add draft version of EnforcedTransactionQueue

.github/workflows/bridge.yml

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

.github/workflows/common.yml

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

.github/workflows/contracts.yaml

@@ -8,7 +8,6 @@ on:
       - prod
       - release/*
       - staging
-      - alpha
     paths:
       - 'contracts/**'
       - '.github/workflows/contracts.yaml'
@@ -19,7 +18,6 @@ on:
       - prod
       - release/*
       - staging
-      - alpha
     paths:
       - 'contracts/**'
       - '.github/workflows/contracts.yaml'

.github/workflows/coordinator.yml

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

.github/workflows/database.yml

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

.github/workflows/roller.yml

@@ -5,7 +5,6 @@ on:
     branches:
       - main
       - staging
-      - alpha
     paths:
       - 'roller/**'
       - '.github/workflows/roller.yml'
@@ -13,7 +12,6 @@ on:
     branches:
       - main
       - staging
-      - alpha
     paths:
       - 'roller/**'
       - '.github/workflows/roller.yml'
@@ -28,7 +26,7 @@ jobs:
     steps:
     - uses: actions-rs/toolchain@v1
       with:
-        toolchain: nightly-2022-12-10
+        toolchain: nightly-2022-08-23
         override: true
         components: rustfmt, clippy
     - name: Install Go
@@ -44,8 +42,6 @@ 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

Jenkinsfile

@@ -13,8 +13,6 @@ 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 {

Makefile

@@ -1,7 +1,5 @@
 .PHONY: check update dev_docker clean
 
-ZKP_VERSION=release-1220
-
 help: ## Display this help message
 	@grep -h \
 		-E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | \
@@ -31,15 +29,5 @@ dev_docker: ## build docker images for development/testing usages
 	docker build -t scroll_l1geth ./common/docker/l1geth/
 	docker build -t scroll_l2geth ./common/docker/l2geth/
 
-test_zkp: ## Test zkp prove and verify, roller/prover generates the proof and coordinator/verifier verifies it
-	mkdir -p test_params
-	wget https://circuit-release.s3.us-west-2.amazonaws.com/circuit-release/${ZKP_VERSION}/test_params/params19 -O ./test_params/params19
-	wget https://circuit-release.s3.us-west-2.amazonaws.com/circuit-release/${ZKP_VERSION}/test_params/params26 -O ./test_params/params26
-	wget https://circuit-release.s3.us-west-2.amazonaws.com/circuit-release/${ZKP_VERSION}/test_seed -O test_seed
-	rm -rf ./roller/assets/test_params && mv test_params ./roller/assets/ && mv test_seed ./roller/assets/
-	cd ./roller && make test-gpu-prover
-	rm -rf ./coordinator/assets/test_params && mv ./roller/assets/test_params ./coordinator/assets/ && mv ./roller/assets/agg_proof ./coordinator/assets/
-	cd ./coordinator && make test-gpu-verifier
-
 clean: ## Empty out the bin folder
 	@rm -rf build/bin

bridge/abi/bridge_abi.go

@@ -9,38 +9,34 @@ import (
 )
 
 var (
-	// ScrollChainABI holds information about ScrollChain's context and available invokable methods.
-	ScrollChainABI *abi.ABI
-	// L1ScrollMessengerABI holds information about L1ScrollMessenger's context and available invokable methods.
-	L1ScrollMessengerABI *abi.ABI
+	// RollupABI holds information about ZKRollup contracts' context and available invokable methods.
+	RollupABI *abi.ABI
+	// L1MessengerABI holds information about L1ScrollMessenger contract's context and available invokable methods.
+	L1MessengerABI *abi.ABI
 	// L1MessageQueueABI holds information about L1MessageQueue contract's context and available invokable methods.
 	L1MessageQueueABI *abi.ABI
-	// L2GasPriceOracleABI holds information about L2GasPriceOracle's context and available invokable methods.
-	L2GasPriceOracleABI *abi.ABI
 
-	// L2ScrollMessengerABI holds information about L2ScrollMessenger's context and available invokable methods.
-	L2ScrollMessengerABI *abi.ABI
+	// L2MessengerABI holds information about L2ScrollMessenger contract's context and available invokable methods.
+	L2MessengerABI *abi.ABI
 	// L1BlockContainerABI holds information about L1BlockContainer contract's context and available invokable methods.
 	L1BlockContainerABI *abi.ABI
-	// L1GasPriceOracleABI holds information about L1GasPriceOracle's context and available invokable methods.
-	L1GasPriceOracleABI *abi.ABI
 	// L2MessageQueueABI holds information about L2MessageQueue contract's context and available invokable methods.
 	L2MessageQueueABI *abi.ABI
 
-	// L1SentMessageEventSignature = keccak256("SentMessage(address,address,uint256,uint256,uint256,bytes)")
+	// L1SentMessageEventSignature = keccak256("SentMessage(address,address,uint256,uint256,uint256,bytes,uint256,uint256)")
 	L1SentMessageEventSignature common.Hash
 	// L1RelayedMessageEventSignature = keccak256("RelayedMessage(bytes32)")
 	L1RelayedMessageEventSignature common.Hash
 	// L1FailedRelayedMessageEventSignature = keccak256("FailedRelayedMessage(bytes32)")
 	L1FailedRelayedMessageEventSignature common.Hash
 
-	// L1CommitBatchEventSignature = keccak256("CommitBatch(bytes32)")
+	// L1CommitBatchEventSignature = keccak256("CommitBatch(bytes32,bytes32,uint256,bytes32)")
 	L1CommitBatchEventSignature common.Hash
-	// L1FinalizeBatchEventSignature = keccak256("FinalizeBatch(bytes32)")
+	// L1FinalizeBatchEventSignature = keccak256("FinalizeBatch(bytes32,bytes32,uint256,bytes32)")
 	L1FinalizeBatchEventSignature common.Hash
 
-	// L1QueueTransactionEventSignature = keccak256("QueueTransaction(address,address,uint256,uint256,uint256,bytes)")
-	L1QueueTransactionEventSignature common.Hash
+	// L1AppendMessageEventSignature = keccak256("AppendMessage(bytes32)")
+	L1AppendMessageEventSignature common.Hash
 
 	// L2SentMessageEventSignature = keccak256("SentMessage(address,address,uint256,uint256,uint256,bytes,uint256,uint256)")
 	L2SentMessageEventSignature common.Hash
@@ -49,7 +45,7 @@ var (
 	// L2FailedRelayedMessageEventSignature = keccak256("FailedRelayedMessage(bytes32)")
 	L2FailedRelayedMessageEventSignature common.Hash
 
-	// L2ImportBlockEventSignature = keccak256("ImportBlock(bytes32,uint256,uint256,uint256,bytes32)")
+	// L2ImportBlockEventSignature = keccak256("ImportBlock(bytes32,uint256,uint256,bytes32)")
 	L2ImportBlockEventSignature common.Hash
 
 	// L2AppendMessageEventSignature = keccak256("AppendMessage(uint256,bytes32)")
@@ -57,28 +53,26 @@ var (
 )
 
 func init() {
-	ScrollChainABI, _ = ScrollChainMetaData.GetAbi()
-	L1ScrollMessengerABI, _ = L1ScrollMessengerMetaData.GetAbi()
+	L1MessengerABI, _ = L1MessengerMetaData.GetAbi()
+	RollupABI, _ = RollupMetaData.GetAbi()
 	L1MessageQueueABI, _ = L1MessageQueueMetaData.GetAbi()
-	L2GasPriceOracleABI, _ = L2GasPriceOracleMetaData.GetAbi()
 
-	L2ScrollMessengerABI, _ = L2ScrollMessengerMetaData.GetAbi()
+	L2MessengerABI, _ = L2MessengerMetaData.GetAbi()
 	L1BlockContainerABI, _ = L1BlockContainerMetaData.GetAbi()
 	L2MessageQueueABI, _ = L2MessageQueueMetaData.GetAbi()
-	L1GasPriceOracleABI, _ = L1GasPriceOracleMetaData.GetAbi()
 
-	L1SentMessageEventSignature = L1ScrollMessengerABI.Events["SentMessage"].ID
-	L1RelayedMessageEventSignature = L1ScrollMessengerABI.Events["RelayedMessage"].ID
-	L1FailedRelayedMessageEventSignature = L1ScrollMessengerABI.Events["FailedRelayedMessage"].ID
+	L1SentMessageEventSignature = L1MessengerABI.Events["SentMessage"].ID
+	L1RelayedMessageEventSignature = L1MessengerABI.Events["RelayedMessage"].ID
+	L1FailedRelayedMessageEventSignature = L1MessengerABI.Events["FailedRelayedMessage"].ID
 
-	L1CommitBatchEventSignature = ScrollChainABI.Events["CommitBatch"].ID
-	L1FinalizeBatchEventSignature = ScrollChainABI.Events["FinalizeBatch"].ID
+	L1CommitBatchEventSignature = RollupABI.Events["CommitBatch"].ID
+	L1FinalizeBatchEventSignature = RollupABI.Events["FinalizeBatch"].ID
 
-	L1QueueTransactionEventSignature = L1MessageQueueABI.Events["QueueTransaction"].ID
+	L1AppendMessageEventSignature = L1MessageQueueABI.Events["AppendMessage"].ID
 
-	L2SentMessageEventSignature = L2ScrollMessengerABI.Events["SentMessage"].ID
-	L2RelayedMessageEventSignature = L2ScrollMessengerABI.Events["RelayedMessage"].ID
-	L2FailedRelayedMessageEventSignature = L2ScrollMessengerABI.Events["FailedRelayedMessage"].ID
+	L2SentMessageEventSignature = L2MessengerABI.Events["SentMessage"].ID
+	L2RelayedMessageEventSignature = L2MessengerABI.Events["RelayedMessage"].ID
+	L2FailedRelayedMessageEventSignature = L2MessengerABI.Events["FailedRelayedMessage"].ID
 
 	L2ImportBlockEventSignature = L1BlockContainerABI.Events["ImportBlock"].ID
 
@@ -87,118 +81,138 @@ func init() {
 
 // Generated manually from abigen and only necessary events and mutable calls are kept.
 
-// ScrollChainMetaData contains all meta data concerning the ScrollChain contract.
-var ScrollChainMetaData = &bind.MetaData{
-	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"batchHash\",\"type\":\"bytes32\"}],\"name\":\"CommitBatch\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"batchHash\",\"type\":\"bytes32\"}],\"name\":\"FinalizeBatch\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"batchHash\",\"type\":\"bytes32\"}],\"name\":\"RevertBatch\",\"type\":\"event\"},{\"inputs\":[{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"parentHash\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"blockNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"timestamp\",\"type\":\"uint64\"},{\"internalType\":\"uint256\",\"name\":\"baseFee\",\"type\":\"uint256\"},{\"internalType\":\"uint64\",\"name\":\"gasLimit\",\"type\":\"uint64\"},{\"internalType\":\"uint16\",\"name\":\"numTransactions\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"numL1Messages\",\"type\":\"uint16\"}],\"internalType\":\"structIScrollChain.BlockContext[]\",\"name\":\"blocks\",\"type\":\"tuple[]\"},{\"internalType\":\"bytes32\",\"name\":\"prevStateRoot\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"newStateRoot\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"withdrawTrieRoot\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"batchIndex\",\"type\":\"uint64\"},{\"internalType\":\"bytes32\",\"name\":\"parentBatchHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"l2Transactions\",\"type\":\"bytes\"}],\"internalType\":\"structIScrollChain.Batch\",\"name\":\"batch\",\"type\":\"tuple\"}],\"name\":\"commitBatch\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"parentHash\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"blockNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"timestamp\",\"type\":\"uint64\"},{\"internalType\":\"uint256\",\"name\":\"baseFee\",\"type\":\"uint256\"},{\"internalType\":\"uint64\",\"name\":\"gasLimit\",\"type\":\"uint64\"},{\"internalType\":\"uint16\",\"name\":\"numTransactions\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"numL1Messages\",\"type\":\"uint16\"}],\"internalType\":\"structIScrollChain.BlockContext[]\",\"name\":\"blocks\",\"type\":\"tuple[]\"},{\"internalType\":\"bytes32\",\"name\":\"prevStateRoot\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"newStateRoot\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"withdrawTrieRoot\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"batchIndex\",\"type\":\"uint64\"},{\"internalType\":\"bytes32\",\"name\":\"parentBatchHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"l2Transactions\",\"type\":\"bytes\"}],\"internalType\":\"structIScrollChain.Batch[]\",\"name\":\"batches\",\"type\":\"tuple[]\"}],\"name\":\"commitBatches\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"batchId\",\"type\":\"bytes32\"},{\"internalType\":\"uint256[]\",\"name\":\"proof\",\"type\":\"uint256[]\"},{\"internalType\":\"uint256[]\",\"name\":\"instances\",\"type\":\"uint256[]\"}],\"name\":\"finalizeBatchWithProof\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"batchHash\",\"type\":\"bytes32\"}],\"name\":\"getL2MessageRoot\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"batchHash\",\"type\":\"bytes32\"}],\"name\":\"isBatchFinalized\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"batchId\",\"type\":\"bytes32\"}],\"name\":\"revertBatch\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
+// L1MessengerMetaData contains all meta data concerning the L1Messenger contract.
+var L1MessengerMetaData = &bind.MetaData{
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"msgHash\",\"type\":\"bytes32\"}],\"name\":\"FailedRelayedMessage\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"msgHash\",\"type\":\"bytes32\"}],\"name\":\"MessageDropped\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"msgHash\",\"type\":\"bytes32\"}],\"name\":\"RelayedMessage\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"fee\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"messageNonce\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"}],\"name\":\"SentMessage\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_from\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_value\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_fee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_deadline\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_nonce\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_message\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"dropMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_from\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_value\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_fee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_deadline\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_nonce\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_message\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32[]\",\"name\":\"messageRootProof\",\"type\":\"bytes32[]\"}],\"internalType\":\"structIL1ScrollMessenger.L2MessageProof\",\"name\":\"_proof\",\"type\":\"tuple\"}],\"name\":\"relayMessageWithProof\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_from\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_value\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_fee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_deadline\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_message\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"_queueIndex\",\"type\":\"uint256\"},{\"internalType\":\"uint32\",\"name\":\"_oldGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"_newGasLimit\",\"type\":\"uint32\"}],\"name\":\"replayMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_fee\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_message\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"sendMessage\",\"outputs\":[],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"xDomainMessageSender\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
 }
 
-// L1ScrollMessengerMetaData contains all meta data concerning the L1ScrollMessenger contract.
-var L1ScrollMessengerMetaData = &bind.MetaData{
-	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"messageHash\",\"type\":\"bytes32\"}],\"name\":\"FailedRelayedMessage\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"messageHash\",\"type\":\"bytes32\"}],\"name\":\"RelayedMessage\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"messageNonce\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"}],\"name\":\"SentMessage\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"nonce\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"batchHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"merkleProof\",\"type\":\"bytes\"}],\"internalType\":\"structIL1ScrollMessenger.L2MessageProof\",\"name\":\"proof\",\"type\":\"tuple\"}],\"name\":\"relayMessageWithProof\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"queueIndex\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"},{\"internalType\":\"uint32\",\"name\":\"oldGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"newGasLimit\",\"type\":\"uint32\"}],\"name\":\"replayMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"}],\"name\":\"sendMessage\",\"outputs\":[],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"xDomainMessageSender\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
+// RollupMetaData contains all meta data concerning the Rollup contract.
+var RollupMetaData = &bind.MetaData{
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"_batchId\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"_batchHash\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"_batchIndex\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"_parentHash\",\"type\":\"bytes32\"}],\"name\":\"CommitBatch\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"_batchId\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"_batchHash\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"_batchIndex\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"_parentHash\",\"type\":\"bytes32\"}],\"name\":\"FinalizeBatch\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"_batchId\",\"type\":\"bytes32\"}],\"name\":\"RevertBatch\",\"type\":\"event\"},{\"inputs\":[{\"components\":[{\"internalType\":\"uint64\",\"name\":\"batchIndex\",\"type\":\"uint64\"},{\"internalType\":\"bytes32\",\"name\":\"parentHash\",\"type\":\"bytes32\"},{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"parentHash\",\"type\":\"bytes32\"},{\"internalType\":\"uint256\",\"name\":\"baseFee\",\"type\":\"uint256\"},{\"internalType\":\"bytes32\",\"name\":\"stateRoot\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"blockHeight\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"gasUsed\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"timestamp\",\"type\":\"uint64\"},{\"internalType\":\"bytes\",\"name\":\"extraData\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"uint64\",\"name\":\"nonce\",\"type\":\"uint64\"},{\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"internalType\":\"uint64\",\"name\":\"gas\",\"type\":\"uint64\"},{\"internalType\":\"uint256\",\"name\":\"gasPrice\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"r\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"s\",\"type\":\"uint256\"},{\"internalType\":\"uint64\",\"name\":\"v\",\"type\":\"uint64\"}],\"internalType\":\"structIZKRollup.Layer2Transaction[]\",\"name\":\"txs\",\"type\":\"tuple[]\"},{\"internalType\":\"bytes32\",\"name\":\"messageRoot\",\"type\":\"bytes32\"}],\"internalType\":\"structIZKRollup.Layer2BlockHeader[]\",\"name\":\"blocks\",\"type\":\"tuple[]\"}],\"internalType\":\"structIZKRollup.Layer2Batch\",\"name\":\"_batch\",\"type\":\"tuple\"}],\"name\":\"commitBatch\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_batchId\",\"type\":\"bytes32\"},{\"internalType\":\"uint256[]\",\"name\":\"_proof\",\"type\":\"uint256[]\"},{\"internalType\":\"uint256[]\",\"name\":\"_instances\",\"type\":\"uint256[]\"}],\"name\":\"finalizeBatchWithProof\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"}],\"name\":\"getL2MessageRoot\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"}],\"name\":\"isBlockFinalized\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"blockHeight\",\"type\":\"uint256\"}],\"name\":\"isBlockFinalized\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_blockNumber\",\"type\":\"uint256\"}],\"name\":\"layer2GasLimit\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_batchId\",\"type\":\"bytes32\"}],\"name\":\"revertBatch\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
 }
 
 // L1MessageQueueMetaData contains all meta data concerning the L1MessageQueue contract.
 var L1MessageQueueMetaData = &bind.MetaData{
-	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"queueIndex\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"QueueTransaction\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"appendCrossDomainMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"appendEnforcedTransaction\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"}],\"name\":\"estimateCrossDomainMessageFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"queueIndex\",\"type\":\"uint256\"}],\"name\":\"getCrossDomainMessage\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"nextCrossDomainMessageIndex\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"msgHash\",\"type\":\"bytes32\"}],\"name\":\"AppendMessage\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_msgHash\",\"type\":\"bytes32\"}],\"name\":\"appendMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_msgHash\",\"type\":\"bytes32\"}],\"name\":\"hasMessage\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"nextMessageIndex\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
+	Sigs: map[string]string{
+		"600a2e77": "appendMessage(bytes32)",
+		"e90cc719": "hasMessage(bytes32)",
+		"26aad7b7": "nextMessageIndex()",
+	},
 }
 
-// L2GasPriceOracleMetaData contains all meta data concerning the L2GasPriceOracle contract.
-var L2GasPriceOracleMetaData = &bind.MetaData{
-	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"l2BaseFee\",\"type\":\"uint256\"}],\"name\":\"L2BaseFeeUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"overhead\",\"type\":\"uint256\"}],\"name\":\"OverheadUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"previousOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"scalar\",\"type\":\"uint256\"}],\"name\":\"ScalarUpdated\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"_message\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"estimateCrossDomainMessageFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"getL1GasUsed\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"initialize\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"l1BaseFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"l2BaseFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"overhead\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"renounceOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"scalar\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_l2BaseFee\",\"type\":\"uint256\"}],\"name\":\"setL2BaseFee\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_overhead\",\"type\":\"uint256\"}],\"name\":\"setOverhead\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_scalar\",\"type\":\"uint256\"}],\"name\":\"setScalar\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
-}
-
-// L2ScrollMessengerMetaData contains all meta data concerning the L2ScrollMessenger contract.
-var L2ScrollMessengerMetaData = &bind.MetaData{
-	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"messageHash\",\"type\":\"bytes32\"}],\"name\":\"FailedRelayedMessage\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"messageHash\",\"type\":\"bytes32\"}],\"name\":\"RelayedMessage\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"messageNonce\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"}],\"name\":\"SentMessage\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"nonce\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"}],\"name\":\"relayMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"nonce\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"stateRootProof\",\"type\":\"bytes\"}],\"internalType\":\"structIL2ScrollMessenger.L1MessageProof\",\"name\":\"proof\",\"type\":\"tuple\"}],\"name\":\"retryMessageWithProof\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"}],\"name\":\"sendMessage\",\"outputs\":[],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"xDomainMessageSender\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
+// L2MessengerMetaData contains all meta data concerning the L2Messenger contract.
+var L2MessengerMetaData = &bind.MetaData{
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"msgHash\",\"type\":\"bytes32\"}],\"name\":\"FailedRelayedMessage\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"msgHash\",\"type\":\"bytes32\"}],\"name\":\"MessageDropped\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"msgHash\",\"type\":\"bytes32\"}],\"name\":\"RelayedMessage\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"fee\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"deadline\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"messageNonce\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"}],\"name\":\"SentMessage\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_from\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_value\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_fee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_deadline\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_nonce\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_message\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"dropMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_from\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_value\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_fee\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_deadline\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_nonce\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_message\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"stateRootProof\",\"type\":\"bytes\"}],\"internalType\":\"structIL2ScrollMessenger.L1MessageProof\",\"name\":\"_proof\",\"type\":\"tuple\"}],\"name\":\"relayMessageWithProof\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_fee\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_message\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"sendMessage\",\"outputs\":[],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"xDomainMessageSender\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
 }
 
 // L1BlockContainerMetaData contains all meta data concerning the L1BlockContainer contract.
 var L1BlockContainerMetaData = &bind.MetaData{
-	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"blockHeight\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"blockTimestamp\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"baseFee\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"stateRoot\",\"type\":\"bytes32\"}],\"name\":\"ImportBlock\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"}],\"name\":\"getBlockTimestamp\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"timestamp\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"}],\"name\":\"getStateRoot\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"stateRoot\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"blockHeaderRLP\",\"type\":\"bytes\"},{\"internalType\":\"bool\",\"name\":\"updateGasPriceOracle\",\"type\":\"bool\"}],\"name\":\"importBlockHeader\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"latestBaseFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"latestBlockHash\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"latestBlockNumber\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"latestBlockTimestamp\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"blockHeight\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"blockTimestamp\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"stateRoot\",\"type\":\"bytes32\"}],\"name\":\"ImportBlock\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"}],\"name\":\"getBlockTimestamp\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"timestamp\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"}],\"name\":\"getStateRoot\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"stateRoot\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"blockHeaderRLP\",\"type\":\"bytes\"},{\"internalType\":\"bytes\",\"name\":\"signature\",\"type\":\"bytes\"}],\"name\":\"importBlockHeader\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"msgHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"proof\",\"type\":\"bytes\"}],\"name\":\"verifyMessageExecutionStatus\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"executed\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"msgHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"proof\",\"type\":\"bytes\"}],\"name\":\"verifyMessageInclusionStatus\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"included\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
 }
 
 // L2MessageQueueMetaData contains all meta data concerning the L2MessageQueue contract.
 var L2MessageQueueMetaData = &bind.MetaData{
-	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_owner\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"index\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"messageHash\",\"type\":\"bytes32\"}],\"name\":\"AppendMessage\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_oldOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_newOwner\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_messageHash\",\"type\":\"bytes32\"}],\"name\":\"appendMessage\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"branches\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"initialize\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"messageRoot\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"messenger\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"nextMessageIndex\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"renounceOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_newOwner\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_messenger\",\"type\":\"address\"}],\"name\":\"updateMessenger\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
-}
-
-// L1GasPriceOracleMetaData contains all meta data concerning the L1GasPriceOracle contract.
-var L1GasPriceOracleMetaData = &bind.MetaData{
-	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_owner\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"l1BaseFee\",\"type\":\"uint256\"}],\"name\":\"L1BaseFeeUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"overhead\",\"type\":\"uint256\"}],\"name\":\"OverheadUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_oldOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_newOwner\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"scalar\",\"type\":\"uint256\"}],\"name\":\"ScalarUpdated\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"getL1Fee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"getL1GasUsed\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"l1BaseFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"overhead\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"renounceOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"scalar\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_l1BaseFee\",\"type\":\"uint256\"}],\"name\":\"setL1BaseFee\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_overhead\",\"type\":\"uint256\"}],\"name\":\"setOverhead\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_scalar\",\"type\":\"uint256\"}],\"name\":\"setScalar\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_newOwner\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
+	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_messenger\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"index\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"messageHash\",\"type\":\"bytes32\"}],\"name\":\"AppendMessage\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_messageHash\",\"type\":\"bytes32\"}],\"name\":\"appendMessage\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"branches\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"messageRoot\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"messenger\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"nextMessageIndex\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"name\":\"sentMessages\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
 }
 
 // IL1ScrollMessengerL2MessageProof is an auto generated low-level Go binding around an user-defined struct.
 type IL1ScrollMessengerL2MessageProof struct {
-	BatchHash   common.Hash
-	MerkleProof []byte
+	BlockHash        common.Hash
+	MessageRootProof []common.Hash
 }
 
-// IScrollChainBatch is an auto generated low-level Go binding around an user-defined struct.
-type IScrollChainBatch struct {
-	Blocks           []IScrollChainBlockContext
-	PrevStateRoot    common.Hash
-	NewStateRoot     common.Hash
-	WithdrawTrieRoot common.Hash
-	BatchIndex       uint64
-	ParentBatchHash  common.Hash
-	L2Transactions   []byte
+// IL2ScrollMessengerL1MessageProof is an auto generated low-level Go binding around an user-defined struct.
+type IL2ScrollMessengerL1MessageProof struct {
+	BlockHash      common.Hash
+	StateRootProof []byte
 }
 
-// IScrollChainBlockContext is an auto generated low-level Go binding around an user-defined struct.
-type IScrollChainBlockContext struct {
-	BlockHash       common.Hash
-	ParentHash      common.Hash
-	BlockNumber     uint64
-	Timestamp       uint64
-	BaseFee         *big.Int
-	GasLimit        uint64
-	NumTransactions uint16
-	NumL1Messages   uint16
+// IZKRollupLayer2Batch is an auto generated low-level Go binding around an user-defined struct.
+type IZKRollupLayer2Batch struct {
+	BatchIndex uint64
+	ParentHash [32]byte
+	Blocks     []IZKRollupLayer2BlockHeader
 }
 
-// L1CommitBatchEvent represents a CommitBatch event raised by the ScrollChain contract.
+// IZKRollupLayer2BlockHeader is an auto generated low-level Go binding around an user-defined struct.
+type IZKRollupLayer2BlockHeader struct {
+	BlockHash   [32]byte
+	ParentHash  [32]byte
+	BaseFee     *big.Int
+	StateRoot   [32]byte
+	BlockHeight uint64
+	GasUsed     uint64
+	Timestamp   uint64
+	ExtraData   []byte
+	Txs         []IZKRollupLayer2Transaction
+	MessageRoot common.Hash
+}
+
+// IZKRollupLayer2Transaction is an auto generated low-level Go binding around an user-defined struct.
+type IZKRollupLayer2Transaction struct {
+	Nonce    uint64
+	Target   common.Address
+	Gas      uint64
+	GasPrice *big.Int
+	Value    *big.Int
+	Data     []byte
+	R        *big.Int
+	S        *big.Int
+	V        uint64
+}
+
+// L1AppendMessageEvent represents a AppendMessage event raised by the L1MessageQueue contract.
+type L1AppendMessageEvent struct {
+	MsgHash common.Hash
+}
+
+// L1CommitBatchEvent represents a CommitBatch event raised by the ZKRollup contract.
 type L1CommitBatchEvent struct {
-	BatchHash common.Hash
+	BatchId    common.Hash //nolint:all
+	BatchHash  common.Hash
+	BatchIndex *big.Int
+	ParentHash common.Hash
 }
 
-// L1FinalizeBatchEvent represents a FinalizeBatch event raised by the ScrollChain contract.
+// L1FinalizeBatchEvent represents a FinalizeBatch event raised by the ZKRollup contract.
 type L1FinalizeBatchEvent struct {
-	BatchHash common.Hash
+	BatchId    common.Hash //nolint:all
+	BatchHash  common.Hash
+	BatchIndex *big.Int
+	ParentHash common.Hash
 }
 
-// L1RevertBatchEvent represents a RevertBatch event raised by the ScrollChain contract.
+// L1RevertBatchEvent represents a RevertBatch event raised by the ZKRollup contract.
 type L1RevertBatchEvent struct {
-	BatchHash common.Hash
-}
-
-// L1QueueTransactionEvent represents a QueueTransaction event raised by the L1MessageQueue contract.
-type L1QueueTransactionEvent struct {
-	Sender     common.Address
-	Target     common.Address
-	Value      *big.Int
-	QueueIndex *big.Int
-	GasLimit   *big.Int
-	Data       []byte
+	BatchId common.Hash //nolint:all
 }
 
 // L1SentMessageEvent represents a SentMessage event raised by the L1ScrollMessenger contract.
 type L1SentMessageEvent struct {
-	Sender       common.Address
 	Target       common.Address
+	Sender       common.Address
 	Value        *big.Int
+	Fee          *big.Int
+	Deadline     *big.Int
+	Message      []byte
 	MessageNonce *big.Int
 	GasLimit     *big.Int
-	Message      []byte
 }
 
 // L1FailedRelayedMessageEvent represents a FailedRelayedMessage event raised by the L1ScrollMessenger contract.
 type L1FailedRelayedMessageEvent struct {
-	MessageHash common.Hash
+	MsgHash common.Hash
+}
+
+// L1MessageDroppedEvent represents a MessageDropped event raised by the L1ScrollMessenger contract.
+type L1MessageDroppedEvent struct {
+	MsgHash common.Hash
 }
 
 // L1RelayedMessageEvent represents a RelayedMessage event raised by the L1ScrollMessenger contract.
 type L1RelayedMessageEvent struct {
-	MessageHash common.Hash
+	MsgHash common.Hash
 }
 
 // L2AppendMessageEvent represents a AppendMessage event raised by the L2MessageQueue contract.
@@ -212,31 +226,32 @@ type L2ImportBlockEvent struct {
 	BlockHash      common.Hash
 	BlockHeight    *big.Int
 	BlockTimestamp *big.Int
-	BaseFee        *big.Int
 	StateRoot      common.Hash
 }
 
 // L2SentMessageEvent represents a SentMessage event raised by the L2ScrollMessenger contract.
 type L2SentMessageEvent struct {
-	Sender       common.Address
 	Target       common.Address
+	Sender       common.Address
 	Value        *big.Int
+	Fee          *big.Int
+	Deadline     *big.Int
+	Message      []byte
 	MessageNonce *big.Int
 	GasLimit     *big.Int
-	Message      []byte
 }
 
 // L2FailedRelayedMessageEvent represents a FailedRelayedMessage event raised by the L2ScrollMessenger contract.
 type L2FailedRelayedMessageEvent struct {
-	MessageHash common.Hash
+	MsgHash common.Hash
+}
+
+// L2MessageDroppedEvent represents a MessageDropped event raised by the L2ScrollMessenger contract.
+type L2MessageDroppedEvent struct {
+	MsgHash common.Hash
 }
 
 // L2RelayedMessageEvent represents a RelayedMessage event raised by the L2ScrollMessenger contract.
 type L2RelayedMessageEvent struct {
-	MessageHash common.Hash
-}
-
-// GetBatchCalldataLength gets the calldata bytelen of IScrollChainBatch.
-func GetBatchCalldataLength(batch *IScrollChainBatch) uint64 {
-	return uint64(5*32 + len(batch.L2Transactions) + len(batch.Blocks)*8*32)
+	MsgHash common.Hash
 }

bridge/abi/bridge_abi_test.go

@@ -5,80 +5,94 @@ import (
 	"testing"
 
 	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/stretchr/testify/assert"
 
 	bridge_abi "scroll-tech/bridge/abi"
+	"scroll-tech/bridge/utils"
 )
 
 func TestEventSignature(t *testing.T) {
 	assert := assert.New(t)
 
-	assert.Equal(bridge_abi.L1SentMessageEventSignature, common.HexToHash("104371f3b442861a2a7b82a070afbbaab748bb13757bf47769e170e37809ec1e"))
+	assert.Equal(bridge_abi.L1SentMessageEventSignature, common.HexToHash("806b28931bc6fbe6c146babfb83d5c2b47e971edb43b4566f010577a0ee7d9f4"))
 	assert.Equal(bridge_abi.L1RelayedMessageEventSignature, common.HexToHash("4641df4a962071e12719d8c8c8e5ac7fc4d97b927346a3d7a335b1f7517e133c"))
 	assert.Equal(bridge_abi.L1FailedRelayedMessageEventSignature, common.HexToHash("99d0e048484baa1b1540b1367cb128acd7ab2946d1ed91ec10e3c85e4bf51b8f"))
 
-	assert.Equal(bridge_abi.L1CommitBatchEventSignature, common.HexToHash("2cdc615c74452778c0fb6184735e014c13aad2b62774fe0b09bd1dcc2cc14a62"))
-	assert.Equal(bridge_abi.L1FinalizeBatchEventSignature, common.HexToHash("6be443154c959a7a1645b4392b6fa97d8e8ab6e8fd853d7085e8867083737d79"))
+	assert.Equal(bridge_abi.L1CommitBatchEventSignature, common.HexToHash("a26d4bd91c4c2eff3b1bf542129607d782506fc1950acfab1472a20d28c06596"))
+	assert.Equal(bridge_abi.L1FinalizeBatchEventSignature, common.HexToHash("e20f311a96205960de4d2bb351f7729e5136fa36ae64d7f736c67ddc4ca4cd4b"))
 
-	assert.Equal(bridge_abi.L1QueueTransactionEventSignature, common.HexToHash("bdcc7517f8fe3db6506dfd910942d0bbecaf3d6a506dadea65b0d988e75b9439"))
+	assert.Equal(bridge_abi.L1AppendMessageEventSignature, common.HexToHash("4e24f8e58edb75fdffd4bd6a38963c5bd49cdf3f7898748e48c58b2076cfe70f"))
 
-	assert.Equal(bridge_abi.L2SentMessageEventSignature, common.HexToHash("104371f3b442861a2a7b82a070afbbaab748bb13757bf47769e170e37809ec1e"))
+	assert.Equal(bridge_abi.L2SentMessageEventSignature, common.HexToHash("806b28931bc6fbe6c146babfb83d5c2b47e971edb43b4566f010577a0ee7d9f4"))
 	assert.Equal(bridge_abi.L2RelayedMessageEventSignature, common.HexToHash("4641df4a962071e12719d8c8c8e5ac7fc4d97b927346a3d7a335b1f7517e133c"))
 	assert.Equal(bridge_abi.L2FailedRelayedMessageEventSignature, common.HexToHash("99d0e048484baa1b1540b1367cb128acd7ab2946d1ed91ec10e3c85e4bf51b8f"))
 
-	assert.Equal(bridge_abi.L2ImportBlockEventSignature, common.HexToHash("a7823f45e1ee21f9530b77959b57507ad515a14fa9fa24d262ee80e79b2b5745"))
+	assert.Equal(bridge_abi.L2ImportBlockEventSignature, common.HexToHash("fa1488a208a99e5ca060aff7763286188c6a5bdc43964fb76baf67b419450995"))
 
 	assert.Equal(bridge_abi.L2AppendMessageEventSignature, common.HexToHash("faa617c2d8ce12c62637dbce76efcc18dae60574aa95709bdcedce7e76071693"))
 }
 
 func TestPackRelayL2MessageWithProof(t *testing.T) {
 	assert := assert.New(t)
-	l1MessengerABI, err := bridge_abi.L1ScrollMessengerMetaData.GetAbi()
-	assert.NoError(err)
+
+	l1MessengerABI := bridge_abi.L1MessengerABI
 
 	proof := bridge_abi.IL1ScrollMessengerL2MessageProof{
-		BatchHash:   common.Hash{},
-		MerkleProof: make([]byte, 0),
+		BlockHash:        common.Hash{},
+		MessageRootProof: make([]common.Hash, 10),
 	}
-	_, err = l1MessengerABI.Pack("relayMessageWithProof", common.Address{}, common.Address{}, big.NewInt(0), big.NewInt(0), make([]byte, 0), proof)
+	_, err := l1MessengerABI.Pack("relayMessageWithProof", common.Address{}, common.Address{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), make([]byte, 0), proof)
 	assert.NoError(err)
 }
 
 func TestPackCommitBatch(t *testing.T) {
 	assert := assert.New(t)
 
-	scrollChainABI, err := bridge_abi.ScrollChainMetaData.GetAbi()
-	assert.NoError(err)
+	l1RollupABI := bridge_abi.RollupABI
 
-	header := bridge_abi.IScrollChainBlockContext{
-		BlockHash:       common.Hash{},
-		ParentHash:      common.Hash{},
-		BlockNumber:     0,
-		Timestamp:       0,
-		BaseFee:         big.NewInt(0),
-		GasLimit:        0,
-		NumTransactions: 0,
-		NumL1Messages:   0,
+	txns := make([]bridge_abi.IZKRollupLayer2Transaction, 5)
+	for i := 0; i < 5; i++ {
+		txns[i] = bridge_abi.IZKRollupLayer2Transaction{
+			Target:   common.Address{},
+			Nonce:    0,
+			Gas:      0,
+			GasPrice: big.NewInt(0),
+			Value:    big.NewInt(0),
+			Data:     make([]byte, 0),
+			R:        big.NewInt(0),
+			S:        big.NewInt(0),
+			V:        0,
+		}
 	}
 
-	batch := bridge_abi.IScrollChainBatch{
-		Blocks:           []bridge_abi.IScrollChainBlockContext{header},
-		PrevStateRoot:    common.Hash{},
-		NewStateRoot:     common.Hash{},
-		WithdrawTrieRoot: common.Hash{},
-		BatchIndex:       0,
-		L2Transactions:   make([]byte, 0),
+	header := bridge_abi.IZKRollupLayer2BlockHeader{
+		BlockHash:   common.Hash{},
+		ParentHash:  common.Hash{},
+		BaseFee:     big.NewInt(0),
+		StateRoot:   common.Hash{},
+		BlockHeight: 0,
+		GasUsed:     0,
+		Timestamp:   0,
+		ExtraData:   make([]byte, 0),
+		Txs:         txns,
+		MessageRoot: common.Hash{},
 	}
 
-	_, err = scrollChainABI.Pack("commitBatch", batch)
+	batch := bridge_abi.IZKRollupLayer2Batch{
+		BatchIndex: 0,
+		ParentHash: common.Hash{},
+		Blocks:     []bridge_abi.IZKRollupLayer2BlockHeader{header},
+	}
+
+	_, err := l1RollupABI.Pack("commitBatch", batch)
 	assert.NoError(err)
 }
 
 func TestPackFinalizeBatchWithProof(t *testing.T) {
 	assert := assert.New(t)
 
-	l1RollupABI, err := bridge_abi.ScrollChainMetaData.GetAbi()
-	assert.NoError(err)
+	l1RollupABI := bridge_abi.RollupABI
 
 	proof := make([]*big.Int, 10)
 	instance := make([]*big.Int, 10)
@@ -87,39 +101,20 @@ func TestPackFinalizeBatchWithProof(t *testing.T) {
 		instance[i] = big.NewInt(0)
 	}
 
-	_, err = l1RollupABI.Pack("finalizeBatchWithProof", common.Hash{}, proof, instance)
+	_, err := l1RollupABI.Pack("finalizeBatchWithProof", common.Hash{}, proof, instance)
 	assert.NoError(err)
 }
 
-func TestPackRelayL1Message(t *testing.T) {
+func TestPackRelayL1MessageWithProof(t *testing.T) {
 	assert := assert.New(t)
 
-	l2MessengerABI, err := bridge_abi.L2ScrollMessengerMetaData.GetAbi()
-	assert.NoError(err)
+	l2MessengerABI := bridge_abi.L2MessengerABI
 
-	_, err = l2MessengerABI.Pack("relayMessage", common.Address{}, common.Address{}, big.NewInt(0), big.NewInt(0), make([]byte, 0))
-	assert.NoError(err)
-}
-
-func TestPackSetL1BaseFee(t *testing.T) {
-	assert := assert.New(t)
-
-	l1GasOracleABI, err := bridge_abi.L1GasPriceOracleMetaData.GetAbi()
-	assert.NoError(err)
-
-	baseFee := big.NewInt(2333)
-	_, err = l1GasOracleABI.Pack("setL1BaseFee", baseFee)
-	assert.NoError(err)
-}
-
-func TestPackSetL2BaseFee(t *testing.T) {
-	assert := assert.New(t)
-
-	l2GasOracleABI, err := bridge_abi.L2GasPriceOracleMetaData.GetAbi()
-	assert.NoError(err)
-
-	baseFee := big.NewInt(2333)
-	_, err = l2GasOracleABI.Pack("setL2BaseFee", baseFee)
+	proof := bridge_abi.IL2ScrollMessengerL1MessageProof{
+		BlockHash:      common.Hash{},
+		StateRootProof: make([]byte, 10),
+	}
+	_, err := l2MessengerABI.Pack("relayMessageWithProof", common.Address{}, common.Address{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), make([]byte, 0), proof)
 	assert.NoError(err)
 }
 
@@ -128,6 +123,61 @@ func TestPackImportBlock(t *testing.T) {
 
 	l1BlockContainerABI := bridge_abi.L1BlockContainerABI
 
-	_, err := l1BlockContainerABI.Pack("importBlockHeader", common.Hash{}, make([]byte, 0), false)
+	_, err := l1BlockContainerABI.Pack("importBlockHeader", common.Hash{}, make([]byte, 0), make([]byte, 0))
 	assert.NoError(err)
 }
+
+func TestUnpackL1Event_SentMessage(t *testing.T) {
+	log := types.Log{
+		Topics: []common.Hash{
+			common.HexToHash("0x806b28931bc6fbe6c146babfb83d5c2b47e971edb43b4566f010577a0ee7d9f4"),
+			common.HexToHash("0x000000000000000000000000330a32fee6421b9c0b6cfaa6ddaa1ad6c8ed17f9"),
+		},
+		Data: common.Hex2Bytes("000000000000000000000000f8f8b383285cd23ed2cb9fdf9599b968ddafc3c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000063c63a8100000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000013f1000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e48431f5c10000000000000000000000001838a36ab91900fa0e637006bb2faa6ef1a5f84100000000000000000000000038ba9a208f34ddc9332f6dfc0e9d567f098958a4000000000000000000000000bf290324852d86976e9982241723e53eaf2d29d0000000000000000000000000bf290324852d86976e9982241723e53eaf2d29d0000000000000000000000000000000000000000000000002b5e3af16b188000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"),
+	}
+
+	event := bridge_abi.L1SentMessageEvent{}
+	err := utils.UnpackLog(bridge_abi.L1MessengerABI, &event, "SentMessage", log)
+	assert.NoError(t, err)
+	assert.Equal(t, event.Target, common.HexToAddress("0x330a32fee6421b9c0b6cfaa6ddaa1ad6c8ed17f9"))
+	assert.Equal(t, event.Sender, common.HexToAddress("0xf8f8b383285cd23ed2cb9fdf9599b968ddafc3c0"))
+
+	out := make(map[string]interface{})
+	err = utils.UnpackLogIntoMap(bridge_abi.L1MessengerABI, out, "SentMessage", log)
+	assert.NoError(t, err)
+	assert.Equal(t, event.Target, out["target"])
+	assert.Equal(t, event.Sender, out["sender"])
+	assert.Equal(t, event.Value, out["value"])
+	assert.Equal(t, event.Fee, out["fee"])
+	assert.Equal(t, event.Deadline, out["deadline"])
+	assert.Equal(t, event.Message, out["message"])
+	assert.Equal(t, event.MessageNonce, out["messageNonce"])
+	assert.Equal(t, event.GasLimit, out["gasLimit"])
+}
+
+func TestUnpackL1Event_CommitBatch(t *testing.T) {
+	log := types.Log{
+		Topics: []common.Hash{
+			common.HexToHash("0xa26d4bd91c4c2eff3b1bf542129607d782506fc1950acfab1472a20d28c06596"),
+			common.HexToHash("0x214875997226c54175df6dc97e1bce7f3d624263e1b33bf5daf37b3440d8ffbc"),
+		},
+		Data: common.Hex2Bytes("4476f580301f544e9e76d1c72037fdb53d83e43436639c69d472ad3be0afbdc000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000"),
+	}
+
+	event := bridge_abi.L1CommitBatchEvent{}
+	err := utils.UnpackLog(bridge_abi.RollupABI, &event, "CommitBatch", log)
+	assert.NoError(t, err)
+	assert.Equal(t, event.BatchId, common.HexToHash("0x214875997226c54175df6dc97e1bce7f3d624263e1b33bf5daf37b3440d8ffbc"))
+	assert.Equal(t, event.BatchHash, common.HexToHash("0x4476f580301f544e9e76d1c72037fdb53d83e43436639c69d472ad3be0afbdc0"))
+
+	out := make(map[string]interface{})
+	err = utils.UnpackLogIntoMap(bridge_abi.RollupABI, out, "CommitBatch", log)
+	assert.NoError(t, err)
+	batchID := out["_batchId"].([32]byte)
+	batchHash := out["_batchHash"].([32]byte)
+	parentHash := out["_parentHash"].([32]byte)
+	assert.Equal(t, event.BatchId, common.BytesToHash(batchID[:]))
+	assert.Equal(t, event.BatchHash, common.BytesToHash(batchHash[:]))
+	assert.Equal(t, event.BatchIndex, out["_batchIndex"].(*big.Int))
+	assert.Equal(t, event.ParentHash, common.BytesToHash(parentHash[:]))
+}

bridge/config.json

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

bridge/config/config_test.go

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

bridge/config/l1_config.go

@@ -1,24 +1,21 @@
 package config
 
-import (
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/rpc"
-)
+import "github.com/scroll-tech/go-ethereum/common"
 
 // L1Config loads l1eth configuration items.
 type L1Config struct {
 	// Confirmations block height confirmations number.
-	Confirmations rpc.BlockNumber `json:"confirmations"`
+	Confirmations uint64 `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 L1ScrollMessenger contract address deployed on layer 1 chain.
+	// The messenger contract address deployed on layer 1 chain.
 	L1MessengerAddress common.Address `json:"l1_messenger_address"`
-	// The L1MessageQueue contract address deployed on layer 1 chain.
+	// The rollup contract address deployed on layer 1 chain.
+	RollupContractAddress common.Address `json:"rollup_contract_address"`
+	// The message queue contract address deployed on layer 1 chain.
 	L1MessageQueueAddress common.Address `json:"l1_message_queue_address"`
-	// The ScrollChain contract address deployed on layer 1 chain.
-	ScrollChainContractAddress common.Address `json:"scroll_chain_address"`
 	// The relayer config
 	RelayerConfig *RelayerConfig `json:"relayer_config"`
 }

bridge/config/l2_config.go

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

bridge/config/relayer_config.go

@@ -8,7 +8,6 @@ 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
@@ -20,7 +19,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 rpc.BlockNumber `json:"confirmations"`
+	Confirmations uint64 `json:"confirmations"`
 	// The numerator of gas price escalate multiple.
 	EscalateMultipleNum uint64 `json:"escalate_multiple_num"`
 	// The denominator of gas price escalate multiple.
@@ -41,24 +40,13 @@ type RelayerConfig struct {
 	RollupContractAddress common.Address `json:"rollup_contract_address,omitempty"`
 	// MessengerContractAddress store the scroll messenger contract address.
 	MessengerContractAddress common.Address `json:"messenger_contract_address"`
-	// GasPriceOracleContractAddress store the scroll messenger contract address.
-	GasPriceOracleContractAddress common.Address `json:"gas_price_oracle_contract_address"`
+	// ContrainerContractAddress store the l1 block container contract address.
+	ContrainerContractAddress common.Address `json:"container_contract_address,omitempty"`
 	// sender config
 	SenderConfig *SenderConfig `json:"sender_config"`
-	// gas oracle config
-	GasOracleConfig *GasOracleConfig `json:"gas_oracle_config"`
 	// The private key of the relayer
-	MessageSenderPrivateKeys   []*ecdsa.PrivateKey `json:"-"`
-	GasOracleSenderPrivateKeys []*ecdsa.PrivateKey `json:"-"`
-	RollupSenderPrivateKeys    []*ecdsa.PrivateKey `json:"-"`
-}
-
-// GasOracleConfig The config for updating gas price oracle.
-type GasOracleConfig struct {
-	// MinGasPrice store the minimum gas price to set.
-	MinGasPrice uint64 `json:"min_gas_price"`
-	// GasPriceDiff store the percentage of gas price difference.
-	GasPriceDiff uint64 `json:"gas_price_diff"`
+	MessageSenderPrivateKeys []*ecdsa.PrivateKey `json:"-"`
+	RollupSenderPrivateKeys  []*ecdsa.PrivateKey `json:"-"`
 }
 
 // relayerConfigAlias RelayerConfig alias name
@@ -69,17 +57,15 @@ func (r *RelayerConfig) UnmarshalJSON(input []byte) error {
 	var jsonConfig struct {
 		relayerConfigAlias
 		// The private key of the relayer
-		MessageSenderPrivateKeys   []string `json:"message_sender_private_keys"`
-		GasOracleSenderPrivateKeys []string `json:"gas_oracle_sender_private_keys"`
-		RollupSenderPrivateKeys    []string `json:"rollup_sender_private_keys,omitempty"`
+		MessageSenderPrivateKeys []string `json:"message_sender_private_keys"`
+		RollupSenderPrivateKeys  []string `json:"rollup_sender_private_keys,omitempty"`
 	}
 	if err := json.Unmarshal(input, &jsonConfig); err != nil {
 		return err
 	}
 
-	*r = RelayerConfig(jsonConfig.relayerConfigAlias)
-
 	// Get messenger private key list.
+	*r = RelayerConfig(jsonConfig.relayerConfigAlias)
 	for _, privStr := range jsonConfig.MessageSenderPrivateKeys {
 		priv, err := crypto.ToECDSA(common.FromHex(privStr))
 		if err != nil {
@@ -88,15 +74,6 @@ func (r *RelayerConfig) UnmarshalJSON(input []byte) error {
 		r.MessageSenderPrivateKeys = append(r.MessageSenderPrivateKeys, priv)
 	}
 
-	// Get gas oracle private key list.
-	for _, privStr := range jsonConfig.GasOracleSenderPrivateKeys {
-		priv, err := crypto.ToECDSA(common.FromHex(privStr))
-		if err != nil {
-			return fmt.Errorf("incorrect private_key_list format, err: %v", err)
-		}
-		r.GasOracleSenderPrivateKeys = append(r.GasOracleSenderPrivateKeys, priv)
-	}
-
 	// Get rollup private key
 	for _, privStr := range jsonConfig.RollupSenderPrivateKeys {
 		priv, err := crypto.ToECDSA(common.FromHex(privStr))
@@ -114,21 +91,15 @@ func (r *RelayerConfig) MarshalJSON() ([]byte, error) {
 	jsonConfig := struct {
 		relayerConfigAlias
 		// The private key of the relayer
-		MessageSenderPrivateKeys   []string `json:"message_sender_private_keys"`
-		GasOracleSenderPrivateKeys []string `json:"gas_oracle_sender_private_keys,omitempty"`
-		RollupSenderPrivateKeys    []string `json:"rollup_sender_private_keys,omitempty"`
-	}{relayerConfigAlias(*r), nil, nil, nil}
+		MessageSenderPrivateKeys []string `json:"message_sender_private_keys"`
+		RollupSenderPrivateKeys  []string `json:"rollup_sender_private_keys,omitempty"`
+	}{relayerConfigAlias(*r), nil, nil}
 
 	// Transfer message sender private keys to hex type.
 	for _, priv := range r.MessageSenderPrivateKeys {
 		jsonConfig.MessageSenderPrivateKeys = append(jsonConfig.MessageSenderPrivateKeys, common.Bytes2Hex(crypto.FromECDSA(priv)))
 	}
 
-	// Transfer rollup sender private keys to hex type.
-	for _, priv := range r.GasOracleSenderPrivateKeys {
-		jsonConfig.GasOracleSenderPrivateKeys = append(jsonConfig.GasOracleSenderPrivateKeys, common.Bytes2Hex(crypto.FromECDSA(priv)))
-	}
-
 	// Transfer rollup sender private keys to hex type.
 	for _, priv := range r.RollupSenderPrivateKeys {
 		jsonConfig.RollupSenderPrivateKeys = append(jsonConfig.RollupSenderPrivateKeys, common.Bytes2Hex(crypto.FromECDSA(priv)))

bridge/go.mod

@@ -3,39 +3,49 @@ module scroll-tech/bridge
 go 1.18
 
 require (
+	github.com/iden3/go-iden3-crypto v0.0.13
+	github.com/jmoiron/sqlx v1.3.5
 	github.com/orcaman/concurrent-map v1.0.0
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20230220082843-ec9254b0b1c6
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230112091133-2891916a0f81
 	github.com/stretchr/testify v1.8.0
-	github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa
+	github.com/urfave/cli/v2 v2.10.2
 	golang.org/x/sync v0.1.0
 	modernc.org/mathutil v1.4.1
 )
 
 require (
 	github.com/btcsuite/btcd v0.20.1-beta // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set v1.8.0 // indirect
-	github.com/ethereum/go-ethereum v1.11.1 // indirect
+	github.com/ethereum/go-ethereum v1.10.26 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-stack/stack v1.8.1 // indirect
+	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
 	github.com/holiman/uint256 v1.2.0 // indirect
-	github.com/iden3/go-iden3-crypto v0.0.13 // indirect
+	github.com/huin/goupnp v1.0.3 // indirect
+	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
+	github.com/kr/pretty v0.3.0 // indirect
+	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.5.0 // indirect
+	github.com/scroll-tech/zktrie v0.3.1 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
+	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
 	github.com/tklauser/numcpus v0.4.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/crypto v0.6.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
+	golang.org/x/crypto v0.5.0 // indirect
+	golang.org/x/sys v0.4.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

bridge/go.sum

@@ -71,10 +71,10 @@ github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOC
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
 github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -111,13 +111,14 @@ github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaB
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/ethereum/go-ethereum v1.10.13/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw=
-github.com/ethereum/go-ethereum v1.11.1 h1:EMymmWFzpS7G9l9NvVN8G73cgdUIqDPNRf2YTSGBXlk=
-github.com/ethereum/go-ethereum v1.11.1/go.mod h1:DuefStAgaxoaYGLR0FueVcVbehmn5n9QUcVrMCuOvuc=
+github.com/ethereum/go-ethereum v1.10.26 h1:i/7d9RBBwiXCEuyduBQzJw/mKmnvzsN14jqBmytw72s=
+github.com/ethereum/go-ethereum v1.10.26/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI=
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
@@ -139,9 +140,10 @@ github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
+github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
-github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
 github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
@@ -207,6 +209,7 @@ github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huin/goupnp v1.0.2/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSamkM=
 github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ=
+github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y=
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/iden3/go-iden3-crypto v0.0.12/go.mod h1:swXIv0HFbJKobbQBtsB50G7IHr6PbTowutSew/iBEoo=
@@ -226,10 +229,13 @@ github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mq
 github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po=
 github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
+github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
+github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
+github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
@@ -251,7 +257,8 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -262,25 +269,30 @@ github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL
 github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
 github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
+github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc=
 github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/mattn/go-sqlite3 v1.14.6 h1:dNPt6NO46WmLVt2DLNpwczCmdV5boIZ6g/tlDrlRUbg=
+github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
@@ -294,6 +306,7 @@ github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
 github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
+github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
@@ -301,9 +314,11 @@ github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
@@ -315,6 +330,7 @@ github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHu
 github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
 github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -340,16 +356,19 @@ github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1
 github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeCE=
 github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
+github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
 github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
 github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230220082843-ec9254b0b1c6 h1:2kXWJR+mOj09HBh5sUTb4L/OURPSXoQd1NC/10v7otM=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230220082843-ec9254b0b1c6/go.mod h1:eW+eyNdMoO0MyuczCc9xWSnW8dPJ0kOy5xsxgOKYEaA=
-github.com/scroll-tech/zktrie v0.5.0 h1:dABDR6lMZq6Hs+fWQSiHbX8s3AOX6hY+5nkhSYm5rmU=
-github.com/scroll-tech/zktrie v0.5.0/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230112091133-2891916a0f81 h1:Gm18RZ9WTR2Dupumr60E2m1Noe+l9/lITt6iRyxxZoc=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230112091133-2891916a0f81/go.mod h1:jurIpDQ0hqtp9//xxeWzr8X9KMP/+TYn+vz3K1wZrv0=
+github.com/scroll-tech/zktrie v0.3.0/go.mod h1:CuJFlG1/soTJJBAySxCZgTF7oPvd5qF6utHOEciC43Q=
+github.com/scroll-tech/zktrie v0.3.1 h1:HlR+fMBdjXX1/7cUMqpUgGEhGy/3vN1JpwQ0ovg/Ys8=
+github.com/scroll-tech/zktrie v0.3.1/go.mod h1:CuJFlG1/soTJJBAySxCZgTF7oPvd5qF6utHOEciC43Q=
 github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=
 github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
@@ -364,8 +383,8 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg=
 github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
-github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
@@ -387,11 +406,11 @@ github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYa
 github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM=
 github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
 github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
+github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef h1:wHSqTBrZW24CsNJDfeh9Ex6Pm0Rcpc7qrgKBiL44vF4=
 github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs=
-github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
-github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa h1:5SqCsI/2Qya2bCzK15ozrqo2sZxkh0FHynJZOTVoV6Q=
-github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
+github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y=
+github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
@@ -420,8 +439,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.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
+golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -475,6 +494,7 @@ 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.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
 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=
@@ -530,13 +550,14 @@ golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -548,12 +569,12 @@ 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.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
+golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -585,6 +606,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618=
 gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
 gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
 gonum.org/v1/gonum v0.6.0/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU=
@@ -638,6 +660,7 @@ gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMy
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
 gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0=
 gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0=
@@ -647,6 +670,7 @@ gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

bridge/l1/backend.go

@@ -4,6 +4,8 @@ import (
 	"context"
 
 	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/ethclient/gethclient"
+	"github.com/scroll-tech/go-ethereum/rpc"
 
 	"scroll-tech/database"
 
@@ -21,17 +23,23 @@ type Backend struct {
 
 // New returns a new instance of Backend.
 func New(ctx context.Context, cfg *config.L1Config, orm database.OrmFactory) (*Backend, error) {
-	client, err := ethclient.Dial(cfg.Endpoint)
+	rawClient, err := rpc.DialContext(ctx, cfg.Endpoint)
 	if err != nil {
 		return nil, err
 	}
 
-	relayer, err := NewLayer1Relayer(ctx, orm, cfg.RelayerConfig)
+	gethClient := gethclient.New(rawClient)
+	ethClient := ethclient.NewClient(rawClient)
+
+	relayer, err := NewLayer1Relayer(ctx, gethClient, ethClient, int64(cfg.Confirmations), cfg.L1MessageQueueAddress, orm, cfg.RelayerConfig)
 	if err != nil {
 		return nil, err
 	}
 
-	watcher := NewWatcher(ctx, client, cfg.StartHeight, cfg.Confirmations, cfg.L1MessengerAddress, cfg.L1MessageQueueAddress, cfg.ScrollChainContractAddress, orm)
+	watcher, err := NewWatcher(ctx, gethClient, ethClient, cfg.StartHeight, cfg.Confirmations, cfg.L1MessengerAddress, cfg.L1MessageQueueAddress, cfg.RollupContractAddress, orm)
+	if err != nil {
+		return nil, err
+	}
 
 	return &Backend{
 		cfg:     cfg,

bridge/l1/relayer.go

@@ -11,21 +11,17 @@ 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/ethclient/gethclient"
 	"github.com/scroll-tech/go-ethereum/log"
 
-	"scroll-tech/common/types"
-
 	"scroll-tech/database"
+	"scroll-tech/database/orm"
 
 	bridge_abi "scroll-tech/bridge/abi"
 	"scroll-tech/bridge/config"
 	"scroll-tech/bridge/sender"
-)
-
-const (
-	gasPriceDiffPrecision = 1000000
-
-	defaultGasPriceDiff = 50000 // 5%
+	"scroll-tech/bridge/utils"
 )
 
 // Layer1Relayer is responsible for
@@ -37,76 +33,80 @@ const (
 type Layer1Relayer struct {
 	ctx context.Context
 
+	gethClient *gethclient.Client
+	ethClient  *ethclient.Client
+
+	// sender and channel used for relay message
+	relaySender         *sender.Sender
+	relayConfirmationCh <-chan *sender.Confirmation
+
+	// sender and channel used for import blocks
+	importSender         *sender.Sender
+	importConfirmationCh <-chan *sender.Confirmation
+
+	l1MessageQueueAddress common.Address
+
 	db  database.OrmFactory
 	cfg *config.RelayerConfig
 
-	// channel used to communicate with transaction sender
-	messageSender  *sender.Sender
-	messageCh      <-chan *sender.Confirmation
-	l2MessengerABI *abi.ABI
-
-	gasOracleSender *sender.Sender
-	gasOracleCh     <-chan *sender.Confirmation
-	l1GasOracleABI  *abi.ABI
-
-	lastGasPrice uint64
-	minGasPrice  uint64
-	gasPriceDiff uint64
+	l2MessengerABI      *abi.ABI
+	l1BlockContainerABI *abi.ABI
 
 	stopCh chan struct{}
 }
 
 // NewLayer1Relayer will return a new instance of Layer1RelayerClient
-func NewLayer1Relayer(ctx context.Context, db database.OrmFactory, cfg *config.RelayerConfig) (*Layer1Relayer, error) {
-	messageSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.MessageSenderPrivateKeys)
+func NewLayer1Relayer(ctx context.Context, gethClient *gethclient.Client, ethClient *ethclient.Client, l1ConfirmNum int64, l1MessageQueueAddress common.Address, db database.OrmFactory, cfg *config.RelayerConfig) (*Layer1Relayer, error) {
+	relaySender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.MessageSenderPrivateKeys)
+	if err != nil {
+		log.Error("new relayer sender failed", "err", err)
+		return nil, err
+	}
+
+	if len(cfg.RollupSenderPrivateKeys) != 1 {
+		return nil, errors.New("more than 1 private key for importing L1 block")
+	}
+	importSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.RollupSenderPrivateKeys)
 	if err != nil {
 		addr := crypto.PubkeyToAddress(cfg.MessageSenderPrivateKeys[0].PublicKey)
-		log.Error("new MessageSender failed", "main address", addr.String(), "err", err)
+		log.Error("new sender failed", "main address", addr.String(), "err", err)
 		return nil, err
 	}
 
-	// @todo make sure only one sender is available
-	gasOracleSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.GasOracleSenderPrivateKeys)
-	if err != nil {
-		addr := crypto.PubkeyToAddress(cfg.GasOracleSenderPrivateKeys[0].PublicKey)
-		log.Error("new GasOracleSender failed", "main address", addr.String(), "err", err)
-		return nil, err
-	}
-
-	var minGasPrice uint64
-	var gasPriceDiff uint64
-	if cfg.GasOracleConfig != nil {
-		minGasPrice = cfg.GasOracleConfig.MinGasPrice
-		gasPriceDiff = cfg.GasOracleConfig.GasPriceDiff
-	} else {
-		minGasPrice = 0
-		gasPriceDiff = defaultGasPriceDiff
-	}
-
 	return &Layer1Relayer{
 		ctx: ctx,
+
+		gethClient: gethClient,
+		ethClient:  ethClient,
+
+		relaySender:         relaySender,
+		relayConfirmationCh: relaySender.ConfirmChan(),
+
+		importSender:         importSender,
+		importConfirmationCh: importSender.ConfirmChan(),
+
+		l1MessageQueueAddress: l1MessageQueueAddress,
+
 		db:  db,
+		cfg: cfg,
 
-		messageSender:  messageSender,
-		messageCh:      messageSender.ConfirmChan(),
-		l2MessengerABI: bridge_abi.L2ScrollMessengerABI,
+		l2MessengerABI:      bridge_abi.L2MessengerABI,
+		l1BlockContainerABI: bridge_abi.L1BlockContainerABI,
 
-		gasOracleSender: gasOracleSender,
-		gasOracleCh:     gasOracleSender.ConfirmChan(),
-		l1GasOracleABI:  bridge_abi.L1GasPriceOracleABI,
-
-		minGasPrice:  minGasPrice,
-		gasPriceDiff: gasPriceDiff,
-
-		cfg:    cfg,
 		stopCh: make(chan struct{}),
 	}, nil
 }
 
 // ProcessSavedEvents relays saved un-processed cross-domain transactions to desired blockchain
 func (r *Layer1Relayer) ProcessSavedEvents() {
+	block, err := r.db.GetLatestImportedL1Block()
+	if err != nil {
+		log.Error("GetLatestImportedL1Block failed", "err", err)
+		return
+	}
+
 	// msgs are sorted by nonce in increasing order
-	msgs, err := r.db.GetL1MessagesByStatus(types.MsgPending, 100)
+	msgs, err := r.db.GetL1MessagesByStatusUpToProofHeight(orm.MsgPending, block.Number, 100)
 	if err != nil {
 		log.Error("Failed to fetch unprocessed L1 messages", "err", err)
 		return
@@ -117,7 +117,7 @@ func (r *Layer1Relayer) ProcessSavedEvents() {
 	}
 
 	for _, msg := range msgs {
-		if err = r.processSavedEvent(msg); err != nil {
+		if err = r.processSavedEvent(msg, block); err != nil {
 			if !errors.Is(err, sender.ErrNoAvailableAccount) {
 				log.Error("failed to process event", "msg.msgHash", msg.MsgHash, "err", err)
 			}
@@ -126,138 +126,188 @@ func (r *Layer1Relayer) ProcessSavedEvents() {
 	}
 }
 
-func (r *Layer1Relayer) processSavedEvent(msg *types.L1Message) error {
-	calldata := common.Hex2Bytes(msg.Calldata)
+func (r *Layer1Relayer) processSavedEvent(msg *orm.L1Message, block *orm.L1BlockInfo) error {
+	// @todo add support to relay multiple messages
+	from := common.HexToAddress(msg.Sender)
+	target := common.HexToAddress(msg.Target)
+	value, ok := big.NewInt(0).SetString(msg.Value, 10)
+	if !ok {
+		// @todo maybe panic?
+		log.Error("Failed to parse message value", "nonce", msg.Nonce, "height", msg.Height, "value", msg.Value)
+		// TODO: need to skip this message by changing its status to MsgError
+	}
 
-	hash, err := r.messageSender.SendTransaction(msg.MsgHash, &r.cfg.MessengerContractAddress, big.NewInt(0), calldata)
+	if len(msg.MessageProof) == 0 {
+		// empty proof, we need to fetch storage proof from client
+		hash := common.HexToHash(msg.MsgHash)
+		proofs, err := utils.GetL1MessageProof(r.gethClient, r.l1MessageQueueAddress, []common.Hash{hash}, block.Number)
+		if err != nil {
+			log.Error("Failed to GetL1MessageProof", "msg.hash", msg.MsgHash, "height", block.Number, "err", err)
+			return err
+		}
+		msg.MessageProof = common.Bytes2Hex(proofs[0])
+		msg.ProofHeight = block.Number
+	}
+
+	blocks, err := r.db.GetL1BlockInfos(map[string]interface{}{
+		"number": msg.ProofHeight,
+	})
+	if err != nil {
+		log.Error("Failed to GetL1BlockInfos from db", "proof_height", msg.ProofHeight, "err", err)
+		return err
+	}
+	if len(blocks) != 1 {
+		log.Error("Block not exist", "height", msg.ProofHeight)
+		return errors.New("block not exist")
+	}
+
+	proof := bridge_abi.IL2ScrollMessengerL1MessageProof{
+		BlockHash:      common.HexToHash(blocks[0].Hash),
+		StateRootProof: common.Hex2Bytes(msg.MessageProof),
+	}
+
+	fee, _ := big.NewInt(0).SetString(msg.Fee, 10)
+	deadline := big.NewInt(int64(msg.Deadline))
+	msgNonce := big.NewInt(int64(msg.Nonce))
+	calldata := common.Hex2Bytes(msg.Calldata)
+	data, err := r.l2MessengerABI.Pack("relayMessageWithProof", from, target, value, fee, deadline, msgNonce, calldata, proof)
+	if err != nil {
+		log.Error("Failed to pack relayMessageWithProof", "msg.nonce", msg.Nonce, "msg.height", msg.Height, "err", err)
+		// TODO: need to skip this message by changing its status to MsgError
+		return err
+	}
+
+	hash, err := r.relaySender.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, types.MsgExpired)
+		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, types.MsgConfirmed)
+		return r.db.UpdateLayer1Status(r.ctx, msg.MsgHash, orm.MsgConfirmed)
 	}
 	if err != nil {
 		return err
 	}
 	log.Info("relayMessage to layer2", "msg hash", msg.MsgHash, "tx hash", hash)
 
-	err = r.db.UpdateLayer1StatusAndLayer2Hash(r.ctx, msg.MsgHash, types.MsgSubmitted, hash.String())
+	err = r.db.UpdateLayer1StatusAndLayer2Hash(r.ctx, msg.MsgHash, orm.MsgSubmitted, hash.String())
 	if err != nil {
 		log.Error("UpdateLayer1StatusAndLayer2Hash failed", "msg.msgHash", msg.MsgHash, "msg.height", msg.Height, "err", err)
 	}
 	return err
 }
 
-// ProcessGasPriceOracle imports gas price to layer2
-func (r *Layer1Relayer) ProcessGasPriceOracle() {
-	latestBlockHeight, err := r.db.GetLatestL1BlockHeight()
-	if err != nil {
-		log.Warn("Failed to fetch latest L1 block height from db", "err", err)
-		return
-	}
-
-	blocks, err := r.db.GetL1BlockInfos(map[string]interface{}{
-		"number": latestBlockHeight,
+// ProcessPendingBlocks imports failed/pending block headers to layer2
+func (r *Layer1Relayer) ProcessPendingBlocks() {
+	// handle failed block first since we need to import sequentially
+	failedBlocks, err := r.db.GetL1BlockInfos(map[string]interface{}{
+		"block_status": orm.L1BlockFailed,
 	})
 	if err != nil {
-		log.Error("Failed to GetL1BlockInfos from db", "height", latestBlockHeight, "err", err)
+		log.Error("Failed to fetch failed L1 Blocks from db", "err", err)
 		return
 	}
-	if len(blocks) != 1 {
-		log.Error("Block not exist", "height", latestBlockHeight)
+	for _, block := range failedBlocks {
+		if err = r.importBlock(block); err != nil {
+			if !errors.Is(err, sender.ErrNoAvailableAccount) {
+				log.Error("failed to retry failed L1 block", "err", err)
+			}
+			return
+		}
+	}
+
+	// If there are failed blocks, we don't handle pending blocks. This is
+	// because if there are `importing`` blocks after `failed`` blocks, the
+	// `importing` block will fail eventually. If we send `pending` blocks
+	// immediately, they will also fail eventually.
+	if len(failedBlocks) > 0 {
 		return
 	}
-	block := blocks[0]
 
-	if block.GasOracleStatus == types.GasOraclePending {
-		expectedDelta := r.lastGasPrice * r.gasPriceDiff / gasPriceDiffPrecision
-		// last is undefine or (block.BaseFee >= minGasPrice && exceed diff)
-		if r.lastGasPrice == 0 || (block.BaseFee >= r.minGasPrice && (block.BaseFee >= r.lastGasPrice+expectedDelta || block.BaseFee <= r.lastGasPrice-expectedDelta)) {
-			baseFee := big.NewInt(int64(block.BaseFee))
-			data, err := r.l1GasOracleABI.Pack("setL1BaseFee", baseFee)
-			if err != nil {
-				log.Error("Failed to pack setL1BaseFee", "block.Hash", block.Hash, "block.Height", block.Number, "block.BaseFee", block.BaseFee, "err", err)
-				return
+	// handle pending blocks
+	pendingBlocks, err := r.db.GetL1BlockInfos(map[string]interface{}{
+		"block_status": orm.L1BlockPending,
+	})
+	if err != nil {
+		log.Error("Failed to fetch pending L1 Blocks from db", "err", err)
+		return
+	}
+	for _, block := range pendingBlocks {
+		if err = r.importBlock(block); err != nil {
+			if !errors.Is(err, sender.ErrNoAvailableAccount) {
+				log.Error("failed to import pending L1 block", "err", err)
 			}
-
-			hash, err := r.gasOracleSender.SendTransaction(block.Hash, &r.cfg.GasPriceOracleContractAddress, big.NewInt(0), data)
-			if err != nil {
-				if !errors.Is(err, sender.ErrNoAvailableAccount) {
-					log.Error("Failed to send setL1BaseFee tx to layer2 ", "block.Hash", block.Hash, "block.Height", block.Number, "err", err)
-				}
-				return
-			}
-
-			err = r.db.UpdateL1GasOracleStatusAndOracleTxHash(r.ctx, block.Hash, types.GasOracleImporting, hash.String())
-			if err != nil {
-				log.Error("UpdateGasOracleStatusAndOracleTxHash failed", "block.Hash", block.Hash, "block.Height", block.Number, "err", err)
-				return
-			}
-			r.lastGasPrice = block.BaseFee
-			log.Info("Update l1 base fee", "txHash", hash.String(), "baseFee", baseFee)
+			return
 		}
 	}
 }
 
+func (r *Layer1Relayer) importBlock(block *orm.L1BlockInfo) error {
+	data, err := r.l1BlockContainerABI.Pack("importBlockHeader", common.HexToHash(block.Hash), common.Hex2Bytes(block.HeaderRLP), make([]byte, 0))
+	if err != nil {
+		return err
+	}
+
+	hash, err := r.importSender.SendTransaction(block.Hash, &r.cfg.ContrainerContractAddress, big.NewInt(0), data)
+	if err != nil {
+		return err
+	}
+	log.Info("import block to layer2", "height", block.Number, "hash", block.Hash, "tx hash", hash)
+
+	err = r.db.UpdateL1BlockStatusAndImportTxHash(r.ctx, block.Hash, orm.L1BlockImporting, hash.String())
+	if err != nil {
+		log.Error("UpdateL1BlockStatusAndImportTxHash failed", "height", block.Number, "hash", block.Hash, "err", err)
+	}
+	return err
+}
+
 // Start the relayer process
 func (r *Layer1Relayer) Start() {
-	loop := func(ctx context.Context, f func()) {
-		ticker := time.NewTicker(2 * time.Second)
+	go func() {
+		// trigger by timer
+		ticker := time.NewTicker(3 * time.Second)
 		defer ticker.Stop()
 
 		for {
 			select {
-			case <-ctx.Done():
-				return
 			case <-ticker.C:
-				f()
+				r.ProcessPendingBlocks()
+				r.ProcessSavedEvents()
+			case cfm := <-r.relayConfirmationCh:
+				if !cfm.IsSuccessful {
+					// @todo handle db error
+					err := r.db.UpdateLayer1StatusAndLayer2Hash(r.ctx, cfm.ID, orm.MsgFailed, cfm.TxHash.String())
+					if err != nil {
+						log.Warn("UpdateLayer1StatusAndLayer2Hash failed", "err", err)
+					}
+					log.Warn("relay transaction confirmed but failed in layer2", "confirmation", cfm)
+				} else {
+					// @todo handle db error
+					err := r.db.UpdateLayer1StatusAndLayer2Hash(r.ctx, cfm.ID, orm.MsgConfirmed, cfm.TxHash.String())
+					if err != nil {
+						log.Warn("UpdateLayer1StatusAndLayer2Hash failed", "err", err)
+					}
+					log.Info("relay transaction confirmed in layer2", "confirmation", cfm)
+				}
+			case cfm := <-r.importConfirmationCh:
+				if !cfm.IsSuccessful {
+					// @todo handle db error
+					err := r.db.UpdateL1BlockStatusAndImportTxHash(r.ctx, cfm.ID, orm.L1BlockFailed, cfm.TxHash.String())
+					if err != nil {
+						log.Warn("UpdateL1BlockStatusAndImportTxHash failed", "err", err)
+					}
+					log.Warn("import transaction confirmed but failed in layer2", "confirmation", cfm)
+				} else {
+					// @todo handle db error
+					err := r.db.UpdateL1BlockStatusAndImportTxHash(r.ctx, cfm.ID, orm.L1BlockImported, cfm.TxHash.String())
+					if err != nil {
+						log.Warn("UpdateL1BlockStatusAndImportTxHash failed", "err", err)
+					}
+					log.Info("import transaction confirmed in layer2", "confirmation", cfm)
+				}
+			case <-r.stopCh:
+				return
 			}
 		}
-	}
-	go func() {
-		ctx, cancel := context.WithCancel(r.ctx)
-
-		go loop(ctx, r.ProcessSavedEvents)
-		go loop(ctx, r.ProcessGasPriceOracle)
-
-		go func(ctx context.Context) {
-			for {
-				select {
-				case <-ctx.Done():
-					return
-				case cfm := <-r.messageCh:
-					if !cfm.IsSuccessful {
-						log.Warn("transaction confirmed but failed in layer2", "confirmation", cfm)
-					} else {
-						// @todo handle db error
-						err := r.db.UpdateLayer1StatusAndLayer2Hash(r.ctx, cfm.ID, types.MsgConfirmed, cfm.TxHash.String())
-						if err != nil {
-							log.Warn("UpdateLayer1StatusAndLayer2Hash failed", "err", err)
-						}
-						log.Info("transaction confirmed in layer2", "confirmation", cfm)
-					}
-				case cfm := <-r.gasOracleCh:
-					if !cfm.IsSuccessful {
-						// @discuss: maybe make it pending again?
-						err := r.db.UpdateL1GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleFailed, cfm.TxHash.String())
-						if err != nil {
-							log.Warn("UpdateL1GasOracleStatusAndOracleTxHash failed", "err", err)
-						}
-						log.Warn("transaction confirmed but failed in layer2", "confirmation", cfm)
-					} else {
-						// @todo handle db error
-						err := r.db.UpdateL1GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleImported, cfm.TxHash.String())
-						if err != nil {
-							log.Warn("UpdateGasOracleStatusAndOracleTxHash failed", "err", err)
-						}
-						log.Info("transaction confirmed in layer2", "confirmation", cfm)
-					}
-				}
-			}
-		}(ctx)
-
-		<-r.stopCh
-		cancel()
 	}()
 }
 

bridge/l1/relayer_test.go

@@ -4,6 +4,10 @@ import (
 	"context"
 	"testing"
 
+	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/ethclient/gethclient"
+	"github.com/scroll-tech/go-ethereum/rpc"
 	"github.com/stretchr/testify/assert"
 
 	"scroll-tech/database/migrate"
@@ -19,7 +23,12 @@ func testCreateNewL1Relayer(t *testing.T) {
 	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
 	defer db.Close()
 
-	relayer, err := NewLayer1Relayer(context.Background(), db, cfg.L2Config.RelayerConfig)
+	rawClient, err := rpc.DialContext(context.Background(), l1gethImg.Endpoint())
+	assert.NoError(t, err)
+	gethClient := gethclient.New(rawClient)
+	ethClient := ethclient.NewClient(rawClient)
+
+	relayer, err := NewLayer1Relayer(context.Background(), gethClient, ethClient, 1, common.Address{}, db, cfg.L2Config.RelayerConfig)
 	assert.NoError(t, err)
 	defer relayer.Stop()
 

bridge/l1/watcher.go

@@ -2,22 +2,23 @@ package l1
 
 import (
 	"context"
+	"errors"
 	"math/big"
 	"time"
 
+	"github.com/jmoiron/sqlx"
 	geth "github.com/scroll-tech/go-ethereum"
 	"github.com/scroll-tech/go-ethereum/accounts/abi"
 	"github.com/scroll-tech/go-ethereum/common"
-	geth_types "github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/scroll-tech/go-ethereum/crypto"
+	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/ethclient/gethclient"
 	"github.com/scroll-tech/go-ethereum/log"
+	"github.com/scroll-tech/go-ethereum/rlp"
 	"github.com/scroll-tech/go-ethereum/metrics"
-	"github.com/scroll-tech/go-ethereum/rpc"
-
-	"scroll-tech/common/types"
 
 	"scroll-tech/database"
+	"scroll-tech/database/orm"
 
 	bridge_abi "scroll-tech/bridge/abi"
 	"scroll-tech/bridge/utils"
@@ -34,19 +35,22 @@ type relayedMessage struct {
 }
 
 type rollupEvent struct {
-	batchHash common.Hash
-	txHash    common.Hash
-	status    types.RollupStatus
+	batchID common.Hash
+	txHash  common.Hash
+	status  orm.RollupStatus
 }
 
 // Watcher will listen for smart contract events from Eth L1.
 type Watcher struct {
-	ctx    context.Context
-	client *ethclient.Client
-	db     database.OrmFactory
+	ctx context.Context
+
+	gethClient *gethclient.Client
+	ethClient  *ethclient.Client
+
+	db database.OrmFactory
 
 	// The number of new blocks to wait for a block to be confirmed
-	confirmations rpc.BlockNumber
+	confirmations uint64
 
 	messengerAddress common.Address
 	messengerABI     *abi.ABI
@@ -54,128 +58,105 @@ type Watcher struct {
 	messageQueueAddress common.Address
 	messageQueueABI     *abi.ABI
 
-	scrollChainAddress common.Address
-	scrollChainABI     *abi.ABI
+	rollupAddress common.Address
+	rollupABI     *abi.ABI
 
 	// The height of the block that the watcher has retrieved event logs
 	processedMsgHeight uint64
 	// The height of the block that the watcher has retrieved header rlp
 	processedBlockHeight uint64
 
-	stopCh chan bool
+	stop chan bool
 }
 
 // NewWatcher returns a new instance of Watcher. The instance will be not fully prepared,
 // and still needs to be finalized and ran by calling `watcher.Start`.
-func NewWatcher(ctx context.Context, client *ethclient.Client, startHeight uint64, confirmations rpc.BlockNumber, messengerAddress, messageQueueAddress, scrollChainAddress common.Address, db database.OrmFactory) *Watcher {
-	savedHeight, err := db.GetLayer1LatestWatchedHeight()
+func NewWatcher(ctx context.Context, gethClient *gethclient.Client, ethClient *ethclient.Client, startHeight uint64, confirmations uint64, messengerAddress common.Address, messageQueueAddress common.Address, rollupAddress common.Address, db database.OrmFactory) (*Watcher, error) {
+	savedMsgHeight, err := db.GetLayer1LatestWatchedHeight()
 	if err != nil {
-		log.Warn("Failed to fetch height from db", "err", err)
-		savedHeight = 0
+		log.Warn("Failed to fetch L1 watched message height from db", "err", err)
+		return nil, err
 	}
-	if savedHeight < int64(startHeight) {
-		savedHeight = int64(startHeight)
+	if savedMsgHeight < int64(startHeight) {
+		savedMsgHeight = int64(startHeight)
 	}
-
-	savedL1BlockHeight, err := db.GetLatestL1BlockHeight()
+	savedBlockHeight, err := db.GetLatestL1BlockHeight()
 	if err != nil {
 		log.Warn("Failed to fetch latest L1 block height from db", "err", err)
-		savedL1BlockHeight = 0
+		return nil, err
 	}
-	if savedL1BlockHeight < startHeight {
-		savedL1BlockHeight = startHeight
+	if savedBlockHeight < startHeight {
+		savedBlockHeight = startHeight
 	}
 
-	stopCh := make(chan bool)
+	stop := make(chan bool)
 
 	return &Watcher{
-		ctx:           ctx,
-		client:        client,
+		ctx: ctx,
+
+		gethClient: gethClient,
+		ethClient:  ethClient,
+
 		db:            db,
 		confirmations: confirmations,
 
 		messengerAddress: messengerAddress,
-		messengerABI:     bridge_abi.L1ScrollMessengerABI,
+		messengerABI:     bridge_abi.L1MessengerABI,
 
 		messageQueueAddress: messageQueueAddress,
 		messageQueueABI:     bridge_abi.L1MessageQueueABI,
 
-		scrollChainAddress: scrollChainAddress,
-		scrollChainABI:     bridge_abi.ScrollChainABI,
+		rollupAddress: rollupAddress,
+		rollupABI:     bridge_abi.RollupABI,
 
-		processedMsgHeight:   uint64(savedHeight),
-		processedBlockHeight: savedL1BlockHeight,
-		stopCh:               stopCh,
-	}
+		processedMsgHeight:   uint64(savedMsgHeight),
+		processedBlockHeight: savedBlockHeight,
+
+		stop: stop,
+	}, nil
 }
 
 // Start the Watcher module.
 func (w *Watcher) Start() {
 	go func() {
-		ctx, cancel := context.WithCancel(w.ctx)
+		ticker := time.NewTicker(10 * time.Second)
+		defer ticker.Stop()
 
-		go func(ctx context.Context) {
-			ticker := time.NewTicker(2 * time.Second)
-			defer ticker.Stop()
+		for ; true; <-ticker.C {
+			select {
+			case <-w.stop:
+				return
 
-			for {
-				select {
-				case <-ctx.Done():
-					return
+			default:
+				blockNumber, err := w.ethClient.BlockNumber(w.ctx)
+				if err != nil {
+					log.Error("Failed to get block number", "err", err)
+					continue
+				}
 
-				case <-ticker.C:
-					number, err := utils.GetLatestConfirmedBlockNumber(w.ctx, w.client, w.confirmations)
-					if err != nil {
-						log.Error("failed to get block number", "err", err)
-						continue
-					}
+				if err := w.fetchBlockHeader(blockNumber); err != nil {
+					log.Error("Failed to fetch L1 block header", "lastest", blockNumber, "err", err)
+				}
 
-					if err := w.FetchBlockHeader(number); err != nil {
-						log.Error("Failed to fetch L1 block header", "lastest", number, "err", err)
-					}
+				if err := w.FetchContractEvent(blockNumber); err != nil {
+					log.Error("Failed to fetch L1 bridge event", "lastest", blockNumber, "err", err)
 				}
 			}
-		}(ctx)
-
-		go func(ctx context.Context) {
-			ticker := time.NewTicker(2 * time.Second)
-			defer ticker.Stop()
-
-			for {
-				select {
-				case <-ctx.Done():
-					return
-
-				case <-ticker.C:
-					number, err := utils.GetLatestConfirmedBlockNumber(w.ctx, w.client, w.confirmations)
-					if err != nil {
-						log.Error("failed to get block number", "err", err)
-						continue
-					}
-
-					if err := w.FetchContractEvent(number); err != nil {
-						log.Error("Failed to fetch bridge contract", "err", err)
-					}
-				}
-			}
-		}(ctx)
-
-		<-w.stopCh
-		cancel()
+		}
 	}()
 }
 
 // Stop the Watcher module, for a graceful shutdown.
 func (w *Watcher) Stop() {
-	w.stopCh <- true
+	w.stop <- true
 }
 
 const contractEventsBlocksFetchLimit = int64(10)
 
-// FetchBlockHeader pull latest L1 blocks and save in DB
-func (w *Watcher) FetchBlockHeader(blockHeight uint64) error {
+// fetchBlockHeader pull latest L1 blocks and save in DB
+func (w *Watcher) fetchBlockHeader(blockHeight uint64) error {
 	fromBlock := int64(w.processedBlockHeight) + 1
-	toBlock := int64(blockHeight)
+	toBlock := int64(blockHeight) - int64(w.confirmations)
 	if toBlock < fromBlock {
 		return nil
 	}
@@ -183,20 +164,26 @@ func (w *Watcher) FetchBlockHeader(blockHeight uint64) error {
 		toBlock = fromBlock + contractEventsBlocksFetchLimit - 1
 	}
 
-	var blocks []*types.L1BlockInfo
+	var blocks []*orm.L1BlockInfo
 	var err error
 	height := fromBlock
 	for ; height <= toBlock; height++ {
-		var block *geth_types.Header
-		block, err = w.client.HeaderByNumber(w.ctx, big.NewInt(height))
+		var block *types.Block
+		block, err = w.ethClient.BlockByNumber(w.ctx, big.NewInt(height))
 		if err != nil {
 			log.Warn("Failed to get block", "height", height, "err", err)
 			break
 		}
-		blocks = append(blocks, &types.L1BlockInfo{
-			Number:  uint64(height),
-			Hash:    block.Hash().String(),
-			BaseFee: block.BaseFee.Uint64(),
+		var headerRLPBytes []byte
+		headerRLPBytes, err = rlp.EncodeToBytes(block.Header())
+		if err != nil {
+			log.Warn("Failed to rlp encode header", "height", height, "err", err)
+			break
+		}
+		blocks = append(blocks, &orm.L1BlockInfo{
+			Number:    uint64(height),
+			Hash:      block.Hash().String(),
+			HeaderRLP: common.Bytes2Hex(headerRLPBytes),
 		})
 	}
 
@@ -224,8 +211,18 @@ func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 		log.Info("l1 watcher fetchContractEvent", "w.processedMsgHeight", w.processedMsgHeight)
 	}()
 
+	var dbTx *sqlx.Tx
+	var dbTxErr error
+	defer func() {
+		if dbTxErr != nil {
+			if err := dbTx.Rollback(); err != nil {
+				log.Error("dbTx.Rollback()", "err", err)
+			}
+		}
+	}()
+
 	fromBlock := int64(w.processedMsgHeight) + 1
-	toBlock := int64(blockHeight)
+	toBlock := int64(blockHeight) - int64(w.confirmations)
 
 	for from := fromBlock; from <= toBlock; from += contractEventsBlocksFetchLimit {
 		to := from + contractEventsBlocksFetchLimit - 1
@@ -240,19 +237,20 @@ func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 			ToBlock:   big.NewInt(to),   // inclusive
 			Addresses: []common.Address{
 				w.messengerAddress,
-				w.scrollChainAddress,
 				w.messageQueueAddress,
+				w.rollupAddress,
 			},
 			Topics: make([][]common.Hash, 1),
 		}
-		query.Topics[0] = make([]common.Hash, 5)
-		query.Topics[0][0] = bridge_abi.L1QueueTransactionEventSignature
+		query.Topics[0] = make([]common.Hash, 6)
+		query.Topics[0][0] = bridge_abi.L1SentMessageEventSignature
 		query.Topics[0][1] = bridge_abi.L1RelayedMessageEventSignature
 		query.Topics[0][2] = bridge_abi.L1FailedRelayedMessageEventSignature
 		query.Topics[0][3] = bridge_abi.L1CommitBatchEventSignature
 		query.Topics[0][4] = bridge_abi.L1FinalizeBatchEventSignature
+		query.Topics[0][5] = bridge_abi.L1AppendMessageEventSignature
 
-		logs, err := w.client.FilterLogs(w.ctx, query)
+		logs, err := w.ethClient.FilterLogs(w.ctx, query)
 		if err != nil {
 			log.Warn("Failed to get event logs", "err", err)
 			return err
@@ -272,29 +270,29 @@ func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 		log.Info("L1 events types", "SentMessageCount", len(sentMessageEvents), "RelayedMessageCount", len(relayedMessageEvents), "RollupEventCount", len(rollupEvents))
 
 		// use rollup event to update rollup results db status
-		var batchHashes []string
+		var batchIDs []string
 		for _, event := range rollupEvents {
-			batchHashes = append(batchHashes, event.batchHash.String())
+			batchIDs = append(batchIDs, event.batchID.String())
 		}
-		statuses, err := w.db.GetRollupStatusByHashList(batchHashes)
+		statuses, err := w.db.GetRollupStatusByIDList(batchIDs)
 		if err != nil {
-			log.Error("Failed to GetRollupStatusByHashList", "err", err)
+			log.Error("Failed to GetRollupStatusByIDList", "err", err)
 			return err
 		}
-		if len(statuses) != len(batchHashes) {
-			log.Error("RollupStatus.Length mismatch with batchHashes.Length", "RollupStatus.Length", len(statuses), "batchHashes.Length", len(batchHashes))
+		if len(statuses) != len(batchIDs) {
+			log.Error("RollupStatus.Length mismatch with BatchIDs.Length", "RollupStatus.Length", len(statuses), "BatchIDs.Length", len(batchIDs))
 			return nil
 		}
 
 		for index, event := range rollupEvents {
-			batchHash := event.batchHash.String()
+			batchID := event.batchID.String()
 			status := statuses[index]
 			// only update when db status is before event status
 			if event.status > status {
-				if event.status == types.RollupFinalized {
-					err = w.db.UpdateFinalizeTxHashAndRollupStatus(w.ctx, batchHash, event.txHash.String(), event.status)
-				} else if event.status == types.RollupCommitted {
-					err = w.db.UpdateCommitTxHashAndRollupStatus(w.ctx, batchHash, event.txHash.String(), event.status)
+				if event.status == orm.RollupFinalized {
+					err = w.db.UpdateFinalizeTxHashAndRollupStatus(w.ctx, batchID, event.txHash.String(), event.status)
+				} else if event.status == orm.RollupCommitted {
+					err = w.db.UpdateCommitTxHashAndRollupStatus(w.ctx, batchID, event.txHash.String(), event.status)
 				}
 				if err != nil {
 					log.Error("Failed to update Rollup/Finalize TxHash and Status", "err", err)
@@ -306,21 +304,51 @@ func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 		// Update relayed message first to make sure we don't forget to update submitted message.
 		// Since, we always start sync from the latest unprocessed message.
 		for _, msg := range relayedMessageEvents {
-			var msgStatus types.MsgStatus
 			if msg.isSuccessful {
-				msgStatus = types.MsgConfirmed
+				// succeed
+				err = w.db.UpdateLayer2StatusAndLayer1Hash(w.ctx, msg.msgHash.String(), orm.MsgConfirmed, msg.txHash.String())
 			} else {
-				msgStatus = types.MsgFailed
+				// failed
+				err = w.db.UpdateLayer2StatusAndLayer1Hash(w.ctx, msg.msgHash.String(), orm.MsgFailed, msg.txHash.String())
 			}
-			if err = w.db.UpdateLayer2StatusAndLayer1Hash(w.ctx, msg.msgHash.String(), msgStatus, msg.txHash.String()); err != nil {
+			if err != nil {
 				log.Error("Failed to update layer1 status and layer2 hash", "err", err)
 				return err
 			}
 		}
 
-		if err = w.db.SaveL1Messages(w.ctx, sentMessageEvents); err != nil {
+		// group messages by height
+		dbTx, err = w.db.Beginx()
+		if err != nil {
 			return err
 		}
+		for i := 0; i < len(sentMessageEvents); {
+			j := i
+			var messages []*orm.L1Message
+			for ; j < len(sentMessageEvents) && sentMessageEvents[i].Height == sentMessageEvents[j].Height; j++ {
+				messages = append(messages, sentMessageEvents[j])
+			}
+			i = j
+			err = w.fillMessageProof(messages)
+			if err != nil {
+				log.Error("Failed to fillMessageProof", "err", err)
+				// make sure we will rollback
+				dbTxErr = err
+				return err
+			}
+
+			dbTxErr = w.db.SaveL1MessagesInDbTx(w.ctx, dbTx, messages)
+			if dbTxErr != nil {
+				log.Error("SaveL1MessagesInDbTx failed", "error", dbTxErr)
+				return dbTxErr
+			}
+		}
+
+		dbTxErr = dbTx.Commit()
+		if dbTxErr != nil {
+			log.Error("dbTx.Commit failed", "error", dbTxErr)
+			return dbTxErr
+		}
 
 		w.processedMsgHeight = uint64(to)
 		bridgeL1MsgSyncHeightGauge.Update(to)
@@ -329,34 +357,48 @@ func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 	return nil
 }
 
-func (w *Watcher) parseBridgeEventLogs(logs []geth_types.Log) ([]*types.L1Message, []relayedMessage, []rollupEvent, error) {
+func (w *Watcher) parseBridgeEventLogs(logs []types.Log) ([]*orm.L1Message, []relayedMessage, []rollupEvent, error) {
 	// Need use contract abi to parse event Log
 	// Can only be tested after we have our contracts set up
 
-	var l1Messages []*types.L1Message
+	var l1Messages []*orm.L1Message
 	var relayedMessages []relayedMessage
 	var rollupEvents []rollupEvent
+	var lastAppendMsgHash common.Hash
 	for _, vLog := range logs {
 		switch vLog.Topics[0] {
-		case bridge_abi.L1QueueTransactionEventSignature:
-			event := bridge_abi.L1QueueTransactionEvent{}
-			err := utils.UnpackLog(w.messageQueueABI, &event, "QueueTransaction", vLog)
+		case bridge_abi.L1SentMessageEventSignature:
+			event := bridge_abi.L1SentMessageEvent{}
+			err := utils.UnpackLog(w.messengerABI, &event, "SentMessage", vLog)
 			if err != nil {
-				log.Warn("Failed to unpack layer1 QueueTransaction event", "err", err)
+				log.Warn("Failed to unpack layer1 SentMessage event", "err", err)
 				return l1Messages, relayedMessages, rollupEvents, err
 			}
+			computedMsgHash := utils.ComputeMessageHash(
+				event.Sender,
+				event.Target,
+				event.Value,
+				event.Fee,
+				event.Deadline,
+				event.Message,
+				event.MessageNonce,
+			)
+			// they should always match, just double check
+			if computedMsgHash != lastAppendMsgHash {
+				return l1Messages, relayedMessages, rollupEvents, errors.New("l1 message hash mismatch")
+			}
 
-			msgHash := common.BytesToHash(crypto.Keccak256(event.Data))
-
-			l1Messages = append(l1Messages, &types.L1Message{
-				QueueIndex: event.QueueIndex.Uint64(),
-				MsgHash:    msgHash.String(),
+			l1Messages = append(l1Messages, &orm.L1Message{
+				Nonce:      event.MessageNonce.Uint64(),
+				MsgHash:    computedMsgHash.String(),
 				Height:     vLog.BlockNumber,
 				Sender:     event.Sender.String(),
 				Value:      event.Value.String(),
-				Target:     event.Target.String(),
-				Calldata:   common.Bytes2Hex(event.Data),
+				Fee:        event.Fee.String(),
 				GasLimit:   event.GasLimit.Uint64(),
+				Deadline:   event.Deadline.Uint64(),
+				Target:     event.Target.String(),
+				Calldata:   common.Bytes2Hex(event.Message),
 				Layer1Hash: vLog.TxHash.Hex(),
 			})
 		case bridge_abi.L1RelayedMessageEventSignature:
@@ -366,9 +408,8 @@ func (w *Watcher) parseBridgeEventLogs(logs []geth_types.Log) ([]*types.L1Messag
 				log.Warn("Failed to unpack layer1 RelayedMessage event", "err", err)
 				return l1Messages, relayedMessages, rollupEvents, err
 			}
-
 			relayedMessages = append(relayedMessages, relayedMessage{
-				msgHash:      event.MessageHash,
+				msgHash:      event.MsgHash,
 				txHash:       vLog.TxHash,
 				isSuccessful: true,
 			})
@@ -379,38 +420,45 @@ func (w *Watcher) parseBridgeEventLogs(logs []geth_types.Log) ([]*types.L1Messag
 				log.Warn("Failed to unpack layer1 FailedRelayedMessage event", "err", err)
 				return l1Messages, relayedMessages, rollupEvents, err
 			}
-
 			relayedMessages = append(relayedMessages, relayedMessage{
-				msgHash:      event.MessageHash,
+				msgHash:      event.MsgHash,
 				txHash:       vLog.TxHash,
 				isSuccessful: false,
 			})
 		case bridge_abi.L1CommitBatchEventSignature:
 			event := bridge_abi.L1CommitBatchEvent{}
-			err := utils.UnpackLog(w.scrollChainABI, &event, "CommitBatch", vLog)
+			err := utils.UnpackLog(w.rollupABI, &event, "CommitBatch", vLog)
 			if err != nil {
 				log.Warn("Failed to unpack layer1 CommitBatch event", "err", err)
 				return l1Messages, relayedMessages, rollupEvents, err
 			}
 
 			rollupEvents = append(rollupEvents, rollupEvent{
-				batchHash: event.BatchHash,
-				txHash:    vLog.TxHash,
-				status:    types.RollupCommitted,
+				batchID: event.BatchId,
+				txHash:  vLog.TxHash,
+				status:  orm.RollupCommitted,
 			})
 		case bridge_abi.L1FinalizeBatchEventSignature:
 			event := bridge_abi.L1FinalizeBatchEvent{}
-			err := utils.UnpackLog(w.scrollChainABI, &event, "FinalizeBatch", vLog)
+			err := utils.UnpackLog(w.rollupABI, &event, "FinalizeBatch", vLog)
 			if err != nil {
 				log.Warn("Failed to unpack layer1 FinalizeBatch event", "err", err)
 				return l1Messages, relayedMessages, rollupEvents, err
 			}
 
 			rollupEvents = append(rollupEvents, rollupEvent{
-				batchHash: event.BatchHash,
-				txHash:    vLog.TxHash,
-				status:    types.RollupFinalized,
+				batchID: event.BatchId,
+				txHash:  vLog.TxHash,
+				status:  orm.RollupFinalized,
 			})
+		case bridge_abi.L1AppendMessageEventSignature:
+			event := bridge_abi.L1AppendMessageEvent{}
+			err := utils.UnpackLog(w.messageQueueABI, &event, "AppendMessage", vLog)
+			if err != nil {
+				log.Warn("Failed to unpack layer1 AppendMessage event", "err", err)
+				return l1Messages, relayedMessages, rollupEvents, err
+			}
+			lastAppendMsgHash = event.MsgHash
 		default:
 			log.Error("Unknown event", "topic", vLog.Topics[0], "txHash", vLog.TxHash)
 		}
@@ -418,3 +466,25 @@ func (w *Watcher) parseBridgeEventLogs(logs []geth_types.Log) ([]*types.L1Messag
 
 	return l1Messages, relayedMessages, rollupEvents, nil
 }
+
+// fetchMessageProof will fetch storage proof for msgs.
+// caller should make sure the height of all msgs are the same.
+func (w *Watcher) fillMessageProof(msgs []*orm.L1Message) error {
+	var hashes []common.Hash
+	for _, msg := range msgs {
+		hashes = append(hashes, common.HexToHash(msg.MsgHash))
+	}
+
+	height := msgs[0].Height
+	proofs, err := utils.GetL1MessageProof(w.gethClient, w.messageQueueAddress, hashes, height)
+	if err != nil {
+		return err
+	}
+
+	for i := 0; i < len(msgs); i++ {
+		msgs[i].ProofHeight = height
+		msgs[i].MessageProof = common.Bytes2Hex(proofs[i])
+	}
+
+	return nil
+}

bridge/l1/watcher_test.go

@@ -5,6 +5,8 @@ import (
 	"testing"
 
 	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/ethclient/gethclient"
+	"github.com/scroll-tech/go-ethereum/rpc"
 	"github.com/stretchr/testify/assert"
 
 	"scroll-tech/database"
@@ -18,12 +20,15 @@ func testStartWatcher(t *testing.T) {
 	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
 	defer db.Close()
 
-	client, err := ethclient.Dial(l1gethImg.Endpoint())
+	rawClient, err := rpc.DialContext(context.Background(), l1gethImg.Endpoint())
 	assert.NoError(t, err)
+	gethClient := gethclient.New(rawClient)
+	ethClient := ethclient.NewClient(rawClient)
 
 	l1Cfg := cfg.L1Config
 
-	watcher := NewWatcher(context.Background(), client, l1Cfg.StartHeight, l1Cfg.Confirmations, l1Cfg.L1MessengerAddress, l1Cfg.L1MessageQueueAddress, l1Cfg.RelayerConfig.RollupContractAddress, db)
+	watcher, err := NewWatcher(context.Background(), gethClient, ethClient, l1Cfg.StartHeight, l1Cfg.Confirmations, l1Cfg.L1MessengerAddress, l1Cfg.L1MessageQueueAddress, l1Cfg.RollupContractAddress, db)
+	assert.NoError(t, err)
 	watcher.Start()
 	defer watcher.Stop()
 }

bridge/l2/backend.go

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

bridge/l2/batch_proposer.go

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

bridge/l2/batch_proposer_test.go

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

bridge/l2/l2_test.go

@@ -1,17 +1,12 @@
 package l2
 
 import (
-	"encoding/json"
-	"fmt"
-	"os"
 	"testing"
 
-	geth_types "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/stretchr/testify/assert"
 
 	"scroll-tech/common/docker"
-	"scroll-tech/common/types"
 
 	"scroll-tech/bridge/config"
 )
@@ -27,14 +22,6 @@ var (
 
 	// l2geth client
 	l2Cli *ethclient.Client
-
-	// block trace
-	blockTrace1 *geth_types.BlockTrace
-	blockTrace2 *geth_types.BlockTrace
-
-	// batch data
-	batchData1 *types.BatchData
-	batchData2 *types.BatchData
 )
 
 func setupEnv(t *testing.T) (err error) {
@@ -60,40 +47,6 @@ func setupEnv(t *testing.T) (err error) {
 	l2Cli, err = ethclient.Dial(cfg.L2Config.Endpoint)
 	assert.NoError(t, err)
 
-	templateBlockTrace1, err := os.ReadFile("../../common/testdata/blockTrace_02.json")
-	if err != nil {
-		return err
-	}
-	// unmarshal blockTrace
-	blockTrace1 = &geth_types.BlockTrace{}
-	if err = json.Unmarshal(templateBlockTrace1, blockTrace1); err != nil {
-		return err
-	}
-
-	parentBatch1 := &types.BlockBatch{
-		Index: 1,
-		Hash:  "0x0000000000000000000000000000000000000000",
-	}
-	batchData1 = types.NewBatchData(parentBatch1, []*geth_types.BlockTrace{blockTrace1}, nil)
-
-	templateBlockTrace2, err := os.ReadFile("../../common/testdata/blockTrace_03.json")
-	if err != nil {
-		return err
-	}
-	// unmarshal blockTrace
-	blockTrace2 = &geth_types.BlockTrace{}
-	if err = json.Unmarshal(templateBlockTrace2, blockTrace2); err != nil {
-		return err
-	}
-	parentBatch2 := &types.BlockBatch{
-		Index: batchData1.Batch.BatchIndex,
-		Hash:  batchData1.Hash().Hex(),
-	}
-	batchData2 = types.NewBatchData(parentBatch2, []*geth_types.BlockTrace{blockTrace2}, nil)
-
-	fmt.Printf("batchhash1 = %x\n", batchData1.Hash())
-	fmt.Printf("batchhash2 = %x\n", batchData2.Hash())
-
 	return err
 }
 
@@ -122,12 +75,11 @@ func TestFunction(t *testing.T) {
 	// Run l2 relayer test cases.
 	t.Run("TestCreateNewRelayer", testCreateNewRelayer)
 	t.Run("TestL2RelayerProcessSaveEvents", testL2RelayerProcessSaveEvents)
-	t.Run("TestL2RelayerProcessCommittedBatches", testL2RelayerProcessCommittedBatches)
-	t.Run("TestL2RelayerSkipBatches", testL2RelayerSkipBatches)
+	t.Run("testL2RelayerProcessPendingBatches", testL2RelayerProcessPendingBatches)
+	t.Run("testL2RelayerProcessCommittedBatches", testL2RelayerProcessCommittedBatches)
+	t.Run("testL2RelayerSkipBatches", testL2RelayerSkipBatches)
 
-	// Run batch proposer test cases.
-	t.Run("TestBatchProposerProposeBatch", testBatchProposerProposeBatch)
-	t.Run("TestBatchProposerGracefulRestart", testBatchProposerGracefulRestart)
+	t.Run("testBatchProposer", testBatchProposer)
 
 	t.Cleanup(func() {
 		free(t)

bridge/l2/relayer.go

@@ -13,15 +13,12 @@ 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"
 	"golang.org/x/sync/errgroup"
 	"modernc.org/mathutil"
 
-	"scroll-tech/common/types"
-
 	"scroll-tech/database"
+	"scroll-tech/database/orm"
 
 	bridge_abi "scroll-tech/bridge/abi"
 	"scroll-tech/bridge/config"
@@ -29,12 +26,6 @@ import (
 	"scroll-tech/bridge/utils"
 )
 
-const (
-	gasPriceDiffPrecision = 1000000
-
-	defaultGasPriceDiff = 50000 // 5%
-)
-
 // Layer2Relayer is responsible for
 //  1. Committing and finalizing L2 blocks on L1
 //  2. Relaying messages from L2 to L1
@@ -44,8 +35,6 @@ const (
 type Layer2Relayer struct {
 	ctx context.Context
 
-	l2Client *ethclient.Client
-
 	db  database.OrmFactory
 	cfg *config.RelayerConfig
 
@@ -57,31 +46,23 @@ type Layer2Relayer struct {
 	rollupCh     <-chan *sender.Confirmation
 	l1RollupABI  *abi.ABI
 
-	gasOracleSender *sender.Sender
-	gasOracleCh     <-chan *sender.Confirmation
-	l2GasOracleABI  *abi.ABI
-
-	lastGasPrice uint64
-	minGasPrice  uint64
-	gasPriceDiff uint64
-
 	// A list of processing message.
 	// key(string): confirmation ID, value(string): layer2 hash.
 	processingMessage sync.Map
 
-	// A list of processing batches commitment.
-	// key(string): confirmation ID, value([]string): batch hashes.
-	processingBatchesCommitment sync.Map
+	// A list of processing batch commitment.
+	// key(string): confirmation ID, value(string): batch id.
+	processingCommitment sync.Map
 
 	// A list of processing batch finalization.
-	// key(string): confirmation ID, value(string): batch hash.
+	// 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, l2Client *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 {
@@ -95,55 +76,28 @@ func NewLayer2Relayer(ctx context.Context, l2Client *ethclient.Client, db databa
 		return nil, err
 	}
 
-	gasOracleSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.GasOracleSenderPrivateKeys)
-	if err != nil {
-		log.Error("Failed to create gas oracle sender", "err", err)
-		return nil, err
-	}
-
-	var minGasPrice uint64
-	var gasPriceDiff uint64
-	if cfg.GasOracleConfig != nil {
-		minGasPrice = cfg.GasOracleConfig.MinGasPrice
-		gasPriceDiff = cfg.GasOracleConfig.GasPriceDiff
-	} else {
-		minGasPrice = 0
-		gasPriceDiff = defaultGasPriceDiff
-	}
-
 	return &Layer2Relayer{
-		ctx: ctx,
-		db:  db,
-
-		l2Client: l2Client,
-
-		messageSender:  messageSender,
-		messageCh:      messageSender.ConfirmChan(),
-		l1MessengerABI: bridge_abi.L1ScrollMessengerABI,
-
-		rollupSender: rollupSender,
-		rollupCh:     rollupSender.ConfirmChan(),
-		l1RollupABI:  bridge_abi.ScrollChainABI,
-
-		gasOracleSender: gasOracleSender,
-		gasOracleCh:     gasOracleSender.ConfirmChan(),
-		l2GasOracleABI:  bridge_abi.L2GasPriceOracleABI,
-
-		minGasPrice:  minGasPrice,
-		gasPriceDiff: gasPriceDiff,
-
-		cfg:                         cfg,
-		processingMessage:           sync.Map{},
-		processingBatchesCommitment: sync.Map{},
-		processingFinalization:      sync.Map{},
-		stopCh:                      make(chan struct{}),
+		ctx:                    ctx,
+		db:                     db,
+		messageSender:          messageSender,
+		messageCh:              messageSender.ConfirmChan(),
+		l1MessengerABI:         bridge_abi.L1MessengerABI,
+		rollupSender:           rollupSender,
+		rollupCh:               rollupSender.ConfirmChan(),
+		l1RollupABI:            bridge_abi.RollupABI,
+		cfg:                    cfg,
+		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() {
+func (r *Layer2Relayer) ProcessSavedEvents(wg *sync.WaitGroup) {
+	defer wg.Done()
 	batch, err := r.db.GetLatestFinalizedBatch()
 	if err != nil {
 		log.Error("GetLatestFinalizedBatch failed", "err", err)
@@ -152,7 +106,7 @@ func (r *Layer2Relayer) ProcessSavedEvents() {
 
 	// msgs are sorted by nonce in increasing order
 	msgs, err := r.db.GetL2Messages(
-		map[string]interface{}{"status": types.MsgPending},
+		map[string]interface{}{"status": orm.MsgPending},
 		fmt.Sprintf("AND height<=%d", batch.EndBlockNumber),
 		fmt.Sprintf("ORDER BY nonce ASC LIMIT %d", processMsgLimit),
 	)
@@ -172,7 +126,7 @@ func (r *Layer2Relayer) ProcessSavedEvents() {
 		for _, msg := range msgs[:size] {
 			msg := msg
 			g.Go(func() error {
-				return r.processSavedEvent(msg)
+				return r.processSavedEvent(msg, batch)
 			})
 		}
 		if err := g.Wait(); err != nil {
@@ -184,25 +138,12 @@ func (r *Layer2Relayer) ProcessSavedEvents() {
 	}
 }
 
-func (r *Layer2Relayer) processSavedEvent(msg *types.L2Message) error {
-	// @todo fetch merkle proof from l2geth
+func (r *Layer2Relayer) processSavedEvent(msg *orm.L2Message, batch *orm.BlockBatch) error {
 	log.Info("Processing L2 Message", "msg.nonce", msg.Nonce, "msg.height", msg.Height)
 
-	// Get the block info that contains the message
-	blockInfos, err := r.db.GetL2BlockInfos(map[string]interface{}{"number": msg.Height})
-	if err != nil {
-		log.Error("Failed to GetL2BlockInfos from DB", "number", msg.Height)
-	}
-	blockInfo := blockInfos[0]
-	if !blockInfo.BatchHash.Valid {
-		log.Error("Block has not been batched yet", "number", blockInfo.Number, "msg.nonce", msg.Nonce)
-		return nil
-	}
-
-	// TODO: rebuild the withdraw trie to generate the merkle proof
 	proof := bridge_abi.IL1ScrollMessengerL2MessageProof{
-		BatchHash:   common.HexToHash(blockInfo.BatchHash.String),
-		MerkleProof: make([]byte, 0),
+		BlockHash:        common.HexToHash(batch.EndBlockHash),
+		MessageRootProof: DecodeBytesToMerkleProof(common.Hex2Bytes(msg.Proof)),
 	}
 	from := common.HexToAddress(msg.Sender)
 	target := common.HexToAddress(msg.Target)
@@ -212,9 +153,11 @@ func (r *Layer2Relayer) processSavedEvent(msg *types.L2Message) error {
 		log.Error("Failed to parse message value", "msg.nonce", msg.Nonce, "msg.height", msg.Height)
 		// TODO: need to skip this message by changing its status to MsgError
 	}
+	fee, _ := big.NewInt(0).SetString(msg.Fee, 10)
+	deadline := big.NewInt(int64(msg.Deadline))
 	msgNonce := big.NewInt(int64(msg.Nonce))
 	calldata := common.Hex2Bytes(msg.Calldata)
-	data, err := r.l1MessengerABI.Pack("relayMessageWithProof", from, target, value, msgNonce, calldata, proof)
+	data, err := r.l1MessengerABI.Pack("relayMessageWithProof", from, target, value, fee, deadline, msgNonce, calldata, proof)
 	if err != nil {
 		log.Error("Failed to pack relayMessageWithProof", "msg.nonce", msg.Nonce, "err", err)
 		// TODO: need to skip this message by changing its status to MsgError
@@ -223,10 +166,10 @@ func (r *Layer2Relayer) processSavedEvent(msg *types.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, types.MsgExpired)
+		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, types.MsgConfirmed)
+		return r.db.UpdateLayer2Status(r.ctx, msg.MsgHash, orm.MsgConfirmed)
 	}
 	if err != nil {
 		if !errors.Is(err, sender.ErrNoAvailableAccount) {
@@ -238,7 +181,7 @@ func (r *Layer2Relayer) processSavedEvent(msg *types.L2Message) error {
 
 	// save status in db
 	// @todo handle db error
-	err = r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, msg.MsgHash, types.MsgSubmitted, hash.String())
+	err = r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, msg.MsgHash, orm.MsgSubmitted, hash.String())
 	if err != nil {
 		log.Error("UpdateLayer2StatusAndLayer1Hash failed", "msgHash", msg.MsgHash, "err", err)
 		return err
@@ -247,104 +190,103 @@ func (r *Layer2Relayer) processSavedEvent(msg *types.L2Message) error {
 	return nil
 }
 
-// ProcessGasPriceOracle imports gas price to layer1
-func (r *Layer2Relayer) ProcessGasPriceOracle() {
-	batch, err := r.db.GetLatestBatch()
+// ProcessPendingBatches submit batch data to layer 1 rollup contract
+func (r *Layer2Relayer) ProcessPendingBatches(wg *sync.WaitGroup) {
+	defer wg.Done()
+	// batches are sorted by batch index in increasing order
+	batchesInDB, err := r.db.GetPendingBatches(1)
 	if err != nil {
-		log.Error("Failed to GetLatestBatch", "err", err)
+		log.Error("Failed to fetch pending L2 batches", "err", err)
+		return
+	}
+	if len(batchesInDB) == 0 {
+		return
+	}
+	id := batchesInDB[0]
+	// @todo add support to relay multiple batches
+
+	batches, err := r.db.GetBlockBatches(map[string]interface{}{"id": id})
+	if err != nil || len(batches) == 0 {
+		log.Error("Failed to GetBlockBatches", "batch_id", id, "err", err)
+		return
+	}
+	batch := batches[0]
+
+	traces, err := r.db.GetBlockTraces(map[string]interface{}{"batch_id": id}, "ORDER BY number ASC")
+	if err != nil || len(traces) == 0 {
+		log.Error("Failed to GetBlockTraces", "batch_id", id, "err", err)
 		return
 	}
 
-	if batch.OracleStatus == types.GasOraclePending {
-		suggestGasPrice, err := r.l2Client.SuggestGasPrice(r.ctx)
-		if err != nil {
-			log.Error("Failed to fetch SuggestGasPrice from l2geth", "err", err)
-			return
+	layer2Batch := &bridge_abi.IZKRollupLayer2Batch{
+		BatchIndex: batch.Index,
+		ParentHash: common.HexToHash(batch.ParentHash),
+		Blocks:     make([]bridge_abi.IZKRollupLayer2BlockHeader, len(traces)),
+	}
+
+	parentHash := common.HexToHash(batch.ParentHash)
+	for i, trace := range traces {
+		layer2Batch.Blocks[i] = bridge_abi.IZKRollupLayer2BlockHeader{
+			BlockHash:   trace.Header.Hash(),
+			ParentHash:  parentHash,
+			BaseFee:     trace.Header.BaseFee,
+			StateRoot:   trace.StorageTrace.RootAfter,
+			BlockHeight: trace.Header.Number.Uint64(),
+			GasUsed:     0,
+			Timestamp:   trace.Header.Time,
+			ExtraData:   make([]byte, 0),
+			Txs:         make([]bridge_abi.IZKRollupLayer2Transaction, len(trace.Transactions)),
 		}
-		suggestGasPriceUint64 := uint64(suggestGasPrice.Int64())
-		expectedDelta := r.lastGasPrice * r.gasPriceDiff / gasPriceDiffPrecision
-
-		// last is undefine or (suggestGasPriceUint64 >= minGasPrice && exceed diff)
-		if r.lastGasPrice == 0 || (suggestGasPriceUint64 >= r.minGasPrice && (suggestGasPriceUint64 >= r.lastGasPrice+expectedDelta || suggestGasPriceUint64 <= r.lastGasPrice-expectedDelta)) {
-			data, err := r.l2GasOracleABI.Pack("setL2BaseFee", suggestGasPrice)
-			if err != nil {
-				log.Error("Failed to pack setL2BaseFee", "batch.Hash", batch.Hash, "GasPrice", suggestGasPrice.Uint64(), "err", err)
-				return
+		for j, tx := range trace.Transactions {
+			layer2Batch.Blocks[i].Txs[j] = bridge_abi.IZKRollupLayer2Transaction{
+				Nonce:    tx.Nonce,
+				Gas:      tx.Gas,
+				GasPrice: tx.GasPrice.ToInt(),
+				Value:    tx.Value.ToInt(),
+				Data:     common.Hex2Bytes(tx.Data),
+				R:        tx.R.ToInt(),
+				S:        tx.S.ToInt(),
+				V:        tx.V.ToInt().Uint64(),
 			}
-
-			hash, err := r.gasOracleSender.SendTransaction(batch.Hash, &r.cfg.GasPriceOracleContractAddress, big.NewInt(0), data)
-			if err != nil {
-				if !errors.Is(err, sender.ErrNoAvailableAccount) {
-					log.Error("Failed to send setL2BaseFee tx to layer2 ", "batch.Hash", batch.Hash, "err", err)
-				}
-				return
+			if tx.To != nil {
+				layer2Batch.Blocks[i].Txs[j].Target = *tx.To
 			}
-
-			err = r.db.UpdateL2GasOracleStatusAndOracleTxHash(r.ctx, batch.Hash, types.GasOracleImporting, hash.String())
-			if err != nil {
-				log.Error("UpdateGasOracleStatusAndOracleTxHash failed", "batch.Hash", batch.Hash, "err", err)
-				return
-			}
-			r.lastGasPrice = suggestGasPriceUint64
-			log.Info("Update l2 gas price", "txHash", hash.String(), "GasPrice", suggestGasPrice)
+			layer2Batch.Blocks[i].GasUsed += trace.ExecutionResults[j].Gas
 		}
-	}
-}
 
-// SendCommitTx sends commitBatches tx to L1.
-func (r *Layer2Relayer) SendCommitTx(batchData []*types.BatchData) error {
-	if len(batchData) == 0 {
-		log.Error("SendCommitTx receives empty batch")
-		return nil
+		// for next iteration
+		parentHash = layer2Batch.Blocks[i].BlockHash
 	}
 
-	// pack calldata
-	commitBatches := make([]bridge_abi.IScrollChainBatch, len(batchData))
-	for i, batch := range batchData {
-		commitBatches[i] = batch.Batch
-	}
-	calldata, err := r.l1RollupABI.Pack("commitBatches", commitBatches)
+	data, err := r.l1RollupABI.Pack("commitBatch", layer2Batch)
 	if err != nil {
-		log.Error("Failed to pack commitBatches",
-			"error", err,
-			"start_batch_index", commitBatches[0].BatchIndex,
-			"end_batch_index", commitBatches[len(commitBatches)-1].BatchIndex)
-		return err
+		log.Error("Failed to pack commitBatch", "id", id, "index", batch.Index, "err", err)
+		return
 	}
 
-	// generate a unique txID and send transaction
-	var bytes []byte
-	for _, batch := range batchData {
-		bytes = append(bytes, batch.Hash().Bytes()...)
-	}
-	txID := crypto.Keccak256Hash(bytes).String()
-	txHash, err := r.rollupSender.SendTransaction(txID, &r.cfg.RollupContractAddress, big.NewInt(0), calldata)
+	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 commitBatches tx to layer1 ", "err", err)
+			log.Error("Failed to send commitBatch tx to layer1 ", "id", id, "index", batch.Index, "err", err)
 		}
-		return err
+		return
 	}
-	log.Info("Sent the commitBatches tx to layer1",
-		"tx_hash", txHash.Hex(),
-		"start_batch_index", commitBatches[0].BatchIndex,
-		"end_batch_index", commitBatches[len(commitBatches)-1].BatchIndex)
+	log.Info("commitBatch in layer1", "batch_id", id, "index", batch.Index, "hash", hash)
 
 	// record and sync with db, @todo handle db error
-	batchHashes := make([]string, len(batchData))
-	for i, batch := range batchData {
-		batchHashes[i] = batch.Hash().Hex()
-		err = r.db.UpdateCommitTxHashAndRollupStatus(r.ctx, batchHashes[i], txHash.String(), types.RollupCommitting)
-		if err != nil {
-			log.Error("UpdateCommitTxHashAndRollupStatus failed", "hash", batchHashes[i], "index", batch.Batch.BatchIndex, "err", err)
-		}
+	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.processingBatchesCommitment.Store(txID, batchHashes)
-	return nil
+	r.processingCommitment.Store(txID, id)
 }
 
 // ProcessCommittedBatches submit proof to layer 1 rollup contract
-func (r *Layer2Relayer) ProcessCommittedBatches() {
+func (r *Layer2Relayer) ProcessCommittedBatches(wg *sync.WaitGroup) {
+	defer wg.Done()
+
 	// set skipped batches in a single db operation
 	if count, err := r.db.UpdateSkippedBatches(); err != nil {
 		log.Error("UpdateSkippedBatches failed", "err", err)
@@ -362,91 +304,91 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 	if len(batches) == 0 {
 		return
 	}
-	hash := batches[0]
+	id := batches[0]
 	// @todo add support to relay multiple batches
 
-	status, err := r.db.GetProvingStatusByHash(hash)
+	status, err := r.db.GetProvingStatusByID(id)
 	if err != nil {
-		log.Error("GetProvingStatusByHash failed", "hash", hash, "err", err)
+		log.Error("GetProvingStatusByID failed", "id", id, "err", err)
 		return
 	}
 
 	switch status {
-	case types.ProvingTaskUnassigned, types.ProvingTaskAssigned:
+	case orm.ProvingTaskUnassigned, orm.ProvingTaskAssigned:
 		// The proof for this block is not ready yet.
 		return
 
-	case types.ProvingTaskProved:
+	case orm.ProvingTaskProved:
 		// It's an intermediate state. The roller manager received the proof but has not verified
 		// the proof yet. We don't roll up the proof until it's verified.
 		return
 
-	case types.ProvingTaskFailed, types.ProvingTaskSkipped:
+	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, hash, types.RollupFinalizationSkipped); err != nil {
-			log.Warn("UpdateRollupStatus failed", "hash", hash, "err", err)
+		if err = r.db.UpdateRollupStatus(r.ctx, id, orm.RollupFinalizationSkipped); err != nil {
+			log.Warn("UpdateRollupStatus failed", "id", id, "err", err)
 		}
 
-	case types.ProvingTaskVerified:
-		log.Info("Start to roll up zk proof", "hash", hash)
+	case orm.ProvingTaskVerified:
+		log.Info("Start to roll up zk proof", "id", id)
 		success := false
 
 		defer func() {
 			// TODO: need to revisit this and have a more fine-grained error handling
 			if !success {
-				log.Info("Failed to upload the proof, change rollup status to FinalizationSkipped", "hash", hash)
-				if err = r.db.UpdateRollupStatus(r.ctx, hash, types.RollupFinalizationSkipped); err != nil {
-					log.Warn("UpdateRollupStatus failed", "hash", hash, "err", err)
+				log.Info("Failed to upload the proof, change rollup status to FinalizationSkipped", "id", id)
+				if err = r.db.UpdateRollupStatus(r.ctx, id, orm.RollupFinalizationSkipped); err != nil {
+					log.Warn("UpdateRollupStatus failed", "id", id, "err", err)
 				}
 			}
 		}()
 
-		proofBuffer, instanceBuffer, err := r.db.GetVerifiedProofAndInstanceByHash(hash)
+		proofBuffer, instanceBuffer, err := r.db.GetVerifiedProofAndInstanceByID(id)
 		if err != nil {
-			log.Warn("fetch get proof by hash failed", "hash", hash, "err", err)
+			log.Warn("fetch get proof by id failed", "id", id, "err", err)
 			return
 		}
 		if proofBuffer == nil || instanceBuffer == nil {
-			log.Warn("proof or instance not ready", "hash", hash)
+			log.Warn("proof or instance not ready", "id", id)
 			return
 		}
 		if len(proofBuffer)%32 != 0 {
-			log.Error("proof buffer has wrong length", "hash", hash, "length", len(proofBuffer))
+			log.Error("proof buffer has wrong length", "id", id, "length", len(proofBuffer))
 			return
 		}
 		if len(instanceBuffer)%32 != 0 {
-			log.Warn("instance buffer has wrong length", "hash", hash, "length", len(instanceBuffer))
+			log.Warn("instance buffer has wrong length", "id", id, "length", len(instanceBuffer))
 			return
 		}
 
 		proof := utils.BufferToUint256Le(proofBuffer)
 		instance := utils.BufferToUint256Le(instanceBuffer)
-		data, err := r.l1RollupABI.Pack("finalizeBatchWithProof", common.HexToHash(hash), proof, instance)
+		data, err := r.l1RollupABI.Pack("finalizeBatchWithProof", common.HexToHash(id), proof, instance)
 		if err != nil {
 			log.Error("Pack finalizeBatchWithProof failed", "err", err)
 			return
 		}
 
-		txID := hash + "-finalize"
+		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)
-		finalizeTxHash := &txHash
+		hash := &txHash
 		if err != nil {
 			if !errors.Is(err, sender.ErrNoAvailableAccount) {
-				log.Error("finalizeBatchWithProof in layer1 failed", "hash", hash, "err", err)
+				log.Error("finalizeBatchWithProof in layer1 failed", "id", id, "err", err)
 			}
 			return
 		}
-		log.Info("finalizeBatchWithProof in layer1", "batch_hash", hash, "tx_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, hash, finalizeTxHash.String(), types.RollupFinalizing)
+		err = r.db.UpdateFinalizeTxHashAndRollupStatus(r.ctx, id, hash.String(), orm.RollupFinalizing)
 		if err != nil {
-			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "batch_hash", hash, "err", err)
+			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "batch_id", id, "err", err)
 		}
 		success = true
-		r.processingFinalization.Store(txID, hash)
+		r.processingFinalization.Store(txID, id)
 
 	default:
 		log.Error("encounter unreachable case in ProcessCommittedBatches",
@@ -457,58 +399,28 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 
 // Start the relayer process
 func (r *Layer2Relayer) Start() {
-	loop := func(ctx context.Context, f func()) {
+	go func() {
+		// trigger by timer
 		ticker := time.NewTicker(time.Second)
 		defer ticker.Stop()
 
 		for {
 			select {
-			case <-ctx.Done():
-				return
 			case <-ticker.C:
-				f()
+				var wg = sync.WaitGroup{}
+				wg.Add(3)
+				go r.ProcessSavedEvents(&wg)
+				go r.ProcessPendingBatches(&wg)
+				go r.ProcessCommittedBatches(&wg)
+				wg.Wait()
+			case confirmation := <-r.messageCh:
+				r.handleConfirmation(confirmation)
+			case confirmation := <-r.rollupCh:
+				r.handleConfirmation(confirmation)
+			case <-r.stopCh:
+				return
 			}
 		}
-	}
-
-	go func() {
-		ctx, cancel := context.WithCancel(r.ctx)
-
-		go loop(ctx, r.ProcessSavedEvents)
-		go loop(ctx, r.ProcessCommittedBatches)
-		go loop(ctx, r.ProcessGasPriceOracle)
-
-		go func(ctx context.Context) {
-			for {
-				select {
-				case <-ctx.Done():
-					return
-				case confirmation := <-r.messageCh:
-					r.handleConfirmation(confirmation)
-				case confirmation := <-r.rollupCh:
-					r.handleConfirmation(confirmation)
-				case cfm := <-r.gasOracleCh:
-					if !cfm.IsSuccessful {
-						// @discuss: maybe make it pending again?
-						err := r.db.UpdateL2GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleFailed, cfm.TxHash.String())
-						if err != nil {
-							log.Warn("UpdateL2GasOracleStatusAndOracleTxHash failed", "err", err)
-						}
-						log.Warn("transaction confirmed but failed in layer1", "confirmation", cfm)
-					} else {
-						// @todo handle db error
-						err := r.db.UpdateL2GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleImported, cfm.TxHash.String())
-						if err != nil {
-							log.Warn("UpdateL2GasOracleStatusAndOracleTxHash failed", "err", err)
-						}
-						log.Info("transaction confirmed in layer1", "confirmation", cfm)
-					}
-				}
-			}
-		}(ctx)
-
-		<-r.stopCh
-		cancel()
 	}()
 }
 
@@ -528,33 +440,31 @@ func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) {
 	if msgHash, ok := r.processingMessage.Load(confirmation.ID); ok {
 		transactionType = "MessageRelay"
 		// @todo handle db error
-		err := r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, msgHash.(string), types.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.(string), "err", err)
 		}
 		r.processingMessage.Delete(confirmation.ID)
 	}
 
-	// check whether it is CommitBatches transaction
-	if batchBatches, ok := r.processingBatchesCommitment.Load(confirmation.ID); ok {
-		transactionType = "BatchesCommitment"
-		for _, batchHash := range batchBatches.([]string) {
-			// @todo handle db error
-			err := r.db.UpdateCommitTxHashAndRollupStatus(r.ctx, batchHash, confirmation.TxHash.String(), types.RollupCommitted)
-			if err != nil {
-				log.Warn("UpdateCommitTxHashAndRollupStatus failed", "batch_hash", batchHash, "err", err)
-			}
+	// check whether it is block commitment transaction
+	if batchID, ok := r.processingCommitment.Load(confirmation.ID); ok {
+		transactionType = "BatchCommitment"
+		// @todo handle db error
+		err := r.db.UpdateCommitTxHashAndRollupStatus(r.ctx, batchID.(string), confirmation.TxHash.String(), orm.RollupCommitted)
+		if err != nil {
+			log.Warn("UpdateCommitTxHashAndRollupStatus failed", "batch_id", batchID.(string), "err", err)
 		}
-		r.processingBatchesCommitment.Delete(confirmation.ID)
+		r.processingCommitment.Delete(confirmation.ID)
 	}
 
 	// check whether it is proof finalization transaction
-	if batchHash, ok := r.processingFinalization.Load(confirmation.ID); ok {
+	if batchID, ok := r.processingFinalization.Load(confirmation.ID); ok {
 		transactionType = "ProofFinalization"
 		// @todo handle db error
-		err := r.db.UpdateFinalizeTxHashAndRollupStatus(r.ctx, batchHash.(string), confirmation.TxHash.String(), types.RollupFinalized)
+		err := r.db.UpdateFinalizeTxHashAndRollupStatus(r.ctx, batchID.(string), confirmation.TxHash.String(), orm.RollupFinalized)
 		if err != nil {
-			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "batch_hash", batchHash.(string), "err", err)
+			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "batch_id", batchID.(string), "err", err)
 		}
 		r.processingFinalization.Delete(confirmation.ID)
 	}

bridge/l2/relayer_test.go

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

bridge/l2/watcher.go

@@ -8,22 +8,23 @@ import (
 	"reflect"
 	"time"
 
+	"github.com/jmoiron/sqlx"
 	geth "github.com/scroll-tech/go-ethereum"
 	"github.com/scroll-tech/go-ethereum/accounts/abi"
 	"github.com/scroll-tech/go-ethereum/common"
-	geth_types "github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/event"
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/scroll-tech/go-ethereum/metrics"
-	"github.com/scroll-tech/go-ethereum/rpc"
 
 	bridge_abi "scroll-tech/bridge/abi"
 	"scroll-tech/bridge/utils"
 
-	"scroll-tech/common/types"
-
 	"scroll-tech/database"
+	"scroll-tech/database/orm"
+
+	"scroll-tech/bridge/config"
 )
 
 // Metrics
@@ -37,6 +38,12 @@ type relayedMessage struct {
 	isSuccessful bool
 }
 
+type importedBlock struct {
+	blockHeight uint64
+	blockHash   common.Hash
+	txHash      common.Hash
+}
+
 // WatcherClient provide APIs which support others to subscribe to various event from l2geth
 type WatcherClient struct {
 	ctx context.Context
@@ -46,7 +53,7 @@ type WatcherClient struct {
 
 	orm database.OrmFactory
 
-	confirmations rpc.BlockNumber
+	confirmations uint64
 
 	messengerAddress common.Address
 	messengerABI     *abi.ABI
@@ -54,22 +61,55 @@ type WatcherClient struct {
 	messageQueueAddress common.Address
 	messageQueueABI     *abi.ABI
 
+	blockContainerAddress common.Address
+	blockContainerABI     *abi.ABI
+
+	withdrawTrie *WithdrawTrie
+
 	// The height of the block that the watcher has retrieved event logs
 	processedMsgHeight uint64
 
 	stopped uint64
 	stopCh  chan struct{}
+
+	batchProposer *batchProposer
 }
 
 // NewL2WatcherClient take a l2geth instance to generate a l2watcherclient instance
-func NewL2WatcherClient(ctx context.Context, client *ethclient.Client, confirmations rpc.BlockNumber, messengerAddress, messageQueueAddress common.Address, orm database.OrmFactory) *WatcherClient {
+func NewL2WatcherClient(ctx context.Context, client *ethclient.Client, confirmations uint64, bpCfg *config.BatchProposerConfig, messengerAddress, messageQueueAddress, blockContainerAddress common.Address, orm database.OrmFactory) (*WatcherClient, error) {
 	savedHeight, err := orm.GetLayer2LatestWatchedHeight()
 	if err != nil {
 		log.Warn("fetch height from db failed", "err", err)
 		savedHeight = 0
 	}
 
-	w := WatcherClient{
+	withdrawTrie := NewWithdrawTrie()
+	currentMessageNonce, err := orm.GetLayer2LatestMessageNonce()
+	if err != nil {
+		log.Warn("fetch message nonce from db failed", "err", err)
+		return nil, err
+	}
+
+	if currentMessageNonce != -1 {
+		msg, err := orm.GetL2MessageByNonce(uint64(currentMessageNonce))
+		if err != nil {
+			log.Warn("fetch message by nonce from db failed", "err", err)
+			return nil, err
+		}
+		// fetch and rebuild from message db
+		proofBytes, err := orm.GetMessageProofByNonce(uint64(currentMessageNonce))
+		if err != nil {
+			log.Warn("fetch message proof from db failed", "err", err)
+			return nil, err
+		}
+		if len(proofBytes)%32 != 0 {
+			log.Warn("proof string has wrong length", "length", len(proofBytes))
+			return nil, errors.New("proof string with wrong length")
+		}
+		withdrawTrie.Initialize(uint64(currentMessageNonce), common.HexToHash(msg.MsgHash), proofBytes)
+	}
+
+	return &WatcherClient{
 		ctx:                ctx,
 		Client:             client,
 		orm:                orm,
@@ -77,67 +117,20 @@ func NewL2WatcherClient(ctx context.Context, client *ethclient.Client, confirmat
 		confirmations:      confirmations,
 
 		messengerAddress: messengerAddress,
-		messengerABI:     bridge_abi.L2ScrollMessengerABI,
+		messengerABI:     bridge_abi.L2MessengerABI,
 
 		messageQueueAddress: messageQueueAddress,
 		messageQueueABI:     bridge_abi.L2MessageQueueABI,
 
-		stopCh:  make(chan struct{}),
-		stopped: 0,
-	}
+		blockContainerAddress: blockContainerAddress,
+		blockContainerABI:     bridge_abi.L1BlockContainerABI,
 
-	// Initialize genesis before we do anything else
-	if err := w.initializeGenesis(); err != nil {
-		panic(fmt.Sprintf("failed to initialize L2 genesis batch, err: %v", err))
-	}
+		withdrawTrie: withdrawTrie,
 
-	return &w
-}
-
-func (w *WatcherClient) initializeGenesis() error {
-	if count, err := w.orm.GetBatchCount(); err != nil {
-		return fmt.Errorf("failed to get batch count: %v", err)
-	} else if count > 0 {
-		log.Info("genesis already imported")
-		return nil
-	}
-
-	genesis, err := w.HeaderByNumber(w.ctx, big.NewInt(0))
-	if err != nil {
-		return fmt.Errorf("failed to retrieve L2 genesis header: %v", err)
-	}
-
-	log.Info("retrieved L2 genesis header", "hash", genesis.Hash().String())
-
-	blockTrace := &geth_types.BlockTrace{
-		Coinbase:         nil,
-		Header:           genesis,
-		Transactions:     []*geth_types.TransactionData{},
-		StorageTrace:     nil,
-		ExecutionResults: []*geth_types.ExecutionResult{},
-		MPTWitness:       nil,
-	}
-
-	batchData := types.NewGenesisBatchData(blockTrace)
-
-	if err = AddBatchInfoToDB(w.orm, batchData); err != nil {
-		log.Error("failed to add batch info to DB", "BatchHash", batchData.Hash(), "error", err)
-		return err
-	}
-
-	batchHash := batchData.Hash().Hex()
-
-	if err = w.orm.UpdateProvingStatus(batchHash, types.ProvingTaskProved); err != nil {
-		return fmt.Errorf("failed to update genesis batch proving status: %v", err)
-	}
-
-	if err = w.orm.UpdateRollupStatus(w.ctx, batchHash, types.RollupFinalized); err != nil {
-		return fmt.Errorf("failed to update genesis batch rollup status: %v", err)
-	}
-
-	log.Info("successfully imported genesis batch")
-
-	return nil
+		stopCh:        make(chan struct{}),
+		stopped:       0,
+		batchProposer: newBatchProposer(bpCfg, orm),
+	}, nil
 }
 
 // Start the Listening process
@@ -151,7 +144,7 @@ func (w *WatcherClient) Start() {
 
 		// trace fetcher loop
 		go func(ctx context.Context) {
-			ticker := time.NewTicker(2 * time.Second)
+			ticker := time.NewTicker(3 * time.Second)
 			defer ticker.Stop()
 
 			for {
@@ -160,12 +153,19 @@ func (w *WatcherClient) Start() {
 					return
 
 				case <-ticker.C:
-					number, err := utils.GetLatestConfirmedBlockNumber(ctx, w.Client, w.confirmations)
+					// get current height
+					number, err := w.BlockNumber(ctx)
 					if err != nil {
-						log.Error("failed to get block number", "err", err)
+						log.Error("failed to get_BlockNumber", "err", err)
 						continue
 					}
 
+					if number >= w.confirmations {
+						number = number - w.confirmations
+					} else {
+						number = 0
+					}
+
 					w.tryFetchRunningMissingBlocks(ctx, number)
 				}
 			}
@@ -173,7 +173,7 @@ func (w *WatcherClient) Start() {
 
 		// event fetcher loop
 		go func(ctx context.Context) {
-			ticker := time.NewTicker(2 * time.Second)
+			ticker := time.NewTicker(3 * time.Second)
 			defer ticker.Stop()
 
 			for {
@@ -182,17 +182,40 @@ func (w *WatcherClient) Start() {
 					return
 
 				case <-ticker.C:
-					number, err := utils.GetLatestConfirmedBlockNumber(ctx, w.Client, w.confirmations)
+					// get current height
+					number, err := w.BlockNumber(ctx)
 					if err != nil {
-						log.Error("failed to get block number", "err", err)
+						log.Error("failed to get_BlockNumber", "err", err)
 						continue
 					}
 
+					if number >= w.confirmations {
+						number = number - w.confirmations
+					} else {
+						number = 0
+					}
+
 					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()
 	}()
@@ -210,9 +233,9 @@ func (w *WatcherClient) tryFetchRunningMissingBlocks(ctx context.Context, blockH
 	// Get newest block in DB. must have blocks at that time.
 	// Don't use "block_trace" table "trace" column's BlockTrace.Number,
 	// because it might be empty if the corresponding rollup_result is finalized/finalization_skipped
-	heightInDB, err := w.orm.GetL2BlockTracesLatestHeight()
+	heightInDB, err := w.orm.GetBlockTracesLatestHeight()
 	if err != nil {
-		log.Error("failed to GetL2BlockTracesLatestHeight", "err", err)
+		log.Error("failed to GetBlockTracesLatestHeight", "err", err)
 		return
 	}
 
@@ -238,7 +261,7 @@ func (w *WatcherClient) tryFetchRunningMissingBlocks(ctx context.Context, blockH
 }
 
 func (w *WatcherClient) getAndStoreBlockTraces(ctx context.Context, from, to uint64) error {
-	var traces []*geth_types.BlockTrace
+	var traces []*types.BlockTrace
 
 	for number := from; number <= to; number++ {
 		log.Debug("retrieving block trace", "height", number)
@@ -252,7 +275,7 @@ func (w *WatcherClient) getAndStoreBlockTraces(ctx context.Context, from, to uin
 
 	}
 	if len(traces) > 0 {
-		if err := w.orm.InsertL2BlockTraces(traces); err != nil {
+		if err := w.orm.InsertBlockTraces(traces); err != nil {
 			return fmt.Errorf("failed to batch insert BlockTraces: %v", err)
 		}
 	}
@@ -268,6 +291,16 @@ func (w *WatcherClient) FetchContractEvent(blockHeight uint64) {
 		log.Info("l2 watcher fetchContractEvent", "w.processedMsgHeight", w.processedMsgHeight)
 	}()
 
+	var dbTx *sqlx.Tx
+	var dbTxErr error
+	defer func() {
+		if dbTxErr != nil {
+			if err := dbTx.Rollback(); err != nil {
+				log.Error("dbTx.Rollback()", "err", err)
+			}
+		}
+	}()
+
 	fromBlock := int64(w.processedMsgHeight) + 1
 	toBlock := int64(blockHeight)
 
@@ -285,14 +318,16 @@ func (w *WatcherClient) FetchContractEvent(blockHeight uint64) {
 			Addresses: []common.Address{
 				w.messengerAddress,
 				w.messageQueueAddress,
+				w.blockContainerAddress,
 			},
 			Topics: make([][]common.Hash, 1),
 		}
-		query.Topics[0] = make([]common.Hash, 4)
+		query.Topics[0] = make([]common.Hash, 5)
 		query.Topics[0][0] = bridge_abi.L2SentMessageEventSignature
 		query.Topics[0][1] = bridge_abi.L2RelayedMessageEventSignature
 		query.Topics[0][2] = bridge_abi.L2FailedRelayedMessageEventSignature
 		query.Topics[0][3] = bridge_abi.L2AppendMessageEventSignature
+		query.Topics[0][4] = bridge_abi.L2ImportBlockEventSignature
 
 		logs, err := w.FilterLogs(w.ctx, query)
 		if err != nil {
@@ -304,31 +339,83 @@ func (w *WatcherClient) FetchContractEvent(blockHeight uint64) {
 			bridgeL2MsgSyncHeightGauge.Update(to)
 			continue
 		}
-		log.Info("received new L2 messages", "fromBlock", from, "toBlock", to, "cnt", len(logs))
+		log.Info("received new L2 messages", "fromBlock", from, "toBlock", to,
+			"cnt", len(logs))
 
-		sentMessageEvents, relayedMessageEvents, err := w.parseBridgeEventLogs(logs)
+		sentMessageEvents, relayedMessageEvents, importedBlockEvents, err := w.parseBridgeEventLogs(logs)
 		if err != nil {
 			log.Error("failed to parse emitted event log", "err", err)
 			return
 		}
 
+		// Update imported block first to make sure we don't forget to update importing blocks.
+		for _, block := range importedBlockEvents {
+			err = w.orm.UpdateL1BlockStatusAndImportTxHash(w.ctx, block.blockHash.String(), orm.L1BlockImported, block.txHash.String())
+			if err != nil {
+				log.Error("Failed to update l1 block status and import tx hash", "err", err)
+				return
+			}
+		}
+
 		// Update relayed message first to make sure we don't forget to update submited message.
 		// Since, we always start sync from the latest unprocessed message.
 		for _, msg := range relayedMessageEvents {
-			var msgStatus types.MsgStatus
 			if msg.isSuccessful {
-				msgStatus = types.MsgConfirmed
+				// succeed
+				err = w.orm.UpdateLayer1StatusAndLayer2Hash(w.ctx, msg.msgHash.String(), orm.MsgConfirmed, msg.txHash.String())
 			} else {
-				msgStatus = types.MsgFailed
+				// failed
+				err = w.orm.UpdateLayer1StatusAndLayer2Hash(w.ctx, msg.msgHash.String(), orm.MsgFailed, msg.txHash.String())
 			}
-			if err = w.orm.UpdateLayer1StatusAndLayer2Hash(w.ctx, msg.msgHash.String(), msgStatus, msg.txHash.String()); err != nil {
+			if err != nil {
 				log.Error("Failed to update layer1 status and layer2 hash", "err", err)
 				return
 			}
 		}
 
-		if err = w.orm.SaveL2Messages(w.ctx, sentMessageEvents); err != nil {
-			log.Error("failed to save l2 messages", "err", err)
+		dbTx, err = w.orm.Beginx()
+		if err != nil {
+			return
+		}
+
+		// group sentMessageEvents by block height
+		index := 0
+		nonce := w.withdrawTrie.NextMessageNonce
+		for height := from; height <= to; height++ {
+			var hashes []common.Hash
+			var msgs []*orm.L2Message
+			for ; index < len(sentMessageEvents) && sentMessageEvents[index].Height == uint64(height); index++ {
+				if nonce != sentMessageEvents[index].Nonce {
+					log.Error("nonce mismatch", "expected", nonce, "found", sentMessageEvents[index].Nonce)
+					return
+				}
+				hashes = append(hashes, common.HexToHash(sentMessageEvents[index].MsgHash))
+				msgs = append(msgs, sentMessageEvents[index])
+				nonce++
+			}
+			proofBytes := w.withdrawTrie.AppendMessages(hashes)
+			for i := 0; i < len(hashes); i++ {
+				msgs[i].Proof = common.Bytes2Hex(proofBytes[i])
+			}
+
+			// save message root in block
+			dbTxErr = w.orm.SetMessageRootForBlocksInDBTx(dbTx, []uint64{uint64(height)}, w.withdrawTrie.MessageRoot().String())
+			if dbTxErr != nil {
+				log.Error("SetBatchIDForBlocksInDBTx failed", "error", dbTxErr)
+				return
+			}
+
+			// save l2 messages
+			dbTxErr = w.orm.SaveL2MessagesInDbTx(w.ctx, dbTx, msgs)
+			if dbTxErr != nil {
+				log.Error("SaveL2MessagesInDbTx failed", "error", dbTxErr)
+				return
+			}
+		}
+
+		dbTxErr = dbTx.Commit()
+		if dbTxErr != nil {
+			log.Error("dbTx.Commit failed", "error", dbTxErr)
 			return
 		}
 
@@ -337,12 +424,13 @@ func (w *WatcherClient) FetchContractEvent(blockHeight uint64) {
 	}
 }
 
-func (w *WatcherClient) parseBridgeEventLogs(logs []geth_types.Log) ([]*types.L2Message, []relayedMessage, error) {
+func (w *WatcherClient) parseBridgeEventLogs(logs []types.Log) ([]*orm.L2Message, []relayedMessage, []importedBlock, error) {
 	// Need use contract abi to parse event Log
 	// Can only be tested after we have our contracts set up
 
-	var l2Messages []*types.L2Message
+	var l2Messages []*orm.L2Message
 	var relayedMessages []relayedMessage
+	var importedBlocks []importedBlock
 	var lastAppendMsgHash common.Hash
 	var lastAppendMsgNonce uint64
 	for _, vLog := range logs {
@@ -352,36 +440,33 @@ func (w *WatcherClient) parseBridgeEventLogs(logs []geth_types.Log) ([]*types.L2
 			err := utils.UnpackLog(w.messengerABI, &event, "SentMessage", vLog)
 			if err != nil {
 				log.Error("failed to unpack layer2 SentMessage event", "err", err)
-				return l2Messages, relayedMessages, err
+				return l2Messages, relayedMessages, importedBlocks, err
 			}
-
 			computedMsgHash := utils.ComputeMessageHash(
 				event.Sender,
 				event.Target,
 				event.Value,
-				event.MessageNonce,
+				event.Fee,
+				event.Deadline,
 				event.Message,
+				event.MessageNonce,
 			)
-
-			// `AppendMessage` event is always emitted before `SentMessage` event
-			// So they should always match, just double check
+			// they should always match, just double check
 			if event.MessageNonce.Uint64() != lastAppendMsgNonce {
-				errMsg := fmt.Sprintf("l2 message nonces mismatch: AppendMessage.nonce=%v, SentMessage.nonce=%v, tx_hash=%v",
-					lastAppendMsgNonce, event.MessageNonce.Uint64(), vLog.TxHash.Hex())
-				return l2Messages, relayedMessages, errors.New(errMsg)
+				return l2Messages, relayedMessages, importedBlocks, errors.New("l2 message nonce mismatch")
 			}
 			if computedMsgHash != lastAppendMsgHash {
-				errMsg := fmt.Sprintf("l2 message hashes mismatch: AppendMessage.msg_hash=%v, SentMessage.msg_hash=%v, tx_hash=%v",
-					lastAppendMsgHash.Hex(), computedMsgHash.Hex(), vLog.TxHash.Hex())
-				return l2Messages, relayedMessages, errors.New(errMsg)
+				return l2Messages, relayedMessages, importedBlocks, errors.New("l2 message hash mismatch")
 			}
-
-			l2Messages = append(l2Messages, &types.L2Message{
+			l2Messages = append(l2Messages, &orm.L2Message{
 				Nonce:      event.MessageNonce.Uint64(),
 				MsgHash:    computedMsgHash.String(),
 				Height:     vLog.BlockNumber,
 				Sender:     event.Sender.String(),
 				Value:      event.Value.String(),
+				Fee:        event.Fee.String(),
+				GasLimit:   event.GasLimit.Uint64(),
+				Deadline:   event.Deadline.Uint64(),
 				Target:     event.Target.String(),
 				Calldata:   common.Bytes2Hex(event.Message),
 				Layer2Hash: vLog.TxHash.Hex(),
@@ -391,11 +476,10 @@ func (w *WatcherClient) parseBridgeEventLogs(logs []geth_types.Log) ([]*types.L2
 			err := utils.UnpackLog(w.messengerABI, &event, "RelayedMessage", vLog)
 			if err != nil {
 				log.Warn("Failed to unpack layer2 RelayedMessage event", "err", err)
-				return l2Messages, relayedMessages, err
+				return l2Messages, relayedMessages, importedBlocks, err
 			}
-
 			relayedMessages = append(relayedMessages, relayedMessage{
-				msgHash:      event.MessageHash,
+				msgHash:      event.MsgHash,
 				txHash:       vLog.TxHash,
 				isSuccessful: true,
 			})
@@ -404,22 +488,32 @@ func (w *WatcherClient) parseBridgeEventLogs(logs []geth_types.Log) ([]*types.L2
 			err := utils.UnpackLog(w.messengerABI, &event, "FailedRelayedMessage", vLog)
 			if err != nil {
 				log.Warn("Failed to unpack layer2 FailedRelayedMessage event", "err", err)
-				return l2Messages, relayedMessages, err
+				return l2Messages, relayedMessages, importedBlocks, err
 			}
-
 			relayedMessages = append(relayedMessages, relayedMessage{
-				msgHash:      event.MessageHash,
+				msgHash:      event.MsgHash,
 				txHash:       vLog.TxHash,
 				isSuccessful: false,
 			})
+		case bridge_abi.L2ImportBlockEventSignature:
+			event := bridge_abi.L2ImportBlockEvent{}
+			err := utils.UnpackLog(w.blockContainerABI, &event, "ImportBlock", vLog)
+			if err != nil {
+				log.Warn("Failed to unpack layer2 ImportBlock event", "err", err)
+				return l2Messages, relayedMessages, importedBlocks, err
+			}
+			importedBlocks = append(importedBlocks, importedBlock{
+				blockHeight: event.BlockHeight.Uint64(),
+				blockHash:   event.BlockHash,
+				txHash:      vLog.TxHash,
+			})
 		case bridge_abi.L2AppendMessageEventSignature:
 			event := bridge_abi.L2AppendMessageEvent{}
 			err := utils.UnpackLog(w.messageQueueABI, &event, "AppendMessage", vLog)
 			if err != nil {
 				log.Warn("Failed to unpack layer2 AppendMessage event", "err", err)
-				return l2Messages, relayedMessages, err
+				return l2Messages, relayedMessages, importedBlocks, err
 			}
-
 			lastAppendMsgHash = event.MessageHash
 			lastAppendMsgNonce = event.Index.Uint64()
 		default:
@@ -427,5 +521,5 @@ func (w *WatcherClient) parseBridgeEventLogs(logs []geth_types.Log) ([]*types.L2
 		}
 	}
 
-	return l2Messages, relayedMessages, nil
+	return l2Messages, relayedMessages, importedBlocks, nil
 }

bridge/l2/watcher_test.go

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

bridge/l2/withdraw_trie.go

@@ -0,0 +1,194 @@
+package l2
+
+import (
+	"github.com/scroll-tech/go-ethereum/common"
+
+	"scroll-tech/bridge/utils"
+)
+
+// MaxHeight is the maixium possible height of withdraw trie
+const MaxHeight = 40
+
+// WithdrawTrie is an append only merkle trie
+type WithdrawTrie struct {
+	// used to rebuild the merkle tree
+	NextMessageNonce uint64
+
+	height int // current height of withdraw trie
+
+	branches []common.Hash
+	zeroes   []common.Hash
+}
+
+// NewWithdrawTrie will return a new instance of WithdrawTrie
+func NewWithdrawTrie() *WithdrawTrie {
+	zeroes := make([]common.Hash, MaxHeight)
+	branches := make([]common.Hash, MaxHeight)
+
+	zeroes[0] = common.Hash{}
+	for i := 1; i < MaxHeight; i++ {
+		zeroes[i] = utils.Keccak2(zeroes[i-1], zeroes[i-1])
+	}
+
+	for i := 0; i < MaxHeight; i++ {
+		branches[i] = common.Hash{}
+	}
+
+	return &WithdrawTrie{
+		zeroes:           zeroes,
+		branches:         branches,
+		height:           -1,
+		NextMessageNonce: 0,
+	}
+}
+
+// Initialize will initialize the merkle trie with rightest leaf node
+func (w *WithdrawTrie) Initialize(currentMessageNonce uint64, msgHash common.Hash, proofBytes []byte) {
+	proof := DecodeBytesToMerkleProof(proofBytes)
+	branches := RecoverBranchFromProof(proof, currentMessageNonce, msgHash)
+
+	w.height = len(proof)
+	w.branches = branches
+	w.NextMessageNonce = currentMessageNonce + 1
+}
+
+// AppendMessages append a list of new messages as the rightest leaf node.
+func (w *WithdrawTrie) AppendMessages(hashes []common.Hash) [][]byte {
+	length := len(hashes)
+	if length == 0 {
+		return make([][]byte, 0)
+	}
+
+	cache := make([]map[uint64]common.Hash, MaxHeight)
+	for h := 0; h < MaxHeight; h++ {
+		cache[h] = make(map[uint64]common.Hash)
+	}
+
+	// cache all branches will be used later.
+	if w.NextMessageNonce != 0 {
+		index := w.NextMessageNonce
+		for h := 0; h <= w.height; h++ {
+			if index%2 == 1 {
+				// right child, `w.branches[h]` is the corresponding left child
+				// the index of left child should be `index ^ 1`.
+				cache[h][index^1] = w.branches[h]
+			}
+			index >>= 1
+		}
+	}
+	// cache all new leaves
+	for i := 0; i < length; i++ {
+		cache[0][w.NextMessageNonce+uint64(i)] = hashes[i]
+	}
+
+	// build withdraw trie with new hashes
+	minIndex := w.NextMessageNonce
+	maxIndex := w.NextMessageNonce + uint64(length) - 1
+	for h := 0; maxIndex > 0; h++ {
+		if minIndex%2 == 1 {
+			minIndex--
+		}
+		if maxIndex%2 == 0 {
+			cache[h][maxIndex^1] = w.zeroes[h]
+		}
+		for i := minIndex; i <= maxIndex; i += 2 {
+			cache[h+1][i>>1] = utils.Keccak2(cache[h][i], cache[h][i^1])
+		}
+		minIndex >>= 1
+		maxIndex >>= 1
+	}
+
+	// update branches using hashes one by one
+	for i := 0; i < length; i++ {
+		proof := UpdateBranchWithNewMessage(w.zeroes, w.branches, w.NextMessageNonce, hashes[i])
+		w.NextMessageNonce++
+		w.height = len(proof)
+	}
+
+	proofs := make([][]byte, length)
+	// retrieve merkle proof from cache
+	for i := 0; i < length; i++ {
+		index := w.NextMessageNonce + uint64(i) - uint64(length)
+		var merkleProof []common.Hash
+		for h := 0; h < w.height; h++ {
+			merkleProof = append(merkleProof, cache[h][index^1])
+			index >>= 1
+		}
+		proofs[i] = EncodeMerkleProofToBytes(merkleProof)
+	}
+
+	return proofs
+}
+
+// MessageRoot return the current root hash of withdraw trie.
+func (w *WithdrawTrie) MessageRoot() common.Hash {
+	if w.height == -1 {
+		return common.Hash{}
+	}
+	return w.branches[w.height]
+}
+
+// DecodeBytesToMerkleProof transfer byte array to bytes32 array. The caller should make sure the length is matched.
+func DecodeBytesToMerkleProof(proofBytes []byte) []common.Hash {
+	proof := make([]common.Hash, len(proofBytes)/32)
+	for i := 0; i < len(proofBytes); i += 32 {
+		proof[i/32] = common.BytesToHash(proofBytes[i : i+32])
+	}
+	return proof
+}
+
+// EncodeMerkleProofToBytes transfer byte32 array to byte array by concatenation.
+func EncodeMerkleProofToBytes(proof []common.Hash) []byte {
+	var proofBytes []byte
+	for i := 0; i < len(proof); i++ {
+		proofBytes = append(proofBytes, proof[i][:]...)
+	}
+	return proofBytes
+}
+
+// UpdateBranchWithNewMessage update the branches to latest with new message and return the merkle proof for the message.
+func UpdateBranchWithNewMessage(zeroes []common.Hash, branches []common.Hash, index uint64, msgHash common.Hash) []common.Hash {
+	root := msgHash
+	var merkleProof []common.Hash
+	var height uint64
+	for height = 0; index > 0; height++ {
+		if index%2 == 0 {
+			// it may be used in next round.
+			branches[height] = root
+			merkleProof = append(merkleProof, zeroes[height])
+			// it's a left child, the right child must be null
+			root = utils.Keccak2(root, zeroes[height])
+		} else {
+			// it's a right child, use previously computed hash
+			root = utils.Keccak2(branches[height], root)
+			merkleProof = append(merkleProof, branches[height])
+		}
+		index >>= 1
+	}
+	branches[height] = root
+	return merkleProof
+}
+
+// RecoverBranchFromProof will recover latest branches from merkle proof and message hash
+func RecoverBranchFromProof(proof []common.Hash, index uint64, msgHash common.Hash) []common.Hash {
+	branches := make([]common.Hash, 64)
+	root := msgHash
+	var height uint64
+	for height = 0; index > 0; height++ {
+		if index%2 == 0 {
+			branches[height] = root
+			// it's a left child, the right child must be null
+			root = utils.Keccak2(root, proof[height])
+		} else {
+			// it's a right child, use previously computed hash
+			branches[height] = proof[height]
+			root = utils.Keccak2(proof[height], root)
+		}
+		index >>= 1
+	}
+	branches[height] = root
+	for height++; height < 64; height++ {
+		branches[height] = common.Hash{}
+	}
+	return branches
+}

bridge/l2/withdraw_trie_test.go

@@ -0,0 +1,213 @@
+package l2_test
+
+import (
+	"math/big"
+	"testing"
+
+	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/stretchr/testify/assert"
+
+	"scroll-tech/bridge/l2"
+	"scroll-tech/bridge/utils"
+)
+
+func TestUpdateBranchWithNewMessage(t *testing.T) {
+	zeroes := make([]common.Hash, 64)
+	branches := make([]common.Hash, 64)
+	zeroes[0] = common.Hash{}
+	for i := 1; i < 64; i++ {
+		zeroes[i] = utils.Keccak2(zeroes[i-1], zeroes[i-1])
+	}
+
+	l2.UpdateBranchWithNewMessage(zeroes, branches, 0, common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000001"))
+	if branches[0] != common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000001") {
+		t.Fatalf("Invalid root, want %s, got %s", "0x0000000000000000000000000000000000000000000000000000000000000001", branches[0].Hex())
+	}
+
+	l2.UpdateBranchWithNewMessage(zeroes, branches, 1, common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000002"))
+	if branches[1] != common.HexToHash("0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0") {
+		t.Fatalf("Invalid root, want %s, got %s", "0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0", branches[1].Hex())
+	}
+
+	l2.UpdateBranchWithNewMessage(zeroes, branches, 2, common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000003"))
+	if branches[2] != common.HexToHash("0x222ff5e0b5877792c2bc1670e2ccd0c2c97cd7bb1672a57d598db05092d3d72c") {
+		t.Fatalf("Invalid root, want %s, got %s", "0x222ff5e0b5877792c2bc1670e2ccd0c2c97cd7bb1672a57d598db05092d3d72c", branches[2].Hex())
+	}
+
+	l2.UpdateBranchWithNewMessage(zeroes, branches, 3, common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000004"))
+	if branches[2] != common.HexToHash("0xa9bb8c3f1f12e9aa903a50c47f314b57610a3ab32f2d463293f58836def38d36") {
+		t.Fatalf("Invalid root, want %s, got %s", "0xa9bb8c3f1f12e9aa903a50c47f314b57610a3ab32f2d463293f58836def38d36", branches[2].Hex())
+	}
+}
+
+func TestDecodeEncodeMerkleProof(t *testing.T) {
+	proof := l2.DecodeBytesToMerkleProof(common.Hex2Bytes("2ebffc1a6671c51e30777a680904b103992630ec995b6e6ff76a04d5259d49012ebffc1a6671c51e30777a680904b103992630ec995b6e6ff76a04d5259d49022ebffc1a6671c51e30777a680904b103992630ec995b6e6ff76a04d5259d49032ebffc1a6671c51e30777a680904b103992630ec995b6e6ff76a04d5259d4904"))
+	if len(proof) != 4 {
+		t.Fatalf("proof length mismatch, want %d, got %d", 4, len(proof))
+	}
+	if proof[0] != common.HexToHash("0x2ebffc1a6671c51e30777a680904b103992630ec995b6e6ff76a04d5259d4901") {
+		t.Fatalf("proof[0] mismatch, want %s, got %s", "0x2ebffc1a6671c51e30777a680904b103992630ec995b6e6ff76a04d5259d4901", proof[0].Hex())
+	}
+	if proof[1] != common.HexToHash("0x2ebffc1a6671c51e30777a680904b103992630ec995b6e6ff76a04d5259d4902") {
+		t.Fatalf("proof[1] mismatch, want %s, got %s", "0x2ebffc1a6671c51e30777a680904b103992630ec995b6e6ff76a04d5259d4902", proof[0].Hex())
+	}
+	if proof[2] != common.HexToHash("0x2ebffc1a6671c51e30777a680904b103992630ec995b6e6ff76a04d5259d4903") {
+		t.Fatalf("proof[2] mismatch, want %s, got %s", "0x2ebffc1a6671c51e30777a680904b103992630ec995b6e6ff76a04d5259d4903", proof[0].Hex())
+	}
+	if proof[3] != common.HexToHash("0x2ebffc1a6671c51e30777a680904b103992630ec995b6e6ff76a04d5259d4904") {
+		t.Fatalf("proof[3] mismatch, want %s, got %s", "0x2ebffc1a6671c51e30777a680904b103992630ec995b6e6ff76a04d5259d4904", proof[0].Hex())
+	}
+
+	bytes := l2.EncodeMerkleProofToBytes(proof)
+	if common.Bytes2Hex(bytes) != "2ebffc1a6671c51e30777a680904b103992630ec995b6e6ff76a04d5259d49012ebffc1a6671c51e30777a680904b103992630ec995b6e6ff76a04d5259d49022ebffc1a6671c51e30777a680904b103992630ec995b6e6ff76a04d5259d49032ebffc1a6671c51e30777a680904b103992630ec995b6e6ff76a04d5259d4904" {
+		t.Fatalf("wrong encoded bytes")
+	}
+}
+
+func TestRecoverBranchFromProof(t *testing.T) {
+	zeroes := make([]common.Hash, 64)
+	branches := make([]common.Hash, 64)
+	zeroes[0] = common.Hash{}
+	for i := 1; i < 64; i++ {
+		zeroes[i] = utils.Keccak2(zeroes[i-1], zeroes[i-1])
+	}
+
+	proof := l2.UpdateBranchWithNewMessage(zeroes, branches, 0, common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000001"))
+	tmpBranches := l2.RecoverBranchFromProof(proof, 0, common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000001"))
+	for i := 0; i < 64; i++ {
+		if tmpBranches[i] != branches[i] {
+			t.Fatalf("Invalid branch, want %s, got %s", branches[i].Hex(), tmpBranches[i].Hex())
+		}
+	}
+
+	proof = l2.UpdateBranchWithNewMessage(zeroes, branches, 1, common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000002"))
+	tmpBranches = l2.RecoverBranchFromProof(proof, 1, common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000002"))
+	for i := 0; i < 64; i++ {
+		if tmpBranches[i] != branches[i] {
+			t.Fatalf("Invalid branch, want %s, got %s", branches[i].Hex(), tmpBranches[i].Hex())
+		}
+	}
+
+	proof = l2.UpdateBranchWithNewMessage(zeroes, branches, 2, common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000003"))
+	tmpBranches = l2.RecoverBranchFromProof(proof, 2, common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000003"))
+	for i := 0; i < 64; i++ {
+		if tmpBranches[i] != branches[i] {
+			t.Fatalf("Invalid branch, want %s, got %s", branches[i].Hex(), tmpBranches[i].Hex())
+		}
+	}
+
+	proof = l2.UpdateBranchWithNewMessage(zeroes, branches, 3, common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000004"))
+	tmpBranches = l2.RecoverBranchFromProof(proof, 3, common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000004"))
+	for i := 0; i < 64; i++ {
+		if tmpBranches[i] != branches[i] {
+			t.Fatalf("Invalid branch, want %s, got %s", branches[i].Hex(), tmpBranches[i].Hex())
+		}
+	}
+}
+
+func TestWithdrawTrieOneByOne(t *testing.T) {
+	for initial := 0; initial < 128; initial++ {
+		withdrawTrie := l2.NewWithdrawTrie()
+		var hashes []common.Hash
+		for i := 0; i < initial; i++ {
+			hash := common.BigToHash(big.NewInt(int64(i + 1)))
+			hashes = append(hashes, hash)
+			withdrawTrie.AppendMessages([]common.Hash{
+				hash,
+			})
+		}
+
+		for i := initial; i < 128; i++ {
+			hash := common.BigToHash(big.NewInt(int64(i + 1)))
+			hashes = append(hashes, hash)
+			expectedRoot := computeMerkleRoot(hashes)
+			proofBytes := withdrawTrie.AppendMessages([]common.Hash{
+				hash,
+			})
+			assert.Equal(t, withdrawTrie.NextMessageNonce, uint64(i+1))
+			assert.Equal(t, expectedRoot.String(), withdrawTrie.MessageRoot().String())
+			proof := l2.DecodeBytesToMerkleProof(proofBytes[0])
+			verifiedRoot := verifyMerkleProof(uint64(i), hash, proof)
+			assert.Equal(t, expectedRoot.String(), verifiedRoot.String())
+		}
+	}
+}
+
+func TestWithdrawTrieMultiple(t *testing.T) {
+	var expectedRoots []common.Hash
+
+	{
+		var hashes []common.Hash
+		for i := 0; i < 128; i++ {
+			hash := common.BigToHash(big.NewInt(int64(i + 1)))
+			hashes = append(hashes, hash)
+			expectedRoots = append(expectedRoots, computeMerkleRoot(hashes))
+		}
+	}
+
+	for initial := 0; initial < 100; initial++ {
+		var hashes []common.Hash
+		for i := 0; i < initial; i++ {
+			hash := common.BigToHash(big.NewInt(int64(i + 1)))
+			hashes = append(hashes, hash)
+		}
+
+		for finish := initial; finish < 100; finish++ {
+			withdrawTrie := l2.NewWithdrawTrie()
+			withdrawTrie.AppendMessages(hashes)
+
+			var newHashes []common.Hash
+			for i := initial; i <= finish; i++ {
+				hash := common.BigToHash(big.NewInt(int64(i + 1)))
+				newHashes = append(newHashes, hash)
+			}
+			proofBytes := withdrawTrie.AppendMessages(newHashes)
+			assert.Equal(t, withdrawTrie.NextMessageNonce, uint64(finish+1))
+			assert.Equal(t, expectedRoots[finish].String(), withdrawTrie.MessageRoot().String())
+
+			for i := initial; i <= finish; i++ {
+				hash := common.BigToHash(big.NewInt(int64(i + 1)))
+				proof := l2.DecodeBytesToMerkleProof(proofBytes[i-initial])
+				verifiedRoot := verifyMerkleProof(uint64(i), hash, proof)
+				assert.Equal(t, expectedRoots[finish].String(), verifiedRoot.String())
+			}
+		}
+	}
+}
+
+func verifyMerkleProof(index uint64, leaf common.Hash, proof []common.Hash) common.Hash {
+	root := leaf
+	for _, h := range proof {
+		if index%2 == 0 {
+			root = utils.Keccak2(root, h)
+		} else {
+			root = utils.Keccak2(h, root)
+		}
+		index >>= 1
+	}
+	return root
+}
+
+func computeMerkleRoot(hashes []common.Hash) common.Hash {
+	if len(hashes) == 0 {
+		return common.Hash{}
+	}
+
+	zeroHash := common.Hash{}
+	for {
+		if len(hashes) == 1 {
+			break
+		}
+		var newHashes []common.Hash
+		for i := 0; i < len(hashes); i += 2 {
+			if i+1 < len(hashes) {
+				newHashes = append(newHashes, utils.Keccak2(hashes[i], hashes[i+1]))
+			} else {
+				newHashes = append(newHashes, utils.Keccak2(hashes[i], zeroHash))
+			}
+		}
+		hashes = newHashes
+		zeroHash = utils.Keccak2(zeroHash, zeroHash)
+	}
+	return hashes[0]
+}

bridge/mock_bridge/MockBridgeL1.sol

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

bridge/mock_bridge/MockBridgeL2.sol

@@ -2,6 +2,27 @@
 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);
+
   /******************************
    * Events from L2MessageQueue *
    ******************************/
@@ -19,39 +40,17 @@ contract MockBridgeL2 {
   /// @param blockHash The hash of the imported block.
   /// @param blockHeight The height of the imported block.
   /// @param blockTimestamp The timestamp of the imported block.
-  /// @param baseFee The base fee of the imported block.
   /// @param stateRoot The state root of the imported block.
-  event ImportBlock(
-    bytes32 indexed blockHash,
-    uint256 blockHeight,
-    uint256 blockTimestamp,
-    uint256 baseFee,
-    bytes32 stateRoot
-  );
+  event ImportBlock(bytes32 indexed blockHash, uint256 blockHeight, uint256 blockTimestamp, bytes32 stateRoot);
 
-  /*********************************
-   * Events from L2ScrollMessenger *
-   *********************************/
+  /***********
+   * Structs *
+   ***********/
 
-  /// @notice Emitted when a cross domain message is sent.
-  /// @param sender The address of the sender who initiates the message.
-  /// @param target The address of target contract to call.
-  /// @param value The amount of value passed to the target contract.
-  /// @param messageNonce The nonce of the message.
-  /// @param gasLimit The optional gas limit passed to L1 or L2.
-  /// @param message The calldata passed to the target contract.
-  event SentMessage(
-    address indexed sender,
-    address indexed target,
-    uint256 value,
-    uint256 messageNonce,
-    uint256 gasLimit,
-    bytes message
-  );
-
-  /// @notice Emitted when a cross domain message is relayed successfully.
-  /// @param messageHash The hash of the message.
-  event RelayedMessage(bytes32 indexed messageHash);
+  struct L1MessageProof {
+    bytes32 blockHash;
+    bytes stateRootProof;
+  }
 
   /*************
    * Variables *
@@ -60,70 +59,178 @@ contract MockBridgeL2 {
   /// @notice Message nonce, used to avoid relay attack.
   uint256 public messageNonce;
 
-  /***********************************
-   * Functions from L1GasPriceOracle *
-   ***********************************/
-
-  function setL1BaseFee(uint256) external {
-  }
-
   /************************************
    * Functions from L2ScrollMessenger *
    ************************************/
 
   function sendMessage(
     address _to,
-    uint256 _value,
+    uint256 _fee,
     bytes memory _message,
     uint256 _gasLimit
   ) external payable {
-    bytes memory _xDomainCalldata = _encodeXDomainCalldata(msg.sender, _to, _value, messageNonce, _message);
-    bytes32 _xDomainCalldataHash = keccak256(_xDomainCalldata);
-
-    emit AppendMessage(messageNonce, _xDomainCalldataHash);
-    emit SentMessage(msg.sender, _to, _value, messageNonce, _gasLimit, _message);
-
-    messageNonce += 1;
+    // 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 AppendMessage(_nonce, _msghash);
+    emit SentMessage(_to, msg.sender, _value, _fee, _deadline, _message, _nonce, _gasLimit);
+    messageNonce = _nonce + 1;
   }
 
-  function relayMessage(
+  function relayMessageWithProof(
     address _from,
     address _to,
     uint256 _value,
+    uint256 _fee,
+    uint256 _deadline,
     uint256 _nonce,
-    bytes calldata _message
+    bytes memory _message,
+    L1MessageProof calldata
   ) external {
-    bytes memory _xDomainCalldata = _encodeXDomainCalldata(_from, _to, _value, _nonce, _message);
-    bytes32 _xDomainCalldataHash = keccak256(_xDomainCalldata);
-    emit RelayedMessage(_xDomainCalldataHash);
+    bytes32 _msghash = keccak256(abi.encodePacked(_from, _to, _value, _fee, _deadline, _nonce, _message));
+    emit RelayedMessage(_msghash);
   }
 
-  /**********************
-   * Internal Functions *
-   **********************/
+  /***********************************
+   * Functions from L1BlockContainer *
+   ***********************************/
 
-  /// @dev Internal function to generate the correct cross domain calldata for a message.
-  /// @param _sender Message sender address.
-  /// @param _target Target contract address.
-  /// @param _value The amount of ETH pass to the target.
-  /// @param _messageNonce Nonce for the provided message.
-  /// @param _message Message to send to the target.
-  /// @return ABI encoded cross domain calldata.
-  function _encodeXDomainCalldata(
-    address _sender,
-    address _target,
-    uint256 _value,
-    uint256 _messageNonce,
-    bytes memory _message
-  ) internal pure returns (bytes memory) {
-    return
-      abi.encodeWithSignature(
-        "relayMessage(address,address,uint256,uint256,bytes)",
-        _sender,
-        _target,
-        _value,
-        _messageNonce,
-        _message
-      );
+  function importBlockHeader(
+    bytes32 _blockHash,
+    bytes calldata _blockHeaderRLP,
+    bytes calldata
+  ) external {
+    bytes32 _stateRoot;
+    uint64 _height;
+    uint64 _timestamp;
+
+    assembly {
+      // reverts with error `msg`.
+      // make sure the length of error string <= 32
+      function revertWith(msg) {
+        // keccak("Error(string)")
+        mstore(0x00, shl(224, 0x08c379a0))
+        mstore(0x04, 0x20) // str.offset
+        mstore(0x44, msg)
+        let msgLen
+        for {} msg {} {
+          msg := shl(8, msg)
+          msgLen := add(msgLen, 1)
+        }
+        mstore(0x24, msgLen) // str.length
+        revert(0x00, 0x64)
+      }
+      // reverts with `msg` when condition is not matched.
+      // make sure the length of error string <= 32
+      function require(cond, msg) {
+        if iszero(cond) {
+          revertWith(msg)
+        }
+      }
+      // returns the calldata offset of the value and the length in bytes
+      // for the RLP encoded data item at `ptr`. used in `decodeFlat`
+      function decodeValue(ptr) -> dataLen, valueOffset {
+        let b0 := byte(0, calldataload(ptr))
+
+        // 0x00 - 0x7f, single byte
+        if lt(b0, 0x80) {
+          // for a single byte whose value is in the [0x00, 0x7f] range,
+          // that byte is its own RLP encoding.
+          dataLen := 1
+          valueOffset := ptr
+          leave
+        }
+
+        // 0x80 - 0xb7, short string/bytes, length <= 55
+        if lt(b0, 0xb8) {
+          // the RLP encoding consists of a single byte with value 0x80
+          // plus the length of the string followed by the string.
+          dataLen := sub(b0, 0x80)
+          valueOffset := add(ptr, 1)
+          leave
+        }
+
+        // 0xb8 - 0xbf, long string/bytes, length > 55
+        if lt(b0, 0xc0) {
+          // the RLP encoding consists of a single byte with value 0xb7
+          // plus the length in bytes of the length of the string in binary form,
+          // followed by the length of the string, followed by the string.
+          let lengthBytes := sub(b0, 0xb7)
+          if gt(lengthBytes, 4) {
+            invalid()
+          }
+
+          // load the extended length
+          valueOffset := add(ptr, 1)
+          let extendedLen := calldataload(valueOffset)
+          let bits := sub(256, mul(lengthBytes, 8))
+          extendedLen := shr(bits, extendedLen)
+
+          dataLen := extendedLen
+          valueOffset := add(valueOffset, lengthBytes)
+          leave
+        }
+
+        revertWith("Not value")
+      }
+
+      let ptr := _blockHeaderRLP.offset
+      let headerPayloadLength
+      {
+        let b0 := byte(0, calldataload(ptr))
+        // the input should be a long list
+        if lt(b0, 0xf8) {
+          invalid()
+        }
+        let lengthBytes := sub(b0, 0xf7)
+        if gt(lengthBytes, 32) {
+          invalid()
+        }
+        // load the extended length
+        ptr := add(ptr, 1)
+        headerPayloadLength := calldataload(ptr)
+        let bits := sub(256, mul(lengthBytes, 8))
+        // compute payload length: extended length + length bytes + 1
+        headerPayloadLength := shr(bits, headerPayloadLength)
+        headerPayloadLength := add(headerPayloadLength, lengthBytes)
+        headerPayloadLength := add(headerPayloadLength, 1)
+        ptr := add(ptr, lengthBytes)
+      }
+
+      let memPtr := mload(0x40)
+      calldatacopy(memPtr, _blockHeaderRLP.offset, headerPayloadLength)
+      let _computedBlockHash := keccak256(memPtr, headerPayloadLength)
+      require(eq(_blockHash, _computedBlockHash), "Block hash mismatch")
+      
+      // load 16 vaules
+      for { let i := 0 } lt(i, 16) { i := add(i, 1) } {
+        let len, offset := decodeValue(ptr)
+        // the value we care must have at most 32 bytes
+        if lt(len, 33) {
+          let bits := mul( sub(32, len), 8)
+          let value := calldataload(offset)
+          value := shr(bits, value)
+          mstore(memPtr, value)
+        }
+        memPtr := add(memPtr, 0x20)
+        ptr := add(len, offset)
+      }
+      require(eq(ptr, add(_blockHeaderRLP.offset, _blockHeaderRLP.length)), "Header RLP length mismatch")
+
+      memPtr := mload(0x40)
+      // load state root, 4-th entry
+      _stateRoot := mload(add(memPtr, 0x60))
+      // load block height, 9-th entry
+      _height := mload(add(memPtr, 0x100))
+      // load block timestamp, 12-th entry
+      _timestamp := mload(add(memPtr, 0x160))
+    }
+
+    emit ImportBlock(_blockHash, _height, _timestamp, _stateRoot);
   }
 }

bridge/scripts/build_abi.sh

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

bridge/sender/sender.go

@@ -20,8 +20,6 @@ import (
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
 
-	"scroll-tech/bridge/utils"
-
 	"scroll-tech/bridge/config"
 )
 
@@ -41,6 +39,16 @@ var (
 	ErrNoAvailableAccount = errors.New("sender has no available account to send transaction")
 )
 
+// DefaultSenderConfig The default config
+var DefaultSenderConfig = config.SenderConfig{
+	Endpoint:            "",
+	EscalateBlocks:      3,
+	EscalateMultipleNum: 11,
+	EscalateMultipleDen: 10,
+	MaxGasPrice:         1000_000_000_000, // this is 1000 gwei
+	TxType:              AccessListTxType,
+}
+
 // Confirmation struct used to indicate transaction confirmation details
 type Confirmation struct {
 	ID           string
@@ -87,6 +95,9 @@ type Sender struct {
 // NewSender returns a new instance of transaction sender
 // txConfirmationCh is used to notify confirmed transaction
 func NewSender(ctx context.Context, config *config.SenderConfig, privs []*ecdsa.PrivateKey) (*Sender, error) {
+	if config == nil {
+		config = &DefaultSenderConfig
+	}
 	client, err := ethclient.Dial(config.Endpoint)
 	if err != nil {
 		return nil, err
@@ -109,15 +120,6 @@ 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,
@@ -126,7 +128,7 @@ func NewSender(ctx context.Context, config *config.SenderConfig, privs []*ecdsa.
 		auths:         auths,
 		confirmCh:     make(chan *Confirmation, 128),
 		blockNumber:   header.Number.Uint64(),
-		baseFeePerGas: baseFeePerGas,
+		baseFeePerGas: header.BaseFee.Uint64(),
 		pendingTxs:    sync.Map{},
 		stopCh:        make(chan struct{}),
 	}
@@ -350,20 +352,11 @@ func (s *Sender) resubmitTransaction(feeData *FeeData, auth *bind.TransactOpts,
 	return s.createAndSendTx(auth, feeData, tx.To(), tx.Value(), tx.Data(), &nonce)
 }
 
-// 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) {
+// CheckPendingTransaction Check pending transaction given number of blocks to wait before confirmation.
+func (s *Sender) CheckPendingTransaction(header *types.Header) {
 	number := header.Number.Uint64()
 	atomic.StoreUint64(&s.blockNumber, number)
-
-	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")
-		}
-	}
-
+	atomic.StoreUint64(&s.baseFeePerGas, header.BaseFee.Uint64())
 	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() {
@@ -373,7 +366,7 @@ func (s *Sender) checkPendingTransaction(header *types.Header, confirmed uint64)
 		pending := value.(*PendingTransaction)
 		receipt, err := s.client.TransactionReceipt(s.ctx, pending.tx.Hash())
 		if (err == nil) && (receipt != nil) {
-			if receipt.BlockNumber.Uint64() <= confirmed {
+			if number >= receipt.BlockNumber.Uint64()+s.config.Confirmations {
 				s.pendingTxs.Delete(key)
 				// send confirm message
 				s.confirmCh <- &Confirmation{
@@ -447,14 +440,7 @@ func (s *Sender) loop(ctx context.Context) {
 				log.Error("failed to get latest head", "err", err)
 				continue
 			}
-
-			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)
+			s.CheckPendingTransaction(header)
 		case <-checkBalanceTicker.C:
 			// Check and set balance.
 			_ = s.auths.checkAndSetBalances(ctx)

bridge/sender/sender_test.go

@@ -14,7 +14,6 @@ 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"
@@ -69,7 +68,7 @@ func testBatchSender(t *testing.T, batchSize int) {
 	}
 
 	senderCfg := cfg.L1Config.RelayerConfig.SenderConfig
-	senderCfg.Confirmations = rpc.LatestBlockNumber
+	senderCfg.Confirmations = 0
 	newSender, err := sender.NewSender(context.Background(), senderCfg, privateKeys)
 	if err != nil {
 		t.Fatal(err)

bridge/tests/bridge_test.go

@@ -4,20 +4,20 @@ import (
 	"context"
 	"crypto/ecdsa"
 	"math/big"
+	"scroll-tech/common/docker"
 	"testing"
 
+	"scroll-tech/bridge/config"
+	"scroll-tech/bridge/mock_bridge"
+
 	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/crypto"
 	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/ethclient/gethclient"
 	"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 (
@@ -33,8 +33,10 @@ var (
 	dbImg     docker.ImgInstance
 
 	// clients
-	l1Client *ethclient.Client
-	l2Client *ethclient.Client
+	l1ethClient  *ethclient.Client
+	l2ethClient  *ethclient.Client
+	l1gethClient *gethclient.Client
+	l2gethClient *gethclient.Client
 
 	// auth
 	l1Auth *bind.TransactOpts
@@ -45,8 +47,8 @@ var (
 	l1MessengerAddress  common.Address
 
 	// l1 rollup contract
-	scrollChainInstance *mock_bridge.MockBridgeL1
-	scrollChainAddress  common.Address
+	l1RollupInstance *mock_bridge.MockBridgeL1
+	l1RollupAddress  common.Address
 
 	// l2 messenger contract
 	l2MessengerInstance *mock_bridge.MockBridgeL2
@@ -61,20 +63,16 @@ func setupEnv(t *testing.T) {
 	assert.NoError(t, err)
 	rollupPrivateKey, err := crypto.ToECDSA(common.FromHex("1212121212121212121212121212121212121212121212121212121212121214"))
 	assert.NoError(t, err)
-	gasOraclePrivateKey, err := crypto.ToECDSA(common.FromHex("1212121212121212121212121212121212121212121212121212121212121215"))
-	assert.NoError(t, err)
 
 	// Load config.
 	cfg, err = config.NewConfig("../config.json")
 	assert.NoError(t, err)
-	cfg.L1Config.Confirmations = rpc.LatestBlockNumber
+	cfg.L1Config.Confirmations = 0
 	cfg.L1Config.RelayerConfig.MessageSenderPrivateKeys = []*ecdsa.PrivateKey{messagePrivateKey}
 	cfg.L1Config.RelayerConfig.RollupSenderPrivateKeys = []*ecdsa.PrivateKey{rollupPrivateKey}
-	cfg.L1Config.RelayerConfig.GasOracleSenderPrivateKeys = []*ecdsa.PrivateKey{gasOraclePrivateKey}
-	cfg.L2Config.Confirmations = rpc.LatestBlockNumber
+	cfg.L2Config.Confirmations = 0
 	cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys = []*ecdsa.PrivateKey{messagePrivateKey}
 	cfg.L2Config.RelayerConfig.RollupSenderPrivateKeys = []*ecdsa.PrivateKey{rollupPrivateKey}
-	cfg.L2Config.RelayerConfig.GasOracleSenderPrivateKeys = []*ecdsa.PrivateKey{gasOraclePrivateKey}
 
 	// Create l1geth container.
 	l1gethImg = docker.NewTestL1Docker(t)
@@ -91,22 +89,25 @@ func setupEnv(t *testing.T) {
 	cfg.DBConfig.DSN = dbImg.Endpoint()
 
 	// Create l1geth and l2geth client.
-	l1Client, err = ethclient.Dial(cfg.L1Config.Endpoint)
+	l1rawClient, err := rpc.DialContext(context.Background(), cfg.L1Config.Endpoint)
 	assert.NoError(t, err)
-	l2Client, err = ethclient.Dial(cfg.L2Config.Endpoint)
+	l1ethClient = ethclient.NewClient(l1rawClient)
+	l1gethClient = gethclient.New(l1rawClient)
+
+	l2rawClient, err := rpc.DialContext(context.Background(), cfg.L2Config.Endpoint)
 	assert.NoError(t, err)
+	l2ethClient = ethclient.NewClient(l2rawClient)
+	l2gethClient = gethclient.New(l2rawClient)
 
 	// Create l1 and l2 auth
-	l1Auth = prepareAuth(t, l1Client, privateKey)
-	l2Auth = prepareAuth(t, l2Client, privateKey)
+	l1Auth = prepareAuth(t, l1ethClient, privateKey)
+	l2Auth = prepareAuth(t, l2ethClient, privateKey)
 
 	// send some balance to message and rollup sender
-	transferEther(t, l1Auth, l1Client, messagePrivateKey)
-	transferEther(t, l1Auth, l1Client, rollupPrivateKey)
-	transferEther(t, l1Auth, l1Client, gasOraclePrivateKey)
-	transferEther(t, l2Auth, l2Client, messagePrivateKey)
-	transferEther(t, l2Auth, l2Client, rollupPrivateKey)
-	transferEther(t, l2Auth, l2Client, gasOraclePrivateKey)
+	transferEther(t, l1Auth, l1ethClient, messagePrivateKey)
+	transferEther(t, l1Auth, l1ethClient, rollupPrivateKey)
+	transferEther(t, l2Auth, l2ethClient, messagePrivateKey)
+	transferEther(t, l2Auth, l2ethClient, rollupPrivateKey)
 }
 
 func transferEther(t *testing.T, auth *bind.TransactOpts, client *ethclient.Client, privateKey *ecdsa.PrivateKey) {
@@ -161,34 +162,30 @@ func prepareContracts(t *testing.T) {
 	var tx *types.Transaction
 
 	// L1 messenger contract
-	_, tx, l1MessengerInstance, err = mock_bridge.DeployMockBridgeL1(l1Auth, l1Client)
+	_, tx, l1MessengerInstance, err = mock_bridge.DeployMockBridgeL1(l1Auth, l1ethClient)
 	assert.NoError(t, err)
-	l1MessengerAddress, err = bind.WaitDeployed(context.Background(), l1Client, tx)
+	l1MessengerAddress, err = bind.WaitDeployed(context.Background(), l1ethClient, tx)
 	assert.NoError(t, err)
 
-	// L1 ScrolChain contract
-	_, tx, scrollChainInstance, err = mock_bridge.DeployMockBridgeL1(l1Auth, l1Client)
+	// L1 rollup contract
+	_, tx, l1RollupInstance, err = mock_bridge.DeployMockBridgeL1(l1Auth, l1ethClient)
 	assert.NoError(t, err)
-	scrollChainAddress, err = bind.WaitDeployed(context.Background(), l1Client, tx)
+	l1RollupAddress, err = bind.WaitDeployed(context.Background(), l1ethClient, tx)
 	assert.NoError(t, err)
 
 	// L2 messenger contract
-	_, tx, l2MessengerInstance, err = mock_bridge.DeployMockBridgeL2(l2Auth, l2Client)
+	_, tx, l2MessengerInstance, err = mock_bridge.DeployMockBridgeL2(l2Auth, l2ethClient)
 	assert.NoError(t, err)
-	l2MessengerAddress, err = bind.WaitDeployed(context.Background(), l2Client, tx)
+	l2MessengerAddress, err = bind.WaitDeployed(context.Background(), l2ethClient, tx)
 	assert.NoError(t, err)
 
 	cfg.L1Config.L1MessengerAddress = l1MessengerAddress
-	cfg.L1Config.L1MessageQueueAddress = l1MessengerAddress
-	cfg.L1Config.ScrollChainContractAddress = scrollChainAddress
+	cfg.L1Config.RollupContractAddress = l1RollupAddress
 	cfg.L1Config.RelayerConfig.MessengerContractAddress = l2MessengerAddress
-	cfg.L1Config.RelayerConfig.GasPriceOracleContractAddress = l1MessengerAddress
 
 	cfg.L2Config.L2MessengerAddress = l2MessengerAddress
-	cfg.L2Config.L2MessageQueueAddress = l2MessengerAddress
 	cfg.L2Config.RelayerConfig.MessengerContractAddress = l1MessengerAddress
-	cfg.L2Config.RelayerConfig.RollupContractAddress = scrollChainAddress
-	cfg.L2Config.RelayerConfig.GasPriceOracleContractAddress = l2MessengerAddress
+	cfg.L2Config.RelayerConfig.RollupContractAddress = l1RollupAddress
 }
 
 func prepareAuth(t *testing.T, client *ethclient.Client, privateKey *ecdsa.PrivateKey) *bind.TransactOpts {
@@ -207,15 +204,8 @@ func TestFunction(t *testing.T) {
 	// l1 rollup and watch rollup events
 	t.Run("TestCommitBatchAndFinalizeBatch", testCommitBatchAndFinalizeBatch)
 
-	// l1 message
-	t.Run("TestRelayL1MessageSucceed", testRelayL1MessageSucceed)
-
 	// l2 message
-	t.Run("TestRelayL2MessageSucceed", testRelayL2MessageSucceed)
-
-	// l1/l2 gas oracle
-	t.Run("TestImportL1GasPrice", testImportL1GasPrice)
-	t.Run("TestImportL2GasPrice", testImportL2GasPrice)
+	t.Run("testRelayL2MessageSucceed", testRelayL2MessageSucceed)
 
 	t.Cleanup(func() {
 		free(t)

bridge/tests/gas_oracle_test.go

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

bridge/tests/l1_message_relay_test.go

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

bridge/tests/l2_message_relay_test.go

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

bridge/tests/rollup_test.go

@@ -3,20 +3,19 @@ package tests
 import (
 	"context"
 	"math/big"
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
+	"scroll-tech/database/orm"
+	"sync"
 	"testing"
 
-	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
-	"github.com/scroll-tech/go-ethereum/common"
-	geth_types "github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/stretchr/testify/assert"
-
-	"scroll-tech/common/types"
-
 	"scroll-tech/bridge/l1"
 	"scroll-tech/bridge/l2"
 
-	"scroll-tech/database"
-	"scroll-tech/database/migrate"
+	"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) {
@@ -30,105 +29,111 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 
 	// Create L2Relayer
 	l2Cfg := cfg.L2Config
-	l2Relayer, err := l2.NewLayer2Relayer(context.Background(), l2Client, db, l2Cfg.RelayerConfig)
+	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.L1MessageQueueAddress, l1Cfg.ScrollChainContractAddress, db)
+	l1Watcher, err := l1.NewWatcher(context.Background(), l1gethClient, l1ethClient, 0, 0, l1Cfg.L1MessengerAddress, l1Cfg.L1MessageQueueAddress, l1Cfg.RollupContractAddress, db)
+	assert.NoError(t, err)
 
 	// add some blocks to db
-	var traces []*geth_types.BlockTrace
+	var traces []*types.BlockTrace
 	var parentHash common.Hash
 	for i := 1; i <= 10; i++ {
-		header := geth_types.Header{
+		header := types.Header{
 			Number:     big.NewInt(int64(i)),
 			ParentHash: parentHash,
 			Difficulty: big.NewInt(0),
 			BaseFee:    big.NewInt(0),
 		}
-		traces = append(traces, &geth_types.BlockTrace{
+		traces = append(traces, &types.BlockTrace{
 			Header:       &header,
-			StorageTrace: &geth_types.StorageTrace{},
+			StorageTrace: &types.StorageTrace{},
 		})
 		parentHash = header.Hash()
 	}
-	err = db.InsertL2BlockTraces(traces)
+	err = db.InsertBlockTraces(traces)
 	assert.NoError(t, err)
 
-	parentBatch := &types.BlockBatch{
-		Index: 0,
-		Hash:  "0x0000000000000000000000000000000000000000",
-	}
-	batchData := types.NewBatchData(parentBatch, []*geth_types.BlockTrace{
-		traces[0],
-		traces[1],
-	}, cfg.L2Config.BatchProposerConfig.PublicInputConfig)
-
-	batchHash := batchData.Hash().String()
-
 	// add one batch to db
 	dbTx, err := db.Beginx()
 	assert.NoError(t, err)
-	assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData))
-	var blockIDs = make([]uint64, len(batchData.Batch.Blocks))
-	for i, block := range batchData.Batch.Blocks {
-		blockIDs[i] = block.BlockNumber
-	}
-	err = db.SetBatchHashForL2BlocksInDBTx(dbTx, blockIDs, batchHash)
+	batchID, err := db.NewBatchInDBTx(dbTx,
+		&orm.L2BlockInfo{
+			Number:     traces[0].Header.Number.Uint64(),
+			Hash:       traces[0].Header.Hash().String(),
+			ParentHash: traces[0].Header.ParentHash.String(),
+		},
+		&orm.L2BlockInfo{
+			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)
-	assert.NoError(t, dbTx.Commit())
 
+	var wg = sync.WaitGroup{}
+	wg.Add(1)
 	// process pending batch and check status
-	l2Relayer.SendCommitTx([]*types.BatchData{batchData})
+	l2Relayer.ProcessPendingBatches(&wg)
+	wg.Wait()
 
-	status, err := db.GetRollupStatus(batchHash)
+	status, err := db.GetRollupStatus(batchID)
 	assert.NoError(t, err)
-	assert.Equal(t, types.RollupCommitting, status)
-	commitTxHash, err := db.GetCommitTxHash(batchHash)
+	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))
+	commitTx, _, err := l1ethClient.TransactionByHash(context.Background(), common.HexToHash(commitTxHash.String))
 	assert.NoError(t, err)
-	commitTxReceipt, err := bind.WaitMined(context.Background(), l1Client, commitTx)
+	commitTxReceipt, err := bind.WaitMined(context.Background(), l1ethClient, 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(batchHash)
+	status, err = db.GetRollupStatus(batchID)
 	assert.NoError(t, err)
-	assert.Equal(t, types.RollupCommitted, status)
+	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.UpdateProofByHash(context.Background(), batchHash, tProof, tInstanceCommitments, 100)
+	err = db.UpdateProofByID(context.Background(), batchID, tProof, tInstanceCommitments, 100)
 	assert.NoError(t, err)
-	err = db.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
+	err = db.UpdateProvingStatus(batchID, orm.ProvingTaskVerified)
 	assert.NoError(t, err)
 
+	wg.Add(1)
 	// process committed batch and check status
-	l2Relayer.ProcessCommittedBatches()
+	l2Relayer.ProcessCommittedBatches(&wg)
+	wg.Wait()
 
-	status, err = db.GetRollupStatus(batchHash)
+	status, err = db.GetRollupStatus(batchID)
 	assert.NoError(t, err)
-	assert.Equal(t, types.RollupFinalizing, status)
-	finalizeTxHash, err := db.GetFinalizeTxHash(batchHash)
+	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))
+	finalizeTx, _, err := l1ethClient.TransactionByHash(context.Background(), common.HexToHash(finalizeTxHash.String))
 	assert.NoError(t, err)
-	finalizeTxReceipt, err := bind.WaitMined(context.Background(), l1Client, finalizeTx)
+	finalizeTxReceipt, err := bind.WaitMined(context.Background(), l1ethClient, 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(batchHash)
+	status, err = db.GetRollupStatus(batchID)
 	assert.NoError(t, err)
-	assert.Equal(t, types.RollupFinalized, status)
+	assert.Equal(t, orm.RollupFinalized, status)
 }

bridge/utils/confirmation.go

@@ -1,56 +0,0 @@
-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

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

bridge/utils/utils.go

@@ -1,20 +1,26 @@
 package utils
 
 import (
+	"bytes"
+	"context"
 	"fmt"
 	"math/big"
 
+	"github.com/iden3/go-iden3-crypto/keccak256"
 	"github.com/scroll-tech/go-ethereum/accounts/abi"
 	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/common/math"
 	"github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/scroll-tech/go-ethereum/crypto"
-
-	bridgeabi "scroll-tech/bridge/abi"
+	"github.com/scroll-tech/go-ethereum/ethclient/gethclient"
 )
 
 // Keccak2 compute the keccack256 of two concatenations of bytes32
 func Keccak2(a common.Hash, b common.Hash) common.Hash {
-	return common.BytesToHash(crypto.Keccak256(append(a.Bytes()[:], b.Bytes()[:]...)))
+	return common.BytesToHash(keccak256.Hash(append(a.Bytes()[:], b.Bytes()[:]...)))
+}
+
+func encodePacked(input ...[]byte) []byte {
+	return bytes.Join(input, nil)
 }
 
 // ComputeMessageHash compute the message hash
@@ -22,11 +28,21 @@ func ComputeMessageHash(
 	sender common.Address,
 	target common.Address,
 	value *big.Int,
-	messageNonce *big.Int,
+	fee *big.Int,
+	deadline *big.Int,
 	message []byte,
+	messageNonce *big.Int,
 ) common.Hash {
-	data, _ := bridgeabi.L2ScrollMessengerABI.Pack("relayMessage", sender, target, value, messageNonce, message)
-	return common.BytesToHash(crypto.Keccak256(data))
+	packed := encodePacked(
+		sender.Bytes(),
+		target.Bytes(),
+		math.U256Bytes(value),
+		math.U256Bytes(fee),
+		math.U256Bytes(deadline),
+		math.U256Bytes(messageNonce),
+		message,
+	)
+	return common.BytesToHash(keccak256.Hash(packed))
 }
 
 // BufferToUint256Be convert bytes array to uint256 array assuming big-endian
@@ -58,7 +74,6 @@ func BufferToUint256Le(buffer []byte) []*big.Int {
 }
 
 // UnpackLog unpacks a retrieved log into the provided output structure.
-// @todo: add unit test.
 func UnpackLog(c *abi.ABI, out interface{}, event string, log types.Log) error {
 	if log.Topics[0] != c.Events[event].ID {
 		return fmt.Errorf("event signature mismatch")
@@ -78,7 +93,6 @@ func UnpackLog(c *abi.ABI, out interface{}, event string, log types.Log) error {
 }
 
 // UnpackLogIntoMap unpacks a retrieved log into the provided map.
-// @todo: add unit test.
 func UnpackLogIntoMap(c *abi.ABI, out map[string]interface{}, event string, log types.Log) error {
 	if log.Topics[0] != c.Events[event].ID {
 		return fmt.Errorf("event signature mismatch")
@@ -96,3 +110,39 @@ func UnpackLogIntoMap(c *abi.ABI, out map[string]interface{}, event string, log
 	}
 	return abi.ParseTopicsIntoMap(out, indexed, log.Topics[1:])
 }
+
+// GetL1MessageProof will fetch storage proof from geth client
+func GetL1MessageProof(client *gethclient.Client, account common.Address, hashes []common.Hash, height uint64) ([][]byte, error) {
+	slot := common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000000")
+	var keys []string
+	for _, hash := range hashes {
+		keys = append(keys, Keccak2(hash, slot).String())
+	}
+	results, err := client.GetProof(context.Background(), account, keys, big.NewInt(int64(height)))
+	if err != nil {
+		return make([][]byte, 0), err
+	}
+
+	accountProof := results.AccountProof
+	var proofs [][]byte
+	for i := 0; i < len(hashes); i++ {
+		var proof []byte
+		proof = append(proof, big.NewInt(int64(len(accountProof))).Bytes()...)
+		for _, item := range results.AccountProof {
+			// remove 0x prefix
+			proof = append(proof, common.Hex2Bytes(item[2:])...)
+		}
+
+		// the storage proof should have the same order with `hashes`
+		storageProof := results.StorageProof[i]
+		proof = append(proof, big.NewInt(int64(len(storageProof.Proof))).Bytes()...)
+		for _, item := range storageProof.Proof {
+			// remove 0x prefix
+			proof = append(proof, common.Hex2Bytes(item[2:])...)
+		}
+
+		proofs = append(proofs, proof)
+	}
+
+	return proofs, nil
+}

bridge/utils/utils_test.go

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

build/dockerfiles/coordinator.Dockerfile

@@ -1,5 +1,5 @@
 # Build libzkp dependency
-FROM scrolltech/go-rust-builder:go-1.18-rust-nightly-2022-12-10 as chef
+FROM scrolltech/go-rust-builder:go-1.18-rust-nightly-2022-08-23 as chef
 WORKDIR app
 
 FROM chef as planner
@@ -13,11 +13,10 @@ 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-12-10 as base
+FROM scrolltech/go-rust-builder:go-1.18-rust-nightly-2022-08-23 as base
 WORKDIR /src
 COPY go.work* ./
 COPY ./bridge/go.* ./bridge/
@@ -34,16 +33,11 @@ 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/
-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/
+RUN cd ./coordinator && go build -v -p 4 -o /bin/coordinator ./cmd
 
 # 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-12-10
+RUST_VERSION := nightly-2022-08-23
 
 .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 openssl-dev
+RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates

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-12-10
+ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-08-23
 
-RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates openssl-dev
+RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates
 
 # 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-12-10
+RUN rustup toolchain install nightly-2022-08-23
 
 # TODO: make this ARG
 ENV CARGO_CHEF_TAG=0.1.41

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

@@ -1,11 +1,10 @@
 ARG ALPINE_VERSION=3.15
 FROM alpine:${ALPINE_VERSION}
 ARG CARGO_CHEF_TAG=0.1.41
-ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-12-10
+ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-08-23
 
 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-12-10
+RUN rustup toolchain install nightly-2022-08-23

build/push-docker-tag.Jenkinsfile

@@ -1,6 +1,6 @@
 imagePrefix = 'scrolltech'
 credentialDocker = 'dockerhub'
-TAGNAME = ''
+
 pipeline {
     agent any
     options {
@@ -41,20 +41,13 @@ pipeline {
                                 if (TAGNAME == ""){
                                     return;
                                 }
-                                brigeImageName = "scrolltech/bridge:${TAGNAME}"
-                                sh'''
-                                docker login --username=${dockerUser} --password=${dockerPassword}
-                                echo "${brigeImageName}"
-                                docker manifest inspect "${brigeImageName}" > /dev/null
-                                echo $?
-                                '''
-                                // sh "docker login --username=${dockerUser} --password=${dockerPassword}"
-                                // sh "make -C bridge docker"
-                                // sh "make -C coordinator docker"
-                                // sh "docker tag scrolltech/bridge:latest scrolltech/bridge:${TAGNAME}"
-                                // sh "docker tag scrolltech/coordinator:latest scrolltech/coordinator:${TAGNAME}"
-                                // sh "docker push scrolltech/bridge:${TAGNAME}"
-                                // sh "docker push scrolltech/coordinator:${TAGNAME}"
+                                sh "docker login --username=${dockerUser} --password=${dockerPassword}"
+                                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}"
                             }                              
                     }
                }

common/docker/l2geth/Dockerfile

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

common/go.mod

@@ -6,20 +6,19 @@ require (
 	github.com/docker/docker v20.10.21+incompatible
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/lib/pq v1.10.6
-	github.com/mattn/go-colorable v0.1.13
-	github.com/mattn/go-isatty v0.0.16
+	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.20230220082843-ec9254b0b1c6
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230112091133-2891916a0f81
 	github.com/stretchr/testify v1.8.0
-	github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa
-	gotest.tools v2.2.0+incompatible
+	github.com/urfave/cli/v2 v2.10.2
 )
 
 require (
 	github.com/Microsoft/go-winio v0.6.0 // indirect
 	github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
 	github.com/btcsuite/btcd v0.20.1-beta // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set v1.8.0 // indirect
@@ -28,15 +27,14 @@ require (
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/edsrzf/mmap-go v1.0.0 // indirect
-	github.com/ethereum/go-ethereum v1.11.1 // indirect
+	github.com/ethereum/go-ethereum v1.10.26 // indirect
 	github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // indirect
 	github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
-	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-stack/stack v1.8.1 // indirect
+	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/graph-gophers/graphql-go v1.3.0 // indirect
@@ -50,6 +48,7 @@ require (
 	github.com/influxdata/influxdb-client-go/v2 v2.4.0 // indirect
 	github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
+	github.com/kr/pretty v0.3.0 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/mattn/go-sqlite3 v1.14.14 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
@@ -65,25 +64,26 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/tsdb v0.7.1 // indirect
 	github.com/rjeczalik/notify v0.9.1 // indirect
+	github.com/rogpeppe/go-internal v1.8.1 // indirect
 	github.com/rs/cors v1.7.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/scroll-tech/zktrie v0.5.0 // indirect
+	github.com/scroll-tech/zktrie v0.3.1 // 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.2.0 // indirect
+	github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
 	github.com/tklauser/numcpus v0.4.0 // indirect
-	github.com/tyler-smith/go-bip39 v1.1.0 // indirect
+	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.6.0 // indirect
+	golang.org/x/crypto v0.5.0 // indirect
 	golang.org/x/mod v0.7.0 // indirect
-	golang.org/x/net v0.6.0 // indirect
+	golang.org/x/net v0.5.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-20220922220347-f3bd1da661af // indirect
+	golang.org/x/sys v0.4.0 // indirect
+	golang.org/x/text v0.6.0 // indirect
+	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
 	golang.org/x/tools v0.3.0 // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/urfave/cli.v1 v1.20.0 // indirect

common/go.sum

@@ -78,8 +78,8 @@ github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
 github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -126,15 +126,15 @@ github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaB
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/ethereum/go-ethereum v1.10.13/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw=
-github.com/ethereum/go-ethereum v1.11.1 h1:EMymmWFzpS7G9l9NvVN8G73cgdUIqDPNRf2YTSGBXlk=
-github.com/ethereum/go-ethereum v1.11.1/go.mod h1:DuefStAgaxoaYGLR0FueVcVbehmn5n9QUcVrMCuOvuc=
+github.com/ethereum/go-ethereum v1.10.26 h1:i/7d9RBBwiXCEuyduBQzJw/mKmnvzsN14jqBmytw72s=
+github.com/ethereum/go-ethereum v1.10.26/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI=
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
 github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
@@ -148,9 +148,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2
 github.com/go-kit/kit v0.8.0 h1:Wz+5lgoB0kkuqLEc6NVmwRknTKP6dTGbSqvhZtBI/j0=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0 h1:MP4Eh7ZCb31lleYCFuwm0oe4/YGak+5l1vA2NOE80nA=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
-github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
@@ -160,9 +159,8 @@ github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5Nq
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
+github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
-github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
 github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
@@ -201,8 +199,8 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -271,8 +269,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/julienschmidt/httprouter v1.2.0 h1:TDTW5Yz1mjftljbcKqRcrYhd4XeOoI98t+9HbQbYf7g=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
 github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0=
 github.com/karalabe/usb v0.0.0-20211005121534-4c5740d64559/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU=
@@ -285,10 +283,12 @@ github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM52
 github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg=
 github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -308,17 +308,16 @@ github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIG
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc=
 github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
@@ -373,6 +372,7 @@ github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 h1:oYW+YCJ1pachXTQm
 github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
 github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
@@ -396,16 +396,19 @@ github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1
 github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeCE=
 github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
+github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
 github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
 github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230220082843-ec9254b0b1c6 h1:2kXWJR+mOj09HBh5sUTb4L/OURPSXoQd1NC/10v7otM=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230220082843-ec9254b0b1c6/go.mod h1:eW+eyNdMoO0MyuczCc9xWSnW8dPJ0kOy5xsxgOKYEaA=
-github.com/scroll-tech/zktrie v0.5.0 h1:dABDR6lMZq6Hs+fWQSiHbX8s3AOX6hY+5nkhSYm5rmU=
-github.com/scroll-tech/zktrie v0.5.0/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230112091133-2891916a0f81 h1:Gm18RZ9WTR2Dupumr60E2m1Noe+l9/lITt6iRyxxZoc=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230112091133-2891916a0f81/go.mod h1:jurIpDQ0hqtp9//xxeWzr8X9KMP/+TYn+vz3K1wZrv0=
+github.com/scroll-tech/zktrie v0.3.0/go.mod h1:CuJFlG1/soTJJBAySxCZgTF7oPvd5qF6utHOEciC43Q=
+github.com/scroll-tech/zktrie v0.3.1 h1:HlR+fMBdjXX1/7cUMqpUgGEhGy/3vN1JpwQ0ovg/Ys8=
+github.com/scroll-tech/zktrie v0.3.1/go.mod h1:CuJFlG1/soTJJBAySxCZgTF7oPvd5qF6utHOEciC43Q=
 github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=
 github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
@@ -422,9 +425,8 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg=
 github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
-github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA=
-github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9+mHxBEeo3Hbg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
@@ -446,12 +448,11 @@ github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYa
 github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM=
 github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
 github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
+github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef h1:wHSqTBrZW24CsNJDfeh9Ex6Pm0Rcpc7qrgKBiL44vF4=
 github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs=
-github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8=
-github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
-github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa h1:5SqCsI/2Qya2bCzK15ozrqo2sZxkh0FHynJZOTVoV6Q=
-github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
+github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y=
+github.com/urfave/cli/v2 v2.10.2/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
@@ -481,8 +482,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.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
+golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -540,8 +541,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.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
+golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/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=
@@ -598,15 +599,15 @@ golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/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/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -618,14 +619,13 @@ 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.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
+golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220922220347-f3bd1da661af h1:Yx9k8YCG3dvF87UAn2tu2HQLf2dt/eR1bXxpLMWeH+Y=
-golang.org/x/time v0.0.0-20220922220347-f3bd1da661af/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -731,7 +731,6 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=

common/libzkp/impl/Cargo.toml

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

common/libzkp/impl/rust-toolchain

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

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_batch(traces.as_slice())
+        .create_agg_circuit_proof_multi(traces.as_slice())
         .unwrap();
     let proof_bytes = serde_json::to_vec(&proof).unwrap();
     vec_to_c_char(proof_bytes)

common/message/message.go

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

common/testdata/blockTrace_02.json

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

common/testdata/blockTrace_03.json

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

common/types/batch.go

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

common/types/batch_test.go

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

common/types/db.go

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

common/utils/contracts.go

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

common/utils/contracts_test.go

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

common/utils/rpc.go

@@ -38,14 +38,10 @@ func StartHTTPEndpoint(endpoint string, apis []rpc.API) (*http.Server, net.Addr,
 }
 
 // StartWSEndpoint starts the WS RPC endpoint.
-func StartWSEndpoint(endpoint string, apis []rpc.API, compressionLevel int) (*http.Server, net.Addr, error) {
+func StartWSEndpoint(endpoint string, apis []rpc.API) (*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,7 +1,6 @@
 package utils
 
 import (
-	"compress/flate"
 	"context"
 	"testing"
 
@@ -60,7 +59,7 @@ func TestStartWSEndpoint(t *testing.T) {
 			Namespace: "test",
 			Service:   new(testService),
 		},
-	}, flate.NoCompression)
+	})
 	assert.NoError(t, err)
 	defer handler.Shutdown(context.Background())
 

common/version/version.go

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

contracts/.prettierignore

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

contracts/README.md

@@ -45,31 +45,16 @@ yarn install
 
 ## Build
 
-+ Run `git submodule update --init --recursive` to initialise git submodules.
-+ Run `yarn prettier:solidity` to run linting in fix mode, will auto-format all solidity codes.
-+ Run `yarn prettier` to run linting in fix mode, will auto-format all typescript codes.
-+ Run `forge build` to compile contracts with foundry.
-+ Run `npx hardhat compile` to compile with hardhat.
-+ Run `forge test -vvv` to run foundry units tests. It will compile all contracts before running the unit tests.
-+ Run `npx hardhat test` to run integration tests. It may not compile all contracts before running, it's better to run `npx hardhat compile` first.
+- Run `git submodule update --init --recursive` to initialise git submodules.
+- Run `yarn prettier:solidity` to run linting in fix mode, will auto-format all solidity codes.
+- Run `yarn prettier` to run linting in fix mode, will auto-format all typescript codes.
+- Run `forge build` to compile contracts with foundry.
+- Run `npx hardhat compile` to compile with hardhat.
+- Run `forge test -vvv` to run foundry units tests. It will compile all contracts before running the unit tests.
+- Run `npx hardhat test` to run integration tests. It may not compile all contracts before running, it's better to run `npx hardhat compile` first.
 
 ## TODO
 
-- [ ] unit tests
-  - [ ] L1 Messenger
-  - [x] L1 Gateways
-  - [x] L1 Gateway Router
-  - [ ] L2 Messenger
-  - [x] L2 Gateways
-  - [x] L2 Gateway Router
-  - [x] ScrollStandardERC20Factory
-  - [x] Whitelist
-  - [ ] SimpleGasOracle
-- [ ] integration tests
-  - [x] ERC20Gateway
-  - [x] GatewayRouter
-- [ ] ZKRollup contracts
-- [x] Gas Oracle contracts for cross chain message call
-- [ ] ERC721/ERC115 interface design
 - [ ] add proof verification codes
+- [ ] layer1 to layer2 proof
 - [ ] security analysis

contracts/docs/apis/L1ERC1155Gateway.md

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

contracts/docs/apis/L1ERC721Gateway.md

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

contracts/docs/apis/L1GatewayRouter.md

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

contracts/docs/apis/L1ScrollMessenger.md

@@ -10,13 +10,13 @@ The `L1ScrollMessenger` contract can: 1. send messages from layer 1 to layer 2;
 
 ## Methods
 
-### counterpart
+### dropDelayDuration
 
 ```solidity
-function counterpart() external view returns (address)
+function dropDelayDuration() external view returns (uint256)
 ```
 
-The address of counterpart ScrollMessenger contract in L1/L2.
+The amount of seconds needed to wait if we want to drop message.
 
 
 
@@ -25,15 +25,38 @@ The address of counterpart ScrollMessenger contract in L1/L2.
 
 | Name | Type | Description |
 |---|---|---|
-| _0 | address | undefined |
+| _0 | uint256 | undefined |
 
-### feeVault
+### dropMessage
 
 ```solidity
-function feeVault() external view returns (address)
+function dropMessage(address, address, uint256, uint256, uint256, uint256, bytes, uint256) external nonpayable
 ```
 
-The address of fee vault, collecting cross domain messaging fee.
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | address | undefined |
+| _1 | address | undefined |
+| _2 | uint256 | undefined |
+| _3 | uint256 | undefined |
+| _4 | uint256 | undefined |
+| _5 | uint256 | undefined |
+| _6 | bytes | undefined |
+| _7 | uint256 | undefined |
+
+### gasOracle
+
+```solidity
+function gasOracle() external view returns (address)
+```
+
+The gas oracle used to estimate transaction fee on layer 2.
 
 
 
@@ -47,10 +70,10 @@ The address of fee vault, collecting cross domain messaging fee.
 ### initialize
 
 ```solidity
-function initialize(address _counterpart, address _feeVault, address _rollup, address _messageQueue) external nonpayable
+function initialize(address _rollup) external nonpayable
 ```
 
-Initialize the storage of L1ScrollMessenger.
+
 
 
 
@@ -58,65 +81,62 @@ Initialize the storage of L1ScrollMessenger.
 
 | Name | Type | Description |
 |---|---|---|
-| _counterpart | address | The address of L2ScrollMessenger contract in L2. |
-| _feeVault | address | The address of fee vault, which will be used to collect relayer fee. |
-| _rollup | address | The address of ScrollChain contract. |
-| _messageQueue | address | The address of L1MessageQueue contract. |
+| _rollup | address | undefined |
 
-### isL1MessageRelayed
+### isMessageDropped
 
 ```solidity
-function isL1MessageRelayed(bytes32) external view returns (bool)
+function isMessageDropped(bytes32) external view returns (bool)
+```
+
+Mapping from message hash to drop status.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | bytes32 | undefined |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | bool | undefined |
+
+### isMessageExecuted
+
+```solidity
+function isMessageExecuted(bytes32) external view returns (bool)
+```
+
+Mapping from message hash to execution status.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | bytes32 | undefined |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | bool | undefined |
+
+### isMessageRelayed
+
+```solidity
+function isMessageRelayed(bytes32) external view returns (bool)
 ```
 
 Mapping from relay id to relay status.
 
 
 
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | bytes32 | undefined |
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | bool | undefined |
-
-### isL1MessageSent
-
-```solidity
-function isL1MessageSent(bytes32) external view returns (bool)
-```
-
-Mapping from L1 message hash to sent status.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | bytes32 | undefined |
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | bool | undefined |
-
-### isL2MessageExecuted
-
-```solidity
-function isL2MessageExecuted(bytes32) external view returns (bool)
-```
-
-Mapping from L2 message hash to a boolean value indicating if the message has been successfully executed.
-
-
-
 #### Parameters
 
 | Name | Type | Description |
@@ -132,7 +152,7 @@ Mapping from L2 message hash to a boolean value indicating if the message has be
 ### messageQueue
 
 ```solidity
-function messageQueue() external view returns (address)
+function messageQueue() external view returns (contract L1MessageQueue)
 ```
 
 The address of L1MessageQueue contract.
@@ -144,7 +164,7 @@ The address of L1MessageQueue contract.
 
 | Name | Type | Description |
 |---|---|---|
-| _0 | address | undefined |
+| _0 | contract L1MessageQueue | undefined |
 
 ### owner
 
@@ -194,7 +214,7 @@ function paused() external view returns (bool)
 ### relayMessageWithProof
 
 ```solidity
-function relayMessageWithProof(address _from, address _to, uint256 _value, uint256 _nonce, bytes _message, IL1ScrollMessenger.L2MessageProof _proof) external nonpayable
+function relayMessageWithProof(address _from, address _to, uint256 _value, uint256 _fee, uint256 _deadline, uint256 _nonce, bytes _message, IL1ScrollMessenger.L2MessageProof _proof) external nonpayable
 ```
 
 
@@ -208,6 +228,8 @@ function relayMessageWithProof(address _from, address _to, uint256 _value, uint2
 | _from | address | undefined |
 | _to | address | undefined |
 | _value | uint256 | undefined |
+| _fee | uint256 | undefined |
+| _deadline | uint256 | undefined |
 | _nonce | uint256 | undefined |
 | _message | bytes | undefined |
 | _proof | IL1ScrollMessenger.L2MessageProof | undefined |
@@ -226,7 +248,7 @@ function renounceOwnership() external nonpayable
 ### replayMessage
 
 ```solidity
-function replayMessage(address _from, address _to, uint256 _value, uint256 _queueIndex, bytes _message, uint32 _oldGasLimit, uint32 _newGasLimit) external nonpayable
+function replayMessage(address _from, address _to, uint256 _value, uint256 _fee, uint256 _deadline, bytes _message, uint256 _queueIndex, uint32 _oldGasLimit, uint32 _newGasLimit) external nonpayable
 ```
 
 Replay an exsisting message.
@@ -237,13 +259,15 @@ Replay an exsisting message.
 
 | Name | Type | Description |
 |---|---|---|
-| _from | address | undefined |
-| _to | address | undefined |
-| _value | uint256 | undefined |
-| _queueIndex | uint256 | undefined |
-| _message | bytes | undefined |
-| _oldGasLimit | uint32 | undefined |
-| _newGasLimit | uint32 | undefined |
+| _from | address | The address of the sender of the message. |
+| _to | address | The address of the recipient of the message. |
+| _value | uint256 | The msg.value passed to the message call. |
+| _fee | uint256 | The amount of fee in ETH to charge. |
+| _deadline | uint256 | The deadline of the message. |
+| _message | bytes | The content of the message. |
+| _queueIndex | uint256 | CTC Queue index for the message to replay. |
+| _oldGasLimit | uint32 | Original gas limit used to send the message. |
+| _newGasLimit | uint32 | New gas limit to be used for this message. |
 
 ### rollup
 
@@ -265,21 +289,21 @@ The address of Rollup contract.
 ### sendMessage
 
 ```solidity
-function sendMessage(address _to, uint256 _value, bytes _message, uint256 _gasLimit) external payable
+function sendMessage(address _to, uint256 _fee, bytes _message, uint256 _gasLimit) external payable
 ```
 
-Send cross chain message from L1 to L2 or L2 to L1.
-
+Send cross chain message (L1 => L2 or L2 => L1)
 
+*Currently, only privileged accounts can call this function for safty. And adding an extra `_fee` variable make it more easy to upgrade to decentralized version.*
 
 #### Parameters
 
 | Name | Type | Description |
 |---|---|---|
-| _to | address | undefined |
-| _value | uint256 | undefined |
-| _message | bytes | undefined |
-| _gasLimit | uint256 | undefined |
+| _to | address | The address of account who recieve the message. |
+| _fee | uint256 | The amount of fee in Ether the caller would like to pay to the relayer. |
+| _message | bytes | The content of the message. |
+| _gasLimit | uint256 | Unused, but included for potential forward compatibility considerations. |
 
 ### transferOwnership
 
@@ -297,13 +321,13 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateFeeVault
+### updateDropDelayDuration
 
 ```solidity
-function updateFeeVault(address _newFeeVault) external nonpayable
+function updateDropDelayDuration(uint256 _newDuration) external nonpayable
 ```
 
-Update fee vault contract.
+Update the drop delay duration.
 
 *This function can only called by contract owner.*
 
@@ -311,7 +335,23 @@ Update fee vault contract.
 
 | Name | Type | Description |
 |---|---|---|
-| _newFeeVault | address | The address of new fee vault contract. |
+| _newDuration | uint256 | The new delay duration to update. |
+
+### updateGasOracle
+
+```solidity
+function updateGasOracle(address _newGasOracle) external nonpayable
+```
+
+Update the address of gas oracle.
+
+*This function can only called by contract owner.*
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _newGasOracle | address | The address to update. |
 
 ### updateWhitelist
 
@@ -329,6 +369,23 @@ Update whitelist contract.
 |---|---|---|
 | _newWhitelist | address | The address of new whitelist contract. |
 
+### version
+
+```solidity
+function version() external view returns (string)
+```
+
+the current contract version.
+
+
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | string | undefined |
+
 ### whitelist
 
 ```solidity
@@ -370,10 +427,10 @@ See {IScrollMessenger-xDomainMessageSender}
 ### FailedRelayedMessage
 
 ```solidity
-event FailedRelayedMessage(bytes32 indexed messageHash)
+event FailedRelayedMessage(bytes32 indexed msgHash)
 ```
 
-Emitted when a cross domain message is failed to relay.
+
 
 
 
@@ -381,7 +438,23 @@ Emitted when a cross domain message is failed to relay.
 
 | Name | Type | Description |
 |---|---|---|
-| messageHash `indexed` | bytes32 | undefined |
+| msgHash `indexed` | bytes32 | undefined |
+
+### MessageDropped
+
+```solidity
+event MessageDropped(bytes32 indexed msgHash)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| msgHash `indexed` | bytes32 | undefined |
 
 ### OwnershipTransferred
 
@@ -419,10 +492,10 @@ event Paused(address account)
 ### RelayedMessage
 
 ```solidity
-event RelayedMessage(bytes32 indexed messageHash)
+event RelayedMessage(bytes32 indexed msgHash)
 ```
 
-Emitted when a cross domain message is relayed successfully.
+
 
 
 
@@ -430,15 +503,15 @@ Emitted when a cross domain message is relayed successfully.
 
 | Name | Type | Description |
 |---|---|---|
-| messageHash `indexed` | bytes32 | undefined |
+| msgHash `indexed` | bytes32 | undefined |
 
 ### SentMessage
 
 ```solidity
-event SentMessage(address indexed sender, address indexed target, uint256 value, uint256 messageNonce, uint256 gasLimit, bytes message)
+event SentMessage(address indexed target, address sender, uint256 value, uint256 fee, uint256 deadline, bytes message, uint256 messageNonce, uint256 gasLimit)
 ```
 
-Emitted when a cross domain message is sent.
+
 
 
 
@@ -446,12 +519,14 @@ Emitted when a cross domain message is sent.
 
 | Name | Type | Description |
 |---|---|---|
-| sender `indexed` | address | undefined |
 | target `indexed` | address | undefined |
+| sender  | address | undefined |
 | value  | uint256 | undefined |
+| fee  | uint256 | undefined |
+| deadline  | uint256 | undefined |
+| message  | bytes | undefined |
 | messageNonce  | uint256 | undefined |
 | gasLimit  | uint256 | undefined |
-| message  | bytes | undefined |
 
 ### Unpaused
 
@@ -469,13 +544,13 @@ event Unpaused(address account)
 |---|---|---|
 | account  | address | undefined |
 
-### UpdateFeeVault
+### UpdateDropDelayDuration
 
 ```solidity
-event UpdateFeeVault(address _oldFeeVault, address _newFeeVault)
+event UpdateDropDelayDuration(uint256 _oldDuration, uint256 _newDuration)
 ```
 
-Emitted when owner updates fee vault contract.
+Emitted when owner updates drop delay duration
 
 
 
@@ -483,8 +558,25 @@ Emitted when owner updates fee vault contract.
 
 | Name | Type | Description |
 |---|---|---|
-| _oldFeeVault  | address | undefined |
-| _newFeeVault  | address | undefined |
+| _oldDuration  | uint256 | undefined |
+| _newDuration  | uint256 | undefined |
+
+### UpdateGasOracle
+
+```solidity
+event UpdateGasOracle(address _oldGasOracle, address _newGasOracle)
+```
+
+Emitted when owner updates gas oracle contract.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _oldGasOracle  | address | undefined |
+| _newGasOracle  | address | undefined |
 
 ### UpdateWhitelist
 

contracts/docs/apis/L1StandardERC20Gateway.md

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

contracts/docs/apis/L1WETHGateway.md

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

contracts/docs/apis/L2ERC1155Gateway.md

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

contracts/docs/apis/L2ERC721Gateway.md

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

contracts/docs/apis/L2GatewayRouter.md

@@ -32,13 +32,13 @@ Mapping from L2 ERC20 token address to corresponding L2ERC20Gateway.
 |---|---|---|
 | _0 | address | undefined |
 
-### defaultERC20Gateway
+### counterpart
 
 ```solidity
-function defaultERC20Gateway() external view returns (address)
+function counterpart() external view returns (address)
 ```
 
-The addess of default L2 ERC20 gateway, normally the L2StandardERC20Gateway contract.
+The address of corresponding L1/L2 Gateway contract.
 
 
 
@@ -49,13 +49,13 @@ The addess of default L2 ERC20 gateway, normally the L2StandardERC20Gateway cont
 |---|---|---|
 | _0 | address | undefined |
 
-### ethGateway
+### defaultERC20Gateway
 
 ```solidity
-function ethGateway() external view returns (address)
+function defaultERC20Gateway() external view returns (address)
 ```
 
-The address of L2ETHGateway.
+The addess of default L2 ERC20 gateway, normally the L2StandardERC20Gateway contract.
 
 
 
@@ -90,7 +90,7 @@ Complete a deposit from L1 to L2 and send fund to recipient's account in L2.
 ### finalizeDepositETH
 
 ```solidity
-function finalizeDepositETH(address, address, uint256, bytes) external payable
+function finalizeDepositETH(address _from, address _to, uint256 _amount, bytes _data) external payable
 ```
 
 Complete ETH deposit from L1 to L2 and send fund to recipient's account in L2.
@@ -101,10 +101,21 @@ Complete ETH deposit from L1 to L2 and send fund to recipient's account in L
 
 | Name | Type | Description |
 |---|---|---|
-| _0 | address | undefined |
-| _1 | address | undefined |
-| _2 | uint256 | undefined |
-| _3 | bytes | undefined |
+| _from | address | The address of account who deposit ETH in L1. |
+| _to | address | The address of recipient in L2 to receive ETH. |
+| _amount | uint256 | The amount of ETH to deposit. |
+| _data | bytes | Optional data to forward to recipient's account. |
+
+### finalizeDropMessage
+
+```solidity
+function finalizeDropMessage() external payable
+```
+
+
+
+
+
 
 ### getERC20Gateway
 
@@ -175,7 +186,7 @@ Return the corresponding l2 token address given l1 token address.
 ### initialize
 
 ```solidity
-function initialize(address _ethGateway, address _defaultERC20Gateway) external nonpayable
+function initialize(address _defaultERC20Gateway, address _counterpart, address _messenger) external nonpayable
 ```
 
 
@@ -186,8 +197,26 @@ function initialize(address _ethGateway, address _defaultERC20Gateway) external
 
 | Name | Type | Description |
 |---|---|---|
-| _ethGateway | address | undefined |
 | _defaultERC20Gateway | address | undefined |
+| _counterpart | address | undefined |
+| _messenger | address | undefined |
+
+### messenger
+
+```solidity
+function messenger() external view returns (address)
+```
+
+The address of L1ScrollMessenger/L2ScrollMessenger contract.
+
+
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | address | undefined |
 
 ### owner
 
@@ -217,6 +246,23 @@ function renounceOwnership() external nonpayable
 *Leaves the contract without owner. It will not be possible to call `onlyOwner` functions anymore. Can only be called by the current owner. NOTE: Renouncing ownership will leave the contract without an owner, thereby removing any functionality that is only available to the owner.*
 
 
+### router
+
+```solidity
+function router() external view returns (address)
+```
+
+The address of L1GatewayRouter/L2GatewayRouter contract.
+
+
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | address | undefined |
+
 ### setDefaultERC20Gateway
 
 ```solidity
@@ -250,22 +296,6 @@ Update the mapping from token address to gateway address.
 | _tokens | address[] | The list of addresses of tokens to update. |
 | _gateways | address[] | The list of addresses of gateways to update. |
 
-### setETHGateway
-
-```solidity
-function setETHGateway(address _ethGateway) external nonpayable
-```
-
-Update the address of ETH gateway contract.
-
-*This function should only be called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _ethGateway | address | The address to update. |
-
 ### transferOwnership
 
 ```solidity
@@ -282,6 +312,23 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
+### version
+
+```solidity
+function version() external view returns (string)
+```
+
+the current contract version.
+
+
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | string | undefined |
+
 ### withdrawERC20
 
 ```solidity
@@ -296,9 +343,9 @@ Withdraw of some token to a caller's account on L1.
 
 | Name | Type | Description |
 |---|---|---|
-| _token | address | undefined |
-| _amount | uint256 | undefined |
-| _gasLimit | uint256 | undefined |
+| _token | address | The address of token in L2. |
+| _amount | uint256 | The amount of token to transfer. |
+| _gasLimit | uint256 | Unused, but included for potential forward compatibility considerations. |
 
 ### withdrawERC20
 
@@ -314,10 +361,10 @@ Withdraw of some token to a recipient's account on L1.
 
 | Name | Type | Description |
 |---|---|---|
-| _token | address | undefined |
-| _to | address | undefined |
-| _amount | uint256 | undefined |
-| _gasLimit | uint256 | undefined |
+| _token | address | The address of token in L2. |
+| _to | address | The address of recipient's account on L1. |
+| _amount | uint256 | The amount of token to transfer. |
+| _gasLimit | uint256 | Unused, but included for potential forward compatibility considerations. |
 
 ### withdrawERC20AndCall
 
@@ -333,16 +380,16 @@ Withdraw of some token to a recipient's account on L1 and call.
 
 | Name | Type | Description |
 |---|---|---|
-| _token | address | undefined |
-| _to | address | undefined |
-| _amount | uint256 | undefined |
-| _data | bytes | undefined |
-| _gasLimit | uint256 | undefined |
+| _token | address | The address of token in L2. |
+| _to | address | The address of recipient's account on L1. |
+| _amount | uint256 | The amount of token to transfer. |
+| _data | bytes | Optional data to forward to recipient's account. |
+| _gasLimit | uint256 | Unused, but included for potential forward compatibility considerations. |
 
 ### withdrawETH
 
 ```solidity
-function withdrawETH(address _to, uint256 _amount, uint256 _gasLimit) external payable
+function withdrawETH(address _to, uint256 _gasLimit) external payable
 ```
 
 Withdraw ETH to caller's account in L1.
@@ -353,14 +400,13 @@ Withdraw ETH to caller's account in L1.
 
 | Name | Type | Description |
 |---|---|---|
-| _to | address | undefined |
-| _amount | uint256 | undefined |
-| _gasLimit | uint256 | undefined |
+| _to | address | The address of recipient's account on L1. |
+| _gasLimit | uint256 | Gas limit required to complete the withdraw on L1. |
 
 ### withdrawETH
 
 ```solidity
-function withdrawETH(uint256 _amount, uint256 _gasLimit) external payable
+function withdrawETH(uint256 _gasLimit) external payable
 ```
 
 Withdraw ETH to caller's account in L1.
@@ -371,27 +417,7 @@ Withdraw ETH to caller's account in L1.
 
 | Name | Type | Description |
 |---|---|---|
-| _amount | uint256 | undefined |
-| _gasLimit | uint256 | undefined |
-
-### withdrawETHAndCall
-
-```solidity
-function withdrawETHAndCall(address _to, uint256 _amount, bytes _data, uint256 _gasLimit) external payable
-```
-
-Withdraw ETH to caller's account in L1.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _to | address | undefined |
-| _amount | uint256 | undefined |
-| _data | bytes | undefined |
-| _gasLimit | uint256 | undefined |
+| _gasLimit | uint256 | Gas limit required to complete the withdraw on L1. |
 
 
 
@@ -400,10 +426,10 @@ Withdraw ETH to caller's account in L1.
 ### FinalizeDepositERC20
 
 ```solidity
-event FinalizeDepositERC20(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256 amount, bytes data)
+event FinalizeDepositERC20(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256 _amount, bytes _data)
 ```
 
-Emitted when ERC20 token is deposited from L1 to L2 and transfer to recipient.
+
 
 
 
@@ -411,20 +437,20 @@ Emitted when ERC20 token is deposited from L1 to L2 and transfer to recipient.
 
 | Name | Type | Description |
 |---|---|---|
-| l1Token `indexed` | address | undefined |
-| l2Token `indexed` | address | undefined |
-| from `indexed` | address | undefined |
-| to  | address | undefined |
-| amount  | uint256 | undefined |
-| data  | bytes | undefined |
+| _l1Token `indexed` | address | undefined |
+| _l2Token `indexed` | address | undefined |
+| _from `indexed` | address | undefined |
+| _to  | address | undefined |
+| _amount  | uint256 | undefined |
+| _data  | bytes | undefined |
 
 ### FinalizeDepositETH
 
 ```solidity
-event FinalizeDepositETH(address indexed from, address indexed to, uint256 amount, bytes data)
+event FinalizeDepositETH(address indexed _from, address indexed _to, uint256 _amount, bytes _data)
 ```
 
-Emitted when ETH is deposited from L1 to L2 and transfer to recipient.
+
 
 
 
@@ -432,10 +458,10 @@ Emitted when ETH is deposited from L1 to L2 and transfer to recipient.
 
 | Name | Type | Description |
 |---|---|---|
-| from `indexed` | address | undefined |
-| to `indexed` | address | undefined |
-| amount  | uint256 | undefined |
-| data  | bytes | undefined |
+| _from `indexed` | address | undefined |
+| _to `indexed` | address | undefined |
+| _amount  | uint256 | undefined |
+| _data  | bytes | undefined |
 
 ### OwnershipTransferred
 
@@ -457,10 +483,10 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 ### SetDefaultERC20Gateway
 
 ```solidity
-event SetDefaultERC20Gateway(address indexed defaultERC20Gateway)
+event SetDefaultERC20Gateway(address indexed _defaultERC20Gateway)
 ```
 
-Emitted when the address of default ERC20 Gateway is updated.
+
 
 
 
@@ -468,15 +494,15 @@ Emitted when the address of default ERC20 Gateway is updated.
 
 | Name | Type | Description |
 |---|---|---|
-| defaultERC20Gateway `indexed` | address | undefined |
+| _defaultERC20Gateway `indexed` | address | undefined |
 
 ### SetERC20Gateway
 
 ```solidity
-event SetERC20Gateway(address indexed token, address indexed gateway)
+event SetERC20Gateway(address indexed _token, address indexed _gateway)
 ```
 
-Emitted when the `gateway` for `token` is updated.
+
 
 
 
@@ -484,32 +510,16 @@ Emitted when the `gateway` for `token` is updated.
 
 | Name | Type | Description |
 |---|---|---|
-| token `indexed` | address | undefined |
-| gateway `indexed` | address | undefined |
-
-### SetETHGateway
-
-```solidity
-event SetETHGateway(address indexed ethGateway)
-```
-
-Emitted when the address of ETH Gateway is updated.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| ethGateway `indexed` | address | undefined |
+| _token `indexed` | address | undefined |
+| _gateway `indexed` | address | undefined |
 
 ### WithdrawERC20
 
 ```solidity
-event WithdrawERC20(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256 amount, bytes data)
+event WithdrawERC20(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256 _amount, bytes _data)
 ```
 
-Emitted when someone withdraw ERC20 token from L2 to L1.
+
 
 
 
@@ -517,20 +527,20 @@ Emitted when someone withdraw ERC20 token from L2 to L1.
 
 | Name | Type | Description |
 |---|---|---|
-| l1Token `indexed` | address | undefined |
-| l2Token `indexed` | address | undefined |
-| from `indexed` | address | undefined |
-| to  | address | undefined |
-| amount  | uint256 | undefined |
-| data  | bytes | undefined |
+| _l1Token `indexed` | address | undefined |
+| _l2Token `indexed` | address | undefined |
+| _from `indexed` | address | undefined |
+| _to  | address | undefined |
+| _amount  | uint256 | undefined |
+| _data  | bytes | undefined |
 
 ### WithdrawETH
 
 ```solidity
-event WithdrawETH(address indexed from, address indexed to, uint256 amount, bytes data)
+event WithdrawETH(address indexed _from, address indexed _to, uint256 _amount, bytes _data)
 ```
 
-Emitted when someone withdraw ETH from L2 to L1.
+
 
 
 
@@ -538,10 +548,10 @@ Emitted when someone withdraw ETH from L2 to L1.
 
 | Name | Type | Description |
 |---|---|---|
-| from `indexed` | address | undefined |
-| to `indexed` | address | undefined |
-| amount  | uint256 | undefined |
-| data  | bytes | undefined |
+| _from `indexed` | address | undefined |
+| _to `indexed` | address | undefined |
+| _amount  | uint256 | undefined |
+| _data  | bytes | undefined |
 
 
 

contracts/docs/apis/L2ScrollMessenger.md

@@ -13,7 +13,7 @@ The `L2ScrollMessenger` contract can: 1. send messages from layer 2 to layer 1;
 ### blockContainer
 
 ```solidity
-function blockContainer() external view returns (address)
+function blockContainer() external view returns (contract IL1BlockContainer)
 ```
 
 The contract contains the list of L1 blocks.
@@ -25,15 +25,15 @@ The contract contains the list of L1 blocks.
 
 | Name | Type | Description |
 |---|---|---|
-| _0 | address | undefined |
+| _0 | contract IL1BlockContainer | undefined |
 
-### counterpart
+### dropDelayDuration
 
 ```solidity
-function counterpart() external view returns (address)
+function dropDelayDuration() external view returns (uint256)
 ```
 
-The address of counterpart ScrollMessenger contract in L1/L2.
+The amount of seconds needed to wait if we want to drop message.
 
 
 
@@ -42,24 +42,30 @@ The address of counterpart ScrollMessenger contract in L1/L2.
 
 | Name | Type | Description |
 |---|---|---|
-| _0 | address | undefined |
+| _0 | uint256 | undefined |
 
-### feeVault
+### dropMessage
 
 ```solidity
-function feeVault() external view returns (address)
+function dropMessage(address, address, uint256, uint256, uint256, uint256, bytes, uint256) external nonpayable
 ```
 
-The address of fee vault, collecting cross domain messaging fee.
 
 
 
 
-#### Returns
+#### Parameters
 
 | Name | Type | Description |
 |---|---|---|
 | _0 | address | undefined |
+| _1 | address | undefined |
+| _2 | uint256 | undefined |
+| _3 | uint256 | undefined |
+| _4 | uint256 | undefined |
+| _5 | uint256 | undefined |
+| _6 | bytes | undefined |
+| _7 | uint256 | undefined |
 
 ### gasOracle
 
@@ -67,7 +73,7 @@ The address of fee vault, collecting cross domain messaging fee.
 function gasOracle() external view returns (address)
 ```
 
-The address of L2MessageQueue.
+The gas oracle used to estimate transaction fee on layer 2.
 
 
 
@@ -78,30 +84,13 @@ The address of L2MessageQueue.
 |---|---|---|
 | _0 | address | undefined |
 
-### initialize
+### isMessageExecuted
 
 ```solidity
-function initialize(address _counterpart, address _feeVault) external nonpayable
+function isMessageExecuted(bytes32) external view returns (bool)
 ```
 
-
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _counterpart | address | undefined |
-| _feeVault | address | undefined |
-
-### isL1MessageExecuted
-
-```solidity
-function isL1MessageExecuted(bytes32) external view returns (bool)
-```
-
-Mapping from L1 message hash to a boolean value indicating if the message has been successfully executed.
+Mapping from message hash to execution status.
 
 
 
@@ -117,13 +106,13 @@ Mapping from L1 message hash to a boolean value indicating if the message has be
 |---|---|---|
 | _0 | bool | undefined |
 
-### isL2MessageSent
+### isMessageRelayed
 
 ```solidity
-function isL2MessageSent(bytes32) external view returns (bool)
+function isMessageRelayed(bytes32) external view returns (bool)
 ```
 
-Mapping from L2 message hash to sent status.
+Mapping from relay id to relay status.
 
 
 
@@ -139,52 +128,13 @@ Mapping from L2 message hash to sent status.
 |---|---|---|
 | _0 | bool | undefined |
 
-### l1MessageFailedTimes
-
-```solidity
-function l1MessageFailedTimes(bytes32) external view returns (uint256)
-```
-
-Mapping from L1 message hash to the number of failure times.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | bytes32 | undefined |
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | uint256 | undefined |
-
-### maxFailedExecutionTimes
-
-```solidity
-function maxFailedExecutionTimes() external view returns (uint256)
-```
-
-The maximum number of times each L1 message can fail on L2.
-
-
-
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | uint256 | undefined |
-
 ### messageQueue
 
 ```solidity
-function messageQueue() external view returns (address)
+function messageQueue() external view returns (contract L2MessageQueue)
 ```
 
-The address of L2MessageQueue.
+Contract to store the sent message.
 
 
 
@@ -193,7 +143,7 @@ The address of L2MessageQueue.
 
 | Name | Type | Description |
 |---|---|---|
-| _0 | address | undefined |
+| _0 | contract L2MessageQueue | undefined |
 
 ### owner
 
@@ -201,9 +151,9 @@ The address of L2MessageQueue.
 function owner() external view returns (address)
 ```
 
+The address of the current owner.
 
 
-*Returns the address of the current owner.*
 
 
 #### Returns
@@ -212,44 +162,16 @@ function owner() external view returns (address)
 |---|---|---|
 | _0 | address | undefined |
 
-### pause
+### relayMessageWithProof
 
 ```solidity
-function pause() external nonpayable
-```
-
-Pause the contract
-
-*This function can only called by contract owner.*
-
-
-### paused
-
-```solidity
-function paused() external view returns (bool)
+function relayMessageWithProof(address _from, address _to, uint256 _value, uint256 _fee, uint256 _deadline, uint256 _nonce, bytes _message, IL2ScrollMessenger.L1MessageProof _proof) external nonpayable
 ```
 
 
 
-*Returns true if the contract is paused, and false otherwise.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | bool | undefined |
-
-### relayMessage
-
-```solidity
-function relayMessage(address _from, address _to, uint256 _value, uint256 _nonce, bytes _message) external nonpayable
-```
-
-execute L1 => L2 message
-
-*Make sure this is only called by privileged accounts.*
-
 #### Parameters
 
 | Name | Type | Description |
@@ -257,8 +179,11 @@ execute L1 => L2 message
 | _from | address | undefined |
 | _to | address | undefined |
 | _value | uint256 | undefined |
+| _fee | uint256 | undefined |
+| _deadline | uint256 | undefined |
 | _nonce | uint256 | undefined |
 | _message | bytes | undefined |
+| _proof | IL2ScrollMessenger.L1MessageProof | undefined |
 
 ### renounceOwnership
 
@@ -266,39 +191,37 @@ execute L1 => L2 message
 function renounceOwnership() external nonpayable
 ```
 
+Leaves the contract without owner. It will not be possible to call `onlyOwner` functions anymore. Can only be called by the current owner.
 
+*Renouncing ownership will leave the contract without an owner, thereby removing any functionality that is only available to the owner.*
 
-*Leaves the contract without owner. It will not be possible to call `onlyOwner` functions anymore. Can only be called by the current owner. NOTE: Renouncing ownership will leave the contract without an owner, thereby removing any functionality that is only available to the owner.*
-
-
-### retryMessageWithProof
-
-```solidity
-function retryMessageWithProof(address _from, address _to, uint256 _value, uint256 _nonce, bytes _message, IL2ScrollMessenger.L1MessageProof _proof) external nonpayable
-```
-
-
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _from | address | undefined |
-| _to | address | undefined |
-| _value | uint256 | undefined |
-| _nonce | uint256 | undefined |
-| _message | bytes | undefined |
-| _proof | IL2ScrollMessenger.L1MessageProof | undefined |
 
 ### sendMessage
 
 ```solidity
-function sendMessage(address _to, uint256 _value, bytes _message, uint256 _gasLimit) external payable
+function sendMessage(address _to, uint256 _fee, bytes _message, uint256 _gasLimit) external payable
 ```
 
-Send cross chain message from L1 to L2 or L2 to L1.
+Send cross chain message (L1 => L2 or L2 => L1)
+
+*Currently, only privileged accounts can call this function for safty. And adding an extra `_fee` variable make it more easy to upgrade to decentralized version.*
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _to | address | The address of account who recieve the message. |
+| _fee | uint256 | The amount of fee in Ether the caller would like to pay to the relayer. |
+| _message | bytes | The content of the message. |
+| _gasLimit | uint256 | Unused, but included for potential forward compatibility considerations. |
+
+### setBlockContainer
+
+```solidity
+function setBlockContainer(address _blockContainer) external nonpayable
+```
+
+
 
 
 
@@ -306,34 +229,31 @@ Send cross chain message from L1 to L2 or L2 to L1.
 
 | Name | Type | Description |
 |---|---|---|
-| _to | address | undefined |
-| _value | uint256 | undefined |
-| _message | bytes | undefined |
-| _gasLimit | uint256 | undefined |
+| _blockContainer | address | undefined |
 
 ### transferOwnership
 
 ```solidity
-function transferOwnership(address newOwner) external nonpayable
+function transferOwnership(address _newOwner) external nonpayable
 ```
 
+Transfers ownership of the contract to a new account (`newOwner`). Can only be called by the current owner.
 
 
-*Transfers ownership of the contract to a new account (`newOwner`). Can only be called by the current owner.*
 
 #### Parameters
 
 | Name | Type | Description |
 |---|---|---|
-| newOwner | address | undefined |
+| _newOwner | address | undefined |
 
-### updateFeeVault
+### updateDropDelayDuration
 
 ```solidity
-function updateFeeVault(address _newFeeVault) external nonpayable
+function updateDropDelayDuration(uint256 _newDuration) external nonpayable
 ```
 
-Update fee vault contract.
+Update the drop delay duration.
 
 *This function can only called by contract owner.*
 
@@ -341,23 +261,23 @@ Update fee vault contract.
 
 | Name | Type | Description |
 |---|---|---|
-| _newFeeVault | address | The address of new fee vault contract. |
+| _newDuration | uint256 | The new delay duration to update. |
 
-### updateMaxFailedExecutionTimes
+### updateGasOracle
 
 ```solidity
-function updateMaxFailedExecutionTimes(uint256 _maxFailedExecutionTimes) external nonpayable
+function updateGasOracle(address _newGasOracle) external nonpayable
 ```
 
+Update the address of gas oracle.
 
-
-
+*This function can only called by contract owner.*
 
 #### Parameters
 
 | Name | Type | Description |
 |---|---|---|
-| _maxFailedExecutionTimes | uint256 | undefined |
+| _newGasOracle | address | The address to update. |
 
 ### updateWhitelist
 
@@ -375,53 +295,22 @@ Update whitelist contract.
 |---|---|---|
 | _newWhitelist | address | The address of new whitelist contract. |
 
-### verifyMessageExecutionStatus
+### version
 
 ```solidity
-function verifyMessageExecutionStatus(bytes32 _blockHash, bytes32 _msgHash, bytes _proof) external view returns (bool)
+function version() external view returns (string)
 ```
 
-Check whether the message is executed in the corresponding L1 block.
+the current contract version.
 
 
 
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _blockHash | bytes32 | The block hash where the message should in. |
-| _msgHash | bytes32 | The hash of the message to check. |
-| _proof | bytes | The encoded storage proof from eth_getProof. |
 
 #### Returns
 
 | Name | Type | Description |
 |---|---|---|
-| _0 | bool | bool Return true is the message is executed in L1, otherwise return false. |
-
-### verifyMessageInclusionStatus
-
-```solidity
-function verifyMessageInclusionStatus(bytes32 _blockHash, bytes32 _msgHash, bytes _proof) external view returns (bool)
-```
-
-Check whether the l1 message is included in the corresponding L1 block.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _blockHash | bytes32 | The block hash where the message should in. |
-| _msgHash | bytes32 | The hash of the message to check. |
-| _proof | bytes | The encoded storage proof from eth_getProof. |
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | bool | bool Return true is the message is included in L1, otherwise return false. |
+| _0 | string | undefined |
 
 ### whitelist
 
@@ -464,10 +353,10 @@ See {IScrollMessenger-xDomainMessageSender}
 ### FailedRelayedMessage
 
 ```solidity
-event FailedRelayedMessage(bytes32 indexed messageHash)
+event FailedRelayedMessage(bytes32 indexed msgHash)
 ```
 
-Emitted when a cross domain message is failed to relay.
+
 
 
 
@@ -475,15 +364,31 @@ Emitted when a cross domain message is failed to relay.
 
 | Name | Type | Description |
 |---|---|---|
-| messageHash `indexed` | bytes32 | undefined |
+| msgHash `indexed` | bytes32 | undefined |
+
+### MessageDropped
+
+```solidity
+event MessageDropped(bytes32 indexed msgHash)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| msgHash `indexed` | bytes32 | undefined |
 
 ### OwnershipTransferred
 
 ```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner)
+event OwnershipTransferred(address indexed _oldOwner, address indexed _newOwner)
 ```
 
-
+Emitted when owner is changed by current owner.
 
 
 
@@ -491,32 +396,16 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 
 | Name | Type | Description |
 |---|---|---|
-| previousOwner `indexed` | address | undefined |
-| newOwner `indexed` | address | undefined |
-
-### Paused
-
-```solidity
-event Paused(address account)
-```
-
-
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| account  | address | undefined |
+| _oldOwner `indexed` | address | undefined |
+| _newOwner `indexed` | address | undefined |
 
 ### RelayedMessage
 
 ```solidity
-event RelayedMessage(bytes32 indexed messageHash)
+event RelayedMessage(bytes32 indexed msgHash)
 ```
 
-Emitted when a cross domain message is relayed successfully.
+
 
 
 
@@ -524,15 +413,15 @@ Emitted when a cross domain message is relayed successfully.
 
 | Name | Type | Description |
 |---|---|---|
-| messageHash `indexed` | bytes32 | undefined |
+| msgHash `indexed` | bytes32 | undefined |
 
 ### SentMessage
 
 ```solidity
-event SentMessage(address indexed sender, address indexed target, uint256 value, uint256 messageNonce, uint256 gasLimit, bytes message)
+event SentMessage(address indexed target, address sender, uint256 value, uint256 fee, uint256 deadline, bytes message, uint256 messageNonce, uint256 gasLimit)
 ```
 
-Emitted when a cross domain message is sent.
+
 
 
 
@@ -540,20 +429,22 @@ Emitted when a cross domain message is sent.
 
 | Name | Type | Description |
 |---|---|---|
-| sender `indexed` | address | undefined |
 | target `indexed` | address | undefined |
+| sender  | address | undefined |
 | value  | uint256 | undefined |
+| fee  | uint256 | undefined |
+| deadline  | uint256 | undefined |
+| message  | bytes | undefined |
 | messageNonce  | uint256 | undefined |
 | gasLimit  | uint256 | undefined |
-| message  | bytes | undefined |
 
-### Unpaused
+### UpdateDropDelayDuration
 
 ```solidity
-event Unpaused(address account)
+event UpdateDropDelayDuration(uint256 _oldDuration, uint256 _newDuration)
 ```
 
-
+Emitted when owner updates drop delay duration
 
 
 
@@ -561,15 +452,16 @@ event Unpaused(address account)
 
 | Name | Type | Description |
 |---|---|---|
-| account  | address | undefined |
+| _oldDuration  | uint256 | undefined |
+| _newDuration  | uint256 | undefined |
 
-### UpdateFeeVault
+### UpdateGasOracle
 
 ```solidity
-event UpdateFeeVault(address _oldFeeVault, address _newFeeVault)
+event UpdateGasOracle(address _oldGasOracle, address _newGasOracle)
 ```
 
-Emitted when owner updates fee vault contract.
+Emitted when owner updates gas oracle contract.
 
 
 
@@ -577,24 +469,8 @@ Emitted when owner updates fee vault contract.
 
 | Name | Type | Description |
 |---|---|---|
-| _oldFeeVault  | address | undefined |
-| _newFeeVault  | address | undefined |
-
-### UpdateMaxFailedExecutionTimes
-
-```solidity
-event UpdateMaxFailedExecutionTimes(uint256 maxFailedExecutionTimes)
-```
-
-Emitted when the maximum number of times each message can fail in L2 is updated.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| maxFailedExecutionTimes  | uint256 | The new maximum number of times each message can fail in L2. |
+| _oldGasOracle  | address | undefined |
+| _newGasOracle  | address | undefined |
 
 ### UpdateWhitelist
 

contracts/docs/apis/L2StandardERC20Gateway.md

@@ -41,12 +41,23 @@ Complete a deposit from L1 to L2 and send fund to recipient's account in L2.
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token | address | undefined |
-| _l2Token | address | undefined |
-| _from | address | undefined |
-| _to | address | undefined |
-| _amount | uint256 | undefined |
-| _data | bytes | undefined |
+| _l1Token | address | The address of corresponding L1 token. |
+| _l2Token | address | The address of corresponding L2 token. |
+| _from | address | The address of account who deposits the token in L1. |
+| _to | address | The address of recipient in L2 to receive the token. |
+| _amount | uint256 | The amount of the token to deposit. |
+| _data | bytes | Optional data to forward to recipient's account. |
+
+### finalizeDropMessage
+
+```solidity
+function finalizeDropMessage() external payable
+```
+
+
+
+
+
 
 ### getL1ERC20Address
 
@@ -62,7 +73,7 @@ Return the corresponding l1 token address given l2 token address.
 
 | Name | Type | Description |
 |---|---|---|
-| _l2Token | address | undefined |
+| _l2Token | address | The address of l2 token. |
 
 #### Returns
 
@@ -84,7 +95,7 @@ Return the corresponding l2 token address given l1 token address.
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token | address | undefined |
+| _l1Token | address | The address of l1 token. |
 
 #### Returns
 
@@ -117,7 +128,7 @@ function initialize(address _counterpart, address _router, address _messenger, a
 function messenger() external view returns (address)
 ```
 
-The address of corresponding L1ScrollMessenger/L2ScrollMessenger contract.
+The address of L1ScrollMessenger/L2ScrollMessenger contract.
 
 
 
@@ -162,6 +173,23 @@ The address of ScrollStandardERC20Factory.
 |---|---|---|
 | _0 | address | undefined |
 
+### version
+
+```solidity
+function version() external view returns (string)
+```
+
+the current contract version.
+
+
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | string | undefined |
+
 ### withdrawERC20
 
 ```solidity
@@ -176,9 +204,9 @@ Withdraw of some token to a caller's account on L1.
 
 | Name | Type | Description |
 |---|---|---|
-| _token | address | undefined |
-| _amount | uint256 | undefined |
-| _gasLimit | uint256 | undefined |
+| _token | address | The address of token in L2. |
+| _amount | uint256 | The amount of token to transfer. |
+| _gasLimit | uint256 | Unused, but included for potential forward compatibility considerations. |
 
 ### withdrawERC20
 
@@ -194,10 +222,10 @@ Withdraw of some token to a recipient's account on L1.
 
 | Name | Type | Description |
 |---|---|---|
-| _token | address | undefined |
-| _to | address | undefined |
-| _amount | uint256 | undefined |
-| _gasLimit | uint256 | undefined |
+| _token | address | The address of token in L2. |
+| _to | address | The address of recipient's account on L1. |
+| _amount | uint256 | The amount of token to transfer. |
+| _gasLimit | uint256 | Unused, but included for potential forward compatibility considerations. |
 
 ### withdrawERC20AndCall
 
@@ -213,11 +241,11 @@ Withdraw of some token to a recipient's account on L1 and call.
 
 | Name | Type | Description |
 |---|---|---|
-| _token | address | undefined |
-| _to | address | undefined |
-| _amount | uint256 | undefined |
-| _data | bytes | undefined |
-| _gasLimit | uint256 | undefined |
+| _token | address | The address of token in L2. |
+| _to | address | The address of recipient's account on L1. |
+| _amount | uint256 | The amount of token to transfer. |
+| _data | bytes | Optional data to forward to recipient's account. |
+| _gasLimit | uint256 | Unused, but included for potential forward compatibility considerations. |
 
 
 
@@ -226,10 +254,10 @@ Withdraw of some token to a recipient's account on L1 and call.
 ### FinalizeDepositERC20
 
 ```solidity
-event FinalizeDepositERC20(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256 amount, bytes data)
+event FinalizeDepositERC20(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256 _amount, bytes _data)
 ```
 
-Emitted when ERC20 token is deposited from L1 to L2 and transfer to recipient.
+
 
 
 
@@ -237,20 +265,20 @@ Emitted when ERC20 token is deposited from L1 to L2 and transfer to recipient.
 
 | Name | Type | Description |
 |---|---|---|
-| l1Token `indexed` | address | undefined |
-| l2Token `indexed` | address | undefined |
-| from `indexed` | address | undefined |
-| to  | address | undefined |
-| amount  | uint256 | undefined |
-| data  | bytes | undefined |
+| _l1Token `indexed` | address | undefined |
+| _l2Token `indexed` | address | undefined |
+| _from `indexed` | address | undefined |
+| _to  | address | undefined |
+| _amount  | uint256 | undefined |
+| _data  | bytes | undefined |
 
 ### WithdrawERC20
 
 ```solidity
-event WithdrawERC20(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256 amount, bytes data)
+event WithdrawERC20(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256 _amount, bytes _data)
 ```
 
-Emitted when someone withdraw ERC20 token from L2 to L1.
+
 
 
 
@@ -258,12 +286,12 @@ Emitted when someone withdraw ERC20 token from L2 to L1.
 
 | Name | Type | Description |
 |---|---|---|
-| l1Token `indexed` | address | undefined |
-| l2Token `indexed` | address | undefined |
-| from `indexed` | address | undefined |
-| to  | address | undefined |
-| amount  | uint256 | undefined |
-| data  | bytes | undefined |
+| _l1Token `indexed` | address | undefined |
+| _l2Token `indexed` | address | undefined |
+| _from `indexed` | address | undefined |
+| _to  | address | undefined |
+| _amount  | uint256 | undefined |
+| _data  | bytes | undefined |
 
 
 

contracts/docs/apis/L2WETHGateway.md

@@ -58,12 +58,23 @@ Complete a deposit from L1 to L2 and send fund to recipient's account in L2.
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token | address | undefined |
-| _l2Token | address | undefined |
-| _from | address | undefined |
-| _to | address | undefined |
-| _amount | uint256 | undefined |
-| _data | bytes | undefined |
+| _l1Token | address | The address of corresponding L1 token. |
+| _l2Token | address | The address of corresponding L2 token. |
+| _from | address | The address of account who deposits the token in L1. |
+| _to | address | The address of recipient in L2 to receive the token. |
+| _amount | uint256 | The amount of the token to deposit. |
+| _data | bytes | Optional data to forward to recipient's account. |
+
+### finalizeDropMessage
+
+```solidity
+function finalizeDropMessage() external payable
+```
+
+
+
+
+
 
 ### getL1ERC20Address
 
@@ -112,7 +123,7 @@ Return the corresponding l2 token address given l1 token address.
 ### initialize
 
 ```solidity
-function initialize(address _counterpart, address _router, address _messenger) external nonpayable
+function initialize(address _counterpart, address _router, address _messenger, address _WETH, address _l1WETH) external nonpayable
 ```
 
 
@@ -126,6 +137,8 @@ function initialize(address _counterpart, address _router, address _messenger) e
 | _counterpart | address | undefined |
 | _router | address | undefined |
 | _messenger | address | undefined |
+| _WETH | address | undefined |
+| _l1WETH | address | undefined |
 
 ### l1WETH
 
@@ -150,7 +163,7 @@ The address of L1 WETH address.
 function messenger() external view returns (address)
 ```
 
-The address of corresponding L1ScrollMessenger/L2ScrollMessenger contract.
+The address of L1ScrollMessenger/L2ScrollMessenger contract.
 
 
 
@@ -178,6 +191,23 @@ The address of L1GatewayRouter/L2GatewayRouter contract.
 |---|---|---|
 | _0 | address | undefined |
 
+### version
+
+```solidity
+function version() external view returns (string)
+```
+
+the current contract version.
+
+
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | string | undefined |
+
 ### withdrawERC20
 
 ```solidity
@@ -192,9 +222,9 @@ Withdraw of some token to a caller's account on L1.
 
 | Name | Type | Description |
 |---|---|---|
-| _token | address | undefined |
-| _amount | uint256 | undefined |
-| _gasLimit | uint256 | undefined |
+| _token | address | The address of token in L2. |
+| _amount | uint256 | The amount of token to transfer. |
+| _gasLimit | uint256 | Unused, but included for potential forward compatibility considerations. |
 
 ### withdrawERC20
 
@@ -210,10 +240,10 @@ Withdraw of some token to a recipient's account on L1.
 
 | Name | Type | Description |
 |---|---|---|
-| _token | address | undefined |
-| _to | address | undefined |
-| _amount | uint256 | undefined |
-| _gasLimit | uint256 | undefined |
+| _token | address | The address of token in L2. |
+| _to | address | The address of recipient's account on L1. |
+| _amount | uint256 | The amount of token to transfer. |
+| _gasLimit | uint256 | Unused, but included for potential forward compatibility considerations. |
 
 ### withdrawERC20AndCall
 
@@ -229,11 +259,11 @@ Withdraw of some token to a recipient's account on L1 and call.
 
 | Name | Type | Description |
 |---|---|---|
-| _token | address | undefined |
-| _to | address | undefined |
-| _amount | uint256 | undefined |
-| _data | bytes | undefined |
-| _gasLimit | uint256 | undefined |
+| _token | address | The address of token in L2. |
+| _to | address | The address of recipient's account on L1. |
+| _amount | uint256 | The amount of token to transfer. |
+| _data | bytes | Optional data to forward to recipient's account. |
+| _gasLimit | uint256 | Unused, but included for potential forward compatibility considerations. |
 
 
 
@@ -242,10 +272,10 @@ Withdraw of some token to a recipient's account on L1 and call.
 ### FinalizeDepositERC20
 
 ```solidity
-event FinalizeDepositERC20(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256 amount, bytes data)
+event FinalizeDepositERC20(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256 _amount, bytes _data)
 ```
 
-Emitted when ERC20 token is deposited from L1 to L2 and transfer to recipient.
+
 
 
 
@@ -253,20 +283,20 @@ Emitted when ERC20 token is deposited from L1 to L2 and transfer to recipient.
 
 | Name | Type | Description |
 |---|---|---|
-| l1Token `indexed` | address | undefined |
-| l2Token `indexed` | address | undefined |
-| from `indexed` | address | undefined |
-| to  | address | undefined |
-| amount  | uint256 | undefined |
-| data  | bytes | undefined |
+| _l1Token `indexed` | address | undefined |
+| _l2Token `indexed` | address | undefined |
+| _from `indexed` | address | undefined |
+| _to  | address | undefined |
+| _amount  | uint256 | undefined |
+| _data  | bytes | undefined |
 
 ### WithdrawERC20
 
 ```solidity
-event WithdrawERC20(address indexed l1Token, address indexed l2Token, address indexed from, address to, uint256 amount, bytes data)
+event WithdrawERC20(address indexed _l1Token, address indexed _l2Token, address indexed _from, address _to, uint256 _amount, bytes _data)
 ```
 
-Emitted when someone withdraw ERC20 token from L2 to L1.
+
 
 
 
@@ -274,12 +304,12 @@ Emitted when someone withdraw ERC20 token from L2 to L1.
 
 | Name | Type | Description |
 |---|---|---|
-| l1Token `indexed` | address | undefined |
-| l2Token `indexed` | address | undefined |
-| from `indexed` | address | undefined |
-| to  | address | undefined |
-| amount  | uint256 | undefined |
-| data  | bytes | undefined |
+| _l1Token `indexed` | address | undefined |
+| _l2Token `indexed` | address | undefined |
+| _from `indexed` | address | undefined |
+| _to  | address | undefined |
+| _amount  | uint256 | undefined |
+| _data  | bytes | undefined |
 
 
 

contracts/docs/apis/ZKRollup.md

@@ -0,0 +1,477 @@
+# ZKRollup
+
+
+
+> ZKRollup
+
+This contract maintains essential data for zk rollup, including: 1. a list of pending messages, which will be relayed to layer 2; 2. the block tree generated by layer 2 and it's status.
+
+*the message queue is not used yet, the offline relayer only use events in `L1ScrollMessenger`.*
+
+## Methods
+
+### batches
+
+```solidity
+function batches(bytes32) external view returns (bytes32 batchHash, bytes32 parentHash, uint64 batchIndex, bool verified)
+```
+
+Mapping from batch id to batch struct.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | bytes32 | undefined |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| batchHash | bytes32 | undefined |
+| parentHash | bytes32 | undefined |
+| batchIndex | uint64 | undefined |
+| verified | bool | undefined |
+
+### blocks
+
+```solidity
+function blocks(bytes32) external view returns (bytes32 parentHash, bytes32 transactionRoot, uint64 blockHeight, uint64 batchIndex, bytes32 messageRoot)
+```
+
+Mapping from block hash to block struct.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | bytes32 | undefined |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| parentHash | bytes32 | undefined |
+| transactionRoot | bytes32 | undefined |
+| blockHeight | uint64 | undefined |
+| batchIndex | uint64 | undefined |
+| messageRoot | bytes32 | undefined |
+
+### commitBatch
+
+```solidity
+function commitBatch(IZKRollup.Layer2Batch _batch) external nonpayable
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _batch | IZKRollup.Layer2Batch | undefined |
+
+### finalizeBatchWithProof
+
+```solidity
+function finalizeBatchWithProof(bytes32 _batchId, uint256[] _proof, uint256[] _instances) external nonpayable
+```
+
+finalize commited batch in layer 1
+
+*will add more parameters if needed.*
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _batchId | bytes32 | The identification of the commited batch. |
+| _proof | uint256[] | The corresponding proof of the commited batch. |
+| _instances | uint256[] | Instance used to verify, generated from batch. |
+
+### finalizedBatches
+
+```solidity
+function finalizedBatches(uint256) external view returns (bytes32)
+```
+
+Mapping from batch index to finalized batch id.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | uint256 | undefined |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | bytes32 | undefined |
+
+### getL2MessageRoot
+
+```solidity
+function getL2MessageRoot(bytes32 _blockHash) external view returns (bytes32)
+```
+
+Return the merkle root of L2 message tree.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _blockHash | bytes32 | undefined |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | bytes32 | undefined |
+
+### importGenesisBlock
+
+```solidity
+function importGenesisBlock(IZKRollup.Layer2BlockHeader _genesis) external nonpayable
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _genesis | IZKRollup.Layer2BlockHeader | undefined |
+
+### initialize
+
+```solidity
+function initialize(uint256 _chainId) external nonpayable
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _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
+function lastFinalizedBatchID() external view returns (bytes32)
+```
+
+The latest finalized batch id.
+
+
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | bytes32 | undefined |
+
+### layer2ChainId
+
+```solidity
+function layer2ChainId() external view returns (uint256)
+```
+
+The chain id of the corresponding layer 2 chain.
+
+
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | uint256 | undefined |
+
+### layer2GasLimit
+
+```solidity
+function layer2GasLimit(uint256) external view returns (uint256)
+```
+
+Return the layer 2 block gas limit.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | uint256 | undefined |
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | uint256 | undefined |
+
+### operator
+
+```solidity
+function operator() external view returns (address)
+```
+
+The address of operator.
+
+
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | address | undefined |
+
+### owner
+
+```solidity
+function owner() external view returns (address)
+```
+
+
+
+*Returns the address of the current owner.*
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | address | undefined |
+
+### renounceOwnership
+
+```solidity
+function renounceOwnership() external nonpayable
+```
+
+
+
+*Leaves the contract without owner. It will not be possible to call `onlyOwner` functions anymore. Can only be called by the current owner. NOTE: Renouncing ownership will leave the contract without an owner, thereby removing any functionality that is only available to the owner.*
+
+
+### revertBatch
+
+```solidity
+function revertBatch(bytes32 _batchId) external nonpayable
+```
+
+revert a pending batch.
+
+*one can only revert unfinalized batches.*
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _batchId | bytes32 | The identification of the batch. |
+
+### transferOwnership
+
+```solidity
+function transferOwnership(address newOwner) external nonpayable
+```
+
+
+
+*Transfers ownership of the contract to a new account (`newOwner`). Can only be called by the current owner.*
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| newOwner | address | undefined |
+
+### updateOperator
+
+```solidity
+function updateOperator(address _newOperator) external nonpayable
+```
+
+Update the address of operator.
+
+*This function can only called by contract owner.*
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _newOperator | address | The new operator address to update. |
+
+### version
+
+```solidity
+function version() external view returns (string)
+```
+
+the current contract version.
+
+
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | string | undefined |
+
+
+
+## Events
+
+### CommitBatch
+
+```solidity
+event CommitBatch(bytes32 indexed _batchId, bytes32 _batchHash, uint256 _batchIndex, bytes32 _parentHash)
+```
+
+Emitted when a new batch is commited.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _batchId `indexed` | bytes32 | undefined |
+| _batchHash  | bytes32 | undefined |
+| _batchIndex  | uint256 | undefined |
+| _parentHash  | bytes32 | undefined |
+
+### FinalizeBatch
+
+```solidity
+event FinalizeBatch(bytes32 indexed _batchId, bytes32 _batchHash, uint256 _batchIndex, bytes32 _parentHash)
+```
+
+Emitted when a batch is finalized.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _batchId `indexed` | bytes32 | undefined |
+| _batchHash  | bytes32 | undefined |
+| _batchIndex  | uint256 | undefined |
+| _parentHash  | bytes32 | undefined |
+
+### OwnershipTransferred
+
+```solidity
+event OwnershipTransferred(address indexed previousOwner, address indexed newOwner)
+```
+
+
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| previousOwner `indexed` | address | undefined |
+| newOwner `indexed` | address | undefined |
+
+### RevertBatch
+
+```solidity
+event RevertBatch(bytes32 indexed _batchId)
+```
+
+Emitted when a batch is reverted.
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _batchId `indexed` | bytes32 | undefined |
+
+### UpdateOperator
+
+```solidity
+event UpdateOperator(address _oldOperator, address _newOperator)
+```
+
+Emitted when owner updates address of operator
+
+
+
+#### Parameters
+
+| Name | Type | Description |
+|---|---|---|
+| _oldOperator  | address | The address of old operator. |
+| _newOperator  | address | The address of new operator. |
+
+
+

contracts/hardhat.config.ts

@@ -116,6 +116,7 @@ const config: HardhatUserConfig = {
       "IL2ERC1155Gateway",
       "IScrollStandardERC20Factory",
       "IZKRollup",
+      "MockL1ScrollMessenger",
       "WETH9",
     ],
   },

contracts/integration-test/ERC20Gateway.spec.ts

@@ -0,0 +1,996 @@
+/* eslint-disable node/no-unpublished-import */
+/* eslint-disable node/no-missing-import */
+import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
+import { expect } from "chai";
+import { constants } from "ethers";
+import { concat, keccak256 } from "ethers/lib/utils";
+import { ethers } from "hardhat";
+import {
+  ZKRollup,
+  MockL1ScrollMessenger,
+  L2ScrollMessenger,
+  L1StandardERC20Gateway,
+  L2StandardERC20Gateway,
+  MockERC20,
+  ScrollStandardERC20Factory,
+  ScrollStandardERC20,
+  L1WETHGateway,
+  L2WETHGateway,
+  WETH9,
+  L2MessageQueue,
+  L1MessageQueue,
+} from "../typechain";
+
+describe("ERC20Gateway", async () => {
+  const layer1GasLimit = 12345;
+  const layer2GasLimit = 54321;
+  const DROP_DELAY_DURATION = 86400 * 7;
+
+  let deployer: SignerWithAddress;
+  let alice: SignerWithAddress;
+  let bob: SignerWithAddress;
+  let router: SignerWithAddress;
+
+  let rollup: ZKRollup;
+  let l1Messenger: MockL1ScrollMessenger;
+  let l2Messenger: L2ScrollMessenger;
+  let l1MessageQueue: L1MessageQueue;
+  let l2MessageQueue: L2MessageQueue;
+
+  beforeEach(async () => {
+    [deployer, alice, bob, router] = await ethers.getSigners();
+
+    const RollupVerifier = await ethers.getContractFactory("RollupVerifier", deployer);
+    const verifier = await RollupVerifier.deploy();
+    await verifier.deployed();
+
+    // deploy ZKRollup in layer 1
+    const ZKRollup = await ethers.getContractFactory("ZKRollup", {
+      signer: deployer,
+      libraries: { RollupVerifier: verifier.address },
+    });
+    rollup = (await ZKRollup.deploy()) as ZKRollup;
+    await rollup.initialize(233);
+    await rollup.importGenesisBlock({
+      blockHash: keccak256(constants.HashZero),
+      parentHash: constants.HashZero,
+      baseFee: 0,
+      stateRoot: constants.HashZero,
+      blockHeight: 0,
+      gasUsed: 0,
+      timestamp: 0,
+      extraData: "0x",
+      txs: [],
+      messageRoot: constants.HashZero,
+    });
+
+    // deploy MockL1ScrollMessenger in layer 1
+    const MockL1ScrollMessenger = await ethers.getContractFactory("MockL1ScrollMessenger", deployer);
+    l1Messenger = await MockL1ScrollMessenger.deploy();
+    await l1Messenger.initialize(rollup.address);
+    await rollup.updateOperator(deployer.address);
+
+    // deploy L2ScrollMessenger in layer 2
+    const L2ScrollMessenger = await ethers.getContractFactory("L2ScrollMessenger", deployer);
+    l2Messenger = await L2ScrollMessenger.deploy(deployer.address);
+
+    l1MessageQueue = await ethers.getContractAt("L1MessageQueue", await l1Messenger.messageQueue(), deployer);
+    l2MessageQueue = await ethers.getContractAt("L2MessageQueue", await l2Messenger.messageQueue(), deployer);
+  });
+
+  context("StandardERC20Gateway", async () => {
+    let l1Gateway: L1StandardERC20Gateway;
+    let l2Gateway: L2StandardERC20Gateway;
+
+    let factory: ScrollStandardERC20Factory;
+
+    beforeEach(async () => {
+      // deploy token template in layer 2
+      const ScrollStandardERC20 = await ethers.getContractFactory("ScrollStandardERC20", deployer);
+      const tokenImpl = await ScrollStandardERC20.deploy();
+
+      // deploy token factory in layer 2
+      const ScrollStandardERC20Factory = await ethers.getContractFactory("ScrollStandardERC20Factory", deployer);
+      factory = await ScrollStandardERC20Factory.deploy(tokenImpl.address);
+
+      // deploy gateway in layer 1
+      const L1StandardERC20Gateway = await ethers.getContractFactory("L1StandardERC20Gateway", deployer);
+      l1Gateway = await L1StandardERC20Gateway.deploy();
+
+      // deploy gateway in layer 2
+      const L2StandardERC20Gateway = await ethers.getContractFactory("L2StandardERC20Gateway", deployer);
+      l2Gateway = await L2StandardERC20Gateway.deploy();
+
+      // initialize gateway in layer 1
+      await l1Gateway.initialize(
+        l2Gateway.address,
+        router.address,
+        l1Messenger.address,
+        tokenImpl.address,
+        factory.address
+      );
+
+      // initialize gateway in layer 2
+      await l2Gateway.initialize(l1Gateway.address, router.address, l2Messenger.address, factory.address);
+
+      await factory.transferOwnership(l2Gateway.address);
+    });
+
+    const run1to2 = async (decimals: number, sendToSelf: boolean) => {
+      context(`layer 1 to layer 2: decimals[${decimals}], sendToSelf[${sendToSelf}]`, async () => {
+        let l1Token: MockERC20;
+        let l2Token: ScrollStandardERC20;
+        let recipient: SignerWithAddress;
+
+        const amount1 = ethers.utils.parseUnits("1000", decimals);
+        const amount2 = ethers.utils.parseUnits("100", decimals);
+
+        beforeEach(async () => {
+          recipient = sendToSelf ? alice : bob;
+
+          // deploy mock token in layer 1
+          const MockERC20 = await ethers.getContractFactory("MockERC20", deployer);
+          l1Token = await MockERC20.deploy("XYZ", "ZYX", decimals);
+          await l1Token.mint(alice.address, amount1.add(amount2));
+
+          // calculate l2 token address
+          l2Token = await ethers.getContractAt(
+            "ScrollStandardERC20",
+            await l2Gateway.getL2ERC20Address(l1Token.address),
+            deployer
+          );
+        });
+
+        it("should succeed, when transfer on the first time", async () => {
+          // 1. approve
+          await l1Token.connect(alice).approve(l1Gateway.address, amount1);
+
+          // 2. do deposit
+          const nonce = await l1MessageQueue.nextMessageIndex();
+          const beforeBalanceLayer1 = await l1Token.balanceOf(l1Gateway.address);
+          const depositTx = sendToSelf
+            ? await l1Gateway
+                .connect(alice)
+                ["depositERC20(address,uint256,uint256)"](l1Token.address, amount1, layer1GasLimit)
+            : await l1Gateway
+                .connect(alice)
+                ["depositERC20(address,address,uint256,uint256)"](
+                  l1Token.address,
+                  recipient.address,
+                  amount1,
+                  layer1GasLimit
+                );
+          await depositTx.wait();
+          const afterBalanceLayer1 = await l1Token.balanceOf(l1Gateway.address);
+          // should emit DepositERC20
+          await expect(depositTx)
+            .to.emit(l1Gateway, "DepositERC20")
+            .withArgs(l1Token.address, l2Token.address, alice.address, recipient.address, amount1, "0x");
+          // should emit SentMessage
+          const symbol = await l1Token.symbol();
+          const name = await l1Token.name();
+          const deployData = ethers.utils.defaultAbiCoder.encode(
+            ["string", "string", "uint8"],
+            [symbol, name, decimals]
+          );
+          const deadline = (await ethers.provider.getBlock("latest")).timestamp + DROP_DELAY_DURATION;
+          const messageData = l2Gateway.interface.encodeFunctionData("finalizeDepositERC20", [
+            l1Token.address,
+            l2Token.address,
+            alice.address,
+            recipient.address,
+            amount1,
+            ethers.utils.defaultAbiCoder.encode(["bytes", "bytes"], ["0x", deployData]),
+          ]);
+          await expect(depositTx)
+            .to.emit(l1Messenger, "SentMessage")
+            .withArgs(l2Gateway.address, l1Gateway.address, 0, 0, deadline, messageData, nonce, layer1GasLimit);
+          // should transfer token in gateway
+          expect(afterBalanceLayer1.sub(beforeBalanceLayer1)).to.eq(amount1);
+
+          // 3. do relay in layer 2
+          const beforeBalanceLayer2 = constants.Zero;
+          const relayTx = await l2Messenger.relayMessageWithProof(
+            l1Gateway.address,
+            l2Gateway.address,
+            0,
+            0,
+            deadline,
+            nonce,
+            messageData,
+            {
+              blockHash: constants.HashZero,
+              stateRootProof: "0x",
+            }
+          );
+          await relayTx.wait();
+          const afterBalanceLayer2 = await l2Token.balanceOf(recipient.address);
+          // should emit RelayedMessage
+          await expect(relayTx).to.emit(l2Messenger, "RelayedMessage");
+          // should emit FinalizeDepositERC20
+          await expect(relayTx)
+            .to.emit(l2Gateway, "FinalizeDepositERC20")
+            .withArgs(l1Token.address, l2Token.address, alice.address, recipient.address, amount1, "0x");
+          // should deploy token in layer 2
+          expect(await l2Token.symbol()).to.eq(symbol);
+          expect(await l2Token.name()).to.eq(name);
+          expect(await l2Token.decimals()).to.eq(decimals);
+          // should mint in layer 2
+          expect(afterBalanceLayer2.sub(beforeBalanceLayer2)).to.eq(amount1);
+        });
+
+        it("should succeed, when transfer on the second time", async () => {
+          // 1. approve first time
+          await l1Token.connect(alice).approve(l1Gateway.address, amount1);
+
+          // 2. do deposit first time
+          const nonce1 = await l1MessageQueue.nextMessageIndex();
+          let beforeBalanceLayer1 = await l1Token.balanceOf(l1Gateway.address);
+          const depositTx1 = sendToSelf
+            ? await l1Gateway
+                .connect(alice)
+                ["depositERC20(address,uint256,uint256)"](l1Token.address, amount1, layer1GasLimit)
+            : await l1Gateway
+                .connect(alice)
+                ["depositERC20(address,address,uint256,uint256)"](
+                  l1Token.address,
+                  recipient.address,
+                  amount1,
+                  layer1GasLimit
+                );
+          await depositTx1.wait();
+          let afterBalanceLayer1 = await l1Token.balanceOf(l1Gateway.address);
+          const symbol = await l1Token.symbol();
+          const name = await l1Token.name();
+          const deployData = ethers.utils.defaultAbiCoder.encode(
+            ["string", "string", "uint8"],
+            [symbol, name, decimals]
+          );
+          const deadline1 = (await ethers.provider.getBlock("latest")).timestamp + DROP_DELAY_DURATION;
+          const messageData1 = l2Gateway.interface.encodeFunctionData("finalizeDepositERC20", [
+            l1Token.address,
+            l2Token.address,
+            alice.address,
+            recipient.address,
+            amount1,
+            ethers.utils.defaultAbiCoder.encode(["bytes", "bytes"], ["0x", deployData]),
+          ]);
+          // should transfer token in gateway
+          expect(afterBalanceLayer1.sub(beforeBalanceLayer1)).to.eq(amount1);
+
+          // 3. do relay in layer 2 first time
+          let beforeBalanceLayer2 = constants.Zero;
+          const relayTx1 = await l2Messenger.relayMessageWithProof(
+            l1Gateway.address,
+            l2Gateway.address,
+            0,
+            0,
+            deadline1,
+            nonce1,
+            messageData1,
+            {
+              blockHash: constants.HashZero,
+              stateRootProof: "0x",
+            }
+          );
+          await relayTx1.wait();
+          let afterBalanceLayer2 = await l2Token.balanceOf(recipient.address);
+          expect(afterBalanceLayer2.sub(beforeBalanceLayer2)).to.eq(amount1);
+
+          // 4. approve second time
+          await l1Token.connect(alice).approve(l1Gateway.address, amount2);
+
+          // 5. do deposit second time
+          const calldata = "0x000033";
+          const nonce2 = await l1MessageQueue.nextMessageIndex();
+          beforeBalanceLayer1 = await l1Token.balanceOf(l1Gateway.address);
+          const depositTx2 = await l1Gateway
+            .connect(alice)
+            .depositERC20AndCall(l1Token.address, recipient.address, amount2, calldata, layer1GasLimit);
+          await depositTx2.wait();
+          afterBalanceLayer1 = await l1Token.balanceOf(l1Gateway.address);
+          // should emit DepositERC20
+          await expect(depositTx2)
+            .to.emit(l1Gateway, "DepositERC20")
+            .withArgs(l1Token.address, l2Token.address, alice.address, recipient.address, amount2, calldata);
+          // should emit SentMessage
+          const deadline2 = (await ethers.provider.getBlock("latest")).timestamp + DROP_DELAY_DURATION;
+          const messageData2 = l2Gateway.interface.encodeFunctionData("finalizeDepositERC20", [
+            l1Token.address,
+            l2Token.address,
+            alice.address,
+            recipient.address,
+            amount2,
+            calldata,
+          ]);
+          await expect(depositTx2)
+            .to.emit(l1Messenger, "SentMessage")
+            .withArgs(l2Gateway.address, l1Gateway.address, 0, 0, deadline2, messageData2, nonce2, layer1GasLimit);
+          // should transfer token in gateway
+          expect(afterBalanceLayer1.sub(beforeBalanceLayer1)).to.eq(amount2);
+
+          // 3. do relay in layer 2
+          beforeBalanceLayer2 = await l2Token.balanceOf(recipient.address);
+          const relayTx2 = await l2Messenger.relayMessageWithProof(
+            l1Gateway.address,
+            l2Gateway.address,
+            0,
+            0,
+            deadline2,
+            nonce2,
+            messageData2,
+            {
+              blockHash: constants.HashZero,
+              stateRootProof: "0x",
+            }
+          );
+          await relayTx2.wait();
+          afterBalanceLayer2 = await l2Token.balanceOf(recipient.address);
+          // should emit RelayedMessage
+          await expect(relayTx2).to.emit(l2Messenger, "RelayedMessage");
+          // should emit FinalizeDepositERC20
+          await expect(relayTx2)
+            .to.emit(l2Gateway, "FinalizeDepositERC20")
+            .withArgs(l1Token.address, l2Token.address, alice.address, recipient.address, amount2, calldata);
+          // should mint in layer 2
+          expect(afterBalanceLayer2.sub(beforeBalanceLayer2)).to.eq(amount2);
+        });
+      });
+    };
+
+    const run2to1 = async (decimals: number, sendToSelf: boolean) => {
+      context(`layer 2 to layer 1: decimals[${decimals}], sendToSelf[${sendToSelf}]`, async () => {
+        let l1Token: MockERC20;
+        let l2Token: ScrollStandardERC20;
+        let recipient: SignerWithAddress;
+
+        const amount = ethers.utils.parseUnits("1000", decimals);
+
+        beforeEach(async () => {
+          recipient = sendToSelf ? alice : bob;
+
+          // deploy mock token in layer 1
+          const MockERC20 = await ethers.getContractFactory("MockERC20", deployer);
+          l1Token = await MockERC20.deploy("XYZ", "ZYX", decimals);
+          await l1Token.mint(alice.address, amount);
+
+          // calculate l2 token address
+          l2Token = await ethers.getContractAt(
+            "ScrollStandardERC20",
+            await l2Gateway.getL2ERC20Address(l1Token.address),
+            deployer
+          );
+
+          await l1Token.connect(alice).approve(l1Gateway.address, constants.MaxUint256);
+          const depositTx = await l1Gateway
+            .connect(alice)
+            ["depositERC20(address,uint256,uint256)"](l1Token.address, amount, layer1GasLimit);
+          await depositTx.wait();
+          const symbol = await l1Token.symbol();
+          const name = await l1Token.name();
+          const deployData = ethers.utils.defaultAbiCoder.encode(
+            ["string", "string", "uint8"],
+            [symbol, name, decimals]
+          );
+          const deadline = (await ethers.provider.getBlock("latest")).timestamp + DROP_DELAY_DURATION;
+          const nonce = await l1MessageQueue.nextMessageIndex();
+          const messageData = l2Gateway.interface.encodeFunctionData("finalizeDepositERC20", [
+            l1Token.address,
+            l2Token.address,
+            alice.address,
+            alice.address,
+            amount,
+            ethers.utils.defaultAbiCoder.encode(["bytes", "bytes"], ["0x", deployData]),
+          ]);
+          const relayTx = await l2Messenger.relayMessageWithProof(
+            l1Gateway.address,
+            l2Gateway.address,
+            0,
+            0,
+            deadline,
+            nonce,
+            messageData,
+            {
+              blockHash: constants.HashZero,
+              stateRootProof: "0x",
+            }
+          );
+          await relayTx.wait();
+
+          expect(await l2Token.balanceOf(alice.address)).to.eq(amount);
+        });
+
+        it("should succeed, when transfer without data", async () => {
+          // 1. approve
+          await l2Token.connect(alice).approve(l2Gateway.address, amount);
+
+          // 2. withdraw
+          const nonce = await l2MessageQueue.nextMessageIndex();
+          const balanceBefore = await l2Token.balanceOf(alice.address);
+          const withdrawTx = sendToSelf
+            ? await l2Gateway
+                .connect(alice)
+                ["withdrawERC20(address,uint256,uint256)"](l2Token.address, amount, layer2GasLimit)
+            : await l2Gateway
+                .connect(alice)
+                ["withdrawERC20(address,address,uint256,uint256)"](
+                  l2Token.address,
+                  recipient.address,
+                  amount,
+                  layer2GasLimit
+                );
+          await withdrawTx.wait();
+          const deadline = (await ethers.provider.getBlock("latest")).timestamp + DROP_DELAY_DURATION;
+          const balanceAfter = await l2Token.balanceOf(alice.address);
+          // should emit WithdrawERC20
+          await expect(withdrawTx)
+            .to.emit(l2Gateway, "WithdrawERC20")
+            .withArgs(l1Token.address, l2Token.address, alice.address, recipient.address, amount, "0x");
+          // should emit SentMessage
+          const messageData = l1Gateway.interface.encodeFunctionData("finalizeWithdrawERC20", [
+            l1Token.address,
+            l2Token.address,
+            alice.address,
+            recipient.address,
+            amount,
+            "0x",
+          ]);
+
+          const messageHash = keccak256(
+            concat([
+              l2Gateway.address,
+              l1Gateway.address,
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [0]),
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [0]),
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [deadline]),
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [nonce]),
+              messageData,
+            ])
+          );
+          await expect(withdrawTx)
+            .to.emit(l2Messenger, "SentMessage")
+            .withArgs(l1Gateway.address, l2Gateway.address, 0, 0, deadline, messageData, nonce, layer2GasLimit)
+            .to.emit(l2MessageQueue, "AppendMessage")
+            .withArgs(0, messageHash);
+          // should transfer from alice
+          expect(balanceBefore.sub(balanceAfter)).to.eq(amount);
+
+          // 3. import block to rollup contract
+          const blockHash = (await ethers.provider.getBlock("latest")).hash;
+          await rollup.commitBatch({
+            batchIndex: 1,
+            parentHash: keccak256(constants.HashZero),
+            blocks: [
+              {
+                blockHash,
+                parentHash: keccak256(constants.HashZero),
+                baseFee: 0,
+                stateRoot: constants.HashZero,
+                blockHeight: 1,
+                gasUsed: 0,
+                timestamp: 0,
+                extraData: [],
+                txs: [],
+                messageRoot: await l2MessageQueue.messageRoot(),
+              },
+            ],
+          });
+
+          // 4. relay in layer 1
+          const relayTx = await l1Messenger.relayMessageWithProof(
+            l2Gateway.address,
+            l1Gateway.address,
+            0,
+            0,
+            deadline,
+            nonce,
+            messageData,
+            { blockHash, messageRootProof: [] }
+          );
+          await relayTx.wait();
+          // should emit RelayedMessage
+          await expect(relayTx).to.emit(l1Messenger, "RelayedMessage");
+          // should emit FinalizeWithdrawERC20
+          await expect(relayTx)
+            .to.emit(l1Gateway, "FinalizeWithdrawERC20")
+            .withArgs(l1Token.address, l2Token.address, alice.address, recipient.address, amount, "0x");
+          // should transfer out
+          expect(await l1Token.balanceOf(l1Gateway.address)).to.eq(0);
+          expect(await l1Token.balanceOf(recipient.address)).to.eq(amount);
+        });
+
+        it("should succeed, when transfer with data", async () => {
+          const calldata = "0x3d4233433232";
+          // 1. approve
+          await l2Token.connect(alice).approve(l2Gateway.address, amount);
+
+          // 2. withdraw
+          const nonce = await l2MessageQueue.nextMessageIndex();
+          const withdrawTx = await l2Gateway
+            .connect(alice)
+            .withdrawERC20AndCall(l2Token.address, recipient.address, amount, calldata, layer2GasLimit);
+          await withdrawTx.wait();
+          const deadline = (await ethers.provider.getBlock("latest")).timestamp + DROP_DELAY_DURATION;
+          // should emit WithdrawERC20
+          await expect(withdrawTx)
+            .to.emit(l2Gateway, "WithdrawERC20")
+            .withArgs(l1Token.address, l2Token.address, alice.address, recipient.address, amount, calldata);
+          // should emit SentMessage
+          const messageData = l1Gateway.interface.encodeFunctionData("finalizeWithdrawERC20", [
+            l1Token.address,
+            l2Token.address,
+            alice.address,
+            recipient.address,
+            amount,
+            calldata,
+          ]);
+          const messageHash = keccak256(
+            concat([
+              l2Gateway.address,
+              l1Gateway.address,
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [0]),
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [0]),
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [deadline]),
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [nonce]),
+              messageData,
+            ])
+          );
+          await expect(withdrawTx)
+            .to.emit(l2Messenger, "SentMessage")
+            .withArgs(l1Gateway.address, l2Gateway.address, 0, 0, deadline, messageData, nonce, layer2GasLimit)
+            .to.emit(l2MessageQueue, "AppendMessage")
+            .withArgs(0, messageHash);
+
+          // 3. import block to rollup contract
+          const blockHash = (await ethers.provider.getBlock("latest")).hash;
+          await rollup.commitBatch({
+            batchIndex: 1,
+            parentHash: keccak256(constants.HashZero),
+            blocks: [
+              {
+                blockHash,
+                parentHash: keccak256(constants.HashZero),
+                baseFee: 0,
+                stateRoot: constants.HashZero,
+                blockHeight: 1,
+                gasUsed: 0,
+                timestamp: 0,
+                extraData: [],
+                txs: [],
+                messageRoot: await l2MessageQueue.messageRoot(),
+              },
+            ],
+          });
+
+          // 4. relay in layer 1
+          const relayTx = await l1Messenger.relayMessageWithProof(
+            l2Gateway.address,
+            l1Gateway.address,
+            0,
+            0,
+            deadline,
+            nonce,
+            messageData,
+            { blockHash, messageRootProof: [] }
+          );
+          await relayTx.wait();
+          // should emit RelayedMessage
+          await expect(relayTx).to.emit(l1Messenger, "RelayedMessage");
+          // should emit FinalizeWithdrawERC20
+          await expect(relayTx)
+            .to.emit(l1Gateway, "FinalizeWithdrawERC20")
+            .withArgs(l1Token.address, l2Token.address, alice.address, recipient.address, amount, calldata);
+          // should transfer out
+          expect(await l1Token.balanceOf(l1Gateway.address)).to.eq(0);
+          expect(await l1Token.balanceOf(recipient.address)).to.eq(amount);
+        });
+      });
+    };
+
+    for (const decimals of [6, 18, 24]) {
+      for (const sendToSelf of [true, false]) {
+        run1to2(decimals, sendToSelf);
+        run2to1(decimals, sendToSelf);
+      }
+    }
+  });
+
+  context("WETHGateway", async () => {
+    let l1Gateway: L1WETHGateway;
+    let l2Gateway: L2WETHGateway;
+    let l1WETH: WETH9;
+    let l2WETH: WETH9;
+
+    beforeEach(async () => {
+      // deploy weth in layer 1 and layer 2
+      const WETH9 = await ethers.getContractFactory("WETH9", deployer);
+      l1WETH = await WETH9.deploy();
+      l2WETH = await WETH9.deploy();
+
+      // deploy gateway in layer 1
+      const L1WETHGateway = await ethers.getContractFactory("L1WETHGateway", deployer);
+      l1Gateway = await L1WETHGateway.deploy();
+
+      // deploy gateway in layer 2
+      const L2WETHGateway = await ethers.getContractFactory("L2WETHGateway", deployer);
+      l2Gateway = await L2WETHGateway.deploy();
+
+      // initialize gateway in layer 1
+      await l1Gateway.initialize(
+        l2Gateway.address,
+        router.address,
+        l1Messenger.address,
+        l1WETH.address,
+        l2WETH.address
+      );
+
+      // initialize gateway in layer 2
+      await l2Gateway.initialize(
+        l1Gateway.address,
+        router.address,
+        l2Messenger.address,
+        l2WETH.address,
+        l1WETH.address
+      );
+    });
+
+    const run1to2 = async (sendToSelf: boolean) => {
+      context(`layer 1 to layer 2: sendToSelf[${sendToSelf}]`, async () => {
+        const amount = ethers.utils.parseEther("100");
+        let recipient: SignerWithAddress;
+
+        beforeEach(async () => {
+          recipient = sendToSelf ? alice : bob;
+
+          if ((await ethers.provider.getBalance(l2Messenger.address)).eq(constants.Zero)) {
+            await deployer.sendTransaction({ to: l2Messenger.address, value: amount });
+            await l1WETH.connect(alice).deposit({ value: amount });
+          }
+
+          expect(await ethers.provider.getBalance(l2Messenger.address)).to.eq(amount);
+        });
+
+        it("should transfer to layer 2 without data", async () => {
+          // 1. deposit and approve
+          await l1WETH.connect(alice).approve(l1Gateway.address, amount);
+
+          // 2. do deposit
+          const nonce = await l1MessageQueue.nextMessageIndex();
+          const beforeBalanceLayer1 = await ethers.provider.getBalance(l1Messenger.address);
+          const depositTx = sendToSelf
+            ? await l1Gateway
+                .connect(alice)
+                ["depositERC20(address,uint256,uint256)"](l1WETH.address, amount, layer1GasLimit)
+            : await l1Gateway
+                .connect(alice)
+                ["depositERC20(address,address,uint256,uint256)"](
+                  l1WETH.address,
+                  recipient.address,
+                  amount,
+                  layer1GasLimit
+                );
+          await depositTx.wait();
+          const afterBalanceLayer1 = await ethers.provider.getBalance(l1Messenger.address);
+          // should emit DepositERC20
+          await expect(depositTx)
+            .to.emit(l1Gateway, "DepositERC20")
+            .withArgs(l1WETH.address, l2WETH.address, alice.address, recipient.address, amount, "0x");
+          // should emit SentMessage
+          const deadline = (await ethers.provider.getBlock("latest")).timestamp + DROP_DELAY_DURATION;
+          const messageData = l2Gateway.interface.encodeFunctionData("finalizeDepositERC20", [
+            l1WETH.address,
+            l2WETH.address,
+            alice.address,
+            recipient.address,
+            amount,
+            "0x",
+          ]);
+          await expect(depositTx)
+            .to.emit(l1Messenger, "SentMessage")
+            .withArgs(l2Gateway.address, l1Gateway.address, amount, 0, deadline, messageData, nonce, layer1GasLimit);
+          // should unwrap transfer to messenger
+          expect(afterBalanceLayer1.sub(beforeBalanceLayer1)).to.eq(amount);
+
+          // 3. do relay in layer 2
+          const beforeBalanceLayer2 = await l2WETH.balanceOf(recipient.address);
+          const relayTx = await l2Messenger.relayMessageWithProof(
+            l1Gateway.address,
+            l2Gateway.address,
+            amount,
+            0,
+            deadline,
+            nonce,
+            messageData,
+            {
+              blockHash: constants.HashZero,
+              stateRootProof: "0x",
+            }
+          );
+          await relayTx.wait();
+          const afterBalanceLayer2 = await l2WETH.balanceOf(recipient.address);
+          // should emit RelayedMessage
+          await expect(relayTx).to.emit(l2Messenger, "RelayedMessage");
+          // should emit FinalizeDepositERC20
+          await expect(relayTx)
+            .to.emit(l2Gateway, "FinalizeDepositERC20")
+            .withArgs(l1WETH.address, l2WETH.address, alice.address, recipient.address, amount, "0x");
+          // should transfer and wrap weth in layer 2
+          expect(afterBalanceLayer2.sub(beforeBalanceLayer2)).to.eq(amount);
+          expect(await ethers.provider.getBalance(l2Messenger.address)).to.eq(constants.Zero);
+        });
+
+        it("should transfer to layer 2 data", async () => {
+          const calldata = "0x3333444555fdad";
+          // 1. deposit and approve
+          await l1WETH.connect(alice).approve(l1Gateway.address, amount);
+
+          // 2. do deposit
+          const nonce = await l1MessageQueue.nextMessageIndex();
+          const beforeBalanceLayer1 = await ethers.provider.getBalance(l1Messenger.address);
+          const depositTx = await l1Gateway
+            .connect(alice)
+            .depositERC20AndCall(l1WETH.address, recipient.address, amount, calldata, layer1GasLimit);
+          await depositTx.wait();
+          const afterBalanceLayer1 = await ethers.provider.getBalance(l1Messenger.address);
+          // should emit DepositERC20
+          await expect(depositTx)
+            .to.emit(l1Gateway, "DepositERC20")
+            .withArgs(l1WETH.address, l2WETH.address, alice.address, recipient.address, amount, calldata);
+          // should emit SentMessage
+          const deadline = (await ethers.provider.getBlock("latest")).timestamp + DROP_DELAY_DURATION;
+          const messageData = l2Gateway.interface.encodeFunctionData("finalizeDepositERC20", [
+            l1WETH.address,
+            l2WETH.address,
+            alice.address,
+            recipient.address,
+            amount,
+            calldata,
+          ]);
+          await expect(depositTx)
+            .to.emit(l1Messenger, "SentMessage")
+            .withArgs(l2Gateway.address, l1Gateway.address, amount, 0, deadline, messageData, nonce, layer1GasLimit);
+          // should unwrap transfer to messenger
+          expect(afterBalanceLayer1.sub(beforeBalanceLayer1)).to.eq(amount);
+
+          // 3. do relay in layer 2
+          const beforeBalanceLayer2 = await l2WETH.balanceOf(recipient.address);
+          const relayTx = await l2Messenger.relayMessageWithProof(
+            l1Gateway.address,
+            l2Gateway.address,
+            amount,
+            0,
+            deadline,
+            nonce,
+            messageData,
+            {
+              blockHash: constants.HashZero,
+              stateRootProof: "0x",
+            }
+          );
+          await relayTx.wait();
+          const afterBalanceLayer2 = await l2WETH.balanceOf(recipient.address);
+          // should emit RelayedMessage
+          await expect(relayTx).to.emit(l2Messenger, "RelayedMessage");
+          // should emit FinalizeDepositERC20
+          await expect(relayTx)
+            .to.emit(l2Gateway, "FinalizeDepositERC20")
+            .withArgs(l1WETH.address, l2WETH.address, alice.address, recipient.address, amount, calldata);
+          // should transfer and wrap weth in layer 2
+          expect(afterBalanceLayer2.sub(beforeBalanceLayer2)).to.eq(amount);
+          expect(await ethers.provider.getBalance(l2Messenger.address)).to.eq(constants.Zero);
+        });
+      });
+    };
+
+    const run2to1 = async (sendToSelf: boolean) => {
+      context(`layer 2 to layer 1: sendToSelf[${sendToSelf}]`, async () => {
+        const amount = ethers.utils.parseEther("100");
+        let recipient: SignerWithAddress;
+
+        beforeEach(async () => {
+          recipient = sendToSelf ? alice : bob;
+          await l1WETH.connect(alice).deposit({ value: amount });
+          await l1WETH.connect(alice).approve(l1Gateway.address, amount);
+          await l1Gateway.connect(alice)["depositERC20(address,uint256,uint256)"](l1WETH.address, amount, 0);
+          await l2WETH.connect(alice).deposit({ value: amount });
+        });
+
+        it("should transfer to layer 1 without data", async () => {
+          // 1. approve
+          await l2WETH.connect(alice).approve(l2Gateway.address, amount);
+
+          // 2. do withdraw in layer 2
+          const nonce = await l2MessageQueue.nextMessageIndex();
+          const beforeBalanceLayer2 = await ethers.provider.getBalance(l2Messenger.address);
+          const withdrawTx = sendToSelf
+            ? await l2Gateway
+                .connect(alice)
+                ["withdrawERC20(address,uint256,uint256)"](l2WETH.address, amount, layer2GasLimit)
+            : await l2Gateway
+                .connect(alice)
+                ["withdrawERC20(address,address,uint256,uint256)"](
+                  l2WETH.address,
+                  recipient.address,
+                  amount,
+                  layer2GasLimit
+                );
+          await withdrawTx.wait();
+          const afterBalanceLayer2 = await ethers.provider.getBalance(l2Messenger.address);
+          // should emit WithdrawERC20
+          await expect(withdrawTx)
+            .to.emit(l2Gateway, "WithdrawERC20")
+            .withArgs(l1WETH.address, l2WETH.address, alice.address, recipient.address, amount, "0x");
+          // should emit SentMessage
+          const deadline = (await ethers.provider.getBlock("latest")).timestamp + DROP_DELAY_DURATION;
+          const messageData = l1Gateway.interface.encodeFunctionData("finalizeWithdrawERC20", [
+            l1WETH.address,
+            l2WETH.address,
+            alice.address,
+            recipient.address,
+            amount,
+            "0x",
+          ]);
+          const messageHash = keccak256(
+            concat([
+              l2Gateway.address,
+              l1Gateway.address,
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [amount]),
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [0]),
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [deadline]),
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [nonce]),
+              messageData,
+            ])
+          );
+          await expect(withdrawTx)
+            .to.emit(l2Messenger, "SentMessage")
+            .withArgs(l1Gateway.address, l2Gateway.address, amount, 0, deadline, messageData, nonce, layer2GasLimit)
+            .to.emit(l2MessageQueue, "AppendMessage")
+            .withArgs(0, messageHash);
+          // should unwrap transfer to messenger
+          expect(afterBalanceLayer2.sub(beforeBalanceLayer2)).to.eq(amount);
+
+          // 3. import block to rollup contract
+          const blockHash = (await ethers.provider.getBlock("latest")).hash;
+          await rollup.commitBatch({
+            batchIndex: 1,
+            parentHash: keccak256(constants.HashZero),
+            blocks: [
+              {
+                blockHash,
+                parentHash: keccak256(constants.HashZero),
+                baseFee: 0,
+                stateRoot: constants.HashZero,
+                blockHeight: 1,
+                gasUsed: 0,
+                timestamp: 0,
+                extraData: [],
+                txs: [],
+                messageRoot: await l2MessageQueue.messageRoot(),
+              },
+            ],
+          });
+
+          // 4. do relay in layer 1
+          const beforeBalanceLayer1 = await l1WETH.balanceOf(recipient.address);
+          const relayTx = await l1Messenger.relayMessageWithProof(
+            l2Gateway.address,
+            l1Gateway.address,
+            amount,
+            0,
+            deadline,
+            nonce,
+            messageData,
+            { blockHash, messageRootProof: [] }
+          );
+          await relayTx.wait();
+          const afterBalanceLayer1 = await l1WETH.balanceOf(recipient.address);
+          // should emit RelayedMessage
+          await expect(relayTx).to.emit(l1Messenger, "RelayedMessage");
+          // should emit FinalizeWithdrawERC20
+          await expect(relayTx)
+            .to.emit(l1Gateway, "FinalizeWithdrawERC20")
+            .withArgs(l1WETH.address, l2WETH.address, alice.address, recipient.address, amount, "0x");
+          // should transfer and wrap weth in layer 1
+          expect(afterBalanceLayer1.sub(beforeBalanceLayer1)).to.eq(amount);
+        });
+
+        it("should transfer to layer 1 with data", async () => {
+          const calldata = "0x33445566778899";
+          // 1. approve
+          await l2WETH.connect(alice).approve(l2Gateway.address, amount);
+
+          // 2. do withdraw in layer 2
+          const nonce = await l2MessageQueue.nextMessageIndex();
+          const beforeBalanceLayer2 = await ethers.provider.getBalance(l2Messenger.address);
+          const withdrawTx = await l2Gateway
+            .connect(alice)
+            .withdrawERC20AndCall(l2WETH.address, recipient.address, amount, calldata, layer2GasLimit);
+          await withdrawTx.wait();
+          const afterBalanceLayer2 = await ethers.provider.getBalance(l2Messenger.address);
+          // should emit WithdrawERC20
+          await expect(withdrawTx)
+            .to.emit(l2Gateway, "WithdrawERC20")
+            .withArgs(l1WETH.address, l2WETH.address, alice.address, recipient.address, amount, calldata);
+          // should emit SentMessage
+          const deadline = (await ethers.provider.getBlock("latest")).timestamp + DROP_DELAY_DURATION;
+          const messageData = l1Gateway.interface.encodeFunctionData("finalizeWithdrawERC20", [
+            l1WETH.address,
+            l2WETH.address,
+            alice.address,
+            recipient.address,
+            amount,
+            calldata,
+          ]);
+
+          const messageHash = keccak256(
+            concat([
+              l2Gateway.address,
+              l1Gateway.address,
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [amount]),
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [0]),
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [deadline]),
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [nonce]),
+              messageData,
+            ])
+          );
+          await expect(withdrawTx)
+            .to.emit(l2Messenger, "SentMessage")
+            .withArgs(l1Gateway.address, l2Gateway.address, amount, 0, deadline, messageData, nonce, layer2GasLimit)
+            .to.emit(l2MessageQueue, "AppendMessage")
+            .withArgs(0, messageHash);
+          // should unwrap transfer to messenger
+          expect(afterBalanceLayer2.sub(beforeBalanceLayer2)).to.eq(amount);
+
+          // 3. import block to rollup contract
+          const blockHash = (await ethers.provider.getBlock("latest")).hash;
+          await rollup.commitBatch({
+            batchIndex: 1,
+            parentHash: keccak256(constants.HashZero),
+            blocks: [
+              {
+                blockHash,
+                parentHash: keccak256(constants.HashZero),
+                baseFee: 0,
+                stateRoot: constants.HashZero,
+                blockHeight: 1,
+                gasUsed: 0,
+                timestamp: 0,
+                extraData: [],
+                txs: [],
+                messageRoot: await l2MessageQueue.messageRoot(),
+              },
+            ],
+          });
+
+          // 4. do relay in layer 1
+          const beforeBalanceLayer1 = await l1WETH.balanceOf(recipient.address);
+          const relayTx = await l1Messenger.relayMessageWithProof(
+            l2Gateway.address,
+            l1Gateway.address,
+            amount,
+            0,
+            deadline,
+            nonce,
+            messageData,
+            { blockHash, messageRootProof: [] }
+          );
+          await relayTx.wait();
+          const afterBalanceLayer1 = await l1WETH.balanceOf(recipient.address);
+          // should emit RelayedMessage
+          await expect(relayTx).to.emit(l1Messenger, "RelayedMessage");
+          // should emit FinalizeWithdrawERC20
+          await expect(relayTx)
+            .to.emit(l1Gateway, "FinalizeWithdrawERC20")
+            .withArgs(l1WETH.address, l2WETH.address, alice.address, recipient.address, amount, calldata);
+          // should transfer and wrap weth in layer 1
+          expect(afterBalanceLayer1.sub(beforeBalanceLayer1)).to.eq(amount);
+        });
+      });
+    };
+
+    for (const sendToSelf of [true, false]) {
+      run1to2(sendToSelf);
+      run2to1(sendToSelf);
+    }
+  });
+});

contracts/integration-test/GatewayRouter.spec.ts

@@ -0,0 +1,269 @@
+/* eslint-disable node/no-unpublished-import */
+/* eslint-disable node/no-missing-import */
+import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
+import { expect } from "chai";
+import { constants } from "ethers";
+import { concat, keccak256 } from "ethers/lib/utils";
+import { ethers } from "hardhat";
+import {
+  ZKRollup,
+  MockL1ScrollMessenger,
+  L2ScrollMessenger,
+  L1GatewayRouter,
+  L2GatewayRouter,
+  L2MessageQueue,
+  L1MessageQueue,
+} from "../typechain";
+
+describe("GatewayRouter", async () => {
+  const layer1GasLimit = 12345;
+  const layer2GasLimit = 54321;
+  const DROP_DELAY_DURATION = 86400 * 7;
+
+  let deployer: SignerWithAddress;
+  let alice: SignerWithAddress;
+  let bob: SignerWithAddress;
+
+  let rollup: ZKRollup;
+  let l1Messenger: MockL1ScrollMessenger;
+  let l2Messenger: L2ScrollMessenger;
+  let l1MessageQueue: L1MessageQueue;
+  let l2MessageQueue: L2MessageQueue;
+
+  beforeEach(async () => {
+    [deployer, alice, bob] = await ethers.getSigners();
+
+    const RollupVerifier = await ethers.getContractFactory("RollupVerifier", deployer);
+    const verifier = await RollupVerifier.deploy();
+    await verifier.deployed();
+
+    // deploy ZKRollup in layer 1
+    const ZKRollup = await ethers.getContractFactory("ZKRollup", {
+      signer: deployer,
+      libraries: { RollupVerifier: verifier.address },
+    });
+    rollup = (await ZKRollup.deploy()) as ZKRollup;
+    await rollup.initialize(233);
+    await rollup.importGenesisBlock({
+      blockHash: keccak256(constants.HashZero),
+      parentHash: constants.HashZero,
+      baseFee: 0,
+      stateRoot: constants.HashZero,
+      blockHeight: 0,
+      gasUsed: 0,
+      timestamp: 0,
+      extraData: "0x",
+      txs: [],
+      messageRoot: constants.HashZero,
+    });
+
+    // deploy MockL1ScrollMessenger in layer 1
+    const MockL1ScrollMessenger = await ethers.getContractFactory("MockL1ScrollMessenger", deployer);
+    l1Messenger = await MockL1ScrollMessenger.deploy();
+    await l1Messenger.initialize(rollup.address);
+    await rollup.updateOperator(deployer.address);
+
+    // deploy L2ScrollMessenger in layer 2
+    const L2ScrollMessenger = await ethers.getContractFactory("L2ScrollMessenger", deployer);
+    l2Messenger = await L2ScrollMessenger.deploy(deployer.address);
+
+    l1MessageQueue = await ethers.getContractAt("L1MessageQueue", await l1Messenger.messageQueue(), deployer);
+    l2MessageQueue = await ethers.getContractAt("L2MessageQueue", await l2Messenger.messageQueue(), deployer);
+  });
+
+  context("WETHGateway", async () => {
+    let l1Gateway: L1GatewayRouter;
+    let l2Gateway: L2GatewayRouter;
+
+    beforeEach(async () => {
+      // deploy gateway in layer 1
+      const L1GatewayRouter = await ethers.getContractFactory("L1GatewayRouter", deployer);
+      l1Gateway = await L1GatewayRouter.deploy();
+
+      // deploy gateway in layer 2
+      const L2GatewayRouter = await ethers.getContractFactory("L2GatewayRouter", deployer);
+      l2Gateway = await L2GatewayRouter.deploy();
+
+      // initialize gateway in layer 1
+      await l1Gateway.initialize(constants.AddressZero, l2Gateway.address, l1Messenger.address);
+
+      // initialize gateway in layer 2
+      await l2Gateway.initialize(constants.AddressZero, l1Gateway.address, l2Messenger.address);
+    });
+
+    const run1to2 = async (sendToSelf: boolean) => {
+      context(`layer 1 to layer 2: sendToSelf[${sendToSelf}]`, async () => {
+        const amount = ethers.utils.parseEther("100");
+        let recipient: SignerWithAddress;
+
+        beforeEach(async () => {
+          recipient = sendToSelf ? alice : bob;
+
+          if ((await ethers.provider.getBalance(l2Messenger.address)).eq(constants.Zero)) {
+            await deployer.sendTransaction({ to: l2Messenger.address, value: amount });
+          }
+
+          expect(await ethers.provider.getBalance(l2Messenger.address)).to.eq(amount);
+        });
+
+        it("should transfer to layer 2 without data", async () => {
+          // 2. do deposit
+          const nonce = await l1MessageQueue.nextMessageIndex();
+          const beforeBalanceLayer1 = await ethers.provider.getBalance(l1Messenger.address);
+          const depositTx = sendToSelf
+            ? await l1Gateway.connect(alice)["depositETH(uint256)"](layer1GasLimit, { value: amount })
+            : await l1Gateway
+                .connect(alice)
+                ["depositETH(address,uint256)"](recipient.address, layer1GasLimit, { value: amount });
+          await depositTx.wait();
+          const afterBalanceLayer1 = await ethers.provider.getBalance(l1Messenger.address);
+          // should emit DepositETH
+          await expect(depositTx)
+            .to.emit(l1Gateway, "DepositETH")
+            .withArgs(alice.address, recipient.address, amount, "0x");
+          // should emit SentMessage
+          const deadline = (await ethers.provider.getBlock("latest")).timestamp + DROP_DELAY_DURATION;
+          const messageData = l2Gateway.interface.encodeFunctionData("finalizeDepositETH", [
+            alice.address,
+            recipient.address,
+            amount,
+            "0x",
+          ]);
+          await expect(depositTx)
+            .to.emit(l1Messenger, "SentMessage")
+            .withArgs(l2Gateway.address, l1Gateway.address, amount, 0, deadline, messageData, nonce, layer1GasLimit);
+          // should unwrap transfer to messenger
+          expect(afterBalanceLayer1.sub(beforeBalanceLayer1)).to.eq(amount);
+
+          // 3. do relay in layer 2
+          const beforeBalanceLayer2 = await ethers.provider.getBalance(recipient.address);
+          const relayTx = await l2Messenger.relayMessageWithProof(
+            l1Gateway.address,
+            l2Gateway.address,
+            amount,
+            0,
+            deadline,
+            nonce,
+            messageData,
+            { blockHash: constants.HashZero, stateRootProof: "0x" }
+          );
+          await relayTx.wait();
+          const afterBalanceLayer2 = await ethers.provider.getBalance(recipient.address);
+          // should emit RelayedMessage
+          await expect(relayTx).to.emit(l2Messenger, "RelayedMessage");
+          // should emit FinalizeDepositETH
+          await expect(relayTx)
+            .to.emit(l2Gateway, "FinalizeDepositETH")
+            .withArgs(alice.address, recipient.address, amount, "0x");
+          // should transfer and wrap weth in layer 2
+          expect(afterBalanceLayer2.sub(beforeBalanceLayer2)).to.eq(amount);
+          expect(await ethers.provider.getBalance(l2Messenger.address)).to.eq(constants.Zero);
+        });
+      });
+    };
+
+    const run2to1 = async (sendToSelf: boolean) => {
+      context(`layer 2 to layer 1: sendToSelf[${sendToSelf}]`, async () => {
+        const amount = ethers.utils.parseEther("100");
+        let recipient: SignerWithAddress;
+
+        beforeEach(async () => {
+          recipient = sendToSelf ? alice : bob;
+          await l1Gateway["depositETH(uint256)"](layer1GasLimit, { value: amount });
+        });
+
+        it("should transfer to layer 1 without data", async () => {
+          // 2. do withdraw in layer 2
+          const nonce = await l2MessageQueue.nextMessageIndex();
+          const beforeBalanceLayer2 = await ethers.provider.getBalance(l2Messenger.address);
+          const withdrawTx = sendToSelf
+            ? await l2Gateway.connect(alice)["withdrawETH(uint256)"](layer2GasLimit, { value: amount })
+            : await l2Gateway
+                .connect(alice)
+                ["withdrawETH(address,uint256)"](recipient.address, layer2GasLimit, { value: amount });
+          await withdrawTx.wait();
+          const afterBalanceLayer2 = await ethers.provider.getBalance(l2Messenger.address);
+          // should emit WithdrawETH
+          await expect(withdrawTx)
+            .to.emit(l2Gateway, "WithdrawETH")
+            .withArgs(alice.address, recipient.address, amount, "0x");
+          // should emit SentMessage
+          const deadline = (await ethers.provider.getBlock("latest")).timestamp + DROP_DELAY_DURATION;
+          const messageData = l1Gateway.interface.encodeFunctionData("finalizeWithdrawETH", [
+            alice.address,
+            recipient.address,
+            amount,
+            "0x",
+          ]);
+          const messageHash = keccak256(
+            concat([
+              l2Gateway.address,
+              l1Gateway.address,
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [amount]),
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [0]),
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [deadline]),
+              ethers.utils.defaultAbiCoder.encode(["uint256"], [nonce]),
+              messageData,
+            ])
+          );
+          await expect(withdrawTx)
+            .to.emit(l2Messenger, "SentMessage")
+            .withArgs(l1Gateway.address, l2Gateway.address, amount, 0, deadline, messageData, nonce, layer2GasLimit)
+            .to.emit(l2MessageQueue, "AppendMessage")
+            .withArgs(0, messageHash);
+          // should unwrap transfer to messenger
+          expect(afterBalanceLayer2.sub(beforeBalanceLayer2)).to.eq(amount);
+
+          // 3. import block to rollup contract
+          const blockHash = (await ethers.provider.getBlock("latest")).hash;
+          await rollup.commitBatch({
+            batchIndex: 1,
+            parentHash: keccak256(constants.HashZero),
+            blocks: [
+              {
+                blockHash,
+                parentHash: keccak256(constants.HashZero),
+                baseFee: 0,
+                stateRoot: constants.HashZero,
+                blockHeight: 1,
+                gasUsed: 0,
+                timestamp: 0,
+                extraData: [],
+                txs: [],
+                messageRoot: await l2MessageQueue.messageRoot(),
+              },
+            ],
+          });
+
+          // 4. do relay in layer 1
+          const beforeBalanceLayer1 = await ethers.provider.getBalance(recipient.address);
+          const relayTx = await l1Messenger.relayMessageWithProof(
+            l2Gateway.address,
+            l1Gateway.address,
+            amount,
+            0,
+            deadline,
+            nonce,
+            messageData,
+            { blockHash, messageRootProof: [] }
+          );
+          await relayTx.wait();
+          const afterBalanceLayer1 = await ethers.provider.getBalance(recipient.address);
+          // should emit RelayedMessage
+          await expect(relayTx).to.emit(l1Messenger, "RelayedMessage");
+          // should emit FinalizeWithdrawETH
+          await expect(relayTx)
+            .to.emit(l1Gateway, "FinalizeWithdrawETH")
+            .withArgs(alice.address, recipient.address, amount, "0x");
+          // should transfer and wrap weth in layer 1
+          expect(afterBalanceLayer1.sub(beforeBalanceLayer1)).to.eq(amount);
+        });
+      });
+    };
+
+    for (const sendToSelf of [true, false]) {
+      run1to2(sendToSelf);
+      run2to1(sendToSelf);
+    }
+  });
+});

contracts/integration-test/L1BlockContainer.spec.ts

@@ -1,10 +1,11 @@
 /* eslint-disable node/no-unpublished-import */
 /* eslint-disable node/no-missing-import */
+import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
 import { expect } from "chai";
 import { BigNumber, BigNumberish, constants } from "ethers";
 import { concat, RLP } from "ethers/lib/utils";
 import { ethers } from "hardhat";
-import { L1BlockContainer } from "../typechain";
+import { L1BlockContainer, L1MessageQueue } from "../typechain";
 
 interface IImportTestConfig {
   hash: string;
@@ -118,12 +119,13 @@ describe("L1BlockContainer", async () => {
       beforeEach(async () => {
         const [deployer] = await ethers.getSigners();
         const L1BlockContainer = await ethers.getContractFactory("L1BlockContainer", deployer);
-        container = await L1BlockContainer.deploy(deployer.address);
+        container = await L1BlockContainer.deploy(constants.AddressZero, constants.AddressZero);
       });
 
       it("should revert, when sender not allowed", async () => {
         const [deployer] = await ethers.getSigners();
         await container.initialize(
+          deployer.address,
           test.parentHash,
           test.blockHeight - 1,
           test.blockTimestamp - 1,
@@ -134,13 +136,12 @@ describe("L1BlockContainer", async () => {
         const whitelist = await Whitelist.deploy(deployer.address);
         await container.updateWhitelist(whitelist.address);
 
-        await expect(container.importBlockHeader(constants.HashZero, [], false)).to.revertedWith(
-          "Not whitelisted sender"
-        );
+        await expect(container.importBlockHeader(constants.HashZero, [], [])).to.revertedWith("Not whitelist sender");
       });
 
       it("should revert, when block hash mismatch", async () => {
         await container.initialize(
+          constants.AddressZero,
           test.parentHash,
           test.blockHeight - 1,
           test.blockTimestamp - 1,
@@ -148,13 +149,14 @@ describe("L1BlockContainer", async () => {
           test.stateRoot
         );
         const headerRLP = encodeHeader(test);
-        await expect(container.importBlockHeader(test.parentHash, headerRLP, false)).to.revertedWith(
+        await expect(container.importBlockHeader(test.parentHash, headerRLP, "0x")).to.revertedWith(
           "Block hash mismatch"
         );
       });
 
       it("should revert, when has extra bytes", async () => {
         await container.initialize(
+          constants.AddressZero,
           test.parentHash,
           test.blockHeight - 1,
           test.blockTimestamp - 1,
@@ -162,13 +164,14 @@ describe("L1BlockContainer", async () => {
           test.stateRoot
         );
         const headerRLP = encodeHeader(test);
-        await expect(container.importBlockHeader(test.hash, concat([headerRLP, "0x00"]), false)).to.revertedWith(
+        await expect(container.importBlockHeader(test.hash, concat([headerRLP, "0x00"]), "0x")).to.revertedWith(
           "Header RLP length mismatch"
         );
       });
 
       it("should revert, when parent not imported", async () => {
         await container.initialize(
+          constants.AddressZero,
           constants.HashZero,
           test.blockHeight - 1,
           test.blockTimestamp - 1,
@@ -176,11 +179,12 @@ describe("L1BlockContainer", async () => {
           test.stateRoot
         );
         const headerRLP = encodeHeader(test);
-        await expect(container.importBlockHeader(test.hash, headerRLP, false)).to.revertedWith("Parent not imported");
+        await expect(container.importBlockHeader(test.hash, headerRLP, "0x")).to.revertedWith("Parent not imported");
       });
 
       it("should revert, when block height mismatch", async () => {
         await container.initialize(
+          constants.AddressZero,
           test.parentHash,
           test.blockHeight,
           test.blockTimestamp - 1,
@@ -188,11 +192,12 @@ describe("L1BlockContainer", async () => {
           test.stateRoot
         );
         const headerRLP = encodeHeader(test);
-        await expect(container.importBlockHeader(test.hash, headerRLP, false)).to.revertedWith("Block height mismatch");
+        await expect(container.importBlockHeader(test.hash, headerRLP, "0x")).to.revertedWith("Block height mismatch");
       });
 
       it("should revert, when parent block has larger timestamp", async () => {
         await container.initialize(
+          constants.AddressZero,
           test.parentHash,
           test.blockHeight - 1,
           test.blockTimestamp + 1,
@@ -200,13 +205,14 @@ describe("L1BlockContainer", async () => {
           test.stateRoot
         );
         const headerRLP = encodeHeader(test);
-        await expect(container.importBlockHeader(test.hash, headerRLP, false)).to.revertedWith(
+        await expect(container.importBlockHeader(test.hash, headerRLP, "0x")).to.revertedWith(
           "Parent block has larger timestamp"
         );
       });
 
       it(`should succeed`, async () => {
         await container.initialize(
+          constants.AddressZero,
           test.parentHash,
           test.blockHeight - 1,
           test.blockTimestamp - 1,
@@ -215,7 +221,7 @@ describe("L1BlockContainer", async () => {
         );
         expect(await container.latestBlockHash()).to.eq(test.parentHash);
         const headerRLP = encodeHeader(test);
-        await expect(container.importBlockHeader(test.hash, headerRLP, false))
+        await expect(container.importBlockHeader(test.hash, headerRLP, "0x"))
           .to.emit(container, "ImportBlock")
           .withArgs(test.hash, test.blockHeight, test.blockTimestamp, test.baseFee, test.stateRoot);
         expect(await container.getStateRoot(test.hash)).to.eq(test.stateRoot);
@@ -227,4 +233,35 @@ describe("L1BlockContainer", async () => {
       });
     });
   }
+
+  context("message inclusion", async () => {
+    let deployer: SignerWithAddress;
+    let messageQueue: L1MessageQueue;
+
+    beforeEach(async () => {
+      [deployer] = await ethers.getSigners();
+      const L1MessageQueue = await ethers.getContractFactory("L1MessageQueue", deployer);
+      messageQueue = await L1MessageQueue.deploy(deployer.address);
+
+      const L1BlockContainer = await ethers.getContractFactory("L1BlockContainer", deployer);
+      container = await L1BlockContainer.deploy(messageQueue.address, constants.AddressZero);
+      await container.deployed();
+
+      const block = await ethers.provider.getBlock("latest");
+      await container.initialize(
+        deployer.address,
+        block.hash,
+        block.number,
+        block.timestamp,
+        block.baseFeePerGas!,
+        block.hash
+      );
+    });
+
+    it("should revert, when block not imported", async () => {
+      await expect(
+        container.verifyMessageExecutionStatus(constants.HashZero, constants.HashZero, "0x")
+      ).to.revertedWith("Block not imported");
+    });
+  });
 });

contracts/integration-test/ScrollChain.spec.ts

@@ -1,108 +0,0 @@
-/* eslint-disable node/no-unpublished-import */
-/* eslint-disable node/no-missing-import */
-import { constants } from "ethers";
-import { concat } from "ethers/lib/utils";
-import { ethers } from "hardhat";
-import { ScrollChain, L1MessageQueue } from "../typechain";
-
-describe("ScrollChain", async () => {
-  let queue: L1MessageQueue;
-  let chain: ScrollChain;
-
-  beforeEach(async () => {
-    const [deployer] = await ethers.getSigners();
-
-    const L1MessageQueue = await ethers.getContractFactory("L1MessageQueue", deployer);
-    queue = await L1MessageQueue.deploy();
-    await queue.deployed();
-
-    const RollupVerifier = await ethers.getContractFactory("RollupVerifier", deployer);
-    const verifier = await RollupVerifier.deploy();
-    await verifier.deployed();
-
-    const ScrollChain = await ethers.getContractFactory("ScrollChain", {
-      signer: deployer,
-      libraries: { RollupVerifier: verifier.address },
-    });
-    chain = await ScrollChain.deploy(0, 25, "0xb5baa665b2664c3bfed7eb46e00ebc110ecf2ebd257854a9bf2b9dbc9b2c08f6");
-    await chain.deployed();
-
-    await chain.initialize(queue.address);
-    await chain.updateSequencer(deployer.address, true);
-    await queue.initialize(constants.AddressZero, constants.AddressZero);
-  });
-
-  it("should succeed", async () => {
-    await chain.importGenesisBatch({
-      blocks: [
-        {
-          blockHash: "0x92826bd3aad2ef70d8061dc4e25150b305d1233d9cd7579433a77d6eb01dae1c",
-          parentHash: constants.HashZero,
-          blockNumber: 0,
-          timestamp: 1639724192,
-          baseFee: 1000000000,
-          gasLimit: 940000000,
-          numTransactions: 0,
-          numL1Messages: 0,
-        },
-      ],
-      prevStateRoot: constants.HashZero,
-      newStateRoot: "0x1b186a7a90ec3b41a2417062fe44dce8ce82ae76bfbb09eae786a4f1be1895f5",
-      withdrawTrieRoot: constants.HashZero,
-      batchIndex: 0,
-      parentBatchHash: constants.HashZero,
-      l2Transactions: [],
-    });
-    const parentBatchHash = await chain.lastFinalizedBatchHash();
-    console.log("genesis batch hash:", parentBatchHash);
-
-    for (let numTx = 1; numTx <= 25; ++numTx) {
-      for (let txLength = 100; txLength <= 1000; txLength += 100) {
-        const txs: Array<Uint8Array> = [];
-        for (let i = 0; i < numTx; i++) {
-          const tx = new Uint8Array(4 + txLength);
-          let offset = 3;
-          for (let x = txLength; x > 0; x = Math.floor(x / 256)) {
-            tx[offset] = x % 256;
-            offset -= 1;
-          }
-          tx.fill(1, 4);
-          txs.push(tx);
-        }
-        const batch = {
-          blocks: [
-            {
-              blockHash: "0xb5baa665b2664c3bfed7eb46e00ebc110ecf2ebd257854a9bf2b9dbc9b2c08f6",
-              parentHash: "0x92826bd3aad2ef70d8061dc4e25150b305d1233d9cd7579433a77d6eb01dae1c",
-              blockNumber: 1,
-              timestamp: numTx * 100000 + txLength,
-              baseFee: 0,
-              gasLimit: 0,
-              numTransactions: 0,
-              numL1Messages: 0,
-            },
-          ],
-          prevStateRoot: "0x1b186a7a90ec3b41a2417062fe44dce8ce82ae76bfbb09eae786a4f1be1895f5",
-          newStateRoot: "0xb5baa665b2664c3bfed7eb46e00ebc110ecf2ebd257854a9bf2b9dbc9b2c08f6",
-          withdrawTrieRoot: "0xb5baa665b2664c3bfed7eb46e00ebc110ecf2ebd257854a9bf2b9dbc9b2c08f6",
-          batchIndex: 1,
-          parentBatchHash: parentBatchHash,
-          l2Transactions: concat(txs),
-        };
-        const estimateGas = await chain.estimateGas.commitBatch(batch);
-        const tx = await chain.commitBatch(batch, { gasLimit: estimateGas.mul(12).div(10) });
-        const receipt = await tx.wait();
-        console.log(
-          "Commit batch with l2TransactionsBytes:",
-          numTx * (txLength + 4),
-          "gasLimit:",
-          tx.gasLimit.toString(),
-          "estimateGas:",
-          estimateGas.toString(),
-          "gasUsed:",
-          receipt.gasUsed.toString()
-        );
-      }
-    }
-  });
-});

contracts/scripts/README.md

@@ -11,15 +11,13 @@ export owner=0x0000000000000000000000000000000000000000 # change to actual owner
 
 # deploy contracts in layer 1
 npx hardhat --network $layer1 run scripts/deploy_proxy_admin.ts
-npx hardhat --network $layer1 run scripts/deploy_scroll_chain.ts
+npx hardhat --network $layer1 run scripts/deploy_zkrollup.ts
 env CONTRACT_NAME=L1ScrollMessenger npx hardhat run --network $layer1 scripts/deploy_proxy_contract.ts
 env CONTRACT_NAME=L1GatewayRouter npx hardhat run --network $layer1 scripts/deploy_proxy_contract.ts
 env CONTRACT_NAME=L1StandardERC20Gateway npx hardhat run --network $layer1 scripts/deploy_proxy_contract.ts
 env CONTRACT_NAME=L1CustomERC20Gateway npx hardhat run --network $layer1 scripts/deploy_proxy_contract.ts
 env CONTRACT_NAME=L1ERC721Gateway npx hardhat run --network $layer1 scripts/deploy_proxy_contract.ts
 env CONTRACT_NAME=L1ERC1155Gateway npx hardhat run --network $layer1 scripts/deploy_proxy_contract.ts
-env CONTRACT_NAME=L1ETHGateway npx hardhat run --network $layer1 scripts/deploy_proxy_contract.ts
-env CONTRACT_NAME=L1WETHGateway npx hardhat run --network $layer1 scripts/deploy_proxy_contract.ts
 
 # deploy contracts in layer 2, note: l2_messenger is predeployed
 npx hardhat --network $layer2 run scripts/deploy_proxy_admin.ts
@@ -30,13 +28,11 @@ env CONTRACT_NAME=L2StandardERC20Gateway npx hardhat run --network $layer2 scrip
 env CONTRACT_NAME=L2CustomERC20Gateway npx hardhat run --network $layer2 scripts/deploy_proxy_contract.ts
 env CONTRACT_NAME=L2ERC721Gateway npx hardhat run --network $layer2 scripts/deploy_proxy_contract.ts
 env CONTRACT_NAME=L2ERC1155Gateway npx hardhat run --network $layer2 scripts/deploy_proxy_contract.ts
-env CONTRACT_NAME=L2ETHGateway npx hardhat run --network $layer2 scripts/deploy_proxy_contract.ts
-env CONTRACT_NAME=L2WETHGateway npx hardhat run --network $layer2 scripts/deploy_proxy_contract.ts
 
 # initalize contracts in layer 1, should set proper bash env variables first
 npx hardhat --network $layer1 run scripts/initialize_l1_erc20_gateway.ts
 npx hardhat --network $layer1 run scripts/initialize_l1_gateway_router.ts
-npx hardhat --network $layer1 run scripts/initialize_scroll_chain.ts
+npx hardhat --network $layer1 run scripts/initialize_zkrollup.ts
 npx hardhat --network $layer1 run scripts/initialize_l1_messenger.ts
 npx hardhat --network $layer1 run scripts/initialize_l1_custom_erc20_gateway.ts
 npx hardhat --network $layer1 run scripts/initialize_l1_erc1155_gateway.ts

contracts/scripts/deploy_l1_erc20_gateway.ts

@@ -0,0 +1,48 @@
+/* eslint-disable node/no-missing-import */
+import * as hre from "hardhat";
+import { ethers } from "hardhat";
+import { selectAddressFile } from "./utils";
+
+async function main() {
+  const addressFile = selectAddressFile(hre.network.name);
+
+  const [deployer] = await ethers.getSigners();
+
+  const ProxyAdmin = await ethers.getContractAt("ProxyAdmin", addressFile.get("ProxyAdmin"), deployer);
+
+  if (!addressFile.get("L1StandardERC20Gateway.implementation")) {
+    console.log(">> Deploy L1StandardERC20Gateway implementation");
+    const L1StandardERC20Gateway = await ethers.getContractFactory("L1StandardERC20Gateway", deployer);
+    const impl = await L1StandardERC20Gateway.deploy();
+    console.log(`>> waiting for transaction: ${impl.deployTransaction.hash}`);
+    await impl.deployed();
+    console.log(`✅ L1StandardERC20Gateway implementation deployed at ${impl.address}`);
+    addressFile.set("L1StandardERC20Gateway.implementation", impl.address);
+  }
+
+  const impl = addressFile.get("L1StandardERC20Gateway.implementation") as string;
+
+  if (!addressFile.get("L1StandardERC20Gateway.proxy")) {
+    console.log(">> Deploy L1StandardERC20Gateway proxy");
+    const TransparentUpgradeableProxy = await ethers.getContractFactory("TransparentUpgradeableProxy", deployer);
+    const proxy = await TransparentUpgradeableProxy.deploy(impl, ProxyAdmin.address, "0x");
+    console.log(`>> waiting for transaction: ${proxy.deployTransaction.hash}`);
+    await proxy.deployed();
+    console.log(`✅ L1StandardERC20Gateway proxy deployed at ${proxy.address}`);
+    addressFile.set("L1StandardERC20Gateway.proxy", proxy.address);
+  }
+
+  // Export contract address to testnet.
+  console.log(
+    `testnet-export: ${addressFile.get("L1StandardERC20Gateway.implementation")};${addressFile.get(
+      "L1StandardERC20Gateway.proxy"
+    )}`
+  );
+}
+
+// We recommend this pattern to be able to use async/await everywhere
+// and properly handle errors.
+main().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});

contracts/scripts/deploy_l1_gateway_router.ts

@@ -0,0 +1,46 @@
+/* eslint-disable node/no-missing-import */
+import * as hre from "hardhat";
+import { ethers } from "hardhat";
+import { selectAddressFile } from "./utils";
+
+async function main() {
+  const addressFile = selectAddressFile(hre.network.name);
+
+  const [deployer] = await ethers.getSigners();
+
+  const ProxyAdmin = await ethers.getContractAt("ProxyAdmin", addressFile.get("ProxyAdmin"), deployer);
+
+  if (!addressFile.get("L1GatewayRouter.implementation")) {
+    console.log(">> Deploy L1GatewayRouter implementation");
+    const L1GatewayRouter = await ethers.getContractFactory("L1GatewayRouter", deployer);
+    const impl = await L1GatewayRouter.deploy();
+    console.log(`>> waiting for transaction: ${impl.deployTransaction.hash}`);
+    await impl.deployed();
+    console.log(`✅ L1GatewayRouter implementation deployed at ${impl.address}`);
+    addressFile.set("L1GatewayRouter.implementation", impl.address);
+  }
+
+  const impl = addressFile.get("L1GatewayRouter.implementation") as string;
+
+  if (!addressFile.get("L1GatewayRouter.proxy")) {
+    console.log(">> Deploy L1GatewayRouter proxy");
+    const TransparentUpgradeableProxy = await ethers.getContractFactory("TransparentUpgradeableProxy", deployer);
+    const proxy = await TransparentUpgradeableProxy.deploy(impl, ProxyAdmin.address, "0x");
+    console.log(`>> waiting for transaction: ${proxy.deployTransaction.hash}`);
+    await proxy.deployed();
+    console.log(`✅ L1GatewayRouter proxy deployed at ${proxy.address}`);
+    addressFile.set("L1GatewayRouter.proxy", proxy.address);
+  }
+
+  // Export contract address to testnet.
+  console.log(
+    `testnet-export: ${addressFile.get("L1GatewayRouter.implementation")};${addressFile.get("L1GatewayRouter.proxy")}`
+  );
+}
+
+// We recommend this pattern to be able to use async/await everywhere
+// and properly handle errors.
+main().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});

contracts/scripts/deploy_l1_messenger.ts

@@ -0,0 +1,48 @@
+/* eslint-disable node/no-missing-import */
+import * as hre from "hardhat";
+import { ethers } from "hardhat";
+import { selectAddressFile } from "./utils";
+
+async function main() {
+  const addressFile = selectAddressFile(hre.network.name);
+
+  const [deployer] = await ethers.getSigners();
+
+  const ProxyAdmin = await ethers.getContractAt("ProxyAdmin", addressFile.get("ProxyAdmin"), deployer);
+
+  if (!addressFile.get("L1ScrollMessenger.implementation")) {
+    console.log(">> Deploy L1ScrollMessenger implementation");
+    const L1ScrollMessenger = await ethers.getContractFactory("L1ScrollMessenger", deployer);
+    const impl = await L1ScrollMessenger.deploy();
+    console.log(`>> waiting for transaction: ${impl.deployTransaction.hash}`);
+    await impl.deployed();
+    console.log(`✅ L1ScrollMessenger implementation deployed at ${impl.address}`);
+    addressFile.set("L1ScrollMessenger.implementation", impl.address);
+  }
+
+  const impl = addressFile.get("L1ScrollMessenger.implementation") as string;
+
+  if (!addressFile.get("L1ScrollMessenger.proxy")) {
+    console.log(">> Deploy L1ScrollMessenger proxy");
+    const TransparentUpgradeableProxy = await ethers.getContractFactory("TransparentUpgradeableProxy", deployer);
+    const proxy = await TransparentUpgradeableProxy.deploy(impl, ProxyAdmin.address, "0x");
+    console.log(`>> waiting for transaction: ${proxy.deployTransaction.hash}`);
+    await proxy.deployed();
+    console.log(`✅ L1ScrollMessenger proxy deployed at ${proxy.address}`);
+    addressFile.set("L1ScrollMessenger.proxy", proxy.address);
+  }
+
+  // Export contract address to testnet.
+  console.log(
+    `testnet-export: ${addressFile.get("L1ScrollMessenger.implementation")};${addressFile.get(
+      "L1ScrollMessenger.proxy"
+    )}`
+  );
+}
+
+// We recommend this pattern to be able to use async/await everywhere
+// and properly handle errors.
+main().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});

contracts/scripts/deploy_l2_erc20_gateway.ts

@@ -0,0 +1,48 @@
+/* eslint-disable node/no-missing-import */
+import * as hre from "hardhat";
+import { ethers } from "hardhat";
+import { selectAddressFile } from "./utils";
+
+async function main() {
+  const addressFile = selectAddressFile(hre.network.name);
+
+  const [deployer] = await ethers.getSigners();
+
+  const ProxyAdmin = await ethers.getContractAt("ProxyAdmin", addressFile.get("ProxyAdmin"), deployer);
+
+  if (!addressFile.get("L2StandardERC20Gateway.implementation")) {
+    console.log(">> Deploy L2StandardERC20Gateway implementation");
+    const L2StandardERC20Gateway = await ethers.getContractFactory("L2StandardERC20Gateway", deployer);
+    const impl = await L2StandardERC20Gateway.deploy();
+    console.log(`>> waiting for transaction: ${impl.deployTransaction.hash}`);
+    await impl.deployed();
+    console.log(`✅ L2StandardERC20Gateway implementation deployed at ${impl.address}`);
+    addressFile.set("L2StandardERC20Gateway.implementation", impl.address);
+  }
+
+  const impl = addressFile.get("L2StandardERC20Gateway.implementation") as string;
+
+  if (!addressFile.get("L2StandardERC20Gateway.proxy")) {
+    console.log(">> Deploy L2StandardERC20Gateway proxy");
+    const TransparentUpgradeableProxy = await ethers.getContractFactory("TransparentUpgradeableProxy", deployer);
+    const proxy = await TransparentUpgradeableProxy.deploy(impl, ProxyAdmin.address, "0x");
+    console.log(`>> waiting for transaction: ${proxy.deployTransaction.hash}`);
+    await proxy.deployed();
+    console.log(`✅ L2StandardERC20Gateway proxy deployed at ${proxy.address}`);
+    addressFile.set("L2StandardERC20Gateway.proxy", proxy.address);
+  }
+
+  // Export contract address to testnet.
+  console.log(
+    `testnet-export: ${addressFile.get("L2StandardERC20Gateway.implementation")};${addressFile.get(
+      "L2StandardERC20Gateway.proxy"
+    )}`
+  );
+}
+
+// We recommend this pattern to be able to use async/await everywhere
+// and properly handle errors.
+main().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});

contracts/scripts/deploy_l2_gateway_router.ts

@@ -0,0 +1,46 @@
+/* eslint-disable node/no-missing-import */
+import * as hre from "hardhat";
+import { ethers } from "hardhat";
+import { selectAddressFile } from "./utils";
+
+async function main() {
+  const addressFile = selectAddressFile(hre.network.name);
+
+  const [deployer] = await ethers.getSigners();
+
+  const ProxyAdmin = await ethers.getContractAt("ProxyAdmin", addressFile.get("ProxyAdmin"), deployer);
+
+  if (!addressFile.get("L2GatewayRouter.implementation")) {
+    console.log(">> Deploy L2GatewayRouter implementation");
+    const L2GatewayRouter = await ethers.getContractFactory("L2GatewayRouter", deployer);
+    const impl = await L2GatewayRouter.deploy();
+    console.log(`>> waiting for transaction: ${impl.deployTransaction.hash}`);
+    await impl.deployed();
+    console.log(`✅ L2GatewayRouter implementation deployed at ${impl.address}`);
+    addressFile.set("L2GatewayRouter.implementation", impl.address);
+  }
+
+  const impl = addressFile.get("L2GatewayRouter.implementation") as string;
+
+  if (!addressFile.get("L2GatewayRouter.proxy")) {
+    console.log(">> Deploy L2GatewayRouter proxy");
+    const TransparentUpgradeableProxy = await ethers.getContractFactory("TransparentUpgradeableProxy", deployer);
+    const proxy = await TransparentUpgradeableProxy.deploy(impl, ProxyAdmin.address, "0x");
+    console.log(`>> waiting for transaction: ${proxy.deployTransaction.hash}`);
+    await proxy.deployed();
+    console.log(`✅ L2GatewayRouter proxy deployed at ${proxy.address}`);
+    addressFile.set("L2GatewayRouter.proxy", proxy.address);
+  }
+
+  // Export contract address to testnet.
+  console.log(
+    `testnet-export: ${addressFile.get("L2GatewayRouter.implementation")};${addressFile.get("L2GatewayRouter.proxy")}`
+  );
+}
+
+// We recommend this pattern to be able to use async/await everywhere
+// and properly handle errors.
+main().catch((error) => {
+  console.error(error);
+  process.exitCode = 1;
+});

contracts/scripts/deploy_l2_messenger.ts

@@ -8,38 +8,19 @@ async function main() {
 
   const [deployer] = await ethers.getSigners();
 
-  const ProxyAdmin = await ethers.getContractAt("ProxyAdmin", addressFile.get("ProxyAdmin"), deployer);
-
-  const container = process.env.L1_BLOCK_CONTAINER_ADDR!;
-  const queue = process.env.L2_MESSAGE_QUEUE_ADDR!;
-  if (!addressFile.get("L2ScrollMessenger.implementation")) {
+  const owner = process.env.CONTRACT_OWNER || deployer.address;
+  if (!addressFile.get("L2ScrollMessenger")) {
     console.log(">> Deploy L2ScrollMessenger implementation");
     const L2ScrollMessenger = await ethers.getContractFactory("L2ScrollMessenger", deployer);
-    const impl = await L2ScrollMessenger.deploy(container, queue);
+    const impl = await L2ScrollMessenger.deploy(owner);
     console.log(`>> waiting for transaction: ${impl.deployTransaction.hash}`);
     await impl.deployed();
     console.log(`✅ L2ScrollMessenger implementation deployed at ${impl.address}`);
-    addressFile.set("L2ScrollMessenger.implementation", impl.address);
-  }
-
-  const impl = addressFile.get("L2ScrollMessenger.implementation") as string;
-
-  if (!addressFile.get("L2ScrollMessenger.proxy")) {
-    console.log(">> Deploy L2ScrollMessenger proxy");
-    const TransparentUpgradeableProxy = await ethers.getContractFactory("TransparentUpgradeableProxy", deployer);
-    const proxy = await TransparentUpgradeableProxy.deploy(impl, ProxyAdmin.address, "0x");
-    console.log(`>> waiting for transaction: ${proxy.deployTransaction.hash}`);
-    await proxy.deployed();
-    console.log(`✅ L2ScrollMessenger proxy deployed at ${proxy.address}`);
-    addressFile.set(`L2ScrollMessenger.proxy`, proxy.address);
+    addressFile.set("L2ScrollMessenger", impl.address);
   }
 
   // Export contract address to testnet.
-  console.log(
-    `testnet-export: ${addressFile.get("L2ScrollMessenger.implementation")};${addressFile.get(
-      "L2ScrollMessenger.proxy"
-    )}`
-  );
+  console.log(`testnet-export: ${addressFile.get("L2ScrollMessenger")}`);
 }
 
 // We recommend this pattern to be able to use async/await everywhere