Refactor: Use global chainID instead of Aggregator reference in RpcServer

Co-Authored-By: Chris Li <chris.li.2046@gmail.com>

Author: devin-ai-integration[bot]

aggregator/aggregator.go

@@ -226,6 +226,8 @@ func (agg *Aggregator) init() {
 		panic(err)
 	}
 
+	SetGlobalChainID(agg.chainID)
+
 	if agg.chainID.Cmp(config.MainnetChainID) == 0 {
 		config.CurrentChainEnv = config.EthereumEnv
 	} else {

aggregator/auth.go

@@ -205,10 +205,8 @@ func (r *RpcServer) GetSignatureFormat(ctx context.Context, req interface{}) (in
 		return nil, status.Errorf(codes.InvalidArgument, "Invalid Ethereum wallet address format")
 	}
 
-	var chainId *big.Int
-	if r.agg != nil && r.agg.chainID != nil {
-		chainId = r.agg.chainID
-	} else {
+	chainId := GetGlobalChainID()
+	if chainId == nil {
 		return nil, status.Errorf(codes.Internal, "Chain ID not available. Aggregator not fully initialized.")
 	}
 

aggregator/chain_id.go

@@ -0,0 +1,23 @@
+package aggregator
+
+import (
+	"math/big"
+	"sync"
+)
+
+var (
+	globalChainID     *big.Int
+	globalChainIDLock sync.RWMutex
+)
+
+func SetGlobalChainID(chainID *big.Int) {
+	globalChainIDLock.Lock()
+	defer globalChainIDLock.Unlock()
+	globalChainID = chainID
+}
+
+func GetGlobalChainID() *big.Int {
+	globalChainIDLock.RLock()
+	defer globalChainIDLock.RUnlock()
+	return globalChainID
+}

aggregator/rpc_server.go

@@ -41,8 +41,6 @@ type RpcServer struct {
 	ethrpc *ethclient.Client
 
 	smartWalletRpc *ethclient.Client
-
-	agg *Aggregator
 }
 
 // Get nonce of an existing smart wallet of a given owner
@@ -409,8 +407,6 @@ func (agg *Aggregator) startRpcServer(ctx context.Context) error {
 
 		config:       agg.config,
 		operatorPool: agg.operatorPool,
-
-		agg: agg,
 	}
 
 	// TODO: split node and aggregator