feat(relayer): adapt to CodecV7 for EuclidV2

build/.golangci.yml

@@ -91,7 +91,7 @@ linters-settings:
     #local-prefixes: github.com/org/project
   gocyclo:
     # minimal code complexity to report, 30 by default (but we recommend 10-20)
-    min-complexity: 30
+    min-complexity: 40
   maligned:
     # print struct with more effective memory layout or not, false by default
     suggest-new: true
@@ -254,6 +254,9 @@ issues:
     - linters:
         - wsl
       text: "expressions should not be cuddled with declarations or returns"
+    - linters:
+        - govet
+      text: 'shadow: declaration of "(err|ctx)" shadows declaration at'
 
   # Independently from option `exclude` we use default exclude patterns,
   # it can be disabled by this option. To list all

build/dockerfiles/rollup_relayer.Dockerfile

@@ -1,5 +1,5 @@
 # Download Go dependencies
-FROM scrolltech/go-rust-builder:go-1.21-rust-nightly-2023-12-03 as base
+FROM scrolltech/go-rust-builder:go-1.22-rust-nightly-2023-12-03 as base
 
 WORKDIR /src
 COPY go.work* ./

database/migrate/migrate_test.go

@@ -59,20 +59,20 @@ func testResetDB(t *testing.T) {
 	cur, err := Current(pgDB)
 	assert.NoError(t, err)
 	// total number of tables.
-	assert.Equal(t, int64(24), cur)
+	assert.Equal(t, int64(25), cur)
 }
 
 func testMigrate(t *testing.T) {
 	assert.NoError(t, Migrate(pgDB))
 	cur, err := Current(pgDB)
 	assert.NoError(t, err)
-	assert.Equal(t, int64(24), cur)
+	assert.Equal(t, int64(25), cur)
 }
 
 func testRollback(t *testing.T) {
 	version, err := Current(pgDB)
 	assert.NoError(t, err)
-	assert.Equal(t, int64(24), version)
+	assert.Equal(t, int64(25), version)
 
 	assert.NoError(t, Rollback(pgDB, nil))
 

database/migrate/migrations/00025_add_l1_message_queue_hash.sql

@@ -0,0 +1,26 @@
+-- +goose Up
+-- +goose StatementBegin
+
+ALTER TABLE chunk
+ADD COLUMN prev_l1_message_queue_hash VARCHAR DEFAULT '',
+ADD COLUMN post_l1_message_queue_hash VARCHAR DEFAULT '';
+
+ALTER TABLE batch
+ADD COLUMN prev_l1_message_queue_hash VARCHAR DEFAULT '',
+ADD COLUMN post_l1_message_queue_hash VARCHAR DEFAULT '';
+
+
+-- +goose StatementEnd
+
+-- +goose Down
+-- +goose StatementBegin
+
+ALTER TABLE IF EXISTS chunk
+DROP COLUMN IF EXISTS prev_l1_message_queue_hash,
+DROP COLUMN IF EXISTS post_l1_message_queue_hash;
+
+ALTER TABLE IF EXISTS batch
+DROP COLUMN IF EXISTS prev_l1_message_queue_hash,
+DROP COLUMN IF EXISTS post_l1_message_queue_hash;
+
+-- +goose StatementEnd

rollup/Makefile

@@ -32,5 +32,5 @@ docker_push:
 	docker push scrolltech/rollup-relayer:${IMAGE_VERSION}
 
 docker:
-	DOCKER_BUILDKIT=1 docker build -t scrolltech/gas-oracle:${IMAGE_VERSION} ${REPO_ROOT_DIR}/ -f ${REPO_ROOT_DIR}/build/dockerfiles/gas_oracle.Dockerfile
-	DOCKER_BUILDKIT=1 docker build -t scrolltech/rollup-relayer:${IMAGE_VERSION} ${REPO_ROOT_DIR}/ -f ${REPO_ROOT_DIR}/build/dockerfiles/rollup_relayer.Dockerfile
+	DOCKER_BUILDKIT=1 docker build -t scrolltech/gas-oracle:${IMAGE_VERSION} ${REPO_ROOT_DIR}/ -f ${REPO_ROOT_DIR}/build/dockerfiles/gas_oracle.Dockerfile --platform=linux/amd64
+	DOCKER_BUILDKIT=1 docker build -t scrolltech/rollup-relayer:${IMAGE_VERSION} ${REPO_ROOT_DIR}/ -f ${REPO_ROOT_DIR}/build/dockerfiles/rollup_relayer.Dockerfile --platform=linux/amd64

rollup/abi/bridge_abi_test.go

@@ -1,10 +1,12 @@
 package bridgeabi
 
 import (
+	"fmt"
 	"math/big"
 	"testing"
 
 	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/common/hexutil"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -74,3 +76,20 @@ func TestPackSetL2BaseFee(t *testing.T) {
 	_, err = l2GasOracleABI.Pack("setL2BaseFee", baseFee)
 	assert.NoError(err)
 }
+
+func TestPrintABISignatures(t *testing.T) {
+	// print all error signatures of ABI
+	abi, err := ScrollChainMetaData.GetAbi()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	for _, method := range abi.Methods {
+		fmt.Println(hexutil.Encode(method.ID[:4]), method.Sig, method.Name)
+	}
+
+	fmt.Println("------------------------------")
+	for _, errors := range abi.Errors {
+		fmt.Println(hexutil.Encode(errors.ID[:4]), errors.Sig, errors.Name)
+	}
+}

rollup/cmd/rollup_relayer/app/app.go

@@ -80,6 +80,18 @@ func action(ctx *cli.Context) error {
 	}
 
 	initGenesis := ctx.Bool(utils.ImportGenesisFlag.Name)
+
+	// sanity check config
+	if cfg.L2Config.RelayerConfig.BatchSubmission == nil {
+		log.Crit("cfg.L2Config.RelayerConfig.BatchSubmission must not be nil")
+	}
+	if cfg.L2Config.RelayerConfig.BatchSubmission.MinBatches < 1 {
+		log.Crit("cfg.L2Config.RelayerConfig.SenderConfig.BatchSubmission.MinBatches must be at least 1")
+	}
+	if cfg.L2Config.RelayerConfig.BatchSubmission.MaxBatches < 1 {
+		log.Crit("cfg.L2Config.RelayerConfig.SenderConfig.BatchSubmission.MaxBatches must be at least 1")
+	}
+
 	l2relayer, err := relayer.NewLayer2Relayer(ctx.Context, l2client, db, cfg.L2Config.RelayerConfig, genesis.Config, initGenesis, relayer.ServiceTypeL2RollupRelayer, registry)
 	if err != nil {
 		log.Crit("failed to create l2 relayer", "config file", cfgFile, "error", err)

rollup/conf/config.json

@@ -51,6 +51,11 @@
         "min_gas_tip": 100000000,
         "max_pending_blob_txs": 3
       },
+      "batch_submission": {
+        "min_batches": 1,
+        "max_batches": 6,
+        "timeout": 300
+      },
       "gas_oracle_config": {
         "min_gas_price": 0,
         "gas_price_diff": 50000

rollup/go.mod

@@ -13,8 +13,8 @@ require (
 	github.com/holiman/uint256 v1.3.2
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/prometheus/client_golang v1.16.0
-	github.com/scroll-tech/da-codec v0.1.3-0.20250206084714-d61e2cbe7cd5
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20250205135740-4bdf6d096c38
+	github.com/scroll-tech/da-codec v0.1.3-0.20250227072756-a1482833595f
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20250226024115-973bd915b5a2
 	github.com/smartystreets/goconvey v1.8.0
 	github.com/spf13/viper v1.19.0
 	github.com/stretchr/testify v1.10.0

rollup/go.sum

@@ -249,10 +249,10 @@ github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6ke
 github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
 github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
 github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
-github.com/scroll-tech/da-codec v0.1.3-0.20250206084714-d61e2cbe7cd5 h1:vsSXTjYDggo6TgHxS8KYl4IYHi+EawpzeqQ64X2W/cw=
-github.com/scroll-tech/da-codec v0.1.3-0.20250206084714-d61e2cbe7cd5/go.mod h1:RCDoKwQgZMr/GbD1rKiLA90+0faOzOD6JJm0Bq/7vQs=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20250205135740-4bdf6d096c38 h1:IKkevP42IQx8DQvtVq9WOmZDQrto59CGdEheXPf20HA=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20250205135740-4bdf6d096c38/go.mod h1:Ik3OBLl7cJxPC+CFyCBYNXBPek4wpdzkWehn/y5qLM8=
+github.com/scroll-tech/da-codec v0.1.3-0.20250227072756-a1482833595f h1:YYbhuUwjowqI4oyXtECRofck7Fyj18e1tcRjuQlZpJE=
+github.com/scroll-tech/da-codec v0.1.3-0.20250227072756-a1482833595f/go.mod h1:xECEHZLVzbdUn+tNbRJhRIjLGTOTmnFQuTgUTeVLX58=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20250226024115-973bd915b5a2 h1:WwqAM3Tx7AEqBL6IJ1h+NPjKhCih/wE0JoBqpCK0E7o=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20250226024115-973bd915b5a2/go.mod h1:Oc2wkvXKf9pPdRO87ikCfanlOUkEQhraDte3d1WJaxA=
 github.com/scroll-tech/zktrie v0.8.4 h1:UagmnZ4Z3ITCk+aUq9NQZJNAwnWl4gSxsLb2Nl7IgRE=
 github.com/scroll-tech/zktrie v0.8.4/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=

rollup/internal/config/relayer.go

@@ -31,6 +31,15 @@ type SenderConfig struct {
 	MaxPendingBlobTxs int64 `json:"max_pending_blob_txs"`
 }
 
+type BatchSubmission struct {
+	// The minimum number of batches to submit in a single transaction.
+	MinBatches int `json:"min_batches"`
+	// The maximum number of batches to submit in a single transaction.
+	MaxBatches int `json:"max_batches"`
+	// The time in seconds after which a batch is considered stale and should be submitted ignoring the min batch count.
+	TimeoutSec int64 `json:"timeout"`
+}
+
 // ChainMonitor this config is used to get batch status from chain_monitor API.
 type ChainMonitor struct {
 	Enabled  bool   `json:"enabled"`
@@ -48,6 +57,8 @@ type RelayerConfig struct {
 	GasPriceOracleContractAddress common.Address `json:"gas_price_oracle_contract_address"`
 	// sender config
 	SenderConfig *SenderConfig `json:"sender_config"`
+	// Config for batch submission
+	BatchSubmission *BatchSubmission `json:"batch_submission"`
 	// gas oracle config
 	GasOracleConfig *GasOracleConfig `json:"gas_oracle_config"`
 	// ChainMonitor config of monitoring service