feat: upgade l2geth to alpha-v1.10 (#379)

Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>

.github/workflows/bridge.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - main
       - staging
+      - develop
+      - alpha
     paths:
       - 'bridge/**'
       - '.github/workflows/bridge.yml'
@@ -12,6 +14,8 @@ on:
     branches:
       - main
       - staging
+      - develop
+      - alpha
     paths:
       - 'bridge/**'
       - '.github/workflows/bridge.yml'

.github/workflows/common.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - main
       - staging
+      - develop
+      - alpha
     paths:
       - 'common/**'
       - '.github/workflows/common.yml'
@@ -12,6 +14,8 @@ on:
     branches:
       - main
       - staging
+      - develop
+      - alpha
     paths:
       - 'common/**'
       - '.github/workflows/common.yml'
@@ -26,7 +30,7 @@ jobs:
     steps:
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: nightly-2022-08-23
+        toolchain: nightly-2022-12-10
         override: true
         components: rustfmt, clippy
     - name: Install Go

.github/workflows/contracts.yaml

@@ -2,22 +2,10 @@ name: Contracts
 
 on:
   push:
-    branches:
-      - master
-      - main
-      - prod
-      - release/*
-      - staging
     paths:
       - 'contracts/**'
       - '.github/workflows/contracts.yaml'
   pull_request:
-    branches:
-      - master
-      - main
-      - prod
-      - release/*
-      - staging
     paths:
       - 'contracts/**'
       - '.github/workflows/contracts.yaml'
@@ -40,6 +28,9 @@ jobs:
         uses: foundry-rs/foundry-toolchain@v1
         with:
           version: nightly
+      
+      - name: Setup LCOV
+        uses: hrishikesh-kadam/setup-lcov@v1
 
       - name: Install Node.js 14
         uses: actions/setup-node@v2
@@ -76,6 +67,22 @@ jobs:
       - name: Run foundry tests
         run: forge test -vvv
 
+      - name: Run foundry coverage
+        run : forge coverage --report lcov
+
+      - name : Prune coverage
+        run : lcov --remove ./lcov.info -o ./lcov.info.pruned 'src/mocks/*' 'src/test/*' 'scripts/*' 'node_modules/*' 'lib/*'
+
+      - name: Report code coverage
+        uses: zgosalvez/github-actions-report-lcov@v3
+        with:
+          coverage-files: contracts/lcov.info.pruned
+          minimum-coverage: 0
+          artifact-name: code-coverage-report
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          working-directory: contracts
+          update-comment: true
+
   hardhat:
     runs-on: ubuntu-latest
 

.github/workflows/coordinator.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - main
       - staging
+      - develop
+      - alpha
     paths:
       - 'coordinator/**'
       - '.github/workflows/coordinator.yml'
@@ -12,6 +14,8 @@ on:
     branches:
       - main
       - staging
+      - develop
+      - alpha
     paths:
       - 'coordinator/**'
       - '.github/workflows/coordinator.yml'
@@ -26,7 +30,7 @@ jobs:
     steps:
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: nightly-2022-08-23
+        toolchain: nightly-2022-12-10
         override: true
         components: rustfmt, clippy
     - name: Install Go

.github/workflows/database.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - main
       - staging
+      - develop
+      - alpha
     paths:
       - 'database/**'
       - '.github/workflows/database.yml'
@@ -12,6 +14,8 @@ on:
     branches:
       - main
       - staging
+      - develop
+      - alpha
     paths:
       - 'database/**'
       - '.github/workflows/database.yml'

.github/workflows/roller.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - main
       - staging
+      - develop
+      - alpha
     paths:
       - 'roller/**'
       - '.github/workflows/roller.yml'
@@ -12,6 +14,8 @@ on:
     branches:
       - main
       - staging
+      - develop
+      - alpha
     paths:
       - 'roller/**'
       - '.github/workflows/roller.yml'
@@ -26,7 +30,7 @@ jobs:
     steps:
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: nightly-2022-08-23
+        toolchain: nightly-2022-12-10
         override: true
         components: rustfmt, clippy
     - name: Install Go
@@ -42,6 +46,8 @@ jobs:
     - name: Test
       run: |
         make roller
+        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./prover/lib
+        export CHAIN_ID=534353
         go test -v ./...
   check:
     runs-on: ubuntu-latest

.gitignore

@@ -3,6 +3,7 @@ assets/params*
 assets/seed
 coverage.txt
 build/bin
+*.integration.txt
 
 # misc
 sftp-config.json

Jenkinsfile

@@ -13,6 +13,8 @@ pipeline {
     environment {
         GO111MODULE = 'on'
         PATH="/home/ubuntu/.cargo/bin:$PATH"
+        LD_LIBRARY_PATH="$LD_LIBRARY_PATH:./coordinator/verifier/lib"
+        CHAIN_ID='534353'
         // LOG_DOCKER = 'true'
     }
     stages {
@@ -61,42 +63,42 @@ pipeline {
             parallel{
                 stage('Test bridge package') {
                     steps {
-                        sh 'go test -v -race -coverprofile=coverage.bridge.txt -covermode=atomic -p 1 scroll-tech/bridge/...'
+                        sh 'go test -v -coverprofile=coverage.bridge.txt -covermode=atomic -p 1 scroll-tech/bridge/...'
                     }
                 }
                 stage('Test common package') {
                     steps {
-                        sh 'go test -v -race -coverprofile=coverage.common.txt -covermode=atomic -p 1 scroll-tech/common/...'
+                        sh 'go test -v -coverprofile=coverage.common.txt -covermode=atomic -p 1 scroll-tech/common/...'
                     }
                 }
                 stage('Test coordinator package') {
                     steps {
-                        sh 'go test -v -race -coverprofile=coverage.coordinator.txt -covermode=atomic -p 1 scroll-tech/coordinator/...'
+                        sh 'go test -v -coverprofile=coverage.coordinator.txt -covermode=atomic -p 1 scroll-tech/coordinator/...'
                     }
                 }
                 stage('Test database package') {
                     steps {
-                        sh 'go test -v -race -coverprofile=coverage.db.txt -covermode=atomic -p 1 scroll-tech/database/...'
+                        sh 'go test -v -coverprofile=coverage.db.txt -covermode=atomic -p 1 scroll-tech/database/...'
                     }
                 }
                 stage('Integration test') {
                     steps {
-                        sh 'go test -v -race -tags="mock_prover mock_verifier" -coverprofile=coverage.integration.txt -covermode=atomic -p 1 scroll-tech/integration-test/...'
+                        sh 'go test -v -tags="mock_prover mock_verifier" -coverprofile=coverage.integration.txt -covermode=atomic -p 1 scroll-tech/integration-test/...'
                     }
                 }
                 stage('Race test bridge package') {
                     steps {
-                        sh "cd bridge && go test -v -race -coverprofile=coverage.txt -covermode=atomic \$(go list ./... | grep -v 'database\\|common\\|l1\\|l2\\|coordinator')"
+                        sh 'go test -v -race -coverprofile=coverage.txt -covermode=atomic scroll-tech/bridge/...'
                     }
                 }
                 stage('Race test coordinator package') {
                     steps {
-                        sh "cd coordinator && go test -v -race -coverprofile=coverage.txt -covermode=atomic \$(go list ./... | grep -v 'database\\|common\\|l1\\|l2\\|coordinator')"
+                        sh 'go test -v -race -coverprofile=coverage.txt -covermode=atomic scroll-tech/coordinator/...'
                     }
                 }
                 stage('Race test database package') {
                     steps {
-                        sh "cd database && go test -v -race -coverprofile=coverage.txt -covermode=atomic \$(go list ./... | grep -v 'database\\|common\\|l1\\|l2\\|coordinator')"
+                        sh 'go test -v -race -coverprofile=coverage.txt -covermode=atomic scroll-tech/database/...'
                     }
                 }
             }

Makefile

@@ -1,5 +1,7 @@
 .PHONY: check update dev_docker clean
 
+ZKP_VERSION=release-1220
+
 help: ## Display this help message
 	@grep -h \
 		-E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | \
@@ -14,11 +16,11 @@ lint: ## The code's format and security checks.
 
 update: ## update dependencies
 	go work sync
-	cd $(PWD)/bridge/ && go get -u github.com/scroll-tech/go-ethereum@staging && go mod tidy
-	cd $(PWD)/common/ && go get -u github.com/scroll-tech/go-ethereum@staging && go mod tidy
-	cd $(PWD)/coordinator/ && go get -u github.com/scroll-tech/go-ethereum@staging && go mod tidy
-	cd $(PWD)/database/ && go get -u github.com/scroll-tech/go-ethereum@staging && go mod tidy
-	cd $(PWD)/roller/ && go get -u github.com/scroll-tech/go-ethereum@staging && go mod tidy
+	cd $(PWD)/bridge/ && go get -u github.com/scroll-tech/go-ethereum@scroll && go mod tidy
+	cd $(PWD)/common/ && go get -u github.com/scroll-tech/go-ethereum@scroll && go mod tidy
+	cd $(PWD)/coordinator/ && go get -u github.com/scroll-tech/go-ethereum@scroll && go mod tidy
+	cd $(PWD)/database/ && go get -u github.com/scroll-tech/go-ethereum@scroll && go mod tidy
+	cd $(PWD)/roller/ && go get -u github.com/scroll-tech/go-ethereum@scroll && go mod tidy
 	goimports -local $(PWD)/bridge/ -w .
 	goimports -local $(PWD)/common/ -w .
 	goimports -local $(PWD)/coordinator/ -w .
@@ -29,5 +31,15 @@ dev_docker: ## build docker images for development/testing usages
 	docker build -t scroll_l1geth ./common/docker/l1geth/
 	docker build -t scroll_l2geth ./common/docker/l2geth/
 
+test_zkp: ## Test zkp prove and verify, roller/prover generates the proof and coordinator/verifier verifies it
+	mkdir -p test_params
+	wget https://circuit-release.s3.us-west-2.amazonaws.com/circuit-release/${ZKP_VERSION}/test_params/params19 -O ./test_params/params19
+	wget https://circuit-release.s3.us-west-2.amazonaws.com/circuit-release/${ZKP_VERSION}/test_params/params26 -O ./test_params/params26
+	wget https://circuit-release.s3.us-west-2.amazonaws.com/circuit-release/${ZKP_VERSION}/test_seed -O test_seed
+	rm -rf ./roller/assets/test_params && mv test_params ./roller/assets/ && mv test_seed ./roller/assets/
+	cd ./roller && make test-gpu-prover
+	rm -rf ./coordinator/assets/test_params && mv ./roller/assets/test_params ./coordinator/assets/ && mv ./roller/assets/agg_proof ./coordinator/assets/
+	cd ./coordinator && make test-gpu-verifier
+
 clean: ## Empty out the bin folder
 	@rm -rf build/bin

bridge/abi/bridge_abi_test.go

@@ -10,69 +10,74 @@ import (
 	bridge_abi "scroll-tech/bridge/abi"
 )
 
-func TestPackRelayMessageWithProof(t *testing.T) {
+func TestEventSignature(t *testing.T) {
 	assert := assert.New(t)
 
-	l1MessengerABI, err := bridge_abi.L1MessengerMetaData.GetAbi()
+	assert.Equal(bridge_abi.L1SentMessageEventSignature, common.HexToHash("104371f3b442861a2a7b82a070afbbaab748bb13757bf47769e170e37809ec1e"))
+	assert.Equal(bridge_abi.L1RelayedMessageEventSignature, common.HexToHash("4641df4a962071e12719d8c8c8e5ac7fc4d97b927346a3d7a335b1f7517e133c"))
+	assert.Equal(bridge_abi.L1FailedRelayedMessageEventSignature, common.HexToHash("99d0e048484baa1b1540b1367cb128acd7ab2946d1ed91ec10e3c85e4bf51b8f"))
+
+	assert.Equal(bridge_abi.L1CommitBatchEventSignature, common.HexToHash("2cdc615c74452778c0fb6184735e014c13aad2b62774fe0b09bd1dcc2cc14a62"))
+	assert.Equal(bridge_abi.L1FinalizeBatchEventSignature, common.HexToHash("6be443154c959a7a1645b4392b6fa97d8e8ab6e8fd853d7085e8867083737d79"))
+
+	assert.Equal(bridge_abi.L1QueueTransactionEventSignature, common.HexToHash("bdcc7517f8fe3db6506dfd910942d0bbecaf3d6a506dadea65b0d988e75b9439"))
+
+	assert.Equal(bridge_abi.L2SentMessageEventSignature, common.HexToHash("104371f3b442861a2a7b82a070afbbaab748bb13757bf47769e170e37809ec1e"))
+	assert.Equal(bridge_abi.L2RelayedMessageEventSignature, common.HexToHash("4641df4a962071e12719d8c8c8e5ac7fc4d97b927346a3d7a335b1f7517e133c"))
+	assert.Equal(bridge_abi.L2FailedRelayedMessageEventSignature, common.HexToHash("99d0e048484baa1b1540b1367cb128acd7ab2946d1ed91ec10e3c85e4bf51b8f"))
+
+	assert.Equal(bridge_abi.L2ImportBlockEventSignature, common.HexToHash("a7823f45e1ee21f9530b77959b57507ad515a14fa9fa24d262ee80e79b2b5745"))
+
+	assert.Equal(bridge_abi.L2AppendMessageEventSignature, common.HexToHash("faa617c2d8ce12c62637dbce76efcc18dae60574aa95709bdcedce7e76071693"))
+}
+
+func TestPackRelayL2MessageWithProof(t *testing.T) {
+	assert := assert.New(t)
+	l1MessengerABI, err := bridge_abi.L1ScrollMessengerMetaData.GetAbi()
 	assert.NoError(err)
 
 	proof := bridge_abi.IL1ScrollMessengerL2MessageProof{
-		BlockHeight: big.NewInt(0),
-		BatchIndex:  big.NewInt(0),
+		BatchHash:   common.Hash{},
 		MerkleProof: make([]byte, 0),
 	}
-	_, err = l1MessengerABI.Pack("relayMessageWithProof", common.Address{}, common.Address{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), make([]byte, 0), proof)
+	_, err = l1MessengerABI.Pack("relayMessageWithProof", common.Address{}, common.Address{}, big.NewInt(0), big.NewInt(0), make([]byte, 0), proof)
 	assert.NoError(err)
 }
 
 func TestPackCommitBatch(t *testing.T) {
 	assert := assert.New(t)
 
-	l1RollupABI, err := bridge_abi.RollupMetaData.GetAbi()
+	scrollChainABI, err := bridge_abi.ScrollChainMetaData.GetAbi()
 	assert.NoError(err)
 
-	txns := make([]bridge_abi.IZKRollupLayer2Transaction, 5)
-	for i := 0; i < 5; i++ {
-		txns[i] = bridge_abi.IZKRollupLayer2Transaction{
-			Caller:   common.Address{},
-			Target:   common.Address{},
-			Nonce:    0,
-			Gas:      0,
-			GasPrice: big.NewInt(0),
-			Value:    big.NewInt(0),
-			Data:     make([]byte, 0),
-			R:        big.NewInt(0),
-			S:        big.NewInt(0),
-			V:        0,
-		}
+	header := bridge_abi.IScrollChainBlockContext{
+		BlockHash:       common.Hash{},
+		ParentHash:      common.Hash{},
+		BlockNumber:     0,
+		Timestamp:       0,
+		BaseFee:         big.NewInt(0),
+		GasLimit:        0,
+		NumTransactions: 0,
+		NumL1Messages:   0,
 	}
 
-	header := bridge_abi.IZKRollupLayer2BlockHeader{
-		BlockHash:   common.Hash{},
-		ParentHash:  common.Hash{},
-		BaseFee:     big.NewInt(0),
-		StateRoot:   common.Hash{},
-		BlockHeight: 0,
-		GasUsed:     0,
-		Timestamp:   0,
-		ExtraData:   make([]byte, 0),
-		Txs:         txns,
+	batch := bridge_abi.IScrollChainBatch{
+		Blocks:           []bridge_abi.IScrollChainBlockContext{header},
+		PrevStateRoot:    common.Hash{},
+		NewStateRoot:     common.Hash{},
+		WithdrawTrieRoot: common.Hash{},
+		BatchIndex:       0,
+		L2Transactions:   make([]byte, 0),
 	}
 
-	batch := bridge_abi.IZKRollupLayer2Batch{
-		BatchIndex: 0,
-		ParentHash: common.Hash{},
-		Blocks:     []bridge_abi.IZKRollupLayer2BlockHeader{header},
-	}
-
-	_, err = l1RollupABI.Pack("commitBatch", batch)
+	_, err = scrollChainABI.Pack("commitBatch", batch)
 	assert.NoError(err)
 }
 
 func TestPackFinalizeBatchWithProof(t *testing.T) {
 	assert := assert.New(t)
 
-	l1RollupABI, err := bridge_abi.RollupMetaData.GetAbi()
+	l1RollupABI, err := bridge_abi.ScrollChainMetaData.GetAbi()
 	assert.NoError(err)
 
 	proof := make([]*big.Int, 10)
@@ -86,12 +91,43 @@ func TestPackFinalizeBatchWithProof(t *testing.T) {
 	assert.NoError(err)
 }
 
-func TestPackRelayMessage(t *testing.T) {
+func TestPackRelayL1Message(t *testing.T) {
 	assert := assert.New(t)
 
-	l2MessengerABI, err := bridge_abi.L2MessengerMetaData.GetAbi()
+	l2MessengerABI, err := bridge_abi.L2ScrollMessengerMetaData.GetAbi()
 	assert.NoError(err)
 
-	_, err = l2MessengerABI.Pack("relayMessage", common.Address{}, common.Address{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), make([]byte, 0))
+	_, err = l2MessengerABI.Pack("relayMessage", common.Address{}, common.Address{}, big.NewInt(0), big.NewInt(0), make([]byte, 0))
+	assert.NoError(err)
+}
+
+func TestPackSetL1BaseFee(t *testing.T) {
+	assert := assert.New(t)
+
+	l1GasOracleABI, err := bridge_abi.L1GasPriceOracleMetaData.GetAbi()
+	assert.NoError(err)
+
+	baseFee := big.NewInt(2333)
+	_, err = l1GasOracleABI.Pack("setL1BaseFee", baseFee)
+	assert.NoError(err)
+}
+
+func TestPackSetL2BaseFee(t *testing.T) {
+	assert := assert.New(t)
+
+	l2GasOracleABI, err := bridge_abi.L2GasPriceOracleMetaData.GetAbi()
+	assert.NoError(err)
+
+	baseFee := big.NewInt(2333)
+	_, err = l2GasOracleABI.Pack("setL2BaseFee", baseFee)
+	assert.NoError(err)
+}
+
+func TestPackImportBlock(t *testing.T) {
+	assert := assert.New(t)
+
+	l1BlockContainerABI := bridge_abi.L1BlockContainerABI
+
+	_, err := l1BlockContainerABI.Pack("importBlockHeader", common.Hash{}, make([]byte, 0), false)
 	assert.NoError(err)
 }

bridge/cmd/app/app.go

@@ -1,6 +1,7 @@
 package app
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"os/signal"
@@ -10,6 +11,7 @@ import (
 
 	"scroll-tech/database"
 
+	"scroll-tech/common/metrics"
 	"scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
@@ -49,7 +51,10 @@ func action(ctx *cli.Context) error {
 		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
 	}
 
-	// init db connection
+	// Start metrics server.
+	metrics.Serve(context.Background(), ctx)
+
+	// Init db connection.
 	var ormFactory database.OrmFactory
 	if ormFactory, err = database.NewOrmFactory(cfg.DBConfig); err != nil {
 		log.Crit("failed to init db connection", "err", err)

bridge/cmd/app/app_test.go

@@ -10,10 +10,10 @@ import (
 )
 
 func TestRunBridge(t *testing.T) {
-	bridge := cmd.NewCmd(t, "bridge-test", "--version")
+	bridge := cmd.NewCmd("bridge-test", "--version")
 	defer bridge.WaitExit()
 
 	// wait result
-	bridge.ExpectWithTimeout(true, time.Second*3, fmt.Sprintf("bridge version %s", version.Version))
+	bridge.ExpectWithTimeout(t, true, time.Second*3, fmt.Sprintf("bridge version %s", version.Version))
 	bridge.RunApp(nil)
 }

bridge/config.json

@@ -1,49 +1,71 @@
 {
   "l1_config": {
-    "confirmations": 6,
+    "confirmations": "0x6",
     "endpoint": "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
     "l1_messenger_address": "0x0000000000000000000000000000000000000000",
-    "rollup_contract_address": "0x0000000000000000000000000000000000000000",
+    "l1_message_queue_address": "0x0000000000000000000000000000000000000000",
+    "scroll_chain_address": "0x0000000000000000000000000000000000000000",
     "start_height": 0,
     "relayer_config": {
       "messenger_contract_address": "0x0000000000000000000000000000000000000000",
+      "gas_price_oracle_address": "0x0000000000000000000000000000000000000000",
       "sender_config": {
         "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc",
-        "check_pending_time": 3,
+        "check_pending_time": 2,
+        "check_balance_time": 100,
         "escalate_blocks": 100,
-        "confirmations": 1,
+        "confirmations": "0x1",
         "escalate_multiple_num": 11,
         "escalate_multiple_den": 10,
         "max_gas_price": 10000000000,
-        "tx_type": "AccessListTx",
+        "tx_type": "LegacyTx",
         "min_balance": 100000000000000000000
       },
+      "gas_oracle_config": {
+        "min_gas_price": 0,
+        "gas_price_diff": 50000
+      },
+      "finalize_batch_interval_sec": 0,
       "message_sender_private_keys": [
         "1212121212121212121212121212121212121212121212121212121212121212"
+      ],
+      "gas_oracle_sender_private_keys": [
+        "1212121212121212121212121212121212121212121212121212121212121212"
       ]
     }
   },
   "l2_config": {
-    "confirmations": 1,
+    "confirmations": "0x1",
     "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc",
     "l2_messenger_address": "0x0000000000000000000000000000000000000000",
+    "l2_message_queue_address": "0x0000000000000000000000000000000000000000",
     "relayer_config": {
       "rollup_contract_address": "0x0000000000000000000000000000000000000000",
       "messenger_contract_address": "0x0000000000000000000000000000000000000000",
+      "gas_price_oracle_address": "0x0000000000000000000000000000000000000000",
       "sender_config": {
         "endpoint": "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
         "check_pending_time": 10,
+        "check_balance_time": 100,
         "escalate_blocks": 100,
-        "confirmations": 6,
+        "confirmations": "0x6",
         "escalate_multiple_num": 11,
         "escalate_multiple_den": 10,
         "max_gas_price": 10000000000,
-        "tx_type": "DynamicFeeTx",
+        "tx_type": "LegacyTx",
         "min_balance": 100000000000000000000
       },
+      "gas_oracle_config": {
+        "min_gas_price": 0,
+        "gas_price_diff": 50000
+      },
+      "finalize_batch_interval_sec": 0,
       "message_sender_private_keys": [
         "1212121212121212121212121212121212121212121212121212121212121212"
       ],
+      "gas_oracle_sender_private_keys": [
+        "1212121212121212121212121212121212121212121212121212121212121212"
+      ],
       "rollup_sender_private_keys": [
         "1212121212121212121212121212121212121212121212121212121212121212"
       ]
@@ -51,17 +73,21 @@
     "batch_proposer_config": {
       "proof_generation_freq": 1,
       "batch_gas_threshold": 3000000,
-      "batch_tx_num_threshold": 135,
+      "batch_tx_num_threshold": 44,
       "batch_time_sec": 300,
+      "batch_commit_time_sec": 1200,
       "batch_blocks_limit": 100,
-      "skipped_opcodes": [
-        "CREATE2",
-        "DELEGATECALL"
-      ]
+      "commit_tx_calldata_size_limit": 200000,
+      "public_input_config": {
+        "max_tx_num": 44,
+        "padding_tx_hash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      }
     }
   },
   "db_config": {
     "driver_name": "postgres",
-    "dsn": "postgres://admin:123456@localhost/test?sslmode=disable"
+    "dsn": "postgres://admin:123456@localhost/test?sslmode=disable",
+    "maxOpenNum": 200,
+    "maxIdleNum": 20
   }
-}
+}

bridge/config/config_test.go

@@ -16,11 +16,9 @@ func TestConfig(t *testing.T) {
 	cfg, err := config.NewConfig("../config.json")
 	assert.True(t, assert.NoError(t, err), "failed to load config")
 
-	assert.True(t, len(cfg.L2Config.BatchProposerConfig.SkippedOpcodes) > 0)
-
-	assert.True(t, len(cfg.L1Config.RelayerConfig.MessageSenderPrivateKeys) > 0)
-	assert.True(t, len(cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys) > 0)
-	assert.True(t, len(cfg.L2Config.RelayerConfig.RollupSenderPrivateKeys) > 0)
+	assert.Equal(t, 1, len(cfg.L1Config.RelayerConfig.MessageSenderPrivateKeys))
+	assert.Equal(t, 1, len(cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys))
+	assert.Equal(t, 1, len(cfg.L2Config.RelayerConfig.RollupSenderPrivateKeys))
 
 	data, err := json.Marshal(cfg)
 	assert.NoError(t, err)

bridge/config/l1_config.go

@@ -1,19 +1,24 @@
 package config
 
-import "github.com/scroll-tech/go-ethereum/common"
+import (
+	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/rpc"
+)
 
 // L1Config loads l1eth configuration items.
 type L1Config struct {
 	// Confirmations block height confirmations number.
-	Confirmations uint64 `json:"confirmations"`
+	Confirmations rpc.BlockNumber `json:"confirmations"`
 	// l1 eth node url.
 	Endpoint string `json:"endpoint"`
 	// The start height to sync event from layer 1
 	StartHeight uint64 `json:"start_height"`
-	// The messenger contract address deployed on layer 1 chain.
+	// The L1ScrollMessenger contract address deployed on layer 1 chain.
 	L1MessengerAddress common.Address `json:"l1_messenger_address"`
-	// The rollup contract address deployed on layer 1 chain.
-	RollupContractAddress common.Address `json:"rollup_contract_address"`
+	// The L1MessageQueue contract address deployed on layer 1 chain.
+	L1MessageQueueAddress common.Address `json:"l1_message_queue_address"`
+	// The ScrollChain contract address deployed on layer 1 chain.
+	ScrollChainContractAddress common.Address `json:"scroll_chain_address"`
 	// The relayer config
 	RelayerConfig *RelayerConfig `json:"relayer_config"`
 }

bridge/config/l2_config.go

@@ -1,19 +1,23 @@
 package config
 
 import (
-	"encoding/json"
+	"github.com/scroll-tech/go-ethereum/rpc"
 
 	"github.com/scroll-tech/go-ethereum/common"
+
+	"scroll-tech/common/types"
 )
 
 // L2Config loads l2geth configuration items.
 type L2Config struct {
 	// Confirmations block height confirmations number.
-	Confirmations uint64 `json:"confirmations"`
+	Confirmations rpc.BlockNumber `json:"confirmations"`
 	// l2geth node url.
 	Endpoint string `json:"endpoint"`
 	// The messenger contract address deployed on layer 2 chain.
-	L2MessengerAddress common.Address `json:"l2_messenger_address,omitempty"`
+	L2MessengerAddress common.Address `json:"l2_messenger_address"`
+	// The L2MessageQueue contract address deployed on layer 2 chain.
+	L2MessageQueueAddress common.Address `json:"l2_message_queue_address"`
 	// The relayer config
 	RelayerConfig *RelayerConfig `json:"relayer_config"`
 	// The batch_proposer config
@@ -30,44 +34,12 @@ type BatchProposerConfig struct {
 	BatchGasThreshold uint64 `json:"batch_gas_threshold"`
 	// Time waited to generate a batch even if gas_threshold not met
 	BatchTimeSec uint64 `json:"batch_time_sec"`
+	// Time waited to commit batches before the calldata met CommitTxCalldataSizeLimit
+	BatchCommitTimeSec uint64 `json:"batch_commit_time_sec"`
 	// Max number of blocks in a batch
 	BatchBlocksLimit uint64 `json:"batch_blocks_limit"`
-	// Skip generating proof when that opcodes appeared
-	SkippedOpcodes map[string]struct{} `json:"-"`
-}
-
-// batchProposerConfigAlias RelayerConfig alias name
-type batchProposerConfigAlias BatchProposerConfig
-
-// UnmarshalJSON unmarshal BatchProposerConfig config struct.
-func (b *BatchProposerConfig) UnmarshalJSON(input []byte) error {
-	var jsonConfig struct {
-		batchProposerConfigAlias
-		SkippedOpcodes []string `json:"skipped_opcodes,omitempty"`
-	}
-	if err := json.Unmarshal(input, &jsonConfig); err != nil {
-		return err
-	}
-
-	*b = BatchProposerConfig(jsonConfig.batchProposerConfigAlias)
-	b.SkippedOpcodes = make(map[string]struct{}, len(jsonConfig.SkippedOpcodes))
-	for _, opcode := range jsonConfig.SkippedOpcodes {
-		b.SkippedOpcodes[opcode] = struct{}{}
-	}
-	return nil
-}
-
-// MarshalJSON marshal BatchProposerConfig in order to transfer skipOpcodes.
-func (b *BatchProposerConfig) MarshalJSON() ([]byte, error) {
-	jsonConfig := struct {
-		batchProposerConfigAlias
-		SkippedOpcodes []string `json:"skipped_opcodes,omitempty"`
-	}{batchProposerConfigAlias(*b), nil}
-
-	// Load skipOpcodes.
-	for op := range b.SkippedOpcodes {
-		jsonConfig.SkippedOpcodes = append(jsonConfig.SkippedOpcodes, op)
-	}
-
-	return json.Marshal(&jsonConfig)
+	// Commit tx calldata size limit in bytes, target to cap the gas use of commit tx at 2M gas
+	CommitTxCalldataSizeLimit uint64 `json:"commit_tx_calldata_size_limit"`
+	// The public input hash config
+	PublicInputConfig *types.PublicInputHashConfig `json:"public_input_config"`
 }

bridge/config/relayer_config.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/crypto"
+	"github.com/scroll-tech/go-ethereum/rpc"
 )
 
 // SenderConfig The config for transaction sender
@@ -19,7 +20,7 @@ type SenderConfig struct {
 	// The number of blocks to wait to escalate increase gas price of the transaction.
 	EscalateBlocks uint64 `json:"escalate_blocks"`
 	// The gap number between a block be confirmed and the latest block.
-	Confirmations uint64 `json:"confirmations"`
+	Confirmations rpc.BlockNumber `json:"confirmations"`
 	// The numerator of gas price escalate multiple.
 	EscalateMultipleNum uint64 `json:"escalate_multiple_num"`
 	// The denominator of gas price escalate multiple.
@@ -30,6 +31,8 @@ type SenderConfig struct {
 	TxType string `json:"tx_type"`
 	// The min balance set for check and set balance for sender's accounts.
 	MinBalance *big.Int `json:"min_balance,omitempty"`
+	// The interval (in seconds) to check balance and top up sender's accounts
+	CheckBalanceTime uint64 `json:"check_balance_time"`
 }
 
 // RelayerConfig loads relayer configuration items.
@@ -40,11 +43,28 @@ type RelayerConfig struct {
 	RollupContractAddress common.Address `json:"rollup_contract_address,omitempty"`
 	// MessengerContractAddress store the scroll messenger contract address.
 	MessengerContractAddress common.Address `json:"messenger_contract_address"`
+	// GasPriceOracleContractAddress store the scroll messenger contract address.
+	GasPriceOracleContractAddress common.Address `json:"gas_price_oracle_contract_address"`
 	// sender config
 	SenderConfig *SenderConfig `json:"sender_config"`
+	// gas oracle config
+	GasOracleConfig *GasOracleConfig `json:"gas_oracle_config"`
+	// The interval in which we send finalize batch transactions.
+	FinalizeBatchIntervalSec uint64 `json:"finalize_batch_interval_sec"`
+	// MessageRelayMinGasLimit to avoid OutOfGas error
+	MessageRelayMinGasLimit uint64 `json:"message_relay_min_gas_limit,omitempty"`
 	// The private key of the relayer
-	MessageSenderPrivateKeys []*ecdsa.PrivateKey `json:"-"`
-	RollupSenderPrivateKeys  []*ecdsa.PrivateKey `json:"-"`
+	MessageSenderPrivateKeys   []*ecdsa.PrivateKey `json:"-"`
+	GasOracleSenderPrivateKeys []*ecdsa.PrivateKey `json:"-"`
+	RollupSenderPrivateKeys    []*ecdsa.PrivateKey `json:"-"`
+}
+
+// GasOracleConfig The config for updating gas price oracle.
+type GasOracleConfig struct {
+	// MinGasPrice store the minimum gas price to set.
+	MinGasPrice uint64 `json:"min_gas_price"`
+	// GasPriceDiff store the percentage of gas price difference.
+	GasPriceDiff uint64 `json:"gas_price_diff"`
 }
 
 // relayerConfigAlias RelayerConfig alias name
@@ -55,15 +75,17 @@ func (r *RelayerConfig) UnmarshalJSON(input []byte) error {
 	var jsonConfig struct {
 		relayerConfigAlias
 		// The private key of the relayer
-		MessageSenderPrivateKeys []string `json:"message_sender_private_keys"`
-		RollupSenderPrivateKeys  []string `json:"rollup_sender_private_keys,omitempty"`
+		MessageSenderPrivateKeys   []string `json:"message_sender_private_keys"`
+		GasOracleSenderPrivateKeys []string `json:"gas_oracle_sender_private_keys"`
+		RollupSenderPrivateKeys    []string `json:"rollup_sender_private_keys,omitempty"`
 	}
 	if err := json.Unmarshal(input, &jsonConfig); err != nil {
 		return err
 	}
 
-	// Get messenger private key list.
 	*r = RelayerConfig(jsonConfig.relayerConfigAlias)
+
+	// Get messenger private key list.
 	for _, privStr := range jsonConfig.MessageSenderPrivateKeys {
 		priv, err := crypto.ToECDSA(common.FromHex(privStr))
 		if err != nil {
@@ -72,6 +94,15 @@ func (r *RelayerConfig) UnmarshalJSON(input []byte) error {
 		r.MessageSenderPrivateKeys = append(r.MessageSenderPrivateKeys, priv)
 	}
 
+	// Get gas oracle private key list.
+	for _, privStr := range jsonConfig.GasOracleSenderPrivateKeys {
+		priv, err := crypto.ToECDSA(common.FromHex(privStr))
+		if err != nil {
+			return fmt.Errorf("incorrect private_key_list format, err: %v", err)
+		}
+		r.GasOracleSenderPrivateKeys = append(r.GasOracleSenderPrivateKeys, priv)
+	}
+
 	// Get rollup private key
 	for _, privStr := range jsonConfig.RollupSenderPrivateKeys {
 		priv, err := crypto.ToECDSA(common.FromHex(privStr))
@@ -89,15 +120,21 @@ func (r *RelayerConfig) MarshalJSON() ([]byte, error) {
 	jsonConfig := struct {
 		relayerConfigAlias
 		// The private key of the relayer
-		MessageSenderPrivateKeys []string `json:"message_sender_private_keys"`
-		RollupSenderPrivateKeys  []string `json:"rollup_sender_private_keys,omitempty"`
-	}{relayerConfigAlias(*r), nil, nil}
+		MessageSenderPrivateKeys   []string `json:"message_sender_private_keys"`
+		GasOracleSenderPrivateKeys []string `json:"gas_oracle_sender_private_keys,omitempty"`
+		RollupSenderPrivateKeys    []string `json:"rollup_sender_private_keys,omitempty"`
+	}{relayerConfigAlias(*r), nil, nil, nil}
 
 	// Transfer message sender private keys to hex type.
 	for _, priv := range r.MessageSenderPrivateKeys {
 		jsonConfig.MessageSenderPrivateKeys = append(jsonConfig.MessageSenderPrivateKeys, common.Bytes2Hex(crypto.FromECDSA(priv)))
 	}
 
+	// Transfer rollup sender private keys to hex type.
+	for _, priv := range r.GasOracleSenderPrivateKeys {
+		jsonConfig.GasOracleSenderPrivateKeys = append(jsonConfig.GasOracleSenderPrivateKeys, common.Bytes2Hex(crypto.FromECDSA(priv)))
+	}
+
 	// Transfer rollup sender private keys to hex type.
 	for _, priv := range r.RollupSenderPrivateKeys {
 		jsonConfig.RollupSenderPrivateKeys = append(jsonConfig.RollupSenderPrivateKeys, common.Bytes2Hex(crypto.FromECDSA(priv)))

bridge/go.mod

@@ -3,43 +3,40 @@ module scroll-tech/bridge
 go 1.18
 
 require (
-	github.com/iden3/go-iden3-crypto v0.0.13
 	github.com/orcaman/concurrent-map v1.0.0
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20230112091133-2891916a0f81
-	github.com/stretchr/testify v1.8.0
-	github.com/urfave/cli/v2 v2.10.2
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230321020420-127af384ed04
+	github.com/stretchr/testify v1.8.2
+	github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa
 	golang.org/x/sync v0.1.0
 	modernc.org/mathutil v1.4.1
 )
 
 require (
 	github.com/btcsuite/btcd v0.20.1-beta // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set v1.8.0 // indirect
-	github.com/ethereum/go-ethereum v1.10.26 // indirect
+	github.com/ethereum/go-ethereum v1.11.4 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/go-stack/stack v1.8.1 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/holiman/uint256 v1.2.0 // indirect
-	github.com/kr/pretty v0.3.0 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/iden3/go-iden3-crypto v0.0.14 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
 	github.com/rjeczalik/notify v0.9.1 // indirect
-	github.com/rogpeppe/go-internal v1.8.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/scroll-tech/zktrie v0.3.1 // indirect
+	github.com/scroll-tech/zktrie v0.5.2 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
 	github.com/tklauser/numcpus v0.4.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/crypto v0.5.0 // indirect
-	golang.org/x/sys v0.4.0 // indirect
+	golang.org/x/crypto v0.7.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

bridge/go.sum

@@ -1,63 +1,5 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.43.0/go.mod h1:BOSR3VbTLkk6FDC/TcffxP4NF/FFBGA5ku+jvKOP7pg=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.51.0/go.mod h1:hWtGJ6gnXH+KgDv+V0zFGDvpi07n3z8ZNj3T1RW0Gcw=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigtable v1.2.0/go.mod h1:JcVAOl45lrTmQfLj7T6TxyMzIN/3FGGcFm+2xVAli2o=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4=
-github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc=
-github.com/Azure/azure-storage-blob-go v0.7.0/go.mod h1:f9YQKtsG1nMisotuTPpO0tjNuEjKRYAcJU8/ydDI++4=
-github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
-github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
-github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc=
-github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
-github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g=
-github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM=
-github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
-github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o=
-github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
-github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
-github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
-github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0=
-github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo=
-github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y=
-github.com/aws/aws-sdk-go-v2/credentials v1.1.1/go.mod h1:mM2iIjwl7LULWtS6JCACyInboHirisUUdkBPoTHMOUo=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.2/go.mod h1:3hGg3PpiEjHnrkrlasTfxFqUsZ2GCk/fMUn4CbKgSkM=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.2/go.mod h1:45MfaXZ0cNbeuT0KQ1XJylq8A6+OpVV2E5kvY/Kq+u8=
-github.com/aws/aws-sdk-go-v2/service/route53 v1.1.1/go.mod h1:rLiOUrPLW/Er5kRcQ7NkwbjlijluLsrIbu/iyl35RO4=
-github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbEWkXs7QRTQpCLGaKIprQW0=
-github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM=
-github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
-github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/btcsuite/btcd v0.20.1-beta h1:Ik4hyJqN8Jfyv3S4AGBOmyouMsYE3EdYODkMbQjwPGw=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
@@ -67,604 +9,127 @@ github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVa
 github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
 github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
 github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
-github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
-github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
-github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304=
-github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ=
-github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
-github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg=
 github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dchest/blake512 v1.0.0/go.mod h1:FV1x7xPPLWukZlpDpWQ88rF/SFwZ5qbskrzhLMB92JI=
-github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ=
 github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=
 github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
-github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M=
-github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw=
-github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ=
-github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
-github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk=
-github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
-github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts=
 github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
-github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/ethereum/go-ethereum v1.10.13/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw=
-github.com/ethereum/go-ethereum v1.10.26 h1:i/7d9RBBwiXCEuyduBQzJw/mKmnvzsN14jqBmytw72s=
-github.com/ethereum/go-ethereum v1.10.26/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg=
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/ethereum/go-ethereum v1.11.4 h1:KG81SnUHXWk8LJB3mBcHg/E2yLvXoiPmRMCIRxgx3cE=
+github.com/ethereum/go-ethereum v1.11.4/go.mod h1:it7x0DWnTDMfVFdXcU6Ti4KEFQynLHVRarcSlPr0HBo=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
-github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
-github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI=
-github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
-github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
-github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
-github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24=
-github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
-github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
+github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
-github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc=
 github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
-github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs=
-github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
-github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
 github.com/holiman/uint256 v1.2.0 h1:gpSYcPLWGv4sG43I2mVLiDZCNDh/EpGjSk8tmtxitHM=
 github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/huin/goupnp v1.0.2/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSamkM=
 github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ=
-github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/iden3/go-iden3-crypto v0.0.12/go.mod h1:swXIv0HFbJKobbQBtsB50G7IHr6PbTowutSew/iBEoo=
-github.com/iden3/go-iden3-crypto v0.0.13 h1:ixWRiaqDULNyIDdOWz2QQJG5t4PpNHkQk2P6GV94cok=
-github.com/iden3/go-iden3-crypto v0.0.13/go.mod h1:swXIv0HFbJKobbQBtsB50G7IHr6PbTowutSew/iBEoo=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY=
-github.com/influxdata/influxdb v1.8.3/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI=
-github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8=
-github.com/influxdata/influxql v1.1.1-0.20200828144457-65d3ef77d385/go.mod h1:gHp9y86a/pxhjJ+zMjNXiQAA197Xk9wLxaz+fGG+kWk=
-github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e/go.mod h1:4kt73NQhadE3daL3WhR5EJ/J2ocX0PZzwxQ0gXJ7oFE=
-github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo=
-github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo=
-github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19ybifQhZoQNF5D8=
-github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bSgUQ7q5ZLSO+bKBGqJiCBGAl+9DxyW63zLTujjUlOE=
-github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0=
-github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po=
-github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
+github.com/iden3/go-iden3-crypto v0.0.14 h1:HQnFchY735JRNQxof6n/Vbyon4owj4+Ku+LNAamWV6c=
+github.com/iden3/go-iden3-crypto v0.0.14/go.mod h1:dLpM4vEPJ3nDHzhWFXDjzkn1qHoBeOT/3UEhXsEsP3E=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
-github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
-github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0=
-github.com/karalabe/usb v0.0.0-20211005121534-4c5740d64559/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
-github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg=
-github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
-github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
-github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
-github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
-github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc=
-github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc=
-github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
-github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A=
-github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
-github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
-github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
-github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
-github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
-github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/orcaman/concurrent-map v1.0.0 h1:I/2A2XPCb4IuQWcQhBhSwGfiuybl/J0ev9HDbW65HOY=
 github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
-github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE=
-github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
-github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
-github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
-github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5/go.mod h1:eCbImbZ95eXtAUIbLAuAVnBnwf83mjf6QIVH8SHYwqQ=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA=
-github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc=
 github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeCE=
 github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
-github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
-github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230112091133-2891916a0f81 h1:Gm18RZ9WTR2Dupumr60E2m1Noe+l9/lITt6iRyxxZoc=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230112091133-2891916a0f81/go.mod h1:jurIpDQ0hqtp9//xxeWzr8X9KMP/+TYn+vz3K1wZrv0=
-github.com/scroll-tech/zktrie v0.3.0/go.mod h1:CuJFlG1/soTJJBAySxCZgTF7oPvd5qF6utHOEciC43Q=
-github.com/scroll-tech/zktrie v0.3.1 h1:HlR+fMBdjXX1/7cUMqpUgGEhGy/3vN1JpwQ0ovg/Ys8=
-github.com/scroll-tech/zktrie v0.3.1/go.mod h1:CuJFlG1/soTJJBAySxCZgTF7oPvd5qF6utHOEciC43Q=
-github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=
-github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=
-github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230321020420-127af384ed04 h1:PpI31kaBVm6+7sZtyK03Ex0QIg3P821Ktae0FHFh7IM=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230321020420-127af384ed04/go.mod h1:jH8c08L9K8Hieaf0r/ur2P/cpesn4dFhmLm2Mmoi8kI=
+github.com/scroll-tech/zktrie v0.5.2 h1:U34jPXMLGOlRHfdvYp5VVgOcC0RuPeJmcS3bWotCWiY=
+github.com/scroll-tech/zktrie v0.5.2/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg=
-github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
+github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
-github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
-github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
-github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI=
 github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
 github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
-github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM=
 github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
 github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
-github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef h1:wHSqTBrZW24CsNJDfeh9Ex6Pm0Rcpc7qrgKBiL44vF4=
-github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs=
-github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
-github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y=
-github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo=
-github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
-github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
-github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4=
-github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
+github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8=
+github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa h1:5SqCsI/2Qya2bCzK15ozrqo2sZxkh0FHynJZOTVoV6Q=
+github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
-go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
-golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
-golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
+golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
-golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
-gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
-gonum.org/v1/gonum v0.6.0/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU=
-gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
-gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
-gonum.org/v1/plot v0.0.0-20190515093506-e2840ee46a6b/go.mod h1:Wt8AAjI+ypCyYX3nZBvf6cAIx93T+c/OS2HFAYskSZc=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190716160619-c506a9f90610/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200108215221-bd8f9a0ef82f/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
+golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
-gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0=
-gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
 modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8=
 modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

bridge/l1/backend.go

@@ -26,12 +26,12 @@ func New(ctx context.Context, cfg *config.L1Config, orm database.OrmFactory) (*B
 		return nil, err
 	}
 
-	relayer, err := NewLayer1Relayer(ctx, client, int64(cfg.Confirmations), orm, cfg.RelayerConfig)
+	relayer, err := NewLayer1Relayer(ctx, orm, cfg.RelayerConfig)
 	if err != nil {
 		return nil, err
 	}
 
-	watcher := NewWatcher(ctx, client, cfg.StartHeight, cfg.Confirmations, cfg.L1MessengerAddress, cfg.RollupContractAddress, orm)
+	watcher := NewWatcher(ctx, client, cfg.StartHeight, cfg.Confirmations, cfg.L1MessengerAddress, cfg.L1MessageQueueAddress, cfg.ScrollChainContractAddress, orm)
 
 	return &Backend{
 		cfg:     cfg,

bridge/l1/l1_test.go

@@ -15,42 +15,27 @@ var (
 	cfg *config.Config
 
 	// docker consider handler.
-	l1gethImg docker.ImgInstance
-	l2gethImg docker.ImgInstance
-	dbImg     docker.ImgInstance
+	base *docker.App
 )
 
+func TestMain(m *testing.M) {
+	base = docker.NewDockerApp()
+
+	m.Run()
+
+	base.Free()
+}
+
 func setupEnv(t *testing.T) {
 	// Load config.
 	var err error
 	cfg, err = config.NewConfig("../config.json")
 	assert.NoError(t, err)
+	base.RunImages(t)
 
-	// Create l1geth container.
-	l1gethImg = docker.NewTestL1Docker(t)
-	cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = l1gethImg.Endpoint()
-	cfg.L1Config.Endpoint = l1gethImg.Endpoint()
-
-	// Create l2geth container.
-	l2gethImg = docker.NewTestL2Docker(t)
-	cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = l2gethImg.Endpoint()
-	cfg.L2Config.Endpoint = l2gethImg.Endpoint()
-
-	// Create db container.
-	dbImg = docker.NewTestDBDocker(t, cfg.DBConfig.DriverName)
-	cfg.DBConfig.DSN = dbImg.Endpoint()
-}
-
-func free(t *testing.T) {
-	if dbImg != nil {
-		assert.NoError(t, dbImg.Stop())
-	}
-	if l1gethImg != nil {
-		assert.NoError(t, l1gethImg.Stop())
-	}
-	if l2gethImg != nil {
-		assert.NoError(t, l2gethImg.Stop())
-	}
+	cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = base.L1GethEndpoint()
+	cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = base.L2GethEndpoint()
+	cfg.DBConfig.DSN = base.DBEndpoint()
 }
 
 func TestL1(t *testing.T) {
@@ -58,8 +43,4 @@ func TestL1(t *testing.T) {
 
 	t.Run("testCreateNewL1Relayer", testCreateNewL1Relayer)
 	t.Run("testStartWatcher", testStartWatcher)
-
-	t.Cleanup(func() {
-		free(t)
-	})
 }

bridge/l1/relayer.go

@@ -11,16 +11,34 @@ import (
 	"github.com/scroll-tech/go-ethereum/accounts/abi"
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/crypto"
-	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
+	geth_metrics "github.com/scroll-tech/go-ethereum/metrics"
 
-	"scroll-tech/database/orm"
+	"scroll-tech/common/types"
+	"scroll-tech/common/utils"
+
+	"scroll-tech/database"
+
+	"scroll-tech/common/metrics"
 
 	bridge_abi "scroll-tech/bridge/abi"
 	"scroll-tech/bridge/config"
 	"scroll-tech/bridge/sender"
 )
 
+var (
+	bridgeL1MsgsRelayedTotalCounter          = geth_metrics.NewRegisteredCounter("bridge/l1/msgs/relayed/total", metrics.ScrollRegistry)
+	bridgeL1MsgsRelayedConfirmedTotalCounter = geth_metrics.NewRegisteredCounter("bridge/l1/msgs/relayed/confirmed/total", metrics.ScrollRegistry)
+)
+
+const (
+	gasPriceDiffPrecision = 1000000
+
+	defaultGasPriceDiff = 50000 // 5%
+
+	defaultMessageRelayMinGasLimit = 130000 // should be enough for both ERC20 and ETH relay
+)
+
 // Layer1Relayer is responsible for
 //  1. fetch pending L1Message from db
 //  2. relay pending message to layer 2 node
@@ -28,51 +46,87 @@ import (
 // Actions are triggered by new head from layer 1 geth node.
 // @todo It's better to be triggered by watcher.
 type Layer1Relayer struct {
-	ctx    context.Context
-	client *ethclient.Client
-	sender *sender.Sender
+	ctx context.Context
 
-	db  orm.L1MessageOrm
+	db  database.OrmFactory
 	cfg *config.RelayerConfig
 
 	// channel used to communicate with transaction sender
-	confirmationCh <-chan *sender.Confirmation
+	messageSender  *sender.Sender
+	messageCh      <-chan *sender.Confirmation
 	l2MessengerABI *abi.ABI
 
+	gasOracleSender *sender.Sender
+	gasOracleCh     <-chan *sender.Confirmation
+	l1GasOracleABI  *abi.ABI
+
+	minGasLimitForMessageRelay uint64
+
+	lastGasPrice uint64
+	minGasPrice  uint64
+	gasPriceDiff uint64
+
 	stopCh chan struct{}
 }
 
 // NewLayer1Relayer will return a new instance of Layer1RelayerClient
-func NewLayer1Relayer(ctx context.Context, ethClient *ethclient.Client, l1ConfirmNum int64, db orm.L1MessageOrm, cfg *config.RelayerConfig) (*Layer1Relayer, error) {
-	l2MessengerABI, err := bridge_abi.L2MessengerMetaData.GetAbi()
+func NewLayer1Relayer(ctx context.Context, db database.OrmFactory, cfg *config.RelayerConfig) (*Layer1Relayer, error) {
+	messageSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.MessageSenderPrivateKeys)
 	if err != nil {
-		log.Warn("new L2MessengerABI failed", "err", err)
+		addr := crypto.PubkeyToAddress(cfg.MessageSenderPrivateKeys[0].PublicKey)
+		log.Error("new MessageSender failed", "main address", addr.String(), "err", err)
 		return nil, err
 	}
 
-	sender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.MessageSenderPrivateKeys)
+	// @todo make sure only one sender is available
+	gasOracleSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.GasOracleSenderPrivateKeys)
 	if err != nil {
-		addr := crypto.PubkeyToAddress(cfg.MessageSenderPrivateKeys[0].PublicKey)
-		log.Error("new sender failed", "main address", addr.String(), "err", err)
+		addr := crypto.PubkeyToAddress(cfg.GasOracleSenderPrivateKeys[0].PublicKey)
+		log.Error("new GasOracleSender failed", "main address", addr.String(), "err", err)
 		return nil, err
 	}
 
+	var minGasPrice uint64
+	var gasPriceDiff uint64
+	if cfg.GasOracleConfig != nil {
+		minGasPrice = cfg.GasOracleConfig.MinGasPrice
+		gasPriceDiff = cfg.GasOracleConfig.GasPriceDiff
+	} else {
+		minGasPrice = 0
+		gasPriceDiff = defaultGasPriceDiff
+	}
+
+	minGasLimitForMessageRelay := uint64(defaultMessageRelayMinGasLimit)
+	if cfg.MessageRelayMinGasLimit != 0 {
+		minGasLimitForMessageRelay = cfg.MessageRelayMinGasLimit
+	}
+
 	return &Layer1Relayer{
-		ctx:            ctx,
-		client:         ethClient,
-		sender:         sender,
-		db:             db,
-		l2MessengerABI: l2MessengerABI,
-		cfg:            cfg,
-		stopCh:         make(chan struct{}),
-		confirmationCh: sender.ConfirmChan(),
+		ctx: ctx,
+		db:  db,
+
+		messageSender:  messageSender,
+		messageCh:      messageSender.ConfirmChan(),
+		l2MessengerABI: bridge_abi.L2ScrollMessengerABI,
+
+		gasOracleSender: gasOracleSender,
+		gasOracleCh:     gasOracleSender.ConfirmChan(),
+		l1GasOracleABI:  bridge_abi.L1GasPriceOracleABI,
+
+		minGasLimitForMessageRelay: minGasLimitForMessageRelay,
+
+		minGasPrice:  minGasPrice,
+		gasPriceDiff: gasPriceDiff,
+
+		cfg:    cfg,
+		stopCh: make(chan struct{}),
 	}, nil
 }
 
 // ProcessSavedEvents relays saved un-processed cross-domain transactions to desired blockchain
 func (r *Layer1Relayer) ProcessSavedEvents() {
 	// msgs are sorted by nonce in increasing order
-	msgs, err := r.db.GetL1MessagesByStatus(orm.MsgPending, 100)
+	msgs, err := r.db.GetL1MessagesByStatus(types.MsgPending, 100)
 	if err != nil {
 		log.Error("Failed to fetch unprocessed L1 messages", "err", err)
 		return
@@ -92,74 +146,127 @@ func (r *Layer1Relayer) ProcessSavedEvents() {
 	}
 }
 
-func (r *Layer1Relayer) processSavedEvent(msg *orm.L1Message) error {
-	// @todo add support to relay multiple messages
-	from := common.HexToAddress(msg.Sender)
-	target := common.HexToAddress(msg.Target)
-	value, ok := big.NewInt(0).SetString(msg.Value, 10)
-	if !ok {
-		// @todo maybe panic?
-		log.Error("Failed to parse message value", "msg.nonce", msg.Nonce, "msg.height", msg.Height)
-		// TODO: need to skip this message by changing its status to MsgError
-	}
-	fee, _ := big.NewInt(0).SetString(msg.Fee, 10)
-	deadline := big.NewInt(int64(msg.Deadline))
-	msgNonce := big.NewInt(int64(msg.Nonce))
+func (r *Layer1Relayer) processSavedEvent(msg *types.L1Message) error {
 	calldata := common.Hex2Bytes(msg.Calldata)
-	data, err := r.l2MessengerABI.Pack("relayMessage", from, target, value, fee, deadline, msgNonce, calldata)
-	if err != nil {
-		log.Error("Failed to pack relayMessage", "msg.nonce", msg.Nonce, "msg.height", msg.Height, "err", err)
-		// TODO: need to skip this message by changing its status to MsgError
-		return err
-	}
 
-	hash, err := r.sender.SendTransaction(msg.MsgHash, &r.cfg.MessengerContractAddress, big.NewInt(0), data)
+	hash, err := r.messageSender.SendTransaction(msg.MsgHash, &r.cfg.MessengerContractAddress, big.NewInt(0), calldata, r.minGasLimitForMessageRelay)
 	if err != nil && err.Error() == "execution reverted: Message expired" {
-		return r.db.UpdateLayer1Status(r.ctx, msg.MsgHash, orm.MsgExpired)
+		return r.db.UpdateLayer1Status(r.ctx, msg.MsgHash, types.MsgExpired)
 	}
 	if err != nil && err.Error() == "execution reverted: Message successfully executed" {
-		return r.db.UpdateLayer1Status(r.ctx, msg.MsgHash, orm.MsgConfirmed)
+		return r.db.UpdateLayer1Status(r.ctx, msg.MsgHash, types.MsgConfirmed)
 	}
 	if err != nil {
 		return err
 	}
+	bridgeL1MsgsRelayedTotalCounter.Inc(1)
 	log.Info("relayMessage to layer2", "msg hash", msg.MsgHash, "tx hash", hash)
 
-	err = r.db.UpdateLayer1StatusAndLayer2Hash(r.ctx, msg.MsgHash, orm.MsgSubmitted, hash.String())
+	err = r.db.UpdateLayer1StatusAndLayer2Hash(r.ctx, msg.MsgHash, types.MsgSubmitted, hash.String())
 	if err != nil {
 		log.Error("UpdateLayer1StatusAndLayer2Hash failed", "msg.msgHash", msg.MsgHash, "msg.height", msg.Height, "err", err)
 	}
 	return err
 }
 
+// ProcessGasPriceOracle imports gas price to layer2
+func (r *Layer1Relayer) ProcessGasPriceOracle() {
+	latestBlockHeight, err := r.db.GetLatestL1BlockHeight()
+	if err != nil {
+		log.Warn("Failed to fetch latest L1 block height from db", "err", err)
+		return
+	}
+
+	blocks, err := r.db.GetL1BlockInfos(map[string]interface{}{
+		"number": latestBlockHeight,
+	})
+	if err != nil {
+		log.Error("Failed to GetL1BlockInfos from db", "height", latestBlockHeight, "err", err)
+		return
+	}
+	if len(blocks) != 1 {
+		log.Error("Block not exist", "height", latestBlockHeight)
+		return
+	}
+	block := blocks[0]
+
+	if block.GasOracleStatus == types.GasOraclePending {
+		expectedDelta := r.lastGasPrice * r.gasPriceDiff / gasPriceDiffPrecision
+		// last is undefine or (block.BaseFee >= minGasPrice && exceed diff)
+		if r.lastGasPrice == 0 || (block.BaseFee >= r.minGasPrice && (block.BaseFee >= r.lastGasPrice+expectedDelta || block.BaseFee <= r.lastGasPrice-expectedDelta)) {
+			baseFee := big.NewInt(int64(block.BaseFee))
+			data, err := r.l1GasOracleABI.Pack("setL1BaseFee", baseFee)
+			if err != nil {
+				log.Error("Failed to pack setL1BaseFee", "block.Hash", block.Hash, "block.Height", block.Number, "block.BaseFee", block.BaseFee, "err", err)
+				return
+			}
+
+			hash, err := r.gasOracleSender.SendTransaction(block.Hash, &r.cfg.GasPriceOracleContractAddress, big.NewInt(0), data, 0)
+			if err != nil {
+				if !errors.Is(err, sender.ErrNoAvailableAccount) {
+					log.Error("Failed to send setL1BaseFee tx to layer2 ", "block.Hash", block.Hash, "block.Height", block.Number, "err", err)
+				}
+				return
+			}
+
+			err = r.db.UpdateL1GasOracleStatusAndOracleTxHash(r.ctx, block.Hash, types.GasOracleImporting, hash.String())
+			if err != nil {
+				log.Error("UpdateGasOracleStatusAndOracleTxHash failed", "block.Hash", block.Hash, "block.Height", block.Number, "err", err)
+				return
+			}
+			r.lastGasPrice = block.BaseFee
+			log.Info("Update l1 base fee", "txHash", hash.String(), "baseFee", baseFee)
+		}
+	}
+}
+
 // Start the relayer process
 func (r *Layer1Relayer) Start() {
 	go func() {
-		// trigger by timer
-		ticker := time.NewTicker(3 * time.Second)
-		defer ticker.Stop()
+		ctx, cancel := context.WithCancel(r.ctx)
 
-		for {
-			select {
-			case <-ticker.C:
-				// number, err := r.client.BlockNumber(r.ctx)
-				// log.Info("receive header", "height", number)
-				r.ProcessSavedEvents()
-			case cfm := <-r.confirmationCh:
-				if !cfm.IsSuccessful {
-					log.Warn("transaction confirmed but failed in layer2", "confirmation", cfm)
-				} else {
-					// @todo handle db error
-					err := r.db.UpdateLayer1StatusAndLayer2Hash(r.ctx, cfm.ID, orm.MsgConfirmed, cfm.TxHash.String())
-					if err != nil {
-						log.Warn("UpdateLayer1StatusAndLayer2Hash failed", "err", err)
+		go utils.Loop(ctx, 2*time.Second, r.ProcessSavedEvents)
+		go utils.Loop(ctx, 2*time.Second, r.ProcessGasPriceOracle)
+
+		go func(ctx context.Context) {
+			for {
+				select {
+				case <-ctx.Done():
+					return
+				case cfm := <-r.messageCh:
+					bridgeL1MsgsRelayedConfirmedTotalCounter.Inc(1)
+					if !cfm.IsSuccessful {
+						log.Warn("transaction confirmed but failed in layer2", "confirmation", cfm)
+					} else {
+						// @todo handle db error
+						err := r.db.UpdateLayer1StatusAndLayer2Hash(r.ctx, cfm.ID, types.MsgConfirmed, cfm.TxHash.String())
+						if err != nil {
+							log.Warn("UpdateLayer1StatusAndLayer2Hash failed", "err", err)
+						}
+						log.Info("transaction confirmed in layer2", "confirmation", cfm)
+					}
+				case cfm := <-r.gasOracleCh:
+					if !cfm.IsSuccessful {
+						// @discuss: maybe make it pending again?
+						err := r.db.UpdateL1GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleFailed, cfm.TxHash.String())
+						if err != nil {
+							log.Warn("UpdateL1GasOracleStatusAndOracleTxHash failed", "err", err)
+						}
+						log.Warn("transaction confirmed but failed in layer2", "confirmation", cfm)
+					} else {
+						// @todo handle db error
+						err := r.db.UpdateL1GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleImported, cfm.TxHash.String())
+						if err != nil {
+							log.Warn("UpdateGasOracleStatusAndOracleTxHash failed", "err", err)
+						}
+						log.Info("transaction confirmed in layer2", "confirmation", cfm)
 					}
-					log.Info("transaction confirmed in layer2", "confirmation", cfm)
 				}
-			case <-r.stopCh:
-				return
 			}
-		}
+		}(ctx)
+
+		<-r.stopCh
+		cancel()
 	}()
 }
 

bridge/l1/relayer_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"testing"
 
-	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/stretchr/testify/assert"
 
 	"scroll-tech/database/migrate"
@@ -20,10 +19,7 @@ func testCreateNewL1Relayer(t *testing.T) {
 	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
 	defer db.Close()
 
-	client, err := ethclient.Dial(l1gethImg.Endpoint())
-	assert.NoError(t, err)
-
-	relayer, err := NewLayer1Relayer(context.Background(), client, 1, db, cfg.L2Config.RelayerConfig)
+	relayer, err := NewLayer1Relayer(context.Background(), db, cfg.L2Config.RelayerConfig)
 	assert.NoError(t, err)
 	defer relayer.Stop()
 

bridge/l1/watcher.go

@@ -8,17 +8,31 @@ import (
 	geth "github.com/scroll-tech/go-ethereum"
 	"github.com/scroll-tech/go-ethereum/accounts/abi"
 	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/core/types"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/crypto"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
+	geth_metrics "github.com/scroll-tech/go-ethereum/metrics"
+	"github.com/scroll-tech/go-ethereum/rpc"
 
+	"scroll-tech/common/metrics"
+	"scroll-tech/common/types"
 	"scroll-tech/database"
-	"scroll-tech/database/orm"
+
+	cutil "scroll-tech/common/utils"
 
 	bridge_abi "scroll-tech/bridge/abi"
 	"scroll-tech/bridge/utils"
 )
 
+var (
+	bridgeL1MsgsSyncHeightGauge = geth_metrics.NewRegisteredGauge("bridge/l1/msgs/sync/height", metrics.ScrollRegistry)
+
+	bridgeL1MsgsSentEventsTotalCounter    = geth_metrics.NewRegisteredCounter("bridge/l1/msgs/sent/events/total", metrics.ScrollRegistry)
+	bridgeL1MsgsRelayedEventsTotalCounter = geth_metrics.NewRegisteredCounter("bridge/l1/msgs/relayed/events/total", metrics.ScrollRegistry)
+	bridgeL1MsgsRollupEventsTotalCounter  = geth_metrics.NewRegisteredCounter("bridge/l1/msgs/rollup/events/total", metrics.ScrollRegistry)
+)
+
 type relayedMessage struct {
 	msgHash      common.Hash
 	txHash       common.Hash
@@ -26,9 +40,9 @@ type relayedMessage struct {
 }
 
 type rollupEvent struct {
-	batchID common.Hash
-	txHash  common.Hash
-	status  orm.RollupStatus
+	batchHash common.Hash
+	txHash    common.Hash
+	status    types.RollupStatus
 }
 
 // Watcher will listen for smart contract events from Eth L1.
@@ -38,22 +52,28 @@ type Watcher struct {
 	db     database.OrmFactory
 
 	// The number of new blocks to wait for a block to be confirmed
-	confirmations    uint64
+	confirmations rpc.BlockNumber
+
 	messengerAddress common.Address
 	messengerABI     *abi.ABI
 
-	rollupAddress common.Address
-	rollupABI     *abi.ABI
+	messageQueueAddress common.Address
+	messageQueueABI     *abi.ABI
+
+	scrollChainAddress common.Address
+	scrollChainABI     *abi.ABI
 
 	// The height of the block that the watcher has retrieved event logs
 	processedMsgHeight uint64
+	// The height of the block that the watcher has retrieved header rlp
+	processedBlockHeight uint64
 
-	stop chan bool
+	stopCh chan bool
 }
 
 // NewWatcher returns a new instance of Watcher. The instance will be not fully prepared,
 // and still needs to be finalized and ran by calling `watcher.Start`.
-func NewWatcher(ctx context.Context, client *ethclient.Client, startHeight uint64, confirmations uint64, messengerAddress common.Address, rollupAddress common.Address, db database.OrmFactory) *Watcher {
+func NewWatcher(ctx context.Context, client *ethclient.Client, startHeight uint64, confirmations rpc.BlockNumber, messengerAddress, messageQueueAddress, scrollChainAddress common.Address, db database.OrmFactory) *Watcher {
 	savedHeight, err := db.GetLayer1LatestWatchedHeight()
 	if err != nil {
 		log.Warn("Failed to fetch height from db", "err", err)
@@ -63,54 +83,123 @@ func NewWatcher(ctx context.Context, client *ethclient.Client, startHeight uint6
 		savedHeight = int64(startHeight)
 	}
 
-	stop := make(chan bool)
+	savedL1BlockHeight, err := db.GetLatestL1BlockHeight()
+	if err != nil {
+		log.Warn("Failed to fetch latest L1 block height from db", "err", err)
+		savedL1BlockHeight = 0
+	}
+	if savedL1BlockHeight < startHeight {
+		savedL1BlockHeight = startHeight
+	}
+
+	stopCh := make(chan bool)
 
 	return &Watcher{
-		ctx:                ctx,
-		client:             client,
-		db:                 db,
-		confirmations:      confirmations,
-		messengerAddress:   messengerAddress,
-		messengerABI:       bridge_abi.L1MessengerMetaABI,
-		rollupAddress:      rollupAddress,
-		rollupABI:          bridge_abi.RollupMetaABI,
-		processedMsgHeight: uint64(savedHeight),
-		stop:               stop,
+		ctx:           ctx,
+		client:        client,
+		db:            db,
+		confirmations: confirmations,
+
+		messengerAddress: messengerAddress,
+		messengerABI:     bridge_abi.L1ScrollMessengerABI,
+
+		messageQueueAddress: messageQueueAddress,
+		messageQueueABI:     bridge_abi.L1MessageQueueABI,
+
+		scrollChainAddress: scrollChainAddress,
+		scrollChainABI:     bridge_abi.ScrollChainABI,
+
+		processedMsgHeight:   uint64(savedHeight),
+		processedBlockHeight: savedL1BlockHeight,
+		stopCh:               stopCh,
 	}
 }
 
 // Start the Watcher module.
 func (w *Watcher) Start() {
 	go func() {
-		ticker := time.NewTicker(10 * time.Second)
-		defer ticker.Stop()
+		ctx, cancel := context.WithCancel(w.ctx)
 
-		for ; true; <-ticker.C {
-			select {
-			case <-w.stop:
-				return
-
-			default:
-				blockNumber, err := w.client.BlockNumber(w.ctx)
-				if err != nil {
-					log.Error("Failed to get block number", "err", err)
-					continue
+		go cutil.LoopWithContext(ctx, 2*time.Second, func(subCtx context.Context) {
+			number, err := utils.GetLatestConfirmedBlockNumber(subCtx, w.client, w.confirmations)
+			if err != nil {
+				log.Error("failed to get block number", "err", err)
+			} else {
+				if err := w.FetchBlockHeader(number); err != nil {
+					log.Error("Failed to fetch L1 block header", "lastest", number, "err", err)
 				}
-				if err := w.FetchContractEvent(blockNumber); err != nil {
+			}
+		})
+
+		go cutil.LoopWithContext(ctx, 2*time.Second, func(subCtx context.Context) {
+			number, err := utils.GetLatestConfirmedBlockNumber(subCtx, w.client, w.confirmations)
+			if err != nil {
+				log.Error("failed to get block number", "err", err)
+			} else {
+				if err := w.FetchContractEvent(number); err != nil {
 					log.Error("Failed to fetch bridge contract", "err", err)
 				}
 			}
-		}
+		})
+
+		<-w.stopCh
+		cancel()
 	}()
 }
 
 // Stop the Watcher module, for a graceful shutdown.
 func (w *Watcher) Stop() {
-	w.stop <- true
+	w.stopCh <- true
 }
 
 const contractEventsBlocksFetchLimit = int64(10)
 
+// FetchBlockHeader pull latest L1 blocks and save in DB
+func (w *Watcher) FetchBlockHeader(blockHeight uint64) error {
+	fromBlock := int64(w.processedBlockHeight) + 1
+	toBlock := int64(blockHeight)
+	if toBlock < fromBlock {
+		return nil
+	}
+	if toBlock > fromBlock+contractEventsBlocksFetchLimit {
+		toBlock = fromBlock + contractEventsBlocksFetchLimit - 1
+	}
+
+	var blocks []*types.L1BlockInfo
+	var err error
+	height := fromBlock
+	for ; height <= toBlock; height++ {
+		var block *geth_types.Header
+		block, err = w.client.HeaderByNumber(w.ctx, big.NewInt(height))
+		if err != nil {
+			log.Warn("Failed to get block", "height", height, "err", err)
+			break
+		}
+		blocks = append(blocks, &types.L1BlockInfo{
+			Number:  uint64(height),
+			Hash:    block.Hash().String(),
+			BaseFee: block.BaseFee.Uint64(),
+		})
+	}
+
+	// failed at first block, return with the error
+	if height == fromBlock {
+		return err
+	}
+	toBlock = height - 1
+
+	// insert succeed blocks
+	err = w.db.InsertL1Blocks(w.ctx, blocks)
+	if err != nil {
+		log.Warn("Failed to insert L1 block to db", "fromBlock", fromBlock, "toBlock", toBlock, "err", err)
+		return err
+	}
+
+	// update processed height
+	w.processedBlockHeight = uint64(toBlock)
+	return nil
+}
+
 // FetchContractEvent pull latest event logs from given contract address and save in DB
 func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 	defer func() {
@@ -118,7 +207,7 @@ func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 	}()
 
 	fromBlock := int64(w.processedMsgHeight) + 1
-	toBlock := int64(blockHeight) - int64(w.confirmations)
+	toBlock := int64(blockHeight)
 
 	for from := fromBlock; from <= toBlock; from += contractEventsBlocksFetchLimit {
 		to := from + contractEventsBlocksFetchLimit - 1
@@ -133,16 +222,17 @@ func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 			ToBlock:   big.NewInt(to),   // inclusive
 			Addresses: []common.Address{
 				w.messengerAddress,
-				w.rollupAddress,
+				w.scrollChainAddress,
+				w.messageQueueAddress,
 			},
 			Topics: make([][]common.Hash, 1),
 		}
 		query.Topics[0] = make([]common.Hash, 5)
-		query.Topics[0][0] = common.HexToHash(bridge_abi.SentMessageEventSignature)
-		query.Topics[0][1] = common.HexToHash(bridge_abi.RelayedMessageEventSignature)
-		query.Topics[0][2] = common.HexToHash(bridge_abi.FailedRelayedMessageEventSignature)
-		query.Topics[0][3] = common.HexToHash(bridge_abi.CommitBatchEventSignature)
-		query.Topics[0][4] = common.HexToHash(bridge_abi.FinalizedBatchEventSignature)
+		query.Topics[0][0] = bridge_abi.L1QueueTransactionEventSignature
+		query.Topics[0][1] = bridge_abi.L1RelayedMessageEventSignature
+		query.Topics[0][2] = bridge_abi.L1FailedRelayedMessageEventSignature
+		query.Topics[0][3] = bridge_abi.L1CommitBatchEventSignature
+		query.Topics[0][4] = bridge_abi.L1FinalizeBatchEventSignature
 
 		logs, err := w.client.FilterLogs(w.ctx, query)
 		if err != nil {
@@ -151,6 +241,7 @@ func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 		}
 		if len(logs) == 0 {
 			w.processedMsgHeight = uint64(to)
+			bridgeL1MsgsSyncHeightGauge.Update(to)
 			continue
 		}
 		log.Info("Received new L1 events", "fromBlock", from, "toBlock", to, "cnt", len(logs))
@@ -160,32 +251,38 @@ func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 			log.Error("Failed to parse emitted events log", "err", err)
 			return err
 		}
-		log.Info("L1 events types", "SentMessageCount", len(sentMessageEvents), "RelayedMessageCount", len(relayedMessageEvents), "RollupEventCount", len(rollupEvents))
+		sentMessageCount := int64(len(sentMessageEvents))
+		relayedMessageCount := int64(len(relayedMessageEvents))
+		rollupEventCount := int64(len(rollupEvents))
+		bridgeL1MsgsSentEventsTotalCounter.Inc(sentMessageCount)
+		bridgeL1MsgsRelayedEventsTotalCounter.Inc(relayedMessageCount)
+		bridgeL1MsgsRollupEventsTotalCounter.Inc(rollupEventCount)
+		log.Info("L1 events types", "SentMessageCount", sentMessageCount, "RelayedMessageCount", relayedMessageCount, "RollupEventCount", rollupEventCount)
 
 		// use rollup event to update rollup results db status
-		var batchIDs []string
+		var batchHashes []string
 		for _, event := range rollupEvents {
-			batchIDs = append(batchIDs, event.batchID.String())
+			batchHashes = append(batchHashes, event.batchHash.String())
 		}
-		statuses, err := w.db.GetRollupStatusByIDList(batchIDs)
+		statuses, err := w.db.GetRollupStatusByHashList(batchHashes)
 		if err != nil {
-			log.Error("Failed to GetRollupStatusByIDList", "err", err)
+			log.Error("Failed to GetRollupStatusByHashList", "err", err)
 			return err
 		}
-		if len(statuses) != len(batchIDs) {
-			log.Error("RollupStatus.Length mismatch with BatchIDs.Length", "RollupStatus.Length", len(statuses), "BatchIDs.Length", len(batchIDs))
+		if len(statuses) != len(batchHashes) {
+			log.Error("RollupStatus.Length mismatch with batchHashes.Length", "RollupStatus.Length", len(statuses), "batchHashes.Length", len(batchHashes))
 			return nil
 		}
 
 		for index, event := range rollupEvents {
-			batchID := event.batchID.String()
+			batchHash := event.batchHash.String()
 			status := statuses[index]
 			// only update when db status is before event status
 			if event.status > status {
-				if event.status == orm.RollupFinalized {
-					err = w.db.UpdateFinalizeTxHashAndRollupStatus(w.ctx, batchID, event.txHash.String(), event.status)
-				} else if event.status == orm.RollupCommitted {
-					err = w.db.UpdateCommitTxHashAndRollupStatus(w.ctx, batchID, event.txHash.String(), event.status)
+				if event.status == types.RollupFinalized {
+					err = w.db.UpdateFinalizeTxHashAndRollupStatus(w.ctx, batchHash, event.txHash.String(), event.status)
+				} else if event.status == types.RollupCommitted {
+					err = w.db.UpdateCommitTxHashAndRollupStatus(w.ctx, batchHash, event.txHash.String(), event.status)
 				}
 				if err != nil {
 					log.Error("Failed to update Rollup/Finalize TxHash and Status", "err", err)
@@ -197,14 +294,13 @@ func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 		// Update relayed message first to make sure we don't forget to update submitted message.
 		// Since, we always start sync from the latest unprocessed message.
 		for _, msg := range relayedMessageEvents {
+			var msgStatus types.MsgStatus
 			if msg.isSuccessful {
-				// succeed
-				err = w.db.UpdateLayer2StatusAndLayer1Hash(w.ctx, msg.msgHash.String(), orm.MsgConfirmed, msg.txHash.String())
+				msgStatus = types.MsgConfirmed
 			} else {
-				// failed
-				err = w.db.UpdateLayer2StatusAndLayer1Hash(w.ctx, msg.msgHash.String(), orm.MsgFailed, msg.txHash.String())
+				msgStatus = types.MsgFailed
 			}
-			if err != nil {
+			if err = w.db.UpdateLayer2StatusAndLayer1Hash(w.ctx, msg.msgHash.String(), msgStatus, msg.txHash.String()); err != nil {
 				log.Error("Failed to update layer1 status and layer2 hash", "err", err)
 				return err
 			}
@@ -215,113 +311,93 @@ func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 		}
 
 		w.processedMsgHeight = uint64(to)
+		bridgeL1MsgsSyncHeightGauge.Update(to)
 	}
 
 	return nil
 }
 
-func (w *Watcher) parseBridgeEventLogs(logs []types.Log) ([]*orm.L1Message, []relayedMessage, []rollupEvent, error) {
+func (w *Watcher) parseBridgeEventLogs(logs []geth_types.Log) ([]*types.L1Message, []relayedMessage, []rollupEvent, error) {
 	// Need use contract abi to parse event Log
 	// Can only be tested after we have our contracts set up
 
-	var l1Messages []*orm.L1Message
+	var l1Messages []*types.L1Message
 	var relayedMessages []relayedMessage
 	var rollupEvents []rollupEvent
 	for _, vLog := range logs {
 		switch vLog.Topics[0] {
-		case common.HexToHash(bridge_abi.SentMessageEventSignature):
-			event := struct {
-				Target       common.Address
-				Sender       common.Address
-				Value        *big.Int // uint256
-				Fee          *big.Int // uint256
-				Deadline     *big.Int // uint256
-				Message      []byte
-				MessageNonce *big.Int // uint256
-				GasLimit     *big.Int // uint256
-			}{}
-
-			err := w.messengerABI.UnpackIntoInterface(&event, "SentMessage", vLog.Data)
+		case bridge_abi.L1QueueTransactionEventSignature:
+			event := bridge_abi.L1QueueTransactionEvent{}
+			err := utils.UnpackLog(w.messageQueueABI, &event, "QueueTransaction", vLog)
 			if err != nil {
-				log.Warn("Failed to unpack layer1 SentMessage event", "err", err)
+				log.Warn("Failed to unpack layer1 QueueTransaction event", "err", err)
 				return l1Messages, relayedMessages, rollupEvents, err
 			}
-			// target is in topics[1]
-			event.Target = common.HexToAddress(vLog.Topics[1].String())
-			l1Messages = append(l1Messages, &orm.L1Message{
-				Nonce:      event.MessageNonce.Uint64(),
-				MsgHash:    utils.ComputeMessageHash(event.Sender, event.Target, event.Value, event.Fee, event.Deadline, event.Message, event.MessageNonce).String(),
+
+			msgHash := common.BytesToHash(crypto.Keccak256(event.Data))
+
+			l1Messages = append(l1Messages, &types.L1Message{
+				QueueIndex: event.QueueIndex.Uint64(),
+				MsgHash:    msgHash.String(),
 				Height:     vLog.BlockNumber,
 				Sender:     event.Sender.String(),
 				Value:      event.Value.String(),
-				Fee:        event.Fee.String(),
-				GasLimit:   event.GasLimit.Uint64(),
-				Deadline:   event.Deadline.Uint64(),
 				Target:     event.Target.String(),
-				Calldata:   common.Bytes2Hex(event.Message),
+				Calldata:   common.Bytes2Hex(event.Data),
+				GasLimit:   event.GasLimit.Uint64(),
 				Layer1Hash: vLog.TxHash.Hex(),
 			})
-		case common.HexToHash(bridge_abi.RelayedMessageEventSignature):
-			event := struct {
-				MsgHash common.Hash
-			}{}
-			// MsgHash is in topics[1]
-			event.MsgHash = common.HexToHash(vLog.Topics[1].String())
+		case bridge_abi.L1RelayedMessageEventSignature:
+			event := bridge_abi.L1RelayedMessageEvent{}
+			err := utils.UnpackLog(w.messengerABI, &event, "RelayedMessage", vLog)
+			if err != nil {
+				log.Warn("Failed to unpack layer1 RelayedMessage event", "err", err)
+				return l1Messages, relayedMessages, rollupEvents, err
+			}
+
 			relayedMessages = append(relayedMessages, relayedMessage{
-				msgHash:      event.MsgHash,
+				msgHash:      event.MessageHash,
 				txHash:       vLog.TxHash,
 				isSuccessful: true,
 			})
-		case common.HexToHash(bridge_abi.FailedRelayedMessageEventSignature):
-			event := struct {
-				MsgHash common.Hash
-			}{}
-			// MsgHash is in topics[1]
-			event.MsgHash = common.HexToHash(vLog.Topics[1].String())
+		case bridge_abi.L1FailedRelayedMessageEventSignature:
+			event := bridge_abi.L1FailedRelayedMessageEvent{}
+			err := utils.UnpackLog(w.messengerABI, &event, "FailedRelayedMessage", vLog)
+			if err != nil {
+				log.Warn("Failed to unpack layer1 FailedRelayedMessage event", "err", err)
+				return l1Messages, relayedMessages, rollupEvents, err
+			}
+
 			relayedMessages = append(relayedMessages, relayedMessage{
-				msgHash:      event.MsgHash,
+				msgHash:      event.MessageHash,
 				txHash:       vLog.TxHash,
 				isSuccessful: false,
 			})
-		case common.HexToHash(bridge_abi.CommitBatchEventSignature):
-			event := struct {
-				BatchID    common.Hash
-				BatchHash  common.Hash
-				BatchIndex *big.Int
-				ParentHash common.Hash
-			}{}
-			// BatchID is in topics[1]
-			event.BatchID = common.HexToHash(vLog.Topics[1].String())
-			err := w.rollupABI.UnpackIntoInterface(&event, "CommitBatch", vLog.Data)
+		case bridge_abi.L1CommitBatchEventSignature:
+			event := bridge_abi.L1CommitBatchEvent{}
+			err := utils.UnpackLog(w.scrollChainABI, &event, "CommitBatch", vLog)
 			if err != nil {
 				log.Warn("Failed to unpack layer1 CommitBatch event", "err", err)
 				return l1Messages, relayedMessages, rollupEvents, err
 			}
 
 			rollupEvents = append(rollupEvents, rollupEvent{
-				batchID: event.BatchID,
-				txHash:  vLog.TxHash,
-				status:  orm.RollupCommitted,
+				batchHash: event.BatchHash,
+				txHash:    vLog.TxHash,
+				status:    types.RollupCommitted,
 			})
-		case common.HexToHash(bridge_abi.FinalizedBatchEventSignature):
-			event := struct {
-				BatchID    common.Hash
-				BatchHash  common.Hash
-				BatchIndex *big.Int
-				ParentHash common.Hash
-			}{}
-			// BatchID is in topics[1]
-			event.BatchID = common.HexToHash(vLog.Topics[1].String())
-			err := w.rollupABI.UnpackIntoInterface(&event, "FinalizeBatch", vLog.Data)
+		case bridge_abi.L1FinalizeBatchEventSignature:
+			event := bridge_abi.L1FinalizeBatchEvent{}
+			err := utils.UnpackLog(w.scrollChainABI, &event, "FinalizeBatch", vLog)
 			if err != nil {
 				log.Warn("Failed to unpack layer1 FinalizeBatch event", "err", err)
 				return l1Messages, relayedMessages, rollupEvents, err
 			}
 
 			rollupEvents = append(rollupEvents, rollupEvent{
-				batchID: event.BatchID,
-				txHash:  vLog.TxHash,
-				status:  orm.RollupFinalized,
+				batchHash: event.BatchHash,
+				txHash:    vLog.TxHash,
+				status:    types.RollupFinalized,
 			})
 		default:
 			log.Error("Unknown event", "topic", vLog.Topics[0], "txHash", vLog.TxHash)

bridge/l1/watcher_test.go

@@ -18,12 +18,12 @@ func testStartWatcher(t *testing.T) {
 	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
 	defer db.Close()
 
-	client, err := ethclient.Dial(l1gethImg.Endpoint())
+	client, err := ethclient.Dial(base.L1GethEndpoint())
 	assert.NoError(t, err)
 
 	l1Cfg := cfg.L1Config
 
-	watcher := NewWatcher(context.Background(), client, l1Cfg.StartHeight, l1Cfg.Confirmations, l1Cfg.L1MessengerAddress, l1Cfg.RelayerConfig.RollupContractAddress, db)
+	watcher := NewWatcher(context.Background(), client, l1Cfg.StartHeight, l1Cfg.Confirmations, l1Cfg.L1MessengerAddress, l1Cfg.L1MessageQueueAddress, l1Cfg.RelayerConfig.RollupContractAddress, db)
 	watcher.Start()
 	defer watcher.Stop()
 }

bridge/l2/backend.go

@@ -14,10 +14,11 @@ import (
 // Backend manage the resources and services of L2 backend.
 // The backend should monitor events in layer 2 and relay transactions to layer 1
 type Backend struct {
-	cfg       *config.L2Config
-	l2Watcher *WatcherClient
-	relayer   *Layer2Relayer
-	orm       database.OrmFactory
+	cfg           *config.L2Config
+	watcher       *WatcherClient
+	relayer       *Layer2Relayer
+	batchProposer *BatchProposer
+	orm           database.OrmFactory
 }
 
 // New returns a new instance of Backend.
@@ -27,32 +28,39 @@ func New(ctx context.Context, cfg *config.L2Config, orm database.OrmFactory) (*B
 		return nil, err
 	}
 
-	relayer, err := NewLayer2Relayer(ctx, orm, cfg.RelayerConfig)
+	// Note: initialize watcher before relayer to keep DB consistent.
+	// Otherwise, there will be a race condition between watcher.initializeGenesis and relayer.ProcessPendingBatches.
+	watcher := NewL2WatcherClient(ctx, client, cfg.Confirmations, cfg.L2MessengerAddress, cfg.L2MessageQueueAddress, orm)
+
+	relayer, err := NewLayer2Relayer(ctx, client, orm, cfg.RelayerConfig)
 	if err != nil {
 		return nil, err
 	}
 
-	l2Watcher := NewL2WatcherClient(ctx, client, cfg.Confirmations, cfg.BatchProposerConfig, cfg.L2MessengerAddress, orm)
+	batchProposer := NewBatchProposer(ctx, cfg.BatchProposerConfig, relayer, orm)
 
 	return &Backend{
-		cfg:       cfg,
-		l2Watcher: l2Watcher,
-		relayer:   relayer,
-		orm:       orm,
+		cfg:           cfg,
+		watcher:       watcher,
+		relayer:       relayer,
+		batchProposer: batchProposer,
+		orm:           orm,
 	}, nil
 }
 
 // Start Backend module.
 func (l2 *Backend) Start() error {
-	l2.l2Watcher.Start()
+	l2.watcher.Start()
 	l2.relayer.Start()
+	l2.batchProposer.Start()
 	return nil
 }
 
 // Stop Backend module.
 func (l2 *Backend) Stop() {
-	l2.l2Watcher.Stop()
+	l2.batchProposer.Stop()
 	l2.relayer.Stop()
+	l2.watcher.Stop()
 }
 
 // APIs collect API modules.
@@ -61,7 +69,7 @@ func (l2 *Backend) APIs() []rpc.API {
 		{
 			Namespace: "l2",
 			Version:   "1.0",
-			Service:   WatcherAPI(l2.l2Watcher),
+			Service:   WatcherAPI(l2.watcher),
 			Public:    true,
 		},
 	}

bridge/l2/batch_proposer.go

@@ -1,105 +1,41 @@
 package l2
 
 import (
+	"context"
 	"fmt"
+	"math"
+	"reflect"
 	"sync"
 	"time"
 
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/log"
+	geth_metrics "github.com/scroll-tech/go-ethereum/metrics"
+
+	"scroll-tech/common/metrics"
+	"scroll-tech/common/types"
+	"scroll-tech/common/utils"
 
 	"scroll-tech/database"
-	"scroll-tech/database/orm"
 
+	bridgeabi "scroll-tech/bridge/abi"
 	"scroll-tech/bridge/config"
 )
 
-type batchProposer struct {
-	mutex sync.Mutex
+var (
+	bridgeL2BatchesGasOverThresholdTotalCounter = geth_metrics.NewRegisteredCounter("bridge/l2/batches/gas/over/threshold/total", metrics.ScrollRegistry)
+	bridgeL2BatchesTxsOverThresholdTotalCounter = geth_metrics.NewRegisteredCounter("bridge/l2/batches/txs/over/threshold/total", metrics.ScrollRegistry)
+	bridgeL2BatchesCommitTotalCounter           = geth_metrics.NewRegisteredCounter("bridge/l2/batches/commit/total", metrics.ScrollRegistry)
 
-	orm database.OrmFactory
+	bridgeL2BatchesCreatedRateMeter    = geth_metrics.NewRegisteredMeter("bridge/l2/batches/blocks/created/rate", metrics.ScrollRegistry)
+	bridgeL2BatchesTxsCreatedRateMeter = geth_metrics.NewRegisteredMeter("bridge/l2/batches/txs/created/rate", metrics.ScrollRegistry)
+	bridgeL2BatchesGasCreatedRateMeter = geth_metrics.NewRegisteredMeter("bridge/l2/batches/gas/created/rate", metrics.ScrollRegistry)
+)
 
-	batchTimeSec        uint64
-	batchGasThreshold   uint64
-	batchTxNumThreshold uint64
-	batchBlocksLimit    uint64
-
-	proofGenerationFreq uint64
-	skippedOpcodes      map[string]struct{}
-}
-
-func newBatchProposer(cfg *config.BatchProposerConfig, orm database.OrmFactory) *batchProposer {
-	return &batchProposer{
-		mutex:               sync.Mutex{},
-		orm:                 orm,
-		batchTimeSec:        cfg.BatchTimeSec,
-		batchGasThreshold:   cfg.BatchGasThreshold,
-		batchTxNumThreshold: cfg.BatchTxNumThreshold,
-		batchBlocksLimit:    cfg.BatchBlocksLimit,
-		proofGenerationFreq: cfg.ProofGenerationFreq,
-		skippedOpcodes:      cfg.SkippedOpcodes,
-	}
-}
-
-func (w *batchProposer) tryProposeBatch() {
-	w.mutex.Lock()
-	defer w.mutex.Unlock()
-
-	blocks, err := w.orm.GetUnbatchedBlocks(
-		map[string]interface{}{},
-		fmt.Sprintf("order by number ASC LIMIT %d", w.batchBlocksLimit),
-	)
-	if err != nil {
-		log.Error("failed to get unbatched blocks", "err", err)
-		return
-	}
-	if len(blocks) == 0 {
-		return
-	}
-
-	if blocks[0].GasUsed > w.batchGasThreshold {
-		log.Warn("gas overflow even for only 1 block", "height", blocks[0].Number, "gas", blocks[0].GasUsed)
-		if err = w.createBatchForBlocks(blocks[:1]); err != nil {
-			log.Error("failed to create batch", "number", blocks[0].Number, "err", err)
-		}
-		return
-	}
-
-	if blocks[0].TxNum > w.batchTxNumThreshold {
-		log.Warn("too many txs even for only 1 block", "height", blocks[0].Number, "tx_num", blocks[0].TxNum)
-		if err = w.createBatchForBlocks(blocks[:1]); err != nil {
-			log.Error("failed to create batch", "number", blocks[0].Number, "err", err)
-		}
-		return
-	}
-
-	var (
-		length         = len(blocks)
-		gasUsed, txNum uint64
-	)
-	// add blocks into batch until reach batchGasThreshold
-	for i, block := range blocks {
-		if (gasUsed+block.GasUsed > w.batchGasThreshold) || (txNum+block.TxNum > w.batchTxNumThreshold) {
-			blocks = blocks[:i]
-			break
-		}
-		gasUsed += block.GasUsed
-		txNum += block.TxNum
-	}
-
-	// if too few gas gathered, but we don't want to halt, we then check the first block in the batch:
-	// if it's not old enough we will skip proposing the batch,
-	// otherwise we will still propose a batch
-	if length == len(blocks) && blocks[0].BlockTimestamp+w.batchTimeSec > uint64(time.Now().Unix()) {
-		return
-	}
-
-	if err = w.createBatchForBlocks(blocks); err != nil {
-		log.Error("failed to create batch", "from", blocks[0].Number, "to", blocks[len(blocks)-1].Number, "err", err)
-	}
-}
-
-func (w *batchProposer) createBatchForBlocks(blocks []*orm.BlockInfo) error {
-	dbTx, err := w.orm.Beginx()
+// AddBatchInfoToDB inserts the batch information to the BlockBatch table and updates the batch_hash
+// in all blocks included in the batch.
+func AddBatchInfoToDB(db database.OrmFactory, batchData *types.BatchData) error {
+	dbTx, err := db.Beginx()
 	if err != nil {
 		return err
 	}
@@ -113,28 +49,331 @@ func (w *batchProposer) createBatchForBlocks(blocks []*orm.BlockInfo) error {
 		}
 	}()
 
-	var (
-		batchID        string
-		startBlock     = blocks[0]
-		endBlock       = blocks[len(blocks)-1]
-		txNum, gasUsed uint64
-		blockIDs       = make([]uint64, len(blocks))
-	)
-	for i, block := range blocks {
-		txNum += block.TxNum
-		gasUsed += block.GasUsed
-		blockIDs[i] = block.Number
-	}
-
-	batchID, dbTxErr = w.orm.NewBatchInDBTx(dbTx, startBlock, endBlock, startBlock.ParentHash, txNum, gasUsed)
-	if dbTxErr != nil {
+	if dbTxErr = db.NewBatchInDBTx(dbTx, batchData); dbTxErr != nil {
 		return dbTxErr
 	}
 
-	if dbTxErr = w.orm.SetBatchIDForBlocksInDBTx(dbTx, blockIDs, batchID); dbTxErr != nil {
+	var blockIDs = make([]uint64, len(batchData.Batch.Blocks))
+	for i, block := range batchData.Batch.Blocks {
+		blockIDs[i] = block.BlockNumber
+	}
+
+	if dbTxErr = db.SetBatchHashForL2BlocksInDBTx(dbTx, blockIDs, batchData.Hash().Hex()); dbTxErr != nil {
 		return dbTxErr
 	}
 
 	dbTxErr = dbTx.Commit()
 	return dbTxErr
 }
+
+// BatchProposer sends batches commit transactions to relayer.
+type BatchProposer struct {
+	mutex sync.Mutex
+
+	ctx context.Context
+	orm database.OrmFactory
+
+	batchTimeSec             uint64
+	batchGasThreshold        uint64
+	batchTxNumThreshold      uint64
+	batchBlocksLimit         uint64
+	batchCommitTimeSec       uint64
+	commitCalldataSizeLimit  uint64
+	batchDataBufferSizeLimit uint64
+
+	proofGenerationFreq uint64
+	batchDataBuffer     []*types.BatchData
+	relayer             *Layer2Relayer
+
+	piCfg *types.PublicInputHashConfig
+
+	stopCh chan struct{}
+}
+
+// NewBatchProposer will return a new instance of BatchProposer.
+func NewBatchProposer(ctx context.Context, cfg *config.BatchProposerConfig, relayer *Layer2Relayer, orm database.OrmFactory) *BatchProposer {
+	p := &BatchProposer{
+		mutex:                    sync.Mutex{},
+		ctx:                      ctx,
+		orm:                      orm,
+		batchTimeSec:             cfg.BatchTimeSec,
+		batchGasThreshold:        cfg.BatchGasThreshold,
+		batchTxNumThreshold:      cfg.BatchTxNumThreshold,
+		batchBlocksLimit:         cfg.BatchBlocksLimit,
+		batchCommitTimeSec:       cfg.BatchCommitTimeSec,
+		commitCalldataSizeLimit:  cfg.CommitTxCalldataSizeLimit,
+		batchDataBufferSizeLimit: 100*cfg.CommitTxCalldataSizeLimit + 1*1024*1024, // @todo: determine the value.
+		proofGenerationFreq:      cfg.ProofGenerationFreq,
+		piCfg:                    cfg.PublicInputConfig,
+		relayer:                  relayer,
+		stopCh:                   make(chan struct{}),
+	}
+
+	// for graceful restart.
+	p.recoverBatchDataBuffer()
+
+	// try to commit the leftover pending batches
+	p.tryCommitBatches()
+
+	return p
+}
+
+// Start the Listening process
+func (p *BatchProposer) Start() {
+	go func() {
+		if reflect.ValueOf(p.orm).IsNil() {
+			panic("must run BatchProposer with DB")
+		}
+
+		ctx, cancel := context.WithCancel(p.ctx)
+
+		go utils.Loop(ctx, 2*time.Second, func() {
+			p.tryProposeBatch()
+			p.tryCommitBatches()
+		})
+
+		<-p.stopCh
+		cancel()
+	}()
+}
+
+// Stop the Watcher module, for a graceful shutdown.
+func (p *BatchProposer) Stop() {
+	p.stopCh <- struct{}{}
+}
+
+func (p *BatchProposer) recoverBatchDataBuffer() {
+	// batches are sorted by batch index in increasing order
+	batchHashes, err := p.orm.GetPendingBatches(math.MaxInt32)
+	if err != nil {
+		log.Crit("Failed to fetch pending L2 batches", "err", err)
+	}
+	if len(batchHashes) == 0 {
+		return
+	}
+	log.Info("Load pending batches into batchDataBuffer")
+
+	// helper function to cache and get BlockBatch from DB
+	blockBatchCache := make(map[string]*types.BlockBatch)
+	getBlockBatch := func(batchHash string) (*types.BlockBatch, error) {
+		if blockBatch, ok := blockBatchCache[batchHash]; ok {
+			return blockBatch, nil
+		}
+		blockBatches, err := p.orm.GetBlockBatches(map[string]interface{}{"hash": batchHash})
+		if err != nil || len(blockBatches) == 0 {
+			return nil, err
+		}
+		blockBatchCache[batchHash] = blockBatches[0]
+		return blockBatches[0], nil
+	}
+
+	// recover the in-memory batchData from DB
+	for _, batchHash := range batchHashes {
+		log.Info("recover batch data from pending batch", "batch_hash", batchHash)
+		blockBatch, err := getBlockBatch(batchHash)
+		if err != nil {
+			log.Error("could not get BlockBatch", "batch_hash", batchHash, "error", err)
+			continue
+		}
+
+		parentBatch, err := getBlockBatch(blockBatch.ParentHash)
+		if err != nil {
+			log.Error("could not get parent BlockBatch", "batch_hash", batchHash, "error", err)
+			continue
+		}
+
+		blockInfos, err := p.orm.GetL2BlockInfos(
+			map[string]interface{}{"batch_hash": batchHash},
+			"order by number ASC",
+		)
+
+		if err != nil {
+			log.Error("could not GetL2BlockInfos", "batch_hash", batchHash, "error", err)
+			continue
+		}
+		if len(blockInfos) != int(blockBatch.EndBlockNumber-blockBatch.StartBlockNumber+1) {
+			log.Error("the number of block info retrieved from DB mistmatches the batch info in the DB",
+				"len(blockInfos)", len(blockInfos),
+				"expected", blockBatch.EndBlockNumber-blockBatch.StartBlockNumber+1)
+			continue
+		}
+
+		batchData, err := p.generateBatchData(parentBatch, blockInfos)
+		if err != nil {
+			continue
+		}
+		if batchData.Hash().Hex() != batchHash {
+			log.Error("the hash from recovered batch data mismatches the DB entry",
+				"recovered_batch_hash", batchData.Hash().Hex(),
+				"expected", batchHash)
+			continue
+		}
+
+		p.batchDataBuffer = append(p.batchDataBuffer, batchData)
+	}
+}
+
+func (p *BatchProposer) tryProposeBatch() {
+	p.mutex.Lock()
+	defer p.mutex.Unlock()
+
+	if p.getBatchDataBufferSize() < p.batchDataBufferSizeLimit {
+		blocks, err := p.orm.GetUnbatchedL2Blocks(
+			map[string]interface{}{},
+			fmt.Sprintf("order by number ASC LIMIT %d", p.batchBlocksLimit),
+		)
+		if err != nil {
+			log.Error("failed to get unbatched blocks", "err", err)
+			return
+		}
+
+		p.proposeBatch(blocks)
+	}
+}
+
+func (p *BatchProposer) tryCommitBatches() {
+	p.mutex.Lock()
+	defer p.mutex.Unlock()
+
+	if len(p.batchDataBuffer) == 0 {
+		return
+	}
+
+	// estimate the calldata length to determine whether to commit the pending batches
+	index := 0
+	commit := false
+	calldataByteLen := uint64(0)
+	for ; index < len(p.batchDataBuffer); index++ {
+		calldataByteLen += bridgeabi.GetBatchCalldataLength(&p.batchDataBuffer[index].Batch)
+		if calldataByteLen > p.commitCalldataSizeLimit {
+			commit = true
+			if index == 0 {
+				log.Warn(
+					"The calldata size of one batch is larger than the threshold",
+					"batch_hash", p.batchDataBuffer[0].Hash().Hex(),
+					"calldata_size", calldataByteLen,
+				)
+				index = 1
+			}
+			break
+		}
+	}
+	if !commit && p.batchDataBuffer[0].Timestamp()+p.batchCommitTimeSec > uint64(time.Now().Unix()) {
+		return
+	}
+
+	// Send commit tx for batchDataBuffer[0:index]
+	log.Info("Commit batches", "start_index", p.batchDataBuffer[0].Batch.BatchIndex,
+		"end_index", p.batchDataBuffer[index-1].Batch.BatchIndex)
+	err := p.relayer.SendCommitTx(p.batchDataBuffer[:index])
+	if err != nil {
+		// leave the retry to the next ticker
+		log.Error("SendCommitTx failed", "error", err)
+	} else {
+		// pop the processed batches from the buffer
+		bridgeL2BatchesCommitTotalCounter.Inc(1)
+		p.batchDataBuffer = p.batchDataBuffer[index:]
+	}
+}
+
+func (p *BatchProposer) proposeBatch(blocks []*types.BlockInfo) {
+	if len(blocks) == 0 {
+		return
+	}
+
+	if blocks[0].GasUsed > p.batchGasThreshold {
+		bridgeL2BatchesGasOverThresholdTotalCounter.Inc(1)
+		log.Warn("gas overflow even for only 1 block", "height", blocks[0].Number, "gas", blocks[0].GasUsed)
+		if err := p.createBatchForBlocks(blocks[:1]); err != nil {
+			log.Error("failed to create batch", "number", blocks[0].Number, "err", err)
+		} else {
+			bridgeL2BatchesTxsCreatedRateMeter.Mark(int64(blocks[0].TxNum))
+			bridgeL2BatchesGasCreatedRateMeter.Mark(int64(blocks[0].GasUsed))
+			bridgeL2BatchesCreatedRateMeter.Mark(1)
+		}
+		return
+	}
+
+	if blocks[0].TxNum > p.batchTxNumThreshold {
+		bridgeL2BatchesTxsOverThresholdTotalCounter.Inc(1)
+		log.Warn("too many txs even for only 1 block", "height", blocks[0].Number, "tx_num", blocks[0].TxNum)
+		if err := p.createBatchForBlocks(blocks[:1]); err != nil {
+			log.Error("failed to create batch", "number", blocks[0].Number, "err", err)
+		} else {
+			bridgeL2BatchesTxsCreatedRateMeter.Mark(int64(blocks[0].TxNum))
+			bridgeL2BatchesGasCreatedRateMeter.Mark(int64(blocks[0].GasUsed))
+			bridgeL2BatchesCreatedRateMeter.Mark(1)
+		}
+		return
+	}
+
+	var gasUsed, txNum uint64
+	reachThreshold := false
+	// add blocks into batch until reach batchGasThreshold
+	for i, block := range blocks {
+		if (gasUsed+block.GasUsed > p.batchGasThreshold) || (txNum+block.TxNum > p.batchTxNumThreshold) {
+			blocks = blocks[:i]
+			reachThreshold = true
+			break
+		}
+		gasUsed += block.GasUsed
+		txNum += block.TxNum
+	}
+
+	// if too few gas gathered, but we don't want to halt, we then check the first block in the batch:
+	// if it's not old enough we will skip proposing the batch,
+	// otherwise we will still propose a batch
+	if !reachThreshold && blocks[0].BlockTimestamp+p.batchTimeSec > uint64(time.Now().Unix()) {
+		return
+	}
+
+	if err := p.createBatchForBlocks(blocks); err != nil {
+		log.Error("failed to create batch", "from", blocks[0].Number, "to", blocks[len(blocks)-1].Number, "err", err)
+	} else {
+		bridgeL2BatchesTxsCreatedRateMeter.Mark(int64(txNum))
+		bridgeL2BatchesGasCreatedRateMeter.Mark(int64(gasUsed))
+		bridgeL2BatchesCreatedRateMeter.Mark(int64(len(blocks)))
+	}
+}
+
+func (p *BatchProposer) createBatchForBlocks(blocks []*types.BlockInfo) error {
+	lastBatch, err := p.orm.GetLatestBatch()
+	if err != nil {
+		// We should not receive sql.ErrNoRows error. The DB should have the batch entry that contains the genesis block.
+		return err
+	}
+
+	batchData, err := p.generateBatchData(lastBatch, blocks)
+	if err != nil {
+		log.Error("createBatchData failed", "error", err)
+		return err
+	}
+
+	if err := AddBatchInfoToDB(p.orm, batchData); err != nil {
+		log.Error("addBatchInfoToDB failed", "BatchHash", batchData.Hash(), "error", err)
+		return err
+	}
+
+	p.batchDataBuffer = append(p.batchDataBuffer, batchData)
+	return nil
+}
+
+func (p *BatchProposer) generateBatchData(parentBatch *types.BlockBatch, blocks []*types.BlockInfo) (*types.BatchData, error) {
+	var traces []*geth_types.BlockTrace
+	for _, block := range blocks {
+		trs, err := p.orm.GetL2BlockTraces(map[string]interface{}{"hash": block.Hash})
+		if err != nil || len(trs) != 1 {
+			log.Error("Failed to GetBlockTraces", "hash", block.Hash, "err", err)
+			return nil, err
+		}
+		traces = append(traces, trs[0])
+	}
+	return types.NewBatchData(parentBatch, traces, p.piCfg), nil
+}
+
+func (p *BatchProposer) getBatchDataBufferSize() (size uint64) {
+	for _, batchData := range p.batchDataBuffer {
+		size += bridgeabi.GetBatchCalldataLength(&batchData.Batch)
+	}
+	return
+}

bridge/l2/batch_proposer_test.go

@@ -1,13 +1,12 @@
 package l2
 
 import (
-	"encoding/json"
+	"context"
 	"fmt"
-	"math/big"
-	"os"
+	"math"
 	"testing"
 
-	"github.com/scroll-tech/go-ethereum/core/types"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/stretchr/testify/assert"
 
 	"scroll-tech/database"
@@ -15,48 +14,90 @@ import (
 
 	"scroll-tech/bridge/config"
 
-	"scroll-tech/common/utils"
+	"scroll-tech/common/types"
 )
 
-func testBatchProposer(t *testing.T) {
+func testBatchProposerProposeBatch(t *testing.T) {
 	// Create db handler and reset db.
 	db, err := database.NewOrmFactory(cfg.DBConfig)
 	assert.NoError(t, err)
 	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
 	defer db.Close()
 
-	trace2 := &types.BlockTrace{}
-	trace3 := &types.BlockTrace{}
-
-	data, err := os.ReadFile("../../common/testdata/blockTrace_02.json")
-	assert.NoError(t, err)
-	err = json.Unmarshal(data, trace2)
-	assert.NoError(t, err)
-
-	data, err = os.ReadFile("../../common/testdata/blockTrace_03.json")
-	assert.NoError(t, err)
-	err = json.Unmarshal(data, trace3)
-	assert.NoError(t, err)
 	// Insert traces into db.
-	assert.NoError(t, db.InsertBlockTraces([]*types.BlockTrace{trace2, trace3}))
+	assert.NoError(t, db.InsertL2BlockTraces([]*geth_types.BlockTrace{blockTrace1}))
 
-	id := utils.ComputeBatchID(trace3.Header.Hash(), trace2.Header.ParentHash, big.NewInt(1))
+	l2cfg := cfg.L2Config
+	wc := NewL2WatcherClient(context.Background(), l2Cli, l2cfg.Confirmations, l2cfg.L2MessengerAddress, l2cfg.L2MessageQueueAddress, db)
+	wc.Start()
+	defer wc.Stop()
 
-	proposer := newBatchProposer(&config.BatchProposerConfig{
+	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, cfg.L2Config.RelayerConfig)
+	assert.NoError(t, err)
+
+	proposer := NewBatchProposer(context.Background(), &config.BatchProposerConfig{
 		ProofGenerationFreq: 1,
 		BatchGasThreshold:   3000000,
 		BatchTxNumThreshold: 135,
 		BatchTimeSec:        1,
 		BatchBlocksLimit:    100,
-	}, db)
+	}, relayer, db)
 	proposer.tryProposeBatch()
 
-	infos, err := db.GetUnbatchedBlocks(map[string]interface{}{},
+	infos, err := db.GetUnbatchedL2Blocks(map[string]interface{}{},
 		fmt.Sprintf("order by number ASC LIMIT %d", 100))
 	assert.NoError(t, err)
-	assert.Equal(t, true, len(infos) == 0)
+	assert.Equal(t, 0, len(infos))
 
-	exist, err := db.BatchRecordExist(id)
+	exist, err := db.BatchRecordExist(batchData1.Hash().Hex())
+	assert.NoError(t, err)
+	assert.Equal(t, true, exist)
+}
+
+func testBatchProposerGracefulRestart(t *testing.T) {
+	// Create db handler and reset db.
+	db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
+
+	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, cfg.L2Config.RelayerConfig)
+	assert.NoError(t, err)
+
+	// Insert traces into db.
+	assert.NoError(t, db.InsertL2BlockTraces([]*geth_types.BlockTrace{blockTrace2}))
+
+	// Insert block batch into db.
+	dbTx, err := db.Beginx()
+	assert.NoError(t, err)
+	assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData1))
+	assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData2))
+	assert.NoError(t, db.SetBatchHashForL2BlocksInDBTx(dbTx, []uint64{
+		batchData1.Batch.Blocks[0].BlockNumber}, batchData1.Hash().Hex()))
+	assert.NoError(t, db.SetBatchHashForL2BlocksInDBTx(dbTx, []uint64{
+		batchData2.Batch.Blocks[0].BlockNumber}, batchData2.Hash().Hex()))
+	assert.NoError(t, dbTx.Commit())
+
+	assert.NoError(t, db.UpdateRollupStatus(context.Background(), batchData1.Hash().Hex(), types.RollupFinalized))
+
+	batchHashes, err := db.GetPendingBatches(math.MaxInt32)
+	assert.NoError(t, err)
+	assert.Equal(t, 1, len(batchHashes))
+	assert.Equal(t, batchData2.Hash().Hex(), batchHashes[0])
+	// test p.recoverBatchDataBuffer().
+	_ = NewBatchProposer(context.Background(), &config.BatchProposerConfig{
+		ProofGenerationFreq: 1,
+		BatchGasThreshold:   3000000,
+		BatchTxNumThreshold: 135,
+		BatchTimeSec:        1,
+		BatchBlocksLimit:    100,
+	}, relayer, db)
+
+	batchHashes, err = db.GetPendingBatches(math.MaxInt32)
+	assert.NoError(t, err)
+	assert.Equal(t, 0, len(batchHashes))
+
+	exist, err := db.BatchRecordExist(batchData2.Hash().Hex())
 	assert.NoError(t, err)
 	assert.Equal(t, true, exist)
 }

bridge/l2/l2_test.go

@@ -1,12 +1,17 @@
 package l2
 
 import (
+	"encoding/json"
+	"fmt"
+	"os"
 	"testing"
 
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/stretchr/testify/assert"
 
 	"scroll-tech/common/docker"
+	"scroll-tech/common/types"
 
 	"scroll-tech/bridge/config"
 )
@@ -15,13 +20,18 @@ var (
 	// config
 	cfg *config.Config
 
-	// docker consider handler.
-	l1gethImg docker.ImgInstance
-	l2gethImg docker.ImgInstance
-	dbImg     docker.ImgInstance
+	base *docker.App
 
 	// l2geth client
 	l2Cli *ethclient.Client
+
+	// block trace
+	blockTrace1 *geth_types.BlockTrace
+	blockTrace2 *geth_types.BlockTrace
+
+	// batch data
+	batchData1 *types.BatchData
+	batchData2 *types.BatchData
 )
 
 func setupEnv(t *testing.T) (err error) {
@@ -29,37 +39,59 @@ func setupEnv(t *testing.T) (err error) {
 	cfg, err = config.NewConfig("../config.json")
 	assert.NoError(t, err)
 
-	// Create l1geth container.
-	l1gethImg = docker.NewTestL1Docker(t)
-	cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = l1gethImg.Endpoint()
-	cfg.L1Config.Endpoint = l1gethImg.Endpoint()
+	base.RunImages(t)
 
-	// Create l2geth container.
-	l2gethImg = docker.NewTestL2Docker(t)
-	cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = l2gethImg.Endpoint()
-	cfg.L2Config.Endpoint = l2gethImg.Endpoint()
-
-	// Create db container.
-	dbImg = docker.NewTestDBDocker(t, cfg.DBConfig.DriverName)
-	cfg.DBConfig.DSN = dbImg.Endpoint()
+	cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = base.L1GethEndpoint()
+	cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = base.L2GethEndpoint()
+	cfg.DBConfig.DSN = base.DBEndpoint()
 
 	// Create l2geth client.
-	l2Cli, err = ethclient.Dial(cfg.L2Config.Endpoint)
+	l2Cli, err = base.L2Client()
 	assert.NoError(t, err)
 
+	templateBlockTrace1, err := os.ReadFile("../../common/testdata/blockTrace_02.json")
+	if err != nil {
+		return err
+	}
+	// unmarshal blockTrace
+	blockTrace1 = &geth_types.BlockTrace{}
+	if err = json.Unmarshal(templateBlockTrace1, blockTrace1); err != nil {
+		return err
+	}
+
+	parentBatch1 := &types.BlockBatch{
+		Index: 1,
+		Hash:  "0x0000000000000000000000000000000000000000",
+	}
+	batchData1 = types.NewBatchData(parentBatch1, []*geth_types.BlockTrace{blockTrace1}, nil)
+
+	templateBlockTrace2, err := os.ReadFile("../../common/testdata/blockTrace_03.json")
+	if err != nil {
+		return err
+	}
+	// unmarshal blockTrace
+	blockTrace2 = &geth_types.BlockTrace{}
+	if err = json.Unmarshal(templateBlockTrace2, blockTrace2); err != nil {
+		return err
+	}
+	parentBatch2 := &types.BlockBatch{
+		Index: batchData1.Batch.BatchIndex,
+		Hash:  batchData1.Hash().Hex(),
+	}
+	batchData2 = types.NewBatchData(parentBatch2, []*geth_types.BlockTrace{blockTrace2}, nil)
+
+	fmt.Printf("batchhash1 = %x\n", batchData1.Hash())
+	fmt.Printf("batchhash2 = %x\n", batchData2.Hash())
+
 	return err
 }
 
-func free(t *testing.T) {
-	if dbImg != nil {
-		assert.NoError(t, dbImg.Stop())
-	}
-	if l1gethImg != nil {
-		assert.NoError(t, l1gethImg.Stop())
-	}
-	if l2gethImg != nil {
-		assert.NoError(t, l2gethImg.Stop())
-	}
+func TestMain(m *testing.M) {
+	base = docker.NewDockerApp()
+
+	m.Run()
+
+	base.Free()
 }
 
 func TestFunction(t *testing.T) {
@@ -75,13 +107,11 @@ func TestFunction(t *testing.T) {
 	// Run l2 relayer test cases.
 	t.Run("TestCreateNewRelayer", testCreateNewRelayer)
 	t.Run("TestL2RelayerProcessSaveEvents", testL2RelayerProcessSaveEvents)
-	t.Run("testL2RelayerProcessPendingBatches", testL2RelayerProcessPendingBatches)
-	t.Run("testL2RelayerProcessCommittedBatches", testL2RelayerProcessCommittedBatches)
-	t.Run("testL2RelayerSkipBatches", testL2RelayerSkipBatches)
+	t.Run("TestL2RelayerProcessCommittedBatches", testL2RelayerProcessCommittedBatches)
+	t.Run("TestL2RelayerSkipBatches", testL2RelayerSkipBatches)
 
-	t.Run("testBatchProposer", testBatchProposer)
+	// Run batch proposer test cases.
+	t.Run("TestBatchProposerProposeBatch", testBatchProposerProposeBatch)
+	t.Run("TestBatchProposerGracefulRestart", testBatchProposerGracefulRestart)
 
-	t.Cleanup(func() {
-		free(t)
-	})
 }

bridge/l2/relayer.go

@@ -9,16 +9,20 @@ import (
 	"sync"
 	"time"
 
-	// not sure if this will make problems when relay with l1geth
-
 	"github.com/scroll-tech/go-ethereum/accounts/abi"
 	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/crypto"
+	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
+	geth_metrics "github.com/scroll-tech/go-ethereum/metrics"
 	"golang.org/x/sync/errgroup"
 	"modernc.org/mathutil"
 
+	"scroll-tech/common/metrics"
+	"scroll-tech/common/types"
 	"scroll-tech/database"
-	"scroll-tech/database/orm"
+
+	cutil "scroll-tech/common/utils"
 
 	bridge_abi "scroll-tech/bridge/abi"
 	"scroll-tech/bridge/config"
@@ -26,6 +30,24 @@ import (
 	"scroll-tech/bridge/utils"
 )
 
+var (
+	bridgeL2MsgsRelayedTotalCounter               = geth_metrics.NewRegisteredCounter("bridge/l2/msgs/relayed/total", metrics.ScrollRegistry)
+	bridgeL2BatchesFinalizedTotalCounter          = geth_metrics.NewRegisteredCounter("bridge/l2/batches/finalized/total", metrics.ScrollRegistry)
+	bridgeL2BatchesCommittedTotalCounter          = geth_metrics.NewRegisteredCounter("bridge/l2/batches/committed/total", metrics.ScrollRegistry)
+	bridgeL2MsgsRelayedConfirmedTotalCounter      = geth_metrics.NewRegisteredCounter("bridge/l2/msgs/relayed/confirmed/total", metrics.ScrollRegistry)
+	bridgeL2BatchesFinalizedConfirmedTotalCounter = geth_metrics.NewRegisteredCounter("bridge/l2/batches/finalized/confirmed/total", metrics.ScrollRegistry)
+	bridgeL2BatchesCommittedConfirmedTotalCounter = geth_metrics.NewRegisteredCounter("bridge/l2/batches/committed/confirmed/total", metrics.ScrollRegistry)
+	bridgeL2BatchesSkippedTotalCounter            = geth_metrics.NewRegisteredCounter("bridge/l2/batches/skipped/total", metrics.ScrollRegistry)
+)
+
+const (
+	gasPriceDiffPrecision = 1000000
+
+	defaultGasPriceDiff = 50000 // 5%
+
+	defaultMessageRelayMinGasLimit = 200000 // should be enough for both ERC20 and ETH relay
+)
+
 // Layer2Relayer is responsible for
 //  1. Committing and finalizing L2 blocks on L1
 //  2. Relaying messages from L2 to L1
@@ -35,6 +57,8 @@ import (
 type Layer2Relayer struct {
 	ctx context.Context
 
+	l2Client *ethclient.Client
+
 	db  database.OrmFactory
 	cfg *config.RelayerConfig
 
@@ -46,23 +70,33 @@ type Layer2Relayer struct {
 	rollupCh     <-chan *sender.Confirmation
 	l1RollupABI  *abi.ABI
 
+	gasOracleSender *sender.Sender
+	gasOracleCh     <-chan *sender.Confirmation
+	l2GasOracleABI  *abi.ABI
+
+	minGasLimitForMessageRelay uint64
+
+	lastGasPrice uint64
+	minGasPrice  uint64
+	gasPriceDiff uint64
+
 	// A list of processing message.
 	// key(string): confirmation ID, value(string): layer2 hash.
 	processingMessage sync.Map
 
-	// A list of processing batch commitment.
-	// key(string): confirmation ID, value(string): batch id.
-	processingCommitment sync.Map
+	// A list of processing batches commitment.
+	// key(string): confirmation ID, value([]string): batch hashes.
+	processingBatchesCommitment sync.Map
 
 	// A list of processing batch finalization.
-	// key(string): confirmation ID, value(string): batch id.
+	// key(string): confirmation ID, value(string): batch hash.
 	processingFinalization sync.Map
 
 	stopCh chan struct{}
 }
 
 // NewLayer2Relayer will return a new instance of Layer2RelayerClient
-func NewLayer2Relayer(ctx context.Context, db database.OrmFactory, cfg *config.RelayerConfig) (*Layer2Relayer, error) {
+func NewLayer2Relayer(ctx context.Context, l2Client *ethclient.Client, db database.OrmFactory, cfg *config.RelayerConfig) (*Layer2Relayer, error) {
 	// @todo use different sender for relayer, block commit and proof finalize
 	messageSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.MessageSenderPrivateKeys)
 	if err != nil {
@@ -76,28 +110,62 @@ func NewLayer2Relayer(ctx context.Context, db database.OrmFactory, cfg *config.R
 		return nil, err
 	}
 
+	gasOracleSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.GasOracleSenderPrivateKeys)
+	if err != nil {
+		log.Error("Failed to create gas oracle sender", "err", err)
+		return nil, err
+	}
+
+	var minGasPrice uint64
+	var gasPriceDiff uint64
+	if cfg.GasOracleConfig != nil {
+		minGasPrice = cfg.GasOracleConfig.MinGasPrice
+		gasPriceDiff = cfg.GasOracleConfig.GasPriceDiff
+	} else {
+		minGasPrice = 0
+		gasPriceDiff = defaultGasPriceDiff
+	}
+
+	minGasLimitForMessageRelay := uint64(defaultMessageRelayMinGasLimit)
+	if cfg.MessageRelayMinGasLimit != 0 {
+		minGasLimitForMessageRelay = cfg.MessageRelayMinGasLimit
+	}
+
 	return &Layer2Relayer{
-		ctx:                    ctx,
-		db:                     db,
-		messageSender:          messageSender,
-		messageCh:              messageSender.ConfirmChan(),
-		l1MessengerABI:         bridge_abi.L1MessengerMetaABI,
-		rollupSender:           rollupSender,
-		rollupCh:               rollupSender.ConfirmChan(),
-		l1RollupABI:            bridge_abi.RollupMetaABI,
-		cfg:                    cfg,
-		processingMessage:      sync.Map{},
-		processingCommitment:   sync.Map{},
-		processingFinalization: sync.Map{},
-		stopCh:                 make(chan struct{}),
+		ctx: ctx,
+		db:  db,
+
+		l2Client: l2Client,
+
+		messageSender:  messageSender,
+		messageCh:      messageSender.ConfirmChan(),
+		l1MessengerABI: bridge_abi.L1ScrollMessengerABI,
+
+		rollupSender: rollupSender,
+		rollupCh:     rollupSender.ConfirmChan(),
+		l1RollupABI:  bridge_abi.ScrollChainABI,
+
+		gasOracleSender: gasOracleSender,
+		gasOracleCh:     gasOracleSender.ConfirmChan(),
+		l2GasOracleABI:  bridge_abi.L2GasPriceOracleABI,
+
+		minGasLimitForMessageRelay: minGasLimitForMessageRelay,
+
+		minGasPrice:  minGasPrice,
+		gasPriceDiff: gasPriceDiff,
+
+		cfg:                         cfg,
+		processingMessage:           sync.Map{},
+		processingBatchesCommitment: sync.Map{},
+		processingFinalization:      sync.Map{},
+		stopCh:                      make(chan struct{}),
 	}, nil
 }
 
 const processMsgLimit = 100
 
 // ProcessSavedEvents relays saved un-processed cross-domain transactions to desired blockchain
-func (r *Layer2Relayer) ProcessSavedEvents(wg *sync.WaitGroup) {
-	defer wg.Done()
+func (r *Layer2Relayer) ProcessSavedEvents() {
 	batch, err := r.db.GetLatestFinalizedBatch()
 	if err != nil {
 		log.Error("GetLatestFinalizedBatch failed", "err", err)
@@ -106,7 +174,7 @@ func (r *Layer2Relayer) ProcessSavedEvents(wg *sync.WaitGroup) {
 
 	// msgs are sorted by nonce in increasing order
 	msgs, err := r.db.GetL2Messages(
-		map[string]interface{}{"status": orm.MsgPending},
+		map[string]interface{}{"status": types.MsgPending},
 		fmt.Sprintf("AND height<=%d", batch.EndBlockNumber),
 		fmt.Sprintf("ORDER BY nonce ASC LIMIT %d", processMsgLimit),
 	)
@@ -126,7 +194,7 @@ func (r *Layer2Relayer) ProcessSavedEvents(wg *sync.WaitGroup) {
 		for _, msg := range msgs[:size] {
 			msg := msg
 			g.Go(func() error {
-				return r.processSavedEvent(msg, batch.Index)
+				return r.processSavedEvent(msg)
 			})
 		}
 		if err := g.Wait(); err != nil {
@@ -138,13 +206,24 @@ func (r *Layer2Relayer) ProcessSavedEvents(wg *sync.WaitGroup) {
 	}
 }
 
-func (r *Layer2Relayer) processSavedEvent(msg *orm.L2Message, index uint64) error {
+func (r *Layer2Relayer) processSavedEvent(msg *types.L2Message) error {
 	// @todo fetch merkle proof from l2geth
 	log.Info("Processing L2 Message", "msg.nonce", msg.Nonce, "msg.height", msg.Height)
 
+	// Get the block info that contains the message
+	blockInfos, err := r.db.GetL2BlockInfos(map[string]interface{}{"number": msg.Height})
+	if err != nil {
+		log.Error("Failed to GetL2BlockInfos from DB", "number", msg.Height)
+	}
+	blockInfo := blockInfos[0]
+	if !blockInfo.BatchHash.Valid {
+		log.Error("Block has not been batched yet", "number", blockInfo.Number, "msg.nonce", msg.Nonce)
+		return nil
+	}
+
+	// TODO: rebuild the withdraw trie to generate the merkle proof
 	proof := bridge_abi.IL1ScrollMessengerL2MessageProof{
-		BlockHeight: big.NewInt(int64(msg.Height)),
-		BatchIndex:  big.NewInt(0).SetUint64(index),
+		BatchHash:   common.HexToHash(blockInfo.BatchHash.String),
 		MerkleProof: make([]byte, 0),
 	}
 	from := common.HexToAddress(msg.Sender)
@@ -155,23 +234,21 @@ func (r *Layer2Relayer) processSavedEvent(msg *orm.L2Message, index uint64) erro
 		log.Error("Failed to parse message value", "msg.nonce", msg.Nonce, "msg.height", msg.Height)
 		// TODO: need to skip this message by changing its status to MsgError
 	}
-	fee, _ := big.NewInt(0).SetString(msg.Fee, 10)
-	deadline := big.NewInt(int64(msg.Deadline))
 	msgNonce := big.NewInt(int64(msg.Nonce))
 	calldata := common.Hex2Bytes(msg.Calldata)
-	data, err := r.l1MessengerABI.Pack("relayMessageWithProof", from, target, value, fee, deadline, msgNonce, calldata, proof)
+	data, err := r.l1MessengerABI.Pack("relayMessageWithProof", from, target, value, msgNonce, calldata, proof)
 	if err != nil {
 		log.Error("Failed to pack relayMessageWithProof", "msg.nonce", msg.Nonce, "err", err)
 		// TODO: need to skip this message by changing its status to MsgError
 		return err
 	}
 
-	hash, err := r.messageSender.SendTransaction(msg.MsgHash, &r.cfg.MessengerContractAddress, big.NewInt(0), data)
+	hash, err := r.messageSender.SendTransaction(msg.MsgHash, &r.cfg.MessengerContractAddress, big.NewInt(0), data, r.minGasLimitForMessageRelay)
 	if err != nil && err.Error() == "execution reverted: Message expired" {
-		return r.db.UpdateLayer2Status(r.ctx, msg.MsgHash, orm.MsgExpired)
+		return r.db.UpdateLayer2Status(r.ctx, msg.MsgHash, types.MsgExpired)
 	}
 	if err != nil && err.Error() == "execution reverted: Message successfully executed" {
-		return r.db.UpdateLayer2Status(r.ctx, msg.MsgHash, orm.MsgConfirmed)
+		return r.db.UpdateLayer2Status(r.ctx, msg.MsgHash, types.MsgConfirmed)
 	}
 	if err != nil {
 		if !errors.Is(err, sender.ErrNoAvailableAccount) {
@@ -179,11 +256,12 @@ func (r *Layer2Relayer) processSavedEvent(msg *orm.L2Message, index uint64) erro
 		}
 		return err
 	}
+	bridgeL2MsgsRelayedTotalCounter.Inc(1)
 	log.Info("relayMessageWithProof to layer1", "msgHash", msg.MsgHash, "txhash", hash.String())
 
 	// save status in db
 	// @todo handle db error
-	err = r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, msg.MsgHash, orm.MsgSubmitted, hash.String())
+	err = r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, msg.MsgHash, types.MsgSubmitted, hash.String())
 	if err != nil {
 		log.Error("UpdateLayer2StatusAndLayer1Hash failed", "msgHash", msg.MsgHash, "err", err)
 		return err
@@ -192,206 +270,244 @@ func (r *Layer2Relayer) processSavedEvent(msg *orm.L2Message, index uint64) erro
 	return nil
 }
 
-// ProcessPendingBatches submit batch data to layer 1 rollup contract
-func (r *Layer2Relayer) ProcessPendingBatches(wg *sync.WaitGroup) {
-	defer wg.Done()
-	// batches are sorted by batch index in increasing order
-	batchesInDB, err := r.db.GetPendingBatches(1)
+// ProcessGasPriceOracle imports gas price to layer1
+func (r *Layer2Relayer) ProcessGasPriceOracle() {
+	batch, err := r.db.GetLatestBatch()
 	if err != nil {
-		log.Error("Failed to fetch pending L2 batches", "err", err)
-		return
-	}
-	if len(batchesInDB) == 0 {
-		return
-	}
-	id := batchesInDB[0]
-	// @todo add support to relay multiple batches
-
-	batches, err := r.db.GetBlockBatches(map[string]interface{}{"id": id})
-	if err != nil || len(batches) == 0 {
-		log.Error("Failed to GetBlockBatches", "batch_id", id, "err", err)
-		return
-	}
-	batch := batches[0]
-
-	traces, err := r.db.GetBlockTraces(map[string]interface{}{"batch_id": id}, "ORDER BY number ASC")
-	if err != nil || len(traces) == 0 {
-		log.Error("Failed to GetBlockTraces", "batch_id", id, "err", err)
+		log.Error("Failed to GetLatestBatch", "err", err)
 		return
 	}
 
-	layer2Batch := &bridge_abi.IZKRollupLayer2Batch{
-		BatchIndex: batch.Index,
-		ParentHash: common.HexToHash(batch.ParentHash),
-		Blocks:     make([]bridge_abi.IZKRollupLayer2BlockHeader, len(traces)),
-	}
-
-	parentHash := common.HexToHash(batch.ParentHash)
-	for i, trace := range traces {
-		layer2Batch.Blocks[i] = bridge_abi.IZKRollupLayer2BlockHeader{
-			BlockHash:   trace.Header.Hash(),
-			ParentHash:  parentHash,
-			BaseFee:     trace.Header.BaseFee,
-			StateRoot:   trace.StorageTrace.RootAfter,
-			BlockHeight: trace.Header.Number.Uint64(),
-			GasUsed:     0,
-			Timestamp:   trace.Header.Time,
-			ExtraData:   make([]byte, 0),
-			Txs:         make([]bridge_abi.IZKRollupLayer2Transaction, len(trace.Transactions)),
-		}
-		for j, tx := range trace.Transactions {
-			layer2Batch.Blocks[i].Txs[j] = bridge_abi.IZKRollupLayer2Transaction{
-				Caller:   tx.From,
-				Nonce:    tx.Nonce,
-				Gas:      tx.Gas,
-				GasPrice: tx.GasPrice.ToInt(),
-				Value:    tx.Value.ToInt(),
-				Data:     common.Hex2Bytes(tx.Data),
-				R:        tx.R.ToInt(),
-				S:        tx.S.ToInt(),
-				V:        tx.V.ToInt().Uint64(),
-			}
-			if tx.To != nil {
-				layer2Batch.Blocks[i].Txs[j].Target = *tx.To
-			}
-			layer2Batch.Blocks[i].GasUsed += trace.ExecutionResults[j].Gas
+	if batch.OracleStatus == types.GasOraclePending {
+		suggestGasPrice, err := r.l2Client.SuggestGasPrice(r.ctx)
+		if err != nil {
+			log.Error("Failed to fetch SuggestGasPrice from l2geth", "err", err)
+			return
 		}
+		suggestGasPriceUint64 := uint64(suggestGasPrice.Int64())
+		expectedDelta := r.lastGasPrice * r.gasPriceDiff / gasPriceDiffPrecision
 
-		// for next iteration
-		parentHash = layer2Batch.Blocks[i].BlockHash
+		// last is undefine or (suggestGasPriceUint64 >= minGasPrice && exceed diff)
+		if r.lastGasPrice == 0 || (suggestGasPriceUint64 >= r.minGasPrice && (suggestGasPriceUint64 >= r.lastGasPrice+expectedDelta || suggestGasPriceUint64 <= r.lastGasPrice-expectedDelta)) {
+			data, err := r.l2GasOracleABI.Pack("setL2BaseFee", suggestGasPrice)
+			if err != nil {
+				log.Error("Failed to pack setL2BaseFee", "batch.Hash", batch.Hash, "GasPrice", suggestGasPrice.Uint64(), "err", err)
+				return
+			}
+
+			hash, err := r.gasOracleSender.SendTransaction(batch.Hash, &r.cfg.GasPriceOracleContractAddress, big.NewInt(0), data, 0)
+			if err != nil {
+				if !errors.Is(err, sender.ErrNoAvailableAccount) {
+					log.Error("Failed to send setL2BaseFee tx to layer2 ", "batch.Hash", batch.Hash, "err", err)
+				}
+				return
+			}
+
+			err = r.db.UpdateL2GasOracleStatusAndOracleTxHash(r.ctx, batch.Hash, types.GasOracleImporting, hash.String())
+			if err != nil {
+				log.Error("UpdateGasOracleStatusAndOracleTxHash failed", "batch.Hash", batch.Hash, "err", err)
+				return
+			}
+			r.lastGasPrice = suggestGasPriceUint64
+			log.Info("Update l2 gas price", "txHash", hash.String(), "GasPrice", suggestGasPrice)
+		}
+	}
+}
+
+// SendCommitTx sends commitBatches tx to L1.
+func (r *Layer2Relayer) SendCommitTx(batchData []*types.BatchData) error {
+	if len(batchData) == 0 {
+		log.Error("SendCommitTx receives empty batch")
+		return nil
 	}
 
-	data, err := r.l1RollupABI.Pack("commitBatch", layer2Batch)
+	// pack calldata
+	commitBatches := make([]bridge_abi.IScrollChainBatch, len(batchData))
+	for i, batch := range batchData {
+		commitBatches[i] = batch.Batch
+	}
+	calldata, err := r.l1RollupABI.Pack("commitBatches", commitBatches)
 	if err != nil {
-		log.Error("Failed to pack commitBatch", "id", id, "index", batch.Index, "err", err)
-		return
+		log.Error("Failed to pack commitBatches",
+			"error", err,
+			"start_batch_index", commitBatches[0].BatchIndex,
+			"end_batch_index", commitBatches[len(commitBatches)-1].BatchIndex)
+		return err
 	}
 
-	txID := id + "-commit"
-	// add suffix `-commit` to avoid duplication with finalize tx in unit tests
-	hash, err := r.rollupSender.SendTransaction(txID, &r.cfg.RollupContractAddress, big.NewInt(0), data)
+	// generate a unique txID and send transaction
+	var bytes []byte
+	for _, batch := range batchData {
+		bytes = append(bytes, batch.Hash().Bytes()...)
+	}
+	txID := crypto.Keccak256Hash(bytes).String()
+	txHash, err := r.rollupSender.SendTransaction(txID, &r.cfg.RollupContractAddress, big.NewInt(0), calldata, 0)
 	if err != nil {
 		if !errors.Is(err, sender.ErrNoAvailableAccount) {
-			log.Error("Failed to send commitBatch tx to layer1 ", "id", id, "index", batch.Index, "err", err)
+			log.Error("Failed to send commitBatches tx to layer1 ", "err", err)
 		}
-		return
+		return err
 	}
-	log.Info("commitBatch in layer1", "batch_id", id, "index", batch.Index, "hash", hash)
+	bridgeL2BatchesCommittedTotalCounter.Inc(int64(len(commitBatches)))
+	log.Info("Sent the commitBatches tx to layer1",
+		"tx_hash", txHash.Hex(),
+		"start_batch_index", commitBatches[0].BatchIndex,
+		"end_batch_index", commitBatches[len(commitBatches)-1].BatchIndex)
 
 	// record and sync with db, @todo handle db error
-	err = r.db.UpdateCommitTxHashAndRollupStatus(r.ctx, id, hash.String(), orm.RollupCommitting)
-	if err != nil {
-		log.Error("UpdateCommitTxHashAndRollupStatus failed", "id", id, "index", batch.Index, "err", err)
+	batchHashes := make([]string, len(batchData))
+	for i, batch := range batchData {
+		batchHashes[i] = batch.Hash().Hex()
+		err = r.db.UpdateCommitTxHashAndRollupStatus(r.ctx, batchHashes[i], txHash.String(), types.RollupCommitting)
+		if err != nil {
+			log.Error("UpdateCommitTxHashAndRollupStatus failed", "hash", batchHashes[i], "index", batch.Batch.BatchIndex, "err", err)
+		}
 	}
-	r.processingCommitment.Store(txID, id)
+	r.processingBatchesCommitment.Store(txID, batchHashes)
+	return nil
 }
 
 // ProcessCommittedBatches submit proof to layer 1 rollup contract
-func (r *Layer2Relayer) ProcessCommittedBatches(wg *sync.WaitGroup) {
-	defer wg.Done()
-
+func (r *Layer2Relayer) ProcessCommittedBatches() {
 	// set skipped batches in a single db operation
 	if count, err := r.db.UpdateSkippedBatches(); err != nil {
 		log.Error("UpdateSkippedBatches failed", "err", err)
 		// continue anyway
 	} else if count > 0 {
+		bridgeL2BatchesSkippedTotalCounter.Inc(count)
 		log.Info("Skipping batches", "count", count)
 	}
 
 	// batches are sorted by batch index in increasing order
-	batches, err := r.db.GetCommittedBatches(1)
+	batchHashes, err := r.db.GetCommittedBatches(1)
 	if err != nil {
 		log.Error("Failed to fetch committed L2 batches", "err", err)
 		return
 	}
-	if len(batches) == 0 {
+	if len(batchHashes) == 0 {
 		return
 	}
-	id := batches[0]
+	hash := batchHashes[0]
 	// @todo add support to relay multiple batches
 
-	status, err := r.db.GetProvingStatusByID(id)
+	batches, err := r.db.GetBlockBatches(map[string]interface{}{"hash": hash}, "LIMIT 1")
 	if err != nil {
-		log.Error("GetProvingStatusByID failed", "id", id, "err", err)
+		log.Error("Failed to fetch committed L2 batch", "hash", hash, "err", err)
+		return
+	}
+	if len(batches) == 0 {
+		log.Error("Unexpected result for GetBlockBatches", "hash", hash, "len", 0)
 		return
 	}
 
+	batch := batches[0]
+	status := batch.ProvingStatus
+
 	switch status {
-	case orm.ProvingTaskUnassigned, orm.ProvingTaskAssigned:
+	case types.ProvingTaskUnassigned, types.ProvingTaskAssigned:
 		// The proof for this block is not ready yet.
 		return
 
-	case orm.ProvingTaskProved:
+	case types.ProvingTaskProved:
 		// It's an intermediate state. The roller manager received the proof but has not verified
 		// the proof yet. We don't roll up the proof until it's verified.
 		return
 
-	case orm.ProvingTaskFailed, orm.ProvingTaskSkipped:
+	case types.ProvingTaskFailed, types.ProvingTaskSkipped:
 		// note: this is covered by UpdateSkippedBatches, but we keep it for completeness's sake
 
-		if err = r.db.UpdateRollupStatus(r.ctx, id, orm.RollupFinalizationSkipped); err != nil {
-			log.Warn("UpdateRollupStatus failed", "id", id, "err", err)
+		if err = r.db.UpdateRollupStatus(r.ctx, hash, types.RollupFinalizationSkipped); err != nil {
+			log.Warn("UpdateRollupStatus failed", "hash", hash, "err", err)
 		}
 
-	case orm.ProvingTaskVerified:
-		log.Info("Start to roll up zk proof", "id", id)
+	case types.ProvingTaskVerified:
+		log.Info("Start to roll up zk proof", "hash", hash)
 		success := false
 
+		previousBatch, err := r.db.GetLatestFinalizingOrFinalizedBatch()
+
+		// skip submitting proof
+		if err == nil && uint64(batch.CreatedAt.Sub(*previousBatch.CreatedAt).Seconds()) < r.cfg.FinalizeBatchIntervalSec {
+			log.Info(
+				"Not enough time passed, skipping",
+				"hash", hash,
+				"createdAt", batch.CreatedAt,
+				"lastFinalizingHash", previousBatch.Hash,
+				"lastFinalizingStatus", previousBatch.RollupStatus,
+				"lastFinalizingCreatedAt", previousBatch.CreatedAt,
+			)
+
+			if err = r.db.UpdateRollupStatus(r.ctx, hash, types.RollupFinalizationSkipped); err != nil {
+				log.Warn("UpdateRollupStatus failed", "hash", hash, "err", err)
+			} else {
+				success = true
+			}
+
+			return
+		}
+
+		// handle unexpected db error
+		if err != nil && err.Error() != "sql: no rows in result set" {
+			log.Error("Failed to get latest finalized batch", "err", err)
+			return
+		}
+
 		defer func() {
 			// TODO: need to revisit this and have a more fine-grained error handling
 			if !success {
-				log.Info("Failed to upload the proof, change rollup status to FinalizationSkipped", "id", id)
-				if err = r.db.UpdateRollupStatus(r.ctx, id, orm.RollupFinalizationSkipped); err != nil {
-					log.Warn("UpdateRollupStatus failed", "id", id, "err", err)
+				log.Info("Failed to upload the proof, change rollup status to FinalizationSkipped", "hash", hash)
+				if err = r.db.UpdateRollupStatus(r.ctx, hash, types.RollupFinalizationSkipped); err != nil {
+					log.Warn("UpdateRollupStatus failed", "hash", hash, "err", err)
 				}
 			}
 		}()
 
-		proofBuffer, instanceBuffer, err := r.db.GetVerifiedProofAndInstanceByID(id)
+		proofBuffer, instanceBuffer, err := r.db.GetVerifiedProofAndInstanceByHash(hash)
 		if err != nil {
-			log.Warn("fetch get proof by id failed", "id", id, "err", err)
+			log.Warn("fetch get proof by hash failed", "hash", hash, "err", err)
 			return
 		}
 		if proofBuffer == nil || instanceBuffer == nil {
-			log.Warn("proof or instance not ready", "id", id)
+			log.Warn("proof or instance not ready", "hash", hash)
 			return
 		}
 		if len(proofBuffer)%32 != 0 {
-			log.Error("proof buffer has wrong length", "id", id, "length", len(proofBuffer))
+			log.Error("proof buffer has wrong length", "hash", hash, "length", len(proofBuffer))
 			return
 		}
 		if len(instanceBuffer)%32 != 0 {
-			log.Warn("instance buffer has wrong length", "id", id, "length", len(instanceBuffer))
+			log.Warn("instance buffer has wrong length", "hash", hash, "length", len(instanceBuffer))
 			return
 		}
 
 		proof := utils.BufferToUint256Le(proofBuffer)
 		instance := utils.BufferToUint256Le(instanceBuffer)
-		data, err := r.l1RollupABI.Pack("finalizeBatchWithProof", common.HexToHash(id), proof, instance)
+		data, err := r.l1RollupABI.Pack("finalizeBatchWithProof", common.HexToHash(hash), proof, instance)
 		if err != nil {
 			log.Error("Pack finalizeBatchWithProof failed", "err", err)
 			return
 		}
 
-		txID := id + "-finalize"
+		txID := hash + "-finalize"
 		// add suffix `-finalize` to avoid duplication with commit tx in unit tests
-		txHash, err := r.rollupSender.SendTransaction(txID, &r.cfg.RollupContractAddress, big.NewInt(0), data)
-		hash := &txHash
+		txHash, err := r.rollupSender.SendTransaction(txID, &r.cfg.RollupContractAddress, big.NewInt(0), data, 0)
+		finalizeTxHash := &txHash
 		if err != nil {
 			if !errors.Is(err, sender.ErrNoAvailableAccount) {
-				log.Error("finalizeBatchWithProof in layer1 failed", "id", id, "err", err)
+				log.Error("finalizeBatchWithProof in layer1 failed", "hash", hash, "err", err)
 			}
 			return
 		}
-		log.Info("finalizeBatchWithProof in layer1", "batch_id", id, "hash", hash)
+		bridgeL2BatchesFinalizedTotalCounter.Inc(1)
+		log.Info("finalizeBatchWithProof in layer1", "batch_hash", hash, "tx_hash", hash)
 
 		// record and sync with db, @todo handle db error
-		err = r.db.UpdateFinalizeTxHashAndRollupStatus(r.ctx, id, hash.String(), orm.RollupFinalizing)
+		err = r.db.UpdateFinalizeTxHashAndRollupStatus(r.ctx, hash, finalizeTxHash.String(), types.RollupFinalizing)
 		if err != nil {
-			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "batch_id", id, "err", err)
+			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "batch_hash", hash, "err", err)
 		}
 		success = true
-		r.processingFinalization.Store(txID, id)
+		r.processingFinalization.Store(txID, hash)
 
 	default:
 		log.Error("encounter unreachable case in ProcessCommittedBatches",
@@ -403,27 +519,42 @@ func (r *Layer2Relayer) ProcessCommittedBatches(wg *sync.WaitGroup) {
 // Start the relayer process
 func (r *Layer2Relayer) Start() {
 	go func() {
-		// trigger by timer
-		ticker := time.NewTicker(time.Second)
-		defer ticker.Stop()
+		ctx, cancel := context.WithCancel(r.ctx)
+		go cutil.Loop(ctx, time.Second, r.ProcessSavedEvents)
+		go cutil.Loop(ctx, time.Second, r.ProcessCommittedBatches)
+		go cutil.Loop(ctx, time.Second, r.ProcessGasPriceOracle)
 
-		for {
-			select {
-			case <-ticker.C:
-				var wg = sync.WaitGroup{}
-				wg.Add(3)
-				go r.ProcessSavedEvents(&wg)
-				go r.ProcessPendingBatches(&wg)
-				go r.ProcessCommittedBatches(&wg)
-				wg.Wait()
-			case confirmation := <-r.messageCh:
-				r.handleConfirmation(confirmation)
-			case confirmation := <-r.rollupCh:
-				r.handleConfirmation(confirmation)
-			case <-r.stopCh:
-				return
+		go func(ctx context.Context) {
+			for {
+				select {
+				case <-ctx.Done():
+					return
+				case confirmation := <-r.messageCh:
+					r.handleConfirmation(confirmation)
+				case confirmation := <-r.rollupCh:
+					r.handleConfirmation(confirmation)
+				case cfm := <-r.gasOracleCh:
+					if !cfm.IsSuccessful {
+						// @discuss: maybe make it pending again?
+						err := r.db.UpdateL2GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleFailed, cfm.TxHash.String())
+						if err != nil {
+							log.Warn("UpdateL2GasOracleStatusAndOracleTxHash failed", "err", err)
+						}
+						log.Warn("transaction confirmed but failed in layer1", "confirmation", cfm)
+					} else {
+						// @todo handle db error
+						err := r.db.UpdateL2GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleImported, cfm.TxHash.String())
+						if err != nil {
+							log.Warn("UpdateL2GasOracleStatusAndOracleTxHash failed", "err", err)
+						}
+						log.Info("transaction confirmed in layer1", "confirmation", cfm)
+					}
+				}
 			}
-		}
+		}(ctx)
+
+		<-r.stopCh
+		cancel()
 	}()
 }
 
@@ -443,32 +574,38 @@ func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) {
 	if msgHash, ok := r.processingMessage.Load(confirmation.ID); ok {
 		transactionType = "MessageRelay"
 		// @todo handle db error
-		err := r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, msgHash.(string), orm.MsgConfirmed, confirmation.TxHash.String())
+		err := r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, msgHash.(string), types.MsgConfirmed, confirmation.TxHash.String())
 		if err != nil {
 			log.Warn("UpdateLayer2StatusAndLayer1Hash failed", "msgHash", msgHash.(string), "err", err)
 		}
+		bridgeL2MsgsRelayedConfirmedTotalCounter.Inc(1)
 		r.processingMessage.Delete(confirmation.ID)
 	}
 
-	// check whether it is block commitment transaction
-	if batchID, ok := r.processingCommitment.Load(confirmation.ID); ok {
-		transactionType = "BatchCommitment"
-		// @todo handle db error
-		err := r.db.UpdateCommitTxHashAndRollupStatus(r.ctx, batchID.(string), confirmation.TxHash.String(), orm.RollupCommitted)
-		if err != nil {
-			log.Warn("UpdateCommitTxHashAndRollupStatus failed", "batch_id", batchID.(string), "err", err)
+	// check whether it is CommitBatches transaction
+	if batchBatches, ok := r.processingBatchesCommitment.Load(confirmation.ID); ok {
+		transactionType = "BatchesCommitment"
+		batchHashes := batchBatches.([]string)
+		for _, batchHash := range batchHashes {
+			// @todo handle db error
+			err := r.db.UpdateCommitTxHashAndRollupStatus(r.ctx, batchHash, confirmation.TxHash.String(), types.RollupCommitted)
+			if err != nil {
+				log.Warn("UpdateCommitTxHashAndRollupStatus failed", "batch_hash", batchHash, "err", err)
+			}
 		}
-		r.processingCommitment.Delete(confirmation.ID)
+		bridgeL2BatchesCommittedConfirmedTotalCounter.Inc(int64(len(batchHashes)))
+		r.processingBatchesCommitment.Delete(confirmation.ID)
 	}
 
 	// check whether it is proof finalization transaction
-	if batchID, ok := r.processingFinalization.Load(confirmation.ID); ok {
+	if batchHash, ok := r.processingFinalization.Load(confirmation.ID); ok {
 		transactionType = "ProofFinalization"
 		// @todo handle db error
-		err := r.db.UpdateFinalizeTxHashAndRollupStatus(r.ctx, batchID.(string), confirmation.TxHash.String(), orm.RollupFinalized)
+		err := r.db.UpdateFinalizeTxHashAndRollupStatus(r.ctx, batchHash.(string), confirmation.TxHash.String(), types.RollupFinalized)
 		if err != nil {
-			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "batch_id", batchID.(string), "err", err)
+			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "batch_hash", batchHash.(string), "err", err)
 		}
+		bridgeL2BatchesFinalizedConfirmedTotalCounter.Inc(1)
 		r.processingFinalization.Delete(confirmation.ID)
 	}
 	log.Info("transaction confirmed in layer1", "type", transactionType, "confirmation", confirmation)

bridge/l2/relayer_test.go

@@ -5,28 +5,26 @@ import (
 	"encoding/json"
 	"math/big"
 	"os"
-	"sync"
+	"strconv"
 	"testing"
-	"time"
 
-	"github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/common"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/stretchr/testify/assert"
 
+	"scroll-tech/common/types"
+
 	"scroll-tech/database"
 	"scroll-tech/database/migrate"
-	"scroll-tech/database/orm"
 )
 
 var (
-	templateL2Message = []*orm.L2Message{
+	templateL2Message = []*types.L2Message{
 		{
 			Nonce:      1,
 			Height:     1,
 			Sender:     "0x596a746661dbed76a84556111c2872249b070e15",
 			Value:      "100",
-			Fee:        "100",
-			GasLimit:   11529940,
-			Deadline:   uint64(time.Now().Unix()),
 			Target:     "0x2c73620b223808297ea734d946813f0dd78eb8f7",
 			Calldata:   "testdata",
 			Layer2Hash: "hash0",
@@ -41,7 +39,7 @@ func testCreateNewRelayer(t *testing.T) {
 	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
 	defer db.Close()
 
-	relayer, err := NewLayer2Relayer(context.Background(), db, cfg.L2Config.RelayerConfig)
+	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, cfg.L2Config.RelayerConfig)
 	assert.NoError(t, err)
 	defer relayer.Stop()
 
@@ -56,113 +54,42 @@ func testL2RelayerProcessSaveEvents(t *testing.T) {
 	defer db.Close()
 
 	l2Cfg := cfg.L2Config
-	relayer, err := NewLayer2Relayer(context.Background(), db, l2Cfg.RelayerConfig)
+	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig)
 	assert.NoError(t, err)
 	defer relayer.Stop()
 
 	err = db.SaveL2Messages(context.Background(), templateL2Message)
 	assert.NoError(t, err)
 
-	traces := []*types.BlockTrace{
+	traces := []*geth_types.BlockTrace{
 		{
-			Header: &types.Header{
+			Header: &geth_types.Header{
 				Number: big.NewInt(int64(templateL2Message[0].Height)),
 			},
 		},
 		{
-			Header: &types.Header{
+			Header: &geth_types.Header{
 				Number: big.NewInt(int64(templateL2Message[0].Height + 1)),
 			},
 		},
 	}
-	err = db.InsertBlockTraces(traces)
-	assert.NoError(t, err)
+	assert.NoError(t, db.InsertL2BlockTraces(traces))
 
 	dbTx, err := db.Beginx()
 	assert.NoError(t, err)
-	batchID, err := db.NewBatchInDBTx(dbTx,
-		&orm.BlockInfo{Number: templateL2Message[0].Height},
-		&orm.BlockInfo{Number: templateL2Message[0].Height + 1},
-		"0f", 1, 194676) // parentHash & totalTxNum & totalL2Gas don't really matter here
-	assert.NoError(t, err)
-	err = db.SetBatchIDForBlocksInDBTx(dbTx, []uint64{
-		templateL2Message[0].Height,
-		templateL2Message[0].Height + 1}, batchID)
-	assert.NoError(t, err)
-	err = dbTx.Commit()
+	assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData1))
+	batchHash := batchData1.Hash().Hex()
+	assert.NoError(t, db.SetBatchHashForL2BlocksInDBTx(dbTx, []uint64{1}, batchHash))
+	assert.NoError(t, dbTx.Commit())
+
+	err = db.UpdateRollupStatus(context.Background(), batchHash, types.RollupFinalized)
 	assert.NoError(t, err)
 
-	err = db.UpdateRollupStatus(context.Background(), batchID, orm.RollupFinalized)
-	assert.NoError(t, err)
-
-	var wg = sync.WaitGroup{}
-	wg.Add(1)
-	relayer.ProcessSavedEvents(&wg)
-	wg.Wait()
+	relayer.ProcessSavedEvents()
 
 	msg, err := db.GetL2MessageByNonce(templateL2Message[0].Nonce)
 	assert.NoError(t, err)
-	assert.Equal(t, orm.MsgSubmitted, msg.Status)
-}
-
-func testL2RelayerProcessPendingBatches(t *testing.T) {
-	// Create db handler and reset db.
-	db, err := database.NewOrmFactory(cfg.DBConfig)
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
-	defer db.Close()
-
-	l2Cfg := cfg.L2Config
-	relayer, err := NewLayer2Relayer(context.Background(), db, l2Cfg.RelayerConfig)
-	assert.NoError(t, err)
-	defer relayer.Stop()
-
-	// this blockresult has number of 0x4, need to change it to match the testcase
-	// In this testcase scenario, db will store two blocks with height 0x4 and 0x3
-	var traces []*types.BlockTrace
-
-	templateBlockTrace, err := os.ReadFile("../../common/testdata/blockTrace_02.json")
-	assert.NoError(t, err)
-	blockTrace := &types.BlockTrace{}
-	err = json.Unmarshal(templateBlockTrace, blockTrace)
-	assert.NoError(t, err)
-	traces = append(traces, blockTrace)
-	templateBlockTrace, err = os.ReadFile("../../common/testdata/blockTrace_03.json")
-	assert.NoError(t, err)
-	blockTrace = &types.BlockTrace{}
-	err = json.Unmarshal(templateBlockTrace, blockTrace)
-	assert.NoError(t, err)
-	traces = append(traces, blockTrace)
-
-	err = db.InsertBlockTraces(traces)
-	assert.NoError(t, err)
-
-	dbTx, err := db.Beginx()
-	assert.NoError(t, err)
-	batchID, err := db.NewBatchInDBTx(dbTx,
-		&orm.BlockInfo{Number: traces[0].Header.Number.Uint64()},
-		&orm.BlockInfo{Number: traces[1].Header.Number.Uint64()},
-		"ff", 1, 194676) // parentHash & totalTxNum & totalL2Gas don't really matter here
-	assert.NoError(t, err)
-	err = db.SetBatchIDForBlocksInDBTx(dbTx, []uint64{
-		traces[0].Header.Number.Uint64(),
-		traces[1].Header.Number.Uint64()}, batchID)
-	assert.NoError(t, err)
-	err = dbTx.Commit()
-	assert.NoError(t, err)
-
-	// err = db.UpdateRollupStatus(context.Background(), batchID, orm.RollupPending)
-	// assert.NoError(t, err)
-
-	var wg = sync.WaitGroup{}
-	wg.Add(1)
-	relayer.ProcessPendingBatches(&wg)
-	wg.Wait()
-
-	// Check if Rollup Result is changed successfully
-	status, err := db.GetRollupStatus(batchID)
-	assert.NoError(t, err)
-	assert.Equal(t, orm.RollupCommitting, status)
+	assert.Equal(t, types.MsgSubmitted, msg.Status)
 }
 
 func testL2RelayerProcessCommittedBatches(t *testing.T) {
@@ -173,35 +100,32 @@ func testL2RelayerProcessCommittedBatches(t *testing.T) {
 	defer db.Close()
 
 	l2Cfg := cfg.L2Config
-	relayer, err := NewLayer2Relayer(context.Background(), db, l2Cfg.RelayerConfig)
+	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig)
 	assert.NoError(t, err)
 	defer relayer.Stop()
 
 	dbTx, err := db.Beginx()
 	assert.NoError(t, err)
-	batchID, err := db.NewBatchInDBTx(dbTx, &orm.BlockInfo{}, &orm.BlockInfo{}, "0", 1, 194676) // startBlock & endBlock & parentHash & totalTxNum & totalL2Gas don't really matter here
-	assert.NoError(t, err)
+	assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData1))
+	batchHash := batchData1.Hash().Hex()
 	err = dbTx.Commit()
 	assert.NoError(t, err)
 
-	err = db.UpdateRollupStatus(context.Background(), batchID, orm.RollupCommitted)
+	err = db.UpdateRollupStatus(context.Background(), batchHash, types.RollupCommitted)
 	assert.NoError(t, err)
 
 	tProof := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
 	tInstanceCommitments := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-	err = db.UpdateProofByID(context.Background(), batchID, tProof, tInstanceCommitments, 100)
+	err = db.UpdateProofByHash(context.Background(), batchHash, tProof, tInstanceCommitments, 100)
 	assert.NoError(t, err)
-	err = db.UpdateProvingStatus(batchID, orm.ProvingTaskVerified)
+	err = db.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
 	assert.NoError(t, err)
 
-	var wg = sync.WaitGroup{}
-	wg.Add(1)
-	relayer.ProcessCommittedBatches(&wg)
-	wg.Wait()
+	relayer.ProcessCommittedBatches()
 
-	status, err := db.GetRollupStatus(batchID)
+	status, err := db.GetRollupStatus(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, orm.RollupFinalizing, status)
+	assert.Equal(t, types.RollupFinalizing, status)
 }
 
 func testL2RelayerSkipBatches(t *testing.T) {
@@ -212,62 +136,75 @@ func testL2RelayerSkipBatches(t *testing.T) {
 	defer db.Close()
 
 	l2Cfg := cfg.L2Config
-	relayer, err := NewLayer2Relayer(context.Background(), db, l2Cfg.RelayerConfig)
+	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig)
 	assert.NoError(t, err)
 	defer relayer.Stop()
 
-	createBatch := func(rollupStatus orm.RollupStatus, provingStatus orm.ProvingStatus) string {
+	createBatch := func(rollupStatus types.RollupStatus, provingStatus types.ProvingStatus, index uint64) string {
 		dbTx, err := db.Beginx()
 		assert.NoError(t, err)
-		batchID, err := db.NewBatchInDBTx(dbTx, &orm.BlockInfo{}, &orm.BlockInfo{}, "0", 1, 194676) // startBlock & endBlock & parentHash & totalTxNum & totalL2Gas don't really matter here
-		assert.NoError(t, err)
+		batchData := genBatchData(t, index)
+		assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData))
+		batchHash := batchData.Hash().Hex()
 		err = dbTx.Commit()
 		assert.NoError(t, err)
 
-		err = db.UpdateRollupStatus(context.Background(), batchID, rollupStatus)
+		err = db.UpdateRollupStatus(context.Background(), batchHash, rollupStatus)
 		assert.NoError(t, err)
 
 		tProof := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
 		tInstanceCommitments := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-		err = db.UpdateProofByID(context.Background(), batchID, tProof, tInstanceCommitments, 100)
+		err = db.UpdateProofByHash(context.Background(), batchHash, tProof, tInstanceCommitments, 100)
 		assert.NoError(t, err)
-		err = db.UpdateProvingStatus(batchID, provingStatus)
+		err = db.UpdateProvingStatus(batchHash, provingStatus)
 		assert.NoError(t, err)
 
-		return batchID
+		return batchHash
 	}
 
 	skipped := []string{
-		createBatch(orm.RollupCommitted, orm.ProvingTaskSkipped),
-		createBatch(orm.RollupCommitted, orm.ProvingTaskFailed),
+		createBatch(types.RollupCommitted, types.ProvingTaskSkipped, 1),
+		createBatch(types.RollupCommitted, types.ProvingTaskFailed, 2),
 	}
 
 	notSkipped := []string{
-		createBatch(orm.RollupPending, orm.ProvingTaskSkipped),
-		createBatch(orm.RollupCommitting, orm.ProvingTaskSkipped),
-		createBatch(orm.RollupFinalizing, orm.ProvingTaskSkipped),
-		createBatch(orm.RollupFinalized, orm.ProvingTaskSkipped),
-		createBatch(orm.RollupPending, orm.ProvingTaskFailed),
-		createBatch(orm.RollupCommitting, orm.ProvingTaskFailed),
-		createBatch(orm.RollupFinalizing, orm.ProvingTaskFailed),
-		createBatch(orm.RollupFinalized, orm.ProvingTaskFailed),
-		createBatch(orm.RollupCommitted, orm.ProvingTaskVerified),
+		createBatch(types.RollupPending, types.ProvingTaskSkipped, 3),
+		createBatch(types.RollupCommitting, types.ProvingTaskSkipped, 4),
+		createBatch(types.RollupFinalizing, types.ProvingTaskSkipped, 5),
+		createBatch(types.RollupFinalized, types.ProvingTaskSkipped, 6),
+		createBatch(types.RollupPending, types.ProvingTaskFailed, 7),
+		createBatch(types.RollupCommitting, types.ProvingTaskFailed, 8),
+		createBatch(types.RollupFinalizing, types.ProvingTaskFailed, 9),
+		createBatch(types.RollupFinalized, types.ProvingTaskFailed, 10),
+		createBatch(types.RollupCommitted, types.ProvingTaskVerified, 11),
 	}
 
-	var wg = sync.WaitGroup{}
-	wg.Add(1)
-	relayer.ProcessCommittedBatches(&wg)
-	wg.Wait()
+	relayer.ProcessCommittedBatches()
 
 	for _, id := range skipped {
 		status, err := db.GetRollupStatus(id)
 		assert.NoError(t, err)
-		assert.Equal(t, orm.RollupFinalizationSkipped, status)
+		assert.Equal(t, types.RollupFinalizationSkipped, status)
 	}
 
 	for _, id := range notSkipped {
 		status, err := db.GetRollupStatus(id)
 		assert.NoError(t, err)
-		assert.NotEqual(t, orm.RollupFinalizationSkipped, status)
+		assert.NotEqual(t, types.RollupFinalizationSkipped, status)
 	}
 }
+
+func genBatchData(t *testing.T, index uint64) *types.BatchData {
+	templateBlockTrace, err := os.ReadFile("../../common/testdata/blockTrace_02.json")
+	assert.NoError(t, err)
+	// unmarshal blockTrace
+	blockTrace := &geth_types.BlockTrace{}
+	err = json.Unmarshal(templateBlockTrace, blockTrace)
+	assert.NoError(t, err)
+	blockTrace.Header.ParentHash = common.HexToHash("0x" + strconv.FormatUint(index+1, 16))
+	parentBatch := &types.BlockBatch{
+		Index: index,
+		Hash:  "0x0000000000000000000000000000000000000000",
+	}
+	return types.NewBatchData(parentBatch, []*geth_types.BlockTrace{blockTrace}, nil)
+}

bridge/l2/watcher.go

@@ -2,6 +2,7 @@ package l2
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"math/big"
 	"reflect"
@@ -10,18 +11,31 @@ import (
 	geth "github.com/scroll-tech/go-ethereum"
 	"github.com/scroll-tech/go-ethereum/accounts/abi"
 	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/core/types"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/event"
 	"github.com/scroll-tech/go-ethereum/log"
+	geth_metrics "github.com/scroll-tech/go-ethereum/metrics"
+	"github.com/scroll-tech/go-ethereum/rpc"
+
+	"scroll-tech/common/metrics"
+	"scroll-tech/common/types"
+	cutil "scroll-tech/common/utils"
+	"scroll-tech/database"
 
 	bridge_abi "scroll-tech/bridge/abi"
 	"scroll-tech/bridge/utils"
+)
 
-	"scroll-tech/database"
-	"scroll-tech/database/orm"
+// Metrics
+var (
+	bridgeL2MsgsSyncHeightGauge      = geth_metrics.NewRegisteredGauge("bridge/l2/msgs/sync/height", metrics.ScrollRegistry)
+	bridgeL2TracesFetchedHeightGauge = geth_metrics.NewRegisteredGauge("bridge/l2/traces/fetched/height", metrics.ScrollRegistry)
+	bridgeL2TracesFetchedGapGauge    = geth_metrics.NewRegisteredGauge("bridge/l2/traces/fetched/gap", metrics.ScrollRegistry)
 
-	"scroll-tech/bridge/config"
+	bridgeL2MsgsSentEventsTotalCounter    = geth_metrics.NewRegisteredCounter("bridge/l2/msgs/sent/events/total", metrics.ScrollRegistry)
+	bridgeL2MsgsAppendEventsTotalCounter  = geth_metrics.NewRegisteredCounter("bridge/l2/msgs/append/events/total", metrics.ScrollRegistry)
+	bridgeL2MsgsRelayedEventsTotalCounter = geth_metrics.NewRegisteredCounter("bridge/l2/msgs/relayed/events/total", metrics.ScrollRegistry)
 )
 
 type relayedMessage struct {
@@ -39,39 +53,98 @@ type WatcherClient struct {
 
 	orm database.OrmFactory
 
-	confirmations    uint64
+	confirmations rpc.BlockNumber
+
 	messengerAddress common.Address
 	messengerABI     *abi.ABI
 
+	messageQueueAddress common.Address
+	messageQueueABI     *abi.ABI
+
 	// The height of the block that the watcher has retrieved event logs
 	processedMsgHeight uint64
 
 	stopped uint64
 	stopCh  chan struct{}
-
-	batchProposer *batchProposer
 }
 
 // NewL2WatcherClient take a l2geth instance to generate a l2watcherclient instance
-func NewL2WatcherClient(ctx context.Context, client *ethclient.Client, confirmations uint64, bpCfg *config.BatchProposerConfig, messengerAddress common.Address, orm database.OrmFactory) *WatcherClient {
+func NewL2WatcherClient(ctx context.Context, client *ethclient.Client, confirmations rpc.BlockNumber, messengerAddress, messageQueueAddress common.Address, orm database.OrmFactory) *WatcherClient {
 	savedHeight, err := orm.GetLayer2LatestWatchedHeight()
 	if err != nil {
 		log.Warn("fetch height from db failed", "err", err)
 		savedHeight = 0
 	}
 
-	return &WatcherClient{
+	w := WatcherClient{
 		ctx:                ctx,
 		Client:             client,
 		orm:                orm,
 		processedMsgHeight: uint64(savedHeight),
 		confirmations:      confirmations,
-		messengerAddress:   messengerAddress,
-		messengerABI:       bridge_abi.L2MessengerMetaABI,
-		stopCh:             make(chan struct{}),
-		stopped:            0,
-		batchProposer:      newBatchProposer(bpCfg, orm),
+
+		messengerAddress: messengerAddress,
+		messengerABI:     bridge_abi.L2ScrollMessengerABI,
+
+		messageQueueAddress: messageQueueAddress,
+		messageQueueABI:     bridge_abi.L2MessageQueueABI,
+
+		stopCh:  make(chan struct{}),
+		stopped: 0,
 	}
+
+	// Initialize genesis before we do anything else
+	if err := w.initializeGenesis(); err != nil {
+		panic(fmt.Sprintf("failed to initialize L2 genesis batch, err: %v", err))
+	}
+
+	return &w
+}
+
+func (w *WatcherClient) initializeGenesis() error {
+	if count, err := w.orm.GetBatchCount(); err != nil {
+		return fmt.Errorf("failed to get batch count: %v", err)
+	} else if count > 0 {
+		log.Info("genesis already imported")
+		return nil
+	}
+
+	genesis, err := w.HeaderByNumber(w.ctx, big.NewInt(0))
+	if err != nil {
+		return fmt.Errorf("failed to retrieve L2 genesis header: %v", err)
+	}
+
+	log.Info("retrieved L2 genesis header", "hash", genesis.Hash().String())
+
+	blockTrace := &geth_types.BlockTrace{
+		Coinbase:         nil,
+		Header:           genesis,
+		Transactions:     []*geth_types.TransactionData{},
+		StorageTrace:     nil,
+		ExecutionResults: []*geth_types.ExecutionResult{},
+		MPTWitness:       nil,
+	}
+
+	batchData := types.NewGenesisBatchData(blockTrace)
+
+	if err = AddBatchInfoToDB(w.orm, batchData); err != nil {
+		log.Error("failed to add batch info to DB", "BatchHash", batchData.Hash(), "error", err)
+		return err
+	}
+
+	batchHash := batchData.Hash().Hex()
+
+	if err = w.orm.UpdateProvingStatus(batchHash, types.ProvingTaskProved); err != nil {
+		return fmt.Errorf("failed to update genesis batch proving status: %v", err)
+	}
+
+	if err = w.orm.UpdateRollupStatus(w.ctx, batchHash, types.RollupFinalized); err != nil {
+		return fmt.Errorf("failed to update genesis batch rollup status: %v", err)
+	}
+
+	log.Info("successfully imported genesis batch")
+
+	return nil
 }
 
 // Start the Listening process
@@ -82,80 +155,23 @@ func (w *WatcherClient) Start() {
 		}
 
 		ctx, cancel := context.WithCancel(w.ctx)
-
-		// trace fetcher loop
-		go func(ctx context.Context) {
-			ticker := time.NewTicker(3 * time.Second)
-			defer ticker.Stop()
-
-			for {
-				select {
-				case <-ctx.Done():
-					return
-
-				case <-ticker.C:
-					// get current height
-					number, err := w.BlockNumber(ctx)
-					if err != nil {
-						log.Error("failed to get_BlockNumber", "err", err)
-						continue
-					}
-
-					if number >= w.confirmations {
-						number = number - w.confirmations
-					} else {
-						number = 0
-					}
-
-					w.tryFetchRunningMissingBlocks(ctx, number)
-				}
+		go cutil.LoopWithContext(ctx, 2*time.Second, func(subCtx context.Context) {
+			number, err := utils.GetLatestConfirmedBlockNumber(subCtx, w.Client, w.confirmations)
+			if err != nil {
+				log.Error("failed to get block number", "err", err)
+			} else {
+				w.tryFetchRunningMissingBlocks(ctx, number)
 			}
-		}(ctx)
+		})
 
-		// event fetcher loop
-		go func(ctx context.Context) {
-			ticker := time.NewTicker(3 * time.Second)
-			defer ticker.Stop()
-
-			for {
-				select {
-				case <-ctx.Done():
-					return
-
-				case <-ticker.C:
-					// get current height
-					number, err := w.BlockNumber(ctx)
-					if err != nil {
-						log.Error("failed to get_BlockNumber", "err", err)
-						continue
-					}
-
-					if number >= w.confirmations {
-						number = number - w.confirmations
-					} else {
-						number = 0
-					}
-
-					w.FetchContractEvent(number)
-				}
+		go cutil.LoopWithContext(ctx, 2*time.Second, func(subCtx context.Context) {
+			number, err := utils.GetLatestConfirmedBlockNumber(subCtx, w.Client, w.confirmations)
+			if err != nil {
+				log.Error("failed to get block number", "err", err)
+			} else {
+				w.FetchContractEvent(number)
 			}
-		}(ctx)
-
-		// batch proposer loop
-		go func(ctx context.Context) {
-			ticker := time.NewTicker(3 * time.Second)
-			defer ticker.Stop()
-
-			for {
-				select {
-				case <-ctx.Done():
-					return
-
-				case <-ticker.C:
-					w.batchProposer.tryProposeBatch()
-				}
-			}
-		}(ctx)
+		})
 
 		<-w.stopCh
 		cancel()
@@ -174,9 +190,9 @@ func (w *WatcherClient) tryFetchRunningMissingBlocks(ctx context.Context, blockH
 	// Get newest block in DB. must have blocks at that time.
 	// Don't use "block_trace" table "trace" column's BlockTrace.Number,
 	// because it might be empty if the corresponding rollup_result is finalized/finalization_skipped
-	heightInDB, err := w.orm.GetBlockTracesLatestHeight()
+	heightInDB, err := w.orm.GetL2BlockTracesLatestHeight()
 	if err != nil {
-		log.Error("failed to GetBlockTracesLatestHeight", "err", err)
+		log.Error("failed to GetL2BlockTracesLatestHeight", "err", err)
 		return
 	}
 
@@ -198,12 +214,13 @@ func (w *WatcherClient) tryFetchRunningMissingBlocks(ctx context.Context, blockH
 			log.Error("fail to getAndStoreBlockTraces", "from", from, "to", to, "err", err)
 			return
 		}
+		bridgeL2TracesFetchedHeightGauge.Update(int64(to))
+		bridgeL2TracesFetchedGapGauge.Update(int64(blockHeight - to))
 	}
 }
 
 func (w *WatcherClient) getAndStoreBlockTraces(ctx context.Context, from, to uint64) error {
-	var traces []*types.BlockTrace
-
+	var traces []*geth_types.BlockTrace
 	for number := from; number <= to; number++ {
 		log.Debug("retrieving block trace", "height", number)
 		trace, err2 := w.GetBlockTraceByNumber(ctx, big.NewInt(int64(number)))
@@ -211,12 +228,10 @@ func (w *WatcherClient) getAndStoreBlockTraces(ctx context.Context, from, to uin
 			return fmt.Errorf("failed to GetBlockResultByHash: %v. number: %v", err2, number)
 		}
 		log.Info("retrieved block trace", "height", trace.Header.Number, "hash", trace.Header.Hash().String())
-
 		traces = append(traces, trace)
-
 	}
 	if len(traces) > 0 {
-		if err := w.orm.InsertBlockTraces(traces); err != nil {
+		if err := w.orm.InsertL2BlockTraces(traces); err != nil {
 			return fmt.Errorf("failed to batch insert BlockTraces: %v", err)
 		}
 	}
@@ -248,13 +263,15 @@ func (w *WatcherClient) FetchContractEvent(blockHeight uint64) {
 			ToBlock:   big.NewInt(to),   // inclusive
 			Addresses: []common.Address{
 				w.messengerAddress,
+				w.messageQueueAddress,
 			},
 			Topics: make([][]common.Hash, 1),
 		}
-		query.Topics[0] = make([]common.Hash, 3)
-		query.Topics[0][0] = common.HexToHash(bridge_abi.SentMessageEventSignature)
-		query.Topics[0][1] = common.HexToHash(bridge_abi.RelayedMessageEventSignature)
-		query.Topics[0][2] = common.HexToHash(bridge_abi.FailedRelayedMessageEventSignature)
+		query.Topics[0] = make([]common.Hash, 4)
+		query.Topics[0][0] = bridge_abi.L2SentMessageEventSignature
+		query.Topics[0][1] = bridge_abi.L2RelayedMessageEventSignature
+		query.Topics[0][2] = bridge_abi.L2FailedRelayedMessageEventSignature
+		query.Topics[0][3] = bridge_abi.L2AppendMessageEventSignature
 
 		logs, err := w.FilterLogs(w.ctx, query)
 		if err != nil {
@@ -263,6 +280,7 @@ func (w *WatcherClient) FetchContractEvent(blockHeight uint64) {
 		}
 		if len(logs) == 0 {
 			w.processedMsgHeight = uint64(to)
+			bridgeL2MsgsSyncHeightGauge.Update(to)
 			continue
 		}
 		log.Info("received new L2 messages", "fromBlock", from, "toBlock", to, "cnt", len(logs))
@@ -273,17 +291,22 @@ func (w *WatcherClient) FetchContractEvent(blockHeight uint64) {
 			return
 		}
 
+		sentMessageCount := int64(len(sentMessageEvents))
+		relayedMessageCount := int64(len(relayedMessageEvents))
+		bridgeL2MsgsSentEventsTotalCounter.Inc(sentMessageCount)
+		bridgeL2MsgsRelayedEventsTotalCounter.Inc(relayedMessageCount)
+		log.Info("L2 events types", "SentMessageCount", sentMessageCount, "RelayedMessageCount", relayedMessageCount)
+
 		// Update relayed message first to make sure we don't forget to update submited message.
 		// Since, we always start sync from the latest unprocessed message.
 		for _, msg := range relayedMessageEvents {
+			var msgStatus types.MsgStatus
 			if msg.isSuccessful {
-				// succeed
-				err = w.orm.UpdateLayer1StatusAndLayer2Hash(w.ctx, msg.msgHash.String(), orm.MsgConfirmed, msg.txHash.String())
+				msgStatus = types.MsgConfirmed
 			} else {
-				// failed
-				err = w.orm.UpdateLayer1StatusAndLayer2Hash(w.ctx, msg.msgHash.String(), orm.MsgFailed, msg.txHash.String())
+				msgStatus = types.MsgFailed
 			}
-			if err != nil {
+			if err = w.orm.UpdateLayer1StatusAndLayer2Hash(w.ctx, msg.msgHash.String(), msgStatus, msg.txHash.String()); err != nil {
 				log.Error("Failed to update layer1 status and layer2 hash", "err", err)
 				return
 			}
@@ -295,71 +318,96 @@ func (w *WatcherClient) FetchContractEvent(blockHeight uint64) {
 		}
 
 		w.processedMsgHeight = uint64(to)
+		bridgeL2MsgsSyncHeightGauge.Update(to)
 	}
 }
 
-func (w *WatcherClient) parseBridgeEventLogs(logs []types.Log) ([]*orm.L2Message, []relayedMessage, error) {
+func (w *WatcherClient) parseBridgeEventLogs(logs []geth_types.Log) ([]*types.L2Message, []relayedMessage, error) {
 	// Need use contract abi to parse event Log
 	// Can only be tested after we have our contracts set up
 
-	var l2Messages []*orm.L2Message
+	var l2Messages []*types.L2Message
 	var relayedMessages []relayedMessage
+	var lastAppendMsgHash common.Hash
+	var lastAppendMsgNonce uint64
 	for _, vLog := range logs {
 		switch vLog.Topics[0] {
-		case common.HexToHash(bridge_abi.SentMessageEventSignature):
-			event := struct {
-				Target       common.Address
-				Sender       common.Address
-				Value        *big.Int // uint256
-				Fee          *big.Int // uint256
-				Deadline     *big.Int // uint256
-				Message      []byte
-				MessageNonce *big.Int // uint256
-				GasLimit     *big.Int // uint256
-			}{}
-
-			err := w.messengerABI.UnpackIntoInterface(&event, "SentMessage", vLog.Data)
+		case bridge_abi.L2SentMessageEventSignature:
+			event := bridge_abi.L2SentMessageEvent{}
+			err := utils.UnpackLog(w.messengerABI, &event, "SentMessage", vLog)
 			if err != nil {
 				log.Error("failed to unpack layer2 SentMessage event", "err", err)
 				return l2Messages, relayedMessages, err
 			}
-			// target is in topics[1]
-			event.Target = common.HexToAddress(vLog.Topics[1].String())
-			l2Messages = append(l2Messages, &orm.L2Message{
+
+			computedMsgHash := utils.ComputeMessageHash(
+				event.Sender,
+				event.Target,
+				event.Value,
+				event.MessageNonce,
+				event.Message,
+			)
+
+			// `AppendMessage` event is always emitted before `SentMessage` event
+			// So they should always match, just double check
+			if event.MessageNonce.Uint64() != lastAppendMsgNonce {
+				errMsg := fmt.Sprintf("l2 message nonces mismatch: AppendMessage.nonce=%v, SentMessage.nonce=%v, tx_hash=%v",
+					lastAppendMsgNonce, event.MessageNonce.Uint64(), vLog.TxHash.Hex())
+				return l2Messages, relayedMessages, errors.New(errMsg)
+			}
+			if computedMsgHash != lastAppendMsgHash {
+				errMsg := fmt.Sprintf("l2 message hashes mismatch: AppendMessage.msg_hash=%v, SentMessage.msg_hash=%v, tx_hash=%v",
+					lastAppendMsgHash.Hex(), computedMsgHash.Hex(), vLog.TxHash.Hex())
+				return l2Messages, relayedMessages, errors.New(errMsg)
+			}
+
+			l2Messages = append(l2Messages, &types.L2Message{
 				Nonce:      event.MessageNonce.Uint64(),
-				MsgHash:    utils.ComputeMessageHash(event.Sender, event.Target, event.Value, event.Fee, event.Deadline, event.Message, event.MessageNonce).String(),
+				MsgHash:    computedMsgHash.String(),
 				Height:     vLog.BlockNumber,
 				Sender:     event.Sender.String(),
 				Value:      event.Value.String(),
-				Fee:        event.Fee.String(),
-				GasLimit:   event.GasLimit.Uint64(),
-				Deadline:   event.Deadline.Uint64(),
 				Target:     event.Target.String(),
 				Calldata:   common.Bytes2Hex(event.Message),
 				Layer2Hash: vLog.TxHash.Hex(),
 			})
-		case common.HexToHash(bridge_abi.RelayedMessageEventSignature):
-			event := struct {
-				MsgHash common.Hash
-			}{}
-			// MsgHash is in topics[1]
-			event.MsgHash = common.HexToHash(vLog.Topics[1].String())
+		case bridge_abi.L2RelayedMessageEventSignature:
+			event := bridge_abi.L2RelayedMessageEvent{}
+			err := utils.UnpackLog(w.messengerABI, &event, "RelayedMessage", vLog)
+			if err != nil {
+				log.Warn("Failed to unpack layer2 RelayedMessage event", "err", err)
+				return l2Messages, relayedMessages, err
+			}
+
 			relayedMessages = append(relayedMessages, relayedMessage{
-				msgHash:      event.MsgHash,
+				msgHash:      event.MessageHash,
 				txHash:       vLog.TxHash,
 				isSuccessful: true,
 			})
-		case common.HexToHash(bridge_abi.FailedRelayedMessageEventSignature):
-			event := struct {
-				MsgHash common.Hash
-			}{}
-			// MsgHash is in topics[1]
-			event.MsgHash = common.HexToHash(vLog.Topics[1].String())
+		case bridge_abi.L2FailedRelayedMessageEventSignature:
+			event := bridge_abi.L2FailedRelayedMessageEvent{}
+			err := utils.UnpackLog(w.messengerABI, &event, "FailedRelayedMessage", vLog)
+			if err != nil {
+				log.Warn("Failed to unpack layer2 FailedRelayedMessage event", "err", err)
+				return l2Messages, relayedMessages, err
+			}
+
 			relayedMessages = append(relayedMessages, relayedMessage{
-				msgHash:      event.MsgHash,
+				msgHash:      event.MessageHash,
 				txHash:       vLog.TxHash,
 				isSuccessful: false,
 			})
+		case bridge_abi.L2AppendMessageEventSignature:
+			event := bridge_abi.L2AppendMessageEvent{}
+			err := utils.UnpackLog(w.messageQueueABI, &event, "AppendMessage", vLog)
+			if err != nil {
+				log.Warn("Failed to unpack layer2 AppendMessage event", "err", err)
+				return l2Messages, relayedMessages, err
+			}
+
+			lastAppendMsgHash = event.MessageHash
+			lastAppendMsgNonce = event.Index.Uint64()
+			bridgeL2MsgsAppendEventsTotalCounter.Inc(1)
 		default:
 			log.Error("Unknown event", "topic", vLog.Topics[0], "txHash", vLog.TxHash)
 		}

bridge/l2/watcher_test.go

@@ -10,17 +10,18 @@ import (
 
 	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
 	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/core/types"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/rpc"
 	"github.com/stretchr/testify/assert"
 
-	"scroll-tech/bridge/config"
+	"scroll-tech/common/types"
+
 	"scroll-tech/bridge/mock_bridge"
 	"scroll-tech/bridge/sender"
 
 	"scroll-tech/database"
 	"scroll-tech/database/migrate"
-	"scroll-tech/database/orm"
 )
 
 func testCreateNewWatcherAndStop(t *testing.T) {
@@ -31,12 +32,12 @@ func testCreateNewWatcherAndStop(t *testing.T) {
 	defer l2db.Close()
 
 	l2cfg := cfg.L2Config
-	rc := NewL2WatcherClient(context.Background(), l2Cli, l2cfg.Confirmations, l2cfg.BatchProposerConfig, l2cfg.L2MessengerAddress, l2db)
+	rc := NewL2WatcherClient(context.Background(), l2Cli, l2cfg.Confirmations, l2cfg.L2MessengerAddress, l2cfg.L2MessageQueueAddress, l2db)
 	rc.Start()
 	defer rc.Stop()
 
 	l1cfg := cfg.L1Config
-	l1cfg.RelayerConfig.SenderConfig.Confirmations = 0
+	l1cfg.RelayerConfig.SenderConfig.Confirmations = rpc.LatestBlockNumber
 	newSender, err := sender.NewSender(context.Background(), l1cfg.RelayerConfig.SenderConfig, l1cfg.RelayerConfig.MessageSenderPrivateKeys)
 	assert.NoError(t, err)
 
@@ -44,7 +45,7 @@ func testCreateNewWatcherAndStop(t *testing.T) {
 	numTransactions := 3
 	toAddress := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
 	for i := 0; i < numTransactions; i++ {
-		_, err = newSender.SendTransaction(strconv.Itoa(1000+i), &toAddress, big.NewInt(1000000000), nil)
+		_, err = newSender.SendTransaction(strconv.Itoa(1000+i), &toAddress, big.NewInt(1000000000), nil, 0)
 		assert.NoError(t, err)
 		<-newSender.ConfirmChan()
 	}
@@ -61,6 +62,11 @@ func testMonitorBridgeContract(t *testing.T) {
 	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
 	defer db.Close()
 
+	l2cfg := cfg.L2Config
+	wc := NewL2WatcherClient(context.Background(), l2Cli, l2cfg.Confirmations, l2cfg.L2MessengerAddress, l2cfg.L2MessageQueueAddress, db)
+	wc.Start()
+	defer wc.Stop()
+
 	previousHeight, err := l2Cli.BlockNumber(context.Background())
 	assert.NoError(t, err)
 
@@ -72,7 +78,7 @@ func testMonitorBridgeContract(t *testing.T) {
 	address, err := bind.WaitDeployed(context.Background(), l2Cli, tx)
 	assert.NoError(t, err)
 
-	rc := prepareRelayerClient(l2Cli, cfg.L2Config.BatchProposerConfig, db, address)
+	rc := prepareWatcherClient(l2Cli, db, address)
 	rc.Start()
 	defer rc.Stop()
 
@@ -85,7 +91,7 @@ func testMonitorBridgeContract(t *testing.T) {
 	tx, err = instance.SendMessage(auth, toAddress, fee, message, gasLimit)
 	assert.NoError(t, err)
 	receipt, err := bind.WaitMined(context.Background(), l2Cli, tx)
-	if receipt.Status != types.ReceiptStatusSuccessful || err != nil {
+	if receipt.Status != geth_types.ReceiptStatusSuccessful || err != nil {
 		t.Fatalf("Call failed")
 	}
 
@@ -95,7 +101,7 @@ func testMonitorBridgeContract(t *testing.T) {
 	tx, err = instance.SendMessage(auth, toAddress, fee, message, gasLimit)
 	assert.NoError(t, err)
 	receipt, err = bind.WaitMined(context.Background(), l2Cli, tx)
-	if receipt.Status != types.ReceiptStatusSuccessful || err != nil {
+	if receipt.Status != geth_types.ReceiptStatusSuccessful || err != nil {
 		t.Fatalf("Call failed")
 	}
 
@@ -112,7 +118,7 @@ func testMonitorBridgeContract(t *testing.T) {
 	assert.NoError(t, err)
 	t.Log("Height in DB is", height)
 	assert.Greater(t, height, int64(previousHeight))
-	msgs, err := db.GetL2Messages(map[string]interface{}{"status": orm.MsgPending})
+	msgs, err := db.GetL2Messages(map[string]interface{}{"status": types.MsgPending})
 	assert.NoError(t, err)
 	assert.Equal(t, 2, len(msgs))
 }
@@ -134,13 +140,13 @@ func testFetchMultipleSentMessageInOneBlock(t *testing.T) {
 	address, err := bind.WaitDeployed(context.Background(), l2Cli, trx)
 	assert.NoError(t, err)
 
-	rc := prepareRelayerClient(l2Cli, cfg.L2Config.BatchProposerConfig, db, address)
+	rc := prepareWatcherClient(l2Cli, db, address)
 	rc.Start()
 	defer rc.Stop()
 
 	// Call mock_bridge instance sendMessage to trigger emit events multiple times
 	numTransactions := 4
-	var tx *types.Transaction
+	var tx *geth_types.Transaction
 
 	for i := 0; i < numTransactions; i++ {
 		addr := common.HexToAddress("0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63")
@@ -156,7 +162,7 @@ func testFetchMultipleSentMessageInOneBlock(t *testing.T) {
 	}
 
 	receipt, err := bind.WaitMined(context.Background(), l2Cli, tx)
-	if receipt.Status != types.ReceiptStatusSuccessful || err != nil {
+	if receipt.Status != geth_types.ReceiptStatusSuccessful || err != nil {
 		t.Fatalf("Call failed")
 	}
 
@@ -172,7 +178,7 @@ func testFetchMultipleSentMessageInOneBlock(t *testing.T) {
 	tx, err = instance.SendMessage(auth, toAddress, fee, message, gasLimit)
 	assert.NoError(t, err)
 	receipt, err = bind.WaitMined(context.Background(), l2Cli, tx)
-	if receipt.Status != types.ReceiptStatusSuccessful || err != nil {
+	if receipt.Status != geth_types.ReceiptStatusSuccessful || err != nil {
 		t.Fatalf("Call failed")
 	}
 
@@ -184,13 +190,14 @@ func testFetchMultipleSentMessageInOneBlock(t *testing.T) {
 	assert.NoError(t, err)
 	t.Log("LatestHeight is", height)
 	assert.Greater(t, height, int64(previousHeight)) // height must be greater than previousHeight because confirmations is 0
-	msgs, err := db.GetL2Messages(map[string]interface{}{"status": orm.MsgPending})
+	msgs, err := db.GetL2Messages(map[string]interface{}{"status": types.MsgPending})
 	assert.NoError(t, err)
 	assert.Equal(t, 5, len(msgs))
 }
 
-func prepareRelayerClient(l2Cli *ethclient.Client, bpCfg *config.BatchProposerConfig, db database.OrmFactory, contractAddr common.Address) *WatcherClient {
-	return NewL2WatcherClient(context.Background(), l2Cli, 0, bpCfg, contractAddr, db)
+func prepareWatcherClient(l2Cli *ethclient.Client, db database.OrmFactory, contractAddr common.Address) *WatcherClient {
+	confirmations := rpc.LatestBlockNumber
+	return NewL2WatcherClient(context.Background(), l2Cli, confirmations, contractAddr, contractAddr, db)
 }
 
 func prepareAuth(t *testing.T, l2Cli *ethclient.Client, privateKey *ecdsa.PrivateKey) *bind.TransactOpts {

bridge/mock_bridge/MockBridgeL1.sol

@@ -2,98 +2,120 @@
 pragma solidity ^0.8.0;
 
 contract MockBridgeL1 {
+  /******************************
+   * Events from L1MessageQueue *
+   ******************************/
+
+  /// @notice Emitted when a new L1 => L2 transaction is appended to the queue.
+  /// @param sender The address of account who initiates the transaction.
+  /// @param target The address of account who will recieve the transaction.
+  /// @param value The value passed with the transaction.
+  /// @param queueIndex The index of this transaction in the queue.
+  /// @param gasLimit Gas limit required to complete the message relay on L2.
+  /// @param data The calldata of the transaction.
+  event QueueTransaction(
+    address indexed sender,
+    address indexed target,
+    uint256 value,
+    uint256 queueIndex,
+    uint256 gasLimit,
+    bytes data
+  );
+
   /*********************************
    * Events from L1ScrollMessenger *
    *********************************/
 
+  /// @notice Emitted when a cross domain message is sent.
+  /// @param sender The address of the sender who initiates the message.
+  /// @param target The address of target contract to call.
+  /// @param value The amount of value passed to the target contract.
+  /// @param messageNonce The nonce of the message.
+  /// @param gasLimit The optional gas limit passed to L1 or L2.
+  /// @param message The calldata passed to the target contract.
   event SentMessage(
+    address indexed sender,
     address indexed target,
-    address sender,
     uint256 value,
-    uint256 fee,
-    uint256 deadline,
-    bytes message,
     uint256 messageNonce,
-    uint256 gasLimit
+    uint256 gasLimit,
+    bytes message
   );
 
-  event MessageDropped(bytes32 indexed msgHash);
+  /// @notice Emitted when a cross domain message is relayed successfully.
+  /// @param messageHash The hash of the message.
+  event RelayedMessage(bytes32 indexed messageHash);
 
-  event RelayedMessage(bytes32 indexed msgHash);
+  /// @dev The maximum number of transaction in on batch.
+  uint256 public immutable maxNumTxInBatch;
 
-  event FailedRelayedMessage(bytes32 indexed msgHash);
+  /// @dev The hash used for padding public inputs.
+  bytes32 public immutable paddingTxHash;
 
-  /************************
-   * Events from ZKRollup *
-   ************************/
+  /***************************
+   * Events from ScrollChain *
+   ***************************/
 
   /// @notice Emitted when a new batch is commited.
-  /// @param _batchHash The hash of the batch
-  /// @param _batchIndex The index of the batch
-  /// @param _parentHash The hash of parent batch
-  event CommitBatch(bytes32 indexed _batchId, bytes32 _batchHash, uint256 _batchIndex, bytes32 _parentHash);
+  /// @param batchHash The hash of the batch
+  event CommitBatch(bytes32 indexed batchHash);
 
   /// @notice Emitted when a batch is reverted.
-  /// @param _batchId The identification of the batch.
-  event RevertBatch(bytes32 indexed _batchId);
+  /// @param batchHash The identification of the batch.
+  event RevertBatch(bytes32 indexed batchHash);
 
   /// @notice Emitted when a batch is finalized.
-  /// @param _batchHash The hash of the batch
-  /// @param _batchIndex The index of the batch
-  /// @param _parentHash The hash of parent batch
-  event FinalizeBatch(bytes32 indexed _batchId, bytes32 _batchHash, uint256 _batchIndex, bytes32 _parentHash);
+  /// @param batchHash The hash of the batch
+  event FinalizeBatch(bytes32 indexed batchHash);
 
   /***********
    * Structs *
    ***********/
 
-  struct L2MessageProof {
-    uint256 batchIndex;
-    uint256 blockHeight;
-    bytes merkleProof;
-  }
-
-  /// @dev The transanction struct
-  struct Layer2Transaction {
-    address caller;
-    uint64 nonce;
-    address target;
-    uint64 gas;
-    uint256 gasPrice;
-    uint256 value;
-    bytes data;
-    // signature
-    uint256 r;
-    uint256 s;
-    uint64 v;
-  }
-
-  /// @dev The block header struct
-  struct Layer2BlockHeader {
+  struct BlockContext {
+    // The hash of this block.
     bytes32 blockHash;
+    // The parent hash of this block.
     bytes32 parentHash;
-    uint256 baseFee;
-    bytes32 stateRoot;
-    uint64 blockHeight;
-    uint64 gasUsed;
+    // The height of this block.
+    uint64 blockNumber;
+    // The timestamp of this block.
     uint64 timestamp;
-    bytes extraData;
-    Layer2Transaction[] txs;
+    // The base fee of this block.
+    // Currently, it is not used, because we disable EIP-1559.
+    // We keep it for future proof.
+    uint256 baseFee;
+    // The gas limit of this block.
+    uint64 gasLimit;
+    // The number of transactions in this block, both L1 & L2 txs.
+    uint16 numTransactions;
+    // The number of l1 messages in this block.
+    uint16 numL1Messages;
   }
 
-  /// @dev The batch struct, the batch hash is always the last block hash of `blocks`.
-  struct Layer2Batch {
+  struct Batch {
+    // The list of blocks in this batch
+    BlockContext[] blocks; // MAX_NUM_BLOCKS = 100, about 5 min
+    // The state root of previous batch.
+    // The first batch will use 0x0 for prevStateRoot
+    bytes32 prevStateRoot;
+    // The state root of the last block in this batch.
+    bytes32 newStateRoot;
+    // The withdraw trie root of the last block in this batch.
+    bytes32 withdrawTrieRoot;
+    // The index of the batch.
     uint64 batchIndex;
-    // The hash of the last block in the parent batch
-    bytes32 parentHash;
-    Layer2BlockHeader[] blocks;
+    // The parent batch hash.
+    bytes32 parentBatchHash;
+    // Concatenated raw data of RLP encoded L2 txs
+    bytes l2Transactions;
   }
 
-  struct Layer2BatchStored {
+  struct L2MessageProof {
+    // The hash of the batch where the message belongs to.
     bytes32 batchHash;
-    bytes32 parentHash;
-    uint64 batchIndex;
-    bool verified;
+    // Concatenation of merkle proof for withdraw merkle trie.
+    bytes merkleProof;
   }
 
   /*************
@@ -103,27 +125,39 @@ contract MockBridgeL1 {
   /// @notice Message nonce, used to avoid relay attack.
   uint256 public messageNonce;
 
-  /// @notice Mapping from batch id to batch struct.
-  mapping(bytes32 => Layer2BatchStored) public batches;
+  /***************
+   * Constructor *
+   ***************/
+
+  constructor() {
+    maxNumTxInBatch = 44;
+    paddingTxHash = 0x0000000000000000000000000000000000000000000000000000000000000000;
+  }
+
+  /***********************************
+   * Functions from L2GasPriceOracle *
+   ***********************************/
+
+  function setL2BaseFee(uint256) external {
+  }
 
   /************************************
    * Functions from L1ScrollMessenger *
    ************************************/
 
   function sendMessage(
-    address _to,
-    uint256 _fee,
-    bytes memory _message,
-    uint256 _gasLimit
+    address target,
+    uint256 value,
+    bytes calldata message,
+    uint256 gasLimit
   ) external payable {
-    // solhint-disable-next-line not-rely-on-time
-    uint256 _deadline = block.timestamp + 1 days;
-    uint256 _value;
-    unchecked {
-      _value = msg.value - _fee;
+    bytes memory _xDomainCalldata = _encodeXDomainCalldata(msg.sender, target, value, messageNonce, message);
+    {
+      address _sender = applyL1ToL2Alias(address(this));
+      emit QueueTransaction(_sender, target, 0, messageNonce, gasLimit, _xDomainCalldata);
     }
-    uint256 _nonce = messageNonce;
-    emit SentMessage(_to, msg.sender, _value, _fee, _deadline, _message, _nonce, _gasLimit);
+
+    emit SentMessage(msg.sender, target, value, messageNonce, gasLimit, message);
     messageNonce += 1;
   }
 
@@ -131,57 +165,216 @@ contract MockBridgeL1 {
     address _from,
     address _to,
     uint256 _value,
-    uint256 _fee,
-    uint256 _deadline,
     uint256 _nonce,
     bytes memory _message,
     L2MessageProof memory
   ) external {
-    bytes32 _msghash = keccak256(abi.encodePacked(_from, _to, _value, _fee, _deadline, _nonce, _message));
-    emit RelayedMessage(_msghash);
+    bytes memory _xDomainCalldata = _encodeXDomainCalldata(_from, _to, _value, _nonce, _message);
+    bytes32 _xDomainCalldataHash = keccak256(_xDomainCalldata);
+    emit RelayedMessage(_xDomainCalldataHash);
   }
 
-  /***************************
-   * Functions from ZKRollup *
-   ***************************/
+  /******************************
+   * Functions from ScrollChain *
+   ******************************/
 
-  function commitBatch(Layer2Batch memory _batch) external {
-    bytes32 _batchHash = _batch.blocks[_batch.blocks.length - 1].blockHash;
-    bytes32 _batchId = _computeBatchId(_batchHash, _batch.parentHash, _batch.batchIndex);
-
-    Layer2BatchStored storage _batchStored = batches[_batchId];
-    _batchStored.batchHash = _batchHash;
-    _batchStored.parentHash = _batch.parentHash;
-    _batchStored.batchIndex = _batch.batchIndex;
-
-    emit CommitBatch(_batchId, _batchHash, _batch.batchIndex, _batch.parentHash);
+  function commitBatch(Batch memory _batch) external {
+    _commitBatch(_batch);
   }
-  
-  function revertBatch(bytes32 _batchId) external {
-    emit RevertBatch(_batchId);
+
+  function commitBatches(Batch[] memory _batches) external {
+    for (uint256 i = 0; i < _batches.length; i++) {
+      _commitBatch(_batches[i]);
+    }
+  }
+
+  function revertBatch(bytes32 _batchHash) external {
+    emit RevertBatch(_batchHash);
   }
 
   function finalizeBatchWithProof(
-    bytes32 _batchId,
+    bytes32 _batchHash,
     uint256[] memory,
     uint256[] memory
   ) external {
-    Layer2BatchStored storage _batch = batches[_batchId];
-    uint256 _batchIndex = _batch.batchIndex;
-
-    emit FinalizeBatch(_batchId, _batch.batchHash, _batchIndex, _batch.parentHash);
+    emit FinalizeBatch(_batchHash);
   }
 
-  /// @dev Internal function to compute a unique batch id for mapping.
-  /// @param _batchHash The hash of the batch.
-  /// @param _parentHash The hash of the batch.
-  /// @param _batchIndex The index of the batch.
-  /// @return Return the computed batch id.
-  function _computeBatchId(
-    bytes32 _batchHash,
-    bytes32 _parentHash,
-    uint256 _batchIndex
-  ) internal pure returns (bytes32) {
-    return keccak256(abi.encode(_batchHash, _parentHash, _batchIndex));
+  /**********************
+   * Internal Functions *
+   **********************/
+
+  function _commitBatch(Batch memory _batch) internal {
+    bytes32 _batchHash = _computePublicInputHash(_batch);
+    emit CommitBatch(_batchHash);
   }
-}
+
+  /// @dev Internal function to generate the correct cross domain calldata for a message.
+  /// @param _sender Message sender address.
+  /// @param _target Target contract address.
+  /// @param _value The amount of ETH pass to the target.
+  /// @param _messageNonce Nonce for the provided message.
+  /// @param _message Message to send to the target.
+  /// @return ABI encoded cross domain calldata.
+  function _encodeXDomainCalldata(
+    address _sender,
+    address _target,
+    uint256 _value,
+    uint256 _messageNonce,
+    bytes memory _message
+  ) internal pure returns (bytes memory) {
+    return
+      abi.encodeWithSignature(
+        "relayMessage(address,address,uint256,uint256,bytes)",
+        _sender,
+        _target,
+        _value,
+        _messageNonce,
+        _message
+      );
+  }
+
+  function applyL1ToL2Alias(address l1Address) internal pure returns (address l2Address) {
+    uint160 offset = uint160(0x1111000000000000000000000000000000001111);
+    unchecked {
+      l2Address = address(uint160(l1Address) + offset);
+    }
+  }
+
+  /// @dev Internal function to compute the public input hash.
+  /// @param batch The batch to compute.
+  function _computePublicInputHash(Batch memory batch)
+    internal
+    view
+    returns (
+      bytes32
+    )
+  {
+    uint256 publicInputsPtr;
+    // 1. append prevStateRoot, newStateRoot and withdrawTrieRoot to public inputs
+    {
+      bytes32 prevStateRoot = batch.prevStateRoot;
+      bytes32 newStateRoot = batch.newStateRoot;
+      bytes32 withdrawTrieRoot = batch.withdrawTrieRoot;
+      // number of bytes in public inputs: 32 * 3 + 124 * blocks + 32 * MAX_NUM_TXS
+      uint256 publicInputsSize = 32 * 3 + batch.blocks.length * 124 + 32 * maxNumTxInBatch;
+      assembly {
+        publicInputsPtr := mload(0x40)
+        mstore(0x40, add(publicInputsPtr, publicInputsSize))
+        mstore(publicInputsPtr, prevStateRoot)
+        publicInputsPtr := add(publicInputsPtr, 0x20)
+        mstore(publicInputsPtr, newStateRoot)
+        publicInputsPtr := add(publicInputsPtr, 0x20)
+        mstore(publicInputsPtr, withdrawTrieRoot)
+        publicInputsPtr := add(publicInputsPtr, 0x20)
+      }
+    }
+
+    uint64 numTransactionsInBatch;
+    BlockContext memory _block;
+    // 2. append block information to public inputs.
+    for (uint256 i = 0; i < batch.blocks.length; i++) {
+      // validate blocks, we won't check first block against previous batch.
+      {
+        BlockContext memory _currentBlock = batch.blocks[i];
+        if (i > 0) {
+          require(_block.blockHash == _currentBlock.parentHash, "Parent hash mismatch");
+          require(_block.blockNumber + 1 == _currentBlock.blockNumber, "Block number mismatch");
+        }
+        _block = _currentBlock;
+      }
+
+      // append blockHash and parentHash to public inputs
+      {
+        bytes32 blockHash = _block.blockHash;
+        bytes32 parentHash = _block.parentHash;
+        assembly {
+          mstore(publicInputsPtr, blockHash)
+          publicInputsPtr := add(publicInputsPtr, 0x20)
+          mstore(publicInputsPtr, parentHash)
+          publicInputsPtr := add(publicInputsPtr, 0x20)
+        }
+      }
+      // append blockNumber and blockTimestamp to public inputs
+      {
+        uint256 blockNumber = _block.blockNumber;
+        uint256 blockTimestamp = _block.timestamp;
+        assembly {
+          mstore(publicInputsPtr, shl(192, blockNumber))
+          publicInputsPtr := add(publicInputsPtr, 0x8)
+          mstore(publicInputsPtr, shl(192, blockTimestamp))
+          publicInputsPtr := add(publicInputsPtr, 0x8)
+        }
+      }
+      // append baseFee to public inputs
+      {
+        uint256 baseFee = _block.baseFee;
+        assembly {
+          mstore(publicInputsPtr, baseFee)
+          publicInputsPtr := add(publicInputsPtr, 0x20)
+        }
+      }
+      uint64 numTransactionsInBlock = _block.numTransactions;
+      // gasLimit, numTransactions and numL1Messages to public inputs
+      {
+        uint256 gasLimit = _block.gasLimit;
+        uint256 numL1MessagesInBlock = _block.numL1Messages;
+        assembly {
+          mstore(publicInputsPtr, shl(192, gasLimit))
+          publicInputsPtr := add(publicInputsPtr, 0x8)
+          mstore(publicInputsPtr, shl(240, numTransactionsInBlock))
+          publicInputsPtr := add(publicInputsPtr, 0x2)
+          mstore(publicInputsPtr, shl(240, numL1MessagesInBlock))
+          publicInputsPtr := add(publicInputsPtr, 0x2)
+        }
+      }
+      numTransactionsInBatch += numTransactionsInBlock;
+    }
+    require(numTransactionsInBatch <= maxNumTxInBatch, "Too many transactions in batch");
+
+    // 3. append transaction hash to public inputs.
+    uint256 _l2TxnPtr;
+    {
+      bytes memory l2Transactions = batch.l2Transactions;
+      assembly {
+        _l2TxnPtr := add(l2Transactions, 0x20)
+      }
+    }
+    for (uint256 i = 0; i < batch.blocks.length; i++) {
+      uint256 numL1MessagesInBlock = batch.blocks[i].numL1Messages;
+      require(numL1MessagesInBlock == 0);
+      uint256 numTransactionsInBlock = batch.blocks[i].numTransactions;
+      for (uint256 j = numL1MessagesInBlock; j < numTransactionsInBlock; ++j) {
+        bytes32 hash;
+        assembly {
+          let txPayloadLength := shr(224, mload(_l2TxnPtr))
+          _l2TxnPtr := add(_l2TxnPtr, 4)
+          _l2TxnPtr := add(_l2TxnPtr, txPayloadLength)
+          hash := keccak256(sub(_l2TxnPtr, txPayloadLength), txPayloadLength)
+          mstore(publicInputsPtr, hash)
+          publicInputsPtr := add(publicInputsPtr, 0x20)
+        }
+      }
+    }
+
+    // 4. append padding transaction to public inputs.
+    bytes32 txHashPadding = paddingTxHash;
+    for (uint256 i = numTransactionsInBatch; i < maxNumTxInBatch; i++) {
+      assembly {
+        mstore(publicInputsPtr, txHashPadding)
+        publicInputsPtr := add(publicInputsPtr, 0x20)
+      }
+    }
+
+    // 5. compute public input hash
+    bytes32 publicInputHash;
+    {
+      uint256 publicInputsSize = 32 * 3 + batch.blocks.length * 124 + 32 * maxNumTxInBatch;
+      assembly {
+        publicInputHash := keccak256(sub(publicInputsPtr, publicInputsSize), publicInputsSize)
+      }
+    }
+
+    return publicInputHash;
+  }
+}

bridge/mock_bridge/MockBridgeL2.sol

@@ -2,26 +2,56 @@
 pragma solidity ^0.8.0;
 
 contract MockBridgeL2 {
+  /******************************
+   * Events from L2MessageQueue *
+   ******************************/
+
+  /// @notice Emitted when a new message is added to the merkle tree.
+  /// @param index The index of the corresponding message.
+  /// @param messageHash The hash of the corresponding message.
+  event AppendMessage(uint256 index, bytes32 messageHash);
+
+  /********************************
+   * Events from L1BlockContainer *
+   ********************************/
+
+  /// @notice Emitted when a block is imported.
+  /// @param blockHash The hash of the imported block.
+  /// @param blockHeight The height of the imported block.
+  /// @param blockTimestamp The timestamp of the imported block.
+  /// @param baseFee The base fee of the imported block.
+  /// @param stateRoot The state root of the imported block.
+  event ImportBlock(
+    bytes32 indexed blockHash,
+    uint256 blockHeight,
+    uint256 blockTimestamp,
+    uint256 baseFee,
+    bytes32 stateRoot
+  );
+
   /*********************************
    * Events from L2ScrollMessenger *
    *********************************/
 
+  /// @notice Emitted when a cross domain message is sent.
+  /// @param sender The address of the sender who initiates the message.
+  /// @param target The address of target contract to call.
+  /// @param value The amount of value passed to the target contract.
+  /// @param messageNonce The nonce of the message.
+  /// @param gasLimit The optional gas limit passed to L1 or L2.
+  /// @param message The calldata passed to the target contract.
   event SentMessage(
+    address indexed sender,
     address indexed target,
-    address sender,
     uint256 value,
-    uint256 fee,
-    uint256 deadline,
-    bytes message,
     uint256 messageNonce,
-    uint256 gasLimit
+    uint256 gasLimit,
+    bytes message
   );
 
-  event MessageDropped(bytes32 indexed msgHash);
-  
-  event RelayedMessage(bytes32 indexed msgHash);
-  
-  event FailedRelayedMessage(bytes32 indexed msgHash);
+  /// @notice Emitted when a cross domain message is relayed successfully.
+  /// @param messageHash The hash of the message.
+  event RelayedMessage(bytes32 indexed messageHash);
 
   /*************
    * Variables *
@@ -30,38 +60,70 @@ contract MockBridgeL2 {
   /// @notice Message nonce, used to avoid relay attack.
   uint256 public messageNonce;
 
+  /***********************************
+   * Functions from L1GasPriceOracle *
+   ***********************************/
+
+  function setL1BaseFee(uint256) external {
+  }
+
   /************************************
    * Functions from L2ScrollMessenger *
    ************************************/
 
   function sendMessage(
     address _to,
-    uint256 _fee,
+    uint256 _value,
     bytes memory _message,
     uint256 _gasLimit
   ) external payable {
-    // solhint-disable-next-line not-rely-on-time
-    uint256 _deadline = block.timestamp + 1 days;
-    uint256 _nonce = messageNonce;
-    uint256 _value;
-    unchecked {
-      _value = msg.value - _fee;
-    }
-    bytes32 _msghash = keccak256(abi.encodePacked(msg.sender, _to, _value, _fee, _deadline, _nonce, _message));
-    emit SentMessage(_to, msg.sender, _value, _fee, _deadline, _message, _nonce, _gasLimit);
-    messageNonce = _nonce + 1;
+    bytes memory _xDomainCalldata = _encodeXDomainCalldata(msg.sender, _to, _value, messageNonce, _message);
+    bytes32 _xDomainCalldataHash = keccak256(_xDomainCalldata);
+
+    emit AppendMessage(messageNonce, _xDomainCalldataHash);
+    emit SentMessage(msg.sender, _to, _value, messageNonce, _gasLimit, _message);
+
+    messageNonce += 1;
   }
 
-  function relayMessageWithProof(
+  function relayMessage(
     address _from,
     address _to,
     uint256 _value,
-    uint256 _fee,
-    uint256 _deadline,
     uint256 _nonce,
-    bytes memory _message
+    bytes calldata _message
   ) external {
-    bytes32 _msghash = keccak256(abi.encodePacked(_from, _to, _value, _fee, _deadline, _nonce, _message));
-    emit RelayedMessage(_msghash);
+    bytes memory _xDomainCalldata = _encodeXDomainCalldata(_from, _to, _value, _nonce, _message);
+    bytes32 _xDomainCalldataHash = keccak256(_xDomainCalldata);
+    emit RelayedMessage(_xDomainCalldataHash);
+  }
+
+  /**********************
+   * Internal Functions *
+   **********************/
+
+  /// @dev Internal function to generate the correct cross domain calldata for a message.
+  /// @param _sender Message sender address.
+  /// @param _target Target contract address.
+  /// @param _value The amount of ETH pass to the target.
+  /// @param _messageNonce Nonce for the provided message.
+  /// @param _message Message to send to the target.
+  /// @return ABI encoded cross domain calldata.
+  function _encodeXDomainCalldata(
+    address _sender,
+    address _target,
+    uint256 _value,
+    uint256 _messageNonce,
+    bytes memory _message
+  ) internal pure returns (bytes memory) {
+    return
+      abi.encodeWithSignature(
+        "relayMessage(address,address,uint256,uint256,bytes)",
+        _sender,
+        _target,
+        _value,
+        _messageNonce,
+        _message
+      );
   }
 }

bridge/scripts/build_abi.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# generates go bindings from contracts, to paste into abi/bridge_abi.go
+# compile artifacts in /contracts folder with `forge build`` first 
+
 # Only run if it is ran from repository root.
 if [[ ! -d "cmd" ]]
 then
@@ -14,16 +17,20 @@ else
   mkdir -p contracts
 fi
 
-abi_name=("IL1GatewayRouter" "IL2GatewayRouter" "IL1ScrollMessenger" "IL2ScrollMessenger" "ZKRollup")
-pkg_name=("l1_gateway" "l2_gateway" "l1_messenger" "l2_messenger" "rollup")
-gen_name=("L1GatewayRouter" "L2GatewayRouter" "L1ScrollMessenger" "L2ScrollMessenger" "ZKRollup")
+abi_name=("IL1GatewayRouter" "IL2GatewayRouter" "IL1ScrollMessenger" "IL2ScrollMessenger" "IScrollChain" "L1MessageQueue")
+pkg_name=("l1_gateway" "l2_gateway" "l1_messenger" "l2_messenger" "scrollchain" "l1_message_queue")
+gen_name=("L1GatewayRouter" "L2GatewayRouter" "L1ScrollMessenger" "L2ScrollMessenger" "IScrollChain" "L1MessageQueue")
 
 for i in "${!abi_name[@]}"; do
-  abi="bridge/abi/${abi_name[$i]}.json"
-  pkg="${pkg_name[$i]}"
+  mkdir -p tmp
+  abi="tmp/${abi_name[$i]}.json"
+  cat ../contracts/artifacts/src/${abi_name[$i]}.sol/${abi_name[$i]}.json | jq '.abi' > $abi
+  pkg="${pkg_name[$i]}_abi"
   out="contracts/${pkg}/${gen_name[$i]}.go"
   echo "generating ${out} from ${abi}"
   mkdir -p contracts/$pkg
   abigen --abi=$abi --pkg=$pkg --out=$out
   awk '{sub("github.com/ethereum","github.com/scroll-tech")}1' $out > temp && mv temp $out
-done
+done
+
+rm -rf tmp

bridge/sender/estimategas.go

@@ -0,0 +1,73 @@
+package sender
+
+import (
+	"math/big"
+	"sync/atomic"
+
+	"github.com/scroll-tech/go-ethereum"
+	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
+	"github.com/scroll-tech/go-ethereum/common"
+)
+
+func (s *Sender) estimateLegacyGas(auth *bind.TransactOpts, contract *common.Address, value *big.Int, input []byte, minGasLimit uint64) (*FeeData, error) {
+	gasPrice, err := s.client.SuggestGasPrice(s.ctx)
+	if err != nil {
+		return nil, err
+	}
+	gasLimit, err := s.estimateGasLimit(auth, contract, input, gasPrice, nil, nil, value, minGasLimit)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeData{
+		gasPrice: gasPrice,
+		gasLimit: gasLimit,
+	}, nil
+}
+
+func (s *Sender) estimateDynamicGas(auth *bind.TransactOpts, contract *common.Address, value *big.Int, input []byte, minGasLimit uint64) (*FeeData, error) {
+	gasTipCap, err := s.client.SuggestGasTipCap(s.ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	baseFee := big.NewInt(0)
+	if feeGas := atomic.LoadUint64(&s.baseFeePerGas); feeGas != 0 {
+		baseFee.SetUint64(feeGas)
+	}
+	gasFeeCap := new(big.Int).Add(
+		gasTipCap,
+		new(big.Int).Mul(baseFee, big.NewInt(2)),
+	)
+	gasLimit, err := s.estimateGasLimit(auth, contract, input, nil, gasTipCap, gasFeeCap, value, minGasLimit)
+	if err != nil {
+		return nil, err
+	}
+	return &FeeData{
+		gasLimit:  gasLimit,
+		gasTipCap: gasTipCap,
+		gasFeeCap: gasFeeCap,
+	}, nil
+}
+
+func (s *Sender) estimateGasLimit(opts *bind.TransactOpts, contract *common.Address, input []byte, gasPrice, gasTipCap, gasFeeCap, value *big.Int, minGasLimit uint64) (uint64, error) {
+	msg := ethereum.CallMsg{
+		From:      opts.From,
+		To:        contract,
+		GasPrice:  gasPrice,
+		GasTipCap: gasTipCap,
+		GasFeeCap: gasFeeCap,
+		Value:     value,
+		Data:      input,
+	}
+	gasLimit, err := s.client.EstimateGas(s.ctx, msg)
+	if err != nil {
+		return 0, err
+	}
+	if minGasLimit > gasLimit {
+		gasLimit = minGasLimit
+	}
+
+	gasLimit = gasLimit * 15 / 10 // 50% extra gas to void out of gas error
+
+	return gasLimit, nil
+}

bridge/sender/sender.go

@@ -12,14 +12,14 @@ import (
 	"sync/atomic"
 	"time"
 
-	geth "github.com/scroll-tech/go-ethereum"
 	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
 	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/common/math"
 	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
 
+	"scroll-tech/bridge/utils"
+
 	"scroll-tech/bridge/config"
 )
 
@@ -39,16 +39,6 @@ var (
 	ErrNoAvailableAccount = errors.New("sender has no available account to send transaction")
 )
 
-// DefaultSenderConfig The default config
-var DefaultSenderConfig = config.SenderConfig{
-	Endpoint:            "",
-	EscalateBlocks:      3,
-	EscalateMultipleNum: 11,
-	EscalateMultipleDen: 10,
-	MaxGasPrice:         1000_000_000_000, // this is 1000 gwei
-	TxType:              AccessListTxType,
-}
-
 // Confirmation struct used to indicate transaction confirmation details
 type Confirmation struct {
 	ID           string
@@ -95,9 +85,6 @@ type Sender struct {
 // NewSender returns a new instance of transaction sender
 // txConfirmationCh is used to notify confirmed transaction
 func NewSender(ctx context.Context, config *config.SenderConfig, privs []*ecdsa.PrivateKey) (*Sender, error) {
-	if config == nil {
-		config = &DefaultSenderConfig
-	}
 	client, err := ethclient.Dial(config.Endpoint)
 	if err != nil {
 		return nil, err
@@ -120,6 +107,15 @@ func NewSender(ctx context.Context, config *config.SenderConfig, privs []*ecdsa.
 		return nil, err
 	}
 
+	var baseFeePerGas uint64
+	if config.TxType == DynamicFeeTxType {
+		if header.BaseFee != nil {
+			baseFeePerGas = header.BaseFee.Uint64()
+		} else {
+			return nil, errors.New("DynamicFeeTxType not supported, header.BaseFee nil")
+		}
+	}
+
 	sender := &Sender{
 		ctx:           ctx,
 		config:        config,
@@ -128,7 +124,7 @@ func NewSender(ctx context.Context, config *config.SenderConfig, privs []*ecdsa.
 		auths:         auths,
 		confirmCh:     make(chan *Confirmation, 128),
 		blockNumber:   header.Number.Uint64(),
-		baseFeePerGas: header.BaseFee.Uint64(),
+		baseFeePerGas: baseFeePerGas,
 		pendingTxs:    sync.Map{},
 		stopCh:        make(chan struct{}),
 	}
@@ -154,42 +150,15 @@ func (s *Sender) NumberOfAccounts() int {
 	return len(s.auths.accounts)
 }
 
-func (s *Sender) getFeeData(auth *bind.TransactOpts, target *common.Address, value *big.Int, data []byte) (*FeeData, error) {
-	// estimate gas limit
-	gasLimit, err := s.client.EstimateGas(s.ctx, geth.CallMsg{From: auth.From, To: target, Value: value, Data: data})
-	if err != nil {
-		return nil, err
+func (s *Sender) getFeeData(auth *bind.TransactOpts, target *common.Address, value *big.Int, data []byte, minGasLimit uint64) (*FeeData, error) {
+	if s.config.TxType == DynamicFeeTxType {
+		return s.estimateDynamicGas(auth, target, value, data, minGasLimit)
 	}
-	gasLimit = gasLimit * 15 / 10 // 50% extra gas to void out of gas error
-	// @todo change it when Scroll enable EIP1559
-	if s.config.TxType != DynamicFeeTxType {
-		// estimate gas price
-		var gasPrice *big.Int
-		gasPrice, err = s.client.SuggestGasPrice(s.ctx)
-		if err != nil {
-			return nil, err
-		}
-		return &FeeData{
-			gasPrice: gasPrice,
-			gasLimit: gasLimit,
-		}, nil
-	}
-	gasTipCap, err := s.client.SuggestGasTipCap(s.ctx)
-	if err != nil {
-		return nil, err
-	}
-	// Make sure feeCap is bigger than txpool's gas price. 1000000000 is l2geth's default pool.gas value.
-	baseFee := atomic.LoadUint64(&s.baseFeePerGas)
-	maxFeePerGas := math.BigMax(big.NewInt(int64(baseFee)), big.NewInt(1000000000))
-	return &FeeData{
-		gasFeeCap: math.BigMax(maxFeePerGas, gasTipCap),
-		gasTipCap: math.BigMin(maxFeePerGas, gasTipCap),
-		gasLimit:  gasLimit,
-	}, nil
+	return s.estimateLegacyGas(auth, target, value, data, minGasLimit)
 }
 
 // SendTransaction send a signed L2tL1 transaction.
-func (s *Sender) SendTransaction(ID string, target *common.Address, value *big.Int, data []byte) (hash common.Hash, err error) {
+func (s *Sender) SendTransaction(ID string, target *common.Address, value *big.Int, data []byte, minGasLimit uint64) (hash common.Hash, err error) {
 	// We occupy the ID, in case some other threads call with the same ID in the same time
 	if _, loaded := s.pendingTxs.LoadOrStore(ID, nil); loaded {
 		return common.Hash{}, fmt.Errorf("has the repeat tx ID, ID: %s", ID)
@@ -213,7 +182,7 @@ func (s *Sender) SendTransaction(ID string, target *common.Address, value *big.I
 		tx      *types.Transaction
 	)
 	// estimate gas fee
-	if feeData, err = s.getFeeData(auth, target, value, data); err != nil {
+	if feeData, err = s.getFeeData(auth, target, value, data, minGasLimit); err != nil {
 		return
 	}
 	if tx, err = s.createAndSendTx(auth, feeData, target, value, data, nil); err == nil {
@@ -352,11 +321,20 @@ func (s *Sender) resubmitTransaction(feeData *FeeData, auth *bind.TransactOpts,
 	return s.createAndSendTx(auth, feeData, tx.To(), tx.Value(), tx.Data(), &nonce)
 }
 
-// CheckPendingTransaction Check pending transaction given number of blocks to wait before confirmation.
-func (s *Sender) CheckPendingTransaction(header *types.Header) {
+// checkPendingTransaction checks the confirmation status of pending transactions against the latest confirmed block number.
+// If a transaction hasn't been confirmed after a certain number of blocks, it will be resubmitted with an increased gas price.
+func (s *Sender) checkPendingTransaction(header *types.Header, confirmed uint64) {
 	number := header.Number.Uint64()
 	atomic.StoreUint64(&s.blockNumber, number)
-	atomic.StoreUint64(&s.baseFeePerGas, header.BaseFee.Uint64())
+
+	if s.config.TxType == DynamicFeeTxType {
+		if header.BaseFee != nil {
+			atomic.StoreUint64(&s.baseFeePerGas, header.BaseFee.Uint64())
+		} else {
+			log.Error("DynamicFeeTxType not supported, header.BaseFee nil")
+		}
+	}
+
 	s.pendingTxs.Range(func(key, value interface{}) bool {
 		// ignore empty id, since we use empty id to occupy pending task
 		if value == nil || reflect.ValueOf(value).IsNil() {
@@ -366,7 +344,7 @@ func (s *Sender) CheckPendingTransaction(header *types.Header) {
 		pending := value.(*PendingTransaction)
 		receipt, err := s.client.TransactionReceipt(s.ctx, pending.tx.Hash())
 		if (err == nil) && (receipt != nil) {
-			if number >= receipt.BlockNumber.Uint64()+s.config.Confirmations {
+			if receipt.BlockNumber.Uint64() <= confirmed {
 				s.pendingTxs.Delete(key)
 				// send confirm message
 				s.confirmCh <- &Confirmation{
@@ -429,7 +407,7 @@ func (s *Sender) loop(ctx context.Context) {
 	checkTick := time.NewTicker(time.Duration(s.config.CheckPendingTime) * time.Second)
 	defer checkTick.Stop()
 
-	checkBalanceTicker := time.NewTicker(time.Minute * 10)
+	checkBalanceTicker := time.NewTicker(time.Duration(s.config.CheckBalanceTime) * time.Second)
 	defer checkBalanceTicker.Stop()
 
 	for {
@@ -440,7 +418,14 @@ func (s *Sender) loop(ctx context.Context) {
 				log.Error("failed to get latest head", "err", err)
 				continue
 			}
-			s.CheckPendingTransaction(header)
+
+			confirmed, err := utils.GetLatestConfirmedBlockNumber(s.ctx, s.client, s.config.Confirmations)
+			if err != nil {
+				log.Error("failed to get latest confirmed block number", "err", err)
+				continue
+			}
+
+			s.checkPendingTransaction(header, confirmed)
 		case <-checkBalanceTicker.C:
 			// Check and set balance.
 			_ = s.auths.checkAndSetBalances(ctx)

bridge/sender/sender_test.go

@@ -14,6 +14,8 @@ import (
 	cmap "github.com/orcaman/concurrent-map"
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/crypto"
+	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/rpc"
 	"github.com/stretchr/testify/assert"
 
 	"scroll-tech/common/docker"
@@ -27,35 +29,64 @@ const TXBatch = 50
 var (
 	privateKeys []*ecdsa.PrivateKey
 	cfg         *config.Config
-	l2gethImg   docker.ImgInstance
+	base        *docker.App
 )
 
+func TestMain(m *testing.M) {
+	base = docker.NewDockerApp()
+
+	m.Run()
+
+	base.Free()
+}
+
 func setupEnv(t *testing.T) {
 	var err error
 	cfg, err = config.NewConfig("../config.json")
 	assert.NoError(t, err)
-
+	base.RunImages(t)
 	priv, err := crypto.HexToECDSA("1212121212121212121212121212121212121212121212121212121212121212")
 	assert.NoError(t, err)
 	// Load default private key.
 	privateKeys = []*ecdsa.PrivateKey{priv}
 
-	l2gethImg = docker.NewTestL2Docker(t)
-	cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = l2gethImg.Endpoint()
+	cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = base.L2GethEndpoint()
 }
 
 func TestSender(t *testing.T) {
 	// Setup
 	setupEnv(t)
 
+	t.Run("test min gas limit", func(t *testing.T) { testMinGasLimit(t) })
+
 	t.Run("test 1 account sender", func(t *testing.T) { testBatchSender(t, 1) })
 	t.Run("test 3 account sender", func(t *testing.T) { testBatchSender(t, 3) })
 	t.Run("test 8 account sender", func(t *testing.T) { testBatchSender(t, 8) })
+}
 
-	// Teardown
-	t.Cleanup(func() {
-		assert.NoError(t, l2gethImg.Stop())
-	})
+func testMinGasLimit(t *testing.T) {
+	senderCfg := cfg.L1Config.RelayerConfig.SenderConfig
+	senderCfg.Confirmations = rpc.LatestBlockNumber
+	newSender, err := sender.NewSender(context.Background(), senderCfg, privateKeys)
+	assert.NoError(t, err)
+	defer newSender.Stop()
+
+	client, err := ethclient.Dial(senderCfg.Endpoint)
+	assert.NoError(t, err)
+
+	// MinGasLimit = 0
+	txHash0, err := newSender.SendTransaction("0", &common.Address{}, big.NewInt(1), nil, 0)
+	assert.NoError(t, err)
+	tx0, _, err := client.TransactionByHash(context.Background(), txHash0)
+	assert.NoError(t, err)
+	assert.Greater(t, tx0.Gas(), uint64(0))
+
+	// MinGasLimit = 100000
+	txHash1, err := newSender.SendTransaction("1", &common.Address{}, big.NewInt(1), nil, 100000)
+	assert.NoError(t, err)
+	tx1, _, err := client.TransactionByHash(context.Background(), txHash1)
+	assert.NoError(t, err)
+	assert.Equal(t, tx1.Gas(), uint64(150000))
 }
 
 func testBatchSender(t *testing.T, batchSize int) {
@@ -68,7 +99,7 @@ func testBatchSender(t *testing.T, batchSize int) {
 	}
 
 	senderCfg := cfg.L1Config.RelayerConfig.SenderConfig
-	senderCfg.Confirmations = 0
+	senderCfg.Confirmations = rpc.LatestBlockNumber
 	newSender, err := sender.NewSender(context.Background(), senderCfg, privateKeys)
 	if err != nil {
 		t.Fatal(err)
@@ -87,7 +118,7 @@ func testBatchSender(t *testing.T, batchSize int) {
 			for i := 0; i < TXBatch; i++ {
 				toAddr := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
 				id := strconv.Itoa(i + index*1000)
-				_, err := newSender.SendTransaction(id, &toAddr, big.NewInt(1), nil)
+				_, err := newSender.SendTransaction(id, &toAddr, big.NewInt(1), nil, 0)
 				if errors.Is(err, sender.ErrNoAvailableAccount) {
 					<-time.After(time.Second)
 					continue

bridge/tests/bridge_test.go

@@ -4,18 +4,20 @@ import (
 	"context"
 	"crypto/ecdsa"
 	"math/big"
-	"scroll-tech/common/docker"
 	"testing"
 
-	"scroll-tech/bridge/config"
-	"scroll-tech/bridge/mock_bridge"
-
 	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/crypto"
 	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/rpc"
 	"github.com/stretchr/testify/assert"
+
+	"scroll-tech/bridge/config"
+	"scroll-tech/bridge/mock_bridge"
+
+	"scroll-tech/common/docker"
 )
 
 var (
@@ -24,11 +26,7 @@ var (
 
 	// private key
 	privateKey *ecdsa.PrivateKey
-
-	// docker consider handler.
-	l1gethImg docker.ImgInstance
-	l2gethImg docker.ImgInstance
-	dbImg     docker.ImgInstance
+	base       *docker.App
 
 	// clients
 	l1Client *ethclient.Client
@@ -43,14 +41,22 @@ var (
 	l1MessengerAddress  common.Address
 
 	// l1 rollup contract
-	l1RollupInstance *mock_bridge.MockBridgeL1
-	l1RollupAddress  common.Address
+	scrollChainInstance *mock_bridge.MockBridgeL1
+	scrollChainAddress  common.Address
 
 	// l2 messenger contract
 	l2MessengerInstance *mock_bridge.MockBridgeL2
 	l2MessengerAddress  common.Address
 )
 
+func TestMain(m *testing.M) {
+	base = docker.NewDockerApp()
+
+	m.Run()
+
+	base.Free()
+}
+
 func setupEnv(t *testing.T) {
 	var err error
 	privateKey, err = crypto.ToECDSA(common.FromHex("1212121212121212121212121212121212121212121212121212121212121212"))
@@ -59,30 +65,32 @@ func setupEnv(t *testing.T) {
 	assert.NoError(t, err)
 	rollupPrivateKey, err := crypto.ToECDSA(common.FromHex("1212121212121212121212121212121212121212121212121212121212121214"))
 	assert.NoError(t, err)
+	gasOraclePrivateKey, err := crypto.ToECDSA(common.FromHex("1212121212121212121212121212121212121212121212121212121212121215"))
+	assert.NoError(t, err)
 
 	// Load config.
 	cfg, err = config.NewConfig("../config.json")
 	assert.NoError(t, err)
-	cfg.L1Config.Confirmations = 0
+	cfg.L1Config.Confirmations = rpc.LatestBlockNumber
 	cfg.L1Config.RelayerConfig.MessageSenderPrivateKeys = []*ecdsa.PrivateKey{messagePrivateKey}
 	cfg.L1Config.RelayerConfig.RollupSenderPrivateKeys = []*ecdsa.PrivateKey{rollupPrivateKey}
-	cfg.L2Config.Confirmations = 0
+	cfg.L1Config.RelayerConfig.GasOracleSenderPrivateKeys = []*ecdsa.PrivateKey{gasOraclePrivateKey}
+	cfg.L2Config.Confirmations = rpc.LatestBlockNumber
 	cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys = []*ecdsa.PrivateKey{messagePrivateKey}
 	cfg.L2Config.RelayerConfig.RollupSenderPrivateKeys = []*ecdsa.PrivateKey{rollupPrivateKey}
+	cfg.L2Config.RelayerConfig.GasOracleSenderPrivateKeys = []*ecdsa.PrivateKey{gasOraclePrivateKey}
+	base.RunImages(t)
 
 	// Create l1geth container.
-	l1gethImg = docker.NewTestL1Docker(t)
-	cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = l1gethImg.Endpoint()
-	cfg.L1Config.Endpoint = l1gethImg.Endpoint()
+	cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = base.L1GethEndpoint()
+	cfg.L1Config.Endpoint = base.L1GethEndpoint()
 
 	// Create l2geth container.
-	l2gethImg = docker.NewTestL2Docker(t)
-	cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = l2gethImg.Endpoint()
-	cfg.L2Config.Endpoint = l2gethImg.Endpoint()
+	cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = base.L2GethEndpoint()
+	cfg.L2Config.Endpoint = base.L2GethEndpoint()
 
 	// Create db container.
-	dbImg = docker.NewTestDBDocker(t, cfg.DBConfig.DriverName)
-	cfg.DBConfig.DSN = dbImg.Endpoint()
+	cfg.DBConfig.DSN = base.DBEndpoint()
 
 	// Create l1geth and l2geth client.
 	l1Client, err = ethclient.Dial(cfg.L1Config.Endpoint)
@@ -97,8 +105,10 @@ func setupEnv(t *testing.T) {
 	// send some balance to message and rollup sender
 	transferEther(t, l1Auth, l1Client, messagePrivateKey)
 	transferEther(t, l1Auth, l1Client, rollupPrivateKey)
+	transferEther(t, l1Auth, l1Client, gasOraclePrivateKey)
 	transferEther(t, l2Auth, l2Client, messagePrivateKey)
 	transferEther(t, l2Auth, l2Client, rollupPrivateKey)
+	transferEther(t, l2Auth, l2Client, gasOraclePrivateKey)
 }
 
 func transferEther(t *testing.T, auth *bind.TransactOpts, client *ethclient.Client, privateKey *ecdsa.PrivateKey) {
@@ -136,18 +146,6 @@ func transferEther(t *testing.T, auth *bind.TransactOpts, client *ethclient.Clie
 	}
 }
 
-func free(t *testing.T) {
-	if dbImg != nil {
-		assert.NoError(t, dbImg.Stop())
-	}
-	if l1gethImg != nil {
-		assert.NoError(t, l1gethImg.Stop())
-	}
-	if l2gethImg != nil {
-		assert.NoError(t, l2gethImg.Stop())
-	}
-}
-
 func prepareContracts(t *testing.T) {
 	var err error
 	var tx *types.Transaction
@@ -158,10 +156,10 @@ func prepareContracts(t *testing.T) {
 	l1MessengerAddress, err = bind.WaitDeployed(context.Background(), l1Client, tx)
 	assert.NoError(t, err)
 
-	// L1 rollup contract
-	_, tx, l1RollupInstance, err = mock_bridge.DeployMockBridgeL1(l1Auth, l1Client)
+	// L1 ScrolChain contract
+	_, tx, scrollChainInstance, err = mock_bridge.DeployMockBridgeL1(l1Auth, l1Client)
 	assert.NoError(t, err)
-	l1RollupAddress, err = bind.WaitDeployed(context.Background(), l1Client, tx)
+	scrollChainAddress, err = bind.WaitDeployed(context.Background(), l1Client, tx)
 	assert.NoError(t, err)
 
 	// L2 messenger contract
@@ -171,12 +169,16 @@ func prepareContracts(t *testing.T) {
 	assert.NoError(t, err)
 
 	cfg.L1Config.L1MessengerAddress = l1MessengerAddress
-	cfg.L1Config.RollupContractAddress = l1RollupAddress
+	cfg.L1Config.L1MessageQueueAddress = l1MessengerAddress
+	cfg.L1Config.ScrollChainContractAddress = scrollChainAddress
 	cfg.L1Config.RelayerConfig.MessengerContractAddress = l2MessengerAddress
+	cfg.L1Config.RelayerConfig.GasPriceOracleContractAddress = l1MessengerAddress
 
 	cfg.L2Config.L2MessengerAddress = l2MessengerAddress
+	cfg.L2Config.L2MessageQueueAddress = l2MessengerAddress
 	cfg.L2Config.RelayerConfig.MessengerContractAddress = l1MessengerAddress
-	cfg.L2Config.RelayerConfig.RollupContractAddress = l1RollupAddress
+	cfg.L2Config.RelayerConfig.RollupContractAddress = scrollChainAddress
+	cfg.L2Config.RelayerConfig.GasPriceOracleContractAddress = l2MessengerAddress
 }
 
 func prepareAuth(t *testing.T, client *ethclient.Client, privateKey *ecdsa.PrivateKey) *bind.TransactOpts {
@@ -195,10 +197,14 @@ func TestFunction(t *testing.T) {
 	// l1 rollup and watch rollup events
 	t.Run("TestCommitBatchAndFinalizeBatch", testCommitBatchAndFinalizeBatch)
 
-	// l2 message
-	t.Run("testRelayL2MessageSucceed", testRelayL2MessageSucceed)
+	// l1 message
+	t.Run("TestRelayL1MessageSucceed", testRelayL1MessageSucceed)
+
+	// l2 message
+	t.Run("TestRelayL2MessageSucceed", testRelayL2MessageSucceed)
+
+	// l1/l2 gas oracle
+	t.Run("TestImportL1GasPrice", testImportL1GasPrice)
+	t.Run("TestImportL2GasPrice", testImportL2GasPrice)
 
-	t.Cleanup(func() {
-		free(t)
-	})
 }

bridge/tests/gas_oracle_test.go

@@ -0,0 +1,128 @@
+package tests
+
+import (
+	"context"
+	"math/big"
+	"testing"
+
+	"github.com/scroll-tech/go-ethereum/common"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/stretchr/testify/assert"
+
+	"scroll-tech/common/types"
+
+	"scroll-tech/bridge/l1"
+	"scroll-tech/bridge/l2"
+
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
+)
+
+func testImportL1GasPrice(t *testing.T) {
+	// Create db handler and reset db.
+	db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
+
+	prepareContracts(t)
+
+	l1Cfg := cfg.L1Config
+
+	// Create L1Relayer
+	l1Relayer, err := l1.NewLayer1Relayer(context.Background(), db, l1Cfg.RelayerConfig)
+	assert.NoError(t, err)
+	defer l1Relayer.Stop()
+
+	// Create L1Watcher
+	startHeight, err := l1Client.BlockNumber(context.Background())
+	assert.NoError(t, err)
+	l1Watcher := l1.NewWatcher(context.Background(), l1Client, startHeight-1, 0, l1Cfg.L1MessengerAddress, l1Cfg.L1MessageQueueAddress, l1Cfg.ScrollChainContractAddress, db)
+
+	// fetch new blocks
+	number, err := l1Client.BlockNumber(context.Background())
+	assert.Greater(t, number, startHeight-1)
+	assert.NoError(t, err)
+	err = l1Watcher.FetchBlockHeader(number)
+	assert.NoError(t, err)
+
+	// check db status
+	latestBlockHeight, err := db.GetLatestL1BlockHeight()
+	assert.NoError(t, err)
+	assert.Equal(t, number, latestBlockHeight)
+	blocks, err := db.GetL1BlockInfos(map[string]interface{}{
+		"number": latestBlockHeight,
+	})
+	assert.NoError(t, err)
+	assert.Equal(t, len(blocks), 1)
+	assert.Equal(t, blocks[0].GasOracleStatus, types.GasOraclePending)
+	assert.Equal(t, blocks[0].OracleTxHash.Valid, false)
+
+	// relay gas price
+	l1Relayer.ProcessGasPriceOracle()
+	blocks, err = db.GetL1BlockInfos(map[string]interface{}{
+		"number": latestBlockHeight,
+	})
+	assert.NoError(t, err)
+	assert.Equal(t, len(blocks), 1)
+	assert.Equal(t, blocks[0].GasOracleStatus, types.GasOracleImporting)
+	assert.Equal(t, blocks[0].OracleTxHash.Valid, true)
+}
+
+func testImportL2GasPrice(t *testing.T) {
+	// Create db handler and reset db.
+	db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
+
+	prepareContracts(t)
+
+	l2Cfg := cfg.L2Config
+
+	// Create L2Relayer
+	l2Relayer, err := l2.NewLayer2Relayer(context.Background(), l2Client, db, l2Cfg.RelayerConfig)
+	assert.NoError(t, err)
+	defer l2Relayer.Stop()
+
+	// add fake blocks
+	traces := []*geth_types.BlockTrace{
+		{
+			Header: &geth_types.Header{
+				Number:     big.NewInt(1),
+				ParentHash: common.Hash{},
+				Difficulty: big.NewInt(0),
+				BaseFee:    big.NewInt(0),
+			},
+			StorageTrace: &geth_types.StorageTrace{},
+		},
+	}
+	assert.NoError(t, db.InsertL2BlockTraces(traces))
+
+	parentBatch := &types.BlockBatch{
+		Index: 0,
+		Hash:  "0x0000000000000000000000000000000000000000",
+	}
+	batchData := types.NewBatchData(parentBatch, []*geth_types.BlockTrace{
+		traces[0],
+	}, cfg.L2Config.BatchProposerConfig.PublicInputConfig)
+
+	// add fake batch
+	dbTx, err := db.Beginx()
+	assert.NoError(t, err)
+	assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData))
+	assert.NoError(t, dbTx.Commit())
+
+	// check db status
+	batch, err := db.GetLatestBatch()
+	assert.NoError(t, err)
+	assert.Equal(t, batch.OracleStatus, types.GasOraclePending)
+	assert.Equal(t, batch.OracleTxHash.Valid, false)
+
+	// relay gas price
+	l2Relayer.ProcessGasPriceOracle()
+	batch, err = db.GetLatestBatch()
+	assert.NoError(t, err)
+	assert.Equal(t, batch.OracleStatus, types.GasOracleImporting)
+	assert.Equal(t, batch.OracleTxHash.Valid, true)
+}

bridge/tests/l1_message_relay_test.go

@@ -0,0 +1,86 @@
+package tests
+
+import (
+	"context"
+	"math/big"
+	"testing"
+
+	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
+	"github.com/scroll-tech/go-ethereum/common"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/rpc"
+	"github.com/stretchr/testify/assert"
+
+	"scroll-tech/common/types"
+
+	"scroll-tech/bridge/l1"
+	"scroll-tech/bridge/l2"
+
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
+)
+
+func testRelayL1MessageSucceed(t *testing.T) {
+	// Create db handler and reset db.
+	db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
+
+	prepareContracts(t)
+
+	l1Cfg := cfg.L1Config
+	l2Cfg := cfg.L2Config
+
+	// Create L1Relayer
+	l1Relayer, err := l1.NewLayer1Relayer(context.Background(), db, l1Cfg.RelayerConfig)
+	assert.NoError(t, err)
+	defer l1Relayer.Stop()
+
+	// Create L1Watcher
+	confirmations := rpc.LatestBlockNumber
+	l1Watcher := l1.NewWatcher(context.Background(), l1Client, 0, confirmations, l1Cfg.L1MessengerAddress, l1Cfg.L1MessageQueueAddress, l1Cfg.ScrollChainContractAddress, db)
+
+	// Create L2Watcher
+	l2Watcher := l2.NewL2WatcherClient(context.Background(), l2Client, confirmations, l2Cfg.L2MessengerAddress, l2Cfg.L2MessageQueueAddress, db)
+
+	// send message through l1 messenger contract
+	nonce, err := l1MessengerInstance.MessageNonce(&bind.CallOpts{})
+	assert.NoError(t, err)
+	sendTx, err := l1MessengerInstance.SendMessage(l1Auth, l2Auth.From, big.NewInt(0), common.Hex2Bytes("00112233"), big.NewInt(0))
+	assert.NoError(t, err)
+	sendReceipt, err := bind.WaitMined(context.Background(), l1Client, sendTx)
+	assert.NoError(t, err)
+	if sendReceipt.Status != geth_types.ReceiptStatusSuccessful || err != nil {
+		t.Fatalf("Call failed")
+	}
+
+	// l1 watch process events
+	l1Watcher.FetchContractEvent(sendReceipt.BlockNumber.Uint64())
+
+	// check db status
+	msg, err := db.GetL1MessageByQueueIndex(nonce.Uint64())
+	assert.NoError(t, err)
+	assert.Equal(t, msg.Status, types.MsgPending)
+	assert.Equal(t, msg.Target, l2Auth.From.String())
+
+	// process l1 messages
+	l1Relayer.ProcessSavedEvents()
+	msg, err = db.GetL1MessageByQueueIndex(nonce.Uint64())
+	assert.NoError(t, err)
+	assert.Equal(t, msg.Status, types.MsgSubmitted)
+	relayTxHash, err := db.GetRelayL1MessageTxHash(nonce.Uint64())
+	assert.NoError(t, err)
+	assert.Equal(t, true, relayTxHash.Valid)
+	relayTx, _, err := l2Client.TransactionByHash(context.Background(), common.HexToHash(relayTxHash.String))
+	assert.NoError(t, err)
+	relayTxReceipt, err := bind.WaitMined(context.Background(), l2Client, relayTx)
+	assert.NoError(t, err)
+	assert.Equal(t, len(relayTxReceipt.Logs), 1)
+
+	// fetch message relayed events
+	l2Watcher.FetchContractEvent(relayTxReceipt.BlockNumber.Uint64())
+	msg, err = db.GetL1MessageByQueueIndex(nonce.Uint64())
+	assert.NoError(t, err)
+	assert.Equal(t, msg.Status, types.MsgConfirmed)
+}

bridge/tests/l2_message_relay_test.go

@@ -3,19 +3,21 @@ package tests
 import (
 	"context"
 	"math/big"
-	"scroll-tech/database"
-	"scroll-tech/database/migrate"
-	"scroll-tech/database/orm"
-	"sync"
 	"testing"
 
+	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
+	"github.com/scroll-tech/go-ethereum/common"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/rpc"
+	"github.com/stretchr/testify/assert"
+
+	"scroll-tech/common/types"
+
 	"scroll-tech/bridge/l1"
 	"scroll-tech/bridge/l2"
 
-	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/stretchr/testify/assert"
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
 )
 
 func testRelayL2MessageSucceed(t *testing.T) {
@@ -25,23 +27,21 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
 	defer db.Close()
 
-	var wg sync.WaitGroup
-	wg.Add(3)
-
 	prepareContracts(t)
 
-	// Create L2Relayer
 	l2Cfg := cfg.L2Config
-	l2Relayer, err := l2.NewLayer2Relayer(context.Background(), db, l2Cfg.RelayerConfig)
-	assert.NoError(t, err)
-	defer l2Relayer.Stop()
 
 	// Create L2Watcher
-	l2Watcher := l2.NewL2WatcherClient(context.Background(), l2Client, 0, l2Cfg.BatchProposerConfig, l2Cfg.L2MessengerAddress, db)
+	confirmations := rpc.LatestBlockNumber
+	l2Watcher := l2.NewL2WatcherClient(context.Background(), l2Client, confirmations, l2Cfg.L2MessengerAddress, l2Cfg.L2MessageQueueAddress, db)
+
+	// Create L2Relayer
+	l2Relayer, err := l2.NewLayer2Relayer(context.Background(), l2Client, db, l2Cfg.RelayerConfig)
+	assert.NoError(t, err)
 
 	// Create L1Watcher
 	l1Cfg := cfg.L1Config
-	l1Watcher := l1.NewWatcher(context.Background(), l1Client, 0, 0, l1Cfg.L1MessengerAddress, l1Cfg.RollupContractAddress, db)
+	l1Watcher := l1.NewWatcher(context.Background(), l1Client, 0, confirmations, l1Cfg.L1MessengerAddress, l1Cfg.L1MessageQueueAddress, l1Cfg.ScrollChainContractAddress, db)
 
 	// send message through l2 messenger contract
 	nonce, err := l2MessengerInstance.MessageNonce(&bind.CallOpts{})
@@ -50,7 +50,7 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	assert.NoError(t, err)
 	sendReceipt, err := bind.WaitMined(context.Background(), l2Client, sendTx)
 	assert.NoError(t, err)
-	if sendReceipt.Status != types.ReceiptStatusSuccessful || err != nil {
+	if sendReceipt.Status != geth_types.ReceiptStatusSuccessful || err != nil {
 		t.Fatalf("Call failed")
 	}
 
@@ -60,62 +60,59 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	// check db status
 	msg, err := db.GetL2MessageByNonce(nonce.Uint64())
 	assert.NoError(t, err)
-	assert.Equal(t, msg.Status, orm.MsgPending)
+	assert.Equal(t, msg.Status, types.MsgPending)
 	assert.Equal(t, msg.Sender, l2Auth.From.String())
 	assert.Equal(t, msg.Target, l1Auth.From.String())
 
 	// add fake blocks
-	traces := []*types.BlockTrace{
+	traces := []*geth_types.BlockTrace{
 		{
-			Header: &types.Header{
+			Header: &geth_types.Header{
 				Number:     sendReceipt.BlockNumber,
 				ParentHash: common.Hash{},
 				Difficulty: big.NewInt(0),
 				BaseFee:    big.NewInt(0),
 			},
-			StorageTrace: &types.StorageTrace{},
+			StorageTrace: &geth_types.StorageTrace{},
 		},
 	}
-	err = db.InsertBlockTraces(traces)
-	assert.NoError(t, err)
+	assert.NoError(t, db.InsertL2BlockTraces(traces))
+
+	parentBatch := &types.BlockBatch{
+		Index: 0,
+		Hash:  "0x0000000000000000000000000000000000000000",
+	}
+	batchData := types.NewBatchData(parentBatch, []*geth_types.BlockTrace{
+		traces[0],
+	}, cfg.L2Config.BatchProposerConfig.PublicInputConfig)
+	batchHash := batchData.Hash().String()
 
 	// add fake batch
 	dbTx, err := db.Beginx()
 	assert.NoError(t, err)
-	batchID, err := db.NewBatchInDBTx(dbTx,
-		&orm.BlockInfo{
-			Number:     traces[0].Header.Number.Uint64(),
-			Hash:       traces[0].Header.Hash().String(),
-			ParentHash: traces[0].Header.ParentHash.String(),
-		},
-		&orm.BlockInfo{
-			Number:     traces[0].Header.Number.Uint64(),
-			Hash:       traces[0].Header.Hash().String(),
-			ParentHash: traces[0].Header.ParentHash.String(),
-		},
-		traces[0].Header.ParentHash.String(), 1, 194676)
-	assert.NoError(t, err)
-	err = db.SetBatchIDForBlocksInDBTx(dbTx, []uint64{
-		traces[0].Header.Number.Uint64(),
-		traces[0].Header.Number.Uint64()}, batchID)
-	assert.NoError(t, err)
-	err = dbTx.Commit()
+	assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData))
+	var blockIDs = make([]uint64, len(batchData.Batch.Blocks))
+	for i, block := range batchData.Batch.Blocks {
+		blockIDs[i] = block.BlockNumber
+	}
+	err = db.SetBatchHashForL2BlocksInDBTx(dbTx, blockIDs, batchHash)
 	assert.NoError(t, err)
+	assert.NoError(t, dbTx.Commit())
 
 	// add dummy proof
 	tProof := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
 	tInstanceCommitments := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-	err = db.UpdateProofByID(context.Background(), batchID, tProof, tInstanceCommitments, 100)
+	err = db.UpdateProofByHash(context.Background(), batchHash, tProof, tInstanceCommitments, 100)
 	assert.NoError(t, err)
-	err = db.UpdateProvingStatus(batchID, orm.ProvingTaskVerified)
+	err = db.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
 	assert.NoError(t, err)
 
 	// process pending batch and check status
-	l2Relayer.ProcessPendingBatches(&wg)
-	status, err := db.GetRollupStatus(batchID)
+	l2Relayer.SendCommitTx([]*types.BatchData{batchData})
+	status, err := db.GetRollupStatus(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, orm.RollupCommitting, status)
-	commitTxHash, err := db.GetCommitTxHash(batchID)
+	assert.Equal(t, types.RollupCommitting, status)
+	commitTxHash, err := db.GetCommitTxHash(batchHash)
 	assert.NoError(t, err)
 	assert.Equal(t, true, commitTxHash.Valid)
 	commitTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(commitTxHash.String))
@@ -127,16 +124,16 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	// fetch CommitBatch rollup events
 	err = l1Watcher.FetchContractEvent(commitTxReceipt.BlockNumber.Uint64())
 	assert.NoError(t, err)
-	status, err = db.GetRollupStatus(batchID)
+	status, err = db.GetRollupStatus(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, orm.RollupCommitted, status)
+	assert.Equal(t, types.RollupCommitted, status)
 
 	// process committed batch and check status
-	l2Relayer.ProcessCommittedBatches(&wg)
-	status, err = db.GetRollupStatus(batchID)
+	l2Relayer.ProcessCommittedBatches()
+	status, err = db.GetRollupStatus(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, orm.RollupFinalizing, status)
-	finalizeTxHash, err := db.GetFinalizeTxHash(batchID)
+	assert.Equal(t, types.RollupFinalizing, status)
+	finalizeTxHash, err := db.GetFinalizeTxHash(batchHash)
 	assert.NoError(t, err)
 	assert.Equal(t, true, finalizeTxHash.Valid)
 	finalizeTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(finalizeTxHash.String))
@@ -148,15 +145,15 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	// fetch FinalizeBatch events
 	err = l1Watcher.FetchContractEvent(finalizeTxReceipt.BlockNumber.Uint64())
 	assert.NoError(t, err)
-	status, err = db.GetRollupStatus(batchID)
+	status, err = db.GetRollupStatus(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, orm.RollupFinalized, status)
+	assert.Equal(t, types.RollupFinalized, status)
 
 	// process l2 messages
-	l2Relayer.ProcessSavedEvents(&wg)
+	l2Relayer.ProcessSavedEvents()
 	msg, err = db.GetL2MessageByNonce(nonce.Uint64())
 	assert.NoError(t, err)
-	assert.Equal(t, msg.Status, orm.MsgSubmitted)
+	assert.Equal(t, msg.Status, types.MsgSubmitted)
 	relayTxHash, err := db.GetRelayL2MessageTxHash(nonce.Uint64())
 	assert.NoError(t, err)
 	assert.Equal(t, true, relayTxHash.Valid)
@@ -171,5 +168,5 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	assert.NoError(t, err)
 	msg, err = db.GetL2MessageByNonce(nonce.Uint64())
 	assert.NoError(t, err)
-	assert.Equal(t, msg.Status, orm.MsgConfirmed)
+	assert.Equal(t, msg.Status, types.MsgConfirmed)
 }

bridge/tests/rollup_test.go

@@ -3,19 +3,20 @@ package tests
 import (
 	"context"
 	"math/big"
-	"scroll-tech/database"
-	"scroll-tech/database/migrate"
-	"scroll-tech/database/orm"
-	"sync"
 	"testing"
 
+	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
+	"github.com/scroll-tech/go-ethereum/common"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/stretchr/testify/assert"
+
+	"scroll-tech/common/types"
+
 	"scroll-tech/bridge/l1"
 	"scroll-tech/bridge/l2"
 
-	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/stretchr/testify/assert"
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
 )
 
 func testCommitBatchAndFinalizeBatch(t *testing.T) {
@@ -29,66 +30,62 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 
 	// Create L2Relayer
 	l2Cfg := cfg.L2Config
-	l2Relayer, err := l2.NewLayer2Relayer(context.Background(), db, l2Cfg.RelayerConfig)
+	l2Relayer, err := l2.NewLayer2Relayer(context.Background(), l2Client, db, l2Cfg.RelayerConfig)
 	assert.NoError(t, err)
 	defer l2Relayer.Stop()
 
 	// Create L1Watcher
 	l1Cfg := cfg.L1Config
-	l1Watcher := l1.NewWatcher(context.Background(), l1Client, 0, 0, l1Cfg.L1MessengerAddress, l1Cfg.RollupContractAddress, db)
+	l1Watcher := l1.NewWatcher(context.Background(), l1Client, 0, l1Cfg.Confirmations, l1Cfg.L1MessengerAddress, l1Cfg.L1MessageQueueAddress, l1Cfg.ScrollChainContractAddress, db)
 
 	// add some blocks to db
-	var traces []*types.BlockTrace
+	var traces []*geth_types.BlockTrace
 	var parentHash common.Hash
 	for i := 1; i <= 10; i++ {
-		header := types.Header{
+		header := geth_types.Header{
 			Number:     big.NewInt(int64(i)),
 			ParentHash: parentHash,
 			Difficulty: big.NewInt(0),
 			BaseFee:    big.NewInt(0),
 		}
-		traces = append(traces, &types.BlockTrace{
+		traces = append(traces, &geth_types.BlockTrace{
 			Header:       &header,
-			StorageTrace: &types.StorageTrace{},
+			StorageTrace: &geth_types.StorageTrace{},
 		})
 		parentHash = header.Hash()
 	}
-	err = db.InsertBlockTraces(traces)
-	assert.NoError(t, err)
+	assert.NoError(t, db.InsertL2BlockTraces(traces))
+
+	parentBatch := &types.BlockBatch{
+		Index: 0,
+		Hash:  "0x0000000000000000000000000000000000000000",
+	}
+	batchData := types.NewBatchData(parentBatch, []*geth_types.BlockTrace{
+		traces[0],
+		traces[1],
+	}, cfg.L2Config.BatchProposerConfig.PublicInputConfig)
+
+	batchHash := batchData.Hash().String()
 
 	// add one batch to db
 	dbTx, err := db.Beginx()
 	assert.NoError(t, err)
-	batchID, err := db.NewBatchInDBTx(dbTx,
-		&orm.BlockInfo{
-			Number:     traces[0].Header.Number.Uint64(),
-			Hash:       traces[0].Header.Hash().String(),
-			ParentHash: traces[0].Header.ParentHash.String(),
-		},
-		&orm.BlockInfo{
-			Number:     traces[1].Header.Number.Uint64(),
-			Hash:       traces[1].Header.Hash().String(),
-			ParentHash: traces[1].Header.ParentHash.String(),
-		},
-		traces[0].Header.ParentHash.String(), 1, 194676) // parentHash & totalTxNum & totalL2Gas don't really matter here
-	assert.NoError(t, err)
-	err = db.SetBatchIDForBlocksInDBTx(dbTx, []uint64{
-		traces[0].Header.Number.Uint64(),
-		traces[1].Header.Number.Uint64()}, batchID)
-	assert.NoError(t, err)
-	err = dbTx.Commit()
+	assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData))
+	var blockIDs = make([]uint64, len(batchData.Batch.Blocks))
+	for i, block := range batchData.Batch.Blocks {
+		blockIDs[i] = block.BlockNumber
+	}
+	err = db.SetBatchHashForL2BlocksInDBTx(dbTx, blockIDs, batchHash)
 	assert.NoError(t, err)
+	assert.NoError(t, dbTx.Commit())
 
-	var wg = sync.WaitGroup{}
-	wg.Add(1)
 	// process pending batch and check status
-	l2Relayer.ProcessPendingBatches(&wg)
-	wg.Wait()
+	l2Relayer.SendCommitTx([]*types.BatchData{batchData})
 
-	status, err := db.GetRollupStatus(batchID)
+	status, err := db.GetRollupStatus(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, orm.RollupCommitting, status)
-	commitTxHash, err := db.GetCommitTxHash(batchID)
+	assert.Equal(t, types.RollupCommitting, status)
+	commitTxHash, err := db.GetCommitTxHash(batchHash)
 	assert.NoError(t, err)
 	assert.Equal(t, true, commitTxHash.Valid)
 	commitTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(commitTxHash.String))
@@ -100,27 +97,25 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 	// fetch rollup events
 	err = l1Watcher.FetchContractEvent(commitTxReceipt.BlockNumber.Uint64())
 	assert.NoError(t, err)
-	status, err = db.GetRollupStatus(batchID)
+	status, err = db.GetRollupStatus(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, orm.RollupCommitted, status)
+	assert.Equal(t, types.RollupCommitted, status)
 
 	// add dummy proof
 	tProof := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
 	tInstanceCommitments := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-	err = db.UpdateProofByID(context.Background(), batchID, tProof, tInstanceCommitments, 100)
+	err = db.UpdateProofByHash(context.Background(), batchHash, tProof, tInstanceCommitments, 100)
 	assert.NoError(t, err)
-	err = db.UpdateProvingStatus(batchID, orm.ProvingTaskVerified)
+	err = db.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
 	assert.NoError(t, err)
 
-	wg.Add(1)
 	// process committed batch and check status
-	l2Relayer.ProcessCommittedBatches(&wg)
-	wg.Wait()
+	l2Relayer.ProcessCommittedBatches()
 
-	status, err = db.GetRollupStatus(batchID)
+	status, err = db.GetRollupStatus(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, orm.RollupFinalizing, status)
-	finalizeTxHash, err := db.GetFinalizeTxHash(batchID)
+	assert.Equal(t, types.RollupFinalizing, status)
+	finalizeTxHash, err := db.GetFinalizeTxHash(batchHash)
 	assert.NoError(t, err)
 	assert.Equal(t, true, finalizeTxHash.Valid)
 	finalizeTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(finalizeTxHash.String))
@@ -132,7 +127,7 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 	// fetch rollup events
 	err = l1Watcher.FetchContractEvent(finalizeTxReceipt.BlockNumber.Uint64())
 	assert.NoError(t, err)
-	status, err = db.GetRollupStatus(batchID)
+	status, err = db.GetRollupStatus(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, orm.RollupFinalized, status)
+	assert.Equal(t, types.RollupFinalized, status)
 }

bridge/utils/confirmation.go

@@ -0,0 +1,56 @@
+package utils
+
+import (
+	"context"
+	"fmt"
+	"math/big"
+
+	"github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/rpc"
+)
+
+type ethClient interface {
+	BlockNumber(ctx context.Context) (uint64, error)
+	HeaderByNumber(ctx context.Context, number *big.Int) (*types.Header, error)
+}
+
+// GetLatestConfirmedBlockNumber get confirmed block number by rpc.BlockNumber type.
+func GetLatestConfirmedBlockNumber(ctx context.Context, client ethClient, confirm rpc.BlockNumber) (uint64, error) {
+	switch true {
+	case confirm == rpc.SafeBlockNumber || confirm == rpc.FinalizedBlockNumber:
+		var tag *big.Int
+		if confirm == rpc.FinalizedBlockNumber {
+			tag = big.NewInt(int64(rpc.FinalizedBlockNumber))
+		} else {
+			tag = big.NewInt(int64(rpc.SafeBlockNumber))
+		}
+
+		header, err := client.HeaderByNumber(ctx, tag)
+		if err != nil {
+			return 0, err
+		}
+		if !header.Number.IsInt64() {
+			return 0, fmt.Errorf("received invalid block confirm: %v", header.Number)
+		}
+		return header.Number.Uint64(), nil
+	case confirm == rpc.LatestBlockNumber:
+		number, err := client.BlockNumber(ctx)
+		if err != nil {
+			return 0, err
+		}
+		return number, nil
+	case confirm.Int64() >= 0: // If it's positive integer, consider it as a certain confirm value.
+		number, err := client.BlockNumber(ctx)
+		if err != nil {
+			return 0, err
+		}
+		cfmNum := uint64(confirm.Int64())
+
+		if number >= cfmNum {
+			return number - cfmNum, nil
+		}
+		return 0, nil
+	default:
+		return 0, fmt.Errorf("unknown confirmation type: %v", confirm)
+	}
+}

bridge/utils/confirmation_test.go

@@ -0,0 +1,107 @@
+package utils_test
+
+import (
+	"context"
+	"encoding/json"
+	"math/big"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/scroll-tech/go-ethereum/common/math"
+	"github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/rpc"
+
+	"scroll-tech/bridge/utils"
+)
+
+var (
+	tests = []struct {
+		input    string
+		mustFail bool
+		expected rpc.BlockNumber
+	}{
+		{`"0x"`, true, rpc.BlockNumber(0)},
+		{`"0x0"`, false, rpc.BlockNumber(0)},
+		{`"0X1"`, false, rpc.BlockNumber(1)},
+		{`"0x00"`, true, rpc.BlockNumber(0)},
+		{`"0x01"`, true, rpc.BlockNumber(0)},
+		{`"0x1"`, false, rpc.BlockNumber(1)},
+		{`"0x12"`, false, rpc.BlockNumber(18)},
+		{`"0x7fffffffffffffff"`, false, rpc.BlockNumber(math.MaxInt64)},
+		{`"0x8000000000000000"`, true, rpc.BlockNumber(0)},
+		{"0", true, rpc.BlockNumber(0)},
+		{`"ff"`, true, rpc.BlockNumber(0)},
+		{`"safe"`, false, rpc.SafeBlockNumber},
+		{`"finalized"`, false, rpc.FinalizedBlockNumber},
+		{`"pending"`, false, rpc.PendingBlockNumber},
+		{`"latest"`, false, rpc.LatestBlockNumber},
+		{`"earliest"`, false, rpc.EarliestBlockNumber},
+		{`someString`, true, rpc.BlockNumber(0)},
+		{`""`, true, rpc.BlockNumber(0)},
+		{``, true, rpc.BlockNumber(0)},
+	}
+)
+
+func TestUnmarshalJSON(t *testing.T) {
+	for i, test := range tests {
+		var num rpc.BlockNumber
+		err := json.Unmarshal([]byte(test.input), &num)
+		if test.mustFail && err == nil {
+			t.Errorf("Test %d should fail", i)
+			continue
+		}
+		if !test.mustFail && err != nil {
+			t.Errorf("Test %d should pass but got err: %v", i, err)
+			continue
+		}
+		if num != test.expected {
+			t.Errorf("Test %d got unexpected value, want %d, got %d", i, test.expected, num)
+		}
+	}
+}
+
+func TestMarshalJSON(t *testing.T) {
+	for i, test := range tests {
+		var num rpc.BlockNumber
+		want, err := json.Marshal(test.expected)
+		assert.Nil(t, err)
+		if !test.mustFail {
+			err = json.Unmarshal([]byte(test.input), &num)
+			assert.Nil(t, err)
+			got, err := json.Marshal(&num)
+			assert.Nil(t, err)
+			if string(want) != string(got) {
+				t.Errorf("Test %d got unexpected value, want %d, got %d", i, test.expected, num)
+
+			}
+		}
+	}
+}
+
+type MockEthClient struct {
+	val uint64
+}
+
+func (e MockEthClient) BlockNumber(ctx context.Context) (uint64, error) {
+	return e.val, nil
+}
+
+func (e MockEthClient) HeaderByNumber(ctx context.Context, number *big.Int) (*types.Header, error) {
+	return &types.Header{Number: new(big.Int).SetUint64(e.val)}, nil
+}
+
+func TestGetLatestConfirmedBlockNumber(t *testing.T) {
+	ctx := context.Background()
+	client := MockEthClient{}
+
+	client.val = 5
+	confirmed, err := utils.GetLatestConfirmedBlockNumber(ctx, &client, 6)
+	assert.Nil(t, err)
+	assert.Equal(t, uint64(0), confirmed)
+
+	client.val = 7
+	confirmed, err = utils.GetLatestConfirmedBlockNumber(ctx, &client, 6)
+	assert.Nil(t, err)
+	assert.Equal(t, uint64(1), confirmed)
+}

bridge/utils/utils.go

@@ -1,21 +1,20 @@
 package utils
 
 import (
-	"bytes"
+	"fmt"
 	"math/big"
 
-	"github.com/iden3/go-iden3-crypto/keccak256"
+	"github.com/scroll-tech/go-ethereum/accounts/abi"
 	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/common/math"
+	"github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/crypto"
+
+	bridgeabi "scroll-tech/bridge/abi"
 )
 
 // Keccak2 compute the keccack256 of two concatenations of bytes32
 func Keccak2(a common.Hash, b common.Hash) common.Hash {
-	return common.BytesToHash(keccak256.Hash(append(a.Bytes()[:], b.Bytes()[:]...)))
-}
-
-func encodePacked(input ...[]byte) []byte {
-	return bytes.Join(input, nil)
+	return common.BytesToHash(crypto.Keccak256(append(a.Bytes()[:], b.Bytes()[:]...)))
 }
 
 // ComputeMessageHash compute the message hash
@@ -23,21 +22,11 @@ func ComputeMessageHash(
 	sender common.Address,
 	target common.Address,
 	value *big.Int,
-	fee *big.Int,
-	deadline *big.Int,
-	message []byte,
 	messageNonce *big.Int,
+	message []byte,
 ) common.Hash {
-	packed := encodePacked(
-		sender.Bytes(),
-		target.Bytes(),
-		math.U256Bytes(value),
-		math.U256Bytes(fee),
-		math.U256Bytes(deadline),
-		math.U256Bytes(messageNonce),
-		message,
-	)
-	return common.BytesToHash(keccak256.Hash(packed))
+	data, _ := bridgeabi.L2ScrollMessengerABI.Pack("relayMessage", sender, target, value, messageNonce, message)
+	return common.BytesToHash(crypto.Keccak256(data))
 }
 
 // BufferToUint256Be convert bytes array to uint256 array assuming big-endian
@@ -67,3 +56,43 @@ func BufferToUint256Le(buffer []byte) []*big.Int {
 	}
 	return buffer256
 }
+
+// UnpackLog unpacks a retrieved log into the provided output structure.
+// @todo: add unit test.
+func UnpackLog(c *abi.ABI, out interface{}, event string, log types.Log) error {
+	if log.Topics[0] != c.Events[event].ID {
+		return fmt.Errorf("event signature mismatch")
+	}
+	if len(log.Data) > 0 {
+		if err := c.UnpackIntoInterface(out, event, log.Data); err != nil {
+			return err
+		}
+	}
+	var indexed abi.Arguments
+	for _, arg := range c.Events[event].Inputs {
+		if arg.Indexed {
+			indexed = append(indexed, arg)
+		}
+	}
+	return abi.ParseTopics(out, indexed, log.Topics[1:])
+}
+
+// UnpackLogIntoMap unpacks a retrieved log into the provided map.
+// @todo: add unit test.
+func UnpackLogIntoMap(c *abi.ABI, out map[string]interface{}, event string, log types.Log) error {
+	if log.Topics[0] != c.Events[event].ID {
+		return fmt.Errorf("event signature mismatch")
+	}
+	if len(log.Data) > 0 {
+		if err := c.UnpackIntoMap(out, event, log.Data); err != nil {
+			return err
+		}
+	}
+	var indexed abi.Arguments
+	for _, arg := range c.Events[event].Inputs {
+		if arg.Indexed {
+			indexed = append(indexed, arg)
+		}
+	}
+	return abi.ParseTopicsIntoMap(out, indexed, log.Topics[1:])
+}

bridge/utils/utils_test.go

@@ -29,13 +29,11 @@ func TestKeccak2(t *testing.T) {
 
 func TestComputeMessageHash(t *testing.T) {
 	hash := utils.ComputeMessageHash(
-		common.HexToAddress("0xd7227113b92e537aeda220d5a2f201b836e5879d"),
-		common.HexToAddress("0x47c02b023b6787ef4e503df42bbb1a94f451a1c0"),
-		big.NewInt(5000000000000000),
+		common.HexToAddress("0x1C5A77d9FA7eF466951B2F01F724BCa3A5820b63"),
+		common.HexToAddress("0x4592D8f8D7B001e72Cb26A73e4Fa1806a51aC79d"),
 		big.NewInt(0),
-		big.NewInt(1674204924),
-		common.Hex2Bytes("8eaac8a30000000000000000000000007138b17fc82d7e954b3bd2f98d8166d03e5e569b0000000000000000000000007138b17fc82d7e954b3bd2f98d8166d03e5e569b0000000000000000000000000000000000000000000000000011c37937e0800000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000"),
-		big.NewInt(30706),
+		big.NewInt(1),
+		[]byte("testbridgecontract"),
 	)
-	assert.Equal(t, hash.String(), "0x920e59f62ca89a0f481d44961c55d299dd20c575693692d61fdf3ca579d8edf3")
+	assert.Equal(t, "0xda253c04595a49017bb54b1b46088c69752b5ad2f0c47971ac76b8b25abec202", hash.String())
 }

build/dockerfiles/coordinator.Dockerfile

@@ -1,5 +1,5 @@
 # Build libzkp dependency
-FROM scrolltech/go-rust-builder:go-1.18-rust-nightly-2022-08-23 as chef
+FROM scrolltech/go-rust-builder:go-1.18-rust-nightly-2022-12-10 as chef
 WORKDIR app
 
 FROM chef as planner
@@ -13,10 +13,11 @@ RUN cargo chef cook --release --recipe-path recipe.json
 
 COPY ./common/libzkp/impl .
 RUN cargo build --release
+RUN find ./ | grep libzktrie.so | xargs -i cp {} /app/target/release/
 
 
 # Download Go dependencies
-FROM scrolltech/go-rust-builder:go-1.18-rust-nightly-2022-08-23 as base
+FROM scrolltech/go-rust-builder:go-1.18-rust-nightly-2022-12-10 as base
 WORKDIR /src
 COPY go.work* ./
 COPY ./bridge/go.* ./bridge/
@@ -33,11 +34,16 @@ FROM base as builder
 COPY . .
 RUN cp -r ./common/libzkp/interface ./coordinator/verifier/lib
 COPY --from=zkp-builder /app/target/release/libzkp.a ./coordinator/verifier/lib/
-RUN cd ./coordinator && go build -v -p 4 -o /bin/coordinator ./cmd
+COPY --from=zkp-builder /app/target/release/libzktrie.so ./coordinator/verifier/lib/
+RUN cd ./coordinator && go build -v -p 4 -o /bin/coordinator ./cmd && mv verifier/lib /bin/
 
 # Pull coordinator into a second stage deploy alpine container
 FROM ubuntu:20.04
-
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/src/coordinator/verifier/lib
+# ENV CHAIN_ID=534353
+RUN mkdir -p /src/coordinator/verifier/lib
+COPY --from=builder /bin/lib /src/coordinator/verifier/lib
 COPY --from=builder /bin/coordinator /bin/
 
+
 ENTRYPOINT ["/bin/coordinator"]

build/dockerfiles/intermediate/Makefile

@@ -1,6 +1,6 @@
 GO_VERSION := 1.18
 PYTHON_VERSION := 3.10
-RUST_VERSION := nightly-2022-08-23
+RUST_VERSION := nightly-2022-12-10
 
 .PHONY: all go-alpine-builder rust-builder rust-alpine-builder go-rust-alpine-builder go-rust-builder py-runner
 

build/dockerfiles/intermediate/go-alpine-builder.Dockerfile

@@ -4,4 +4,4 @@ FROM golang:1.18-alpine
 
 # RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
 
-RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates
+RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates openssl-dev

build/dockerfiles/intermediate/go-rust-alpine-builder.Dockerfile

@@ -1,8 +1,8 @@
 FROM golang:1.18-alpine
 ARG CARGO_CHEF_TAG=0.1.41
-ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-08-23
+ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-12-10
 
-RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates
+RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates openssl-dev
 
 # RUN apk add --no-cache libc6-compat
 # RUN apk add --no-cache gcompat

build/dockerfiles/intermediate/go-rust-builder.Dockerfile

@@ -14,7 +14,7 @@ ENV PATH="/root/.cargo/bin:${PATH}"
 ENV CARGO_HOME=/root/.cargo
 
 # Add Toolchain
-RUN rustup toolchain install nightly-2022-08-23
+RUN rustup toolchain install nightly-2022-12-10
 
 # TODO: make this ARG
 ENV CARGO_CHEF_TAG=0.1.41

build/dockerfiles/intermediate/rust-alpine-builder.Dockerfile

@@ -1,10 +1,11 @@
 ARG ALPINE_VERSION=3.15
 FROM alpine:${ALPINE_VERSION}
 ARG CARGO_CHEF_TAG=0.1.41
-ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-08-23
+ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-12-10
 
 RUN apk add --no-cache \
         ca-certificates \
+        openssl-dev \
         gcc \
         git \
         musl-dev

build/dockerfiles/intermediate/rust-builder.Dockerfile

@@ -13,4 +13,4 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
 # Add Toolchain
-RUN rustup toolchain install nightly-2022-08-23
+RUN rustup toolchain install nightly-2022-12-10

build/push-docker-tag.Jenkinsfile

@@ -1,6 +1,6 @@
 imagePrefix = 'scrolltech'
 credentialDocker = 'dockerhub'
-
+TAGNAME = ''
 pipeline {
     agent any
     options {
@@ -41,16 +41,38 @@ pipeline {
                                 if (TAGNAME == ""){
                                     return;
                                 }
-                                sh "docker login --username=${dockerUser} --password=${dockerPassword}"
-                                sh "make -C bridge docker"
-                                sh "make -C coordinator docker"
-                                sh "docker tag scrolltech/bridge:latest scrolltech/bridge:${TAGNAME}"
-                                sh "docker tag scrolltech/coordinator:latest scrolltech/coordinator:${TAGNAME}"
-                                sh "docker push scrolltech/bridge:${TAGNAME}"
-                                sh "docker push scrolltech/coordinator:${TAGNAME}"
+                                sh "docker login --username=$dockerUser --password=$dockerPassword"
+                                catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
+                                    script {
+                                        try {
+                                            sh "docker manifest inspect scrolltech/bridge:$TAGNAME > /dev/null"
+                                        } catch (e) {
+                                            // only build if the tag non existed
+                                            //sh "docker login --username=${dockerUser} --password=${dockerPassword}"
+                                            sh "make -C bridge docker"
+                                            sh "docker tag scrolltech/bridge:latest scrolltech/bridge:${TAGNAME}"
+                                            sh "docker push scrolltech/bridge:${TAGNAME}"
+                                            throw e
+                                        }
+                                    }
+                                }
+                                catchError(buildResult: 'SUCCESS', stageResult: 'SUCCESS') {
+                                    script {
+                                        try {
+                                            sh "docker manifest inspect scrolltech/coordinator:$TAGNAME > /dev/null"
+                                        } catch (e) {
+                                            // only build if the tag non existed
+                                            //sh "docker login --username=${dockerUser} --password=${dockerPassword}"
+                                            sh "make -C coordinator docker"
+                                            sh "docker tag scrolltech/coordinator:latest scrolltech/coordinator:${TAGNAME}"
+                                            sh "docker push scrolltech/coordinator:${TAGNAME}"
+                                            throw e
+                                        }
+                                    }
+                                }
                             }                              
                     }
-               }
+                }
             }
         }
     }

common/cmd/cmd.go

@@ -1,11 +1,11 @@
 package cmd
 
 import (
+	"fmt"
 	"os"
 	"os/exec"
 	"strings"
 	"sync"
-	"testing"
 
 	cmap "github.com/orcaman/concurrent-map"
 )
@@ -23,8 +23,6 @@ type checkFunc func(buf string)
 
 // Cmd struct
 type Cmd struct {
-	*testing.T
-
 	name string
 	args []string
 
@@ -38,9 +36,8 @@ type Cmd struct {
 }
 
 // NewCmd create Cmd instance.
-func NewCmd(t *testing.T, name string, args ...string) *Cmd {
+func NewCmd(name string, args ...string) *Cmd {
 	return &Cmd{
-		T:          t,
 		checkFuncs: cmap.New(),
 		name:       name,
 		args:       args,
@@ -48,40 +45,40 @@ func NewCmd(t *testing.T, name string, args ...string) *Cmd {
 }
 
 // RegistFunc register check func
-func (t *Cmd) RegistFunc(key string, check checkFunc) {
-	t.checkFuncs.Set(key, check)
+func (c *Cmd) RegistFunc(key string, check checkFunc) {
+	c.checkFuncs.Set(key, check)
 }
 
 // UnRegistFunc unregister check func
-func (t *Cmd) UnRegistFunc(key string) {
-	t.checkFuncs.Pop(key)
+func (c *Cmd) UnRegistFunc(key string) {
+	c.checkFuncs.Pop(key)
 }
 
-func (t *Cmd) runCmd() {
-	cmd := exec.Command(t.args[0], t.args[1:]...) //nolint:gosec
-	cmd.Stdout = t
-	cmd.Stderr = t
+func (c *Cmd) runCmd() {
+	cmd := exec.Command(c.args[0], c.args[1:]...) //nolint:gosec
+	cmd.Stdout = c
+	cmd.Stderr = c
 	_ = cmd.Run()
 }
 
 // RunCmd parallel running when parallel is true.
-func (t *Cmd) RunCmd(parallel bool) {
-	t.Log("cmd: ", t.args)
+func (c *Cmd) RunCmd(parallel bool) {
+	fmt.Println("cmd: ", c.args)
 	if parallel {
-		go t.runCmd()
+		go c.runCmd()
 	} else {
-		t.runCmd()
+		c.runCmd()
 	}
 }
 
-func (t *Cmd) Write(data []byte) (int, error) {
+func (c *Cmd) Write(data []byte) (int, error) {
 	out := string(data)
 	if verbose {
-		t.Logf("%s: %v", t.name, out)
+		fmt.Printf("%s: %v", c.name, out)
 	} else if strings.Contains(out, "error") || strings.Contains(out, "warning") {
-		t.Logf("%s: %v", t.name, out)
+		fmt.Printf("%s: %v", c.name, out)
 	}
-	go t.checkFuncs.IterCb(func(_ string, value interface{}) {
+	go c.checkFuncs.IterCb(func(_ string, value interface{}) {
 		check := value.(checkFunc)
 		check(out)
 	})

common/cmd/cmd_app.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/exec"
 	"strings"
+	"testing"
 	"time"
 
 	"github.com/docker/docker/pkg/reexec"
@@ -13,13 +14,13 @@ import (
 
 // RunApp exec's the current binary using name as argv[0] which will trigger the
 // reexec init function for that name (e.g. "geth-test" in cmd/geth/run_test.go)
-func (t *Cmd) RunApp(waitResult func() bool) {
-	t.Log("cmd: ", append([]string{t.name}, t.args...))
+func (c *Cmd) RunApp(waitResult func() bool) {
+	fmt.Println("cmd: ", append([]string{c.name}, c.args...))
 	cmd := &exec.Cmd{
 		Path:   reexec.Self(),
-		Args:   append([]string{t.name}, t.args...),
-		Stderr: t,
-		Stdout: t,
+		Args:   append([]string{c.name}, c.args...),
+		Stderr: c,
+		Stdout: c,
 	}
 	if waitResult != nil {
 		go func() {
@@ -30,38 +31,39 @@ func (t *Cmd) RunApp(waitResult func() bool) {
 		_ = cmd.Run()
 	}
 
-	t.mu.Lock()
-	t.cmd = cmd
-	t.mu.Unlock()
+	c.mu.Lock()
+	c.cmd = cmd
+	c.mu.Unlock()
 }
 
 // WaitExit wait util process exit.
-func (t *Cmd) WaitExit() {
+func (c *Cmd) WaitExit() {
 	// Wait all the check funcs are finished or test status is failed.
-	for !(t.Failed() || t.checkFuncs.IsEmpty()) {
+	for !(c.Err != nil || c.checkFuncs.IsEmpty()) {
 		<-time.After(time.Millisecond * 500)
 	}
 
 	// Send interrupt signal.
-	t.mu.Lock()
-	_ = t.cmd.Process.Signal(os.Interrupt)
-	t.mu.Unlock()
+	c.mu.Lock()
+	_ = c.cmd.Process.Signal(os.Interrupt)
+	_, _ = c.cmd.Process.Wait()
+	c.mu.Unlock()
 }
 
 // Interrupt send interrupt signal.
-func (t *Cmd) Interrupt() {
-	t.mu.Lock()
-	t.Err = t.cmd.Process.Signal(os.Interrupt)
-	t.mu.Unlock()
+func (c *Cmd) Interrupt() {
+	c.mu.Lock()
+	c.Err = c.cmd.Process.Signal(os.Interrupt)
+	c.mu.Unlock()
 }
 
 // WaitResult return true when get the keyword during timeout.
-func (t *Cmd) WaitResult(timeout time.Duration, keyword string) bool {
+func (c *Cmd) WaitResult(t *testing.T, timeout time.Duration, keyword string) bool {
 	if keyword == "" {
 		return false
 	}
 	okCh := make(chan struct{}, 1)
-	t.RegistFunc(keyword, func(buf string) {
+	c.RegistFunc(keyword, func(buf string) {
 		if strings.Contains(buf, keyword) {
 			select {
 			case okCh <- struct{}{}:
@@ -70,7 +72,7 @@ func (t *Cmd) WaitResult(timeout time.Duration, keyword string) bool {
 			}
 		}
 	})
-	defer t.UnRegistFunc(keyword)
+	defer c.UnRegistFunc(keyword)
 	select {
 	case <-okCh:
 		return true
@@ -81,12 +83,12 @@ func (t *Cmd) WaitResult(timeout time.Duration, keyword string) bool {
 }
 
 // ExpectWithTimeout wait result during timeout time.
-func (t *Cmd) ExpectWithTimeout(parallel bool, timeout time.Duration, keyword string) {
+func (c *Cmd) ExpectWithTimeout(t *testing.T, parallel bool, timeout time.Duration, keyword string) {
 	if keyword == "" {
 		return
 	}
 	okCh := make(chan struct{}, 1)
-	t.RegistFunc(keyword, func(buf string) {
+	c.RegistFunc(keyword, func(buf string) {
 		if strings.Contains(buf, keyword) {
 			select {
 			case okCh <- struct{}{}:
@@ -97,7 +99,7 @@ func (t *Cmd) ExpectWithTimeout(parallel bool, timeout time.Duration, keyword st
 	})
 
 	waitResult := func() {
-		defer t.UnRegistFunc(keyword)
+		defer c.UnRegistFunc(keyword)
 		select {
 		case <-okCh:
 			return

common/cmd/cmd_test.go

@@ -12,7 +12,7 @@ import (
 )
 
 func TestCmd(t *testing.T) {
-	app := cmd.NewCmd(t, "curTime", "date", "+%Y-%m-%d")
+	app := cmd.NewCmd("curTime", "date", "+%Y-%m-%d")
 
 	tm := time.Now()
 	curTime := fmt.Sprintf("%d-%02d-%02d", tm.Year(), tm.Month(), tm.Day())

common/docker/docker_app.go

@@ -0,0 +1,234 @@
+package docker
+
+import (
+	"context"
+	"crypto/rand"
+	"encoding/json"
+	"fmt"
+	"math/big"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/jmoiron/sqlx"
+	"github.com/modern-go/reflect2"
+	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/stretchr/testify/assert"
+
+	"scroll-tech/database"
+
+	"scroll-tech/common/cmd"
+	"scroll-tech/common/utils"
+)
+
+var (
+	l1StartPort = 10000
+	l2StartPort = 20000
+	dbStartPort = 30000
+)
+
+// App is collection struct of runtime docker images
+type App struct {
+	l1gethImg ImgInstance
+	l2gethImg ImgInstance
+
+	dbImg    ImgInstance
+	dbConfig *database.DBConfig
+	dbFile   string
+
+	// common time stamp.
+	timestamp int
+}
+
+// NewDockerApp returns new instance of dokerApp struct
+func NewDockerApp() *App {
+	timestamp := time.Now().Nanosecond()
+	return &App{
+		timestamp: timestamp,
+		dbFile:    fmt.Sprintf("/tmp/%d_db-config.json", timestamp),
+	}
+}
+
+// RunImages runs all images togather
+func (b *App) RunImages(t *testing.T) {
+	b.runDBImage(t)
+	b.runL1Geth(t)
+	b.runL2Geth(t)
+}
+
+func (b *App) runDBImage(t *testing.T) {
+	if b.dbImg != nil {
+		return
+	}
+	b.dbImg = newTestDBDocker(t, "postgres")
+	if err := b.mockDBConfig(); err != nil {
+		_ = b.dbImg.Stop()
+		b.dbImg = nil
+		_ = os.Remove(b.dbFile)
+		t.Fatal(err)
+	}
+}
+
+// RunDBApp runs DB app with command
+func (b *App) RunDBApp(t *testing.T, option, keyword string) {
+	args := []string{option, "--config", b.dbFile}
+	app := cmd.NewCmd("db_cli-test", args...)
+	defer app.WaitExit()
+
+	// Wait expect result.
+	app.ExpectWithTimeout(t, true, time.Second*3, keyword)
+	app.RunApp(nil)
+}
+
+// Free clear all running images
+func (b *App) Free() {
+	if b.l1gethImg != nil {
+		_ = b.l1gethImg.Stop()
+		b.l1gethImg = nil
+	}
+	if b.l2gethImg != nil {
+		_ = b.l2gethImg.Stop()
+		b.l2gethImg = nil
+	}
+	if b.dbImg != nil {
+		_ = b.dbImg.Stop()
+		b.dbImg = nil
+		_ = os.Remove(b.dbFile)
+	}
+}
+
+// L1GethEndpoint returns l1gethimg endpoint
+func (b *App) L1GethEndpoint() string {
+	if b.l1gethImg != nil {
+		return b.l1gethImg.Endpoint()
+	}
+	return ""
+}
+
+// L2GethEndpoint returns l2gethimg endpoint
+func (b *App) L2GethEndpoint() string {
+	if b.l2gethImg != nil {
+		return b.l2gethImg.Endpoint()
+	}
+	return ""
+}
+
+// DBEndpoint returns the endpoint of the dbimg
+func (b *App) DBEndpoint() string {
+	return b.dbImg.Endpoint()
+}
+
+func (b *App) runL1Geth(t *testing.T) {
+	if b.l1gethImg != nil {
+		return
+	}
+	b.l1gethImg = newTestL1Docker(t)
+}
+
+// L1Client returns a ethclient by dialing running l1geth
+func (b *App) L1Client() (*ethclient.Client, error) {
+	if b.l1gethImg == nil || reflect2.IsNil(b.l1gethImg) {
+		return nil, fmt.Errorf("l1 geth is not running")
+	}
+	client, err := ethclient.Dial(b.l1gethImg.Endpoint())
+	if err != nil {
+		return nil, err
+	}
+	return client, nil
+}
+
+func (b *App) runL2Geth(t *testing.T) {
+	if b.l2gethImg != nil {
+		return
+	}
+	b.l2gethImg = newTestL2Docker(t)
+}
+
+// L2Client returns a ethclient by dialing running l2geth
+func (b *App) L2Client() (*ethclient.Client, error) {
+	if b.l2gethImg == nil || reflect2.IsNil(b.l2gethImg) {
+		return nil, fmt.Errorf("l2 geth is not running")
+	}
+	client, err := ethclient.Dial(b.l2gethImg.Endpoint())
+	if err != nil {
+		return nil, err
+	}
+	return client, nil
+}
+
+func (b *App) mockDBConfig() error {
+	if b.dbConfig == nil {
+
+		b.dbConfig = &database.DBConfig{
+			DSN:        "",
+			DriverName: "postgres",
+			MaxOpenNum: 200,
+			MaxIdleNum: 20,
+		}
+	}
+
+	if b.dbImg != nil {
+		b.dbConfig.DSN = b.dbImg.Endpoint()
+	}
+	data, err := json.Marshal(b.dbConfig)
+	if err != nil {
+		return err
+	}
+
+	return os.WriteFile(b.dbFile, data, 0644) //nolint:gosec
+}
+
+func newTestL1Docker(t *testing.T) ImgInstance {
+	id, _ := rand.Int(rand.Reader, big.NewInt(2000))
+	imgL1geth := NewImgGeth("scroll_l1geth", "", "", 0, l1StartPort+int(id.Int64()))
+	assert.NoError(t, imgL1geth.Start())
+
+	// try 3 times to get chainID until is ok.
+	utils.TryTimes(3, func() bool {
+		client, _ := ethclient.Dial(imgL1geth.Endpoint())
+		if client != nil {
+			if _, err := client.ChainID(context.Background()); err == nil {
+				return true
+			}
+		}
+		return false
+	})
+
+	return imgL1geth
+}
+
+func newTestL2Docker(t *testing.T) ImgInstance {
+	id, _ := rand.Int(rand.Reader, big.NewInt(2000))
+	imgL2geth := NewImgGeth("scroll_l2geth", "", "", 0, l2StartPort+int(id.Int64()))
+	assert.NoError(t, imgL2geth.Start())
+
+	// try 3 times to get chainID until is ok.
+	utils.TryTimes(3, func() bool {
+		client, _ := ethclient.Dial(imgL2geth.Endpoint())
+		if client != nil {
+			if _, err := client.ChainID(context.Background()); err == nil {
+				return true
+			}
+		}
+		return false
+	})
+
+	return imgL2geth
+}
+
+func newTestDBDocker(t *testing.T, driverName string) ImgInstance {
+	id, _ := rand.Int(rand.Reader, big.NewInt(2000))
+	imgDB := NewImgDB(driverName, "123456", "test_db", dbStartPort+int(id.Int64()))
+	assert.NoError(t, imgDB.Start())
+
+	// try 5 times until the db is ready.
+	utils.TryTimes(5, func() bool {
+		db, _ := sqlx.Open(driverName, imgDB.Endpoint())
+		if db != nil {
+			return db.Ping() == nil
+		}
+		return false
+	})
+
+	return imgDB
+}

common/docker/docker_db.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"strings"
-	"testing"
 	"time"
 
 	"github.com/docker/docker/api/types"
@@ -28,7 +27,7 @@ type ImgDB struct {
 }
 
 // NewImgDB return postgres db img instance.
-func NewImgDB(t *testing.T, image, password, dbName string, port int) ImgInstance {
+func NewImgDB(image, password, dbName string, port int) ImgInstance {
 	img := &ImgDB{
 		image:    image,
 		name:     fmt.Sprintf("%s-%s_%d", image, dbName, port),
@@ -36,7 +35,7 @@ func NewImgDB(t *testing.T, image, password, dbName string, port int) ImgInstanc
 		dbName:   dbName,
 		port:     port,
 	}
-	img.cmd = cmd.NewCmd(t, img.name, img.prepare()...)
+	img.cmd = cmd.NewCmd(img.name, img.prepare()...)
 	return img
 }
 

common/docker/docker_geth.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"strconv"
 	"strings"
-	"testing"
 	"time"
 
 	"github.com/docker/docker/api/types"
@@ -30,7 +29,7 @@ type ImgGeth struct {
 }
 
 // NewImgGeth return geth img instance.
-func NewImgGeth(t *testing.T, image, volume, ipc string, hPort, wPort int) ImgInstance {
+func NewImgGeth(image, volume, ipc string, hPort, wPort int) ImgInstance {
 	img := &ImgGeth{
 		image:    image,
 		name:     fmt.Sprintf("%s-%d", image, time.Now().Nanosecond()),
@@ -39,7 +38,7 @@ func NewImgGeth(t *testing.T, image, volume, ipc string, hPort, wPort int) ImgIn
 		httpPort: hPort,
 		wsPort:   wPort,
 	}
-	img.cmd = cmd.NewCmd(t, img.name, img.prepare()...)
+	img.cmd = cmd.NewCmd(img.name, img.prepare()...)
 	return img
 }
 

common/docker/docker_test.go

@@ -1,4 +1,4 @@
-package docker
+package docker_test
 
 import (
 	"context"
@@ -6,13 +6,36 @@ import (
 
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq" //nolint:golint
-	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/stretchr/testify/assert"
+
+	_ "scroll-tech/database/cmd/app"
+
+	"scroll-tech/common/docker"
 )
 
-func TestDocker(t *testing.T) {
-	t.Parallel()
+var (
+	base *docker.App
+)
 
+func TestMain(m *testing.M) {
+	base = docker.NewDockerApp()
+
+	m.Run()
+
+	base.Free()
+}
+
+func TestStartProcess(t *testing.T) {
+	base.RunImages(t)
+
+	// migrate db.
+	base.RunDBApp(t, "reset", "successful to reset")
+	base.RunDBApp(t, "migrate", "current version:")
+}
+
+func TestDocker(t *testing.T) {
+	base.RunImages(t)
+	t.Parallel()
 	t.Run("testL1Geth", testL1Geth)
 	t.Run("testL2Geth", testL2Geth)
 	t.Run("testDB", testDB)
@@ -22,10 +45,7 @@ func testL1Geth(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	img := NewTestL1Docker(t)
-	defer img.Stop()
-
-	client, err := ethclient.Dial(img.Endpoint())
+	client, err := base.L1Client()
 	assert.NoError(t, err)
 
 	chainID, err := client.ChainID(ctx)
@@ -37,10 +57,7 @@ func testL2Geth(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	img := NewTestL2Docker(t)
-	defer img.Stop()
-
-	client, err := ethclient.Dial(img.Endpoint())
+	client, err := base.L2Client()
 	assert.NoError(t, err)
 
 	chainID, err := client.ChainID(ctx)
@@ -50,10 +67,8 @@ func testL2Geth(t *testing.T) {
 
 func testDB(t *testing.T) {
 	driverName := "postgres"
-	dbImg := NewTestDBDocker(t, driverName)
-	defer dbImg.Stop()
 
-	db, err := sqlx.Open(driverName, dbImg.Endpoint())
+	db, err := sqlx.Open(driverName, base.DBEndpoint())
 	assert.NoError(t, err)
 	assert.NoError(t, db.Ping())
 }

common/docker/l1geth/l1geth_run.sh

@@ -11,6 +11,6 @@ if [ ! -n "${IPC_PATH}" ];then
   IPC_PATH="/tmp/l1geth_path.ipc"
 fi
 
-exec geth --mine --datadir "." --unlock 0 --password "./password" --allow-insecure-unlock --nodiscover \
+exec geth --mine --datadir "." --unlock 0 --miner.etherbase "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63" --password "./password" --allow-insecure-unlock --nodiscover \
   --http --http.addr "0.0.0.0" --http.port 8545 --ws --ws.addr "0.0.0.0" --ws.port 8546 --ipcpath ${IPC_PATH}
 

common/docker/l2geth/Dockerfile

@@ -1,4 +1,4 @@
-FROM scrolltech/l2geth:prealpha-v4.2
+FROM scrolltech/l2geth:prealpha-v5.1
 
 RUN mkdir -p /l2geth/keystore
 

common/docker/mock.go

@@ -1,78 +0,0 @@
-package docker
-
-import (
-	"context"
-	"crypto/rand"
-	"math/big"
-	"testing"
-
-	"github.com/jmoiron/sqlx"
-	"github.com/scroll-tech/go-ethereum/ethclient"
-	"github.com/stretchr/testify/assert"
-
-	"scroll-tech/common/utils"
-)
-
-var (
-	l1StartPort = 10000
-	l2StartPort = 20000
-	dbStartPort = 30000
-)
-
-// NewTestL1Docker starts and returns l1geth docker
-func NewTestL1Docker(t *testing.T) ImgInstance {
-	id, _ := rand.Int(rand.Reader, big.NewInt(2000))
-	imgL1geth := NewImgGeth(t, "scroll_l1geth", "", "", 0, l1StartPort+int(id.Int64()))
-	assert.NoError(t, imgL1geth.Start())
-
-	// try 3 times to get chainID until is ok.
-	utils.TryTimes(3, func() bool {
-		client, _ := ethclient.Dial(imgL1geth.Endpoint())
-		if client != nil {
-			if _, err := client.ChainID(context.Background()); err == nil {
-				return true
-			}
-		}
-		return false
-	})
-
-	return imgL1geth
-}
-
-// NewTestL2Docker starts and returns l2geth docker
-func NewTestL2Docker(t *testing.T) ImgInstance {
-	id, _ := rand.Int(rand.Reader, big.NewInt(2000))
-	imgL2geth := NewImgGeth(t, "scroll_l2geth", "", "", 0, l2StartPort+int(id.Int64()))
-	assert.NoError(t, imgL2geth.Start())
-
-	// try 3 times to get chainID until is ok.
-	utils.TryTimes(3, func() bool {
-		client, _ := ethclient.Dial(imgL2geth.Endpoint())
-		if client != nil {
-			if _, err := client.ChainID(context.Background()); err == nil {
-				return true
-			}
-		}
-		return false
-	})
-
-	return imgL2geth
-}
-
-// NewTestDBDocker starts and returns database docker
-func NewTestDBDocker(t *testing.T, driverName string) ImgInstance {
-	id, _ := rand.Int(rand.Reader, big.NewInt(2000))
-	imgDB := NewImgDB(t, driverName, "123456", "test_db", dbStartPort+int(id.Int64()))
-	assert.NoError(t, imgDB.Start())
-
-	// try 5 times until the db is ready.
-	utils.TryTimes(5, func() bool {
-		db, _ := sqlx.Open(driverName, imgDB.Endpoint())
-		if db != nil {
-			return db.Ping() == nil
-		}
-		return false
-	})
-
-	return imgDB
-}

common/go.mod

@@ -6,19 +6,21 @@ require (
 	github.com/docker/docker v20.10.21+incompatible
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/lib/pq v1.10.6
-	github.com/mattn/go-colorable v0.1.8
-	github.com/mattn/go-isatty v0.0.14
+	github.com/mattn/go-colorable v0.1.13
+	github.com/mattn/go-isatty v0.0.16
+	github.com/modern-go/reflect2 v1.0.2
 	github.com/orcaman/concurrent-map v1.0.0
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20230112091133-2891916a0f81
-	github.com/stretchr/testify v1.8.0
-	github.com/urfave/cli/v2 v2.10.2
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230321020420-127af384ed04
+	github.com/stretchr/testify v1.8.2
+	github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa
+	gotest.tools v2.2.0+incompatible
 )
 
 require (
 	github.com/Microsoft/go-winio v0.6.0 // indirect
 	github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
 	github.com/btcsuite/btcd v0.20.1-beta // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set v1.8.0 // indirect
@@ -27,14 +29,15 @@ require (
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/edsrzf/mmap-go v1.0.0 // indirect
-	github.com/ethereum/go-ethereum v1.10.26 // indirect
+	github.com/ethereum/go-ethereum v1.11.4 // indirect
 	github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // indirect
 	github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
+	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/go-stack/stack v1.8.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/go-cmp v0.5.8 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/graph-gophers/graphql-go v1.3.0 // indirect
@@ -43,12 +46,11 @@ require (
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
 	github.com/holiman/uint256 v1.2.0 // indirect
 	github.com/huin/goupnp v1.0.3 // indirect
-	github.com/iden3/go-iden3-crypto v0.0.13 // indirect
+	github.com/iden3/go-iden3-crypto v0.0.14 // indirect
 	github.com/influxdata/influxdb v1.8.3 // indirect
 	github.com/influxdata/influxdb-client-go/v2 v2.4.0 // indirect
 	github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
-	github.com/kr/pretty v0.3.0 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/mattn/go-sqlite3 v1.14.14 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -64,27 +66,27 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/tsdb v0.7.1 // indirect
 	github.com/rjeczalik/notify v0.9.1 // indirect
-	github.com/rogpeppe/go-internal v1.8.1 // indirect
 	github.com/rs/cors v1.7.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/scroll-tech/zktrie v0.3.1 // indirect
+	github.com/scroll-tech/zktrie v0.5.2 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 // indirect
+	github.com/status-im/keycard-go v0.2.0 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
 	github.com/tklauser/numcpus v0.4.0 // indirect
-	github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef // indirect
+	github.com/tyler-smith/go-bip39 v1.1.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/crypto v0.5.0 // indirect
-	golang.org/x/mod v0.7.0 // indirect
-	golang.org/x/net v0.5.0 // indirect
+	golang.org/x/crypto v0.7.0 // indirect
+	golang.org/x/mod v0.8.0 // indirect
+	golang.org/x/net v0.8.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.4.0 // indirect
-	golang.org/x/text v0.6.0 // indirect
-	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
-	golang.org/x/tools v0.3.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/time v0.0.0-20220922220347-f3bd1da661af // indirect
+	golang.org/x/tools v0.6.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/urfave/cli.v1 v1.20.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

common/go.sum

@@ -18,28 +18,14 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy
 cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
 collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4=
-github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc=
-github.com/Azure/azure-storage-blob-go v0.7.0/go.mod h1:f9YQKtsG1nMisotuTPpO0tjNuEjKRYAcJU8/ydDI++4=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
-github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI=
-github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
-github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc=
-github.com/Azure/go-autorest/autorest/date v0.1.0/go.mod h1:plvfp3oPSKwf2DNjlBjWF/7vwR+cUD/ELuzDCXwHUVA=
-github.com/Azure/go-autorest/autorest/date v0.2.0/go.mod h1:vcORJHLJEh643/Ioh9+vPmf1Ij9AEBM5FuBIXLmIy0g=
-github.com/Azure/go-autorest/autorest/mocks v0.1.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.2.0/go.mod h1:OTyCOPRA2IgIlWxVYxBee2F5Gr4kF2zd2J5cFRaIDN0=
-github.com/Azure/go-autorest/autorest/mocks v0.3.0/go.mod h1:a8FDP3DYzQ4RYfVAxAN3SVSiiO77gL2j2ronKKP0syM=
-github.com/Azure/go-autorest/logger v0.1.0/go.mod h1:oExouG+K6PryycPJfVSxi/koC6LSNgds39diKLz7Vrc=
-github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbtp2fGCgRFtBroKn4Dk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
 github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
 github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o=
 github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
@@ -50,15 +36,6 @@ github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8=
 github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0=
-github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo=
-github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y=
-github.com/aws/aws-sdk-go-v2/credentials v1.1.1/go.mod h1:mM2iIjwl7LULWtS6JCACyInboHirisUUdkBPoTHMOUo=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.2/go.mod h1:3hGg3PpiEjHnrkrlasTfxFqUsZ2GCk/fMUn4CbKgSkM=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.2/go.mod h1:45MfaXZ0cNbeuT0KQ1XJylq8A6+OpVV2E5kvY/Kq+u8=
-github.com/aws/aws-sdk-go-v2/service/route53 v1.1.1/go.mod h1:rLiOUrPLW/Er5kRcQ7NkwbjlijluLsrIbu/iyl35RO4=
-github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbEWkXs7QRTQpCLGaKIprQW0=
-github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM=
-github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
@@ -75,22 +52,16 @@ github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46f
 github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
-github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
-github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304=
-github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ=
-github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
 github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg=
@@ -98,8 +69,6 @@ github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dchest/blake512 v1.0.0/go.mod h1:FV1x7xPPLWukZlpDpWQ88rF/SFwZ5qbskrzhLMB92JI=
-github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ=
 github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4=
 github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo=
 github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M=
@@ -108,33 +77,27 @@ github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRk
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
-github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
 github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker v20.10.21+incompatible h1:UTLdBmHk3bEY+w8qeO5KttOhy6OmXWsl/FEet9Uswog=
 github.com/docker/docker v20.10.21+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk=
-github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
 github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts=
 github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/ethereum/go-ethereum v1.10.13/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw=
-github.com/ethereum/go-ethereum v1.10.26 h1:i/7d9RBBwiXCEuyduBQzJw/mKmnvzsN14jqBmytw72s=
-github.com/ethereum/go-ethereum v1.10.26/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg=
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/ethereum/go-ethereum v1.11.4 h1:KG81SnUHXWk8LJB3mBcHg/E2yLvXoiPmRMCIRxgx3cE=
+github.com/ethereum/go-ethereum v1.11.4/go.mod h1:it7x0DWnTDMfVFdXcU6Ti4KEFQynLHVRarcSlPr0HBo=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI=
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
 github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
@@ -148,19 +111,19 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
 github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
+github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
+github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
+github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
 github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
@@ -183,7 +146,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
@@ -196,28 +158,22 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
-github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc=
 github.com/graph-gophers/graphql-go v1.3.0 h1:Eb9x/q6MFpCLz7jBCiP/WTxjSDrYLR1QY41SORZyNJ0=
 github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc=
 github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
@@ -231,14 +187,12 @@ github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iU
 github.com/holiman/uint256 v1.2.0 h1:gpSYcPLWGv4sG43I2mVLiDZCNDh/EpGjSk8tmtxitHM=
 github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/huin/goupnp v1.0.2/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSamkM=
 github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ=
 github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y=
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/iden3/go-iden3-crypto v0.0.12/go.mod h1:swXIv0HFbJKobbQBtsB50G7IHr6PbTowutSew/iBEoo=
-github.com/iden3/go-iden3-crypto v0.0.13 h1:ixWRiaqDULNyIDdOWz2QQJG5t4PpNHkQk2P6GV94cok=
-github.com/iden3/go-iden3-crypto v0.0.13/go.mod h1:swXIv0HFbJKobbQBtsB50G7IHr6PbTowutSew/iBEoo=
+github.com/iden3/go-iden3-crypto v0.0.14 h1:HQnFchY735JRNQxof6n/Vbyon4owj4+Ku+LNAamWV6c=
+github.com/iden3/go-iden3-crypto v0.0.14/go.mod h1:dLpM4vEPJ3nDHzhWFXDjzkn1qHoBeOT/3UEhXsEsP3E=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY=
 github.com/influxdata/influxdb v1.8.3 h1:WEypI1BQFTT4teLM+1qkEcvUi0dAvopAI/ir0vAiBg8=
@@ -254,13 +208,9 @@ github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19y
 github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bSgUQ7q5ZLSO+bKBGqJiCBGAl+9DxyW63zLTujjUlOE=
 github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0=
 github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po=
-github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
-github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
-github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
 github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
@@ -269,11 +219,10 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/julienschmidt/httprouter v1.2.0 h1:TDTW5Yz1mjftljbcKqRcrYhd4XeOoI98t+9HbQbYf7g=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
 github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0=
-github.com/karalabe/usb v0.0.0-20211005121534-4c5740d64559/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
@@ -283,21 +232,16 @@ github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM52
 github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg=
 github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
-github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=
@@ -308,16 +252,15 @@ github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIG
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc=
-github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
@@ -336,12 +279,12 @@ github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA
 github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
-github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
 github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
@@ -372,7 +315,6 @@ github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 h1:oYW+YCJ1pachXTQm
 github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
 github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -396,26 +338,20 @@ github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1
 github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeCE=
 github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
-github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
 github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230112091133-2891916a0f81 h1:Gm18RZ9WTR2Dupumr60E2m1Noe+l9/lITt6iRyxxZoc=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230112091133-2891916a0f81/go.mod h1:jurIpDQ0hqtp9//xxeWzr8X9KMP/+TYn+vz3K1wZrv0=
-github.com/scroll-tech/zktrie v0.3.0/go.mod h1:CuJFlG1/soTJJBAySxCZgTF7oPvd5qF6utHOEciC43Q=
-github.com/scroll-tech/zktrie v0.3.1 h1:HlR+fMBdjXX1/7cUMqpUgGEhGy/3vN1JpwQ0ovg/Ys8=
-github.com/scroll-tech/zktrie v0.3.1/go.mod h1:CuJFlG1/soTJJBAySxCZgTF7oPvd5qF6utHOEciC43Q=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230321020420-127af384ed04 h1:PpI31kaBVm6+7sZtyK03Ex0QIg3P821Ktae0FHFh7IM=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230321020420-127af384ed04/go.mod h1:jH8c08L9K8Hieaf0r/ur2P/cpesn4dFhmLm2Mmoi8kI=
+github.com/scroll-tech/zktrie v0.5.2 h1:U34jPXMLGOlRHfdvYp5VVgOcC0RuPeJmcS3bWotCWiY=
+github.com/scroll-tech/zktrie v0.5.2/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
 github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=
 github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
@@ -425,11 +361,12 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg=
-github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
+github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA=
+github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9+mHxBEeo3Hbg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -437,22 +374,20 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
-github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI=
 github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
 github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
-github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM=
 github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
 github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
-github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef h1:wHSqTBrZW24CsNJDfeh9Ex6Pm0Rcpc7qrgKBiL44vF4=
-github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs=
-github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
-github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y=
-github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo=
+github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8=
+github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U=
+github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa h1:5SqCsI/2Qya2bCzK15ozrqo2sZxkh0FHynJZOTVoV6Q=
+github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
@@ -475,15 +410,12 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
-golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
+golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
+golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -512,9 +444,8 @@ golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
-golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -536,13 +467,8 @@ golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
-golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
+golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -554,10 +480,8 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -593,39 +517,28 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y=
+golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -656,8 +569,8 @@ golang.org/x/tools v0.0.0-20200108203644-89082a384178/go.mod h1:TB2adYChydJhpapK
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.3.0 h1:SrNbZl6ECOS1qFzgTdQfWXZM9XBkiA6tkFrH9YSTPHM=
-golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -715,22 +628,20 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
-gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0=
 gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
@@ -740,6 +651,5 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.1.3/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

common/libzkp/impl/Cargo.toml

@@ -7,9 +7,16 @@ edition = "2021"
 [lib]
 crate-type = ["staticlib"]
 
+[patch."https://github.com/privacy-scaling-explorations/halo2.git"]
+halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "scroll-dev-0220"  }
+[patch."https://github.com/privacy-scaling-explorations/poseidon.git"]
+poseidon = { git = "https://github.com/scroll-tech/poseidon.git", branch = "scroll-dev-0220" }
+[patch."https://github.com/scroll-tech/zktrie.git"]
+zktrie = { git = "https://github.com/lispc/zktrie", branch = "scroll-dev-0215" }
+
 [dependencies]
-zkevm = { git = "https://github.com/scroll-tech/scroll-zkevm", branch="fix/mpt_limit" }
-types = { git = "https://github.com/scroll-tech/scroll-zkevm", branch="fix/mpt_limit" }
+zkevm = { git = "https://github.com/scroll-tech/scroll-zkevm", branch="goerli-0215" }
+types = { git = "https://github.com/scroll-tech/scroll-zkevm", branch="goerli-0215" }
 
 log = "0.4"
 env_logger = "0.9.0"

common/libzkp/impl/rust-toolchain

@@ -1 +1 @@
-nightly-2022-08-23
+nightly-2022-12-10

common/libzkp/impl/src/prove.rs

@@ -44,7 +44,7 @@ pub unsafe extern "C" fn create_agg_proof_multi(trace_char: *const c_char) -> *c
     let proof = PROVER
         .get_mut()
         .unwrap()
-        .create_agg_circuit_proof_multi(traces.as_slice())
+        .create_agg_circuit_proof_batch(traces.as_slice())
         .unwrap();
     let proof_bytes = serde_json::to_vec(&proof).unwrap();
     vec_to_c_char(proof_bytes)

common/message/message.go

@@ -214,8 +214,9 @@ func (z *ProofDetail) Hash() ([]byte, error) {
 
 // AggProof includes the proof and public input that are required to verification and rollup.
 type AggProof struct {
-	Proof     []byte `json:"proof"`
-	Instance  []byte `json:"instance"`
-	FinalPair []byte `json:"final_pair"`
-	Vk        []byte `json:"vk"`
+	Proof      []byte `json:"proof"`
+	Instance   []byte `json:"instance"`
+	FinalPair  []byte `json:"final_pair"`
+	Vk         []byte `json:"vk"`
+	BlockCount uint   `json:"block_count"`
 }

common/metrics/metrics.go

@@ -0,0 +1,57 @@
+package metrics
+
+import (
+	"context"
+	"net"
+	"net/http"
+	"strconv"
+
+	"github.com/scroll-tech/go-ethereum/log"
+	"github.com/scroll-tech/go-ethereum/metrics"
+	"github.com/scroll-tech/go-ethereum/metrics/prometheus"
+	"github.com/scroll-tech/go-ethereum/rpc"
+	"github.com/urfave/cli/v2"
+
+	"scroll-tech/common/utils"
+)
+
+var (
+	// ScrollRegistry is used for scroll metrics.
+	ScrollRegistry = metrics.NewRegistry()
+)
+
+// Serve starts the metrics server on the given address, will be closed when the given
+// context is canceled.
+func Serve(ctx context.Context, c *cli.Context) {
+	if !c.Bool(utils.MetricsEnabled.Name) {
+		return
+	}
+
+	address := net.JoinHostPort(
+		c.String(utils.MetricsAddr.Name),
+		strconv.Itoa(c.Int(utils.MetricsPort.Name)),
+	)
+
+	server := &http.Server{
+		Addr:         address,
+		Handler:      prometheus.Handler(ScrollRegistry),
+		ReadTimeout:  rpc.DefaultHTTPTimeouts.ReadTimeout,
+		WriteTimeout: rpc.DefaultHTTPTimeouts.WriteTimeout,
+		IdleTimeout:  rpc.DefaultHTTPTimeouts.IdleTimeout,
+	}
+
+	go func() {
+		<-ctx.Done()
+		if err := server.Close(); err != nil {
+			log.Error("Failed to close metrics server", "error", err)
+		}
+	}()
+
+	log.Info("Starting metrics server", "address", address)
+
+	go func() {
+		if err := server.ListenAndServe(); err != nil {
+			log.Error("start metrics server error", "error", err)
+		}
+	}()
+}

common/testdata/blockTrace_02.json

@@ -1,4 +1,5 @@
 {
+    "withdrawTrieRoot": "0x0000000000000000000000000000000000000000",
     "coinbase": {
         "address": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63",
         "nonce": 2,

common/testdata/blockTrace_03.json

@@ -1,4 +1,5 @@
 {
+    "withdrawTrieRoot": "0x0000000000000000000000000000000000000000",
     "coinbase": {
         "address": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63",
         "nonce": 3,

common/types/batch.go

@@ -0,0 +1,237 @@
+package types
+
+import (
+	"bufio"
+	"bytes"
+	"encoding/binary"
+	"math/big"
+
+	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/common/hexutil"
+	"github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/crypto"
+
+	abi "scroll-tech/bridge/abi"
+)
+
+// PublicInputHashConfig is the configuration of how to compute the public input hash.
+type PublicInputHashConfig struct {
+	MaxTxNum      int         `json:"max_tx_num"`
+	PaddingTxHash common.Hash `json:"padding_tx_hash"`
+}
+
+const defaultMaxTxNum = 44
+
+var defaultPaddingTxHash = [32]byte{}
+
+// BatchData contains info of batch to be committed.
+type BatchData struct {
+	Batch        abi.IScrollChainBatch
+	TxHashes     []common.Hash
+	TotalTxNum   uint64
+	TotalL1TxNum uint64
+	TotalL2Gas   uint64
+
+	// cache for the BatchHash
+	hash *common.Hash
+	// The config to compute the public input hash, or the block hash.
+	// If it is nil, the hash calculation will use `defaultMaxTxNum` and `defaultPaddingTxHash`.
+	piCfg *PublicInputHashConfig
+}
+
+// Timestamp returns the timestamp of the first block in the BlockData.
+func (b *BatchData) Timestamp() uint64 {
+	if len(b.Batch.Blocks) == 0 {
+		return 0
+	}
+	return b.Batch.Blocks[0].Timestamp
+}
+
+// Hash calculates the hash of this batch.
+func (b *BatchData) Hash() *common.Hash {
+	if b.hash != nil {
+		return b.hash
+	}
+
+	buf := make([]byte, 8)
+	hasher := crypto.NewKeccakState()
+
+	// 1. hash PrevStateRoot, NewStateRoot, WithdrawTrieRoot
+	// @todo: panic on error here.
+	_, _ = hasher.Write(b.Batch.PrevStateRoot[:])
+	_, _ = hasher.Write(b.Batch.NewStateRoot[:])
+	_, _ = hasher.Write(b.Batch.WithdrawTrieRoot[:])
+
+	// 2. hash all block contexts
+	for _, block := range b.Batch.Blocks {
+		// write BlockHash & ParentHash
+		_, _ = hasher.Write(block.BlockHash[:])
+		_, _ = hasher.Write(block.ParentHash[:])
+		// write BlockNumber
+		binary.BigEndian.PutUint64(buf, block.BlockNumber)
+		_, _ = hasher.Write(buf)
+		// write Timestamp
+		binary.BigEndian.PutUint64(buf, block.Timestamp)
+		_, _ = hasher.Write(buf)
+		// write BaseFee
+		var baseFee [32]byte
+		if block.BaseFee != nil {
+			baseFee = newByte32FromBytes(block.BaseFee.Bytes())
+		}
+		_, _ = hasher.Write(baseFee[:])
+		// write GasLimit
+		binary.BigEndian.PutUint64(buf, block.GasLimit)
+		_, _ = hasher.Write(buf)
+		// write NumTransactions
+		binary.BigEndian.PutUint16(buf[:2], block.NumTransactions)
+		_, _ = hasher.Write(buf[:2])
+		// write NumL1Messages
+		binary.BigEndian.PutUint16(buf[:2], block.NumL1Messages)
+		_, _ = hasher.Write(buf[:2])
+	}
+
+	// 3. add all tx hashes
+	for _, txHash := range b.TxHashes {
+		_, _ = hasher.Write(txHash[:])
+	}
+
+	// 4. append empty tx hash up to MaxTxNum
+	maxTxNum := defaultMaxTxNum
+	paddingTxHash := common.Hash(defaultPaddingTxHash)
+	if b.piCfg != nil {
+		maxTxNum = b.piCfg.MaxTxNum
+		paddingTxHash = b.piCfg.PaddingTxHash
+	}
+	for i := len(b.TxHashes); i < maxTxNum; i++ {
+		_, _ = hasher.Write(paddingTxHash[:])
+	}
+
+	b.hash = new(common.Hash)
+	_, _ = hasher.Read(b.hash[:])
+
+	return b.hash
+}
+
+// NewBatchData creates a BatchData given the parent batch information and the traces of the blocks
+// included in this batch
+func NewBatchData(parentBatch *BlockBatch, blockTraces []*types.BlockTrace, piCfg *PublicInputHashConfig) *BatchData {
+	batchData := new(BatchData)
+	batch := &batchData.Batch
+
+	// set BatchIndex, ParentBatchHash
+	batch.BatchIndex = parentBatch.Index + 1
+	batch.ParentBatchHash = common.HexToHash(parentBatch.Hash)
+	batch.Blocks = make([]abi.IScrollChainBlockContext, len(blockTraces))
+
+	var batchTxDataBuf bytes.Buffer
+	batchTxDataWriter := bufio.NewWriter(&batchTxDataBuf)
+
+	for i, trace := range blockTraces {
+		batchData.TotalTxNum += uint64(len(trace.Transactions))
+		batchData.TotalL2Gas += trace.Header.GasUsed
+
+		// set baseFee to 0 when it's nil in the block header
+		baseFee := trace.Header.BaseFee
+		if baseFee == nil {
+			baseFee = big.NewInt(0)
+		}
+
+		batch.Blocks[i] = abi.IScrollChainBlockContext{
+			BlockHash:       trace.Header.Hash(),
+			ParentHash:      trace.Header.ParentHash,
+			BlockNumber:     trace.Header.Number.Uint64(),
+			Timestamp:       trace.Header.Time,
+			BaseFee:         baseFee,
+			GasLimit:        trace.Header.GasLimit,
+			NumTransactions: uint16(len(trace.Transactions)),
+			NumL1Messages:   0, // TODO: currently use 0, will re-enable after we use l2geth to include L1 messages
+		}
+
+		// fill in RLP-encoded transactions
+		for _, txData := range trace.Transactions {
+			data, _ := hexutil.Decode(txData.Data)
+			// right now we only support legacy tx
+			tx := types.NewTx(&types.LegacyTx{
+				Nonce:    txData.Nonce,
+				To:       txData.To,
+				Value:    txData.Value.ToInt(),
+				Gas:      txData.Gas,
+				GasPrice: txData.GasPrice.ToInt(),
+				Data:     data,
+				V:        txData.V.ToInt(),
+				R:        txData.R.ToInt(),
+				S:        txData.S.ToInt(),
+			})
+			rlpTxData, _ := tx.MarshalBinary()
+			var txLen [4]byte
+			binary.BigEndian.PutUint32(txLen[:], uint32(len(rlpTxData)))
+			_, _ = batchTxDataWriter.Write(txLen[:])
+			_, _ = batchTxDataWriter.Write(rlpTxData)
+			batchData.TxHashes = append(batchData.TxHashes, tx.Hash())
+		}
+
+		// set PrevStateRoot from the first block
+		if i == 0 {
+			batch.PrevStateRoot = trace.StorageTrace.RootBefore
+		}
+
+		// set NewStateRoot & WithdrawTrieRoot from the last block
+		if i == len(blockTraces)-1 {
+			batch.NewStateRoot = trace.Header.Root
+			batch.WithdrawTrieRoot = trace.WithdrawTrieRoot
+		}
+	}
+
+	if err := batchTxDataWriter.Flush(); err != nil {
+		panic("Buffered I/O flush failed")
+	}
+
+	batch.L2Transactions = batchTxDataBuf.Bytes()
+	batchData.piCfg = piCfg
+
+	return batchData
+}
+
+// NewGenesisBatchData generates the batch that contains the genesis block.
+func NewGenesisBatchData(genesisBlockTrace *types.BlockTrace) *BatchData {
+	header := genesisBlockTrace.Header
+	if header.Number.Uint64() != 0 {
+		panic("invalid genesis block trace: block number is not 0")
+	}
+
+	batchData := new(BatchData)
+	batch := &batchData.Batch
+
+	// fill in batch information
+	batch.BatchIndex = 0
+	batch.Blocks = make([]abi.IScrollChainBlockContext, 1)
+	batch.NewStateRoot = header.Root
+	// PrevStateRoot, WithdrawTrieRoot, ParentBatchHash should all be 0
+	// L2Transactions should be empty
+
+	// fill in block context
+	batch.Blocks[0] = abi.IScrollChainBlockContext{
+		BlockHash:       header.Hash(),
+		ParentHash:      header.ParentHash,
+		BlockNumber:     header.Number.Uint64(),
+		Timestamp:       header.Time,
+		BaseFee:         header.BaseFee,
+		GasLimit:        header.GasLimit,
+		NumTransactions: 0,
+		NumL1Messages:   0,
+	}
+
+	return batchData
+}
+
+// newByte32FromBytes converts the bytes in big-endian encoding to 32 bytes in big-endian encoding
+func newByte32FromBytes(b []byte) [32]byte {
+	var byte32 [32]byte
+
+	if len(b) > 32 {
+		b = b[len(b)-32:]
+	}
+
+	copy(byte32[32-len(b):], b)
+	return byte32
+}

common/types/batch_test.go

@@ -0,0 +1,99 @@
+package types
+
+import (
+	"math/big"
+	"testing"
+
+	"gotest.tools/assert"
+
+	"github.com/scroll-tech/go-ethereum/common"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
+
+	abi "scroll-tech/bridge/abi"
+)
+
+func TestBatchHash(t *testing.T) {
+	txBytes := common.Hex2Bytes("02f8710582fd14808506e38dccc9825208944d496ccc28058b1d74b7a19541663e21154f9c848801561db11e24a43380c080a0d890606d7a35b2ab0f9b866d62c092d5b163f3e6a55537ae1485aac08c3f8ff7a023997be2d32f53e146b160fff0ba81e81dbb4491c865ab174d15c5b3d28c41ae")
+	tx := new(geth_types.Transaction)
+	if err := tx.UnmarshalBinary(txBytes); err != nil {
+		t.Fatalf("invalid tx hex string: %s", err)
+	}
+
+	batchData := new(BatchData)
+	batchData.TxHashes = append(batchData.TxHashes, tx.Hash())
+	batchData.piCfg = &PublicInputHashConfig{
+		MaxTxNum:      4,
+		PaddingTxHash: common.HexToHash("0xb5baa665b2664c3bfed7eb46e00ebc110ecf2ebd257854a9bf2b9dbc9b2c08f6"),
+	}
+
+	batch := &batchData.Batch
+	batch.PrevStateRoot = common.HexToHash("0x000000000000000000000000000000000000000000000000000000000000cafe")
+
+	block := abi.IScrollChainBlockContext{
+		BlockNumber:     51966,
+		Timestamp:       123456789,
+		BaseFee:         new(big.Int).SetUint64(0),
+		GasLimit:        10000000000000000,
+		NumTransactions: 1,
+		NumL1Messages:   0,
+	}
+	batch.Blocks = append(batch.Blocks, block)
+
+	hash := batchData.Hash()
+	assert.Equal(t, *hash, common.HexToHash("0xa9f2ca3175794f91226a410ba1e60fff07a405c957562675c4149b77e659d805"))
+
+	// use a different tx hash
+	txBytes = common.Hex2Bytes("f8628001830f424094000000000000000000000000000000000000bbbb8080820a97a064e07cd8f939e2117724bdcbadc80dda421381cbc2a1f4e0d093d9cc5c5cf68ea03e264227f80852d88743cd9e43998f2746b619180366a87e4531debf9c3fa5dc")
+	tx = new(geth_types.Transaction)
+	if err := tx.UnmarshalBinary(txBytes); err != nil {
+		t.Fatalf("invalid tx hex string: %s", err)
+	}
+	batchData.TxHashes[0] = tx.Hash()
+
+	batchData.hash = nil // clear the cache
+	assert.Equal(t, *batchData.Hash(), common.HexToHash("0x398cb22bbfa1665c1b342b813267538a4c933d7f92d8bd9184aba0dd1122987b"))
+}
+
+func TestNewGenesisBatch(t *testing.T) {
+	genesisBlock := &geth_types.Header{
+		UncleHash:   common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
+		Root:        common.HexToHash("0x1b186a7a90ec3b41a2417062fe44dce8ce82ae76bfbb09eae786a4f1be1895f5"),
+		TxHash:      common.HexToHash("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"),
+		ReceiptHash: common.HexToHash("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"),
+		Difficulty:  big.NewInt(1),
+		Number:      big.NewInt(0),
+		GasLimit:    940000000,
+		GasUsed:     0,
+		Time:        1639724192,
+		Extra:       common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000000214f8d488aa9ebf83e30bad45fb8f9c8ee2509f5511caff794753d07e9dfb218cfc233bb62d2c57022783094e1a7edb6f069f8424bb68496a0926b130000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"),
+		BaseFee:     big.NewInt(1000000000),
+	}
+	assert.Equal(
+		t,
+		genesisBlock.Hash().Hex(),
+		"0x92826bd3aad2ef70d8061dc4e25150b305d1233d9cd7579433a77d6eb01dae1c",
+		"wrong genesis block header",
+	)
+
+	blockTrace := &geth_types.BlockTrace{
+		Coinbase:         nil,
+		Header:           genesisBlock,
+		Transactions:     []*geth_types.TransactionData{},
+		StorageTrace:     nil,
+		ExecutionResults: []*geth_types.ExecutionResult{},
+		MPTWitness:       nil,
+	}
+
+	batchData := NewGenesisBatchData(blockTrace)
+	t.Log(batchData.Batch.Blocks[0])
+	batchData.piCfg = &PublicInputHashConfig{
+		MaxTxNum:      25,
+		PaddingTxHash: common.HexToHash("0xb5baa665b2664c3bfed7eb46e00ebc110ecf2ebd257854a9bf2b9dbc9b2c08f6"),
+	}
+	assert.Equal(
+		t,
+		batchData.Hash().Hex(),
+		"0x65cf210e30f75cf8fd198df124255f73bc08d6324759e828a784fa938e7ac43d",
+		"wrong genesis batch hash",
+	)
+}

common/types/db.go

@@ -0,0 +1,250 @@
+// Package types defines the table schema data structure used in the database tables
+package types
+
+import (
+	"database/sql"
+	"fmt"
+	"time"
+)
+
+// L1BlockStatus represents current l1 block processing status
+type L1BlockStatus int
+
+// GasOracleStatus represents current gas oracle processing status
+type GasOracleStatus int
+
+const (
+	// L1BlockUndefined : undefined l1 block status
+	L1BlockUndefined L1BlockStatus = iota
+
+	// L1BlockPending represents the l1 block status is pending
+	L1BlockPending
+
+	// L1BlockImporting represents the l1 block status is importing
+	L1BlockImporting
+
+	// L1BlockImported represents the l1 block status is imported
+	L1BlockImported
+
+	// L1BlockFailed represents the l1 block status is failed
+	L1BlockFailed
+)
+
+const (
+	// GasOracleUndefined : undefined gas oracle status
+	GasOracleUndefined GasOracleStatus = iota
+
+	// GasOraclePending represents the gas oracle status is pending
+	GasOraclePending
+
+	// GasOracleImporting represents the gas oracle status is importing
+	GasOracleImporting
+
+	// GasOracleImported represents the gas oracle status is imported
+	GasOracleImported
+
+	// GasOracleFailed represents the gas oracle status is failed
+	GasOracleFailed
+)
+
+// L1BlockInfo is structure of stored l1 block
+type L1BlockInfo struct {
+	Number    uint64 `json:"number" db:"number"`
+	Hash      string `json:"hash" db:"hash"`
+	HeaderRLP string `json:"header_rlp" db:"header_rlp"`
+	BaseFee   uint64 `json:"base_fee" db:"base_fee"`
+
+	BlockStatus     L1BlockStatus   `json:"block_status" db:"block_status"`
+	GasOracleStatus GasOracleStatus `json:"oracle_status" db:"oracle_status"`
+
+	ImportTxHash sql.NullString `json:"import_tx_hash" db:"import_tx_hash"`
+	OracleTxHash sql.NullString `json:"oracle_tx_hash" db:"oracle_tx_hash"`
+}
+
+// MsgStatus represents current layer1 transaction processing status
+type MsgStatus int
+
+const (
+	// MsgUndefined : undefined msg status
+	MsgUndefined MsgStatus = iota
+
+	// MsgPending represents the from_layer message status is pending
+	MsgPending
+
+	// MsgSubmitted represents the from_layer message status is submitted
+	MsgSubmitted
+
+	// MsgConfirmed represents the from_layer message status is confirmed
+	MsgConfirmed
+
+	// MsgFailed represents the from_layer message status is failed
+	MsgFailed
+
+	// MsgExpired represents the from_layer message status is expired
+	MsgExpired
+)
+
+// L1Message is structure of stored layer1 bridge message
+type L1Message struct {
+	QueueIndex uint64    `json:"queue_index" db:"queue_index"`
+	MsgHash    string    `json:"msg_hash" db:"msg_hash"`
+	Height     uint64    `json:"height" db:"height"`
+	Sender     string    `json:"sender" db:"sender"`
+	Value      string    `json:"value" db:"value"`
+	Target     string    `json:"target" db:"target"`
+	Calldata   string    `json:"calldata" db:"calldata"`
+	GasLimit   uint64    `json:"gas_limit" db:"gas_limit"`
+	Layer1Hash string    `json:"layer1_hash" db:"layer1_hash"`
+	Status     MsgStatus `json:"status" db:"status"`
+}
+
+// L2Message is structure of stored layer2 bridge message
+type L2Message struct {
+	Nonce      uint64    `json:"nonce" db:"nonce"`
+	MsgHash    string    `json:"msg_hash" db:"msg_hash"`
+	Height     uint64    `json:"height" db:"height"`
+	Sender     string    `json:"sender" db:"sender"`
+	Value      string    `json:"value" db:"value"`
+	Target     string    `json:"target" db:"target"`
+	Calldata   string    `json:"calldata" db:"calldata"`
+	Layer2Hash string    `json:"layer2_hash" db:"layer2_hash"`
+	Status     MsgStatus `json:"status" db:"status"`
+}
+
+// BlockInfo is structure of stored `block_trace` without `trace`
+type BlockInfo struct {
+	Number         uint64         `json:"number" db:"number"`
+	Hash           string         `json:"hash" db:"hash"`
+	ParentHash     string         `json:"parent_hash" db:"parent_hash"`
+	BatchHash      sql.NullString `json:"batch_hash" db:"batch_hash"`
+	TxNum          uint64         `json:"tx_num" db:"tx_num"`
+	GasUsed        uint64         `json:"gas_used" db:"gas_used"`
+	BlockTimestamp uint64         `json:"block_timestamp" db:"block_timestamp"`
+}
+
+// RollerProveStatus is the roller prove status of a block batch (session)
+type RollerProveStatus int32
+
+const (
+	// RollerAssigned indicates roller assigned but has not submitted proof
+	RollerAssigned RollerProveStatus = iota
+	// RollerProofValid indicates roller has submitted valid proof
+	RollerProofValid
+	// RollerProofInvalid indicates roller has submitted invalid proof
+	RollerProofInvalid
+)
+
+func (s RollerProveStatus) String() string {
+	switch s {
+	case RollerAssigned:
+		return "RollerAssigned"
+	case RollerProofValid:
+		return "RollerProofValid"
+	case RollerProofInvalid:
+		return "RollerProofInvalid"
+	default:
+		return fmt.Sprintf("Bad Value: %d", int32(s))
+	}
+}
+
+// RollerStatus is the roller name and roller prove status
+type RollerStatus struct {
+	PublicKey string            `json:"public_key"`
+	Name      string            `json:"name"`
+	Status    RollerProveStatus `json:"status"`
+}
+
+// SessionInfo is assigned rollers info of a block batch (session)
+type SessionInfo struct {
+	ID             string                   `json:"id"`
+	Rollers        map[string]*RollerStatus `json:"rollers"`
+	StartTimestamp int64                    `json:"start_timestamp"`
+}
+
+// ProvingStatus block_batch proving_status (unassigned, assigned, proved, verified, submitted)
+type ProvingStatus int
+
+const (
+	// ProvingStatusUndefined : undefined proving_task status
+	ProvingStatusUndefined ProvingStatus = iota
+	// ProvingTaskUnassigned : proving_task is not assigned to be proved
+	ProvingTaskUnassigned
+	// ProvingTaskSkipped : proving_task is skipped for proof generation
+	ProvingTaskSkipped
+	// ProvingTaskAssigned : proving_task is assigned to be proved
+	ProvingTaskAssigned
+	// ProvingTaskProved : proof has been returned by prover
+	ProvingTaskProved
+	// ProvingTaskVerified : proof is valid
+	ProvingTaskVerified
+	// ProvingTaskFailed : fail to generate proof
+	ProvingTaskFailed
+)
+
+func (ps ProvingStatus) String() string {
+	switch ps {
+	case ProvingTaskUnassigned:
+		return "unassigned"
+	case ProvingTaskSkipped:
+		return "skipped"
+	case ProvingTaskAssigned:
+		return "assigned"
+	case ProvingTaskProved:
+		return "proved"
+	case ProvingTaskVerified:
+		return "verified"
+	case ProvingTaskFailed:
+		return "failed"
+	default:
+		return "undefined"
+	}
+}
+
+// RollupStatus block_batch rollup_status (pending, committing, committed, finalizing, finalized)
+type RollupStatus int
+
+const (
+	// RollupUndefined : undefined rollup status
+	RollupUndefined RollupStatus = iota
+	// RollupPending : batch is pending to rollup to layer1
+	RollupPending
+	// RollupCommitting : rollup transaction is submitted to layer1
+	RollupCommitting
+	// RollupCommitted : rollup transaction is confirmed to layer1
+	RollupCommitted
+	// RollupFinalizing : finalize transaction is submitted to layer1
+	RollupFinalizing
+	// RollupFinalized : finalize transaction is confirmed to layer1
+	RollupFinalized
+	// RollupFinalizationSkipped : batch finalization is skipped
+	RollupFinalizationSkipped
+)
+
+// BlockBatch is structure of stored block_batch
+type BlockBatch struct {
+	Hash                string          `json:"hash" db:"hash"`
+	Index               uint64          `json:"index" db:"index"`
+	ParentHash          string          `json:"parent_hash" db:"parent_hash"`
+	StartBlockNumber    uint64          `json:"start_block_number" db:"start_block_number"`
+	StartBlockHash      string          `json:"start_block_hash" db:"start_block_hash"`
+	EndBlockNumber      uint64          `json:"end_block_number" db:"end_block_number"`
+	EndBlockHash        string          `json:"end_block_hash" db:"end_block_hash"`
+	StateRoot           string          `json:"state_root" db:"state_root"`
+	TotalTxNum          uint64          `json:"total_tx_num" db:"total_tx_num"`
+	TotalL1TxNum        uint64          `json:"total_l1_tx_num" db:"total_l1_tx_num"`
+	TotalL2Gas          uint64          `json:"total_l2_gas" db:"total_l2_gas"`
+	ProvingStatus       ProvingStatus   `json:"proving_status" db:"proving_status"`
+	Proof               []byte          `json:"proof" db:"proof"`
+	InstanceCommitments []byte          `json:"instance_commitments" db:"instance_commitments"`
+	ProofTimeSec        uint64          `json:"proof_time_sec" db:"proof_time_sec"`
+	RollupStatus        RollupStatus    `json:"rollup_status" db:"rollup_status"`
+	OracleStatus        GasOracleStatus `json:"oracle_status" db:"oracle_status"`
+	CommitTxHash        sql.NullString  `json:"commit_tx_hash" db:"commit_tx_hash"`
+	FinalizeTxHash      sql.NullString  `json:"finalize_tx_hash" db:"finalize_tx_hash"`
+	OracleTxHash        sql.NullString  `json:"oracle_tx_hash" db:"oracle_tx_hash"`
+	CreatedAt           *time.Time      `json:"created_at" db:"created_at"`
+	ProverAssignedAt    *time.Time      `json:"prover_assigned_at" db:"prover_assigned_at"`
+	ProvedAt            *time.Time      `json:"proved_at" db:"proved_at"`
+	CommittedAt         *time.Time      `json:"committed_at" db:"committed_at"`
+	FinalizedAt         *time.Time      `json:"finalized_at" db:"finalized_at"`
+}

common/utils/contracts.go

@@ -1,19 +0,0 @@
-package utils
-
-import (
-	"math/big"
-
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/crypto"
-)
-
-// ComputeBatchID compute a unique hash for a batch using "endBlockHash" & "endBlockHash in last batch"
-// & "batch height", following the logic in `_computeBatchId` in contracts/src/L1/rollup/ZKRollup.sol
-func ComputeBatchID(endBlockHash common.Hash, lastEndBlockHash common.Hash, index *big.Int) string {
-	indexBytes := make([]byte, 32)
-	return crypto.Keccak256Hash(
-		endBlockHash.Bytes(),
-		lastEndBlockHash.Bytes(),
-		index.FillBytes(indexBytes),
-	).String()
-}

common/utils/contracts_test.go

@@ -1,40 +0,0 @@
-package utils_test
-
-import (
-	"math/big"
-	"testing"
-
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/common/math"
-	"github.com/stretchr/testify/assert"
-
-	"scroll-tech/common/utils"
-)
-
-func TestComputeBatchID(t *testing.T) {
-	// expected generated using contract:
-	// ```
-	// // SPDX-License-Identifier: MIT
-
-	// pragma solidity ^0.6.6;
-
-	// contract AAA {
-	//     uint256 private constant MAX = ~uint256(0);
-
-	//     function _computeBatchId() public pure returns (bytes32) {
-	//         return keccak256(abi.encode(bytes32(0), bytes32(0), MAX));
-	//     }
-	// }
-	// ```
-
-	expected := "0xafe1e714d2cd3ed5b0fa0a04ee95cd564b955ab8661c5665588758b48b66e263"
-	actual := utils.ComputeBatchID(common.Hash{}, common.Hash{}, math.MaxBig256)
-	assert.Equal(t, expected, actual)
-
-	expected = "0xe05698242b035c0e4d1d58e8ab89507ac7a1403b17fd6a7ea87621a32674ec88"
-	actual = utils.ComputeBatchID(
-		common.HexToHash("0xfaef7761204f43c4ab2528a65fcc7ec2108709e5ebb646bdce9ce3c8862d3f25"),
-		common.HexToHash("0xe3abef08cce4b8a0dcc6b7e4dd11f32863007a86f46c1d136682b5d77bdf0f7a"),
-		big.NewInt(77233900))
-	assert.Equal(t, expected, actual)
-}

common/utils/flags.go

@@ -12,6 +12,9 @@ var (
 		&LogFileFlag,
 		&LogJSONFormat,
 		&LogDebugFlag,
+		&MetricsEnabled,
+		&MetricsAddr,
+		&MetricsPort,
 	}
 	// ConfigFileFlag load json type config file.
 	ConfigFileFlag = cli.StringFlag{
@@ -42,4 +45,25 @@ var (
 		Name:  "log.debug",
 		Usage: "Prepends log messages with call-site location (file and line number)",
 	}
+	// MetricsEnabled enable metrics collection and reporting
+	MetricsEnabled = cli.BoolFlag{
+		Name:     "metrics",
+		Usage:    "Enable metrics collection and reporting",
+		Category: "METRICS",
+		Value:    false,
+	}
+	// MetricsAddr is listening address of Metrics reporting server
+	MetricsAddr = cli.StringFlag{
+		Name:     "metrics.addr",
+		Usage:    "Metrics reporting server listening address",
+		Category: "METRICS",
+		Value:    "127.0.0.1",
+	}
+	// MetricsPort is listening port of Metrics reporting server
+	MetricsPort = cli.IntFlag{
+		Name:     "metrics.port",
+		Usage:    "Metrics reporting server listening port",
+		Category: "METRICS",
+		Value:    6060,
+	}
 )

common/utils/rpc.go

@@ -38,10 +38,14 @@ func StartHTTPEndpoint(endpoint string, apis []rpc.API) (*http.Server, net.Addr,
 }
 
 // StartWSEndpoint starts the WS RPC endpoint.
-func StartWSEndpoint(endpoint string, apis []rpc.API) (*http.Server, net.Addr, error) {
+func StartWSEndpoint(endpoint string, apis []rpc.API, compressionLevel int) (*http.Server, net.Addr, error) {
 	handler, addr, err := StartHTTPEndpoint(endpoint, apis)
 	if err == nil {
 		srv := (handler.Handler).(*rpc.Server)
+		err = srv.SetCompressionLevel(compressionLevel)
+		if err != nil {
+			log.Error("failed to set ws compression level", "compression level", compressionLevel, "err", err)
+		}
 		handler.Handler = srv.WebsocketHandler(nil)
 	}
 	return handler, addr, err

common/utils/rpc_test.go

@@ -1,6 +1,7 @@
 package utils
 
 import (
+	"compress/flate"
 	"context"
 	"testing"
 
@@ -59,7 +60,7 @@ func TestStartWSEndpoint(t *testing.T) {
 			Namespace: "test",
 			Service:   new(testService),
 		},
-	})
+	}, flate.NoCompression)
 	assert.NoError(t, err)
 	defer handler.Shutdown(context.Background())
 

common/utils/utils.go

@@ -1,6 +1,9 @@
 package utils
 
-import "time"
+import (
+	"context"
+	"time"
+)
 
 // TryTimes try run several times until the function return true.
 func TryTimes(times int, run func() bool) {
@@ -11,3 +14,31 @@ func TryTimes(times int, run func() bool) {
 		time.Sleep(time.Millisecond * 500)
 	}
 }
+
+// LoopWithContext Run the f func with context periodically.
+func LoopWithContext(ctx context.Context, period time.Duration, f func(ctx context.Context)) {
+	tick := time.NewTicker(period)
+	defer tick.Stop()
+	for ; ; <-tick.C {
+		select {
+		case <-ctx.Done():
+			return
+		default:
+			f(ctx)
+		}
+	}
+}
+
+// Loop Run the f func periodically.
+func Loop(ctx context.Context, period time.Duration, f func()) {
+	tick := time.NewTicker(period)
+	defer tick.Stop()
+	for ; ; <-tick.C {
+		select {
+		case <-ctx.Done():
+			return
+		default:
+			f()
+		}
+	}
+}

common/utils/workerpool/workerpool.go

@@ -0,0 +1,51 @@
+package workerpool
+
+import (
+	"sync"
+)
+
+// WorkerPool is responsible for creating workers and managing verify proof task between them
+type WorkerPool struct {
+	maxWorker     int
+	taskQueueChan chan func()
+	wg            sync.WaitGroup
+}
+
+// NewWorkerPool creates new worker pool with given amount of workers
+func NewWorkerPool(maxWorker int) *WorkerPool {
+	return &WorkerPool{
+		maxWorker:     maxWorker,
+		taskQueueChan: nil,
+		wg:            sync.WaitGroup{},
+	}
+}
+
+// Run runs WorkerPool
+func (vwp *WorkerPool) Run() {
+	vwp.taskQueueChan = make(chan func())
+	for i := 0; i < vwp.maxWorker; i++ {
+		go func() {
+			for task := range vwp.taskQueueChan {
+				if task != nil {
+					task()
+					vwp.wg.Done()
+				} else {
+					return
+				}
+			}
+		}()
+	}
+}
+
+// Stop stop WorkerPool
+func (vwp *WorkerPool) Stop() {
+	vwp.wg.Wait()
+	// close task queue channel, so that all goruotines listening from it stop
+	close(vwp.taskQueueChan)
+}
+
+// AddTask adds a task to WorkerPool
+func (vwp *WorkerPool) AddTask(task func()) {
+	vwp.wg.Add(1)
+	vwp.taskQueueChan <- task
+}

common/utils/workerpool/workerpool_test.go

@@ -0,0 +1,57 @@
+package workerpool_test
+
+import (
+	"sync/atomic"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+
+	"scroll-tech/common/utils/workerpool"
+)
+
+func TestWorkerPool(t *testing.T) {
+	as := assert.New(t)
+
+	vwp := workerpool.NewWorkerPool(2)
+	vwp.Run()
+	var cnt int32 = 3
+
+	task := func() {
+		time.Sleep(500 * time.Millisecond)
+		atomic.AddInt32(&cnt, -1)
+	}
+
+	go vwp.AddTask(task)
+	go vwp.AddTask(task)
+	go vwp.AddTask(task)
+
+	time.Sleep(600 * time.Millisecond)
+	as.Equal(int32(1), atomic.LoadInt32(&cnt))
+	vwp.Stop()
+	as.Equal(int32(0), atomic.LoadInt32(&cnt))
+
+}
+
+func TestWorkerPoolStopAndStart(t *testing.T) {
+	as := assert.New(t)
+	vwp := workerpool.NewWorkerPool(1)
+	var cnt int32 = 3
+
+	task := func() {
+		time.Sleep(500 * time.Millisecond)
+		atomic.AddInt32(&cnt, -1)
+	}
+
+	vwp.Run()
+	vwp.AddTask(task)
+	vwp.AddTask(task)
+	vwp.Stop()
+	as.Equal(int32(1), atomic.LoadInt32(&cnt))
+
+	vwp.Run()
+	vwp.AddTask(task)
+	vwp.Stop()
+	as.Equal(int32(0), atomic.LoadInt32(&cnt))
+
+}

common/version/version.go

@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "prealpha-v11.14"
+var tag = "alpha-v2.3"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

contracts/.prettierignore

@@ -3,3 +3,6 @@ artifacts
 cache
 coverage*
 gasReporterOutput.json
+src/libraries/verifier/ZkTrieVerifier.sol
+src/libraries/verifier/PatriciaMerkleTrieVerifier.sol
+src/L2/predeploys/L1BlockContainer.sol

contracts/.prettierrc

@@ -2,5 +2,17 @@
   "printWidth": 120,
   "singleQuote": false,
   "tabWidth": 2,
-  "bracketSpacing": true
+  "bracketSpacing": true,
+  "overrides": [
+    {
+      "files": "src/**/*.sol",
+      "options": {
+        "printWidth": 120,
+        "tabWidth": 4,
+        "useTabs": false,
+        "singleQuote": false,
+        "bracketSpacing": false
+      }
+    }
+  ]
 }

contracts/circomlib.d.ts

@@ -0,0 +1 @@
+declare module "circomlib/src/poseidon_gencontract";

contracts/docs/apis/L1ERC1155Gateway.md

@@ -13,7 +13,7 @@ The `L1ERC1155Gateway` is used to deposit ERC1155 compatible NFT in layer 1 and
 ### batchDepositERC1155
 
 ```solidity
-function batchDepositERC1155(address _token, uint256[] _tokenIds, uint256[] _amounts, uint256 _gasLimit) external nonpayable
+function batchDepositERC1155(address _token, uint256[] _tokenIds, uint256[] _amounts, uint256 _gasLimit) external payable
 ```
 
 Deposit a list of some ERC1155 NFT to caller's account on layer 2.
@@ -32,7 +32,7 @@ Deposit a list of some ERC1155 NFT to caller's account on layer 2.
 ### batchDepositERC1155
 
 ```solidity
-function batchDepositERC1155(address _token, address _to, uint256[] _tokenIds, uint256[] _amounts, uint256 _gasLimit) external nonpayable
+function batchDepositERC1155(address _token, address _to, uint256[] _tokenIds, uint256[] _amounts, uint256 _gasLimit) external payable
 ```
 
 Deposit a list of some ERC1155 NFT to a recipient's account on layer 2.
@@ -69,7 +69,7 @@ The address of corresponding L1/L2 Gateway contract.
 ### depositERC1155
 
 ```solidity
-function depositERC1155(address _token, address _to, uint256 _tokenId, uint256 _amount, uint256 _gasLimit) external nonpayable
+function depositERC1155(address _token, address _to, uint256 _tokenId, uint256 _amount, uint256 _gasLimit) external payable
 ```
 
 Deposit some ERC1155 NFT to a recipient's account on layer 2.
@@ -89,7 +89,7 @@ Deposit some ERC1155 NFT to a recipient's account on layer 2.
 ### depositERC1155
 
 ```solidity
-function depositERC1155(address _token, uint256 _tokenId, uint256 _amount, uint256 _gasLimit) external nonpayable
+function depositERC1155(address _token, uint256 _tokenId, uint256 _amount, uint256 _gasLimit) external payable
 ```
 
 Deposit some ERC1155 NFT to caller's account on layer 2.
@@ -126,17 +126,6 @@ Complete ERC1155 batch withdraw from layer 2 to layer 1 and send fund to recipie
 | _tokenIds | uint256[] | The list of token ids to withdraw. |
 | _amounts | uint256[] | The list of corresponding number of token to withdraw. |
 
-### finalizeDropMessage
-
-```solidity
-function finalizeDropMessage() external payable
-```
-
-
-
-
-
-
 ### finalizeWithdrawERC1155
 
 ```solidity
@@ -164,7 +153,7 @@ Complete ERC1155 withdraw from layer 2 to layer 1 and send fund to recipient&#39
 function initialize(address _counterpart, address _messenger) external nonpayable
 ```
 
-
+Initialize the storage of L1ERC1155Gateway.
 
 
 
@@ -172,8 +161,8 @@ function initialize(address _counterpart, address _messenger) external nonpayabl
 
 | Name | Type | Description |
 |---|---|---|
-| _counterpart | address | undefined |
-| _messenger | address | undefined |
+| _counterpart | address | The address of L2ERC1155Gateway in L2. |
+| _messenger | address | The address of L1ScrollMessenger. |
 
 ### messenger
 
@@ -181,7 +170,7 @@ function initialize(address _counterpart, address _messenger) external nonpayabl
 function messenger() external view returns (address)
 ```
 
-The address of L1ScrollMessenger/L2ScrollMessenger contract.
+The address of corresponding L1ScrollMessenger/L2ScrollMessenger contract.
 
 
 

contracts/docs/apis/L1ERC721Gateway.md

@@ -13,7 +13,7 @@ The `L1ERC721Gateway` is used to deposit ERC721 compatible NFT in layer 1 and fi
 ### batchDepositERC721
 
 ```solidity
-function batchDepositERC721(address _token, address _to, uint256[] _tokenIds, uint256 _gasLimit) external nonpayable
+function batchDepositERC721(address _token, address _to, uint256[] _tokenIds, uint256 _gasLimit) external payable
 ```
 
 Deposit a list of some ERC721 NFT to a recipient's account on layer 2.
@@ -32,7 +32,7 @@ Deposit a list of some ERC721 NFT to a recipient's account on layer 2.
 ### batchDepositERC721
 
 ```solidity
-function batchDepositERC721(address _token, uint256[] _tokenIds, uint256 _gasLimit) external nonpayable
+function batchDepositERC721(address _token, uint256[] _tokenIds, uint256 _gasLimit) external payable
 ```
 
 Deposit a list of some ERC721 NFT to caller's account on layer 2.
@@ -67,7 +67,7 @@ The address of corresponding L1/L2 Gateway contract.
 ### depositERC721
 
 ```solidity
-function depositERC721(address _token, address _to, uint256 _tokenId, uint256 _gasLimit) external nonpayable
+function depositERC721(address _token, address _to, uint256 _tokenId, uint256 _gasLimit) external payable
 ```
 
 Deposit some ERC721 NFT to a recipient's account on layer 2.
@@ -86,7 +86,7 @@ Deposit some ERC721 NFT to a recipient's account on layer 2.
 ### depositERC721
 
 ```solidity
-function depositERC721(address _token, uint256 _tokenId, uint256 _gasLimit) external nonpayable
+function depositERC721(address _token, uint256 _tokenId, uint256 _gasLimit) external payable
 ```
 
 Deposit some ERC721 NFT to caller's account on layer 2.
@@ -121,17 +121,6 @@ Complete ERC721 batch withdraw from layer 2 to layer 1 and send NFT to recipient
 | _to | address | The address of recipient in layer 1 to receive the token. |
 | _tokenIds | uint256[] | The list of token ids to withdraw. |
 
-### finalizeDropMessage
-
-```solidity
-function finalizeDropMessage() external payable
-```
-
-
-
-
-
-
 ### finalizeWithdrawERC721
 
 ```solidity
@@ -158,7 +147,7 @@ Complete ERC721 withdraw from layer 2 to layer 1 and send NFT to recipient's
 function initialize(address _counterpart, address _messenger) external nonpayable
 ```
 
-
+Initialize the storage of L1ERC721Gateway.
 
 
 
@@ -166,8 +155,8 @@ function initialize(address _counterpart, address _messenger) external nonpayabl
 
 | Name | Type | Description |
 |---|---|---|
-| _counterpart | address | undefined |
-| _messenger | address | undefined |
+| _counterpart | address | The address of L2ERC721Gateway in L2. |
+| _messenger | address | The address of L1ScrollMessenger. |
 
 ### messenger
 
@@ -175,7 +164,7 @@ function initialize(address _counterpart, address _messenger) external nonpayabl
 function messenger() external view returns (address)
 ```
 
-The address of L1ScrollMessenger/L2ScrollMessenger contract.
+The address of corresponding L1ScrollMessenger/L2ScrollMessenger contract.
 
 
 

contracts/docs/apis/L1GatewayRouter.md

@@ -26,23 +26,6 @@ Mapping from ERC20 token address to corresponding L1ERC20Gateway.
 |---|---|---|
 | _0 | address | undefined |
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### counterpart
-
-```solidity
-function counterpart() external view returns (address)
-```
-
-The address of corresponding L1/L2 Gateway contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -126,10 +109,10 @@ Deposit some token to a recipient's account on L2 and call.
 ### depositETH
 
 ```solidity
-function depositETH(address _to, uint256 _gasLimit) external payable
+function depositETH(uint256 _amount, uint256 _gasLimit) external payable
 ```
 
-Deposit ETH to recipient's account in L2.
+Deposit ETH to caller's account in L2.
 
 
 
@@ -137,16 +120,16 @@ Deposit ETH to recipient's account in L2.
 
 | Name | Type | Description |
 |---|---|---|
-| _to | address | The address of recipient's account on L2. |
-| _gasLimit | uint256 | Gas limit required to complete the deposit on L2. |
+| _amount | uint256 | undefined |
+| _gasLimit | uint256 | undefined |
 
 ### depositETH
 
 ```solidity
-function depositETH(uint256 _gasLimit) external payable
+function depositETH(address _to, uint256 _amount, uint256 _gasLimit) external payable
 ```
 
-Deposit ETH to call's account in L2.
+Deposit ETH to some recipient's account in L2.
 
 
 
@@ -154,18 +137,45 @@ Deposit ETH to call's account in L2.
 
 | Name | Type | Description |
 |---|---|---|
-| _gasLimit | uint256 | Gas limit required to complete the deposit on L2. |
+| _to | address | undefined |
+| _amount | uint256 | undefined |
+| _gasLimit | uint256 | undefined |
 
-### finalizeDropMessage
+### depositETHAndCall
 
 ```solidity
-function finalizeDropMessage() external payable
+function depositETHAndCall(address _to, uint256 _amount, bytes _data, uint256 _gasLimit) external payable
 ```
 
+Deposit ETH to some recipient's account in L2 and call the target contract.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _to | address | undefined |
+| _amount | uint256 | undefined |
+| _data | bytes | undefined |
+| _gasLimit | uint256 | undefined |
+
+### ethGateway
+
+```solidity
+function ethGateway() external view returns (address)
+```
+
+The address of L1ETHGateway.
 
 
 
 
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | address | undefined |
 
 ### finalizeWithdrawERC20
 
@@ -191,21 +201,21 @@ Complete ERC20 withdraw from L2 to L1 and send fund to recipient's account i
 ### finalizeWithdrawETH
 
 ```solidity
-function finalizeWithdrawETH(address _from, address _to, uint256 _amount, bytes _data) external payable
+function finalizeWithdrawETH(address, address, uint256, bytes) external payable
 ```
 
 Complete ETH withdraw from L2 to L1 and send fund to recipient's account in L1.
 
-*This function should only be called by L1ScrollMessenger.      This function should also only be called by L2GatewayRouter in L2.*
+*This function should only be called by L1ScrollMessenger.      This function should also only be called by L1ETHGateway in L2.*
 
 #### Parameters
 
 | Name | Type | Description |
 |---|---|---|
-| _from | address | The address of account who withdraw ETH in L2. |
-| _to | address | The address of recipient in L1 to receive ETH. |
-| _amount | uint256 | The amount of ETH to withdraw. |
-| _data | bytes | Optional data to forward to recipient's account. |
+| _0 | address | undefined |
+| _1 | address | undefined |
+| _2 | uint256 | undefined |
+| _3 | bytes | undefined |
 
 ### getERC20Gateway
 
@@ -254,10 +264,10 @@ Return the corresponding l2 token address given l1 token address.
 ### initialize
 
 ```solidity
-function initialize(address _defaultERC20Gateway, address _counterpart, address _messenger) external nonpayable
+function initialize(address _ethGateway, address _defaultERC20Gateway) external nonpayable
 ```
 
-
+Initialize the storage of L1GatewayRouter.
 
 
 
@@ -265,26 +275,8 @@ function initialize(address _defaultERC20Gateway, address _counterpart, address
 
 | Name | Type | Description |
 |---|---|---|
-| _defaultERC20Gateway | address | undefined |
-| _counterpart | address | undefined |
-| _messenger | address | undefined |
-
-### messenger
-
-```solidity
-function messenger() external view returns (address)
-```
-
-The address of L1ScrollMessenger/L2ScrollMessenger contract.
-
-
-
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
+| _ethGateway | address | The address of L1ETHGateway contract. |
+| _defaultERC20Gateway | address | The address of default ERC20 Gateway contract. |
 
 ### owner
 
@@ -314,23 +306,6 @@ function renounceOwnership() external nonpayable
 *Leaves the contract without owner. It will not be possible to call `onlyOwner` functions anymore. Can only be called by the current owner. NOTE: Renouncing ownership will leave the contract without an owner, thereby removing any functionality that is only available to the owner.*
 
 
-### router
-
-```solidity
-function router() external view returns (address)
-```
-
-The address of L1GatewayRouter/L2GatewayRouter contract.
-
-
-
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
 ### setDefaultERC20Gateway
 
 ```solidity
@@ -364,6 +339,22 @@ Update the mapping from token address to gateway address.
 | _tokens | address[] | The list of addresses of tokens to update. |
 | _gateways | address[] | The list of addresses of gateways to update. |
 
+### setETHGateway
+
+```solidity
+function setETHGateway(address _ethGateway) external nonpayable
+```
+
+Update the address of ETH gateway contract.
+
+*This function should only be called by contract owner.*
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _ethGateway | address | The address to update. |
+
 ### transferOwnership
 
 ```solidity
@@ -387,10 +378,10 @@ function transferOwnership(address newOwner) external nonpayable
 ### DepositERC20
 
 ```solidity
-event DepositERC20(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256 _amount, bytes _data)
+event DepositERC20(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256 amount, bytes data)
 ```
 
-
+Emitted when someone deposit ERC20 token from L1 to L2.
 
 
 
@@ -398,20 +389,20 @@ event DepositERC20(address indexed _l1Token, address indexed _l2Token, address i
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token `indexed` | address | undefined |
-| _l2Token `indexed` | address | undefined |
-| _from `indexed` | address | undefined |
-| _to  | address | undefined |
-| _amount  | uint256 | undefined |
-| _data  | bytes | undefined |
+| l1Token `indexed` | address | undefined |
+| l2Token `indexed` | address | undefined |
+| from `indexed` | address | undefined |
+| to  | address | undefined |
+| amount  | uint256 | undefined |
+| data  | bytes | undefined |
 
 ### DepositETH
 
 ```solidity
-event DepositETH(address indexed _from, address indexed _to, uint256 _amount, bytes _data)
+event DepositETH(address indexed from, address indexed to, uint256 amount, bytes data)
 ```
 
-
+Emitted when someone deposit ETH from L1 to L2.
 
 
 
@@ -419,18 +410,18 @@ event DepositETH(address indexed _from, address indexed _to, uint256 _amount, by
 
 | Name | Type | Description |
 |---|---|---|
-| _from `indexed` | address | undefined |
-| _to `indexed` | address | undefined |
-| _amount  | uint256 | undefined |
-| _data  | bytes | undefined |
+| from `indexed` | address | undefined |
+| to `indexed` | address | undefined |
+| amount  | uint256 | undefined |
+| data  | bytes | undefined |
 
 ### FinalizeWithdrawERC20
 
 ```solidity
-event FinalizeWithdrawERC20(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256 _amount, bytes _data)
+event FinalizeWithdrawERC20(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256 amount, bytes data)
 ```
 
-
+Emitted when ERC20 token is withdrawn from L2 to L1 and transfer to recipient.
 
 
 
@@ -438,20 +429,20 @@ event FinalizeWithdrawERC20(address indexed _l1Token, address indexed _l2Token,
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token `indexed` | address | undefined |
-| _l2Token `indexed` | address | undefined |
-| _from `indexed` | address | undefined |
-| _to  | address | undefined |
-| _amount  | uint256 | undefined |
-| _data  | bytes | undefined |
+| l1Token `indexed` | address | undefined |
+| l2Token `indexed` | address | undefined |
+| from `indexed` | address | undefined |
+| to  | address | undefined |
+| amount  | uint256 | undefined |
+| data  | bytes | undefined |
 
 ### FinalizeWithdrawETH
 
 ```solidity
-event FinalizeWithdrawETH(address indexed _from, address indexed _to, uint256 _amount, bytes _data)
+event FinalizeWithdrawETH(address indexed from, address indexed to, uint256 amount, bytes data)
 ```
 
-
+Emitted when ETH is withdrawn from L2 to L1 and transfer to recipient.
 
 
 
@@ -459,10 +450,10 @@ event FinalizeWithdrawETH(address indexed _from, address indexed _to, uint256 _a
 
 | Name | Type | Description |
 |---|---|---|
-| _from `indexed` | address | undefined |
-| _to `indexed` | address | undefined |
-| _amount  | uint256 | undefined |
-| _data  | bytes | undefined |
+| from `indexed` | address | undefined |
+| to `indexed` | address | undefined |
+| amount  | uint256 | undefined |
+| data  | bytes | undefined |
 
 ### OwnershipTransferred
 
@@ -484,10 +475,10 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 ### SetDefaultERC20Gateway
 
 ```solidity
-event SetDefaultERC20Gateway(address indexed _defaultERC20Gateway)
+event SetDefaultERC20Gateway(address indexed defaultERC20Gateway)
 ```
 
-
+Emitted when the address of default ERC20 Gateway is updated.
 
 
 
@@ -495,15 +486,15 @@ event SetDefaultERC20Gateway(address indexed _defaultERC20Gateway)
 
 | Name | Type | Description |
 |---|---|---|
-| _defaultERC20Gateway `indexed` | address | undefined |
+| defaultERC20Gateway `indexed` | address | undefined |
 
 ### SetERC20Gateway
 
 ```solidity
-event SetERC20Gateway(address indexed _token, address indexed _gateway)
+event SetERC20Gateway(address indexed token, address indexed gateway)
 ```
 
-
+Emitted when the `gateway` for `token` is updated.
 
 
 
@@ -511,8 +502,24 @@ event SetERC20Gateway(address indexed _token, address indexed _gateway)
 
 | Name | Type | Description |
 |---|---|---|
-| _token `indexed` | address | undefined |
-| _gateway `indexed` | address | undefined |
+| token `indexed` | address | undefined |
+| gateway `indexed` | address | undefined |
+
+### SetETHGateway
+
+```solidity
+event SetETHGateway(address indexed ethGateway)
+```
+
+Emitted when the address of ETH Gateway is updated.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| ethGateway `indexed` | address | undefined |
 
 
 

contracts/docs/apis/L1ScrollMessenger.md

@@ -10,13 +10,13 @@ The `L1ScrollMessenger` contract can: 1. send messages from layer 1 to layer 2;
 
 ## Methods
 
-### dropDelayDuration
+### counterpart
 
 ```solidity
-function dropDelayDuration() external view returns (uint256)
+function counterpart() external view returns (address)
 ```
 
-The amount of seconds needed to wait if we want to drop message.
+The address of counterpart ScrollMessenger contract in L1/L2.
 
 
 
@@ -25,38 +25,15 @@ The amount of seconds needed to wait if we want to drop message.
 
 | Name | Type | Description |
 |---|---|---|
-| _0 | uint256 | undefined |
+| _0 | address | undefined |
 
-### dropMessage
+### feeVault
 
 ```solidity
-function dropMessage(address _from, address _to, uint256 _value, uint256 _fee, uint256 _deadline, uint256 _nonce, bytes _message, uint256 _gasLimit) external nonpayable
+function feeVault() external view returns (address)
 ```
 
-
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _from | address | undefined |
-| _to | address | undefined |
-| _value | uint256 | undefined |
-| _fee | uint256 | undefined |
-| _deadline | uint256 | undefined |
-| _nonce | uint256 | undefined |
-| _message | bytes | undefined |
-| _gasLimit | uint256 | undefined |
-
-### gasOracle
-
-```solidity
-function gasOracle() external view returns (address)
-```
-
-The gas oracle used to estimate transaction fee on layer 2.
+The address of fee vault, collecting cross domain messaging fee.
 
 
 
@@ -70,10 +47,10 @@ The gas oracle used to estimate transaction fee on layer 2.
 ### initialize
 
 ```solidity
-function initialize(address _rollup) external nonpayable
+function initialize(address _counterpart, address _feeVault, address _rollup, address _messageQueue) external nonpayable
 ```
 
-
+Initialize the storage of L1ScrollMessenger.
 
 
 
@@ -81,56 +58,15 @@ function initialize(address _rollup) external nonpayable
 
 | Name | Type | Description |
 |---|---|---|
-| _rollup | address | undefined |
+| _counterpart | address | The address of L2ScrollMessenger contract in L2. |
+| _feeVault | address | The address of fee vault, which will be used to collect relayer fee. |
+| _rollup | address | The address of ScrollChain contract. |
+| _messageQueue | address | The address of L1MessageQueue contract. |
 
-### isMessageDropped
+### isL1MessageRelayed
 
 ```solidity
-function isMessageDropped(bytes32) external view returns (bool)
-```
-
-Mapping from message hash to drop status.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | bytes32 | undefined |
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | bool | undefined |
-
-### isMessageExecuted
-
-```solidity
-function isMessageExecuted(bytes32) external view returns (bool)
-```
-
-Mapping from message hash to execution status.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | bytes32 | undefined |
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | bool | undefined |
-
-### isMessageRelayed
-
-```solidity
-function isMessageRelayed(bytes32) external view returns (bool)
+function isL1MessageRelayed(bytes32) external view returns (bool)
 ```
 
 Mapping from relay id to relay status.
@@ -149,6 +85,67 @@ Mapping from relay id to relay status.
 |---|---|---|
 | _0 | bool | undefined |
 
+### isL1MessageSent
+
+```solidity
+function isL1MessageSent(bytes32) external view returns (bool)
+```
+
+Mapping from L1 message hash to sent status.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | bytes32 | undefined |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | bool | undefined |
+
+### isL2MessageExecuted
+
+```solidity
+function isL2MessageExecuted(bytes32) external view returns (bool)
+```
+
+Mapping from L2 message hash to a boolean value indicating if the message has been successfully executed.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | bytes32 | undefined |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | bool | undefined |
+
+### messageQueue
+
+```solidity
+function messageQueue() external view returns (address)
+```
+
+The address of L1MessageQueue contract.
+
+
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | address | undefined |
+
 ### owner
 
 ```solidity
@@ -166,17 +163,6 @@ function owner() external view returns (address)
 |---|---|---|
 | _0 | address | undefined |
 
-### pause
-
-```solidity
-function pause() external nonpayable
-```
-
-Pause the contract
-
-*This function can only called by contract owner.*
-
-
 ### paused
 
 ```solidity
@@ -197,7 +183,7 @@ function paused() external view returns (bool)
 ### relayMessageWithProof
 
 ```solidity
-function relayMessageWithProof(address _from, address _to, uint256 _value, uint256 _fee, uint256 _deadline, uint256 _nonce, bytes _message, IL1ScrollMessenger.L2MessageProof _proof) external nonpayable
+function relayMessageWithProof(address _from, address _to, uint256 _value, uint256 _nonce, bytes _message, IL1ScrollMessenger.L2MessageProof _proof) external nonpayable
 ```
 
 
@@ -211,8 +197,6 @@ function relayMessageWithProof(address _from, address _to, uint256 _value, uint2
 | _from | address | undefined |
 | _to | address | undefined |
 | _value | uint256 | undefined |
-| _fee | uint256 | undefined |
-| _deadline | uint256 | undefined |
 | _nonce | uint256 | undefined |
 | _message | bytes | undefined |
 | _proof | IL1ScrollMessenger.L2MessageProof | undefined |
@@ -231,7 +215,7 @@ function renounceOwnership() external nonpayable
 ### replayMessage
 
 ```solidity
-function replayMessage(address _from, address _to, uint256 _value, uint256 _fee, uint256 _deadline, bytes _message, uint256 _queueIndex, uint32 _oldGasLimit, uint32 _newGasLimit) external nonpayable
+function replayMessage(address _from, address _to, uint256 _value, uint256 _queueIndex, bytes _message, uint32 _oldGasLimit, uint32 _newGasLimit) external nonpayable
 ```
 
 Replay an exsisting message.
@@ -242,15 +226,13 @@ Replay an exsisting message.
 
 | Name | Type | Description |
 |---|---|---|
-| _from | address | The address of the sender of the message. |
-| _to | address | The address of the recipient of the message. |
-| _value | uint256 | The msg.value passed to the message call. |
-| _fee | uint256 | The amount of fee in ETH to charge. |
-| _deadline | uint256 | The deadline of the message. |
-| _message | bytes | The content of the message. |
-| _queueIndex | uint256 | CTC Queue index for the message to replay. |
-| _oldGasLimit | uint32 | Original gas limit used to send the message. |
-| _newGasLimit | uint32 | New gas limit to be used for this message. |
+| _from | address | undefined |
+| _to | address | undefined |
+| _value | uint256 | undefined |
+| _queueIndex | uint256 | undefined |
+| _message | bytes | undefined |
+| _oldGasLimit | uint32 | undefined |
+| _newGasLimit | uint32 | undefined |
 
 ### rollup
 
@@ -272,21 +254,57 @@ The address of Rollup contract.
 ### sendMessage
 
 ```solidity
-function sendMessage(address _to, uint256 _fee, bytes _message, uint256 _gasLimit) external payable
+function sendMessage(address _to, uint256 _value, bytes _message, uint256 _gasLimit, address _refundAddress) external payable
 ```
 
-Send cross chain message (L1 => L2 or L2 => L1)
+Send cross chain message from L1 to L2 or L2 to L1.
+
 
-*Currently, only privileged accounts can call this function for safty. And adding an extra `_fee` variable make it more easy to upgrade to decentralized version.*
 
 #### Parameters
 
 | Name | Type | Description |
 |---|---|---|
-| _to | address | The address of account who recieve the message. |
-| _fee | uint256 | The amount of fee in Ether the caller would like to pay to the relayer. |
-| _message | bytes | The content of the message. |
-| _gasLimit | uint256 | Unused, but included for potential forward compatibility considerations. |
+| _to | address | undefined |
+| _value | uint256 | undefined |
+| _message | bytes | undefined |
+| _gasLimit | uint256 | undefined |
+| _refundAddress | address | undefined |
+
+### sendMessage
+
+```solidity
+function sendMessage(address _to, uint256 _value, bytes _message, uint256 _gasLimit) external payable
+```
+
+Send cross chain message from L1 to L2 or L2 to L1.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _to | address | undefined |
+| _value | uint256 | undefined |
+| _message | bytes | undefined |
+| _gasLimit | uint256 | undefined |
+
+### setPause
+
+```solidity
+function setPause(bool _status) external nonpayable
+```
+
+Pause the contract
+
+*This function can only called by contract owner.*
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _status | bool | The pause status to update. |
 
 ### transferOwnership
 
@@ -304,13 +322,13 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateDropDelayDuration
+### updateFeeVault
 
 ```solidity
-function updateDropDelayDuration(uint256 _newDuration) external nonpayable
+function updateFeeVault(address _newFeeVault) external nonpayable
 ```
 
-Update the drop delay duration.
+Update fee vault contract.
 
 *This function can only called by contract owner.*
 
@@ -318,23 +336,7 @@ Update the drop delay duration.
 
 | Name | Type | Description |
 |---|---|---|
-| _newDuration | uint256 | The new delay duration to update. |
-
-### updateGasOracle
-
-```solidity
-function updateGasOracle(address _newGasOracle) external nonpayable
-```
-
-Update the address of gas oracle.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newGasOracle | address | The address to update. |
+| _newFeeVault | address | The address of new fee vault contract. |
 
 ### updateWhitelist
 
@@ -393,10 +395,10 @@ See {IScrollMessenger-xDomainMessageSender}
 ### FailedRelayedMessage
 
 ```solidity
-event FailedRelayedMessage(bytes32 indexed msgHash)
+event FailedRelayedMessage(bytes32 indexed messageHash)
 ```
 
-
+Emitted when a cross domain message is failed to relay.
 
 
 
@@ -404,23 +406,7 @@ event FailedRelayedMessage(bytes32 indexed msgHash)
 
 | Name | Type | Description |
 |---|---|---|
-| msgHash `indexed` | bytes32 | undefined |
-
-### MessageDropped
-
-```solidity
-event MessageDropped(bytes32 indexed msgHash)
-```
-
-
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| msgHash `indexed` | bytes32 | undefined |
+| messageHash `indexed` | bytes32 | undefined |
 
 ### OwnershipTransferred
 
@@ -458,10 +444,10 @@ event Paused(address account)
 ### RelayedMessage
 
 ```solidity
-event RelayedMessage(bytes32 indexed msgHash)
+event RelayedMessage(bytes32 indexed messageHash)
 ```
 
-
+Emitted when a cross domain message is relayed successfully.
 
 
 
@@ -469,15 +455,15 @@ event RelayedMessage(bytes32 indexed msgHash)
 
 | Name | Type | Description |
 |---|---|---|
-| msgHash `indexed` | bytes32 | undefined |
+| messageHash `indexed` | bytes32 | undefined |
 
 ### SentMessage
 
 ```solidity
-event SentMessage(address indexed target, address sender, uint256 value, uint256 fee, uint256 deadline, bytes message, uint256 messageNonce, uint256 gasLimit)
+event SentMessage(address indexed sender, address indexed target, uint256 value, uint256 messageNonce, uint256 gasLimit, bytes message)
 ```
 
-
+Emitted when a cross domain message is sent.
 
 
 
@@ -485,14 +471,12 @@ event SentMessage(address indexed target, address sender, uint256 value, uint256
 
 | Name | Type | Description |
 |---|---|---|
+| sender `indexed` | address | undefined |
 | target `indexed` | address | undefined |
-| sender  | address | undefined |
 | value  | uint256 | undefined |
-| fee  | uint256 | undefined |
-| deadline  | uint256 | undefined |
-| message  | bytes | undefined |
 | messageNonce  | uint256 | undefined |
 | gasLimit  | uint256 | undefined |
+| message  | bytes | undefined |
 
 ### Unpaused
 
@@ -510,13 +494,13 @@ event Unpaused(address account)
 |---|---|---|
 | account  | address | undefined |
 
-### UpdateDropDelayDuration
+### UpdateFeeVault
 
 ```solidity
-event UpdateDropDelayDuration(uint256 _oldDuration, uint256 _newDuration)
+event UpdateFeeVault(address _oldFeeVault, address _newFeeVault)
 ```
 
-Emitted when owner updates drop delay duration
+Emitted when owner updates fee vault contract.
 
 
 
@@ -524,25 +508,8 @@ Emitted when owner updates drop delay duration
 
 | Name | Type | Description |
 |---|---|---|
-| _oldDuration  | uint256 | undefined |
-| _newDuration  | uint256 | undefined |
-
-### UpdateGasOracle
-
-```solidity
-event UpdateGasOracle(address _oldGasOracle, address _newGasOracle)
-```
-
-Emitted when owner updates gas oracle contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldGasOracle  | address | undefined |
-| _newGasOracle  | address | undefined |
+| _oldFeeVault  | address | undefined |
+| _newFeeVault  | address | undefined |
 
 ### UpdateWhitelist
 

contracts/docs/apis/L1StandardERC20Gateway.md

@@ -84,17 +84,6 @@ Deposit some token to a recipient's account on L2 and call.
 | _data | bytes | Optional data to forward to recipient's account. |
 | _gasLimit | uint256 | Gas limit required to complete the deposit on L2. |
 
-### finalizeDropMessage
-
-```solidity
-function finalizeDropMessage() external payable
-```
-
-
-
-
-
-
 ### finalizeWithdrawERC20
 
 ```solidity
@@ -144,7 +133,7 @@ Return the corresponding l2 token address given l1 token address.
 function initialize(address _counterpart, address _router, address _messenger, address _l2TokenImplementation, address _l2TokenFactory) external nonpayable
 ```
 
-
+Initialize the storage of L1StandardERC20Gateway.
 
 
 
@@ -152,11 +141,11 @@ function initialize(address _counterpart, address _router, address _messenger, a
 
 | Name | Type | Description |
 |---|---|---|
-| _counterpart | address | undefined |
-| _router | address | undefined |
-| _messenger | address | undefined |
-| _l2TokenImplementation | address | undefined |
-| _l2TokenFactory | address | undefined |
+| _counterpart | address | The address of L2StandardERC20Gateway in L2. |
+| _router | address | The address of L1GatewayRouter. |
+| _messenger | address | The address of L1ScrollMessenger. |
+| _l2TokenImplementation | address | The address of ScrollStandardERC20 implementation in L2. |
+| _l2TokenFactory | address | The address of ScrollStandardERC20Factory contract in L2. |
 
 ### l2TokenFactory
 
@@ -198,7 +187,7 @@ The address of ScrollStandardERC20 implementation in L2.
 function messenger() external view returns (address)
 ```
 
-The address of L1ScrollMessenger/L2ScrollMessenger contract.
+The address of corresponding L1ScrollMessenger/L2ScrollMessenger contract.
 
 
 
@@ -233,10 +222,10 @@ The address of L1GatewayRouter/L2GatewayRouter contract.
 ### DepositERC20
 
 ```solidity
-event DepositERC20(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256 _amount, bytes _data)
+event DepositERC20(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256 amount, bytes data)
 ```
 
-
+Emitted when someone deposit ERC20 token from L1 to L2.
 
 
 
@@ -244,20 +233,20 @@ event DepositERC20(address indexed _l1Token, address indexed _l2Token, address i
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token `indexed` | address | undefined |
-| _l2Token `indexed` | address | undefined |
-| _from `indexed` | address | undefined |
-| _to  | address | undefined |
-| _amount  | uint256 | undefined |
-| _data  | bytes | undefined |
+| l1Token `indexed` | address | undefined |
+| l2Token `indexed` | address | undefined |
+| from `indexed` | address | undefined |
+| to  | address | undefined |
+| amount  | uint256 | undefined |
+| data  | bytes | undefined |
 
 ### FinalizeWithdrawERC20
 
 ```solidity
-event FinalizeWithdrawERC20(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256 _amount, bytes _data)
+event FinalizeWithdrawERC20(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256 amount, bytes data)
 ```
 
-
+Emitted when ERC20 token is withdrawn from L2 to L1 and transfer to recipient.
 
 
 
@@ -265,12 +254,12 @@ event FinalizeWithdrawERC20(address indexed _l1Token, address indexed _l2Token,
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token `indexed` | address | undefined |
-| _l2Token `indexed` | address | undefined |
-| _from `indexed` | address | undefined |
-| _to  | address | undefined |
-| _amount  | uint256 | undefined |
-| _data  | bytes | undefined |
+| l1Token `indexed` | address | undefined |
+| l2Token `indexed` | address | undefined |
+| from `indexed` | address | undefined |
+| to  | address | undefined |
+| amount  | uint256 | undefined |
+| data  | bytes | undefined |
 
 
 

contracts/docs/apis/L1WETHGateway.md

@@ -101,17 +101,6 @@ Deposit some token to a recipient's account on L2 and call.
 | _data | bytes | Optional data to forward to recipient's account. |
 | _gasLimit | uint256 | Gas limit required to complete the deposit on L2. |
 
-### finalizeDropMessage
-
-```solidity
-function finalizeDropMessage() external payable
-```
-
-
-
-
-
-
 ### finalizeWithdrawERC20
 
 ```solidity
@@ -158,10 +147,10 @@ Return the corresponding l2 token address given l1 token address.
 ### initialize
 
 ```solidity
-function initialize(address _counterpart, address _router, address _messenger, address _WETH, address _l2WETH) external nonpayable
+function initialize(address _counterpart, address _router, address _messenger) external nonpayable
 ```
 
-
+Initialize the storage of L1WETHGateway.
 
 
 
@@ -169,11 +158,9 @@ function initialize(address _counterpart, address _router, address _messenger, a
 
 | Name | Type | Description |
 |---|---|---|
-| _counterpart | address | undefined |
-| _router | address | undefined |
-| _messenger | address | undefined |
-| _WETH | address | undefined |
-| _l2WETH | address | undefined |
+| _counterpart | address | The address of L2ETHGateway in L2. |
+| _router | address | The address of L1GatewayRouter. |
+| _messenger | address | The address of L1ScrollMessenger. |
 
 ### l2WETH
 
@@ -198,7 +185,7 @@ The address of L2 WETH address.
 function messenger() external view returns (address)
 ```
 
-The address of L1ScrollMessenger/L2ScrollMessenger contract.
+The address of corresponding L1ScrollMessenger/L2ScrollMessenger contract.
 
 
 
@@ -233,10 +220,10 @@ The address of L1GatewayRouter/L2GatewayRouter contract.
 ### DepositERC20
 
 ```solidity
-event DepositERC20(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256 _amount, bytes _data)
+event DepositERC20(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256 amount, bytes data)
 ```
 
-
+Emitted when someone deposit ERC20 token from L1 to L2.
 
 
 
@@ -244,20 +231,20 @@ event DepositERC20(address indexed _l1Token, address indexed _l2Token, address i
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token `indexed` | address | undefined |
-| _l2Token `indexed` | address | undefined |
-| _from `indexed` | address | undefined |
-| _to  | address | undefined |
-| _amount  | uint256 | undefined |
-| _data  | bytes | undefined |
+| l1Token `indexed` | address | undefined |
+| l2Token `indexed` | address | undefined |
+| from `indexed` | address | undefined |
+| to  | address | undefined |
+| amount  | uint256 | undefined |
+| data  | bytes | undefined |
 
 ### FinalizeWithdrawERC20
 
 ```solidity
-event FinalizeWithdrawERC20(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256 _amount, bytes _data)
+event FinalizeWithdrawERC20(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256 amount, bytes data)
 ```
 
-
+Emitted when ERC20 token is withdrawn from L2 to L1 and transfer to recipient.
 
 
 
@@ -265,12 +252,12 @@ event FinalizeWithdrawERC20(address indexed _l1Token, address indexed _l2Token,
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token `indexed` | address | undefined |
-| _l2Token `indexed` | address | undefined |
-| _from `indexed` | address | undefined |
-| _to  | address | undefined |
-| _amount  | uint256 | undefined |
-| _data  | bytes | undefined |
+| l1Token `indexed` | address | undefined |
+| l2Token `indexed` | address | undefined |
+| from `indexed` | address | undefined |
+| to  | address | undefined |
+| amount  | uint256 | undefined |
+| data  | bytes | undefined |
 
 
 

contracts/docs/apis/L2ERC1155Gateway.md

@@ -16,7 +16,7 @@ The `L2ERC1155Gateway` is used to withdraw ERC1155 compatible NFTs in layer 2 an
 function batchWithdrawERC1155(address _token, uint256[] _tokenIds, uint256[] _amounts, uint256 _gasLimit) external nonpayable
 ```
 
-
+Batch withdraw a list of ERC1155 NFT to caller's account on layer 1.
 
 
 
@@ -35,7 +35,7 @@ function batchWithdrawERC1155(address _token, uint256[] _tokenIds, uint256[] _am
 function batchWithdrawERC1155(address _token, address _to, uint256[] _tokenIds, uint256[] _amounts, uint256 _gasLimit) external nonpayable
 ```
 
-
+Batch withdraw a list of ERC1155 NFT to caller's account on layer 1.
 
 
 
@@ -72,9 +72,9 @@ The address of corresponding L1/L2 Gateway contract.
 function finalizeBatchDepositERC1155(address _l1Token, address _l2Token, address _from, address _to, uint256[] _tokenIds, uint256[] _amounts) external nonpayable
 ```
 
+Complete ERC1155 deposit from layer 1 to layer 2 and send NFT to recipient's account in layer 2.
 
-
-
+*Requirements:  - The function should only be called by L2ScrollMessenger.  - The function should also only be called by L1ERC1155Gateway in layer 1.*
 
 #### Parameters
 
@@ -93,9 +93,9 @@ function finalizeBatchDepositERC1155(address _l1Token, address _l2Token, address
 function finalizeDepositERC1155(address _l1Token, address _l2Token, address _from, address _to, uint256 _tokenId, uint256 _amount) external nonpayable
 ```
 
+Complete ERC1155 deposit from layer 1 to layer 2 and send NFT to recipient's account in layer 2.
 
-
-
+*Requirements:  - The function should only be called by L2ScrollMessenger.  - The function should also only be called by L1ERC1155Gateway in layer 1.*
 
 #### Parameters
 
@@ -108,17 +108,6 @@ function finalizeDepositERC1155(address _l1Token, address _l2Token, address _fro
 | _tokenId | uint256 | undefined |
 | _amount | uint256 | undefined |
 
-### finalizeDropMessage
-
-```solidity
-function finalizeDropMessage() external payable
-```
-
-
-
-
-
-
 ### initialize
 
 ```solidity
@@ -142,7 +131,7 @@ function initialize(address _counterpart, address _messenger) external nonpayabl
 function messenger() external view returns (address)
 ```
 
-The address of L1ScrollMessenger/L2ScrollMessenger contract.
+The address of corresponding L1ScrollMessenger/L2ScrollMessenger contract.
 
 
 
@@ -333,7 +322,7 @@ Update layer 2 to layer 1 token mapping.
 function withdrawERC1155(address _token, uint256 _tokenId, uint256 _amount, uint256 _gasLimit) external nonpayable
 ```
 
-
+Withdraw some ERC1155 NFT to caller's account on layer 1.
 
 
 
@@ -352,7 +341,7 @@ function withdrawERC1155(address _token, uint256 _tokenId, uint256 _amount, uint
 function withdrawERC1155(address _token, address _to, uint256 _tokenId, uint256 _amount, uint256 _gasLimit) external nonpayable
 ```
 
-
+Withdraw some ERC1155 NFT to caller's account on layer 1.
 
 
 
@@ -373,10 +362,10 @@ function withdrawERC1155(address _token, address _to, uint256 _tokenId, uint256
 ### BatchWithdrawERC1155
 
 ```solidity
-event BatchWithdrawERC1155(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256[] _tokenIds, uint256[] _amounts)
+event BatchWithdrawERC1155(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256[] tokenIds, uint256[] amounts)
 ```
 
-
+Emitted when the ERC1155 NFT is batch transfered to gateway in layer 2.
 
 
 
@@ -384,20 +373,20 @@ event BatchWithdrawERC1155(address indexed _l1Token, address indexed _l2Token, a
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token `indexed` | address | undefined |
-| _l2Token `indexed` | address | undefined |
-| _from `indexed` | address | undefined |
-| _to  | address | undefined |
-| _tokenIds  | uint256[] | undefined |
-| _amounts  | uint256[] | undefined |
+| l1Token `indexed` | address | undefined |
+| l2Token `indexed` | address | undefined |
+| from `indexed` | address | undefined |
+| to  | address | undefined |
+| tokenIds  | uint256[] | undefined |
+| amounts  | uint256[] | undefined |
 
 ### FinalizeBatchDepositERC1155
 
 ```solidity
-event FinalizeBatchDepositERC1155(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256[] _tokenIds, uint256[] _amounts)
+event FinalizeBatchDepositERC1155(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256[] tokenIds, uint256[] amounts)
 ```
 
-
+Emitted when the ERC1155 NFT is batch transfered to recipient in layer 2.
 
 
 
@@ -405,20 +394,20 @@ event FinalizeBatchDepositERC1155(address indexed _l1Token, address indexed _l2T
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token `indexed` | address | undefined |
-| _l2Token `indexed` | address | undefined |
-| _from `indexed` | address | undefined |
-| _to  | address | undefined |
-| _tokenIds  | uint256[] | undefined |
-| _amounts  | uint256[] | undefined |
+| l1Token `indexed` | address | undefined |
+| l2Token `indexed` | address | undefined |
+| from `indexed` | address | undefined |
+| to  | address | undefined |
+| tokenIds  | uint256[] | undefined |
+| amounts  | uint256[] | undefined |
 
 ### FinalizeDepositERC1155
 
 ```solidity
-event FinalizeDepositERC1155(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256 _tokenId, uint256 _amount)
+event FinalizeDepositERC1155(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256 tokenId, uint256 amount)
 ```
 
-
+Emitted when the ERC1155 NFT is transfered to recipient in layer 2.
 
 
 
@@ -426,12 +415,12 @@ event FinalizeDepositERC1155(address indexed _l1Token, address indexed _l2Token,
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token `indexed` | address | undefined |
-| _l2Token `indexed` | address | undefined |
-| _from `indexed` | address | undefined |
-| _to  | address | undefined |
-| _tokenId  | uint256 | undefined |
-| _amount  | uint256 | undefined |
+| l1Token `indexed` | address | undefined |
+| l2Token `indexed` | address | undefined |
+| from `indexed` | address | undefined |
+| to  | address | undefined |
+| tokenId  | uint256 | undefined |
+| amount  | uint256 | undefined |
 
 ### OwnershipTransferred
 
@@ -470,10 +459,10 @@ Emitted when token mapping for ERC1155 token is updated.
 ### WithdrawERC1155
 
 ```solidity
-event WithdrawERC1155(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256 _tokenId, uint256 _amount)
+event WithdrawERC1155(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256 tokenId, uint256 amount)
 ```
 
-
+Emitted when the ERC1155 NFT is transfered to gateway in layer 2.
 
 
 
@@ -481,12 +470,12 @@ event WithdrawERC1155(address indexed _l1Token, address indexed _l2Token, addres
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token `indexed` | address | undefined |
-| _l2Token `indexed` | address | undefined |
-| _from `indexed` | address | undefined |
-| _to  | address | undefined |
-| _tokenId  | uint256 | undefined |
-| _amount  | uint256 | undefined |
+| l1Token `indexed` | address | undefined |
+| l2Token `indexed` | address | undefined |
+| from `indexed` | address | undefined |
+| to  | address | undefined |
+| tokenId  | uint256 | undefined |
+| amount  | uint256 | undefined |
 
 
 

contracts/docs/apis/L2ERC721Gateway.md

@@ -24,9 +24,9 @@ Batch withdraw a list of ERC721 NFT to caller's account on layer 1.
 
 | Name | Type | Description |
 |---|---|---|
-| _token | address | The address of ERC721 NFT in layer 2. |
-| _tokenIds | uint256[] | The list of token ids to withdraw. |
-| _gasLimit | uint256 | Unused, but included for potential forward compatibility considerations. |
+| _token | address | undefined |
+| _tokenIds | uint256[] | undefined |
+| _gasLimit | uint256 | undefined |
 
 ### batchWithdrawERC721
 
@@ -42,10 +42,10 @@ Batch withdraw a list of ERC721 NFT to caller's account on layer 1.
 
 | Name | Type | Description |
 |---|---|---|
-| _token | address | The address of ERC721 NFT in layer 2. |
-| _to | address | The address of recipient in layer 1. |
-| _tokenIds | uint256[] | The list of token ids to withdraw. |
-| _gasLimit | uint256 | Unused, but included for potential forward compatibility considerations. |
+| _token | address | undefined |
+| _to | address | undefined |
+| _tokenIds | uint256[] | undefined |
+| _gasLimit | uint256 | undefined |
 
 ### counterpart
 
@@ -78,11 +78,11 @@ Complete ERC721 deposit from layer 1 to layer 2 and send NFT to recipient's
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token | address | The address of corresponding layer 1 token. |
-| _l2Token | address | The address of corresponding layer 2 token. |
-| _from | address | The address of account who withdraw the token in layer 1. |
-| _to | address | The address of recipient in layer 2 to receive the token. |
-| _tokenIds | uint256[] | The list of token ids to withdraw. |
+| _l1Token | address | undefined |
+| _l2Token | address | undefined |
+| _from | address | undefined |
+| _to | address | undefined |
+| _tokenIds | uint256[] | undefined |
 
 ### finalizeDepositERC721
 
@@ -98,22 +98,11 @@ Complete ERC721 deposit from layer 1 to layer 2 and send NFT to recipient's
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token | address | The address of corresponding layer 1 token. |
-| _l2Token | address | The address of corresponding layer 2 token. |
-| _from | address | The address of account who withdraw the token in layer 1. |
-| _to | address | The address of recipient in layer 2 to receive the token. |
-| _tokenId | uint256 | The token id to withdraw. |
-
-### finalizeDropMessage
-
-```solidity
-function finalizeDropMessage() external payable
-```
-
-
-
-
-
+| _l1Token | address | undefined |
+| _l2Token | address | undefined |
+| _from | address | undefined |
+| _to | address | undefined |
+| _tokenId | uint256 | undefined |
 
 ### initialize
 
@@ -138,7 +127,7 @@ function initialize(address _counterpart, address _messenger) external nonpayabl
 function messenger() external view returns (address)
 ```
 
-The address of L1ScrollMessenger/L2ScrollMessenger contract.
+The address of corresponding L1ScrollMessenger/L2ScrollMessenger contract.
 
 
 
@@ -288,9 +277,9 @@ Withdraw some ERC721 NFT to caller's account on layer 1.
 
 | Name | Type | Description |
 |---|---|---|
-| _token | address | The address of ERC721 NFT in layer 2. |
-| _tokenId | uint256 | The token id to withdraw. |
-| _gasLimit | uint256 | Unused, but included for potential forward compatibility considerations. |
+| _token | address | undefined |
+| _tokenId | uint256 | undefined |
+| _gasLimit | uint256 | undefined |
 
 ### withdrawERC721
 
@@ -306,10 +295,10 @@ Withdraw some ERC721 NFT to caller's account on layer 1.
 
 | Name | Type | Description |
 |---|---|---|
-| _token | address | The address of ERC721 NFT in layer 2. |
-| _to | address | The address of recipient in layer 1. |
-| _tokenId | uint256 | The token id to withdraw. |
-| _gasLimit | uint256 | Unused, but included for potential forward compatibility considerations. |
+| _token | address | undefined |
+| _to | address | undefined |
+| _tokenId | uint256 | undefined |
+| _gasLimit | uint256 | undefined |
 
 
 
@@ -318,7 +307,7 @@ Withdraw some ERC721 NFT to caller's account on layer 1.
 ### BatchWithdrawERC721
 
 ```solidity
-event BatchWithdrawERC721(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256[] _tokenIds)
+event BatchWithdrawERC721(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256[] tokenIds)
 ```
 
 Emitted when the ERC721 NFT is batch transfered to gateway in layer 2.
@@ -329,16 +318,16 @@ Emitted when the ERC721 NFT is batch transfered to gateway in layer 2.
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token `indexed` | address | undefined |
-| _l2Token `indexed` | address | undefined |
-| _from `indexed` | address | undefined |
-| _to  | address | undefined |
-| _tokenIds  | uint256[] | undefined |
+| l1Token `indexed` | address | undefined |
+| l2Token `indexed` | address | undefined |
+| from `indexed` | address | undefined |
+| to  | address | undefined |
+| tokenIds  | uint256[] | undefined |
 
 ### FinalizeBatchDepositERC721
 
 ```solidity
-event FinalizeBatchDepositERC721(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256[] _tokenIds)
+event FinalizeBatchDepositERC721(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256[] tokenIds)
 ```
 
 Emitted when the ERC721 NFT is batch transfered to recipient in layer 2.
@@ -349,16 +338,16 @@ Emitted when the ERC721 NFT is batch transfered to recipient in layer 2.
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token `indexed` | address | undefined |
-| _l2Token `indexed` | address | undefined |
-| _from `indexed` | address | undefined |
-| _to  | address | undefined |
-| _tokenIds  | uint256[] | undefined |
+| l1Token `indexed` | address | undefined |
+| l2Token `indexed` | address | undefined |
+| from `indexed` | address | undefined |
+| to  | address | undefined |
+| tokenIds  | uint256[] | undefined |
 
 ### FinalizeDepositERC721
 
 ```solidity
-event FinalizeDepositERC721(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256 _tokenId)
+event FinalizeDepositERC721(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256 tokenId)
 ```
 
 Emitted when the ERC721 NFT is transfered to recipient in layer 2.
@@ -369,11 +358,11 @@ Emitted when the ERC721 NFT is transfered to recipient in layer 2.
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token `indexed` | address | undefined |
-| _l2Token `indexed` | address | undefined |
-| _from `indexed` | address | undefined |
-| _to  | address | undefined |
-| _tokenId  | uint256 | undefined |
+| l1Token `indexed` | address | undefined |
+| l2Token `indexed` | address | undefined |
+| from `indexed` | address | undefined |
+| to  | address | undefined |
+| tokenId  | uint256 | undefined |
 
 ### OwnershipTransferred
 
@@ -412,7 +401,7 @@ Emitted when token mapping for ERC721 token is updated.
 ### WithdrawERC721
 
 ```solidity
-event WithdrawERC721(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256 _tokenId)
+event WithdrawERC721(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256 tokenId)
 ```
 
 Emitted when the ERC721 NFT is transfered to gateway in layer 2.
@@ -423,11 +412,11 @@ Emitted when the ERC721 NFT is transfered to gateway in layer 2.
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token `indexed` | address | undefined |
-| _l2Token `indexed` | address | undefined |
-| _from `indexed` | address | undefined |
-| _to  | address | undefined |
-| _tokenId  | uint256 | undefined |
+| l1Token `indexed` | address | undefined |
+| l2Token `indexed` | address | undefined |
+| from `indexed` | address | undefined |
+| to  | address | undefined |
+| tokenId  | uint256 | undefined |