Fix asset signer tool (#239)

* update * fix rollup id * fix comment * add docker image --------- Co-authored-by: JianGuo <[email protected]>
okx · Aug 6, 2024 · 336b9b0 · 336b9b0
1 parent a752112
commit 336b9b0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/etherman/etherman_xlayer.go b/etherman/etherman_xlayer.go
@@ -281,7 +281,7 @@ func NewClient(cfg Config, l1Config L1Config) (*Client, error) {
 	// Get RollupID
 	rollupID, err := rollupManager.RollupAddressToID(&bind.CallOpts{Pending: false}, l1Config.ZkEVMAddr)
 	if err != nil {
-		log.Debugf("error rollupManager.RollupAddressToID(%s). Error: %w", l1Config.RollupManagerAddr, err)
+		log.Debugf("error rollupManager.RollupAddressToID(%s). Error: %w", l1Config.ZkEVMAddr, err)
 		return nil, err
 	}
 	log.Debug("rollupID: ", rollupID)

diff --git a/test/docker-compose.yml b/test/docker-compose.yml
@@ -775,7 +775,7 @@ services:
   xlayer-signer:
     container_name: xlayer-signer
     restart: unless-stopped
-    image: xlayer-signer
+    image: giskook/xlayer-signer:0001
     ports:
       - 7001:7001
     volumes:
@@ -887,4 +887,4 @@ services:
       - ENABLE_DEPOSIT_WARNING=true
       - ENABLE_REPORT_FORM=false
       - USE_FIAT_EXCHANGE_RATES=false
-      - SHOW_OUTDATED_NETWORK_MODAL=false
+      - SHOW_OUTDATED_NETWORK_MODAL=false
diff --git a/tools/signer/config/config.go b/tools/signer/config/config.go
@@ -25,10 +25,11 @@ type L1 struct {
 	SeqPrivateKey types.KeystoreFileConfig `mapstructure:"SeqPrivateKey"`
 	AggPrivateKey types.KeystoreFileConfig `mapstructure:"AggPrivateKey"`
 
-	PolygonMaticAddress       common.Address `mapstructure:"PolygonMaticAddress"`
-	GlobalExitRootManagerAddr common.Address `mapstructure:"GlobalExitRootManagerAddress"`
-	DataCommitteeAddr         common.Address `mapstructure:"DataCommitteeAddress"`
-	PolygonZkEVMAddress       common.Address `mapstructure:"PolygonZkEVMAddress"`
+	PolygonMaticAddress         common.Address `mapstructure:"PolygonMaticAddress"`
+	GlobalExitRootManagerAddr   common.Address `mapstructure:"GlobalExitRootManagerAddress"`
+	DataCommitteeAddr           common.Address `mapstructure:"DataCommitteeAddress"`
+	PolygonZkEVMAddress         common.Address `mapstructure:"PolygonZkEVMAddress"`
+	PolygonRollupManagerAddress common.Address `mapstructure:"PolygonRollupManagerAddress"`
 }
 
 // Config is the configuration for the tool

diff --git a/tools/signer/service/service.go b/tools/signer/service/service.go
@@ -66,10 +66,12 @@ func NewServer(cfg *config.Config, ctx context.Context) *Server {
 		ZkEVMAddr:                 cfg.L1.PolygonZkEVMAddress,
 		PolAddr:                   cfg.L1.PolygonMaticAddress,
 		GlobalExitRootManagerAddr: cfg.L1.GlobalExitRootManagerAddr,
+		RollupManagerAddr:         cfg.L1.PolygonRollupManagerAddress,
 	}
 
 	var err error
 	srv.ethClient, err = etherman.NewClient(srv.ethCfg, srv.l1Cfg)
+	log.Infof("url: %v, l1 chain id: %v, zkevm addr: %v, rollup manager addr: %v", srv.ethCfg.URL, srv.l1Cfg.L1ChainID, srv.l1Cfg.ZkEVMAddr, srv.l1Cfg.RollupManagerAddr)
 	if err != nil {
 		log.Fatal("error creating etherman client. Error: %v", err)
 	}