build: update version to alpha-v1.0 (#301)

Co-authored-by: HAOYUatHZ <haoyu@protonmail.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Co-authored-by: xinran chen <lawliet@xinran-m1x.local>
Co-authored-by: Ubuntu <ubuntu@ip-172-31-9-248.us-west-2.compute.internal>

.github/pull_request_template.md

@@ -0,0 +1,7 @@
+1. Purpose or design rationale of this PR
+
+
+2. Does this PR involve a new deployment, and involve a new git tag & docker image tag? If so, has `tag` in `common/version.go` been updated? 
+
+
+3. Is this PR a breaking change? If so, have it been attached a `breaking-change` label?

.github/workflows/bridge.yml

@@ -31,7 +31,11 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Install Solc
-      uses: pontem-network/get-solc@master
+      uses: supplypike/setup-bin@v3
+      with:
+        uri: 'https://github.com/ethereum/solidity/releases/download/v0.8.16/solc-static-linux'
+        name: 'solc'
+        version: '0.8.16'
     - name: Install Geth Tools
       uses: gacts/install-geth-tools@v1
     - name: Lint

.github/workflows/common.yml

@@ -26,7 +26,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/coordinator.yml

@@ -26,7 +26,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/roller.yml

@@ -26,7 +26,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 +42,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,22 +13,12 @@ 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 {
         stage('Build') {
-            when {
-                anyOf {
-                    changeset "Jenkinsfile"
-                    changeset "build/**"
-                    changeset "go.work**"
-                    changeset "bridge/**"
-                    changeset "coordinator/**"
-                    changeset "common/**"
-                    changeset "database/**"
-                    changeset "tests/**"
-                }
-            }
             parallel {
                 stage('Build Prerequisite') {
                     steps {
@@ -70,18 +60,6 @@ pipeline {
             }
         }
         stage('Parallel Test') {
-            when {
-                anyOf {
-                    changeset "Jenkinsfile"
-                    changeset "build/**"
-                    changeset "go.work**"
-                    changeset "bridge/**"
-                    changeset "coordinator/**"
-                    changeset "common/**"
-                    changeset "database/**"
-                    changeset "tests/**"
-                }
-            }
             parallel{
                 stage('Test bridge package') {
                     steps {
@@ -126,24 +104,12 @@ pipeline {
             }
         }
         stage('Compare Coverage') {
-            when {
-                anyOf {
-                    changeset "Jenkinsfile"
-                    changeset "build/**"
-                    changeset "go.work**"
-                    changeset "bridge/**"
-                    changeset "coordinator/**"
-                    changeset "common/**"
-                    changeset "database/**"
-                    changeset "tests/**"
-                }
-            }
             steps {
                 sh "./build/post-test-report-coverage.sh"
                 script {
                     currentBuild.result = 'SUCCESS'
                 }
-                step([$class: 'CompareCoverageAction', publishResultAs: 'statusCheck', scmVars: [GIT_URL: env.GIT_URL]])
+                step([$class: 'CompareCoverageAction', publishResultAs: 'Comment', scmVars: [GIT_URL: env.GIT_URL]])
             }
         }
     }

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) | \
@@ -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/Makefile

@@ -5,7 +5,8 @@ IMAGE_VERSION=latest
 REPO_ROOT_DIR=./..
 
 mock_abi:
-	go run github.com/scroll-tech/go-ethereum/cmd/abigen --sol mock_bridge/Mock_Bridge.sol --pkg mock_bridge --out mock_bridge/Mock_Bridge.go
+	go run github.com/scroll-tech/go-ethereum/cmd/abigen --sol mock_bridge/MockBridgeL1.sol --pkg mock_bridge --out mock_bridge/MockBridgeL1.go
+	go run github.com/scroll-tech/go-ethereum/cmd/abigen --sol mock_bridge/MockBridgeL2.sol --pkg mock_bridge --out mock_bridge/MockBridgeL2.go
 
 bridge: ## Builds the Bridge instance.
 	go build -o $(PWD)/build/bin/bridge ./cmd

bridge/abi/bridge_abi.go

@@ -9,20 +9,20 @@ import (
 )
 
 const (
-	// SENT_MESSAGE_EVENT_SIGNATURE = keccak256("SentMessage(address,address,uint256,uint256,uint256,bytes,uint256,uint256)")
-	SENT_MESSAGE_EVENT_SIGNATURE = "806b28931bc6fbe6c146babfb83d5c2b47e971edb43b4566f010577a0ee7d9f4"
+	// SentMessageEventSignature = keccak256("SentMessage(address,address,uint256,uint256,uint256,bytes,uint256,uint256)")
+	SentMessageEventSignature = "806b28931bc6fbe6c146babfb83d5c2b47e971edb43b4566f010577a0ee7d9f4"
 
-	// RELAYED_MESSAGE_EVENT_SIGNATURE = keccak256("RelayedMessage(bytes32)")
-	RELAYED_MESSAGE_EVENT_SIGNATURE = "4641df4a962071e12719d8c8c8e5ac7fc4d97b927346a3d7a335b1f7517e133c"
+	// RelayedMessageEventSignature = keccak256("RelayedMessage(bytes32)")
+	RelayedMessageEventSignature = "4641df4a962071e12719d8c8c8e5ac7fc4d97b927346a3d7a335b1f7517e133c"
 
-	// FAILED_RELAYED_MESSAGE_EVENT_SIGNATURE = keccak256("FailedRelayedMessage(bytes32)")
-	FAILED_RELAYED_MESSAGE_EVENT_SIGNATURE = "99d0e048484baa1b1540b1367cb128acd7ab2946d1ed91ec10e3c85e4bf51b8f"
+	// FailedRelayedMessageEventSignature = keccak256("FailedRelayedMessage(bytes32)")
+	FailedRelayedMessageEventSignature = "99d0e048484baa1b1540b1367cb128acd7ab2946d1ed91ec10e3c85e4bf51b8f"
 
-	// COMMIT_BATCH_EVENT_SIGNATURE = keccak256("CommitBatch(bytes32,bytes32,uint256,bytes32)")
-	COMMIT_BATCH_EVENT_SIGNATURE = "a26d4bd91c4c2eff3b1bf542129607d782506fc1950acfab1472a20d28c06596"
+	// CommitBatchEventSignature = keccak256("CommitBatch(bytes32,bytes32,uint256,bytes32)")
+	CommitBatchEventSignature = "a26d4bd91c4c2eff3b1bf542129607d782506fc1950acfab1472a20d28c06596"
 
-	// FINALIZED_BATCH_EVENT_SIGNATURE = keccak256("FinalizeBatch(bytes32,bytes32,uint256,bytes32)")
-	FINALIZED_BATCH_EVENT_SIGNATURE = "e20f311a96205960de4d2bb351f7729e5136fa36ae64d7f736c67ddc4ca4cd4b"
+	// FinalizedBatchEventSignature = keccak256("FinalizeBatch(bytes32,bytes32,uint256,bytes32)")
+	FinalizedBatchEventSignature = "e20f311a96205960de4d2bb351f7729e5136fa36ae64d7f736c67ddc4ca4cd4b"
 )
 
 var (

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

@@ -15,5 +15,5 @@ func TestRunBridge(t *testing.T) {
 
 	// wait result
 	bridge.ExpectWithTimeout(true, time.Second*3, fmt.Sprintf("bridge version %s", version.Version))
-	bridge.RunApp(false)
+	bridge.RunApp(nil)
 }

bridge/config.json

@@ -1,8 +1,9 @@
 {
   "l1_config": {
-    "confirmations": 6,
+    "confirmations": "0x6",
     "endpoint": "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
     "l1_messenger_address": "0x0000000000000000000000000000000000000000",
+    "rollup_contract_address": "0x0000000000000000000000000000000000000000",
     "start_height": 0,
     "relayer_config": {
       "messenger_contract_address": "0x0000000000000000000000000000000000000000",
@@ -10,11 +11,11 @@
         "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc",
         "check_pending_time": 3,
         "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
       },
       "message_sender_private_keys": [
@@ -23,7 +24,7 @@
     }
   },
   "l2_config": {
-    "confirmations": 1,
+    "confirmations": "0x1",
     "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc",
     "l2_messenger_address": "0x0000000000000000000000000000000000000000",
     "relayer_config": {
@@ -33,11 +34,11 @@
         "endpoint": "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
         "check_pending_time": 10,
         "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
       },
       "message_sender_private_keys": [

bridge/config/l1_config.go

@@ -1,17 +1,22 @@
 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.
-	L1MessengerAddress common.Address `json:"l1_messenger_address,omitempty"`
+	L1MessengerAddress common.Address `json:"l1_messenger_address"`
+	// The rollup contract address deployed on layer 1 chain.
+	RollupContractAddress common.Address `json:"rollup_contract_address"`
 	// The relayer config
 	RelayerConfig *RelayerConfig `json:"relayer_config"`
 }

bridge/config/l2_config.go

@@ -3,13 +3,15 @@ package config
 import (
 	"encoding/json"
 
+	"github.com/scroll-tech/go-ethereum/rpc"
+
 	"github.com/scroll-tech/go-ethereum/common"
 )
 
 // 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.

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.

bridge/go.mod

@@ -5,10 +5,11 @@ 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.20221221073256-5ca70bf3a257
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230210093343-bb26fa3e391d
 	github.com/stretchr/testify v1.8.0
 	github.com/urfave/cli/v2 v2.10.2
 	golang.org/x/sync v0.1.0
+	modernc.org/mathutil v1.4.1
 )
 
 require (
@@ -27,17 +28,18 @@ require (
 	github.com/mattn/go-isatty 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.4.3 // 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.4.0 // indirect
-	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

bridge/go.sum

@@ -336,6 +336,8 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
 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=
@@ -348,11 +350,10 @@ 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.20221221073256-5ca70bf3a257 h1:FjBC0Ww42WRoiB5EQFxoIEcJqoEUw2twdhN9nGkVCQA=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20221221073256-5ca70bf3a257/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.20230210093343-bb26fa3e391d h1:S4bEgTezJrqYmDfUSkp9Of0/lcglm4CTAWQHSnsn2HE=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230210093343-bb26fa3e391d/go.mod h1:OH4ZTAz6RM1IL0xcQ1zM6+Iy9s2vtcYqqwcEQdfHV7g=
+github.com/scroll-tech/zktrie v0.4.3 h1:RyhusIu8F8u5ITmzqZjkAwlL6jdC9TK9i6tfuJoZcpk=
+github.com/scroll-tech/zktrie v0.4.3/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=
@@ -423,8 +424,8 @@ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPh
 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.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
-golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
+golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 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=
@@ -539,8 +540,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
 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.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
+golang.org/x/sys v0.5.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=
@@ -552,7 +553,7 @@ 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.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 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=
@@ -662,5 +663,7 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
 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.RelayerConfig.RollupContractAddress, orm)
+	watcher := NewWatcher(ctx, client, cfg.StartHeight, cfg.Confirmations, cfg.L1MessengerAddress, cfg.RollupContractAddress, orm)
 
 	return &Backend{
 		cfg:     cfg,

bridge/l1/relayer.go

@@ -11,7 +11,6 @@ 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"
 
 	"scroll-tech/database/orm"
@@ -29,7 +28,6 @@ import (
 // @todo It's better to be triggered by watcher.
 type Layer1Relayer struct {
 	ctx    context.Context
-	client *ethclient.Client
 	sender *sender.Sender
 
 	db  orm.L1MessageOrm
@@ -43,7 +41,7 @@ type Layer1Relayer 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) {
+func NewLayer1Relayer(ctx context.Context, db orm.L1MessageOrm, cfg *config.RelayerConfig) (*Layer1Relayer, error) {
 	l2MessengerABI, err := bridge_abi.L2MessengerMetaData.GetAbi()
 	if err != nil {
 		log.Warn("new L2MessengerABI failed", "err", err)
@@ -59,7 +57,6 @@ func NewLayer1Relayer(ctx context.Context, ethClient *ethclient.Client, l1Confir
 
 	return &Layer1Relayer{
 		ctx:            ctx,
-		client:         ethClient,
 		sender:         sender,
 		db:             db,
 		l2MessengerABI: l2MessengerABI,
@@ -72,15 +69,20 @@ func NewLayer1Relayer(ctx context.Context, ethClient *ethclient.Client, l1Confir
 // 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)
+	msgs, err := r.db.GetL1MessagesByStatus(orm.MsgPending, 100)
 	if err != nil {
 		log.Error("Failed to fetch unprocessed L1 messages", "err", err)
 		return
 	}
+
+	if len(msgs) > 0 {
+		log.Info("Processing L1 messages", "count", len(msgs))
+	}
+
 	for _, msg := range msgs {
 		if err = r.processSavedEvent(msg); err != nil {
 			if !errors.Is(err, sender.ErrNoAvailableAccount) {
-				log.Error("failed to process event", "err", err)
+				log.Error("failed to process event", "msg.msgHash", msg.MsgHash, "err", err)
 			}
 			return
 		}
@@ -109,6 +111,12 @@ func (r *Layer1Relayer) processSavedEvent(msg *orm.L1Message) error {
 	}
 
 	hash, err := r.sender.SendTransaction(msg.MsgHash, &r.cfg.MessengerContractAddress, big.NewInt(0), data)
+	if err != nil && err.Error() == "execution reverted: Message expired" {
+		return r.db.UpdateLayer1Status(r.ctx, msg.MsgHash, orm.MsgExpired)
+	}
+	if err != nil && err.Error() == "execution reverted: Message successfully executed" {
+		return r.db.UpdateLayer1Status(r.ctx, msg.MsgHash, orm.MsgConfirmed)
+	}
 	if err != nil {
 		return err
 	}

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

@@ -11,6 +11,8 @@ import (
 	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
+	"github.com/scroll-tech/go-ethereum/metrics"
+	"github.com/scroll-tech/go-ethereum/rpc"
 
 	"scroll-tech/database"
 	"scroll-tech/database/orm"
@@ -19,6 +21,10 @@ import (
 	"scroll-tech/bridge/utils"
 )
 
+var (
+	bridgeL1MsgSyncHeightGauge = metrics.NewRegisteredGauge("bridge/l1/msg/sync/height", nil)
+)
+
 type relayedMessage struct {
 	msgHash      common.Hash
 	txHash       common.Hash
@@ -38,7 +44,7 @@ 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
 
@@ -53,7 +59,7 @@ type Watcher struct {
 
 // 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 common.Address, rollupAddress common.Address, db database.OrmFactory) *Watcher {
 	savedHeight, err := db.GetLayer1LatestWatchedHeight()
 	if err != nil {
 		log.Warn("Failed to fetch height from db", "err", err)
@@ -91,12 +97,13 @@ func (w *Watcher) Start() {
 				return
 
 			default:
-				blockNumber, err := w.client.BlockNumber(w.ctx)
+				number, err := utils.GetLatestConfirmedBlockNumber(w.ctx, w.client, w.confirmations)
 				if err != nil {
-					log.Error("Failed to get block number", "err", err)
+					log.Error("failed to get block number", "err", err)
 					continue
 				}
-				if err := w.fetchContractEvent(blockNumber); err != nil {
+
+				if err := w.FetchContractEvent(number); err != nil {
 					log.Error("Failed to fetch bridge contract", "err", err)
 				}
 			}
@@ -112,13 +119,13 @@ func (w *Watcher) Stop() {
 const contractEventsBlocksFetchLimit = int64(10)
 
 // FetchContractEvent pull latest event logs from given contract address and save in DB
-func (w *Watcher) fetchContractEvent(blockHeight uint64) error {
+func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 	defer func() {
 		log.Info("l1 watcher fetchContractEvent", "w.processedMsgHeight", w.processedMsgHeight)
 	}()
 
 	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
@@ -138,11 +145,11 @@ func (w *Watcher) fetchContractEvent(blockHeight uint64) error {
 			Topics: make([][]common.Hash, 1),
 		}
 		query.Topics[0] = make([]common.Hash, 5)
-		query.Topics[0][0] = common.HexToHash(bridge_abi.SENT_MESSAGE_EVENT_SIGNATURE)
-		query.Topics[0][1] = common.HexToHash(bridge_abi.RELAYED_MESSAGE_EVENT_SIGNATURE)
-		query.Topics[0][2] = common.HexToHash(bridge_abi.FAILED_RELAYED_MESSAGE_EVENT_SIGNATURE)
-		query.Topics[0][3] = common.HexToHash(bridge_abi.COMMIT_BATCH_EVENT_SIGNATURE)
-		query.Topics[0][4] = common.HexToHash(bridge_abi.FINALIZED_BATCH_EVENT_SIGNATURE)
+		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)
 
 		logs, err := w.client.FilterLogs(w.ctx, query)
 		if err != nil {
@@ -151,15 +158,17 @@ func (w *Watcher) fetchContractEvent(blockHeight uint64) error {
 		}
 		if len(logs) == 0 {
 			w.processedMsgHeight = uint64(to)
+			bridgeL1MsgSyncHeightGauge.Update(to)
 			continue
 		}
-		log.Info("Received new L1 messages", "fromBlock", from, "toBlock", to, "cnt", len(logs))
+		log.Info("Received new L1 events", "fromBlock", from, "toBlock", to, "cnt", len(logs))
 
 		sentMessageEvents, relayedMessageEvents, rollupEvents, err := w.parseBridgeEventLogs(logs)
 		if err != nil {
 			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))
 
 		// use rollup event to update rollup results db status
 		var batchIDs []string
@@ -179,7 +188,8 @@ func (w *Watcher) fetchContractEvent(blockHeight uint64) error {
 		for index, event := range rollupEvents {
 			batchID := event.batchID.String()
 			status := statuses[index]
-			if event.status != status {
+			// 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 {
@@ -197,10 +207,10 @@ func (w *Watcher) fetchContractEvent(blockHeight uint64) error {
 		for _, msg := range relayedMessageEvents {
 			if msg.isSuccessful {
 				// succeed
-				err = w.db.UpdateLayer1StatusAndLayer2Hash(w.ctx, msg.msgHash.String(), orm.MsgConfirmed, msg.txHash.String())
+				err = w.db.UpdateLayer2StatusAndLayer1Hash(w.ctx, msg.msgHash.String(), orm.MsgConfirmed, msg.txHash.String())
 			} else {
 				// failed
-				err = w.db.UpdateLayer1StatusAndLayer2Hash(w.ctx, msg.msgHash.String(), orm.MsgFailed, msg.txHash.String())
+				err = w.db.UpdateLayer2StatusAndLayer1Hash(w.ctx, msg.msgHash.String(), orm.MsgFailed, msg.txHash.String())
 			}
 			if err != nil {
 				log.Error("Failed to update layer1 status and layer2 hash", "err", err)
@@ -213,6 +223,7 @@ func (w *Watcher) fetchContractEvent(blockHeight uint64) error {
 		}
 
 		w.processedMsgHeight = uint64(to)
+		bridgeL1MsgSyncHeightGauge.Update(to)
 	}
 
 	return nil
@@ -227,7 +238,7 @@ func (w *Watcher) parseBridgeEventLogs(logs []types.Log) ([]*orm.L1Message, []re
 	var rollupEvents []rollupEvent
 	for _, vLog := range logs {
 		switch vLog.Topics[0] {
-		case common.HexToHash(bridge_abi.SENT_MESSAGE_EVENT_SIGNATURE):
+		case common.HexToHash(bridge_abi.SentMessageEventSignature):
 			event := struct {
 				Target       common.Address
 				Sender       common.Address
@@ -248,7 +259,7 @@ func (w *Watcher) parseBridgeEventLogs(logs []types.Log) ([]*orm.L1Message, []re
 			event.Target = common.HexToAddress(vLog.Topics[1].String())
 			l1Messages = append(l1Messages, &orm.L1Message{
 				Nonce:      event.MessageNonce.Uint64(),
-				MsgHash:    utils.ComputeMessageHash(event.Target, event.Sender, event.Value, event.Fee, event.Deadline, event.Message, event.MessageNonce).String(),
+				MsgHash:    utils.ComputeMessageHash(event.Sender, event.Target, event.Value, event.Fee, event.Deadline, event.Message, event.MessageNonce).String(),
 				Height:     vLog.BlockNumber,
 				Sender:     event.Sender.String(),
 				Value:      event.Value.String(),
@@ -259,7 +270,7 @@ func (w *Watcher) parseBridgeEventLogs(logs []types.Log) ([]*orm.L1Message, []re
 				Calldata:   common.Bytes2Hex(event.Message),
 				Layer1Hash: vLog.TxHash.Hex(),
 			})
-		case common.HexToHash(bridge_abi.RELAYED_MESSAGE_EVENT_SIGNATURE):
+		case common.HexToHash(bridge_abi.RelayedMessageEventSignature):
 			event := struct {
 				MsgHash common.Hash
 			}{}
@@ -270,7 +281,7 @@ func (w *Watcher) parseBridgeEventLogs(logs []types.Log) ([]*orm.L1Message, []re
 				txHash:       vLog.TxHash,
 				isSuccessful: true,
 			})
-		case common.HexToHash(bridge_abi.FAILED_RELAYED_MESSAGE_EVENT_SIGNATURE):
+		case common.HexToHash(bridge_abi.FailedRelayedMessageEventSignature):
 			event := struct {
 				MsgHash common.Hash
 			}{}
@@ -281,7 +292,7 @@ func (w *Watcher) parseBridgeEventLogs(logs []types.Log) ([]*orm.L1Message, []re
 				txHash:       vLog.TxHash,
 				isSuccessful: false,
 			})
-		case common.HexToHash(bridge_abi.COMMIT_BATCH_EVENT_SIGNATURE):
+		case common.HexToHash(bridge_abi.CommitBatchEventSignature):
 			event := struct {
 				BatchID    common.Hash
 				BatchHash  common.Hash
@@ -301,7 +312,7 @@ func (w *Watcher) parseBridgeEventLogs(logs []types.Log) ([]*orm.L1Message, []re
 				txHash:  vLog.TxHash,
 				status:  orm.RollupCommitted,
 			})
-		case common.HexToHash(bridge_abi.FINALIZED_BATCH_EVENT_SIGNATURE):
+		case common.HexToHash(bridge_abi.FinalizedBatchEventSignature):
 			event := struct {
 				BatchID    common.Hash
 				BatchHash  common.Hash

bridge/l2/backend.go

@@ -27,7 +27,7 @@ func New(ctx context.Context, cfg *config.L2Config, orm database.OrmFactory) (*B
 		return nil, err
 	}
 
-	relayer, err := NewLayer2Relayer(ctx, client, orm, cfg.RelayerConfig)
+	relayer, err := NewLayer2Relayer(ctx, orm, cfg.RelayerConfig)
 	if err != nil {
 		return nil, err
 	}

bridge/l2/batch_proposer.go

@@ -40,7 +40,7 @@ func newBatchProposer(cfg *config.BatchProposerConfig, orm database.OrmFactory)
 	}
 }
 
-func (w *batchProposer) tryProposeBatch() error {
+func (w *batchProposer) tryProposeBatch() {
 	w.mutex.Lock()
 	defer w.mutex.Unlock()
 
@@ -49,20 +49,27 @@ func (w *batchProposer) tryProposeBatch() error {
 		fmt.Sprintf("order by number ASC LIMIT %d", w.batchBlocksLimit),
 	)
 	if err != nil {
-		return err
+		log.Error("failed to get unbatched blocks", "err", err)
+		return
 	}
 	if len(blocks) == 0 {
-		return nil
+		return
 	}
 
 	if blocks[0].GasUsed > w.batchGasThreshold {
 		log.Warn("gas overflow even for only 1 block", "height", blocks[0].Number, "gas", blocks[0].GasUsed)
-		return w.createBatchForBlocks(blocks[:1])
+		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)
-		return w.createBatchForBlocks(blocks[:1])
+		if err = w.createBatchForBlocks(blocks[:1]); err != nil {
+			log.Error("failed to create batch", "number", blocks[0].Number, "err", err)
+		}
+		return
 	}
 
 	var (
@@ -83,10 +90,12 @@ func (w *batchProposer) tryProposeBatch() error {
 	// 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 nil
+		return
 	}
 
-	return w.createBatchForBlocks(blocks)
+	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 {

bridge/l2/batch_proposer_test.go

@@ -49,7 +49,7 @@ func testBatchProposer(t *testing.T) {
 		BatchTimeSec:        1,
 		BatchBlocksLimit:    100,
 	}, db)
-	assert.NoError(t, proposer.tryProposeBatch())
+	proposer.tryProposeBatch()
 
 	infos, err := db.GetUnbatchedBlocks(map[string]interface{}{},
 		fmt.Sprintf("order by number ASC LIMIT %d", 100))

bridge/l2/l2_test.go

@@ -77,6 +77,7 @@ func TestFunction(t *testing.T) {
 	t.Run("TestL2RelayerProcessSaveEvents", testL2RelayerProcessSaveEvents)
 	t.Run("testL2RelayerProcessPendingBatches", testL2RelayerProcessPendingBatches)
 	t.Run("testL2RelayerProcessCommittedBatches", testL2RelayerProcessCommittedBatches)
+	t.Run("testL2RelayerSkipBatches", testL2RelayerSkipBatches)
 
 	t.Run("testBatchProposer", testBatchProposer)
 

bridge/l2/relayer.go

@@ -3,15 +3,19 @@ package l2
 import (
 	"context"
 	"errors"
+	"fmt"
 	"math/big"
+	"runtime"
+	"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/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
+	"golang.org/x/sync/errgroup"
+	"modernc.org/mathutil"
 
 	"scroll-tech/database"
 	"scroll-tech/database/orm"
@@ -29,8 +33,7 @@ import (
 // Actions are triggered by new head from layer 1 geth node.
 // @todo It's better to be triggered by watcher.
 type Layer2Relayer struct {
-	ctx    context.Context
-	client *ethclient.Client
+	ctx context.Context
 
 	db  database.OrmFactory
 	cfg *config.RelayerConfig
@@ -43,20 +46,23 @@ type Layer2Relayer struct {
 	rollupCh     <-chan *sender.Confirmation
 	l1RollupABI  *abi.ABI
 
-	// a list of processing message, indexed by layer2 hash
-	processingMessage map[string]string
+	// A list of processing message.
+	// key(string): confirmation ID, value(string): layer2 hash.
+	processingMessage sync.Map
 
-	// a list of processing batch commitment, indexed by batch id
-	processingCommitment map[string]string
+	// A list of processing batch commitment.
+	// key(string): confirmation ID, value(string): batch id.
+	processingCommitment sync.Map
 
-	// a list of processing batch finalization, indexed by batch id
-	processingFinalization map[string]string
+	// A list of processing batch finalization.
+	// key(string): confirmation ID, value(string): batch id.
+	processingFinalization sync.Map
 
 	stopCh chan struct{}
 }
 
 // NewLayer2Relayer will return a new instance of Layer2RelayerClient
-func NewLayer2Relayer(ctx context.Context, ethClient *ethclient.Client, db database.OrmFactory, cfg *config.RelayerConfig) (*Layer2Relayer, error) {
+func NewLayer2Relayer(ctx context.Context, 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 {
@@ -72,7 +78,6 @@ func NewLayer2Relayer(ctx context.Context, ethClient *ethclient.Client, db datab
 
 	return &Layer2Relayer{
 		ctx:                    ctx,
-		client:                 ethClient,
 		db:                     db,
 		messageSender:          messageSender,
 		messageCh:              messageSender.ConfirmChan(),
@@ -81,23 +86,49 @@ func NewLayer2Relayer(ctx context.Context, ethClient *ethclient.Client, db datab
 		rollupCh:               rollupSender.ConfirmChan(),
 		l1RollupABI:            bridge_abi.RollupMetaABI,
 		cfg:                    cfg,
-		processingMessage:      map[string]string{},
-		processingCommitment:   map[string]string{},
-		processingFinalization: map[string]string{},
+		processingMessage:      sync.Map{},
+		processingCommitment:   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() {
+	batch, err := r.db.GetLatestFinalizedBatch()
+	if err != nil {
+		log.Error("GetLatestFinalizedBatch failed", "err", err)
+		return
+	}
+
 	// msgs are sorted by nonce in increasing order
-	msgs, err := r.db.GetL2MessagesByStatus(orm.MsgPending)
+	msgs, err := r.db.GetL2Messages(
+		map[string]interface{}{"status": orm.MsgPending},
+		fmt.Sprintf("AND height<=%d", batch.EndBlockNumber),
+		fmt.Sprintf("ORDER BY nonce ASC LIMIT %d", processMsgLimit),
+	)
+
 	if err != nil {
 		log.Error("Failed to fetch unprocessed L2 messages", "err", err)
 		return
 	}
-	for _, msg := range msgs {
-		if err := r.processSavedEvent(msg); err != nil {
+
+	// process messages in batches
+	batchSize := mathutil.Min((runtime.GOMAXPROCS(0)+1)/2, r.messageSender.NumberOfAccounts())
+	for size := 0; len(msgs) > 0; msgs = msgs[size:] {
+		if size = len(msgs); size > batchSize {
+			size = batchSize
+		}
+		var g errgroup.Group
+		for _, msg := range msgs[:size] {
+			msg := msg
+			g.Go(func() error {
+				return r.processSavedEvent(msg, batch.Index)
+			})
+		}
+		if err := g.Wait(); err != nil {
 			if !errors.Is(err, sender.ErrNoAvailableAccount) {
 				log.Error("failed to process l2 saved event", "err", err)
 			}
@@ -106,25 +137,13 @@ func (r *Layer2Relayer) ProcessSavedEvents() {
 	}
 }
 
-func (r *Layer2Relayer) processSavedEvent(msg *orm.L2Message) error {
-	// @todo add support to relay multiple messages
-	batch, err := r.db.GetLatestFinalizedBatch()
-	if err != nil {
-		log.Error("GetLatestFinalizedBatch failed", "err", err)
-		return err
-	}
-
-	if batch.EndBlockNumber < msg.Height {
-		// log.Warn("corresponding block not finalized", "status", status)
-		return nil
-	}
-
+func (r *Layer2Relayer) processSavedEvent(msg *orm.L2Message, index uint64) error {
 	// @todo fetch merkle proof from l2geth
 	log.Info("Processing L2 Message", "msg.nonce", msg.Nonce, "msg.height", msg.Height)
 
 	proof := bridge_abi.IL1ScrollMessengerL2MessageProof{
 		BlockHeight: big.NewInt(int64(msg.Height)),
-		BatchIndex:  big.NewInt(int64(batch.Index)),
+		BatchIndex:  big.NewInt(0).SetUint64(index),
 		MerkleProof: make([]byte, 0),
 	}
 	from := common.HexToAddress(msg.Sender)
@@ -147,6 +166,12 @@ func (r *Layer2Relayer) processSavedEvent(msg *orm.L2Message) error {
 	}
 
 	hash, err := r.messageSender.SendTransaction(msg.MsgHash, &r.cfg.MessengerContractAddress, big.NewInt(0), data)
+	if err != nil && err.Error() == "execution reverted: Message expired" {
+		return r.db.UpdateLayer2Status(r.ctx, msg.MsgHash, orm.MsgExpired)
+	}
+	if err != nil && err.Error() == "execution reverted: Message successfully executed" {
+		return r.db.UpdateLayer2Status(r.ctx, msg.MsgHash, orm.MsgConfirmed)
+	}
 	if err != nil {
 		if !errors.Is(err, sender.ErrNoAvailableAccount) {
 			log.Error("Failed to send relayMessageWithProof tx to layer1 ", "msg.height", msg.Height, "msg.MsgHash", msg.MsgHash, "err", err)
@@ -162,14 +187,14 @@ func (r *Layer2Relayer) processSavedEvent(msg *orm.L2Message) error {
 		log.Error("UpdateLayer2StatusAndLayer1Hash failed", "msgHash", msg.MsgHash, "err", err)
 		return err
 	}
-	r.processingMessage[msg.MsgHash] = msg.MsgHash
+	r.processingMessage.Store(msg.MsgHash, msg.MsgHash)
 	return nil
 }
 
 // ProcessPendingBatches submit batch data to layer 1 rollup contract
 func (r *Layer2Relayer) ProcessPendingBatches() {
 	// batches are sorted by batch index in increasing order
-	batchesInDB, err := r.db.GetPendingBatches()
+	batchesInDB, err := r.db.GetPendingBatches(1)
 	if err != nil {
 		log.Error("Failed to fetch pending L2 batches", "err", err)
 		return
@@ -240,27 +265,37 @@ func (r *Layer2Relayer) ProcessPendingBatches() {
 		return
 	}
 
-	hash, err := r.rollupSender.SendTransaction(id, &r.cfg.RollupContractAddress, big.NewInt(0), data)
+	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)
 	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)
 		}
 		return
 	}
-	log.Info("commitBatch in layer1", "id", id, "index", batch.Index, "hash", hash)
+	log.Info("commitBatch in layer1", "batch_id", id, "index", batch.Index, "hash", hash)
 
 	// 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)
 	}
-	r.processingCommitment[id] = id
+	r.processingCommitment.Store(txID, id)
 }
 
 // ProcessCommittedBatches submit proof to layer 1 rollup contract
 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 {
+		log.Info("Skipping batches", "count", count)
+	}
+
 	// batches are sorted by batch index in increasing order
-	batches, err := r.db.GetCommittedBatches()
+	batches, err := r.db.GetCommittedBatches(1)
 	if err != nil {
 		log.Error("Failed to fetch committed L2 batches", "err", err)
 		return
@@ -288,6 +323,8 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 		return
 
 	case orm.ProvingTaskFailed, orm.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)
 		}
@@ -332,7 +369,9 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 			return
 		}
 
-		txHash, err := r.rollupSender.SendTransaction(id, &r.cfg.RollupContractAddress, big.NewInt(0), data)
+		txID := id + "-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
 		if err != nil {
 			if !errors.Is(err, sender.ErrNoAvailableAccount) {
@@ -340,15 +379,15 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 			}
 			return
 		}
-		log.Info("finalizeBatchWithProof in layer1", "id", id, "hash", hash)
+		log.Info("finalizeBatchWithProof in layer1", "batch_id", id, "hash", hash)
 
 		// record and sync with db, @todo handle db error
 		err = r.db.UpdateFinalizeTxHashAndRollupStatus(r.ctx, id, hash.String(), orm.RollupFinalizing)
 		if err != nil {
-			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "id", id, "err", err)
+			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "batch_id", id, "err", err)
 		}
 		success = true
-		r.processingFinalization[id] = id
+		r.processingFinalization.Store(txID, id)
 
 	default:
 		log.Error("encounter unreachable case in ProcessCommittedBatches",
@@ -359,25 +398,42 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 
 // Start the relayer process
 func (r *Layer2Relayer) Start() {
-	go func() {
-		// trigger by timer
+	loop := func(ctx context.Context, f func()) {
 		ticker := time.NewTicker(time.Second)
 		defer ticker.Stop()
 
 		for {
 			select {
-			case <-ticker.C:
-				r.ProcessSavedEvents()
-				r.ProcessPendingBatches()
-				r.ProcessCommittedBatches()
-			case confirmation := <-r.messageCh:
-				r.handleConfirmation(confirmation)
-			case confirmation := <-r.rollupCh:
-				r.handleConfirmation(confirmation)
-			case <-r.stopCh:
+			case <-ctx.Done():
 				return
+			case <-ticker.C:
+				f()
 			}
 		}
+	}
+
+	go func() {
+		ctx, cancel := context.WithCancel(r.ctx)
+
+		go loop(ctx, r.ProcessSavedEvents)
+		go loop(ctx, r.ProcessPendingBatches)
+		go loop(ctx, r.ProcessCommittedBatches)
+
+		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)
+				}
+			}
+		}(ctx)
+
+		<-r.stopCh
+		cancel()
 	}()
 }
 
@@ -394,36 +450,36 @@ func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) {
 
 	transactionType := "Unknown"
 	// check whether it is message relay transaction
-	if msgHash, ok := r.processingMessage[confirmation.ID]; ok {
+	if msgHash, ok := r.processingMessage.Load(confirmation.ID); ok {
 		transactionType = "MessageRelay"
 		// @todo handle db error
-		err := r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, msgHash, orm.MsgConfirmed, confirmation.TxHash.String())
+		err := r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, msgHash.(string), orm.MsgConfirmed, confirmation.TxHash.String())
 		if err != nil {
-			log.Warn("UpdateLayer2StatusAndLayer1Hash failed", "msgHash", msgHash, "err", err)
+			log.Warn("UpdateLayer2StatusAndLayer1Hash failed", "msgHash", msgHash.(string), "err", err)
 		}
-		delete(r.processingMessage, confirmation.ID)
+		r.processingMessage.Delete(confirmation.ID)
 	}
 
 	// check whether it is block commitment transaction
-	if batch_id, ok := r.processingCommitment[confirmation.ID]; ok {
+	if batchID, ok := r.processingCommitment.Load(confirmation.ID); ok {
 		transactionType = "BatchCommitment"
 		// @todo handle db error
-		err := r.db.UpdateCommitTxHashAndRollupStatus(r.ctx, batch_id, confirmation.TxHash.String(), orm.RollupCommitted)
+		err := r.db.UpdateCommitTxHashAndRollupStatus(r.ctx, batchID.(string), confirmation.TxHash.String(), orm.RollupCommitted)
 		if err != nil {
-			log.Warn("UpdateCommitTxHashAndRollupStatus failed", "batch_id", batch_id, "err", err)
+			log.Warn("UpdateCommitTxHashAndRollupStatus failed", "batch_id", batchID.(string), "err", err)
 		}
-		delete(r.processingCommitment, confirmation.ID)
+		r.processingCommitment.Delete(confirmation.ID)
 	}
 
 	// check whether it is proof finalization transaction
-	if batch_id, ok := r.processingFinalization[confirmation.ID]; ok {
+	if batchID, ok := r.processingFinalization.Load(confirmation.ID); ok {
 		transactionType = "ProofFinalization"
 		// @todo handle db error
-		err := r.db.UpdateFinalizeTxHashAndRollupStatus(r.ctx, batch_id, confirmation.TxHash.String(), orm.RollupFinalized)
+		err := r.db.UpdateFinalizeTxHashAndRollupStatus(r.ctx, batchID.(string), confirmation.TxHash.String(), orm.RollupFinalized)
 		if err != nil {
-			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "batch_id", batch_id, "err", err)
+			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "batch_id", batchID.(string), "err", err)
 		}
-		delete(r.processingFinalization, confirmation.ID)
+		r.processingFinalization.Delete(confirmation.ID)
 	}
 	log.Info("transaction confirmed in layer1", "type", transactionType, "confirmation", confirmation)
 }

bridge/l2/relayer_test.go

@@ -40,7 +40,7 @@ func testCreateNewRelayer(t *testing.T) {
 	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
 	defer db.Close()
 
-	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, cfg.L2Config.RelayerConfig)
+	relayer, err := NewLayer2Relayer(context.Background(), db, cfg.L2Config.RelayerConfig)
 	assert.NoError(t, err)
 	defer relayer.Stop()
 
@@ -55,7 +55,7 @@ func testL2RelayerProcessSaveEvents(t *testing.T) {
 	defer db.Close()
 
 	l2Cfg := cfg.L2Config
-	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig)
+	relayer, err := NewLayer2Relayer(context.Background(), db, l2Cfg.RelayerConfig)
 	assert.NoError(t, err)
 	defer relayer.Stop()
 
@@ -109,7 +109,7 @@ func testL2RelayerProcessPendingBatches(t *testing.T) {
 	defer db.Close()
 
 	l2Cfg := cfg.L2Config
-	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig)
+	relayer, err := NewLayer2Relayer(context.Background(), db, l2Cfg.RelayerConfig)
 	assert.NoError(t, err)
 	defer relayer.Stop()
 
@@ -166,7 +166,7 @@ func testL2RelayerProcessCommittedBatches(t *testing.T) {
 	defer db.Close()
 
 	l2Cfg := cfg.L2Config
-	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig)
+	relayer, err := NewLayer2Relayer(context.Background(), db, l2Cfg.RelayerConfig)
 	assert.NoError(t, err)
 	defer relayer.Stop()
 
@@ -193,3 +193,68 @@ func testL2RelayerProcessCommittedBatches(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, orm.RollupFinalizing, status)
 }
+
+func testL2RelayerSkipBatches(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()
+
+	createBatch := func(rollupStatus orm.RollupStatus, provingStatus orm.ProvingStatus) 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)
+		err = dbTx.Commit()
+		assert.NoError(t, err)
+
+		err = db.UpdateRollupStatus(context.Background(), batchID, 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)
+		assert.NoError(t, err)
+		err = db.UpdateProvingStatus(batchID, provingStatus)
+		assert.NoError(t, err)
+
+		return batchID
+	}
+
+	skipped := []string{
+		createBatch(orm.RollupCommitted, orm.ProvingTaskSkipped),
+		createBatch(orm.RollupCommitted, orm.ProvingTaskFailed),
+	}
+
+	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),
+	}
+
+	relayer.ProcessCommittedBatches()
+
+	for _, id := range skipped {
+		status, err := db.GetRollupStatus(id)
+		assert.NoError(t, err)
+		assert.Equal(t, orm.RollupFinalizationSkipped, status)
+	}
+
+	for _, id := range notSkipped {
+		status, err := db.GetRollupStatus(id)
+		assert.NoError(t, err)
+		assert.NotEqual(t, orm.RollupFinalizationSkipped, status)
+	}
+}

bridge/l2/watcher.go

@@ -14,6 +14,8 @@ import (
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/event"
 	"github.com/scroll-tech/go-ethereum/log"
+	"github.com/scroll-tech/go-ethereum/metrics"
+	"github.com/scroll-tech/go-ethereum/rpc"
 
 	bridge_abi "scroll-tech/bridge/abi"
 	"scroll-tech/bridge/utils"
@@ -24,6 +26,11 @@ import (
 	"scroll-tech/bridge/config"
 )
 
+// Metrics
+var (
+	bridgeL2MsgSyncHeightGauge = metrics.NewRegisteredGauge("bridge/l2/msg/sync/height", nil)
+)
+
 type relayedMessage struct {
 	msgHash      common.Hash
 	txHash       common.Hash
@@ -39,7 +46,7 @@ type WatcherClient struct {
 
 	orm database.OrmFactory
 
-	confirmations    uint64
+	confirmations    rpc.BlockNumber
 	messengerAddress common.Address
 	messengerABI     *abi.ABI
 
@@ -53,7 +60,7 @@ type WatcherClient struct {
 }
 
 // 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, bpCfg *config.BatchProposerConfig, messengerAddress common.Address, orm database.OrmFactory) *WatcherClient {
 	savedHeight, err := orm.GetLayer2LatestWatchedHeight()
 	if err != nil {
 		log.Warn("fetch height from db failed", "err", err)
@@ -81,42 +88,70 @@ func (w *WatcherClient) Start() {
 			panic("must run L2 watcher with DB")
 		}
 
-		ticker := time.NewTicker(3 * time.Second)
-		defer ticker.Stop()
+		ctx, cancel := context.WithCancel(w.ctx)
 
-		for ; true; <-ticker.C {
-			select {
-			case <-w.stopCh:
-				return
+		// trace fetcher loop
+		go func(ctx context.Context) {
+			ticker := time.NewTicker(3 * time.Second)
+			defer ticker.Stop()
 
-			default:
-				// get current height
-				number, err := w.BlockNumber(w.ctx)
-				if err != nil {
-					log.Error("failed to get_BlockNumber", "err", err)
-					continue
-				}
+			for {
+				select {
+				case <-ctx.Done():
+					return
 
-				if number >= w.confirmations {
-					number = number - w.confirmations
-				} else {
-					number = 0
-				}
+				case <-ticker.C:
+					number, err := utils.GetLatestConfirmedBlockNumber(ctx, w.Client, w.confirmations)
+					if err != nil {
+						log.Error("failed to get block number", "err", err)
+						continue
+					}
 
-				if err := w.tryFetchRunningMissingBlocks(w.ctx, number); err != nil {
-					log.Error("failed to fetchRunningMissingBlocks", "err", err)
-				}
-
-				// @todo handle error
-				if err := w.fetchContractEvent(number); err != nil {
-					log.Error("failed to fetchContractEvent", "err", err)
-				}
-
-				if err := w.batchProposer.tryProposeBatch(); err != nil {
-					log.Error("failed to tryProposeBatch", "err", err)
+					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:
+					number, err := utils.GetLatestConfirmedBlockNumber(ctx, w.Client, w.confirmations)
+					if err != nil {
+						log.Error("failed to get block number", "err", err)
+						continue
+					}
+
+					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()
 	}()
 }
 
@@ -128,42 +163,54 @@ func (w *WatcherClient) Stop() {
 const blockTracesFetchLimit = uint64(10)
 
 // try fetch missing blocks if inconsistent
-func (w *WatcherClient) tryFetchRunningMissingBlocks(ctx context.Context, backTrackFrom uint64) error {
+func (w *WatcherClient) tryFetchRunningMissingBlocks(ctx context.Context, blockHeight uint64) {
 	// 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()
 	if err != nil {
-		return fmt.Errorf("failed to GetBlockTracesLatestHeight in DB: %v", err)
+		log.Error("failed to GetBlockTracesLatestHeight", "err", err)
+		return
 	}
-	backTrackTo := uint64(0)
+
+	// Can't get trace from genesis block, so the default start number is 1.
+	var from = uint64(1)
 	if heightInDB > 0 {
-		backTrackTo = uint64(heightInDB)
+		from = uint64(heightInDB) + 1
 	}
 
-	for from := backTrackFrom; from > backTrackTo; from -= blockTracesFetchLimit {
-		to := from - blockTracesFetchLimit
+	for ; from <= blockHeight; from += blockTracesFetchLimit {
+		to := from + blockTracesFetchLimit - 1
 
-		if to < backTrackTo {
-			to = backTrackTo
+		if to > blockHeight {
+			to = blockHeight
 		}
 
-		var traces []*types.BlockTrace
-		for number := from; number > to; number-- {
-			log.Debug("retrieving block trace", "height", number)
-			trace, err2 := w.GetBlockTraceByNumber(ctx, big.NewInt(int64(number)))
-			if err2 != nil {
-				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)
-
+		// Get block traces and insert into db.
+		if err = w.getAndStoreBlockTraces(ctx, from, to); err != nil {
+			log.Error("fail to getAndStoreBlockTraces", "from", from, "to", to, "err", err)
+			return
 		}
-		if len(traces) > 0 {
-			if err = w.orm.InsertBlockTraces(traces); err != nil {
-				return fmt.Errorf("failed to batch insert BlockTraces: %v", err)
-			}
+	}
+}
+
+func (w *WatcherClient) getAndStoreBlockTraces(ctx context.Context, from, to uint64) error {
+	var traces []*types.BlockTrace
+
+	for number := from; number <= to; number++ {
+		log.Debug("retrieving block trace", "height", number)
+		trace, err2 := w.GetBlockTraceByNumber(ctx, big.NewInt(int64(number)))
+		if err2 != nil {
+			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 {
+			return fmt.Errorf("failed to batch insert BlockTraces: %v", err)
 		}
 	}
 
@@ -173,7 +220,7 @@ func (w *WatcherClient) tryFetchRunningMissingBlocks(ctx context.Context, backTr
 const contractEventsBlocksFetchLimit = int64(10)
 
 // FetchContractEvent pull latest event logs from given contract address and save in DB
-func (w *WatcherClient) fetchContractEvent(blockHeight uint64) error {
+func (w *WatcherClient) FetchContractEvent(blockHeight uint64) {
 	defer func() {
 		log.Info("l2 watcher fetchContractEvent", "w.processedMsgHeight", w.processedMsgHeight)
 	}()
@@ -198,17 +245,18 @@ func (w *WatcherClient) fetchContractEvent(blockHeight uint64) error {
 			Topics: make([][]common.Hash, 1),
 		}
 		query.Topics[0] = make([]common.Hash, 3)
-		query.Topics[0][0] = common.HexToHash(bridge_abi.SENT_MESSAGE_EVENT_SIGNATURE)
-		query.Topics[0][1] = common.HexToHash(bridge_abi.RELAYED_MESSAGE_EVENT_SIGNATURE)
-		query.Topics[0][2] = common.HexToHash(bridge_abi.FAILED_RELAYED_MESSAGE_EVENT_SIGNATURE)
+		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)
 
 		logs, err := w.FilterLogs(w.ctx, query)
 		if err != nil {
 			log.Error("failed to get event logs", "err", err)
-			return err
+			return
 		}
 		if len(logs) == 0 {
 			w.processedMsgHeight = uint64(to)
+			bridgeL2MsgSyncHeightGauge.Update(to)
 			continue
 		}
 		log.Info("received new L2 messages", "fromBlock", from, "toBlock", to, "cnt", len(logs))
@@ -216,7 +264,7 @@ func (w *WatcherClient) fetchContractEvent(blockHeight uint64) error {
 		sentMessageEvents, relayedMessageEvents, err := w.parseBridgeEventLogs(logs)
 		if err != nil {
 			log.Error("failed to parse emitted event log", "err", err)
-			return err
+			return
 		}
 
 		// Update relayed message first to make sure we don't forget to update submited message.
@@ -231,18 +279,18 @@ func (w *WatcherClient) fetchContractEvent(blockHeight uint64) error {
 			}
 			if err != nil {
 				log.Error("Failed to update layer1 status and layer2 hash", "err", err)
-				return err
+				return
 			}
 		}
 
 		if err = w.orm.SaveL2Messages(w.ctx, sentMessageEvents); err != nil {
-			return err
+			log.Error("failed to save l2 messages", "err", err)
+			return
 		}
 
 		w.processedMsgHeight = uint64(to)
+		bridgeL2MsgSyncHeightGauge.Update(to)
 	}
-
-	return nil
 }
 
 func (w *WatcherClient) parseBridgeEventLogs(logs []types.Log) ([]*orm.L2Message, []relayedMessage, error) {
@@ -253,7 +301,7 @@ func (w *WatcherClient) parseBridgeEventLogs(logs []types.Log) ([]*orm.L2Message
 	var relayedMessages []relayedMessage
 	for _, vLog := range logs {
 		switch vLog.Topics[0] {
-		case common.HexToHash(bridge_abi.SENT_MESSAGE_EVENT_SIGNATURE):
+		case common.HexToHash(bridge_abi.SentMessageEventSignature):
 			event := struct {
 				Target       common.Address
 				Sender       common.Address
@@ -274,7 +322,7 @@ func (w *WatcherClient) parseBridgeEventLogs(logs []types.Log) ([]*orm.L2Message
 			event.Target = common.HexToAddress(vLog.Topics[1].String())
 			l2Messages = append(l2Messages, &orm.L2Message{
 				Nonce:      event.MessageNonce.Uint64(),
-				MsgHash:    utils.ComputeMessageHash(event.Target, event.Sender, event.Value, event.Fee, event.Deadline, event.Message, event.MessageNonce).String(),
+				MsgHash:    utils.ComputeMessageHash(event.Sender, event.Target, event.Value, event.Fee, event.Deadline, event.Message, event.MessageNonce).String(),
 				Height:     vLog.BlockNumber,
 				Sender:     event.Sender.String(),
 				Value:      event.Value.String(),
@@ -285,7 +333,7 @@ func (w *WatcherClient) parseBridgeEventLogs(logs []types.Log) ([]*orm.L2Message
 				Calldata:   common.Bytes2Hex(event.Message),
 				Layer2Hash: vLog.TxHash.Hex(),
 			})
-		case common.HexToHash(bridge_abi.RELAYED_MESSAGE_EVENT_SIGNATURE):
+		case common.HexToHash(bridge_abi.RelayedMessageEventSignature):
 			event := struct {
 				MsgHash common.Hash
 			}{}
@@ -296,7 +344,7 @@ func (w *WatcherClient) parseBridgeEventLogs(logs []types.Log) ([]*orm.L2Message
 				txHash:       vLog.TxHash,
 				isSuccessful: true,
 			})
-		case common.HexToHash(bridge_abi.FAILED_RELAYED_MESSAGE_EVENT_SIGNATURE):
+		case common.HexToHash(bridge_abi.FailedRelayedMessageEventSignature):
 			event := struct {
 				MsgHash common.Hash
 			}{}

bridge/l2/watcher_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/scroll-tech/go-ethereum/common"
 	"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"
@@ -36,7 +37,7 @@ func testCreateNewWatcherAndStop(t *testing.T) {
 	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)
 
@@ -67,7 +68,7 @@ func testMonitorBridgeContract(t *testing.T) {
 	auth := prepareAuth(t, l2Cli, cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys[0])
 
 	// deploy mock bridge
-	_, tx, instance, err := mock_bridge.DeployMockBridge(auth, l2Cli)
+	_, tx, instance, err := mock_bridge.DeployMockBridgeL2(auth, l2Cli)
 	assert.NoError(t, err)
 	address, err := bind.WaitDeployed(context.Background(), l2Cli, tx)
 	assert.NoError(t, err)
@@ -79,7 +80,10 @@ func testMonitorBridgeContract(t *testing.T) {
 	// Call mock_bridge instance sendMessage to trigger emit events
 	toAddress := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
 	message := []byte("testbridgecontract")
-	tx, err = instance.SendMessage(auth, toAddress, message, auth.GasPrice)
+	fee := big.NewInt(0)
+	gasLimit := big.NewInt(1)
+
+	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 {
@@ -89,7 +93,7 @@ func testMonitorBridgeContract(t *testing.T) {
 	// extra block mined
 	toAddress = common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
 	message = []byte("testbridgecontract")
-	tx, err = instance.SendMessage(auth, toAddress, message, auth.GasPrice)
+	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 {
@@ -109,7 +113,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.GetL2MessagesByStatus(orm.MsgPending)
+	msgs, err := db.GetL2Messages(map[string]interface{}{"status": orm.MsgPending})
 	assert.NoError(t, err)
 	assert.Equal(t, 2, len(msgs))
 }
@@ -126,7 +130,7 @@ func testFetchMultipleSentMessageInOneBlock(t *testing.T) {
 
 	auth := prepareAuth(t, l2Cli, cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys[0])
 
-	_, trx, instance, err := mock_bridge.DeployMockBridge(auth, l2Cli)
+	_, trx, instance, err := mock_bridge.DeployMockBridgeL2(auth, l2Cli)
 	assert.NoError(t, err)
 	address, err := bind.WaitDeployed(context.Background(), l2Cli, trx)
 	assert.NoError(t, err)
@@ -146,7 +150,9 @@ func testFetchMultipleSentMessageInOneBlock(t *testing.T) {
 		auth.Nonce = big.NewInt(int64(nonce))
 		toAddress := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
 		message := []byte("testbridgecontract")
-		tx, err = instance.SendMessage(auth, toAddress, message, auth.GasPrice)
+		fee := big.NewInt(0)
+		gasLimit := big.NewInt(1)
+		tx, err = instance.SendMessage(auth, toAddress, fee, message, gasLimit)
 		assert.NoError(t, err)
 	}
 
@@ -162,7 +168,9 @@ func testFetchMultipleSentMessageInOneBlock(t *testing.T) {
 	auth.Nonce = big.NewInt(int64(nonce))
 	toAddress := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
 	message := []byte("testbridgecontract")
-	tx, err = instance.SendMessage(auth, toAddress, message, auth.GasPrice)
+	fee := big.NewInt(0)
+	gasLimit := big.NewInt(1)
+	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 {
@@ -177,13 +185,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.GetL2MessagesByStatus(orm.MsgPending)
+	msgs, err := db.GetL2Messages(map[string]interface{}{"status": orm.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)
+	confirmations := rpc.LatestBlockNumber
+	return NewL2WatcherClient(context.Background(), l2Cli, confirmations, bpCfg, contractAddr, db)
 }
 
 func prepareAuth(t *testing.T, l2Cli *ethclient.Client, privateKey *ecdsa.PrivateKey) *bind.TransactOpts {

bridge/mock_bridge/MockBridgeL1.sol

@@ -0,0 +1,187 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.0;
+
+contract MockBridgeL1 {
+  /*********************************
+   * Events from L1ScrollMessenger *
+   *********************************/
+
+  event SentMessage(
+    address indexed target,
+    address sender,
+    uint256 value,
+    uint256 fee,
+    uint256 deadline,
+    bytes message,
+    uint256 messageNonce,
+    uint256 gasLimit
+  );
+
+  event MessageDropped(bytes32 indexed msgHash);
+
+  event RelayedMessage(bytes32 indexed msgHash);
+
+  event FailedRelayedMessage(bytes32 indexed msgHash);
+
+  /************************
+   * Events from ZKRollup *
+   ************************/
+
+  /// @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);
+
+  /// @notice Emitted when a batch is reverted.
+  /// @param _batchId The identification of the batch.
+  event RevertBatch(bytes32 indexed _batchId);
+
+  /// @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);
+
+  /***********
+   * 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 {
+    bytes32 blockHash;
+    bytes32 parentHash;
+    uint256 baseFee;
+    bytes32 stateRoot;
+    uint64 blockHeight;
+    uint64 gasUsed;
+    uint64 timestamp;
+    bytes extraData;
+    Layer2Transaction[] txs;
+  }
+
+  /// @dev The batch struct, the batch hash is always the last block hash of `blocks`.
+  struct Layer2Batch {
+    uint64 batchIndex;
+    // The hash of the last block in the parent batch
+    bytes32 parentHash;
+    Layer2BlockHeader[] blocks;
+  }
+
+  struct Layer2BatchStored {
+    bytes32 batchHash;
+    bytes32 parentHash;
+    uint64 batchIndex;
+    bool verified;
+  }
+
+  /*************
+   * Variables *
+   *************/
+
+  /// @notice Message nonce, used to avoid relay attack.
+  uint256 public messageNonce;
+
+  /// @notice Mapping from batch id to batch struct.
+  mapping(bytes32 => Layer2BatchStored) public batches;
+
+  /************************************
+   * Functions from L1ScrollMessenger *
+   ************************************/
+
+  function sendMessage(
+    address _to,
+    uint256 _fee,
+    bytes memory _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;
+    }
+    uint256 _nonce = messageNonce;
+    emit SentMessage(_to, msg.sender, _value, _fee, _deadline, _message, _nonce, _gasLimit);
+    messageNonce += 1;
+  }
+
+  function relayMessageWithProof(
+    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);
+  }
+
+  /***************************
+   * Functions from ZKRollup *
+   ***************************/
+
+  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 revertBatch(bytes32 _batchId) external {
+    emit RevertBatch(_batchId);
+  }
+
+  function finalizeBatchWithProof(
+    bytes32 _batchId,
+    uint256[] memory,
+    uint256[] memory
+  ) external {
+    Layer2BatchStored storage _batch = batches[_batchId];
+    uint256 _batchIndex = _batch.batchIndex;
+
+    emit FinalizeBatch(_batchId, _batch.batchHash, _batchIndex, _batch.parentHash);
+  }
+
+  /// @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));
+  }
+}

bridge/mock_bridge/MockBridgeL2.sol

@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.0;
+
+contract MockBridgeL2 {
+  /*********************************
+   * Events from L2ScrollMessenger *
+   *********************************/
+
+  event SentMessage(
+    address indexed target,
+    address sender,
+    uint256 value,
+    uint256 fee,
+    uint256 deadline,
+    bytes message,
+    uint256 messageNonce,
+    uint256 gasLimit
+  );
+
+  event MessageDropped(bytes32 indexed msgHash);
+  
+  event RelayedMessage(bytes32 indexed msgHash);
+  
+  event FailedRelayedMessage(bytes32 indexed msgHash);
+
+  /*************
+   * Variables *
+   *************/
+
+  /// @notice Message nonce, used to avoid relay attack.
+  uint256 public messageNonce;
+
+  /************************************
+   * Functions from L2ScrollMessenger *
+   ************************************/
+
+  function sendMessage(
+    address _to,
+    uint256 _fee,
+    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;
+  }
+
+  function relayMessageWithProof(
+    address _from,
+    address _to,
+    uint256 _value,
+    uint256 _fee,
+    uint256 _deadline,
+    uint256 _nonce,
+    bytes memory _message
+  ) external {
+    bytes32 _msghash = keccak256(abi.encodePacked(_from, _to, _value, _fee, _deadline, _nonce, _message));
+    emit RelayedMessage(_msghash);
+  }
+}

bridge/mock_bridge/Mock_Bridge.sol

@@ -1,42 +0,0 @@
-//SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.0;
-
-contract Mock_Bridge {
-
-  event SentMessage(
-    address indexed target,
-    address sender,
-    uint256 value,
-    uint256 fee,
-    uint256 deadline,
-    bytes message,
-    uint256 messageNonce,
-    uint256 gasLimit
-  );
-
-    /// @notice Message nonce, used to avoid relay attack.
-  uint256 public messageNonce;
-
- function sendMessage(
-    address _to,
-    bytes memory _message,
-    uint256 _gasLimit
-  ) external payable {
-    // solhint-disable-next-line not-rely-on-time
-    uint256 _deadline = block.timestamp + 1 days;
-    // @todo compute fee
-    uint256 _fee = 0;
-    uint256 _nonce = messageNonce;
-    require(msg.value >= _fee, "cannot pay fee");
-    uint256 _value;
-    unchecked {
-      _value = msg.value - _fee;
-    }
-
-    emit SentMessage(_to, msg.sender, _value, _fee, _deadline, _message, _nonce, _gasLimit);
-
-    unchecked {
-      messageNonce = _nonce + 1;
-    }
-  }
-}

bridge/sender/sender.go

@@ -20,6 +20,8 @@ import (
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
 
+	"scroll-tech/bridge/utils"
+
 	"scroll-tech/bridge/config"
 )
 
@@ -120,6 +122,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 +139,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{}),
 	}
@@ -352,11 +363,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 +386,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{
@@ -440,7 +460,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,7 @@ 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/rpc"
 	"github.com/stretchr/testify/assert"
 
 	"scroll-tech/common/docker"
@@ -22,7 +23,7 @@ import (
 	"scroll-tech/bridge/sender"
 )
 
-const TX_BATCH = 50
+const TXBatch = 50
 
 var (
 	privateKeys []*ecdsa.PrivateKey
@@ -68,7 +69,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)
@@ -84,7 +85,7 @@ func testBatchSender(t *testing.T, batchSize int) {
 	for idx := 0; idx < newSender.NumberOfAccounts(); idx++ {
 		index := idx
 		eg.Go(func() error {
-			for i := 0; i < TX_BATCH; i++ {
+			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)
@@ -103,7 +104,7 @@ func testBatchSender(t *testing.T, batchSize int) {
 	if err := eg.Wait(); err != nil {
 		t.Error(err)
 	}
-	t.Logf("successful send batch txs, batch size: %d, total count: %d", newSender.NumberOfAccounts(), TX_BATCH*newSender.NumberOfAccounts())
+	t.Logf("successful send batch txs, batch size: %d, total count: %d", newSender.NumberOfAccounts(), TXBatch*newSender.NumberOfAccounts())
 
 	// avoid 10 mins cause testcase panic
 	after := time.After(80 * time.Second)

bridge/tests/bridge_test.go

@@ -0,0 +1,206 @@
+package tests
+
+import (
+	"context"
+	"crypto/ecdsa"
+	"math/big"
+	"testing"
+
+	"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 (
+	// config
+	cfg *config.Config
+
+	// private key
+	privateKey *ecdsa.PrivateKey
+
+	// docker consider handler.
+	l1gethImg docker.ImgInstance
+	l2gethImg docker.ImgInstance
+	dbImg     docker.ImgInstance
+
+	// clients
+	l1Client *ethclient.Client
+	l2Client *ethclient.Client
+
+	// auth
+	l1Auth *bind.TransactOpts
+	l2Auth *bind.TransactOpts
+
+	// l1 messenger contract
+	l1MessengerInstance *mock_bridge.MockBridgeL1
+	l1MessengerAddress  common.Address
+
+	// l1 rollup contract
+	l1RollupInstance *mock_bridge.MockBridgeL1
+	l1RollupAddress  common.Address
+
+	// l2 messenger contract
+	l2MessengerInstance *mock_bridge.MockBridgeL2
+	l2MessengerAddress  common.Address
+)
+
+func setupEnv(t *testing.T) {
+	var err error
+	privateKey, err = crypto.ToECDSA(common.FromHex("1212121212121212121212121212121212121212121212121212121212121212"))
+	assert.NoError(t, err)
+	messagePrivateKey, err := crypto.ToECDSA(common.FromHex("1212121212121212121212121212121212121212121212121212121212121213"))
+	assert.NoError(t, err)
+	rollupPrivateKey, err := crypto.ToECDSA(common.FromHex("1212121212121212121212121212121212121212121212121212121212121214"))
+	assert.NoError(t, err)
+
+	// Load config.
+	cfg, err = config.NewConfig("../config.json")
+	assert.NoError(t, err)
+	cfg.L1Config.Confirmations = rpc.LatestBlockNumber
+	cfg.L1Config.RelayerConfig.MessageSenderPrivateKeys = []*ecdsa.PrivateKey{messagePrivateKey}
+	cfg.L1Config.RelayerConfig.RollupSenderPrivateKeys = []*ecdsa.PrivateKey{rollupPrivateKey}
+	cfg.L2Config.Confirmations = rpc.LatestBlockNumber
+	cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys = []*ecdsa.PrivateKey{messagePrivateKey}
+	cfg.L2Config.RelayerConfig.RollupSenderPrivateKeys = []*ecdsa.PrivateKey{rollupPrivateKey}
+
+	// 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()
+
+	// Create l1geth and l2geth client.
+	l1Client, err = ethclient.Dial(cfg.L1Config.Endpoint)
+	assert.NoError(t, err)
+	l2Client, err = ethclient.Dial(cfg.L2Config.Endpoint)
+	assert.NoError(t, err)
+
+	// Create l1 and l2 auth
+	l1Auth = prepareAuth(t, l1Client, privateKey)
+	l2Auth = prepareAuth(t, l2Client, privateKey)
+
+	// send some balance to message and rollup sender
+	transferEther(t, l1Auth, l1Client, messagePrivateKey)
+	transferEther(t, l1Auth, l1Client, rollupPrivateKey)
+	transferEther(t, l2Auth, l2Client, messagePrivateKey)
+	transferEther(t, l2Auth, l2Client, rollupPrivateKey)
+}
+
+func transferEther(t *testing.T, auth *bind.TransactOpts, client *ethclient.Client, privateKey *ecdsa.PrivateKey) {
+	targetAddress := crypto.PubkeyToAddress(privateKey.PublicKey)
+
+	gasPrice, err := client.SuggestGasPrice(context.Background())
+	assert.NoError(t, err)
+	gasPrice.Mul(gasPrice, big.NewInt(2))
+
+	// Get pending nonce
+	nonce, err := client.PendingNonceAt(context.Background(), auth.From)
+	assert.NoError(t, err)
+
+	// 200 ether should be enough
+	value, ok := big.NewInt(0).SetString("0xad78ebc5ac6200000", 0)
+	assert.Equal(t, ok, true)
+
+	tx := types.NewTx(&types.LegacyTx{
+		Nonce:    nonce,
+		To:       &targetAddress,
+		Value:    value,
+		Gas:      500000,
+		GasPrice: gasPrice,
+	})
+	signedTx, err := auth.Signer(auth.From, tx)
+	assert.NoError(t, err)
+
+	err = client.SendTransaction(context.Background(), signedTx)
+	assert.NoError(t, err)
+
+	receipt, err := bind.WaitMined(context.Background(), client, signedTx)
+	assert.NoError(t, err)
+	if receipt.Status != types.ReceiptStatusSuccessful {
+		t.Fatalf("Call failed")
+	}
+}
+
+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
+
+	// L1 messenger contract
+	_, tx, l1MessengerInstance, err = mock_bridge.DeployMockBridgeL1(l1Auth, l1Client)
+	assert.NoError(t, err)
+	l1MessengerAddress, err = bind.WaitDeployed(context.Background(), l1Client, tx)
+	assert.NoError(t, err)
+
+	// L1 rollup contract
+	_, tx, l1RollupInstance, err = mock_bridge.DeployMockBridgeL1(l1Auth, l1Client)
+	assert.NoError(t, err)
+	l1RollupAddress, err = bind.WaitDeployed(context.Background(), l1Client, tx)
+	assert.NoError(t, err)
+
+	// L2 messenger contract
+	_, tx, l2MessengerInstance, err = mock_bridge.DeployMockBridgeL2(l2Auth, l2Client)
+	assert.NoError(t, err)
+	l2MessengerAddress, err = bind.WaitDeployed(context.Background(), l2Client, tx)
+	assert.NoError(t, err)
+
+	cfg.L1Config.L1MessengerAddress = l1MessengerAddress
+	cfg.L1Config.RollupContractAddress = l1RollupAddress
+	cfg.L1Config.RelayerConfig.MessengerContractAddress = l2MessengerAddress
+
+	cfg.L2Config.L2MessengerAddress = l2MessengerAddress
+	cfg.L2Config.RelayerConfig.MessengerContractAddress = l1MessengerAddress
+	cfg.L2Config.RelayerConfig.RollupContractAddress = l1RollupAddress
+}
+
+func prepareAuth(t *testing.T, client *ethclient.Client, privateKey *ecdsa.PrivateKey) *bind.TransactOpts {
+	chainID, err := client.ChainID(context.Background())
+	assert.NoError(t, err)
+	auth, err := bind.NewKeyedTransactorWithChainID(privateKey, chainID)
+	assert.NoError(t, err)
+	auth.Value = big.NewInt(0) // in wei
+	assert.NoError(t, err)
+	return auth
+}
+
+func TestFunction(t *testing.T) {
+	setupEnv(t)
+
+	// l1 rollup and watch rollup events
+	t.Run("TestCommitBatchAndFinalizeBatch", testCommitBatchAndFinalizeBatch)
+
+	// l2 message
+	t.Run("testRelayL2MessageSucceed", testRelayL2MessageSucceed)
+
+	t.Cleanup(func() {
+		free(t)
+	})
+}

bridge/tests/l2_message_relay_test.go

@@ -0,0 +1,174 @@
+package tests
+
+import (
+	"context"
+	"math/big"
+	"testing"
+
+	"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/rpc"
+	"github.com/stretchr/testify/assert"
+
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
+	"scroll-tech/database/orm"
+
+	"scroll-tech/bridge/l1"
+	"scroll-tech/bridge/l2"
+)
+
+func testRelayL2MessageSucceed(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)
+
+	// Create L2Relayer
+	l2Cfg := cfg.L2Config
+	l2Relayer, err := l2.NewLayer2Relayer(context.Background(), db, l2Cfg.RelayerConfig)
+	assert.NoError(t, err)
+	defer l2Relayer.Stop()
+
+	// Create L2Watcher
+	confirmations := rpc.LatestBlockNumber
+	l2Watcher := l2.NewL2WatcherClient(context.Background(), l2Client, confirmations, l2Cfg.BatchProposerConfig, l2Cfg.L2MessengerAddress, db)
+
+	// Create L1Watcher
+	l1Cfg := cfg.L1Config
+	l1Watcher := l1.NewWatcher(context.Background(), l1Client, 0, confirmations, l1Cfg.L1MessengerAddress, l1Cfg.RollupContractAddress, db)
+
+	// send message through l2 messenger contract
+	nonce, err := l2MessengerInstance.MessageNonce(&bind.CallOpts{})
+	assert.NoError(t, err)
+	sendTx, err := l2MessengerInstance.SendMessage(l2Auth, l1Auth.From, big.NewInt(0), common.Hex2Bytes("00112233"), big.NewInt(0))
+	assert.NoError(t, err)
+	sendReceipt, err := bind.WaitMined(context.Background(), l2Client, sendTx)
+	assert.NoError(t, err)
+	if sendReceipt.Status != types.ReceiptStatusSuccessful || err != nil {
+		t.Fatalf("Call failed")
+	}
+
+	// l2 watch process events
+	l2Watcher.FetchContractEvent(sendReceipt.BlockNumber.Uint64())
+
+	// check db status
+	msg, err := db.GetL2MessageByNonce(nonce.Uint64())
+	assert.NoError(t, err)
+	assert.Equal(t, msg.Status, orm.MsgPending)
+	assert.Equal(t, msg.Sender, l2Auth.From.String())
+	assert.Equal(t, msg.Target, l1Auth.From.String())
+
+	// add fake blocks
+	traces := []*types.BlockTrace{
+		{
+			Header: &types.Header{
+				Number:     sendReceipt.BlockNumber,
+				ParentHash: common.Hash{},
+				Difficulty: big.NewInt(0),
+				BaseFee:    big.NewInt(0),
+			},
+			StorageTrace: &types.StorageTrace{},
+		},
+	}
+	err = db.InsertBlockTraces(traces)
+	assert.NoError(t, err)
+
+	// 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, err)
+
+	// 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)
+	assert.NoError(t, err)
+	err = db.UpdateProvingStatus(batchID, orm.ProvingTaskVerified)
+	assert.NoError(t, err)
+
+	// process pending batch and check status
+	l2Relayer.ProcessPendingBatches()
+	status, err := db.GetRollupStatus(batchID)
+	assert.NoError(t, err)
+	assert.Equal(t, orm.RollupCommitting, status)
+	commitTxHash, err := db.GetCommitTxHash(batchID)
+	assert.NoError(t, err)
+	assert.Equal(t, true, commitTxHash.Valid)
+	commitTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(commitTxHash.String))
+	assert.NoError(t, err)
+	commitTxReceipt, err := bind.WaitMined(context.Background(), l1Client, commitTx)
+	assert.NoError(t, err)
+	assert.Equal(t, len(commitTxReceipt.Logs), 1)
+
+	// fetch CommitBatch rollup events
+	err = l1Watcher.FetchContractEvent(commitTxReceipt.BlockNumber.Uint64())
+	assert.NoError(t, err)
+	status, err = db.GetRollupStatus(batchID)
+	assert.NoError(t, err)
+	assert.Equal(t, orm.RollupCommitted, status)
+
+	// process committed batch and check status
+	l2Relayer.ProcessCommittedBatches()
+	status, err = db.GetRollupStatus(batchID)
+	assert.NoError(t, err)
+	assert.Equal(t, orm.RollupFinalizing, status)
+	finalizeTxHash, err := db.GetFinalizeTxHash(batchID)
+	assert.NoError(t, err)
+	assert.Equal(t, true, finalizeTxHash.Valid)
+	finalizeTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(finalizeTxHash.String))
+	assert.NoError(t, err)
+	finalizeTxReceipt, err := bind.WaitMined(context.Background(), l1Client, finalizeTx)
+	assert.NoError(t, err)
+	assert.Equal(t, len(finalizeTxReceipt.Logs), 1)
+
+	// fetch FinalizeBatch events
+	err = l1Watcher.FetchContractEvent(finalizeTxReceipt.BlockNumber.Uint64())
+	assert.NoError(t, err)
+	status, err = db.GetRollupStatus(batchID)
+	assert.NoError(t, err)
+	assert.Equal(t, orm.RollupFinalized, status)
+
+	// process l2 messages
+	l2Relayer.ProcessSavedEvents()
+	msg, err = db.GetL2MessageByNonce(nonce.Uint64())
+	assert.NoError(t, err)
+	assert.Equal(t, msg.Status, orm.MsgSubmitted)
+	relayTxHash, err := db.GetRelayL2MessageTxHash(nonce.Uint64())
+	assert.NoError(t, err)
+	assert.Equal(t, true, relayTxHash.Valid)
+	relayTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(relayTxHash.String))
+	assert.NoError(t, err)
+	relayTxReceipt, err := bind.WaitMined(context.Background(), l1Client, relayTx)
+	assert.NoError(t, err)
+	assert.Equal(t, len(relayTxReceipt.Logs), 1)
+
+	// fetch message relayed events
+	err = l1Watcher.FetchContractEvent(relayTxReceipt.BlockNumber.Uint64())
+	assert.NoError(t, err)
+	msg, err = db.GetL2MessageByNonce(nonce.Uint64())
+	assert.NoError(t, err)
+	assert.Equal(t, msg.Status, orm.MsgConfirmed)
+}

bridge/tests/rollup_test.go

@@ -0,0 +1,132 @@
+package tests
+
+import (
+	"context"
+	"math/big"
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
+	"scroll-tech/database/orm"
+	"testing"
+
+	"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"
+)
+
+func testCommitBatchAndFinalizeBatch(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)
+
+	// Create L2Relayer
+	l2Cfg := cfg.L2Config
+	l2Relayer, err := l2.NewLayer2Relayer(context.Background(), db, l2Cfg.RelayerConfig)
+	assert.NoError(t, err)
+	defer l2Relayer.Stop()
+
+	// Create L1Watcher
+	l1Cfg := cfg.L1Config
+	l1Watcher := l1.NewWatcher(context.Background(), l1Client, 0, l1Cfg.Confirmations, l1Cfg.L1MessengerAddress, l1Cfg.RollupContractAddress, db)
+
+	// add some blocks to db
+	var traces []*types.BlockTrace
+	var parentHash common.Hash
+	for i := 1; i <= 10; i++ {
+		header := types.Header{
+			Number:     big.NewInt(int64(i)),
+			ParentHash: parentHash,
+			Difficulty: big.NewInt(0),
+			BaseFee:    big.NewInt(0),
+		}
+		traces = append(traces, &types.BlockTrace{
+			Header:       &header,
+			StorageTrace: &types.StorageTrace{},
+		})
+		parentHash = header.Hash()
+	}
+	err = db.InsertBlockTraces(traces)
+	assert.NoError(t, err)
+
+	// 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, err)
+
+	// process pending batch and check status
+	l2Relayer.ProcessPendingBatches()
+
+	status, err := db.GetRollupStatus(batchID)
+	assert.NoError(t, err)
+	assert.Equal(t, orm.RollupCommitting, status)
+	commitTxHash, err := db.GetCommitTxHash(batchID)
+	assert.NoError(t, err)
+	assert.Equal(t, true, commitTxHash.Valid)
+	commitTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(commitTxHash.String))
+	assert.NoError(t, err)
+	commitTxReceipt, err := bind.WaitMined(context.Background(), l1Client, commitTx)
+	assert.NoError(t, err)
+	assert.Equal(t, len(commitTxReceipt.Logs), 1)
+
+	// fetch rollup events
+	err = l1Watcher.FetchContractEvent(commitTxReceipt.BlockNumber.Uint64())
+	assert.NoError(t, err)
+	status, err = db.GetRollupStatus(batchID)
+	assert.NoError(t, err)
+	assert.Equal(t, orm.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)
+	assert.NoError(t, err)
+	err = db.UpdateProvingStatus(batchID, orm.ProvingTaskVerified)
+	assert.NoError(t, err)
+
+	// process committed batch and check status
+	l2Relayer.ProcessCommittedBatches()
+
+	status, err = db.GetRollupStatus(batchID)
+	assert.NoError(t, err)
+	assert.Equal(t, orm.RollupFinalizing, status)
+	finalizeTxHash, err := db.GetFinalizeTxHash(batchID)
+	assert.NoError(t, err)
+	assert.Equal(t, true, finalizeTxHash.Valid)
+	finalizeTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(finalizeTxHash.String))
+	assert.NoError(t, err)
+	finalizeTxReceipt, err := bind.WaitMined(context.Background(), l1Client, finalizeTx)
+	assert.NoError(t, err)
+	assert.Equal(t, len(finalizeTxReceipt.Logs), 1)
+
+	// fetch rollup events
+	err = l1Watcher.FetchContractEvent(finalizeTxReceipt.BlockNumber.Uint64())
+	assert.NoError(t, err)
+	status, err = db.GetRollupStatus(batchID)
+	assert.NoError(t, err)
+	assert.Equal(t, orm.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

@@ -20,8 +20,8 @@ func encodePacked(input ...[]byte) []byte {
 
 // ComputeMessageHash compute the message hash
 func ComputeMessageHash(
-	target common.Address,
 	sender common.Address,
+	target common.Address,
 	value *big.Int,
 	fee *big.Int,
 	deadline *big.Int,
@@ -29,8 +29,8 @@ func ComputeMessageHash(
 	messageNonce *big.Int,
 ) common.Hash {
 	packed := encodePacked(
-		target.Bytes(),
 		sender.Bytes(),
+		target.Bytes(),
 		math.U256Bytes(value),
 		math.U256Bytes(fee),
 		math.U256Bytes(deadline),

bridge/utils/utils_test.go

@@ -7,6 +7,7 @@ import (
 	"scroll-tech/bridge/utils"
 
 	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestKeccak2(t *testing.T) {
@@ -28,15 +29,13 @@ func TestKeccak2(t *testing.T) {
 
 func TestComputeMessageHash(t *testing.T) {
 	hash := utils.ComputeMessageHash(
-		common.HexToAddress("0xdafea492d9c6733ae3d56b7ed1adb60692c98bc5"),
-		common.HexToAddress("0xeafea492d9c6733ae3d56b7ed1adb60692c98bf7"),
-		big.NewInt(1),
-		big.NewInt(2),
-		big.NewInt(1234567),
-		common.Hex2Bytes("0011223344"),
-		big.NewInt(3),
+		common.HexToAddress("0xd7227113b92e537aeda220d5a2f201b836e5879d"),
+		common.HexToAddress("0x47c02b023b6787ef4e503df42bbb1a94f451a1c0"),
+		big.NewInt(5000000000000000),
+		big.NewInt(0),
+		big.NewInt(1674204924),
+		common.Hex2Bytes("8eaac8a30000000000000000000000007138b17fc82d7e954b3bd2f98d8166d03e5e569b0000000000000000000000007138b17fc82d7e954b3bd2f98d8166d03e5e569b0000000000000000000000000000000000000000000000000011c37937e0800000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000"),
+		big.NewInt(30706),
 	)
-	if hash != common.HexToHash("0x58c9a5abfd2a558bb6a6fd5192b36fe9325d98763bafd3a51a1ea28a5d0b990b") {
-		t.Fatalf("Invalid ComputeMessageHash, want %s, got %s", "0x58c9a5abfd2a558bb6a6fd5192b36fe9325d98763bafd3a51a1ea28a5d0b990b", hash.Hex())
-	}
+	assert.Equal(t, hash.String(), "0x920e59f62ca89a0f481d44961c55d299dd20c575693692d61fdf3ca579d8edf3")
 }

build/.golangci.yml

@@ -179,6 +179,13 @@ linters:
     - depguard
     - gocyclo
     - unparam
+    - exportloopref
+    - sqlclosecheck
+    - rowserrcheck
+    - durationcheck
+    - bidichk
+    - typecheck
+    - unused
   enable-all: false
   disable:
 
@@ -200,16 +207,7 @@ issues:
     # Exclude some linters from running on tests files.
     - path: _test\.go
       linters:
-        - gocyclo
         - errcheck
-        - dupl
-        - gosec
-
-    # Exclude known linters from partially hard-vendored code,
-    # which is impossible to exclude via "nolint" comments.
-    - path: internal/hmac/
-      text: "weak cryptographic primitive"
-      linters:
         - gosec
 
     # Exclude some staticcheck messages
@@ -217,18 +215,6 @@ issues:
         - staticcheck
       text: "SA9003:"
 
-    - linters:
-        - golint
-      text: "package comment should be of the form"
-
-    - linters:
-        - golint
-      text: "don't use ALL_CAPS in Go names;"
-
-    - linters:
-        - golint
-      text: "don't use underscores in Go names;"
-
     # Exclude lll issues for long lines with go:generate
     - linters:
         - lll

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

@@ -0,0 +1,63 @@
+imagePrefix = 'scrolltech'
+credentialDocker = 'dockerhub'
+
+pipeline {
+    agent any
+    options {
+        timeout (20)
+    }
+    tools {
+        go 'go-1.18'
+        nodejs "nodejs"
+    }
+    environment {
+        GO111MODULE = 'on'
+        PATH="/home/ubuntu/.cargo/bin:$PATH"
+        // LOG_DOCKER = 'true'
+    }
+    stages {
+        stage('Tag') {
+            steps {
+                script {
+                    TAGNAME = sh(returnStdout: true, script: 'git tag -l --points-at HEAD')
+                    sh "echo ${TAGNAME}"
+                    // ... 
+                }
+            }
+        }
+        stage('Build') {
+            environment {
+                // Extract the username and password of our credentials into "DOCKER_CREDENTIALS_USR" and "DOCKER_CREDENTIALS_PSW".
+                // (NOTE 1: DOCKER_CREDENTIALS will be set to "your_username:your_password".)
+                // The new variables will always be YOUR_VARIABLE_NAME + _USR and _PSW.
+                // (NOTE 2: You can't print credentials in the pipeline for security reasons.)
+                DOCKER_CREDENTIALS = credentials('dockerhub')
+            }
+           steps {
+               withCredentials([usernamePassword(credentialsId: "${credentialDocker}", passwordVariable: 'dockerPassword', usernameVariable: 'dockerUser')]) {
+                    // Use a scripted pipeline.
+                    script {
+                            stage('Push image') {
+                                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}"
+                            }                              
+                    }
+               }
+            }
+        }
+    }
+    post {
+        always {
+            cleanWs() 
+            slackSend(message: "${JOB_BASE_NAME} ${GIT_COMMIT} #${TAGNAME} Tag build ${currentBuild.result}")
+        }
+    }
+}

common/cmd/cmd.go

@@ -1,17 +1,13 @@
 package cmd
 
 import (
-	"fmt"
 	"os"
 	"os/exec"
 	"strings"
 	"sync"
 	"testing"
-	"time"
 
-	"github.com/docker/docker/pkg/reexec"
 	cmap "github.com/orcaman/concurrent-map"
-	"github.com/stretchr/testify/assert"
 )
 
 var verbose bool
@@ -51,48 +47,6 @@ func NewCmd(t *testing.T, name string, args ...string) *Cmd {
 	}
 }
 
-// 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(parallel bool) {
-	t.Log("cmd: ", append([]string{t.name}, t.args...))
-	cmd := &exec.Cmd{
-		Path:   reexec.Self(),
-		Args:   append([]string{t.name}, t.args...),
-		Stderr: t,
-		Stdout: t,
-	}
-	if parallel {
-		go func() {
-			_ = cmd.Run()
-		}()
-	} else {
-		_ = cmd.Run()
-	}
-	t.mu.Lock()
-	t.cmd = cmd
-	t.mu.Unlock()
-}
-
-// WaitExit wait util process exit.
-func (t *Cmd) WaitExit() {
-	// Wait all the check funcs are finished or test status is failed.
-	for !(t.Failed() || t.checkFuncs.IsEmpty()) {
-		<-time.After(time.Millisecond * 500)
-	}
-
-	// Send interrupt signal.
-	t.mu.Lock()
-	_ = t.cmd.Process.Signal(os.Interrupt)
-	t.mu.Unlock()
-}
-
-// Interrupt send interrupt signal.
-func (t *Cmd) Interrupt() {
-	t.mu.Lock()
-	t.Err = t.cmd.Process.Signal(os.Interrupt)
-	t.mu.Unlock()
-}
-
 // RegistFunc register check func
 func (t *Cmd) RegistFunc(key string, check checkFunc) {
 	t.checkFuncs.Set(key, check)
@@ -103,39 +57,6 @@ func (t *Cmd) UnRegistFunc(key string) {
 	t.checkFuncs.Pop(key)
 }
 
-// ExpectWithTimeout wait result during timeout time.
-func (t *Cmd) ExpectWithTimeout(parallel bool, timeout time.Duration, keyword string) {
-	if keyword == "" {
-		return
-	}
-	okCh := make(chan struct{}, 1)
-	t.RegistFunc(keyword, func(buf string) {
-		if strings.Contains(buf, keyword) {
-			select {
-			case okCh <- struct{}{}:
-			default:
-				return
-			}
-		}
-	})
-
-	waitResult := func() {
-		defer t.UnRegistFunc(keyword)
-		select {
-		case <-okCh:
-			return
-		case <-time.After(timeout):
-			assert.Fail(t, fmt.Sprintf("didn't get the desired result before timeout, keyword: %s", keyword))
-		}
-	}
-
-	if parallel {
-		go waitResult()
-	} else {
-		waitResult()
-	}
-}
-
 func (t *Cmd) runCmd() {
 	cmd := exec.Command(t.args[0], t.args[1:]...) //nolint:gosec
 	cmd.Stdout = t

common/cmd/cmd_app.go

@@ -0,0 +1,114 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"strings"
+	"time"
+
+	"github.com/docker/docker/pkg/reexec"
+	"github.com/stretchr/testify/assert"
+)
+
+// 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...))
+	cmd := &exec.Cmd{
+		Path:   reexec.Self(),
+		Args:   append([]string{t.name}, t.args...),
+		Stderr: t,
+		Stdout: t,
+	}
+	if waitResult != nil {
+		go func() {
+			_ = cmd.Run()
+		}()
+		waitResult()
+	} else {
+		_ = cmd.Run()
+	}
+
+	t.mu.Lock()
+	t.cmd = cmd
+	t.mu.Unlock()
+}
+
+// WaitExit wait util process exit.
+func (t *Cmd) WaitExit() {
+	// Wait all the check funcs are finished or test status is failed.
+	for !(t.Failed() || t.checkFuncs.IsEmpty()) {
+		<-time.After(time.Millisecond * 500)
+	}
+
+	// Send interrupt signal.
+	t.mu.Lock()
+	_ = t.cmd.Process.Signal(os.Interrupt)
+	t.mu.Unlock()
+}
+
+// Interrupt send interrupt signal.
+func (t *Cmd) Interrupt() {
+	t.mu.Lock()
+	t.Err = t.cmd.Process.Signal(os.Interrupt)
+	t.mu.Unlock()
+}
+
+// WaitResult return true when get the keyword during timeout.
+func (t *Cmd) WaitResult(timeout time.Duration, keyword string) bool {
+	if keyword == "" {
+		return false
+	}
+	okCh := make(chan struct{}, 1)
+	t.RegistFunc(keyword, func(buf string) {
+		if strings.Contains(buf, keyword) {
+			select {
+			case okCh <- struct{}{}:
+			default:
+				return
+			}
+		}
+	})
+	defer t.UnRegistFunc(keyword)
+	select {
+	case <-okCh:
+		return true
+	case <-time.After(timeout):
+		assert.Fail(t, fmt.Sprintf("didn't get the desired result before timeout, keyword: %s", keyword))
+	}
+	return false
+}
+
+// ExpectWithTimeout wait result during timeout time.
+func (t *Cmd) ExpectWithTimeout(parallel bool, timeout time.Duration, keyword string) {
+	if keyword == "" {
+		return
+	}
+	okCh := make(chan struct{}, 1)
+	t.RegistFunc(keyword, func(buf string) {
+		if strings.Contains(buf, keyword) {
+			select {
+			case okCh <- struct{}{}:
+			default:
+				return
+			}
+		}
+	})
+
+	waitResult := func() {
+		defer t.UnRegistFunc(keyword)
+		select {
+		case <-okCh:
+			return
+		case <-time.After(timeout):
+			assert.Fail(t, fmt.Sprintf("didn't get the desired result before timeout, keyword: %s", keyword))
+		}
+	}
+
+	if parallel {
+		go waitResult()
+	} else {
+		waitResult()
+	}
+}

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/go.mod

@@ -9,10 +9,9 @@ require (
 	github.com/mattn/go-colorable v0.1.8
 	github.com/mattn/go-isatty v0.0.14
 	github.com/orcaman/concurrent-map v1.0.0
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20221221073256-5ca70bf3a257
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230210093343-bb26fa3e391d
 	github.com/stretchr/testify v1.8.0
 	github.com/urfave/cli/v2 v2.10.2
-	golang.org/x/sync v0.1.0
 )
 
 require (
@@ -68,7 +67,7 @@ require (
 	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.4.3 // 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
@@ -78,11 +77,12 @@ require (
 	github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/crypto v0.4.0 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
 	golang.org/x/mod v0.7.0 // indirect
-	golang.org/x/net v0.3.0 // indirect
-	golang.org/x/sys v0.3.0 // indirect
-	golang.org/x/text v0.5.0 // indirect
+	golang.org/x/net v0.6.0 // indirect
+	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
 	golang.org/x/tools v0.3.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect

common/go.sum

@@ -404,11 +404,10 @@ 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.20221221073256-5ca70bf3a257 h1:FjBC0Ww42WRoiB5EQFxoIEcJqoEUw2twdhN9nGkVCQA=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20221221073256-5ca70bf3a257/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.20230210093343-bb26fa3e391d h1:S4bEgTezJrqYmDfUSkp9Of0/lcglm4CTAWQHSnsn2HE=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230210093343-bb26fa3e391d/go.mod h1:OH4ZTAz6RM1IL0xcQ1zM6+Iy9s2vtcYqqwcEQdfHV7g=
+github.com/scroll-tech/zktrie v0.4.3 h1:RyhusIu8F8u5ITmzqZjkAwlL6jdC9TK9i6tfuJoZcpk=
+github.com/scroll-tech/zktrie v0.4.3/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=
@@ -482,8 +481,8 @@ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPh
 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.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
-golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
+golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 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=
@@ -541,8 +540,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 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.3.0 h1:VWL6FNY2bEEmsGVKabSlHu5Irp34xmMRoqb/9lF9lxk=
-golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
+golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 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=
@@ -606,8 +605,8 @@ golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBc
 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.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
+golang.org/x/sys v0.5.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=
@@ -619,8 +618,8 @@ 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.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
-golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 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=

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/common-rs" }
-types = { git = "https://github.com/scroll-tech/common-rs" }
+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

@@ -4,12 +4,12 @@ import (
 	"crypto/ecdsa"
 	"crypto/rand"
 	"encoding/hex"
-	"encoding/json"
 
 	"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"
+	"github.com/scroll-tech/go-ethereum/rlp"
 )
 
 // RespStatus represents status code from roller to scroll
@@ -36,12 +36,12 @@ type AuthMsg struct {
 type Identity struct {
 	// Roller name
 	Name string `json:"name"`
-	// Time of message creation
-	Timestamp int64 `json:"timestamp"`
+	// Unverified Unix timestamp of message creation
+	Timestamp uint32 `json:"timestamp"`
 	// Roller public key
 	PublicKey string `json:"publicKey"`
-	// Version is common.Version+ZK_VERSION. Use the following to check the latest ZK_VERSION version.
-	// curl -sL https://api.github.com/repos/scroll-tech/common-rs/commits | jq -r ".[0].sha"
+	// Version is common.Version+ZkVersion. Use the following to check the latest ZkVersion version.
+	// curl -sL https://api.github.com/repos/scroll-tech/scroll-zkevm/commits | jq -r ".[0].sha"
 	Version string `json:"version"`
 	// Random unique token generated by manager
 	Token string `json:"token"`
@@ -115,12 +115,11 @@ func (a *AuthMsg) PublicKey() (string, error) {
 // Hash returns the hash of the auth message, which should be the message used
 // to construct the Signature.
 func (i *Identity) Hash() ([]byte, error) {
-	bs, err := json.Marshal(i)
+	byt, err := rlp.EncodeToBytes(i)
 	if err != nil {
 		return nil, err
 	}
-
-	hash := crypto.Keccak256Hash(bs)
+	hash := crypto.Keccak256Hash(byt)
 	return hash[:], nil
 }
 
@@ -204,19 +203,20 @@ type ProofDetail struct {
 
 // Hash return proofMsg content hash.
 func (z *ProofDetail) Hash() ([]byte, error) {
-	bs, err := json.Marshal(z)
+	byt, err := rlp.EncodeToBytes(z)
 	if err != nil {
 		return nil, err
 	}
 
-	hash := crypto.Keccak256Hash(bs)
+	hash := crypto.Keccak256Hash(byt)
 	return hash[:], nil
 }
 
 // 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/message/message_test.go

@@ -16,7 +16,7 @@ func TestAuthMessageSignAndVerify(t *testing.T) {
 	authMsg := &AuthMsg{
 		Identity: &Identity{
 			Name:      "testRoller",
-			Timestamp: time.Now().UnixNano(),
+			Timestamp: uint32(time.Now().Unix()),
 		},
 	}
 	assert.NoError(t, authMsg.Sign(privkey))

common/metrics/metrics.go

@@ -0,0 +1,53 @@
+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"
+)
+
+// 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(metrics.DefaultRegistry),
+		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/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:    "0.0.0.0",
+	}
+	// 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/trace_gas.go

@@ -1,30 +1,10 @@
 package utils
 
 import (
-	"sync/atomic"
-
 	"github.com/scroll-tech/go-ethereum/core/types"
-	"golang.org/x/sync/errgroup"
 )
 
 // ComputeTraceGasCost computes gascost based on ExecutionResults.StructLogs.GasCost
 func ComputeTraceGasCost(trace *types.BlockTrace) uint64 {
-	var (
-		gasCost uint64
-		eg      errgroup.Group
-	)
-	for idx := range trace.ExecutionResults {
-		i := idx
-		eg.Go(func() error {
-			var sum uint64
-			for _, log := range trace.ExecutionResults[i].StructLogs {
-				sum += log.GasCost
-			}
-			atomic.AddUint64(&gasCost, sum)
-			return nil
-		})
-	}
-	_ = eg.Wait()
-
-	return gasCost
+	return trace.Header.GasUsed
 }

common/utils/trace_gas_test.go

@@ -19,13 +19,7 @@ func TestComputeTraceCost(t *testing.T) {
 	blockTrace := &types.BlockTrace{}
 	err = json.Unmarshal(templateBlockTrace, blockTrace)
 	assert.NoError(t, err)
-	var sum uint64
-	for _, v := range blockTrace.ExecutionResults {
-		for _, sv := range v.StructLogs {
-			sum += sv.GasCost
-		}
-	}
-
-	res := utils.ComputeTraceGasCost(blockTrace)
-	assert.Equal(t, sum, res)
+	var expected = blockTrace.Header.GasUsed
+	got := utils.ComputeTraceGasCost(blockTrace)
+	assert.Equal(t, expected, got)
 }

common/version/version.go

@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "prealpha-v8.7"
+var tag = "alpha-v1.0"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {
@@ -22,8 +22,8 @@ var commit = func() string {
 	return ""
 }()
 
-// ZK_VERSION is commit-id of common/libzkp/impl/cargo.lock/common-rs
-var ZK_VERSION string
+// ZkVersion is commit-id of common/libzkp/impl/cargo.lock/scroll-zkevm
+var ZkVersion string
 
 // Version denote the version of scroll protocol, including the l2geth, relayer, coordinator, roller, contracts and etc.
-var Version = fmt.Sprintf("%s-%s-%s", tag, commit, ZK_VERSION)
+var Version = fmt.Sprintf("%s-%s-%s", tag, commit, ZkVersion)

contracts/docs/apis/ZKRollup.md

@@ -232,6 +232,50 @@ function initialize(uint256 _chainId) external nonpayable
 |---|---|---|
 | _chainId | uint256 | undefined |
 
+### isBlockFinalized
+
+```solidity
+function isBlockFinalized(bytes32 _blockHash) external view returns (bool)
+```
+
+Return whether the block is finalized by block hash.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _blockHash | bytes32 | undefined |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | bool | undefined |
+
+### isBlockFinalized
+
+```solidity
+function isBlockFinalized(uint256 _blockHeight) external view returns (bool)
+```
+
+Return whether the block is finalized by block height.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _blockHeight | uint256 | undefined |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | bool | undefined |
+
 ### lastFinalizedBatchID
 
 ```solidity

contracts/scripts/foundry/DeployL2BridgeContracts.s.sol

@@ -13,17 +13,34 @@ import { L2ERC721Gateway } from "../../src/L2/gateways/L2ERC721Gateway.sol";
 import { L2GatewayRouter } from "../../src/L2/gateways/L2GatewayRouter.sol";
 import { L2ScrollMessenger } from "../../src/L2/L2ScrollMessenger.sol";
 import { L2StandardERC20Gateway } from "../../src/L2/gateways/L2StandardERC20Gateway.sol";
+import { L2TxFeeVault } from "../../src/L2/predeploys/L2TxFeeVault.sol";
+import { Whitelist } from "../../src/L2/predeploys/Whitelist.sol";
 import { ScrollStandardERC20 } from "../../src/libraries/token/ScrollStandardERC20.sol";
 import { ScrollStandardERC20Factory } from "../../src/libraries/token/ScrollStandardERC20Factory.sol";
 
 contract DeployL2BridgeContracts is Script {
     uint256 L2_DEPLOYER_PRIVATE_KEY = vm.envUint("L2_DEPLOYER_PRIVATE_KEY");
+    address L1_TX_FEE_RECIPIENT_ADDR = vm.envAddress("L1_TX_FEE_RECIPIENT_ADDR");
+
+    L2ScrollMessenger messenger;
     ProxyAdmin proxyAdmin;
 
+    address L2_SCROLL_MESSENGER_PREDEPLOY_ADDR = vm.envOr("L2_SCROLL_MESSENGER_PREDEPLOY_ADDR", address(0));
+    address L2_TX_FEE_VAULT_PREDEPLOY_ADDR = vm.envOr("L2_TX_FEE_VAULT_PREDEPLOY_ADDR", address(0));
+    address L2_PROXY_ADMIN_PREDEPLOY_ADDR = vm.envOr("L2_PROXY_ADMIN_PREDEPLOY_ADDR", address(0));
+    address L2_STANDARD_ERC20_GATEWAY_PROXY_PREDEPLOY_ADDR = vm.envOr("L2_STANDARD_ERC20_GATEWAY_PROXY_PREDEPLOY_ADDR", address(0));
+    address L2_GATEWAY_ROUTER_PROXY_PREDEPLOY_ADDR = vm.envOr("L2_GATEWAY_ROUTER_PROXY_PREDEPLOY_ADDR", address(0));
+    address L2_SCROLL_STANDARD_ERC20_FACTORY_PREDEPLOY_ADDR = vm.envOr("L2_SCROLL_STANDARD_ERC20_FACTORY_PREDEPLOY_ADDR", address(0));
+    address L2_CUSTOM_ERC20_GATEWAY_PROXY_PREDEPLOY_ADDR = vm.envOr("L2_CUSTOM_ERC20_GATEWAY_PROXY_PREDEPLOY_ADDR", address(0));
+    address L2_ERC721_GATEWAY_PROXY_PREDEPLOY_ADDR = vm.envOr("L2_ERC721_GATEWAY_PROXY_PREDEPLOY_ADDR", address(0));
+    address L2_ERC1155_GATEWAY_PROXY_PREDEPLOY_ADDR = vm.envOr("L2_ERC1155_GATEWAY_PROXY_PREDEPLOY_ADDR", address(0));
+    address L2_WHITELIST_PREDEPLOY_ADDR = vm.envOr("L2_WHITELIST_PREDEPLOY_ADDR", address(0));
+
     function run() external {
         vm.startBroadcast(L2_DEPLOYER_PRIVATE_KEY);
 
         deployL2ScrollMessenger();
+        deployTxFeeVault();
         deployProxyAdmin();
         deployL2StandardERC20Gateway();
         deployL2GatewayRouter();
@@ -31,24 +48,51 @@ contract DeployL2BridgeContracts is Script {
         deployL2CustomERC20Gateway();
         deployL2ERC721Gateway();
         deployL2ERC1155Gateway();
+        deployL2Whitelist();
 
         vm.stopBroadcast();
     }
 
     function deployL2ScrollMessenger() internal {
-        address owner = vm.addr(L2_DEPLOYER_PRIVATE_KEY);
-        L2ScrollMessenger l2ScrollMessenger = new L2ScrollMessenger(owner);
+        if (L2_SCROLL_MESSENGER_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_SCROLL_MESSENGER_ADDR", address(L2_SCROLL_MESSENGER_PREDEPLOY_ADDR));
+            return;
+        }
 
-        logAddress("L2_SCROLL_MESSENGER_ADDR", address(l2ScrollMessenger));
+        address owner = vm.addr(L2_DEPLOYER_PRIVATE_KEY);
+        messenger = new L2ScrollMessenger(owner);
+
+        logAddress("L2_SCROLL_MESSENGER_ADDR", address(messenger));
+    }
+
+    function deployTxFeeVault() internal {
+        if (L2_TX_FEE_VAULT_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_TX_FEE_VAULT_ADDR", address(L2_TX_FEE_VAULT_PREDEPLOY_ADDR));
+            return;
+        }
+
+        L2TxFeeVault feeVault = new L2TxFeeVault(address(messenger), L1_TX_FEE_RECIPIENT_ADDR);
+
+        logAddress("L2_TX_FEE_VAULT_ADDR", address(feeVault));
     }
 
     function deployProxyAdmin() internal {
+        if (L2_PROXY_ADMIN_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_PROXY_ADMIN_ADDR", address(L2_PROXY_ADMIN_PREDEPLOY_ADDR));
+            return;
+        }
+
         proxyAdmin = new ProxyAdmin();
 
         logAddress("L2_PROXY_ADMIN_ADDR", address(proxyAdmin));
     }
 
     function deployL2StandardERC20Gateway() internal {
+        if (L2_STANDARD_ERC20_GATEWAY_PROXY_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR", address(L2_STANDARD_ERC20_GATEWAY_PROXY_PREDEPLOY_ADDR));
+            return;
+        }
+
         L2StandardERC20Gateway impl = new L2StandardERC20Gateway();
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(impl), address(proxyAdmin), new bytes(0));
 
@@ -57,6 +101,11 @@ contract DeployL2BridgeContracts is Script {
     }
 
     function deployL2GatewayRouter() internal {
+        if (L2_GATEWAY_ROUTER_PROXY_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_GATEWAY_ROUTER_PROXY_ADDR", address(L2_GATEWAY_ROUTER_PROXY_PREDEPLOY_ADDR));
+            return;
+        }
+
         L2GatewayRouter impl = new L2GatewayRouter();
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(impl), address(proxyAdmin), new bytes(0));
 
@@ -65,6 +114,11 @@ contract DeployL2BridgeContracts is Script {
     }
 
     function deployScrollStandardERC20Factory() internal {
+        if (L2_SCROLL_STANDARD_ERC20_FACTORY_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_SCROLL_STANDARD_ERC20_FACTORY_ADDR", address(L2_SCROLL_STANDARD_ERC20_FACTORY_PREDEPLOY_ADDR));
+            return;
+        }
+
         ScrollStandardERC20 tokenImpl = new ScrollStandardERC20();
         ScrollStandardERC20Factory scrollStandardERC20Factory = new ScrollStandardERC20Factory(address(tokenImpl));
 
@@ -73,6 +127,11 @@ contract DeployL2BridgeContracts is Script {
     }
 
     function deployL2CustomERC20Gateway() internal {
+        if (L2_CUSTOM_ERC20_GATEWAY_PROXY_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_CUSTOM_ERC20_GATEWAY_PROXY_ADDR", address(L2_CUSTOM_ERC20_GATEWAY_PROXY_PREDEPLOY_ADDR));
+            return;
+        }
+
         L2CustomERC20Gateway impl = new L2CustomERC20Gateway();
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(impl), address(proxyAdmin), new bytes(0));
 
@@ -81,6 +140,11 @@ contract DeployL2BridgeContracts is Script {
     }
 
     function deployL2ERC721Gateway() internal {
+        if (L2_ERC721_GATEWAY_PROXY_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_ERC721_GATEWAY_PROXY_ADDR", address(L2_ERC721_GATEWAY_PROXY_PREDEPLOY_ADDR));
+            return;
+        }
+
         L2ERC721Gateway impl = new L2ERC721Gateway();
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(impl), address(proxyAdmin), new bytes(0));
 
@@ -89,6 +153,11 @@ contract DeployL2BridgeContracts is Script {
     }
 
     function deployL2ERC1155Gateway() internal {
+        if (L2_ERC1155_GATEWAY_PROXY_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_ERC1155_GATEWAY_PROXY_ADDR", address(L2_ERC1155_GATEWAY_PROXY_PREDEPLOY_ADDR));
+            return;
+        }
+
         L2ERC1155Gateway impl = new L2ERC1155Gateway();
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(impl), address(proxyAdmin), new bytes(0));
 
@@ -96,6 +165,18 @@ contract DeployL2BridgeContracts is Script {
         logAddress("L2_ERC1155_GATEWAY_PROXY_ADDR", address(proxy));
     }
 
+    function deployL2Whitelist() internal {
+        if (L2_WHITELIST_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_WHITELIST_ADDR", address(L2_WHITELIST_PREDEPLOY_ADDR));
+            return;
+        }
+
+        address owner = vm.addr(L2_DEPLOYER_PRIVATE_KEY);
+        Whitelist whitelist = new Whitelist(owner);
+
+        logAddress("L2_WHITELIST_ADDR", address(whitelist));
+    }
+
     function logAddress(string memory name, address addr) internal {
         console.log(string(abi.encodePacked(name, "=", vm.toString(address(addr)))));
     }

contracts/scripts/foundry/InitializeL2BridgeContracts.s.sol

@@ -3,11 +3,13 @@ pragma solidity ^0.8.10;
 
 import { Script } from "forge-std/Script.sol";
 
+import { L2ScrollMessenger } from "../../src/L2/L2ScrollMessenger.sol";
 import { L2CustomERC20Gateway } from "../../src/L2/gateways/L2CustomERC20Gateway.sol";
 import { L2ERC1155Gateway } from "../../src/L2/gateways/L2ERC1155Gateway.sol";
 import { L2ERC721Gateway } from "../../src/L2/gateways/L2ERC721Gateway.sol";
 import { L2GatewayRouter } from "../../src/L2/gateways/L2GatewayRouter.sol";
 import { L2StandardERC20Gateway } from "../../src/L2/gateways/L2StandardERC20Gateway.sol";
+import { Whitelist } from "../../src/L2/predeploys/Whitelist.sol";
 import { ScrollStandardERC20Factory } from "../../src/libraries/token/ScrollStandardERC20Factory.sol";
 
 contract InitializeL2BridgeContracts is Script {
@@ -20,12 +22,14 @@ contract InitializeL2BridgeContracts is Script {
     address L1_ERC1155_GATEWAY_PROXY_ADDR = vm.envAddress("L1_ERC1155_GATEWAY_PROXY_ADDR");
 
     address L2_SCROLL_MESSENGER_ADDR = vm.envAddress("L2_SCROLL_MESSENGER_ADDR");
+    address L2_TX_FEE_VAULT_ADDR = vm.envAddress("L2_TX_FEE_VAULT_ADDR");
     address L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR = vm.envAddress("L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR");
     address L2_GATEWAY_ROUTER_PROXY_ADDR = vm.envAddress("L2_GATEWAY_ROUTER_PROXY_ADDR");
     address L2_SCROLL_STANDARD_ERC20_FACTORY_ADDR = vm.envAddress("L2_SCROLL_STANDARD_ERC20_FACTORY_ADDR");
     address L2_CUSTOM_ERC20_GATEWAY_PROXY_ADDR = vm.envAddress("L2_CUSTOM_ERC20_GATEWAY_PROXY_ADDR");
     address L2_ERC721_GATEWAY_PROXY_ADDR = vm.envAddress("L2_ERC721_GATEWAY_PROXY_ADDR");
     address L2_ERC1155_GATEWAY_PROXY_ADDR = vm.envAddress("L2_ERC1155_GATEWAY_PROXY_ADDR");
+    address L2_WHITELIST_ADDR = vm.envAddress("L2_WHITELIST_ADDR");
 
     function run() external {
         vm.startBroadcast(deployerPrivateKey);
@@ -69,6 +73,21 @@ contract InitializeL2BridgeContracts is Script {
             L2_SCROLL_MESSENGER_ADDR
         );
 
+        // whitelist contracts which can call sendMessage
+        {
+            address[] memory gateways = new address[](6);
+            gateways[0] = L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR;
+            gateways[1] = L2_GATEWAY_ROUTER_PROXY_ADDR;
+            gateways[2] = L2_CUSTOM_ERC20_GATEWAY_PROXY_ADDR;
+            gateways[3] = L2_ERC1155_GATEWAY_PROXY_ADDR;
+            gateways[4] = L2_ERC721_GATEWAY_PROXY_ADDR;
+            gateways[5] = L2_TX_FEE_VAULT_ADDR;
+            Whitelist(L2_WHITELIST_ADDR).updateWhitelistStatus(gateways, true);
+        }
+
+        // update whitelist contract for messenger
+        L2ScrollMessenger(payable(L2_SCROLL_MESSENGER_ADDR)).updateWhitelist(L2_WHITELIST_ADDR);
+
         vm.stopBroadcast();
     }
 }

contracts/src/L1/L1ScrollMessenger.sol

@@ -97,7 +97,7 @@ contract L1ScrollMessenger is OwnableUpgradeable, PausableUpgradeable, ScrollMes
     require(!isMessageExecuted[_msghash], "Message successfully executed");
 
     // @todo check proof
-    require(IZKRollup(rollup).verifyMessageStateProof(_proof.batchIndex, _proof.blockHeight), "invalid state proof");
+    require(IZKRollup(rollup).isBlockFinalized(_proof.blockHeight), "invalid state proof");
     require(ZkTrieVerifier.verifyMerkleProof(_proof.merkleProof), "invalid proof");
 
     // @todo check `_to` address to avoid attack.

contracts/src/L1/rollup/IZKRollup.sol

@@ -59,6 +59,14 @@ interface IZKRollup {
 
   /**************************************** View Functions ****************************************/
 
+  /// @notice Return whether the block is finalized by block hash.
+  /// @param blockHash The hash of the block to query.
+  function isBlockFinalized(bytes32 blockHash) external view returns (bool);
+
+  /// @notice Return whether the block is finalized by block height.
+  /// @param blockHeight The height of the block to query.
+  function isBlockFinalized(uint256 blockHeight) external view returns (bool);
+
   /// @notice Return the message hash by index.
   /// @param _index The index to query.
   function getMessageHashByIndex(uint256 _index) external view returns (bytes32);

contracts/src/L1/rollup/ZKRollup.sol

@@ -89,6 +89,24 @@ contract ZKRollup is OwnableUpgradeable, IZKRollup {
 
   /**************************************** View Functions ****************************************/
 
+  /// @inheritdoc IZKRollup
+  function isBlockFinalized(bytes32 _blockHash) external view returns (bool) {
+    // block not commited
+    if (blocks[_blockHash].transactionRoot == bytes32(0)) return false;
+
+    uint256 _batchIndex = blocks[_blockHash].batchIndex;
+    bytes32 _batchId = finalizedBatches[_batchIndex];
+    return _batchId != bytes32(0);
+  }
+
+  /// @inheritdoc IZKRollup
+  function isBlockFinalized(uint256 _blockHeight) external view returns (bool) {
+    bytes32 _batchID = lastFinalizedBatchID;
+    bytes32 _batchHash = batches[_batchID].batchHash;
+    uint256 _maxHeight = blocks[_batchHash].blockHeight;
+    return _blockHeight <= _maxHeight;
+  }
+
   /// @inheritdoc IZKRollup
   function getMessageHashByIndex(uint256 _index) external view returns (bytes32) {
     return messageQueue[_index];

contracts/src/L2/L2ScrollMessenger.sol

@@ -86,12 +86,10 @@ contract L2ScrollMessenger is ScrollMessengerBase, OwnableBase, IL2ScrollMesseng
     uint256 _deadline,
     uint256 _nonce,
     bytes memory _message
-  ) external override {
+  ) external override onlyWhitelistedSender(msg.sender) {
     // anti reentrance
     require(xDomainMessageSender == ScrollConstants.DEFAULT_XDOMAIN_MESSAGE_SENDER, "already in execution");
 
-    // @todo only privileged accounts can call
-
     // solhint-disable-next-line not-rely-on-time
     require(_deadline >= block.timestamp, "Message expired");
 

contracts/src/L2/predeploys/L2TxFeeVault.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import { FeeVault } from "../../libraries/FeeVault.sol";
+
+/// @title L2TxFeeVault
+/// @notice The `L2TxFeeVault` contract collects all L2 transaction fees and allows withdrawing these fees to a predefined L1 address.
+/// The minimum withdrawal amount is 10 ether.
+contract L2TxFeeVault is FeeVault {
+  /// @param _messenger The address of L2ScrollMessenger.
+  /// @param _recipient The fee recipient address on L1.
+  constructor(address _messenger, address _recipient) FeeVault(_messenger, _recipient, 10 ether) {}
+}

contracts/src/libraries/FeeVault.sol

@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: MIT
+
+// MIT License
+
+// Copyright (c) 2022 Optimism
+// Copyright (c) 2022 Scroll
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+pragma solidity ^0.8.0;
+
+import { IL2ScrollMessenger } from "../L2/IL2ScrollMessenger.sol";
+
+/**
+ * @title FeeVault
+ * @notice The FeeVault contract contains the basic logic for the various different vault contracts
+ *         used to hold fee revenue generated by the L2 system.
+ */
+abstract contract FeeVault {
+  /**
+   * @notice Emits each time that a withdrawal occurs.
+   *
+   * @param value Amount that was withdrawn (in wei).
+   * @param to    Address that the funds were sent to.
+   * @param from  Address that triggered the withdrawal.
+   */
+  event Withdrawal(uint256 value, address to, address from);
+
+  /**
+   * @notice Minimum balance before a withdrawal can be triggered.
+   */
+  uint256 public MIN_WITHDRAWAL_AMOUNT;
+
+  /**
+   * @notice Scroll L2 messenger address.
+   */
+  address public MESSENGER;
+
+  /**
+   * @notice Wallet that will receive the fees on L1.
+   */
+  address public RECIPIENT;
+
+  /**
+   * @notice Total amount of wei processed by the contract.
+   */
+  uint256 public totalProcessed;
+
+  /**
+   * @param _recipient           Wallet that will receive the fees on L1.
+   * @param _minWithdrawalAmount Minimum balance before a withdrawal can be triggered.
+   */
+  constructor(
+    address _messenger,
+    address _recipient,
+    uint256 _minWithdrawalAmount
+  ) {
+    MIN_WITHDRAWAL_AMOUNT = _minWithdrawalAmount;
+    MESSENGER = _messenger;
+    RECIPIENT = _recipient;
+  }
+
+  /**
+   * @notice Allow the contract to receive ETH.
+   */
+  receive() external payable {}
+
+  /**
+   * @notice Triggers a withdrawal of funds to the L1 fee wallet.
+   */
+  function withdraw() external {
+    uint256 value = address(this).balance;
+
+    require(
+      value >= MIN_WITHDRAWAL_AMOUNT,
+      "FeeVault: withdrawal amount must be greater than minimum withdrawal amount"
+    );
+
+    unchecked {
+      totalProcessed += value;
+    }
+
+    emit Withdrawal(value, RECIPIENT, msg.sender);
+
+    IL2ScrollMessenger(MESSENGER).sendMessage{ value: value }(
+      RECIPIENT,
+      0, // no fee provided
+      bytes(""), // no message (simple eth transfer)
+      0 // _gasLimit is not used for eth transfers
+    );
+  }
+}

contracts/src/libraries/verifier/RollupVerifier.sol

@@ -337,7 +337,7 @@ library RollupVerifier {
     n.y[1] = uint256(13392588948715843804641432497768002650278120570034223513918757245338268106653);
   }
 
-  function get_wx_wg(uint256[] calldata proof, uint256[4] memory instances)
+  function get_wx_wg(uint256[] calldata proof, uint256[6] memory instances)
     internal
     view
     returns (
@@ -354,15 +354,15 @@ library RollupVerifier {
 
     (t0, t1) = (
       ecc_mul(
-        13911018583007884881416842514661274050567796652031922980888952067142200734890,
-        6304656948134906299141761906515211516376236447819044970320185642735642777036,
+        16273630658577275004922498653030603356133576819117084202553121866583118864964,
+        6490159372778831696763963776713702553449715395136256408127406430701013586737,
         instances[0]
       )
     );
     (t0, t1) = (
       ecc_mul_add(
-        10634526547038245645834822324032425487434811507756950001533785848774317018670,
-        11025818855933089539342999945076144168100709119485154428833847826982360951459,
+        21465583338900056601761668793508143213048509206826828900542864688378093593107,
+        18916078441896187703473496284050716429170517783995157941513585201547834049281,
         instances[1],
         t0,
         t1
@@ -370,23 +370,41 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        13485936455723319058155687139769502499697405985650416391707184524158646623799,
-        16234009237501684544798205490615498675425737095147152991328466405207467143566,
+        6343857336395576108841088300387244434710621968858839561085778033655098739860,
+        8647137667680968494319179221347060255241434220013711910139382436020093396308,
         instances[2],
         t0,
         t1
       )
     );
+    (t0, t1) = (
+      ecc_mul_add(
+        17609998990685530094209191702545036897101285294398654477281719279316619940710,
+        7891327626892441842954365090016786852185025910332850053066512639794082797200,
+        instances[3],
+        t0,
+        t1
+      )
+    );
+    (t0, t1) = (
+      ecc_mul_add(
+        1271298011119556361067568041994358027954229594187408866479678256322993207430,
+        16519855264988006509000373008036578681979317060055767197977112967887569978562,
+        instances[4],
+        t0,
+        t1
+      )
+    );
     (m[0], m[1]) = (
       ecc_mul_add(
-        21550585789286941025166870525096478397065943995678337623823808437877187678077,
-        4447338868884713453743453617617291019986465683944733951178865127876671635659,
-        instances[3],
+        9106880861932848269529912338578777683259870408474914617967634470292361865683,
+        3191458938194545761508145121615374474619318896841102235687991186359560600763,
+        instances[5],
         t0,
         t1
       )
     );
-    update_hash_scalar(7326291674247555594112707886804937707847188185923070866278273345303869756280, absorbing, 0);
+    update_hash_scalar(16714713909008743871958519800387174981836263428094013165455393524274317552599, absorbing, 0);
     update_hash_point(m[0], m[1], absorbing, 2);
     for (t0 = 0; t0 <= 4; t0++) {
       update_hash_point(proof[0 + t0 * 2], proof[1 + t0 * 2], absorbing, 5 + t0 * 3);
@@ -413,31 +431,31 @@ library RollupVerifier {
       update_hash_point(proof[137 + t0 * 2], proof[138 + t0 * 2], absorbing, 1 + t0 * 3);
     }
     m[8] = (squeeze_challenge(absorbing, 13));
-    m[9] = (mulmod(m[6], 6143038923529407703646399695489445107254060255791852207908457597807435305312, q_mod));
-    m[10] = (mulmod(m[6], 7358966525675286471217089135633860168646304224547606326237275077574224349359, q_mod));
-    m[11] = (mulmod(m[6], 11377606117859914088982205826922132024839443553408109299929510653283289974216, q_mod));
-    m[12] = (fr_pow(m[6], 33554432));
+    m[9] = (mulmod(m[6], 13446667982376394161563610564587413125564757801019538732601045199901075958935, q_mod));
+    m[10] = (mulmod(m[6], 16569469942529664681363945218228869388192121720036659574609237682362097667612, q_mod));
+    m[11] = (mulmod(m[6], 14803907026430593724305438564799066516271154714737734572920456128449769927233, q_mod));
+    m[12] = (fr_pow(m[6], 67108864));
     m[13] = (addmod(m[12], q_mod - 1, q_mod));
-    m[14] = (mulmod(21888242219518804655518433051623070663413851959604507555939307129453691614729, m[13], q_mod));
+    m[14] = (mulmod(21888242545679039938882419398440172875981108180010270949818755658014750055173, m[13], q_mod));
     t0 = (addmod(m[6], q_mod - 1, q_mod));
     m[14] = (fr_div(m[14], t0));
-    m[15] = (mulmod(3814514741328848551622746860665626251343731549210296844380905280010844577811, m[13], q_mod));
-    t0 = (addmod(m[6], q_mod - 11377606117859914088982205826922132024839443553408109299929510653283289974216, q_mod));
+    m[15] = (mulmod(3495999257316610708652455694658595065970881061159015347599790211259094641512, m[13], q_mod));
+    t0 = (addmod(m[6], q_mod - 14803907026430593724305438564799066516271154714737734572920456128449769927233, q_mod));
     m[15] = (fr_div(m[15], t0));
-    m[16] = (mulmod(14167635312934689395373925807699824183296350635557349457928542208657273886961, m[13], q_mod));
-    t0 = (addmod(m[6], q_mod - 17329448237240114492580865744088056414251735686965494637158808787419781175510, q_mod));
+    m[16] = (mulmod(12851378806584061886934576302961450669946047974813165594039554733293326536714, m[13], q_mod));
+    t0 = (addmod(m[6], q_mod - 11377606117859914088982205826922132024839443553408109299929510653283289974216, q_mod));
     m[16] = (fr_div(m[16], t0));
-    m[17] = (mulmod(12609034248192017902501772617940356704925468750503023243291639149763830461639, m[13], q_mod));
-    t0 = (addmod(m[6], q_mod - 16569469942529664681363945218228869388192121720036659574609237682362097667612, q_mod));
+    m[17] = (mulmod(14638077285440018490948843142723135319134576188472316769433007423695824509066, m[13], q_mod));
+    t0 = (addmod(m[6], q_mod - 3693565015985198455139889557180396682968596245011005461846595820698933079918, q_mod));
     m[17] = (fr_div(m[17], t0));
-    m[18] = (mulmod(12805242257443675784492534138904933930037912868081131057088370227525924812579, m[13], q_mod));
-    t0 = (addmod(m[6], q_mod - 9741553891420464328295280489650144566903017206473301385034033384879943874347, q_mod));
+    m[18] = (mulmod(18027939092386982308810165776478549635922357517986691900813373197616541191289, m[13], q_mod));
+    t0 = (addmod(m[6], q_mod - 17329448237240114492580865744088056414251735686965494637158808787419781175510, q_mod));
     m[18] = (fr_div(m[18], t0));
-    m[19] = (mulmod(6559137297042406441428413756926584610543422337862324541665337888392460442551, m[13], q_mod));
-    t0 = (addmod(m[6], q_mod - 5723528081196465413808013109680264505774289533922470433187916976440924869204, q_mod));
+    m[19] = (mulmod(912591536032578604421866340844550116335029274442283291811906603256731601654, m[13], q_mod));
+    t0 = (addmod(m[6], q_mod - 6047398202650739717314770882059679662647667807426525133977681644606291529311, q_mod));
     m[19] = (fr_div(m[19], t0));
-    m[20] = (mulmod(14811589476322888753142612645486192973009181596950146578897598212834285850868, m[13], q_mod));
-    t0 = (addmod(m[6], q_mod - 7358966525675286471217089135633860168646304224547606326237275077574224349359, q_mod));
+    m[20] = (mulmod(17248638560015646562374089181598815896736916575459528793494921668169819478628, m[13], q_mod));
+    t0 = (addmod(m[6], q_mod - 16569469942529664681363945218228869388192121720036659574609237682362097667612, q_mod));
     m[20] = (fr_div(m[20], t0));
     t0 = (addmod(m[15], m[16], q_mod));
     t0 = (addmod(t0, m[17], q_mod));
@@ -724,8 +742,8 @@ library RollupVerifier {
     (t0, t1) = (ecc_mul_add_pm(m, proof, 1461486238301980199876269201563775120819706402602, t0, t1));
     (t0, t1) = (
       ecc_mul_add(
-        18701609130775737229348071043080155034023979562517390395403433088802478899758,
-        15966955543930185772599298905781740007968379271659670990460125132276790404701,
+        1166255827574633395469889753099263335112651429543747917860844891223509395230,
+        18119530258797056675590474142263379269133137917926199526995010149706608452268,
         m[78],
         t0,
         t1
@@ -733,8 +751,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        10391672869328159104536012527288890078475214572275421477472198141744100604180,
-        16383182967525077486800851500412772270268328143041811261940514978333847876450,
+        479654250230311733675045936187074887335076118790675548184957988765243051391,
+        3100719863754926915077773261837642988281275398456491618898287285885297258973,
         m[77],
         t0,
         t1
@@ -742,8 +760,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        1694121668121560366967381814358868176695875056710903754887787227675156636991,
-        6288755472313871386012926867179622380057563139110460659328016508371672965822,
+        3244117516185602927429536955777596704962143625995582449305913349309466588374,
+        4949447249861524239830935874731901209583893161129086694779290040738731707868,
         m[76],
         t0,
         t1
@@ -751,8 +769,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        8449090587209846475328734419746789925412190193479844231777165308243174237722,
-        19620423218491500875965944829407986067794157844846402182805878618955604592848,
+        14948547489533026990535642276664751166524290089518721217701084060838942037816,
+        4158304819018152066924650590566402375351800342702049911667413813453648544913,
         m[75],
         t0,
         t1
@@ -760,8 +778,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        5053208336959682582031156680199539869251745263409434673229644546747696847142,
-        2515271708296970065769200367712058290268116287798438948140802173656220671206,
+        12409839630787558779666051790740339639835641801241950167020910758875751567721,
+        10190386726927990167988725115981898191213252554332296547744162818590468069671,
         m[74],
         t0,
         t1
@@ -769,8 +787,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        14044565934581841113280816557133159251170886931106151374890478449607604267942,
-        4516676687937794780030405510740994119381246893674971835541700695978704585552,
+        17970998203939514710036667497443822563987440725661639935300105673829885028203,
+        5681616020208389658397995048088678631695525787311431942560298329387592854586,
         m[73],
         t0,
         t1
@@ -778,8 +796,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        8808629196631084710334110767449499515582902470045288549019060600095073238105,
-        13294364470509711632739201553507258372326885785844949555702886281377427438475,
+        5422170891120229182360564594866246906567981360038071999127508208070564034524,
+        14722029885921976755274052080011416898514630484317773275415621146460924728182,
         m[72],
         t0,
         t1
@@ -787,8 +805,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        5025513109896000321643874120256520860696240548707294083465215087271048364447,
-        3512836639252013523316566987122028012000136443005216091303269685639094608348,
+        3955318928206501525438681058758319558200398421433597349851235741670899388496,
+        15892053452767975688653514510353871405466169306176036727161401156637227884251,
         m[71],
         t0,
         t1
@@ -796,8 +814,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        20143075587083355112417414887372164250381042430441089145485481665404780784123,
-        9674175910548207533970570126063643897609459066877075659644076646142886425503,
+        18451207565454686459225553564649439057698581050443267052774483067774590965003,
+        4419693978684087696088612463773850574955779922948673330581664932100506990694,
         m[70],
         t0,
         t1
@@ -805,8 +823,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        15449875505347857882486479091299788291220259329814373554032711960946424724459,
-        18962357525499685082729877436365914814836051345178637509857216081206536249101,
+        847101878434221983907574308143360385944534458215526175646288607915875901481,
+        2846353475656269162370753247605184679473264230467654203502980134120309217445,
         m[69],
         t0,
         t1
@@ -814,8 +832,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        8808629196631084710334110767449499515582902470045288549019060600095073238105,
-        13294364470509711632739201553507258372326885785844949555702886281377427438475,
+        5422170891120229182360564594866246906567981360038071999127508208070564034524,
+        14722029885921976755274052080011416898514630484317773275415621146460924728182,
         m[68],
         t0,
         t1
@@ -823,8 +841,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        4919836553908828082540426444868776555669883964231731088484431671272015675682,
-        2534996469663628472218664436969797350677809756735321673130157881813913441609,
+        12355852135968866678343538084506414981897123075397230437920965961095525036339,
+        19173350083521771086213125757940272853888577158427508914933730457941026326040,
         m[67],
         t0,
         t1
@@ -832,8 +850,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        11667150339256836494926506499230187360957884531183800528342644917396989453992,
-        15540782144062394272475578831064080588044323224200171932910650185556553066875,
+        21537162186981550637121053147454964150809482185492418377558290311964245821909,
+        2173324946696678910860567153502925685634606622474439126082176533839311460335,
         m[66],
         t0,
         t1
@@ -841,8 +859,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        7298741378311576950839968993357330108079245118485170808123459961337830256312,
-        10327561179499117619949936626306234488421661318541529469701192193684736307992,
+        20702481083445183838662364419201395944400358423071711333544748994437443350157,
+        21729036491728923882358088642589857779818948470983153549909552615176584955200,
         m[65],
         t0,
         t1
@@ -850,8 +868,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        19156320437354843782276382482504062704637529342417677454208679985931193905144,
-        12513036134308417802230431028731202760516379532825961661396005403922128650283,
+        5211075648402252045446907842677410998750480902260529776286467677659191740672,
+        17759936859541227097052484319437171023743724174885338509498798745592136568923,
         m[64],
         t0,
         t1
@@ -859,8 +877,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        21344975294019301064497004820288763682448968861642019035490416932201272957274,
-        10527619823264344893410550194287064640208153251186939130321425213582959780489,
+        5685082624811934526131077036509066197941130699019907200139767495570575867807,
+        9975752329518147542127949868789945608848626426600733728808879384778577859545,
         m[63],
         t0,
         t1
@@ -868,8 +886,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        8972742415650205333409282370033440562593431348747288268814492203356823531160,
-        8116706321112691122771049432546166822575953322170688547310064134261753771143,
+        1845955600044282712468400114813806019045133083112296001842856684609288249746,
+        6677624509889210837770197526955652810854887548330294041671470991988491766303,
         m[62],
         t0,
         t1
@@ -877,8 +895,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        2245383788954722547301665173770198299224442299145553661157120655982065376923,
-        21429627532145565836455474503387893562363999035988060101286707048187310790834,
+        17721426954552427189787075605835833086212392642349293317822925006771731953198,
+        10818582862561493154030196266254401851195091198556669943079029419869326006448,
         m[61],
         t0,
         t1
@@ -886,8 +904,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        6631831869726773976361406817204839637256208337970281843457872807848960103655,
-        9564029493986604546558813596663080644256762699468834511701525072767927949801,
+        10224195420706066705577574946990328089867884648164309818089282930621493257750,
+        3961164971057442035153270823831734824136501489880082889417523554417504868473,
         m[60],
         t0,
         t1
@@ -895,8 +913,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        11480433023546787855799302686493624232665854025790899812568432142639901048711,
-        19408335616099148180409133533838326787843523379558500985213116784449716389602,
+        4155760488117491189818018229959225087159948854404593659816501566044290851616,
+        7849169269773333823959590214273366557169699873629739076719523623811579483219,
         m[59],
         t0,
         t1
@@ -904,8 +922,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        17119009547436104907589161251911916154539209413889810725547125453954285498068,
-        16196009614025712805558792610177918739658373559330006740051047693948800191562,
+        9303688548891777886487749234688027352493881691026887577351708905397127609597,
+        15420408437274623857443274867832176492025874147466147921781316121716419230415,
         m[58],
         t0,
         t1
@@ -913,8 +931,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        4833170740960210126662783488087087210159995687268566750051519788650425720369,
-        14321097009933429277686973550787181101481482473464521566076287626133354519061,
+        1713011977361327447402228333889074876456179272285913377605323580535155713105,
+        17494574374943878587945090358233307058027002207479570017169918665020362475592,
         m[57],
         t0,
         t1
@@ -922,8 +940,8 @@ library RollupVerifier {
     );
     (t0, t1) = (
       ecc_mul_add(
-        18650010323993268535055713787599480879302828622769515272251129462854128226895,
-        11244246887388549559894193327128701737108444364011850111062992666532968469107,
+        688560977158667877997491129442687540611216305867558421257325952561991356422,
+        1877117185103259325255107191485730322497880777053300656925558921917058739650,
         m[56],
         t0,
         t1
@@ -937,12 +955,15 @@ library RollupVerifier {
   }
 
   function verify(uint256[] calldata proof, uint256[] calldata target_circuit_final_pair) public view {
-    uint256[4] memory instances;
+    uint256[6] memory instances;
     instances[0] = target_circuit_final_pair[0] & ((1 << 136) - 1);
     instances[1] = (target_circuit_final_pair[0] >> 136) + ((target_circuit_final_pair[1] & 1) << 136);
     instances[2] = target_circuit_final_pair[2] & ((1 << 136) - 1);
     instances[3] = (target_circuit_final_pair[2] >> 136) + ((target_circuit_final_pair[3] & 1) << 136);
 
+    instances[4] = target_circuit_final_pair[4];
+    instances[5] = target_circuit_final_pair[5];
+
     uint256 x0 = 0;
     uint256 x1 = 0;
     uint256 y0 = 0;
@@ -961,7 +982,7 @@ library RollupVerifier {
     g2_points[1] = get_verify_circuit_g2_n();
 
     checked = pairing(g1_points, g2_points);
-    require(checked, "verified failed");
+    require(checked);
 
     g1_points[0].x = target_circuit_final_pair[0];
     g1_points[0].y = target_circuit_final_pair[1];
@@ -971,6 +992,6 @@ library RollupVerifier {
     g2_points[1] = get_target_circuit_g2_n();
 
     checked = pairing(g1_points, g2_points);
-    require(checked, "verified failed");
+    require(checked);
   }
 }

contracts/src/test/L2TxFeeVault.t.sol

@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import { DSTestPlus } from "solmate/test/utils/DSTestPlus.sol";
+
+import { MockScrollMessenger } from "./mocks/MockScrollMessenger.sol";
+import { L2TxFeeVault } from "../L2/predeploys/L2TxFeeVault.sol";
+
+contract L2TxFeeVaultTest is DSTestPlus {
+  MockScrollMessenger private messenger;
+  L2TxFeeVault private vault;
+
+  function setUp() public {
+    messenger = new MockScrollMessenger();
+    vault = new L2TxFeeVault(address(messenger), address(1));
+  }
+
+  function testCantWithdrawBelowMinimum() public {
+    hevm.deal(address(vault), 9 ether);
+    hevm.expectRevert("FeeVault: withdrawal amount must be greater than minimum withdrawal amount");
+    vault.withdraw();
+  }
+
+  function testWithdrawOnce() public {
+    hevm.deal(address(vault), 11 ether);
+    vault.withdraw();
+    assertEq(address(messenger).balance, 11 ether);
+    assertEq(vault.totalProcessed(), 11 ether);
+  }
+
+  function testWithdrawTwice() public {
+    hevm.deal(address(vault), 11 ether);
+    vault.withdraw();
+    assertEq(address(messenger).balance, 11 ether);
+    assertEq(vault.totalProcessed(), 11 ether);
+
+    hevm.deal(address(vault), 22 ether);
+    vault.withdraw();
+    assertEq(address(messenger).balance, 33 ether);
+    assertEq(vault.totalProcessed(), 33 ether);
+  }
+}

coordinator/Makefile

@@ -5,9 +5,9 @@ IMAGE_VERSION=latest
 REPO_ROOT_DIR=./..
 
 ifeq (4.3,$(firstword $(sort $(MAKE_VERSION) 4.3)))
-	ZK_VERSION=$(shell grep -m 1 "common-rs" ../common/libzkp/impl/Cargo.lock | cut -d "#" -f2 | cut -c-7)
+	ZK_VERSION=$(shell grep -m 1 "scroll-zkevm" ../common/libzkp/impl/Cargo.lock | cut -d "#" -f2 | cut -c-7)
 else
-	ZK_VERSION=$(shell grep -m 1 "common-rs" ../common/libzkp/impl/Cargo.lock | cut -d "\#" -f2 | cut -c-7)
+	ZK_VERSION=$(shell grep -m 1 "scroll-zkevm" ../common/libzkp/impl/Cargo.lock | cut -d "\#" -f2 | cut -c-7)
 endif
 
 test:
@@ -15,10 +15,11 @@ test:
 
 libzkp:
 	cd ../common/libzkp/impl && cargo build --release && cp ./target/release/libzkp.a ../interface/
-	cp -r ../common/libzkp/interface ./verifier/lib
+	rm -rf ./verifier/lib && cp -r ../common/libzkp/interface ./verifier/lib
+	find ../common | grep libzktrie.so | xargs -i cp {} ./verifier/lib/
 
 coordinator: libzkp ## Builds the Coordinator instance.
-	go build -ldflags "-X scroll-tech/common/version.ZK_VERSION=${ZK_VERSION}" -o $(PWD)/build/bin/coordinator ./cmd
+	go build -ldflags "-X scroll-tech/common/version.ZkVersion=${ZK_VERSION}" -o $(PWD)/build/bin/coordinator ./cmd
 
 test-verifier: libzkp
 	go test -tags ffi -timeout 0 -v ./verifier

coordinator/api.go

@@ -74,7 +74,7 @@ func (m *Manager) Register(ctx context.Context, authMsg *message.AuthMsg) (*rpc.
 	go func() {
 		defer func() {
 			m.freeRoller(pubkey)
-			log.Info("roller unregister", "name", authMsg.Identity.Name)
+			log.Info("roller unregister", "name", authMsg.Identity.Name, "pubkey", pubkey)
 		}()
 
 		for {
@@ -82,14 +82,14 @@ func (m *Manager) Register(ctx context.Context, authMsg *message.AuthMsg) (*rpc.
 			case task := <-taskCh:
 				notifier.Notify(rpcSub.ID, task) //nolint
 			case err := <-rpcSub.Err():
-				log.Warn("client stopped the ws connection", "err", err)
+				log.Warn("client stopped the ws connection", "name", authMsg.Identity.Name, "pubkey", pubkey, "err", err)
 				return
 			case <-notifier.Closed():
 				return
 			}
 		}
 	}()
-	log.Info("roller register", "name", authMsg.Identity.Name, "version", authMsg.Identity.Version)
+	log.Info("roller register", "name", authMsg.Identity.Name, "pubkey", pubkey, "version", authMsg.Identity.Version)
 
 	return rpcSub, nil
 }
@@ -116,6 +116,5 @@ func (m *Manager) SubmitProof(proof *message.ProofMsg) (bool, error) {
 	}
 	defer m.freeTaskIDForRoller(pubkey, proof.ID)
 
-	log.Info("Received zk proof", "proof id", proof.ID, "result", true)
 	return true, nil
 }

coordinator/cmd/app/app.go

@@ -103,7 +103,7 @@ func action(ctx *cli.Context) error {
 				"%s:%d",
 				ctx.String(wsListenAddrFlag.Name),
 				ctx.Int(wsPortFlag.Name)),
-			apis)
+			apis, cfg.RollerManagerConfig.CompressionLevel)
 		if err != nil {
 			log.Crit("Could not start WS api", "error", err)
 		}

coordinator/cmd/app/app_test.go

@@ -15,5 +15,5 @@ func TestRunCoordinator(t *testing.T) {
 
 	// wait result
 	coordinator.ExpectWithTimeout(true, time.Second*3, fmt.Sprintf("coordinator version %s", version.Version))
-	coordinator.RunApp(false)
+	coordinator.RunApp(nil)
 }

coordinator/config.json

@@ -1,7 +1,7 @@
 {
   "roller_manager_config": {
+    "compression_level": 9,
     "rollers_per_session": 1,
-    "verifier_endpoint": "/tmp/verifier.sock",
     "collection_time": 180,
     "token_time_to_live": 60,
     "verifier": {

coordinator/config/config.go

@@ -12,6 +12,7 @@ import (
 
 // RollerManagerConfig loads sequencer configuration items.
 type RollerManagerConfig struct {
+	CompressionLevel int `json:"compression_level,omitempty"`
 	// asc or desc (default: asc)
 	OrderSession string `json:"order_session,omitempty"`
 	// The amount of rollers to pick per proof generation session.

coordinator/go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/orcaman/concurrent-map v1.0.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20221221073256-5ca70bf3a257
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230210093343-bb26fa3e391d
 	github.com/stretchr/testify v1.8.0
 	github.com/urfave/cli/v2 v2.10.2
 	golang.org/x/sync v0.1.0
@@ -29,14 +29,14 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // 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.4.3 // 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.4.0 // indirect
-	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

coordinator/go.sum

@@ -349,11 +349,10 @@ 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.20221221073256-5ca70bf3a257 h1:FjBC0Ww42WRoiB5EQFxoIEcJqoEUw2twdhN9nGkVCQA=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20221221073256-5ca70bf3a257/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.20230210093343-bb26fa3e391d h1:S4bEgTezJrqYmDfUSkp9Of0/lcglm4CTAWQHSnsn2HE=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230210093343-bb26fa3e391d/go.mod h1:OH4ZTAz6RM1IL0xcQ1zM6+Iy9s2vtcYqqwcEQdfHV7g=
+github.com/scroll-tech/zktrie v0.4.3 h1:RyhusIu8F8u5ITmzqZjkAwlL6jdC9TK9i6tfuJoZcpk=
+github.com/scroll-tech/zktrie v0.4.3/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=
@@ -424,8 +423,8 @@ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPh
 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.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
-golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
+golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 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=
@@ -540,8 +539,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
 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.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
+golang.org/x/sys v0.5.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=
@@ -553,7 +552,7 @@ 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.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
+golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
 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=

coordinator/manager.go

@@ -65,7 +65,6 @@ type Manager struct {
 	// A map containing proof failed or verify failed proof.
 	rollerPool cmap.ConcurrentMap
 
-	// TODO: once put into use, should add to graceful restart.
 	failedSessionInfos map[string]*SessionInfo
 
 	// A direct connection to the Halo2 verifier, used to verify
@@ -195,8 +194,18 @@ func (m *Manager) restorePrevSessions() {
 				finishChan: make(chan rollerProofStatus, proofAndPkBufferSize),
 			}
 			m.sessions[sess.info.ID] = sess
-			log.Info("Coordinator restart reload sessions", "ID", sess.info.ID, "sess", sess.info)
-			go m.CollectProofs(sess.info.ID, sess)
+
+			log.Info("Coordinator restart reload sessions", "session start time", time.Unix(sess.info.StartTimestamp, 0))
+			for _, roller := range sess.info.Rollers {
+				log.Info(
+					"restore roller info for session",
+					"session id", sess.info.ID,
+					"roller name", roller.Name,
+					"public key", roller.PublicKey,
+					"proof status", roller.Status)
+			}
+
+			go m.CollectProofs(sess)
 		}
 	}
 }
@@ -220,17 +229,29 @@ func (m *Manager) handleZkProof(pk string, msg *message.ProofDetail) error {
 	proofTimeSec := uint64(time.Since(time.Unix(sess.info.StartTimestamp, 0)).Seconds())
 
 	// Ensure this roller is eligible to participate in the session.
-	if roller, ok := sess.info.Rollers[pk]; !ok {
-		return fmt.Errorf("roller %s is not eligible to partake in proof session %v", pk, msg.ID)
-	} else if roller.Status == orm.RollerProofValid {
+	roller, ok := sess.info.Rollers[pk]
+	if !ok {
+		return fmt.Errorf("roller %s (%s) is not eligible to partake in proof session %v", roller.Name, roller.PublicKey, msg.ID)
+	}
+	if roller.Status == orm.RollerProofValid {
 		// In order to prevent DoS attacks, it is forbidden to repeatedly submit valid proofs.
 		// TODO: Defend invalid proof resubmissions by one of the following two methods:
 		// (i) slash the roller for each submission of invalid proof
 		// (ii) set the maximum failure retry times
-		log.Warn("roller has already submitted valid proof in proof session", "roller", pk, "proof id", msg.ID)
+		log.Warn(
+			"roller has already submitted valid proof in proof session",
+			"roller name", roller.Name,
+			"roller pk", roller.PublicKey,
+			"proof id", msg.ID,
+		)
 		return nil
 	}
-	log.Info("Received zk proof", "proof id", msg.ID)
+	log.Info(
+		"handling zk proof",
+		"proof id", msg.ID,
+		"roller name", roller.Name,
+		"roller pk", roller.PublicKey,
+	)
 
 	defer func() {
 		// TODO: maybe we should use db tx for the whole process?
@@ -250,12 +271,13 @@ func (m *Manager) handleZkProof(pk string, msg *message.ProofDetail) error {
 	}()
 
 	if msg.Status != message.StatusOk {
-		log.Error("Roller failed to generate proof", "msg.ID", msg.ID, "error", msg.Error)
-		if dbErr = m.orm.UpdateProvingStatus(msg.ID, orm.ProvingTaskFailed); dbErr != nil {
-			log.Error("failed to update task status as failed", "error", dbErr)
-		}
-		// record the failed session.
-		m.addFailedSession(sess, msg.Error)
+		log.Error(
+			"Roller failed to generate proof",
+			"msg.ID", msg.ID,
+			"roller name", roller.Name,
+			"roller pk", roller.PublicKey,
+			"error", msg.Error,
+		)
 		return nil
 	}
 
@@ -280,8 +302,6 @@ func (m *Manager) handleZkProof(pk string, msg *message.ProofDetail) error {
 
 	success, err = m.verifier.VerifyProof(msg.Proof)
 	if err != nil {
-		// record failed session.
-		m.addFailedSession(sess, err.Error())
 		// TODO: this is only a temp workaround for testnet, we should return err in real cases
 		success = false
 		log.Error("Failed to verify zk proof", "proof id", msg.ID, "error", err)
@@ -290,35 +310,31 @@ func (m *Manager) handleZkProof(pk string, msg *message.ProofDetail) error {
 		log.Info("Verify zk proof successfully", "verification result", success, "proof id", msg.ID)
 	}
 
-	var status orm.ProvingStatus
 	if success {
-		status = orm.ProvingTaskVerified
-	} else {
-		// Set status as skipped if verification fails.
-		// Note that this is only a workaround for testnet here.
-		// TODO: In real cases we should reset to orm.ProvingTaskUnassigned
-		// so as to re-distribute the task in the future
-		status = orm.ProvingTaskFailed
+		if dbErr = m.orm.UpdateProvingStatus(msg.ID, orm.ProvingTaskVerified); dbErr != nil {
+			log.Error(
+				"failed to update proving_status",
+				"msg.ID", msg.ID,
+				"status", orm.ProvingTaskVerified,
+				"error", dbErr)
+		}
+		return dbErr
 	}
-	if dbErr = m.orm.UpdateProvingStatus(msg.ID, status); dbErr != nil {
-		log.Error("failed to update proving_status", "msg.ID", msg.ID, "status", status, "error", dbErr)
-	}
-
-	return dbErr
+	return nil
 }
 
 // CollectProofs collects proofs corresponding to a proof generation session.
-func (m *Manager) CollectProofs(id string, sess *session) {
-	timer := time.NewTimer(time.Duration(m.cfg.CollectionTime) * time.Minute)
-
+func (m *Manager) CollectProofs(sess *session) {
 	for {
 		select {
-		case <-timer.C:
+		case <-time.After(time.Duration(m.cfg.CollectionTime) * time.Minute):
 			m.mu.Lock()
-
-			// Ensure proper clean-up of resources.
 			defer func() {
-				delete(m.sessions, id)
+				// TODO: remove the clean-up, rollers report healthy status.
+				for pk := range sess.info.Rollers {
+					m.freeTaskIDForRoller(pk, sess.info.ID)
+				}
+				delete(m.sessions, sess.info.ID)
 				m.mu.Unlock()
 			}()
 
@@ -335,13 +351,13 @@ func (m *Manager) CollectProofs(id string, sess *session) {
 				// record failed session.
 				errMsg := "proof generation session ended without receiving any valid proofs"
 				m.addFailedSession(sess, errMsg)
-				log.Warn(errMsg, "session id", id)
+				log.Warn(errMsg, "session id", sess.info.ID)
 				// Set status as skipped.
 				// Note that this is only a workaround for testnet here.
 				// TODO: In real cases we should reset to orm.ProvingTaskUnassigned
 				// so as to re-distribute the task in the future
-				if err := m.orm.UpdateProvingStatus(id, orm.ProvingTaskFailed); err != nil {
-					log.Error("fail to reset task_status as Unassigned", "id", id, "err", err)
+				if err := m.orm.UpdateProvingStatus(sess.info.ID, orm.ProvingTaskFailed); err != nil {
+					log.Error("fail to reset task_status as Unassigned", "id", sess.info.ID, "err", err)
 				}
 				return
 			}
@@ -351,17 +367,32 @@ func (m *Manager) CollectProofs(id string, sess *session) {
 			_ = participatingRollers[randIndex]
 			// TODO: reward winner
 			return
+
 		case ret := <-sess.finishChan:
 			m.mu.Lock()
 			sess.info.Rollers[ret.pk].Status = ret.status
-			m.mu.Unlock()
+			if m.isSessionFailed(sess.info) {
+				if err := m.orm.UpdateProvingStatus(ret.id, orm.ProvingTaskFailed); err != nil {
+					log.Error("failed to update proving_status as failed", "msg.ID", ret.id, "error", err)
+				}
+			}
 			if err := m.orm.SetSessionInfo(sess.info); err != nil {
 				log.Error("db set session info fail", "pk", ret.pk, "error", err)
 			}
+			m.mu.Unlock()
 		}
 	}
 }
 
+func (m *Manager) isSessionFailed(info *orm.SessionInfo) bool {
+	for _, roller := range info.Rollers {
+		if roller.Status != orm.RollerProofInvalid {
+			return false
+		}
+	}
+	return true
+}
+
 // APIs collect API services.
 func (m *Manager) APIs() []rpc.API {
 	return []rpc.API{
@@ -380,12 +411,12 @@ func (m *Manager) APIs() []rpc.API {
 
 // StartProofGenerationSession starts a proof generation session
 func (m *Manager) StartProofGenerationSession(task *orm.BlockBatch) (success bool) {
-	roller := m.selectRoller()
-	if roller == nil {
+	if m.GetNumberOfIdleRollers() == 0 {
+		log.Warn("no idle roller when starting proof generation session", "id", task.ID)
 		return false
 	}
-	log.Info("start proof generation session", "id", task.ID)
 
+	log.Info("start proof generation session", "id", task.ID)
 	defer func() {
 		if !success {
 			if err := m.orm.UpdateProvingStatus(task.ID, orm.ProvingTaskUnassigned); err != nil {
@@ -393,11 +424,8 @@ func (m *Manager) StartProofGenerationSession(task *orm.BlockBatch) (success boo
 			}
 		}
 	}()
-	if err := m.orm.UpdateProvingStatus(task.ID, orm.ProvingTaskAssigned); err != nil {
-		log.Error("failed to update task status", "id", task.ID, "err", err)
-		return false
-	}
 
+	// Get block traces.
 	blockInfos, err := m.orm.GetBlockInfos(map[string]interface{}{"batch_id": task.ID})
 	if err != nil {
 		log.Error(
@@ -407,7 +435,6 @@ func (m *Manager) StartProofGenerationSession(task *orm.BlockBatch) (success boo
 		)
 		return false
 	}
-
 	traces := make([]*types.BlockTrace, len(blockInfos))
 	for i, blockInfo := range blockInfos {
 		traces[i], err = m.Client.GetBlockTraceByHash(m.ctx, common.HexToHash(blockInfo.Hash))
@@ -422,41 +449,62 @@ func (m *Manager) StartProofGenerationSession(task *orm.BlockBatch) (success boo
 		}
 	}
 
-	log.Info("roller is picked", "name", roller.Name, "public_key", roller.PublicKey)
-
-	// send trace to roller
-	if !roller.sendTask(task.ID, traces) {
-		log.Error("send task failed", "roller name", roller.Name, "id", task.ID)
+	// Dispatch task to rollers.
+	rollers := make(map[string]*orm.RollerStatus)
+	for i := 0; i < int(m.cfg.RollersPerSession); i++ {
+		roller := m.selectRoller()
+		if roller == nil {
+			log.Info("selectRoller returns nil")
+			break
+		}
+		log.Info("roller is picked", "session id", task.ID, "name", roller.Name, "public key", roller.PublicKey)
+		// send trace to roller
+		if !roller.sendTask(task.ID, traces) {
+			log.Error("send task failed", "roller name", roller.Name, "public key", roller.PublicKey, "id", task.ID)
+			continue
+		}
+		rollers[roller.PublicKey] = &orm.RollerStatus{PublicKey: roller.PublicKey, Name: roller.Name, Status: orm.RollerAssigned}
+	}
+	// No roller assigned.
+	if len(rollers) == 0 {
+		log.Error("no roller assigned", "id", task.ID, "number of idle rollers", m.GetNumberOfIdleRollers())
+		return false
+	}
+
+	// Update session proving status as assigned.
+	if err = m.orm.UpdateProvingStatus(task.ID, orm.ProvingTaskAssigned); err != nil {
+		log.Error("failed to update task status", "id", task.ID, "err", err)
 		return false
 	}
 
-	pk := roller.PublicKey
 	// Create a proof generation session.
-	s := &session{
+	sess := &session{
 		info: &orm.SessionInfo{
-			ID: task.ID,
-			Rollers: map[string]*orm.RollerStatus{
-				pk: {
-					PublicKey: pk,
-					Name:      roller.Name,
-					Status:    orm.RollerAssigned,
-				},
-			},
+			ID:             task.ID,
+			Rollers:        rollers,
 			StartTimestamp: time.Now().Unix(),
 		},
 		finishChan: make(chan rollerProofStatus, proofAndPkBufferSize),
 	}
 
 	// Store session info.
-	if err = m.orm.SetSessionInfo(s.info); err != nil {
-		log.Error("db set session info fail", "pk", pk, "error", err)
+	if err = m.orm.SetSessionInfo(sess.info); err != nil {
+		log.Error("db set session info fail", "error", err)
+		for _, roller := range sess.info.Rollers {
+			log.Error(
+				"restore roller info for session",
+				"session id", sess.info.ID,
+				"roller name", roller.Name,
+				"public key", roller.PublicKey,
+				"proof status", roller.Status)
+		}
 		return false
 	}
 
 	m.mu.Lock()
-	m.sessions[task.ID] = s
+	m.sessions[task.ID] = sess
 	m.mu.Unlock()
-	go m.CollectProofs(task.ID, s)
+	go m.CollectProofs(sess)
 
 	return true
 }

coordinator/manager_test.go

@@ -1,6 +1,7 @@
 package coordinator_test
 
 import (
+	"compress/flate"
 	"context"
 	"crypto/ecdsa"
 	"crypto/rand"
@@ -40,7 +41,7 @@ var (
 	dbImg docker.ImgInstance
 )
 
-func randomUrl() string {
+func randomURL() string {
 	id, _ := rand.Int(rand.Reader, big.NewInt(2000-1))
 	return fmt.Sprintf("localhost:%d", 10000+2000+id.Int64())
 }
@@ -64,6 +65,8 @@ func TestApis(t *testing.T) {
 	t.Run("TestHandshake", testHandshake)
 	t.Run("TestFailedHandshake", testFailedHandshake)
 	t.Run("TestSeveralConnections", testSeveralConnections)
+	t.Run("TestValidProof", testValidProof)
+	t.Run("TestInvalidProof", testInvalidProof)
 	t.Run("TestIdleRollerSelection", testIdleRollerSelection)
 	// TODO: Restart roller alone when received task, can add this test case in integration-test.
 	//t.Run("TestRollerReconnect", testRollerReconnect)
@@ -83,8 +86,8 @@ func testHandshake(t *testing.T) {
 	defer l2db.Close()
 
 	// Setup coordinator and ws server.
-	wsURL := "ws://" + randomUrl()
-	rollerManager, handler := setupCoordinator(t, cfg.DBConfig, wsURL)
+	wsURL := "ws://" + randomURL()
+	rollerManager, handler := setupCoordinator(t, cfg.DBConfig, 1, wsURL)
 	defer func() {
 		handler.Shutdown(context.Background())
 		rollerManager.Stop()
@@ -104,8 +107,8 @@ func testFailedHandshake(t *testing.T) {
 	defer l2db.Close()
 
 	// Setup coordinator and ws server.
-	wsURL := "ws://" + randomUrl()
-	rollerManager, handler := setupCoordinator(t, cfg.DBConfig, wsURL)
+	wsURL := "ws://" + randomURL()
+	rollerManager, handler := setupCoordinator(t, cfg.DBConfig, 1, wsURL)
 	defer func() {
 		handler.Shutdown(context.Background())
 		rollerManager.Stop()
@@ -127,7 +130,7 @@ func testFailedHandshake(t *testing.T) {
 	authMsg := &message.AuthMsg{
 		Identity: &message.Identity{
 			Name:      name,
-			Timestamp: time.Now().UnixNano(),
+			Timestamp: uint32(time.Now().Unix()),
 		},
 	}
 	assert.NoError(t, authMsg.Sign(privkey))
@@ -145,7 +148,7 @@ func testFailedHandshake(t *testing.T) {
 	authMsg = &message.AuthMsg{
 		Identity: &message.Identity{
 			Name:      name,
-			Timestamp: time.Now().UnixNano(),
+			Timestamp: uint32(time.Now().Unix()),
 		},
 	}
 	assert.NoError(t, authMsg.Sign(privkey))
@@ -170,8 +173,8 @@ func testSeveralConnections(t *testing.T) {
 	defer l2db.Close()
 
 	// Setup coordinator and ws server.
-	wsURL := "ws://" + randomUrl()
-	rollerManager, handler := setupCoordinator(t, cfg.DBConfig, wsURL)
+	wsURL := "ws://" + randomURL()
+	rollerManager, handler := setupCoordinator(t, cfg.DBConfig, 1, wsURL)
 	defer func() {
 		handler.Shutdown(context.Background())
 		rollerManager.Stop()
@@ -215,6 +218,124 @@ func testSeveralConnections(t *testing.T) {
 		}
 	}
 }
+func testValidProof(t *testing.T) {
+	// Create db handler and reset db.
+	l2db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(l2db.GetDB().DB))
+	defer l2db.Close()
+
+	// Setup coordinator and ws server.
+	wsURL := "ws://" + randomURL()
+	rollerManager, handler := setupCoordinator(t, cfg.DBConfig, 3, wsURL)
+	defer func() {
+		handler.Shutdown(context.Background())
+		rollerManager.Stop()
+	}()
+
+	// create mock rollers.
+	rollers := make([]*mockRoller, 3)
+	for i := 0; i < len(rollers); i++ {
+		rollers[i] = newMockRoller(t, "roller_test"+strconv.Itoa(i), wsURL)
+		// only roller 0 submits valid proof.
+		rollers[i].waitTaskAndSendProof(t, time.Second, false, i == 0)
+	}
+	defer func() {
+		// close connection
+		for _, roller := range rollers {
+			roller.close()
+		}
+	}()
+	assert.Equal(t, 3, rollerManager.GetNumberOfIdleRollers())
+
+	var ids = make([]string, 1)
+	dbTx, err := l2db.Beginx()
+	assert.NoError(t, err)
+	for i := range ids {
+		ID, err := l2db.NewBatchInDBTx(dbTx, &orm.BlockInfo{Number: uint64(i)}, &orm.BlockInfo{Number: uint64(i)}, "0f", 1, 194676)
+		assert.NoError(t, err)
+		ids[i] = ID
+	}
+	assert.NoError(t, dbTx.Commit())
+
+	// verify proof status
+	var (
+		tick     = time.Tick(500 * time.Millisecond)
+		tickStop = time.Tick(10 * time.Second)
+	)
+	for len(ids) > 0 {
+		select {
+		case <-tick:
+			status, err := l2db.GetProvingStatusByID(ids[0])
+			assert.NoError(t, err)
+			if status == orm.ProvingTaskVerified {
+				ids = ids[1:]
+			}
+		case <-tickStop:
+			t.Error("failed to check proof status")
+			return
+		}
+	}
+}
+
+func testInvalidProof(t *testing.T) {
+	// Create db handler and reset db.
+	l2db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(l2db.GetDB().DB))
+	defer l2db.Close()
+
+	// Setup coordinator and ws server.
+	wsURL := "ws://" + randomURL()
+	rollerManager, handler := setupCoordinator(t, cfg.DBConfig, 3, wsURL)
+	defer func() {
+		handler.Shutdown(context.Background())
+		rollerManager.Stop()
+	}()
+
+	// create mock rollers.
+	rollers := make([]*mockRoller, 3)
+	for i := 0; i < len(rollers); i++ {
+		rollers[i] = newMockRoller(t, "roller_test"+strconv.Itoa(i), wsURL)
+		rollers[i].waitTaskAndSendProof(t, time.Second, false, false)
+	}
+	defer func() {
+		// close connection
+		for _, roller := range rollers {
+			roller.close()
+		}
+	}()
+	assert.Equal(t, 3, rollerManager.GetNumberOfIdleRollers())
+
+	var ids = make([]string, 1)
+	dbTx, err := l2db.Beginx()
+	assert.NoError(t, err)
+	for i := range ids {
+		ID, err := l2db.NewBatchInDBTx(dbTx, &orm.BlockInfo{Number: uint64(i)}, &orm.BlockInfo{Number: uint64(i)}, "0f", 1, 194676)
+		assert.NoError(t, err)
+		ids[i] = ID
+	}
+	assert.NoError(t, dbTx.Commit())
+
+	// verify proof status
+	var (
+		tick     = time.Tick(500 * time.Millisecond)
+		tickStop = time.Tick(10 * time.Second)
+	)
+	for len(ids) > 0 {
+		select {
+		case <-tick:
+			status, err := l2db.GetProvingStatusByID(ids[0])
+			assert.NoError(t, err)
+			if status == orm.ProvingTaskFailed {
+				ids = ids[1:]
+			}
+		case <-tickStop:
+			t.Error("failed to check proof status")
+			return
+		}
+	}
+}
 
 func testIdleRollerSelection(t *testing.T) {
 	// Create db handler and reset db.
@@ -224,8 +345,8 @@ func testIdleRollerSelection(t *testing.T) {
 	defer l2db.Close()
 
 	// Setup coordinator and ws server.
-	wsURL := "ws://" + randomUrl()
-	rollerManager, handler := setupCoordinator(t, cfg.DBConfig, wsURL)
+	wsURL := "ws://" + randomURL()
+	rollerManager, handler := setupCoordinator(t, cfg.DBConfig, 1, wsURL)
 	defer func() {
 		handler.Shutdown(context.Background())
 		rollerManager.Stop()
@@ -235,7 +356,7 @@ func testIdleRollerSelection(t *testing.T) {
 	rollers := make([]*mockRoller, 20)
 	for i := 0; i < len(rollers); i++ {
 		rollers[i] = newMockRoller(t, "roller_test"+strconv.Itoa(i), wsURL)
-		rollers[i].waitTaskAndSendProof(t, time.Second, false)
+		rollers[i].waitTaskAndSendProof(t, time.Second, false, true)
 	}
 	defer func() {
 		// close connection
@@ -293,13 +414,13 @@ func testGracefulRestart(t *testing.T) {
 	assert.NoError(t, dbTx.Commit())
 
 	// Setup coordinator and ws server.
-	wsURL := "ws://" + randomUrl()
-	rollerManager, handler := setupCoordinator(t, cfg.DBConfig, wsURL)
+	wsURL := "ws://" + randomURL()
+	rollerManager, handler := setupCoordinator(t, cfg.DBConfig, 1, wsURL)
 
 	// create mock roller
 	roller := newMockRoller(t, "roller_test", wsURL)
 	// wait 10 seconds, coordinator restarts before roller submits proof
-	roller.waitTaskAndSendProof(t, 10*time.Second, false)
+	roller.waitTaskAndSendProof(t, 10*time.Second, false, true)
 
 	// wait for coordinator to dispatch task
 	<-time.After(5 * time.Second)
@@ -311,7 +432,7 @@ func testGracefulRestart(t *testing.T) {
 	rollerManager.Stop()
 
 	// Setup new coordinator and ws server.
-	newRollerManager, newHandler := setupCoordinator(t, cfg.DBConfig, wsURL)
+	newRollerManager, newHandler := setupCoordinator(t, cfg.DBConfig, 1, wsURL)
 	defer func() {
 		newHandler.Shutdown(context.Background())
 		newRollerManager.Stop()
@@ -329,7 +450,7 @@ func testGracefulRestart(t *testing.T) {
 	}
 
 	// will overwrite the roller client for `SubmitProof`
-	roller.waitTaskAndSendProof(t, time.Millisecond*500, true)
+	roller.waitTaskAndSendProof(t, time.Millisecond*500, true, true)
 	defer roller.close()
 
 	// verify proof status
@@ -355,13 +476,13 @@ func testGracefulRestart(t *testing.T) {
 	}
 }
 
-func setupCoordinator(t *testing.T, dbCfg *database.DBConfig, wsURL string) (rollerManager *coordinator.Manager, handler *http.Server) {
+func setupCoordinator(t *testing.T, dbCfg *database.DBConfig, rollersPerSession uint8, wsURL string) (rollerManager *coordinator.Manager, handler *http.Server) {
 	// Get db handler.
 	db, err := database.NewOrmFactory(dbCfg)
 	assert.True(t, assert.NoError(t, err), "failed to get db handler.")
 
 	rollerManager, err = coordinator.New(context.Background(), &coordinator_config.RollerManagerConfig{
-		RollersPerSession: 1,
+		RollersPerSession: rollersPerSession,
 		Verifier:          &coordinator_config.VerifierConfig{MockMode: true},
 		CollectionTime:    1,
 		TokenTimeToLive:   5,
@@ -370,7 +491,7 @@ func setupCoordinator(t *testing.T, dbCfg *database.DBConfig, wsURL string) (rol
 	assert.NoError(t, rollerManager.Start())
 
 	// start ws service
-	handler, _, err = utils.StartWSEndpoint(strings.Split(wsURL, "//")[1], rollerManager.APIs())
+	handler, _, err = utils.StartWSEndpoint(strings.Split(wsURL, "//")[1], rollerManager.APIs(), flate.NoCompression)
 	assert.NoError(t, err)
 
 	return rollerManager, handler
@@ -419,7 +540,7 @@ func (r *mockRoller) connectToCoordinator() (*client2.Client, ethereum.Subscript
 	authMsg := &message.AuthMsg{
 		Identity: &message.Identity{
 			Name:      r.rollerName,
-			Timestamp: time.Now().UnixNano(),
+			Timestamp: uint32(time.Now().Unix()),
 		},
 	}
 	_ = authMsg.Sign(r.privKey)
@@ -448,7 +569,7 @@ func (r *mockRoller) releaseTasks() {
 }
 
 // Wait for the proof task, after receiving the proof task, roller submits proof after proofTime secs.
-func (r *mockRoller) waitTaskAndSendProof(t *testing.T, proofTime time.Duration, reconnect bool) {
+func (r *mockRoller) waitTaskAndSendProof(t *testing.T, proofTime time.Duration, reconnect bool, validProof bool) {
 	// simulating the case that the roller first disconnects and then reconnects to the coordinator
 	// the Subscription and its `Err()` channel will be closed, and the coordinator will `freeRoller()`
 	if reconnect {
@@ -464,10 +585,10 @@ func (r *mockRoller) waitTaskAndSendProof(t *testing.T, proofTime time.Duration,
 	r.releaseTasks()
 
 	r.stopCh = make(chan struct{})
-	go r.loop(t, r.client, proofTime, r.stopCh)
+	go r.loop(t, r.client, proofTime, validProof, r.stopCh)
 }
 
-func (r *mockRoller) loop(t *testing.T, client *client2.Client, proofTime time.Duration, stopCh chan struct{}) {
+func (r *mockRoller) loop(t *testing.T, client *client2.Client, proofTime time.Duration, validProof bool, stopCh chan struct{}) {
 	for {
 		select {
 		case task := <-r.taskCh:
@@ -485,6 +606,9 @@ func (r *mockRoller) loop(t *testing.T, client *client2.Client, proofTime time.D
 					Proof:  &message.AggProof{},
 				},
 			}
+			if !validProof {
+				proof.Status = message.StatusProofError
+			}
 			assert.NoError(t, proof.Sign(r.privKey))
 			ok, err := client.SubmitProof(context.Background(), proof)
 			assert.NoError(t, err)

coordinator/rollers.go

@@ -41,7 +41,7 @@ func (r *rollerNode) sendTask(id string, traces []*types.BlockTrace) bool {
 	}:
 		r.TaskIDs.Set(id, struct{}{})
 	default:
-		log.Warn("roller channel is full")
+		log.Warn("roller channel is full", "roller name", r.Name, "public key", r.PublicKey)
 		return false
 	}
 	return true
@@ -77,6 +77,7 @@ func (m *Manager) register(pubkey string, identity *message.Identity) (<-chan *m
 	roller := node.(*rollerNode)
 	// avoid reconnection too frequently.
 	if time.Since(roller.registerTime) < 60 {
+		log.Warn("roller reconnect too frequently", "roller_name", identity.Name, "public key", pubkey)
 		return nil, fmt.Errorf("roller reconnect too frequently")
 	}
 	// update register time and status
@@ -105,17 +106,18 @@ func (m *Manager) freeTaskIDForRoller(pk string, id string) {
 }
 
 // GetNumberOfIdleRollers return the count of idle rollers.
-func (m *Manager) GetNumberOfIdleRollers() int {
-	pubkeys := m.rollerPool.Keys()
-	for i := 0; i < len(pubkeys); i++ {
-		if val, ok := m.rollerPool.Get(pubkeys[i]); ok {
+func (m *Manager) GetNumberOfIdleRollers() (count int) {
+	for i, pk := range m.rollerPool.Keys() {
+		if val, ok := m.rollerPool.Get(pk); ok {
 			r := val.(*rollerNode)
-			if r.TaskIDs.Count() > 0 {
-				pubkeys[i], pubkeys = pubkeys[len(pubkeys)-1], pubkeys[:len(pubkeys)-1]
+			if r.TaskIDs.Count() == 0 {
+				count++
 			}
+		} else {
+			log.Error("rollerPool Get fail", "pk", pk, "idx", i, "pk len", pk)
 		}
 	}
-	return len(pubkeys)
+	return count
 }
 
 func (m *Manager) selectRoller() *rollerNode {
@@ -127,6 +129,8 @@ func (m *Manager) selectRoller() *rollerNode {
 			if r.TaskIDs.Count() == 0 {
 				return r
 			}
+		} else {
+			log.Error("rollerPool Get fail", "pk", pubkeys[idx.Int64()], "idx", idx.Int64(), "pk len", len(pubkeys))
 		}
 		pubkeys[idx.Int64()], pubkeys = pubkeys[0], pubkeys[1:]
 	}

coordinator/verifier/verifier.go

@@ -3,8 +3,8 @@
 package verifier
 
 /*
-#cgo LDFLAGS: ${SRCDIR}/lib/libzkp.a -lm -ldl
-#cgo gpu LDFLAGS: ${SRCDIR}/lib/libzkp.a -lm -ldl -lgmp -lstdc++ -lprocps -L/usr/local/cuda/lib64/ -lcudart
+#cgo LDFLAGS: ${SRCDIR}/lib/libzkp.a -lm -ldl -lzktrie -L${SRCDIR}/lib/ -Wl,-rpath=${SRCDIR}/lib
+#cgo gpu LDFLAGS: ${SRCDIR}/lib/libzkp.a -lm -ldl -lgmp -lstdc++ -lprocps -lzktrie -L/usr/local/cuda/lib64/ -L${SRCDIR}/lib/ -lcudart -Wl,-rpath=${SRCDIR}/lib
 #include <stdlib.h>
 #include "./lib/libzkp.h"
 */

coordinator/verifier/verifier_test.go

@@ -16,17 +16,23 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
+const (
+	paramsPath = "../assets/test_params"
+	aggVkPath  = "../assets/agg_vk"
+	proofPath  = "../assets/agg_proof"
+)
+
 func TestFFI(t *testing.T) {
 	as := assert.New(t)
 	cfg := &config.VerifierConfig{
 		MockMode:   false,
-		ParamsPath: "../assets/test_params",
-		AggVkPath:  "../assets/agg_vk",
+		ParamsPath: paramsPath,
+		AggVkPath:  aggVkPath,
 	}
 	v, err := verifier.NewVerifier(cfg)
 	as.NoError(err)
 
-	f, err := os.Open("../assets/agg_proof")
+	f, err := os.Open(proofPath)
 	as.NoError(err)
 	byt, err := io.ReadAll(f)
 	as.NoError(err)

database/cmd/app/app_test.go

@@ -15,5 +15,5 @@ func TestRunDatabase(t *testing.T) {
 
 	// wait result
 	bridge.ExpectWithTimeout(true, time.Second*3, fmt.Sprintf("db_cli version %s", version.Version))
-	bridge.RunApp(false)
+	bridge.RunApp(nil)
 }

database/go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/lib/pq v1.10.6
 	github.com/mattn/go-sqlite3 v1.14.14
 	github.com/pressly/goose/v3 v3.7.0
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20221221073256-5ca70bf3a257
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230210093343-bb26fa3e391d
 	github.com/stretchr/testify v1.8.0
 	github.com/urfave/cli/v2 v2.10.2
 )
@@ -24,12 +24,12 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // 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.4.3 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/crypto v0.4.0 // indirect
-	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
+	golang.org/x/sys v0.5.0 // indirect
 	golang.org/x/tools v0.3.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

database/go.sum

@@ -339,11 +339,10 @@ 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.20221221073256-5ca70bf3a257 h1:FjBC0Ww42WRoiB5EQFxoIEcJqoEUw2twdhN9nGkVCQA=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20221221073256-5ca70bf3a257/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.20230210093343-bb26fa3e391d h1:S4bEgTezJrqYmDfUSkp9Of0/lcglm4CTAWQHSnsn2HE=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230210093343-bb26fa3e391d/go.mod h1:OH4ZTAz6RM1IL0xcQ1zM6+Iy9s2vtcYqqwcEQdfHV7g=
+github.com/scroll-tech/zktrie v0.4.3 h1:RyhusIu8F8u5ITmzqZjkAwlL6jdC9TK9i6tfuJoZcpk=
+github.com/scroll-tech/zktrie v0.4.3/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=
@@ -412,8 +411,8 @@ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPh
 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.4.0 h1:UVQgzMY87xqpKNgb+kDsll2Igd33HszWHFLmpaRMq/8=
-golang.org/x/crypto v0.4.0/go.mod h1:3quD/ATkf6oY+rnes5c3ExXTbLc8mueNue5/DoinL80=
+golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 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=
@@ -526,8 +525,8 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
 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.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
+golang.org/x/sys v0.5.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=

database/migrate/migrations/00002_l1_message.sql

@@ -20,7 +20,7 @@ create table l1_message
 );
 
 comment
-on column l1_message.status is 'undefined, pending, submitted, confirmed';
+on column l1_message.status is 'undefined, pending, submitted, confirmed, failed, expired';
 
 create unique index l1_message_hash_uindex
 on l1_message (msg_hash);