improve dkg completion

Author: keithsue

api/side/btcbridge/btcbridge.pulsar.go

@@ -168,8 +168,8 @@ message DKGCompletionRequest {
   string sender = 2;
   // new vaults generated by DKG
   repeated string vaults = 3;
-  // consensus address of the corresponding validator
-  string consensus_address = 4;
-  // hex encoded validator signature
+  // participant consensus pub key
+  string consensus_pubkey = 4;
+  // hex encoded participant signature
   string signature = 5;
 }

api/side/btcbridge/tx.pulsar.go

@@ -186,9 +186,9 @@ message MsgCompleteDKG {
   uint64 id = 2;
   // new vaults generated by DKG
   repeated string vaults = 3;
-  // consensus address of the corresponding validator
-  string consensus_address = 4;
-  // hex encoded validator signature
+  // participant consensus pub key
+  string consensus_pubkey = 4;
+  // hex encoded participant signature
   string signature = 5;
 }
 

docs/static/openapi.yml

@@ -298,11 +298,11 @@ func (m msgServer) CompleteDKG(goCtx context.Context, msg *types.MsgCompleteDKG)
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
 	req := &types.DKGCompletionRequest{
-		Id:               msg.Id,
-		Sender:           msg.Sender,
-		Vaults:           msg.Vaults,
-		ConsensusAddress: msg.ConsensusAddress,
-		Signature:        msg.Signature,
+		Id:              msg.Id,
+		Sender:          msg.Sender,
+		Vaults:          msg.Vaults,
+		ConsensusPubkey: msg.ConsensusPubkey,
+		Signature:       msg.Signature,
 	}
 
 	if err := m.Keeper.CompleteDKG(ctx, req); err != nil {

proto/side/btcbridge/btcbridge.proto

@@ -2,6 +2,7 @@ package keeper
 
 import (
 	"bytes"
+	"encoding/base64"
 	"time"
 
 	"github.com/btcsuite/btcd/btcutil/psbt"
@@ -126,14 +127,14 @@ func (k Keeper) SetDKGCompletionRequest(ctx sdk.Context, req *types.DKGCompletio
 	store := ctx.KVStore(k.storeKey)
 
 	bz := k.cdc.MustMarshal(req)
-	store.Set(types.DKGCompletionRequestKey(req.Id, req.ConsensusAddress), bz)
+	store.Set(types.DKGCompletionRequestKey(req.Id, req.ConsensusPubkey), bz)
 }
 
 // HasDKGCompletionRequest returns true if the given completion request exists, false otherwise
-func (k Keeper) HasDKGCompletionRequest(ctx sdk.Context, id uint64, consAddress string) bool {
+func (k Keeper) HasDKGCompletionRequest(ctx sdk.Context, id uint64, consPubKey string) bool {
 	store := ctx.KVStore(k.storeKey)
 
-	return store.Has(types.DKGCompletionRequestKey(id, consAddress))
+	return store.Has(types.DKGCompletionRequestKey(id, consPubKey))
 }
 
 // GetDKGCompletionRequests gets DKG completion requests by the given id
@@ -199,18 +200,18 @@ func (k Keeper) InitiateDKG(ctx sdk.Context, participants []*types.DKGParticipan
 }
 
 // CompleteDKG completes the DKG request by the DKG participant
-// The DKG request will be completed when all participants submit the valid completion request before timeout
+// The DKG request will be finalized when all participants submit the valid completion request before timeout
 func (k Keeper) CompleteDKG(ctx sdk.Context, req *types.DKGCompletionRequest) error {
 	dkgReq := k.GetDKGRequest(ctx, req.Id)
 	if dkgReq == nil {
 		return types.ErrDKGRequestDoesNotExist
 	}
 
-	if !types.ParticipantExists(dkgReq.Participants, req.ConsensusAddress) {
+	if !types.ParticipantExists(dkgReq.Participants, req.ConsensusPubkey) {
 		return types.ErrUnauthorizedDKGCompletionRequest
 	}
 
-	if k.HasDKGCompletionRequest(ctx, req.Id, req.ConsensusAddress) {
+	if k.HasDKGCompletionRequest(ctx, req.Id, req.ConsensusPubkey) {
 		return types.ErrDKGCompletionRequestExists
 	}
 
@@ -241,9 +242,11 @@ func (k Keeper) CompleteDKG(ctx sdk.Context, req *types.DKGCompletionRequest) er
 	// 	return err
 	// }
 
-	// if !types.VerifySignature(req.Signature, pubKey.Bytes(), req) {
-	// 	return errorsmod.Wrap(types.ErrInvalidDKGCompletionRequest, "invalid signature")
-	// }
+	pubKey, _ := base64.StdEncoding.DecodeString(req.ConsensusPubkey)
+
+	if !types.VerifySignature(req.Signature, pubKey, req) {
+		return errorsmod.Wrap(types.ErrInvalidDKGCompletionRequest, "invalid signature")
+	}
 
 	k.SetDKGCompletionRequest(ctx, req)
 

proto/side/btcbridge/tx.proto

@@ -106,6 +106,6 @@ func DKGRequestKey(id uint64) []byte {
 	return append(DKGRequestKeyPrefix, sdk.Uint64ToBigEndian(id)...)
 }
 
-func DKGCompletionRequestKey(id uint64, consAddress string) []byte {
-	return append(append(DKGCompletionRequestKeyPrefix, sdk.Uint64ToBigEndian(id)...), []byte(consAddress)...)
+func DKGCompletionRequestKey(id uint64, consPubKey string) []byte {
+	return append(append(DKGCompletionRequestKeyPrefix, sdk.Uint64ToBigEndian(id)...), []byte(consPubKey)...)
 }

x/btcbridge/keeper/msg_server.go

@@ -1,6 +1,7 @@
 package types
 
 import (
+	"encoding/base64"
 	"encoding/hex"
 
 	errorsmod "cosmossdk.io/errors"
@@ -14,15 +15,15 @@ func NewMsgCompleteDKG(
 	sender string,
 	id uint64,
 	vaults []string,
-	consAddress string,
+	consPubKey string,
 	signature string,
 ) *MsgCompleteDKG {
 	return &MsgCompleteDKG{
-		Sender:           sender,
-		Id:               id,
-		Vaults:           vaults,
-		ConsensusAddress: consAddress,
-		Signature:        signature,
+		Sender:          sender,
+		Id:              id,
+		Vaults:          vaults,
+		ConsensusPubkey: consPubKey,
+		Signature:       signature,
 	}
 }
 
@@ -46,8 +47,13 @@ func (m *MsgCompleteDKG) ValidateBasic() error {
 		vaults[v] = true
 	}
 
-	if _, err := sdk.ConsAddressFromHex(m.ConsensusAddress); err != nil {
-		return errorsmod.Wrap(ErrInvalidDKGCompletionRequest, "invalid consensus address")
+	consensusPubKey, err := base64.StdEncoding.DecodeString(m.ConsensusPubkey)
+	if err != nil {
+		return errorsmod.Wrap(ErrInvalidDKGCompletionRequest, "failed to decode the consensus pub key")
+	}
+
+	if len(consensusPubKey) != ed25519.PubKeySize {
+		return errorsmod.Wrap(ErrInvalidDKGCompletionRequest, "incorrect consensus pub key size")
 	}
 
 	sigBytes, err := hex.DecodeString(m.Signature)