chore: resolve PR review comments

This commit is contained in:
vietddude
2025-07-02 16:26:15 +07:00
parent f5fc40a17c
commit b59005c8ff
7 changed files with 17 additions and 14 deletions
+1 -2
View File
@@ -38,7 +38,6 @@ func main() {
NodeIDs: []string{"0ce02715-0ead-48ef-9772-2583316cc860", "ac37e85f-caca-4bee-8a3a-49a0fe35abff"}, // new peer IDs
NewThreshold: 1, // t+1 <= len(NodeIDs)
KeyType: types.KeyTypeSecp256k1,
Signature: []byte("signature"),
}
err = mpcClient.Resharing(resharingMsg)
if err != nil {
@@ -47,7 +46,7 @@ func main() {
fmt.Printf("Resharing(%q) sent, awaiting result...\n", resharingMsg.WalletID)
// 3) Listen for signing results
err = mpcClient.OnResharingResult(func(evt event.ResharingSuccessEvent) {
err = mpcClient.OnResharingResult(func(evt event.ResharingResultEvent) {
logger.Info("Resharing result received",
"walletID", evt.WalletID,
"pubKey", fmt.Sprintf("%x", evt.PubKey),
+3 -3
View File
@@ -32,7 +32,7 @@ type MPCClient interface {
OnSignResult(callback func(event event.SigningResultEvent)) error
Resharing(msg *types.ResharingMessage) error
OnResharingResult(callback func(event event.ResharingSuccessEvent)) error
OnResharingResult(callback func(event event.ResharingResultEvent)) error
}
type mpcClient struct {
@@ -270,11 +270,11 @@ func (c *mpcClient) Resharing(msg *types.ResharingMessage) error {
return nil
}
func (c *mpcClient) OnResharingResult(callback func(event event.ResharingSuccessEvent)) error {
func (c *mpcClient) OnResharingResult(callback func(event event.ResharingResultEvent)) error {
err := c.reshareSuccessQueue.Dequeue(ResharingSuccessTopic, func(msg []byte) error {
logger.Info("Received reshare success message", "raw", string(msg))
var event event.ResharingSuccessEvent
var event event.ResharingResultEvent
err := json.Unmarshal(msg, &event)
if err != nil {
logger.Error("Failed to unmarshal reshare success event", err, "raw", string(msg))
+1 -1
View File
@@ -2,7 +2,7 @@ package event
import "github.com/fystack/mpcium/pkg/types"
type ResharingSuccessEvent struct {
type ResharingResultEvent struct {
WalletID string `json:"wallet_id"`
NewThreshold int `json:"new_threshold"`
KeyType types.KeyType `json:"key_type"`
+2 -2
View File
@@ -281,7 +281,7 @@ func (ec *eventConsumer) consumeTxSigningEvent() error {
)
case types.KeyTypeEd25519:
session, err = ec.node.CreateSigningSession(
mpc.SessionTypeECDSA,
mpc.SessionTypeEDDSA,
msg.WalletID,
msg.TxID,
msg.NetworkInternalCode,
@@ -455,7 +455,7 @@ func (ec *eventConsumer) consumeReshareEvent() error {
return
}
successEvent := &event.ResharingSuccessEvent{
successEvent := &event.ResharingResultEvent{
WalletID: walletID,
NewThreshold: msg.NewThreshold,
KeyType: msg.KeyType,
+1 -1
View File
@@ -125,7 +125,7 @@ func (s *ecdsaSigningSession) Init(tx *big.Int) error {
}
} else {
logger.Info("Getting key data from KVStore", "walletID", s.walletID, "version", keyInfo.Version)
keyData, err = s.kvstore.Get(s.composeKey(s.walletID + "_v" + strconv.Itoa(s.GetVersion())))
keyData, err = s.kvstore.Get(s.composeKey(s.walletID + "_v" + strconv.Itoa(keyInfo.Version)))
if err != nil {
return errors.Wrap(err, "Failed to get wallet data from KVStore")
}
+1 -1
View File
@@ -116,7 +116,7 @@ func (s *eddsaSigningSession) Init(tx *big.Int) error {
}
} else {
logger.Info("Getting key data from KVStore", "walletID", s.walletID, "version", keyInfo.Version)
keyData, err = s.kvstore.Get(s.composeKey(s.walletID + "_v" + strconv.Itoa(s.GetVersion())))
keyData, err = s.kvstore.Get(s.composeKey(s.walletID + "_v" + strconv.Itoa(keyInfo.Version)))
if err != nil {
return errors.Wrap(err, "Failed to get wallet data from KVStore")
}
+8 -4
View File
@@ -235,9 +235,13 @@ func (s *session) ErrChan() <-chan error {
}
func (s *session) GetVersion() int {
version, err := strconv.Atoi(strings.Split(string(s.selfPartyID.GetKey()), ":")[1])
if err != nil {
return 0
// For backward-compatible party IDs (version 0), the key is just nodeID (no colon)
parts := strings.Split(string(s.selfPartyID.GetKey()), ":")
if len(parts) > 1 {
version, err := strconv.Atoi(parts[1])
if err == nil {
return version
}
}
return version
return 0 // fallback for backward-compatible party IDs
}