From 5dcdbaeb4deffead80b95ee772fca294e6e19cfe Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Fri, 6 Dec 2024 03:11:50 +0800 Subject: [PATCH 1/3] refactor(sender): split signer address checks into gas oracle and rollup-relayer --- .../internal/controller/relayer/l2_relayer.go | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/rollup/internal/controller/relayer/l2_relayer.go b/rollup/internal/controller/relayer/l2_relayer.go index c450e22fe3..7c51819309 100644 --- a/rollup/internal/controller/relayer/l2_relayer.go +++ b/rollup/internal/controller/relayer/l2_relayer.go @@ -71,28 +71,9 @@ type Layer2Relayer struct { // NewLayer2Relayer will return a new instance of Layer2RelayerClient func NewLayer2Relayer(ctx context.Context, l2Client *ethclient.Client, db *gorm.DB, cfg *config.RelayerConfig, chainCfg *params.ChainConfig, initGenesis bool, serviceType ServiceType, reg prometheus.Registerer) (*Layer2Relayer, error) { - var gasOracleSender, commitSender, finalizeSender *sender.Sender var err error - // check that all 3 signer addresses are different, because there will be a problem in managing nonce for different senders - gasOracleSenderAddr, err := addrFromSignerConfig(cfg.GasOracleSenderSignerConfig) - if err != nil { - return nil, fmt.Errorf("failed to parse addr from gas oracle signer config, err: %v", err) - } - commitSenderAddr, err := addrFromSignerConfig(cfg.CommitSenderSignerConfig) - if err != nil { - return nil, fmt.Errorf("failed to parse addr from commit sender config, err: %v", err) - } - finalizeSenderAddr, err := addrFromSignerConfig(cfg.FinalizeSenderSignerConfig) - if err != nil { - return nil, fmt.Errorf("failed to parse addr from finalize sender config, err: %v", err) - } - if gasOracleSenderAddr == commitSenderAddr || gasOracleSenderAddr == finalizeSenderAddr || commitSenderAddr == finalizeSenderAddr { - return nil, fmt.Errorf("gas oracle, commit, and finalize sender addresses must be different. Got: Gas Oracle=%s, Commit=%s, Finalize=%s", - gasOracleSenderAddr.Hex(), commitSenderAddr.Hex(), finalizeSenderAddr.Hex()) - } - switch serviceType { case ServiceTypeL2GasOracle: gasOracleSender, err = sender.NewSender(ctx, cfg.SenderConfig, cfg.GasOracleSenderSignerConfig, "l2_relayer", "gas_oracle_sender", types.SenderTypeL2GasOracle, db, reg) @@ -106,6 +87,18 @@ func NewLayer2Relayer(ctx context.Context, l2Client *ethclient.Client, db *gorm. } case ServiceTypeL2RollupRelayer: + commitSenderAddr, err := addrFromSignerConfig(cfg.CommitSenderSignerConfig) + if err != nil { + return nil, fmt.Errorf("failed to parse addr from commit sender config, err: %v", err) + } + finalizeSenderAddr, err := addrFromSignerConfig(cfg.FinalizeSenderSignerConfig) + if err != nil { + return nil, fmt.Errorf("failed to parse addr from finalize sender config, err: %v", err) + } + if commitSenderAddr == finalizeSenderAddr { + return nil, fmt.Errorf("commit, and finalize sender addresses must be different. Got: Commit=%s, Finalize=%s", commitSenderAddr.Hex(), finalizeSenderAddr.Hex()) + } + commitSender, err = sender.NewSender(ctx, cfg.SenderConfig, cfg.CommitSenderSignerConfig, "l2_relayer", "commit_sender", types.SenderTypeCommitBatch, db, reg) if err != nil { return nil, fmt.Errorf("new commit sender failed, err: %w", err) From 6d7822abd6a293ee49726d639cc27c1a10f23208 Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Thu, 5 Dec 2024 19:29:44 +0000 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20auto=20version=20bump=E2=80=89[bot?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/version/version.go b/common/version/version.go index a88911a89f..4f9eb0c2ef 100644 --- a/common/version/version.go +++ b/common/version/version.go @@ -5,7 +5,7 @@ import ( "runtime/debug" ) -var tag = "v4.4.79" +var tag = "v4.4.80" var commit = func() string { if info, ok := debug.ReadBuildInfo(); ok { From 42e99875afdc56ea8920f9ededdf0367fadff94e Mon Sep 17 00:00:00 2001 From: colinlyguo Date: Fri, 6 Dec 2024 13:07:52 +0800 Subject: [PATCH 3/3] a nitpick --- rollup/internal/controller/relayer/l2_relayer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rollup/internal/controller/relayer/l2_relayer.go b/rollup/internal/controller/relayer/l2_relayer.go index 7c51819309..6878f55dc4 100644 --- a/rollup/internal/controller/relayer/l2_relayer.go +++ b/rollup/internal/controller/relayer/l2_relayer.go @@ -96,7 +96,7 @@ func NewLayer2Relayer(ctx context.Context, l2Client *ethclient.Client, db *gorm. return nil, fmt.Errorf("failed to parse addr from finalize sender config, err: %v", err) } if commitSenderAddr == finalizeSenderAddr { - return nil, fmt.Errorf("commit, and finalize sender addresses must be different. Got: Commit=%s, Finalize=%s", commitSenderAddr.Hex(), finalizeSenderAddr.Hex()) + return nil, fmt.Errorf("commit and finalize sender addresses must be different. Got: Commit=%s, Finalize=%s", commitSenderAddr.Hex(), finalizeSenderAddr.Hex()) } commitSender, err = sender.NewSender(ctx, cfg.SenderConfig, cfg.CommitSenderSignerConfig, "l2_relayer", "commit_sender", types.SenderTypeCommitBatch, db, reg)