Revert "Add support for selected nodes in wallet creation and key generation"

This reverts commit 3c09a2f.

Author: vietddude

pkg/client/client.go

@@ -21,7 +21,6 @@ const (
 type MPCClient interface {
 	CreateWallet(walletID string) error
 	CreateWalletWithAuthorizers(walletID string, authorizerSignatures []types.AuthorizerSignature) error
-	CreateWalletWithSelectedNodes(walletID string, nodes []string) error
 	OnWalletCreationResult(callback func(event event.KeygenResultEvent)) error
 
 	SignTransaction(msg *types.SignTxMessage) error
@@ -106,19 +105,14 @@ func NewMPCClient(opts Options) MPCClient {
 
 // CreateWallet generates a GenerateKeyMessage, signs it, and publishes it.
 func (c *mpcClient) CreateWallet(walletID string) error {
-	return c.createWalletWithAuthorizers(walletID, nil, nil)
-}
-
-func (c *mpcClient) CreateWalletWithAuthorizers(walletID string, authorizerSignatures []types.AuthorizerSignature) error {
-	return c.createWalletWithAuthorizers(walletID, nil, authorizerSignatures)
+	return c.CreateWalletWithAuthorizers(walletID, nil)
 }
 
 // CreateWalletWithAuthorizers generates a GenerateKeyMessage with authorizer signatures, signs it, and publishes it.
-func (c *mpcClient) createWalletWithAuthorizers(walletID string, selectedNodeIDs []string, authorizerSignatures []types.AuthorizerSignature) error {
+func (c *mpcClient) CreateWalletWithAuthorizers(walletID string, authorizerSignatures []types.AuthorizerSignature) error {
 	// build the message
 	msg := &types.GenerateKeyMessage{
 		WalletID:             walletID,
-		SelectedNodeIDs:      selectedNodeIDs,
 		AuthorizerSignatures: authorizerSignatures,
 	}
 	// compute the canonical raw bytes
@@ -143,10 +137,6 @@ func (c *mpcClient) createWalletWithAuthorizers(walletID string, selectedNodeIDs
 	return nil
 }
 
-func (c *mpcClient) CreateWalletWithSelectedNodes(walletID string, nodes []string) error {
-	return c.createWalletWithAuthorizers(walletID, nodes, nil)
-}
-
 // The callback will be invoked whenever a wallet creation result is received.
 func (c *mpcClient) OnWalletCreationResult(callback func(event event.KeygenResultEvent)) error {
 	err := c.genKeySuccessQueue.Dequeue(GenerateWalletSuccessTopic, func(msg []byte) error {

pkg/event/keygen.go

@@ -1,10 +1,9 @@
 package event
 
 const (
-	KeygenBrokerStream    = "mpc-keygen"
-	KeygenConsumerStream  = "mpc-keygen-consumer"
-	KeygenRequestTopic    = "mpc.keygen_request.*"
-	KeygenRequestTopicFmt = "mpc.keygen_request.%s"
+	KeygenBrokerStream   = "mpc-keygen"
+	KeygenConsumerStream = "mpc-keygen-consumer"
+	KeygenRequestTopic   = "mpc.keygen_request.*"
 )
 
 type KeygenResultEvent struct {

pkg/eventconsumer/event_consumer.go

@@ -173,35 +173,13 @@ func (ec *eventConsumer) handleKeyGenEvent(natMsg *nats.Msg) {
 	}
 
 	walletID := msg.WalletID
-	var nodeIDs []string
-	if len(msg.SelectedNodeIDs) > 0 {
-		nodeIDs = msg.SelectedNodeIDs
-		logger.Info("Using selected node IDs for keygen", "walletID", walletID, "nodeIDs", nodeIDs)
-	}
-
-	ecdsaSession, err := ec.node.CreateKeyGenSession(mpc.SessionTypeECDSA, walletID, ec.mpcThreshold, ec.genKeyResultQueue, nodeIDs)
+	ecdsaSession, err := ec.node.CreateKeyGenSession(mpc.SessionTypeECDSA, walletID, ec.mpcThreshold, ec.genKeyResultQueue)
 	if err != nil {
-		if errors.Is(err, mpc.ErrNotInParticipantList) {
-			logger.Info("Node is not in selected node list for this wallet, skipping keygen",
-				"walletID", walletID,
-				"nodeID", ec.node.ID(),
-			)
-			// Skip keygen instead of treating as error, same behavior as sign
-			return
-		}
 		ec.handleKeygenSessionError(walletID, err, "Failed to create ECDSA key generation session", natMsg)
 		return
 	}
-	eddsaSession, err := ec.node.CreateKeyGenSession(mpc.SessionTypeEDDSA, walletID, ec.mpcThreshold, ec.genKeyResultQueue, nodeIDs)
+	eddsaSession, err := ec.node.CreateKeyGenSession(mpc.SessionTypeEDDSA, walletID, ec.mpcThreshold, ec.genKeyResultQueue)
 	if err != nil {
-		if errors.Is(err, mpc.ErrNotInParticipantList) {
-			logger.Info("Node is not in selected node list for this wallet, skipping keygen",
-				"walletID", walletID,
-				"nodeID", ec.node.ID(),
-			)
-			// Skip keygen instead of treating as error, same behavior as sign
-			return
-		}
 		ec.handleKeygenSessionError(walletID, err, "Failed to create EdDSA key generation session", natMsg)
 		return
 	}

pkg/mpc/node.go

@@ -83,7 +83,6 @@ func (p *Node) CreateKeyGenSession(
 	walletID string,
 	threshold int,
 	resultQueue messaging.MessageQueue,
-	selectedNodeIDs []string,
 ) (KeyGenSession, error) {
 	if !p.peerRegistry.ArePeersReady() {
 		return nil, errors.New("All nodes are not ready!")
@@ -94,43 +93,24 @@ func (p *Node) CreateKeyGenSession(
 		return nil, fmt.Errorf("Key already exists: %s", walletID)
 	}
 
-	var nodeIDs []string
-	if len(selectedNodeIDs) > 0 {
-		// Use selected node IDs, but filter to only include ready peers
-		readyPeerIDs := p.peerRegistry.GetReadyPeersIncludeSelf()
-		nodeIDs = p.filterReadyPeers(selectedNodeIDs, readyPeerIDs)
-		
-		// Validate that we have enough ready nodes
-		if len(nodeIDs) < threshold+1 {
-			return nil, fmt.Errorf("not enough ready nodes in selected list: expected at least %d, got %d", threshold+1, len(nodeIDs))
-		}
-		
-		// Validate that self is in the selected list - return special error to skip, same as sign
-		if !slices.Contains(nodeIDs, p.nodeID) {
-			return nil, ErrNotInParticipantList
-		}
-	} else {
-		// Use all ready peers if no selection provided
-		nodeIDs = p.peerRegistry.GetReadyPeersIncludeSelf()
-	}
-
 	switch sessionType {
 	case SessionTypeECDSA:
-		return p.createECDSAKeyGenSession(walletID, threshold, DefaultVersion, resultQueue, nodeIDs)
+		return p.createECDSAKeyGenSession(walletID, threshold, DefaultVersion, resultQueue)
 	case SessionTypeEDDSA:
-		return p.createEDDSAKeyGenSession(walletID, threshold, DefaultVersion, resultQueue, nodeIDs)
+		return p.createEDDSAKeyGenSession(walletID, threshold, DefaultVersion, resultQueue)
 	default:
 		return nil, fmt.Errorf("Unknown session type: %s", sessionType)
 	}
 }
 
-func (p *Node) createECDSAKeyGenSession(walletID string, threshold int, version int, resultQueue messaging.MessageQueue, nodeIDs []string) (KeyGenSession, error) {
-	selfPartyID, allPartyIDs := p.generatePartyIDs(PurposeKeygen, nodeIDs, version)
+func (p *Node) createECDSAKeyGenSession(walletID string, threshold int, version int, resultQueue messaging.MessageQueue) (KeyGenSession, error) {
+	readyPeerIDs := p.peerRegistry.GetReadyPeersIncludeSelf()
+	selfPartyID, allPartyIDs := p.generatePartyIDs(PurposeKeygen, readyPeerIDs, version)
 	session := newECDSAKeygenSession(
 		walletID,
 		p.pubSub,
 		p.direct,
-		nodeIDs,
+		readyPeerIDs,
 		selfPartyID,
 		allPartyIDs,
 		threshold,
@@ -143,13 +123,14 @@ func (p *Node) createECDSAKeyGenSession(walletID string, threshold int, version
 	return session, nil
 }
 
-func (p *Node) createEDDSAKeyGenSession(walletID string, threshold int, version int, resultQueue messaging.MessageQueue, nodeIDs []string) (KeyGenSession, error) {
-	selfPartyID, allPartyIDs := p.generatePartyIDs(PurposeKeygen, nodeIDs, version)
+func (p *Node) createEDDSAKeyGenSession(walletID string, threshold int, version int, resultQueue messaging.MessageQueue) (KeyGenSession, error) {
+	readyPeerIDs := p.peerRegistry.GetReadyPeersIncludeSelf()
+	selfPartyID, allPartyIDs := p.generatePartyIDs(PurposeKeygen, readyPeerIDs, version)
 	session := newEDDSAKeygenSession(
 		walletID,
 		p.pubSub,
 		p.direct,
-		nodeIDs,
+		readyPeerIDs,
 		selfPartyID,
 		allPartyIDs,
 		threshold,
@@ -269,17 +250,6 @@ func (p *Node) getReadyPeersForSession(keyInfo *keyinfo.KeyInfo, readyPeers []st
 	return readyParticipantIDs
 }
 
-func (p *Node) filterReadyPeers(selectedNodeIDs []string, readyPeers []string) []string {
-	// Filter selected node IDs to only include ready peers
-	filtered := make([]string, 0, len(selectedNodeIDs))
-	for _, nodeID := range selectedNodeIDs {
-		if slices.Contains(readyPeers, nodeID) {
-			filtered = append(filtered, nodeID)
-		}
-	}
-	return filtered
-}
-
 func (p *Node) ensureNodeIsParticipant(keyInfo *keyinfo.KeyInfo) error {
 	if !slices.Contains(keyInfo.ParticipantPeerIDs, p.nodeID) {
 		return ErrNotInParticipantList

pkg/types/initiator_msg.go

@@ -36,7 +36,6 @@ type InitiatorMessage interface {
 
 type GenerateKeyMessage struct {
 	WalletID             string                `json:"wallet_id"`
-	SelectedNodeIDs      []string              `json:"selected_node_ids"`
 	Signature            []byte                `json:"signature"`
 	AuthorizerSignatures []AuthorizerSignature `json:"authorizer_signatures,omitempty"`
 }