Skip to content

Commit 1c22307

Browse files
authored
refactor(rollup-relayer): remove outdated logic (#1561)
Co-authored-by: colinlyguo <[email protected]>
1 parent 22dd390 commit 1c22307

File tree

17 files changed

+273
-2336
lines changed

17 files changed

+273
-2336
lines changed

common/utils/flags.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ var (
2121
// RollupRelayerFlags contains flags only used in rollup-relayer
2222
RollupRelayerFlags = []cli.Flag{
2323
&ImportGenesisFlag,
24+
&MinCodecVersionFlag,
2425
}
2526
// ConfigFileFlag load json type config file.
2627
ConfigFileFlag = cli.StringFlag{
@@ -90,4 +91,10 @@ var (
9091
Usage: "Genesis file of the network",
9192
Value: "./conf/genesis.json",
9293
}
94+
// MinCodecVersionFlag defines the minimum codec version required for the chunk/batch/bundle proposers
95+
MinCodecVersionFlag = cli.UintFlag{
96+
Name: "min-codec-version",
97+
Usage: "Minimum required codec version for the chunk/batch/bundle proposers",
98+
Required: true,
99+
}
93100
)

common/version/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"runtime/debug"
66
)
77

8-
var tag = "v4.4.76"
8+
var tag = "v4.4.77"
99

1010
var commit = func() string {
1111
if info, ok := debug.ReadBuildInfo(); ok {

rollup/cmd/rollup_relayer/app/app.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"time"
99

1010
"github.com/prometheus/client_golang/prometheus"
11+
"github.com/scroll-tech/da-codec/encoding"
1112
"github.com/scroll-tech/go-ethereum/ethclient"
1213
"github.com/scroll-tech/go-ethereum/log"
1314
"github.com/urfave/cli/v2"
@@ -84,9 +85,10 @@ func action(ctx *cli.Context) error {
8485
log.Crit("failed to create l2 relayer", "config file", cfgFile, "error", err)
8586
}
8687

87-
chunkProposer := watcher.NewChunkProposer(subCtx, cfg.L2Config.ChunkProposerConfig, genesis.Config, db, registry)
88-
batchProposer := watcher.NewBatchProposer(subCtx, cfg.L2Config.BatchProposerConfig, genesis.Config, db, registry)
89-
bundleProposer := watcher.NewBundleProposer(subCtx, cfg.L2Config.BundleProposerConfig, genesis.Config, db, registry)
88+
minCodecVersion := encoding.CodecVersion(ctx.Uint(utils.MinCodecVersionFlag.Name))
89+
chunkProposer := watcher.NewChunkProposer(subCtx, cfg.L2Config.ChunkProposerConfig, minCodecVersion, genesis.Config, db, registry)
90+
batchProposer := watcher.NewBatchProposer(subCtx, cfg.L2Config.BatchProposerConfig, minCodecVersion, genesis.Config, db, registry)
91+
bundleProposer := watcher.NewBundleProposer(subCtx, cfg.L2Config.BundleProposerConfig, minCodecVersion, genesis.Config, db, registry)
9092

9193
l2watcher := watcher.NewL2WatcherClient(subCtx, l2client, cfg.L2Config.Confirmations, cfg.L2Config.L2MessageQueueAddress, cfg.L2Config.WithdrawTrieRootSlot, genesis.Config, db, registry)
9294

@@ -108,8 +110,6 @@ func action(ctx *cli.Context) error {
108110

109111
go utils.Loop(subCtx, 2*time.Second, l2relayer.ProcessPendingBatches)
110112

111-
go utils.Loop(subCtx, 15*time.Second, l2relayer.ProcessCommittedBatches)
112-
113113
go utils.Loop(subCtx, 15*time.Second, l2relayer.ProcessPendingBundles)
114114

115115
// Finish start all rollup relayer functions.

0 commit comments

Comments
 (0)