updated the peerid for pool discovery to ipfs cluster

Author: ehsan6sha

blockchain/blockchain.go

@@ -1198,7 +1198,7 @@ func (bl *FxBlockchain) discoverPoolAndChain(ctx context.Context, poolID uint32)
 
 		// Check if our peer ID is a member of this pool on this chain
 		membershipReq := IsMemberOfPoolRequest{
-			PeerID:    bl.selfPeerID.String(),
+			PeerID:    bl.clusterPeerID.String(),
 			PoolID:    poolID,
 			ChainName: chainName,
 		}

blockchain/options.go

@@ -33,6 +33,7 @@ type (
 		rpc                      *rpc.HttpApi
 		ipfsClusterApi           ipfsCluster.Client
 		selfPeerID               peer.ID      // Peer ID derived from private key, used for authorization checks
+		clusterPeerID            peer.ID      // IPFS cluster peer ID (original identity), used for on-chain pool membership
 		signingKey               crypto.PrivKey // Private key for signing outgoing requests (mobile client)
 		clientProtocolID         string        // Protocol ID for kubo p2p forwarding (e.g. "/x/fula-blockchain")
 	}
@@ -226,6 +227,15 @@ func WithSelfPeerID(id peer.ID) Option {
 	}
 }
 
+// WithClusterPeerID sets the IPFS cluster peer ID (original identity, not HMAC-derived).
+// This is the peer ID registered on-chain for pool membership checks.
+func WithClusterPeerID(id peer.ID) Option {
+	return func(o *options) error {
+		o.clusterPeerID = id
+		return nil
+	}
+}
+
 // WithRequestSigning enables signed request headers on outgoing HTTP requests.
 // The private key is used to sign requests so the receiving go-fula can verify the caller.
 func WithRequestSigning(key crypto.PrivKey) Option {

blox/blox.go

@@ -81,6 +81,7 @@ func New(o ...Option) (*Blox, error) {
 		blockchain.WithBlockchainEndPoint(p.blockchainEndpoint),
 		blockchain.WithSecretsPath(p.secretsPath),
 		blockchain.WithSelfPeerID(p.selfPeerID),
+		blockchain.WithClusterPeerID(p.clusterPeerID),
 		blockchain.WithTimeout(65),
 		blockchain.WithWg(p.wg),
 		blockchain.WithFetchFrequency(1*time.Minute),
@@ -456,7 +457,7 @@ func (p *Blox) Start(ctx context.Context) error {
 
 		for {
 			attempt++
-			log.Infow("Starting pool discovery", "attempt", attempt, "PeerID", p.selfPeerID.String())
+			log.Infow("Starting pool discovery", "attempt", attempt, "PeerID", p.selfPeerID.String(), "clusterPeerID", p.clusterPeerID.String())
 
 			// Try each chain
 			for _, chainName := range chainList {
@@ -481,7 +482,7 @@ func (p *Blox) Start(ctx context.Context) error {
 
 					// peerID format for membership check
 					membershipReq := blockchain.IsMemberOfPoolRequest{
-						PeerID:    p.selfPeerID.String(),
+						PeerID:    p.clusterPeerID.String(),
 						PoolID:    pool.ID,
 						ChainName: chainName,
 					}
@@ -537,7 +538,7 @@ func (p *Blox) Start(ctx context.Context) error {
 		}
 
 		if !found {
-			log.Warnw("Could not find pool membership on any chain", "peerID", p.selfPeerID.String(), "chains", chainList)
+			log.Warnw("Could not find pool membership on any chain", "clusterPeerID", p.clusterPeerID.String(), "chains", chainList)
 		}
 	}
 

blox/options.go

@@ -24,6 +24,7 @@ type (
 	PoolNameGetter  func() string
 	options         struct {
 		selfPeerID            peer.ID
+		clusterPeerID         peer.ID
 		name                  string
 		topicName             string
 		chainName             string
@@ -125,6 +126,15 @@ func WithSelfPeerID(id peer.ID) Option {
 	}
 }
 
+// WithClusterPeerID sets the IPFS cluster peer ID (original identity, not HMAC-derived).
+// This is the peer ID registered on-chain for pool membership.
+func WithClusterPeerID(id peer.ID) Option {
+	return func(o *options) error {
+		o.clusterPeerID = id
+		return nil
+	}
+}
+
 // WithPoolName sets a human readable name for the pool that the blox should join or create.
 // Required.
 func WithPoolName(n string) Option {

cmd/blox/main.go

@@ -1087,6 +1087,22 @@ func action(ctx *cli.Context) error {
 	}
 	logger.Infow("Derived kubo peer ID from private key", "peerID", selfPeerID.String())
 
+	// Compute cluster peer ID — the original identity (not HMAC-derived).
+	// This is the peer ID registered on-chain for pool membership.
+	clusterPrivKeyBytes, err := base64.StdEncoding.DecodeString(app.config.Identity)
+	if err != nil {
+		return fmt.Errorf("decoding cluster private key: %w", err)
+	}
+	clusterPrivKey, err := crypto.UnmarshalPrivateKey(clusterPrivKeyBytes)
+	if err != nil {
+		return fmt.Errorf("unmarshaling cluster private key: %w", err)
+	}
+	clusterPeerID, err := peer.IDFromPrivateKey(clusterPrivKey)
+	if err != nil {
+		return fmt.Errorf("deriving cluster peer ID: %w", err)
+	}
+	logger.Infow("Computed cluster peer ID (on-chain identity)", "clusterPeerID", clusterPeerID.String())
+
 	linkSystem := cidlink.DefaultLinkSystem()
 	linkSystem.StorageReadOpener = CustomStorageReadOpenerNone
 	linkSystem.StorageWriteOpener = CustomStorageWriteOpenerNone
@@ -1133,6 +1149,7 @@ func action(ctx *cli.Context) error {
 
 	bb, err := blox.New(
 		blox.WithSelfPeerID(selfPeerID),
+		blox.WithClusterPeerID(clusterPeerID),
 		blox.WithAuthorizer(authorizerPeerID),
 		blox.WithWg(&wg),
 		blox.WithLinkSystem(&linkSystem),