From 32154fd71e639714047ceaa4e51bdbbb9e81ffda Mon Sep 17 00:00:00 2001 From: JianGuo Date: Tue, 30 Jul 2024 12:01:08 +0800 Subject: [PATCH 1/4] update --- etherman/etherman_xlayer.go | 2 +- tools/signer/config/config.go | 9 +++++---- tools/signer/service/service.go | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/etherman/etherman_xlayer.go b/etherman/etherman_xlayer.go index 764af960b4..5ff366a4d5 100644 --- a/etherman/etherman_xlayer.go +++ b/etherman/etherman_xlayer.go @@ -279,7 +279,7 @@ func NewClient(cfg Config, l1Config L1Config) (*Client, error) { } metrics.Register() // Get RollupID - rollupID, err := rollupManager.RollupAddressToID(&bind.CallOpts{Pending: false}, l1Config.ZkEVMAddr) + rollupID, err := rollupManager.RollupAddressToID(&bind.CallOpts{Pending: false}, l1Config.RollupManagerAddr) if err != nil { log.Debugf("error rollupManager.RollupAddressToID(%s). Error: %w", l1Config.RollupManagerAddr, err) return nil, err diff --git a/tools/signer/config/config.go b/tools/signer/config/config.go index c6e49db5eb..f1837ccfb7 100644 --- 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 index 4339b527d1..c2eb57574f 100644 --- 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("zjg, %v,%v,%v,%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) } From 872a042ba3f3fcc4b87716b9d9a85e329ad23570 Mon Sep 17 00:00:00 2001 From: zhangkai Date: Thu, 1 Aug 2024 18:16:47 +0800 Subject: [PATCH 2/4] fix rollup id --- etherman/etherman_xlayer.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etherman/etherman_xlayer.go b/etherman/etherman_xlayer.go index 5ff366a4d5..c04b5c5707 100644 --- a/etherman/etherman_xlayer.go +++ b/etherman/etherman_xlayer.go @@ -279,9 +279,9 @@ func NewClient(cfg Config, l1Config L1Config) (*Client, error) { } metrics.Register() // Get RollupID - rollupID, err := rollupManager.RollupAddressToID(&bind.CallOpts{Pending: false}, l1Config.RollupManagerAddr) + 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) From 605614a2fee2a93f7f9736f35ee07b5c61f677a8 Mon Sep 17 00:00:00 2001 From: zhangkai Date: Thu, 1 Aug 2024 18:30:58 +0800 Subject: [PATCH 3/4] fix comment --- tools/signer/service/service.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/signer/service/service.go b/tools/signer/service/service.go index c2eb57574f..94331fde73 100644 --- a/tools/signer/service/service.go +++ b/tools/signer/service/service.go @@ -71,7 +71,7 @@ func NewServer(cfg *config.Config, ctx context.Context) *Server { var err error srv.ethClient, err = etherman.NewClient(srv.ethCfg, srv.l1Cfg) - log.Infof("zjg, %v,%v,%v,%v", srv.ethCfg.URL, srv.l1Cfg.L1ChainID, srv.l1Cfg.ZkEVMAddr, srv.l1Cfg.RollupManagerAddr) + 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) } From 31cff629f32ea7a0af77eca05a862e201de747c4 Mon Sep 17 00:00:00 2001 From: zhangkai Date: Fri, 2 Aug 2024 17:35:21 +0800 Subject: [PATCH 4/4] add docker image --- test/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/docker-compose.yml b/test/docker-compose.yml index 3849a69439..5d69f77acd 100644 --- 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 \ No newline at end of file + - SHOW_OUTDATED_NETWORK_MODAL=false