Fix ECDH session parameter

Author: anhthii

pkg/mpc/key_exchange_session.go

@@ -53,6 +53,7 @@ func NewECDHSession(
 	pubSub messaging.PubSub,
 	identityStore identity.Store,
 ) *ecdhSession {
+	logger.Info("Creating ECDH session", "nodeID", nodeID, "peerIDs", peerIDs, "expectedKeys", len(peerIDs))
 	return &ecdhSession{
 		nodeID:        nodeID,
 		peerIDs:       peerIDs,
@@ -92,15 +93,20 @@ func (e *ecdhSession) ListenKeyExchange() error {
 	sub, err := e.pubSub.Subscribe(ECDHExchangeTopic, func(natMsg *nats.Msg) {
 		var ecdhMsg types.ECDHMessage
 		if err := json.Unmarshal(natMsg.Data, &ecdhMsg); err != nil {
+			logger.Error("Failed to unmarshal ECDH message", err)
 			return
 		}
 
 		if ecdhMsg.From == e.nodeID {
+			logger.Debug("Ignoring own ECDH message", "from", ecdhMsg.From)
 			return
 		}
 
+		logger.Debug("Received ECDH message", "from", ecdhMsg.From, "to", e.nodeID)
+
 		//TODO: consider how to avoid replay attack
 		if err := e.identityStore.VerifySignature(&ecdhMsg); err != nil {
+			logger.Error("ECDH signature verification failed", err, "from", ecdhMsg.From)
 			e.errCh <- err
 			return
 		}

pkg/mpc/registry.go

@@ -66,7 +66,9 @@ func NewRegistry(
 	pubSub messaging.PubSub,
 	identityStore identity.Store,
 ) *registry {
-	ecdhSession := NewECDHSession(nodeID, peerNodeIDs, pubSub, identityStore)
+	// ECDH session should only exchange keys with other peers, not self
+	peerIDsExceptSelf := getPeerIDsExceptSelf(nodeID, peerNodeIDs)
+	ecdhSession := NewECDHSession(nodeID, peerIDsExceptSelf, pubSub, identityStore)
 	mpcThreshold := viper.GetInt("mpc_threshold")
 	if mpcThreshold < 1 {
 		logger.Fatal("mpc_threshold must be greater than 0", nil)
@@ -75,7 +77,7 @@ func NewRegistry(
 	reg := &registry{
 		consulKV:      consulKV,
 		nodeID:        nodeID,
-		peerNodeIDs:   getPeerIDsExceptSelf(nodeID, peerNodeIDs),
+		peerNodeIDs:   peerIDsExceptSelf,
 		readyMap:      make(map[string]bool),
 		readyCount:    1, // self
 		healthCheck:   directMessaging,
@@ -185,12 +187,15 @@ func (r *registry) Ready() error {
 	}
 
 	_, err = r.healthCheck.Listen(r.composeHealthCheckTopic(r.nodeID), func(data []byte) {
-		peerID, isEcdhReady, _ := parseHealthDataSplit(string(data))
+		peerID, isEcdhReady, parseErr := parseHealthDataSplit(string(data))
+		if parseErr != nil {
+			logger.Error("Failed to parse health check data", parseErr, "data", string(data))
+			return
+		}
 		logger.Debug("Health check ok", "peerID", peerID, "isEcdhReady", isEcdhReady)
 		if !isEcdhReady {
 			logger.Info("[ECDH exchange retriggerd] not all peers are ready", "peerID", peerID)
 			go r.triggerECDHExchange()
-
 		}
 	})
 	if err != nil {