fix import_genesis_block.ts

.github/pull_request_template.md

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

.github/workflows/bridge.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - main
       - staging
-      - develop
-      - alpha
     paths:
       - 'bridge/**'
       - '.github/workflows/bridge.yml'
@@ -14,8 +12,6 @@ on:
     branches:
       - main
       - staging
-      - develop
-      - alpha
     paths:
       - 'bridge/**'
       - '.github/workflows/bridge.yml'
@@ -35,11 +31,7 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Install Solc
-      uses: supplypike/setup-bin@v3
-      with:
-        uri: 'https://github.com/ethereum/solidity/releases/download/v0.8.16/solc-static-linux'
-        name: 'solc'
-        version: '0.8.16'
+      uses: pontem-network/get-solc@master
     - name: Install Geth Tools
       uses: gacts/install-geth-tools@v1
     - name: Lint
@@ -66,11 +58,3 @@ jobs:
         if [ -n "$(git status --porcelain)" ]; then
           exit 1
         fi
-  # docker-build:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #   - name: Checkout code
-  #     uses: actions/checkout@v2
-  #   - name: Set up Docker Buildx
-  #     uses: docker/setup-buildx-action@v2
-  #   - run: make docker

.github/workflows/common.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - main
       - staging
-      - develop
-      - alpha
     paths:
       - 'common/**'
       - '.github/workflows/common.yml'
@@ -14,8 +12,6 @@ on:
     branches:
       - main
       - staging
-      - develop
-      - alpha
     paths:
       - 'common/**'
       - '.github/workflows/common.yml'
@@ -28,21 +24,12 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions-rs/toolchain@v1
-      with:
-        toolchain: nightly-2022-12-10
-        override: true
-        components: rustfmt, clippy
     - name: Install Go
       uses: actions/setup-go@v2
       with:
         go-version: 1.18.x
     - name: Checkout code
       uses: actions/checkout@v2
-    - name: Cache cargo
-      uses: Swatinem/rust-cache@v2
-      with:
-        workspaces: "common/libzkp/impl -> target"
     - name: Lint
       run: |
         rm -rf $HOME/.cache/golangci-lint 

.github/workflows/contracts.yaml

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

.github/workflows/coordinator.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - main
       - staging
-      - develop
-      - alpha
     paths:
       - 'coordinator/**'
       - '.github/workflows/coordinator.yml'
@@ -14,8 +12,6 @@ on:
     branches:
       - main
       - staging
-      - develop
-      - alpha
     paths:
       - 'coordinator/**'
       - '.github/workflows/coordinator.yml'
@@ -28,11 +24,6 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions-rs/toolchain@v1
-      with:
-        toolchain: nightly-2022-12-10
-        override: true
-        components: rustfmt, clippy
     - name: Install Go
       uses: actions/setup-go@v2
       with:
@@ -62,18 +53,3 @@ jobs:
         if [ -n "$(git status --porcelain)" ]; then
           exit 1
         fi
-  # docker-build:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #   - name: Checkout code
-  #     uses: actions/checkout@v2
-  #   - name: Set up Docker Buildx
-  #     uses: docker/setup-buildx-action@v2
-  #   - name: Build and push
-  #     uses: docker/build-push-action@v2
-  #     with:
-  #       context: .
-  #       file: ./build/dockerfiles/coordinator.Dockerfile
-  #       push: false
-  #       # cache-from: type=gha,scope=${{ github.workflow }}
-  #       # cache-to: type=gha,scope=${{ github.workflow }}

.github/workflows/database.yml

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

.github/workflows/docker.yaml

@@ -1,65 +0,0 @@
-name: Docker
-
-on:
-  push:
-    tags:
-      - v**
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
-    - name: Build and push coordinator docker
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./build/dockerfiles/coordinator.Dockerfile
-        push: true
-        tags: scrolltech/coordinator:${{github.ref_name}}
-        # cache-from: type=gha,scope=${{ github.workflow }}
-        # cache-to: type=gha,scope=${{ github.workflow }}
-    - name: Build and push event_watcher docker
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./build/dockerfiles/event_watcher.Dockerfile
-        push: true
-        tags: scrolltech/event-watcher:${{github.ref_name}}
-        # cache-from: type=gha,scope=${{ github.workflow }}
-        # cache-to: type=gha,scope=${{ github.workflow }}
-    - name: Build and push gas_oracle docker
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./build/dockerfiles/gas_oracle.Dockerfile
-        push: true
-        tags: scrolltech/gas-oracle:${{github.ref_name}}
-        # cache-from: type=gha,scope=${{ github.workflow }}
-        # cache-to: type=gha,scope=${{ github.workflow }}
-    - name: Build and push msg_relayer docker
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./build/dockerfiles/msg_relayer.Dockerfile
-        push: true
-        tags: scrolltech/msg-relayer:${{github.ref_name}}
-        # cache-from: type=gha,scope=${{ github.workflow }}
-        # cache-to: type=gha,scope=${{ github.workflow }}
-    - name: Build and push rollup_relayer docker
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./build/dockerfiles/rollup_relayer.Dockerfile
-        push: true
-        tags: scrolltech/rollup-relayer:${{github.ref_name}}
-        # cache-from: type=gha,scope=${{ github.workflow }}
-        # cache-to: type=gha,scope=${{ github.workflow }}

.github/workflows/roller.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - main
       - staging
-      - develop
-      - alpha
     paths:
       - 'roller/**'
       - '.github/workflows/roller.yml'
@@ -14,8 +12,6 @@ on:
     branches:
       - main
       - staging
-      - develop
-      - alpha
     paths:
       - 'roller/**'
       - '.github/workflows/roller.yml'
@@ -30,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
@@ -39,15 +35,24 @@ jobs:
         go-version: 1.18.x
     - name: Checkout code
       uses: actions/checkout@v2
-    - name: Cache cargo
-      uses: Swatinem/rust-cache@v2
+    - name: Cache cargo registry
+      uses: actions/cache@v2
       with:
-        workspaces: "common/libzkp/impl -> target"
+        path: ~/.cargo/registry
+        key: ${{ runner.os }}-roller-cargo-registry-${{ hashFiles('roller/core/prover/rust/Cargo.lock') }}
+    - name: Cache cargo index
+      uses: actions/cache@v2
+      with:
+        path: ~/.cargo/git
+        key: ${{ runner.os }}-roller-cargo-index-${{ hashFiles('roller/core/prover/rust/Cargo.lock') }}
+    - name: Cache cargo target
+      uses: actions/cache@v2
+      with:
+        path: /home/runner/work/scroll/scroll/roller/core/prover/rust/target
+        key: ${{ runner.os }}-roller-cargo-build-target-${{ hashFiles('roller/core/prover/rust/Cargo.lock') }}
     - name: Test
       run: |
         make roller
-        export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:./prover/lib
-        export CHAIN_ID=534353
         go test -v ./...
   check:
     runs-on: ubuntu-latest

.gitignore

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

.pre-commit-config.yaml

@@ -1,5 +0,0 @@
-repos:
-  - repo: git@github.com:scroll-tech/keydead.git
-    rev: main
-    hooks:
-      - id: keydead

Jenkinsfile

@@ -1,6 +1,8 @@
 imagePrefix = 'scrolltech'
 credentialDocker = 'dockerhub'
 
+def boolean test_result = false
+
 pipeline {
     agent any
     options {
@@ -8,90 +10,105 @@ pipeline {
     }
     tools {
         go 'go-1.18'
-        nodejs "nodejs"
     }
     environment {
         GO111MODULE = 'on'
-        PATH="/home/ubuntu/.cargo/bin:$PATH"
-        LD_LIBRARY_PATH="$LD_LIBRARY_PATH:./coordinator/verifier/lib"
-        CHAIN_ID='534353'
-        // LOG_DOCKER = 'true'
     }
     stages {
         stage('Build') {
-            parallel {
-                stage('Build Prerequisite') {
-                    steps {
-                        sh 'make dev_docker'
-                        sh 'make -C bridge mock_abi'
-                        sh 'make -C common/bytecode all'
-                    }
-                }
-                stage('Check Bridge Compilation') {
-                    steps {
-                        sh 'make -C bridge bridge_bins'
-                    }
-                }
-                stage('Check Coordinator Compilation') {
-                    steps {
-                        sh 'export PATH=/home/ubuntu/go/bin:$PATH'
-                        sh 'make -C coordinator coordinator'
-                    }
-                }
-                stage('Check Database Compilation') {
-                    steps {
-                        sh 'make -C database db_cli'
-                    }
-                }
-                stage('Check Database Docker Build') {
-                    steps {
-                        sh 'make -C database docker'
-                    }
+            when {
+                anyOf {
+                    changeset "Jenkinsfile"
+                    changeset "build/**"
+                    changeset "go.work**"
+                    changeset "bridge/**"
+                    changeset "coordinator/**"
+                    changeset "common/**"
+                    changeset "database/**"
                 }
             }
-        }
-        stage('Parallel Test') {
-            parallel{
-                stage('Race test common package') {
-                    steps {
-                        sh 'go test -v -race -coverprofile=coverage.common.txt -covermode=atomic scroll-tech/common/...'
-                    }
-                }
-                stage('Race test bridge package') {
-                    steps {
-                        sh "cd ./bridge && ../build/run_tests.sh bridge"
-                    }
-                }
-                stage('Race test coordinator package') {
-                    steps {
-                        sh "cd ./coordinator && ../build/run_tests.sh coordinator"
-                    }
-                }
-                stage('Race test database package') {
-                    steps {
-                        sh 'go test -v -race -coverprofile=coverage.db.txt -covermode=atomic scroll-tech/database/...'
-                    }
-                }
-                stage('Integration test') {
-                    steps {
-                        sh 'go test -v -tags="mock_prover mock_verifier" -p 1 scroll-tech/integration-test/...'
-                    }
-                }
+            steps { 
+                //start to build project
+                sh '''#!/bin/bash
+                    export PATH=/home/ubuntu/go/bin:$PATH
+                    make dev_docker
+                    make -C bridge mock_abi
+                    make -C bridge bridge
+                    make -C bridge docker
+                    make -C coordinator coordinator
+                    make -C coordinator docker
+                    '''
             }
         }
-        stage('Compare Coverage') {
+        stage('Test') {
+            when {
+                anyOf {
+                    changeset "Jenkinsfile"
+                    changeset "build/**"
+                    changeset "go.work**"
+                    changeset "bridge/**"
+                    changeset "coordinator/**"
+                    changeset "common/**"
+                    changeset "database/**"
+                }
+            }
             steps {
-                sh "./build/post-test-report-coverage.sh"
-                script {
-                    currentBuild.result = 'SUCCESS'
+               sh "docker ps -aq | xargs -r docker stop"
+               sh "docker container prune -f"
+               catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                    sh '''
+                        go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 scroll-tech/database
+                        go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 scroll-tech/database/migrate
+                        go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 scroll-tech/database/docker
+                        go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 scroll-tech/bridge/abi
+                        go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 scroll-tech/bridge/l1
+                        go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 scroll-tech/bridge/l2
+                        go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 scroll-tech/bridge/sender
+                        go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 scroll-tech/common/docker
+                        go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 scroll-tech/coordinator
+                        go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 scroll-tech/coordinator/verifier
+                        cd ..
+                    '''
+                    script {
+                        for (i in ['bridge', 'coordinator', 'database']) {
+                            sh "cd $i && go test -v -race -coverprofile=coverage.txt -covermode=atomic \$(go list ./... | grep -v 'database\\|l2\\|l1\\|common\\|coordinator')"
+                        }
+                    }
+
+                    script { test_result = true }
+               }
+            }
+        }
+        stage('Docker') {
+            when {
+                anyOf {
+                    changeset "Jenkinsfile"
+                    changeset "build/**"
+                    changeset "go.work**"
+                    changeset "bridge/**"
+                    changeset "coordinator/**"
+                    changeset "common/**"
+                    changeset "database/**"
+                }
+            }
+            steps {
+                withCredentials([usernamePassword(credentialsId: "${credentialDocker}", passwordVariable: 'dockerPassword', usernameVariable: 'dockerUser')]) {
+                    script {
+                        if (test_result == true) {
+                            sh 'docker login --username=${dockerUser} --password=${dockerPassword}'
+                            for (i in ['bridge', 'coordinator']) {
+                                sh "docker build -t ${imagePrefix}/$i:${GIT_COMMIT} -f build/dockerfiles/${i}.Dockerfile ."
+                                sh "docker push ${imagePrefix}/$i:${GIT_COMMIT}"
+                                sh "docker rmi ${imagePrefix}/$i:${GIT_COMMIT}"
+                            }
+                        }
+                    }
                 }
-                step([$class: 'CompareCoverageAction', publishResultAs: 'Comment', scmVars: [GIT_URL: env.GIT_URL]])
             }
         }
     }
-    post {
-        always {
-            publishCoverage adapters: [coberturaReportAdapter(path: 'cobertura.xml', thresholds: [[thresholdTarget: 'Aggregated Report', unhealthyThreshold: 40.0]])], checksName: '', sourceFileResolver: sourceFiles('NEVER_STORE') 
+    post { 
+        always { 
             cleanWs() 
             slackSend(message: "${JOB_BASE_NAME} ${GIT_COMMIT} #${BUILD_NUMBER} deploy ${currentBuild.result}")
         }

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) | \
@@ -16,11 +14,11 @@ lint: ## The code's format and security checks.
 
 update: ## update dependencies
 	go work sync
-	cd $(PWD)/bridge/ && go get -u github.com/scroll-tech/go-ethereum@scroll && go mod tidy
-	cd $(PWD)/common/ && go get -u github.com/scroll-tech/go-ethereum@scroll && go mod tidy
-	cd $(PWD)/coordinator/ && go get -u github.com/scroll-tech/go-ethereum@scroll && go mod tidy
-	cd $(PWD)/database/ && go get -u github.com/scroll-tech/go-ethereum@scroll && go mod tidy
-	cd $(PWD)/roller/ && go get -u github.com/scroll-tech/go-ethereum@scroll && go mod tidy
+	cd $(PWD)/bridge/ && go mod tidy
+	cd $(PWD)/common/ && go mod tidy
+	cd $(PWD)/coordinator/ && go mod tidy
+	cd $(PWD)/database/ && go mod tidy
+	cd $(PWD)/roller/ && go mod tidy
 	goimports -local $(PWD)/bridge/ -w .
 	goimports -local $(PWD)/common/ -w .
 	goimports -local $(PWD)/coordinator/ -w .
@@ -29,17 +27,7 @@ update: ## update dependencies
 
 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
+	docker build -t scroll_l2geth ./common/docker/l2geth/.
 
 clean: ## Empty out the bin folder
 	@rm -rf build/bin

README.md

@@ -1,12 +1,3 @@
 # Scroll Monorepo
 
 [![Contracts](https://github.com/scroll-tech/scroll/actions/workflows/contracts.yaml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/contracts.yaml) [![Bridge](https://github.com/scroll-tech/scroll/actions/workflows/bridge.yml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/bridge.yml) [![Coordinator](https://github.com/scroll-tech/scroll/actions/workflows/coordinator.yml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/coordinator.yml) [![Database](https://github.com/scroll-tech/scroll/actions/workflows/database.yml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/database.yml) [![Common](https://github.com/scroll-tech/scroll/actions/workflows/common.yml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/common.yml) [![Roller](https://github.com/scroll-tech/scroll/actions/workflows/roller.yml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/roller.yml)
-
-## Prerequisites
-+ go1.18
-+ rust (for version, see [rust-toolchain](./common/libzkp/impl/rust-toolchain))
-+ hardhat / foundry
-
----
-
-For a more comprehensive doc, see [`docs/`](./docs).

bridge/Makefile

@@ -5,26 +5,15 @@ IMAGE_VERSION=latest
 REPO_ROOT_DIR=./..
 
 mock_abi:
-	go run github.com/scroll-tech/go-ethereum/cmd/abigen --sol mock_bridge/MockBridgeL1.sol --pkg mock_bridge --out mock_bridge/MockBridgeL1.go
-	go run github.com/scroll-tech/go-ethereum/cmd/abigen --sol mock_bridge/MockBridgeL2.sol --pkg mock_bridge --out mock_bridge/MockBridgeL2.go
+	solc --bin mock_bridge/Mock_Bridge.sol -o mock_bridge/ --overwrite
+	solc --abi mock_bridge/Mock_Bridge.sol -o mock_bridge/ --overwrite
+	abigen --bin=mock_bridge/Mock_Bridge.bin \
+			--abi=mock_bridge/Mock_Bridge.abi \
+			--pkg=mock_bridge --out=mock_bridge/Mock_Bridge.go
+	awk '{sub("github.com/ethereum","github.com/scroll-tech")}1' mock_bridge/Mock_Bridge.go > temp && mv temp mock_bridge/Mock_Bridge.go
 
-bridge_bins: ## Builds the Bridge bins.
-	go build -o $(PWD)/build/bin/event_watcher ./cmd/event_watcher/
-	go build -o $(PWD)/build/bin/gas_oracle ./cmd/gas_oracle/
-	go build -o $(PWD)/build/bin/message_relayer ./cmd/msg_relayer/
-	go build -o $(PWD)/build/bin/rollup_relayer ./cmd/rollup_relayer/
-
-event_watcher: ## Builds the event_watcher bin
-	go build -o $(PWD)/build/bin/event_watcher ./cmd/event_watcher/
-
-gas_oracle: ## Builds the gas_oracle bin
-	go build -o $(PWD)/build/bin/gas_oracle ./cmd/gas_oracle/
-
-message_relayer: ## Builds the message_relayer bin
-	go build -o $(PWD)/build/bin/message_relayer ./cmd/msg_relayer/
-
-rollup_relayer: ## Builds the rollup_relayer bin
-	go build -o $(PWD)/build/bin/rollup_relayer ./cmd/rollup_relayer/
+bridge: ## Builds the Bridge instance.
+	go build -o $(PWD)/build/bin/bridge ./cmd
 
 test:
 	go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 $(PWD)/...
@@ -35,14 +24,8 @@ lint: ## Lint the files - used for CI
 clean: ## Empty out the bin folder
 	@rm -rf build/bin
 
-docker_push:
-	docker docker push scrolltech/gas-oracle:${IMAGE_VERSION}
-	docker docker push scrolltech/event-watcher:${IMAGE_VERSION}
-	docker docker push scrolltech/rollup-relayer:${IMAGE_VERSION}
-	docker docker push scrolltech/msg-relayer:${IMAGE_VERSION}
-
 docker:
-	DOCKER_BUILDKIT=1 docker build -t scrolltech/gas-oracle:${IMAGE_VERSION} ${REPO_ROOT_DIR}/ -f ${REPO_ROOT_DIR}/build/dockerfiles/gas_oracle.Dockerfile
-	DOCKER_BUILDKIT=1 docker build -t scrolltech/event-watcher:${IMAGE_VERSION} ${REPO_ROOT_DIR}/ -f ${REPO_ROOT_DIR}/build/dockerfiles/event_watcher.Dockerfile
-	DOCKER_BUILDKIT=1 docker build -t scrolltech/rollup-relayer:${IMAGE_VERSION} ${REPO_ROOT_DIR}/ -f ${REPO_ROOT_DIR}/build/dockerfiles/rollup_relayer.Dockerfile
-	DOCKER_BUILDKIT=1 docker build -t scrolltech/msg-relayer:${IMAGE_VERSION} ${REPO_ROOT_DIR}/ -f ${REPO_ROOT_DIR}/build/dockerfiles/msg_relayer.Dockerfile
+	docker build -t scrolltech/${IMAGE_NAME}:${IMAGE_VERSION} ${REPO_ROOT_DIR}/ -f ${REPO_ROOT_DIR}/build/dockerfiles/bridge.Dockerfile
+
+docker_push:
+	docker push scrolltech/${IMAGE_NAME}:${IMAGE_VERSION}

bridge/README.md

@@ -1,12 +1,13 @@
 # Bridge
 
+[![Actions Status](https://scroll-tech/bridge/workflows/Continuous%20Integration/badge.svg)](https://scroll-tech/bridge/actions)
+[![codecov](https://codecov.io/gh/scroll-tech/bridge/branch/master/graph/badge.svg)](https://codecov.io/gh/scroll-tech/bridge)
+
 This repo contains the Scroll bridge.
 
 In addition, launching the bridge will launch a separate instance of l2geth, and sets up a communication channel
 between the two, over JSON-RPC sockets.
 
-Something we should pay attention is that all private keys inside sender instance cannot be duplicated.
-
 ## Dependency
 
 + install `abigen`
@@ -22,7 +23,38 @@ make clean
 make bridge
 ```
 
+## db operation
+
+* init, show version, rollback, check status db
+
+```bash
+# DB_DSN: db data source name
+export DB_DSN="postgres://admin:123456@localhost/test_db?sslmode=disable"
+# DB_DRIVER: db driver name
+export DB_DRIVER="postgres"
+
+# TEST_DB_DRIVER, TEST_DB_DSN: It is required when executing db test cases
+export TEST_DB_DRIVER="postgres"
+export TEST_DB_DSN="postgres://admin:123456@localhost/test_db?sslmode=disable" 
+
+# init db
+./build/bin/bridge reset [--config ./config.json]
+
+# show db version
+./build/bin/bridge version [--config ./config.json]
+
+# rollback db
+/build/bin/bridge rollback [--version version] [--config ./config.json]
+
+# show db status
+./build/bin/bridge status [--config ./config.json]
+
+# migrate db
+./build/bin/bridge migrate [--config ./config.json]
+```
+
 ## Start
+
 * use default ports and config.json
 
 ```bash

bridge/abi/bridge_abi.go

@@ -3,240 +3,62 @@ package bridgeabi
 import (
 	"math/big"
 
-	"github.com/scroll-tech/go-ethereum/accounts/abi"
 	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
 	"github.com/scroll-tech/go-ethereum/common"
 )
 
-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
-	// 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
-	// 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 common.Hash
-	// L1RelayedMessageEventSignature = keccak256("RelayedMessage(bytes32)")
-	L1RelayedMessageEventSignature common.Hash
-	// L1FailedRelayedMessageEventSignature = keccak256("FailedRelayedMessage(bytes32)")
-	L1FailedRelayedMessageEventSignature common.Hash
-
-	// L1CommitBatchEventSignature = keccak256("CommitBatch(bytes32)")
-	L1CommitBatchEventSignature common.Hash
-	// L1FinalizeBatchEventSignature = keccak256("FinalizeBatch(bytes32)")
-	L1FinalizeBatchEventSignature common.Hash
-
-	// L1QueueTransactionEventSignature = keccak256("QueueTransaction(address,address,uint256,uint256,uint256,bytes)")
-	L1QueueTransactionEventSignature common.Hash
-
-	// L2SentMessageEventSignature = keccak256("SentMessage(address,address,uint256,uint256,uint256,bytes,uint256,uint256)")
-	L2SentMessageEventSignature common.Hash
-	// L2RelayedMessageEventSignature = keccak256("RelayedMessage(bytes32)")
-	L2RelayedMessageEventSignature common.Hash
-	// L2FailedRelayedMessageEventSignature = keccak256("FailedRelayedMessage(bytes32)")
-	L2FailedRelayedMessageEventSignature common.Hash
-
-	// L2ImportBlockEventSignature = keccak256("ImportBlock(bytes32,uint256,uint256,uint256,bytes32)")
-	L2ImportBlockEventSignature common.Hash
-
-	// L2AppendMessageEventSignature = keccak256("AppendMessage(uint256,bytes32)")
-	L2AppendMessageEventSignature common.Hash
-)
-
-func init() {
-	ScrollChainABI, _ = ScrollChainMetaData.GetAbi()
-	L1ScrollMessengerABI, _ = L1ScrollMessengerMetaData.GetAbi()
-	L1MessageQueueABI, _ = L1MessageQueueMetaData.GetAbi()
-	L2GasPriceOracleABI, _ = L2GasPriceOracleMetaData.GetAbi()
-
-	L2ScrollMessengerABI, _ = L2ScrollMessengerMetaData.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
-
-	L1CommitBatchEventSignature = ScrollChainABI.Events["CommitBatch"].ID
-	L1FinalizeBatchEventSignature = ScrollChainABI.Events["FinalizeBatch"].ID
-
-	L1QueueTransactionEventSignature = L1MessageQueueABI.Events["QueueTransaction"].ID
-
-	L2SentMessageEventSignature = L2ScrollMessengerABI.Events["SentMessage"].ID
-	L2RelayedMessageEventSignature = L2ScrollMessengerABI.Events["RelayedMessage"].ID
-	L2FailedRelayedMessageEventSignature = L2ScrollMessengerABI.Events["FailedRelayedMessage"].ID
-
-	L2ImportBlockEventSignature = L1BlockContainerABI.Events["ImportBlock"].ID
-
-	L2AppendMessageEventSignature = L2MessageQueueABI.Events["AppendMessage"].ID
-}
-
 // 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\"}]",
+// RollupMetaData contains all meta data concerning the Rollup contract.
+var RollupMetaData = &bind.MetaData{
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"_blockHash\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"_blockHeight\",\"type\":\"uint64\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"_parentHash\",\"type\":\"bytes32\"}],\"name\":\"CommitBlock\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"_blockHash\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"uint64\",\"name\":\"_blockHeight\",\"type\":\"uint64\"}],\"name\":\"FinalizeBlock\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"_blockHash\",\"type\":\"bytes32\"}],\"name\":\"RevertBlock\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_sender\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_target\",\"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\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"appendMessage\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"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\"}],\"internalType\":\"struct IZKRollup.BlockHeader\",\"name\":\"_header\",\"type\":\"tuple\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"caller\",\"type\":\"address\"},{\"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\":\"struct IZKRollup.Layer2Transaction[]\",\"name\":\"_txns\",\"type\":\"tuple[]\"}],\"name\":\"commitBlock\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_blockHash\",\"type\":\"bytes32\"},{\"internalType\":\"uint256[]\",\"name\":\"_proof\",\"type\":\"uint256[]\"},{\"internalType\":\"uint256[]\",\"name\":\"_instances\",\"type\":\"uint256[]\"}],\"name\":\"finalizeBlockWithProof\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_index\",\"type\":\"uint256\"}],\"name\":\"getMessageHashByIndex\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getNextQueueIndex\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"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\":\"_blockHash\",\"type\":\"bytes32\"}],\"name\":\"revertBlock\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_blockNumber\",\"type\":\"uint256\"}],\"name\":\"verifyMessageStateProof\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"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\"}]",
+// L1GatewayMetaData contains all meta data concerning the L1Gateway contract.
+var L1GatewayMetaData = &bind.MetaData{
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_l1Token\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_l2Token\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_from\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"DepositERC20\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"DepositETH\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_l1Token\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_l2Token\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_from\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"FinalizeWithdrawERC20\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"FinalizeWithdrawETH\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"counterpart\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"depositERC20\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_token\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"depositERC20\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_token\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"depositERC20AndCall\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"depositETH\",\"outputs\":[],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"depositETH\",\"outputs\":[],\"stateMutability\":\"payable\",\"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\"}]",
+// 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\":\"uint256\",\"name\":\"blockNumber\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"merkleProof\",\"type\":\"bytes\"}],\"internalType\":\"struct IL1ScrollMessenger.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\"}]",
 }
 
-// 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\":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\":\"address\",\"name\":\"_oldWhitelist\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"_newWhitelist\",\"type\":\"address\"}],\"name\":\"UpdateWhitelist\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"estimateCrossDomainMessageFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"initialize\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"l2BaseFee\",\"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\":\"uint256\",\"name\":\"_l2BaseFee\",\"type\":\"uint256\"}],\"name\":\"setL2BaseFee\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_newWhitelist\",\"type\":\"address\"}],\"name\":\"updateWhitelist\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"whitelist\",\"outputs\":[{\"internalType\":\"contract IWhitelist\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
+// L2GatewayMetaData contains all meta data concerning the L2Gateway contract.
+var L2GatewayMetaData = &bind.MetaData{
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_l1Token\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_l2Token\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_from\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"FinalizeDepositERC20\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"FinalizeDepositETH\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_l1Token\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_l2Token\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_from\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"WithdrawERC20\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"WithdrawETH\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"withdrawERC20\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_token\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"withdrawERC20\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_token\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_amount\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"withdrawERC20AndCall\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"withdrawETH\",\"outputs\":[],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"withdrawETH\",\"outputs\":[],\"stateMutability\":\"payable\",\"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\":\"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\"}],\"name\":\"relayMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"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\"}]",
+// IZKRollupBlockHeader is an auto generated low-level Go binding around an user-defined struct.
+type IZKRollupBlockHeader struct {
+	BlockHash   [32]byte
+	ParentHash  [32]byte
+	BaseFee     *big.Int
+	StateRoot   [32]byte
+	BlockHeight uint64
+	GasUsed     uint64
+	Timestamp   uint64
+	ExtraData   []byte
 }
 
-// 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\"}]",
+// IZKRollupLayer2Transaction is an auto generated low-level Go binding around an user-defined struct.
+type IZKRollupLayer2Transaction struct {
+	Caller   common.Address
+	Nonce    uint64
+	Target   common.Address
+	Gas      uint64
+	GasPrice *big.Int
+	Value    *big.Int
+	Data     []byte
 }
 
 // IL1ScrollMessengerL2MessageProof is an auto generated low-level Go binding around an user-defined struct.
 type IL1ScrollMessengerL2MessageProof struct {
-	BatchHash   common.Hash
+	BlockNumber *big.Int
 	MerkleProof []byte
 }
-
-// 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
-}
-
-// 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
-}
-
-// L1CommitBatchEvent represents a CommitBatch event raised by the ScrollChain contract.
-type L1CommitBatchEvent struct {
-	BatchHash common.Hash
-}
-
-// L1FinalizeBatchEvent represents a FinalizeBatch event raised by the ScrollChain contract.
-type L1FinalizeBatchEvent struct {
-	BatchHash common.Hash
-}
-
-// L1RevertBatchEvent represents a RevertBatch event raised by the ScrollChain 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
-}
-
-// L1SentMessageEvent represents a SentMessage event raised by the L1ScrollMessenger contract.
-type L1SentMessageEvent struct {
-	Sender       common.Address
-	Target       common.Address
-	Value        *big.Int
-	MessageNonce *big.Int
-	GasLimit     *big.Int
-	Message      []byte
-}
-
-// L1FailedRelayedMessageEvent represents a FailedRelayedMessage event raised by the L1ScrollMessenger contract.
-type L1FailedRelayedMessageEvent struct {
-	MessageHash common.Hash
-}
-
-// L1RelayedMessageEvent represents a RelayedMessage event raised by the L1ScrollMessenger contract.
-type L1RelayedMessageEvent struct {
-	MessageHash common.Hash
-}
-
-// L2AppendMessageEvent represents a AppendMessage event raised by the L2MessageQueue contract.
-type L2AppendMessageEvent struct {
-	Index       *big.Int
-	MessageHash common.Hash
-}
-
-// L2ImportBlockEvent represents a ImportBlock event raised by the L1BlockContainer contract.
-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
-	Value        *big.Int
-	MessageNonce *big.Int
-	GasLimit     *big.Int
-	Message      []byte
-}
-
-// L2FailedRelayedMessageEvent represents a FailedRelayedMessage event raised by the L2ScrollMessenger contract.
-type L2FailedRelayedMessageEvent struct {
-	MessageHash 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)
-}

bridge/abi/bridge_abi_test.go

@@ -10,74 +10,56 @@ import (
 	bridge_abi "scroll-tech/bridge/abi"
 )
 
-func TestEventSignature(t *testing.T) {
+func TestPackRelayMessageWithProof(t *testing.T) {
 	assert := assert.New(t)
 
-	assert.Equal(bridge_abi.L1SentMessageEventSignature, common.HexToHash("104371f3b442861a2a7b82a070afbbaab748bb13757bf47769e170e37809ec1e"))
-	assert.Equal(bridge_abi.L1RelayedMessageEventSignature, common.HexToHash("4641df4a962071e12719d8c8c8e5ac7fc4d97b927346a3d7a335b1f7517e133c"))
-	assert.Equal(bridge_abi.L1FailedRelayedMessageEventSignature, common.HexToHash("99d0e048484baa1b1540b1367cb128acd7ab2946d1ed91ec10e3c85e4bf51b8f"))
-
-	assert.Equal(bridge_abi.L1CommitBatchEventSignature, common.HexToHash("2cdc615c74452778c0fb6184735e014c13aad2b62774fe0b09bd1dcc2cc14a62"))
-	assert.Equal(bridge_abi.L1FinalizeBatchEventSignature, common.HexToHash("6be443154c959a7a1645b4392b6fa97d8e8ab6e8fd853d7085e8867083737d79"))
-
-	assert.Equal(bridge_abi.L1QueueTransactionEventSignature, common.HexToHash("bdcc7517f8fe3db6506dfd910942d0bbecaf3d6a506dadea65b0d988e75b9439"))
-
-	assert.Equal(bridge_abi.L2SentMessageEventSignature, common.HexToHash("104371f3b442861a2a7b82a070afbbaab748bb13757bf47769e170e37809ec1e"))
-	assert.Equal(bridge_abi.L2RelayedMessageEventSignature, common.HexToHash("4641df4a962071e12719d8c8c8e5ac7fc4d97b927346a3d7a335b1f7517e133c"))
-	assert.Equal(bridge_abi.L2FailedRelayedMessageEventSignature, common.HexToHash("99d0e048484baa1b1540b1367cb128acd7ab2946d1ed91ec10e3c85e4bf51b8f"))
-
-	assert.Equal(bridge_abi.L2ImportBlockEventSignature, common.HexToHash("a7823f45e1ee21f9530b77959b57507ad515a14fa9fa24d262ee80e79b2b5745"))
-
-	assert.Equal(bridge_abi.L2AppendMessageEventSignature, common.HexToHash("faa617c2d8ce12c62637dbce76efcc18dae60574aa95709bdcedce7e76071693"))
-}
-
-func TestPackRelayL2MessageWithProof(t *testing.T) {
-	assert := assert.New(t)
-	l1MessengerABI, err := bridge_abi.L1ScrollMessengerMetaData.GetAbi()
+	l1MessengerABI, err := bridge_abi.L1MessengerMetaData.GetAbi()
 	assert.NoError(err)
 
 	proof := bridge_abi.IL1ScrollMessengerL2MessageProof{
-		BatchHash:   common.Hash{},
+		BlockNumber: big.NewInt(0),
 		MerkleProof: make([]byte, 0),
 	}
-	_, 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) {
+func TestPackCommitBlock(t *testing.T) {
 	assert := assert.New(t)
 
-	scrollChainABI, err := bridge_abi.ScrollChainMetaData.GetAbi()
+	l1RollupABI, err := bridge_abi.RollupMetaData.GetAbi()
 	assert.NoError(err)
 
-	header := bridge_abi.IScrollChainBlockContext{
-		BlockHash:       common.Hash{},
-		ParentHash:      common.Hash{},
-		BlockNumber:     0,
-		Timestamp:       0,
-		BaseFee:         big.NewInt(0),
-		GasLimit:        0,
-		NumTransactions: 0,
-		NumL1Messages:   0,
+	header := bridge_abi.IZKRollupBlockHeader{
+		BlockHash:   common.Hash{},
+		ParentHash:  common.Hash{},
+		BaseFee:     big.NewInt(0),
+		StateRoot:   common.Hash{},
+		BlockHeight: 0,
+		GasUsed:     0,
+		Timestamp:   0,
+		ExtraData:   make([]byte, 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),
+	txns := make([]bridge_abi.IZKRollupLayer2Transaction, 5)
+	for i := 0; i < 5; i++ {
+		txns[i] = bridge_abi.IZKRollupLayer2Transaction{
+			Caller:   common.Address{},
+			Target:   common.Address{},
+			Nonce:    0,
+			Gas:      0,
+			GasPrice: big.NewInt(0),
+			Value:    big.NewInt(0),
+			Data:     make([]byte, 0),
+		}
 	}
-
-	_, err = scrollChainABI.Pack("commitBatch", batch)
+	_, err = l1RollupABI.Pack("commitBlock", header, txns)
 	assert.NoError(err)
 }
 
-func TestPackFinalizeBatchWithProof(t *testing.T) {
+func TestPackFinalizeBlockWithProof(t *testing.T) {
 	assert := assert.New(t)
 
-	l1RollupABI, err := bridge_abi.ScrollChainMetaData.GetAbi()
+	l1RollupABI, err := bridge_abi.RollupMetaData.GetAbi()
 	assert.NoError(err)
 
 	proof := make([]*big.Int, 10)
@@ -87,47 +69,16 @@ func TestPackFinalizeBatchWithProof(t *testing.T) {
 		instance[i] = big.NewInt(0)
 	}
 
-	_, err = l1RollupABI.Pack("finalizeBatchWithProof", common.Hash{}, proof, instance)
+	_, err = l1RollupABI.Pack("finalizeBlockWithProof", common.Hash{}, proof, instance)
 	assert.NoError(err)
 }
 
-func TestPackRelayL1Message(t *testing.T) {
+func TestPackRelayMessage(t *testing.T) {
 	assert := assert.New(t)
 
-	l2MessengerABI, err := bridge_abi.L2ScrollMessengerMetaData.GetAbi()
+	l2MessengerABI, err := bridge_abi.L2MessengerMetaData.GetAbi()
 	assert.NoError(err)
 
-	_, err = l2MessengerABI.Pack("relayMessage", common.Address{}, common.Address{}, big.NewInt(0), big.NewInt(0), make([]byte, 0))
-	assert.NoError(err)
-}
-
-func TestPackSetL1BaseFee(t *testing.T) {
-	assert := assert.New(t)
-
-	l1GasOracleABI, err := bridge_abi.L1GasPriceOracleMetaData.GetAbi()
-	assert.NoError(err)
-
-	baseFee := big.NewInt(2333)
-	_, err = l1GasOracleABI.Pack("setL1BaseFee", baseFee)
-	assert.NoError(err)
-}
-
-func TestPackSetL2BaseFee(t *testing.T) {
-	assert := assert.New(t)
-
-	l2GasOracleABI, err := bridge_abi.L2GasPriceOracleMetaData.GetAbi()
-	assert.NoError(err)
-
-	baseFee := big.NewInt(2333)
-	_, err = l2GasOracleABI.Pack("setL2BaseFee", baseFee)
-	assert.NoError(err)
-}
-
-func TestPackImportBlock(t *testing.T) {
-	assert := assert.New(t)
-
-	l1BlockContainerABI := bridge_abi.L1BlockContainerABI
-
-	_, err := l1BlockContainerABI.Pack("importBlockHeader", common.Hash{}, make([]byte, 0), false)
+	_, err = l2MessengerABI.Pack("relayMessage", common.Address{}, common.Address{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), make([]byte, 0))
 	assert.NoError(err)
 }

bridge/cmd/db_client.go

@@ -0,0 +1,88 @@
+package main
+
+import (
+	"scroll-tech/bridge/config"
+
+	"github.com/jmoiron/sqlx"
+	"github.com/urfave/cli/v2"
+
+	"github.com/scroll-tech/go-ethereum/log"
+
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
+)
+
+func initDB(file string) (*sqlx.DB, error) {
+	cfg, err := config.NewConfig(file)
+	if err != nil {
+		return nil, err
+	}
+	dbCfg := cfg.DBConfig
+	factory, err := database.NewOrmFactory(dbCfg)
+	if err != nil {
+		return nil, err
+	}
+	log.Debug("Got db config from env", "driver name", dbCfg.DriverName, "dsn", dbCfg.DSN)
+
+	return factory.GetDB(), nil
+}
+
+// ResetDB clean or reset database.
+func ResetDB(ctx *cli.Context) error {
+	db, err := initDB(ctx.String(configFileFlag.Name))
+	if err != nil {
+		return err
+	}
+
+	var version int64
+	err = migrate.Rollback(db.DB, &version)
+	if err != nil {
+		return err
+	}
+	log.Info("successful to reset", "init version", version)
+
+	return nil
+}
+
+// CheckDBStatus check db status
+func CheckDBStatus(ctx *cli.Context) error {
+	db, err := initDB(ctx.String(configFileFlag.Name))
+	if err != nil {
+		return err
+	}
+
+	return migrate.Status(db.DB)
+}
+
+// DBVersion return the latest version
+func DBVersion(ctx *cli.Context) error {
+	db, err := initDB(ctx.String(configFileFlag.Name))
+	if err != nil {
+		return err
+	}
+
+	version, err := migrate.Current(db.DB)
+	log.Info("show database version", "db version", version)
+
+	return err
+}
+
+// MigrateDB migrate db
+func MigrateDB(ctx *cli.Context) error {
+	db, err := initDB(ctx.String(configFileFlag.Name))
+	if err != nil {
+		return err
+	}
+
+	return migrate.Migrate(db.DB)
+}
+
+// RollbackDB rollback db by version
+func RollbackDB(ctx *cli.Context) error {
+	db, err := initDB(ctx.String(configFileFlag.Name))
+	if err != nil {
+		return err
+	}
+	version := ctx.Int64("version")
+	return migrate.Rollback(db.DB, &version)
+}

bridge/cmd/event_watcher/app/app.go

@@ -1,114 +0,0 @@
-package app
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"os/signal"
-	"time"
-
-	"github.com/scroll-tech/go-ethereum/ethclient"
-	"github.com/scroll-tech/go-ethereum/log"
-	"github.com/urfave/cli/v2"
-
-	"scroll-tech/database"
-
-	"scroll-tech/common/metrics"
-	"scroll-tech/common/version"
-
-	"scroll-tech/bridge/config"
-	"scroll-tech/bridge/watcher"
-
-	cutils "scroll-tech/common/utils"
-)
-
-var (
-	app *cli.App
-)
-
-func init() {
-	// Set up event-watcher app info.
-	app = cli.NewApp()
-
-	app.Action = action
-	app.Name = "event-watcher"
-	app.Usage = "The Scroll Event Watcher"
-	app.Version = version.Version
-	app.Flags = append(app.Flags, cutils.CommonFlags...)
-	app.Commands = []*cli.Command{}
-
-	app.Before = func(ctx *cli.Context) error {
-		return cutils.LogSetup(ctx)
-	}
-
-	// Register `event-watcher-test` app for integration-test.
-	cutils.RegisterSimulation(app, cutils.EventWatcherApp)
-}
-
-func action(ctx *cli.Context) error {
-	// Load config file.
-	cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
-	cfg, err := config.NewConfig(cfgFile)
-	if err != nil {
-		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
-	}
-
-	subCtx, cancel := context.WithCancel(ctx.Context)
-	// Init db connection
-	var ormFactory database.OrmFactory
-	if ormFactory, err = database.NewOrmFactory(cfg.DBConfig); err != nil {
-		log.Crit("failed to init db connection", "err", err)
-	}
-
-	defer func() {
-		cancel()
-		err = ormFactory.Close()
-		if err != nil {
-			log.Error("can not close ormFactory", "error", err)
-		}
-	}()
-
-	// Start metrics server.
-	metrics.Serve(subCtx, ctx)
-	l1client, err := ethclient.Dial(cfg.L1Config.Endpoint)
-	if err != nil {
-		log.Error("failed to connect l1 geth", "config file", cfgFile, "error", err)
-		return err
-	}
-
-	l2client, err := ethclient.Dial(cfg.L2Config.Endpoint)
-	if err != nil {
-		log.Error("failed to connect l2 geth", "config file", cfgFile, "error", err)
-		return err
-	}
-	l1watcher := watcher.NewL1WatcherClient(ctx.Context, l1client, cfg.L1Config.StartHeight, cfg.L1Config.Confirmations, cfg.L1Config.L1MessengerAddress, cfg.L1Config.L1MessageQueueAddress, cfg.L1Config.ScrollChainContractAddress, ormFactory)
-	l2watcher := watcher.NewL2WatcherClient(ctx.Context, l2client, cfg.L2Config.Confirmations, cfg.L2Config.L2MessengerAddress, cfg.L2Config.L2MessageQueueAddress, cfg.L2Config.WithdrawTrieRootSlot, ormFactory)
-
-	go cutils.Loop(subCtx, 10*time.Second, func() {
-		if loopErr := l1watcher.FetchContractEvent(); loopErr != nil {
-			log.Error("Failed to fetch bridge contract", "err", loopErr)
-		}
-	})
-
-	// Start l2 watcher process
-	go cutils.Loop(subCtx, 2*time.Second, l2watcher.FetchContractEvent)
-	// Finish start all l2 functions
-	log.Info("Start event-watcher successfully")
-
-	// Catch CTRL-C to ensure a graceful shutdown.
-	interrupt := make(chan os.Signal, 1)
-	signal.Notify(interrupt, os.Interrupt)
-
-	// Wait until the interrupt signal is received from an OS signal.
-	<-interrupt
-
-	return nil
-}
-
-// Run event watcher cmd instance.
-func Run() {
-	if err := app.Run(os.Args); err != nil {
-		_, _ = fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-}

bridge/cmd/event_watcher/main.go

@@ -1,7 +0,0 @@
-package main
-
-import "scroll-tech/bridge/cmd/event_watcher/app"
-
-func main() {
-	app.Run()
-}

bridge/cmd/flags.go

@@ -0,0 +1,93 @@
+package main
+
+import "github.com/urfave/cli/v2"
+
+var (
+	commonFlags = []cli.Flag{
+		&configFileFlag,
+		&verbosityFlag,
+		&logFileFlag,
+		&logJSONFormat,
+		&logDebugFlag,
+	}
+	// configFileFlag load json type config file.
+	configFileFlag = cli.StringFlag{
+		Name:  "config",
+		Usage: "JSON configuration file",
+		Value: "./config.json",
+	}
+	// verbosityFlag log level.
+	verbosityFlag = cli.IntFlag{
+		Name:  "verbosity",
+		Usage: "Logging verbosity: 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=detail",
+		Value: 3,
+	}
+	// logFileFlag decides where the logger output is sent. If this flag is left
+	// empty, it will log to stdout.
+	logFileFlag = cli.StringFlag{
+		Name:  "log.file",
+		Usage: "Tells the sequencer where to write log entries",
+	}
+	logJSONFormat = cli.BoolFlag{
+		Name:  "log.json",
+		Usage: "Tells the sequencer whether log format is json or not",
+		Value: true,
+	}
+	logDebugFlag = cli.BoolFlag{
+		Name:  "log.debug",
+		Usage: "Prepends log messages with call-site location (file and line number)",
+	}
+	apiFlags = []cli.Flag{
+		&httpEnabledFlag,
+		&httpListenAddrFlag,
+		&httpPortFlag,
+	}
+	// httpEnabledFlag enable rpc server.
+	httpEnabledFlag = cli.BoolFlag{
+		Name:  "http",
+		Usage: "Enable the HTTP-RPC server",
+		Value: false,
+	}
+	// httpListenAddrFlag set the http address.
+	httpListenAddrFlag = cli.StringFlag{
+		Name:  "http.addr",
+		Usage: "HTTP-RPC server listening interface",
+		Value: "localhost",
+	}
+	// httpPortFlag set http.port.
+	httpPortFlag = cli.IntFlag{
+		Name:  "http.port",
+		Usage: "HTTP-RPC server listening port",
+		Value: 8290,
+	}
+
+	l1Flags = []cli.Flag{
+		&l1ChainIDFlag,
+		&l1UrlFlag,
+	}
+	l1ChainIDFlag = cli.IntFlag{
+		Name:  "l1.chainID",
+		Usage: "l1 chain id",
+		Value: 4,
+	}
+	l1UrlFlag = cli.StringFlag{
+		Name:  "l1.endpoint",
+		Usage: "The endpoint connect to l1chain node",
+		Value: "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
+	}
+
+	l2Flags = []cli.Flag{
+		&l2ChainIDFlag,
+		&l2UrlFlag,
+	}
+	l2ChainIDFlag = cli.IntFlag{
+		Name:  "l2.chainID",
+		Usage: "l2 chain id",
+		Value: 53077,
+	}
+	l2UrlFlag = cli.StringFlag{
+		Name:  "l2.endpoint",
+		Usage: "The endpoint connect to l2chain node",
+		Value: "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc",
+	}
+)

bridge/cmd/gas_oracle/app/app.go

@@ -1,136 +0,0 @@
-package app
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"os/signal"
-	"time"
-
-	"github.com/scroll-tech/go-ethereum/ethclient"
-	"github.com/scroll-tech/go-ethereum/log"
-	"github.com/urfave/cli/v2"
-
-	"scroll-tech/database"
-
-	"scroll-tech/common/metrics"
-	"scroll-tech/common/version"
-
-	"scroll-tech/bridge/config"
-	"scroll-tech/bridge/relayer"
-	"scroll-tech/bridge/utils"
-	"scroll-tech/bridge/watcher"
-
-	cutils "scroll-tech/common/utils"
-)
-
-var (
-	app *cli.App
-)
-
-func init() {
-	// Set up gas-oracle app info.
-	app = cli.NewApp()
-
-	app.Action = action
-	app.Name = "gas-oracle"
-	app.Usage = "The Scroll Gas Oracle"
-	app.Description = "Scroll Gas Oracle."
-	app.Version = version.Version
-	app.Flags = append(app.Flags, cutils.CommonFlags...)
-	app.Commands = []*cli.Command{}
-
-	app.Before = func(ctx *cli.Context) error {
-		return cutils.LogSetup(ctx)
-	}
-
-	// Register `gas-oracle-test` app for integration-test.
-	cutils.RegisterSimulation(app, cutils.GasOracleApp)
-}
-
-func action(ctx *cli.Context) error {
-	// Load config file.
-	cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
-	cfg, err := config.NewConfig(cfgFile)
-	if err != nil {
-		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
-	}
-	subCtx, cancel := context.WithCancel(ctx.Context)
-	// Init db connection
-	var ormFactory database.OrmFactory
-	if ormFactory, err = database.NewOrmFactory(cfg.DBConfig); err != nil {
-		log.Crit("failed to init db connection", "err", err)
-	}
-
-	defer func() {
-		cancel()
-		err = ormFactory.Close()
-		if err != nil {
-			log.Error("can not close ormFactory", "error", err)
-		}
-	}()
-	// Start metrics server.
-	metrics.Serve(subCtx, ctx)
-
-	l1client, err := ethclient.Dial(cfg.L1Config.Endpoint)
-	if err != nil {
-		log.Error("failed to connect l1 geth", "config file", cfgFile, "error", err)
-		return err
-	}
-
-	// Init l2geth connection
-	l2client, err := ethclient.Dial(cfg.L2Config.Endpoint)
-	if err != nil {
-		log.Error("failed to connect l2 geth", "config file", cfgFile, "error", err)
-		return err
-	}
-
-	l1watcher := watcher.NewL1WatcherClient(ctx.Context, l1client, cfg.L1Config.StartHeight, cfg.L1Config.Confirmations, cfg.L1Config.L1MessengerAddress, cfg.L1Config.L1MessageQueueAddress, cfg.L1Config.ScrollChainContractAddress, ormFactory)
-
-	l1relayer, err := relayer.NewLayer1Relayer(ctx.Context, ormFactory, cfg.L1Config.RelayerConfig)
-	if err != nil {
-		log.Error("failed to create new l1 relayer", "config file", cfgFile, "error", err)
-		return err
-	}
-	l2relayer, err := relayer.NewLayer2Relayer(ctx.Context, l2client, ormFactory, cfg.L2Config.RelayerConfig)
-	if err != nil {
-		log.Error("failed to create new l2 relayer", "config file", cfgFile, "error", err)
-		return err
-	}
-	// Start l1 watcher process
-	go cutils.LoopWithContext(subCtx, 10*time.Second, func(ctx context.Context) {
-		number, loopErr := utils.GetLatestConfirmedBlockNumber(ctx, l1client, cfg.L1Config.Confirmations)
-		if loopErr != nil {
-			log.Error("failed to get block number", "err", loopErr)
-			return
-		}
-
-		if loopErr = l1watcher.FetchBlockHeader(number); loopErr != nil {
-			log.Error("Failed to fetch L1 block header", "lastest", number, "err", loopErr)
-		}
-	})
-
-	// Start l1relayer process
-	go cutils.Loop(subCtx, 10*time.Second, l1relayer.ProcessGasPriceOracle)
-	go cutils.Loop(subCtx, 2*time.Second, l2relayer.ProcessGasPriceOracle)
-
-	// Finish start all message relayer functions
-	log.Info("Start gas-oracle successfully")
-
-	// Catch CTRL-C to ensure a graceful shutdown.
-	interrupt := make(chan os.Signal, 1)
-	signal.Notify(interrupt, os.Interrupt)
-
-	// Wait until the interrupt signal is received from an OS signal.
-	<-interrupt
-
-	return nil
-}
-
-// Run message_relayer cmd instance.
-func Run() {
-	if err := app.Run(os.Args); err != nil {
-		_, _ = fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-}

bridge/cmd/gas_oracle/main.go

@@ -1,7 +0,0 @@
-package main
-
-import "scroll-tech/bridge/cmd/gas_oracle/app"
-
-func main() {
-	app.Run()
-}

bridge/cmd/main.go

@@ -0,0 +1,191 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/signal"
+
+	"github.com/scroll-tech/go-ethereum/log"
+	"github.com/scroll-tech/go-ethereum/rpc"
+	"github.com/urfave/cli/v2"
+
+	"scroll-tech/common/utils"
+	"scroll-tech/common/version"
+	"scroll-tech/database"
+
+	"scroll-tech/bridge/config"
+	"scroll-tech/bridge/l1"
+	"scroll-tech/bridge/l2"
+)
+
+func main() {
+	// Set up Bridge app info.
+	app := cli.NewApp()
+
+	app.Action = action
+	app.Name = "bridge"
+	app.Usage = "The Scroll Bridge"
+	app.Version = version.Version
+	app.Flags = append(app.Flags, commonFlags...)
+	app.Flags = append(app.Flags, apiFlags...)
+	app.Flags = append(app.Flags, l1Flags...)
+	app.Flags = append(app.Flags, l2Flags...)
+
+	app.Before = func(ctx *cli.Context) error {
+		return utils.Setup(&utils.LogConfig{
+			LogFile:       ctx.String(logFileFlag.Name),
+			LogJSONFormat: ctx.Bool(logJSONFormat.Name),
+			LogDebug:      ctx.Bool(logDebugFlag.Name),
+			Verbosity:     ctx.Int(verbosityFlag.Name),
+		})
+	}
+	app.Commands = []*cli.Command{
+		{
+			Name:   "reset",
+			Usage:  "Clean and reset database.",
+			Action: ResetDB,
+			Flags: []cli.Flag{
+				&configFileFlag,
+			},
+		},
+		{
+			Name:   "status",
+			Usage:  "Check migration status.",
+			Action: CheckDBStatus,
+			Flags: []cli.Flag{
+				&configFileFlag,
+			},
+		},
+		{
+			Name:   "version",
+			Usage:  "Display the current database version.",
+			Action: DBVersion,
+			Flags: []cli.Flag{
+				&configFileFlag,
+			},
+		},
+		{
+			Name:   "migrate",
+			Usage:  "Migrate the database to the latest version.",
+			Action: MigrateDB,
+			Flags: []cli.Flag{
+				&configFileFlag,
+			},
+		},
+		{
+			Name:   "rollback",
+			Usage:  "Roll back the database to a previous <version>. Rolls back a single migration if no version specified.",
+			Action: RollbackDB,
+			Flags: []cli.Flag{
+				&configFileFlag,
+				&cli.IntFlag{
+					Name:  "version",
+					Usage: "Rollback to the specified version.",
+					Value: 0,
+				},
+			},
+		},
+	}
+
+	// Run the sequencer.
+	if err := app.Run(os.Args); err != nil {
+		_, _ = fmt.Fprintln(os.Stderr, err)
+		os.Exit(1)
+	}
+}
+
+func applyConfig(ctx *cli.Context, cfg *config.Config) {
+	if ctx.IsSet(l1ChainIDFlag.Name) {
+		cfg.L1Config.ChainID = ctx.Int64(l1ChainIDFlag.Name)
+	}
+	if ctx.IsSet(l1UrlFlag.Name) {
+		cfg.L1Config.Endpoint = ctx.String(l1UrlFlag.Name)
+	}
+	if ctx.IsSet(l2ChainIDFlag.Name) {
+		cfg.L2Config.ChainID = ctx.Int64(l2ChainIDFlag.Name)
+	}
+	if ctx.IsSet(l2UrlFlag.Name) {
+		cfg.L2Config.Endpoint = ctx.String(l2UrlFlag.Name)
+	}
+}
+
+func action(ctx *cli.Context) error {
+	// Load config file.
+	cfgFile := ctx.String(configFileFlag.Name)
+	cfg, err := config.NewConfig(cfgFile)
+	if err != nil {
+		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
+	}
+	applyConfig(ctx, cfg)
+
+	// init db connection
+	var ormFactory database.OrmFactory
+	if ormFactory, err = database.NewOrmFactory(cfg.DBConfig); err != nil {
+		log.Crit("failed to init db connection", "err", err)
+	}
+
+	var (
+		l1Backend *l1.Backend
+		l2Backend *l2.Backend
+	)
+	// @todo change nil to actual client after https://scroll-tech/bridge/pull/40 merged
+	l1Backend, err = l1.New(ctx.Context, cfg.L1Config, ormFactory)
+	if err != nil {
+		return err
+	}
+	l2Backend, err = l2.New(ctx.Context, cfg.L2Config, ormFactory)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		l1Backend.Stop()
+		l2Backend.Stop()
+		err = ormFactory.Close()
+		if err != nil {
+			log.Error("can not close ormFactory", err)
+		}
+	}()
+
+	// Start all modules.
+	if err = l1Backend.Start(); err != nil {
+		log.Crit("couldn't start l1 backend", "error", err)
+	}
+	if err = l2Backend.Start(); err != nil {
+		log.Crit("couldn't start l2 backend", "error", err)
+	}
+
+	// Register api and start rpc service.
+	if ctx.Bool(httpEnabledFlag.Name) {
+		srv := rpc.NewServer()
+		apis := l2Backend.APIs()
+		for _, api := range apis {
+			if err = srv.RegisterName(api.Namespace, api.Service); err != nil {
+				log.Crit("register namespace failed", "namespace", api.Namespace, "error", err)
+			}
+		}
+		handler, addr, err := utils.StartHTTPEndpoint(
+			fmt.Sprintf(
+				"%s:%d",
+				ctx.String(httpListenAddrFlag.Name),
+				ctx.Int(httpPortFlag.Name)),
+			rpc.DefaultHTTPTimeouts,
+			srv)
+		if err != nil {
+			log.Crit("Could not start RPC api", "error", err)
+		}
+		defer func() {
+			_ = handler.Shutdown(ctx.Context)
+			log.Info("HTTP endpoint closed", "url", fmt.Sprintf("http://%v/", addr))
+		}()
+		log.Info("HTTP endpoint opened", "url", fmt.Sprintf("http://%v/", addr))
+	}
+
+	// Catch CTRL-C to ensure a graceful shutdown.
+	interrupt := make(chan os.Signal, 1)
+	signal.Notify(interrupt, os.Interrupt)
+
+	// Wait until the interrupt signal is received from an OS signal.
+	<-interrupt
+
+	return nil
+}

bridge/cmd/mock_app.go

@@ -1,106 +0,0 @@
-package app
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"testing"
-	"time"
-
-	"scroll-tech/common/cmd"
-	"scroll-tech/common/docker"
-	"scroll-tech/common/utils"
-
-	"scroll-tech/bridge/config"
-)
-
-// MockApp mockApp-test client manager.
-type MockApp struct {
-	Config *config.Config
-	base   *docker.App
-
-	mockApps map[utils.MockAppName]docker.AppAPI
-
-	originFile string
-	bridgeFile string
-
-	args []string
-}
-
-// NewBridgeApp return a new bridgeApp manager, name mush be one them.
-func NewBridgeApp(base *docker.App, file string) *MockApp {
-
-	bridgeFile := fmt.Sprintf("/tmp/%d_bridge-config.json", base.Timestamp)
-	bridgeApp := &MockApp{
-		base:       base,
-		mockApps:   make(map[utils.MockAppName]docker.AppAPI),
-		originFile: file,
-		bridgeFile: bridgeFile,
-		args:       []string{"--log.debug", "--config", bridgeFile},
-	}
-	if err := bridgeApp.MockConfig(true); err != nil {
-		panic(err)
-	}
-	return bridgeApp
-}
-
-// RunApp run bridge-test child process by multi parameters.
-func (b *MockApp) RunApp(t *testing.T, name utils.MockAppName, args ...string) {
-	if !(name == utils.EventWatcherApp ||
-		name == utils.GasOracleApp ||
-		name == utils.MessageRelayerApp ||
-		name == utils.RollupRelayerApp) {
-		t.Errorf(fmt.Sprintf("Don't support the mock app, name: %s", name))
-		return
-	}
-
-	if app, ok := b.mockApps[name]; ok {
-		t.Logf(fmt.Sprintf("%s already exist, free the current and recreate again", string(name)))
-		app.WaitExit()
-	}
-	appAPI := cmd.NewCmd(string(name), append(b.args, args...)...)
-	keyword := fmt.Sprintf("Start %s successfully", string(name)[:len(string(name))-len("-test")])
-	appAPI.RunApp(func() bool { return appAPI.WaitResult(t, time.Second*20, keyword) })
-	b.mockApps[name] = appAPI
-}
-
-// WaitExit wait util all processes exit.
-func (b *MockApp) WaitExit() {
-	for _, app := range b.mockApps {
-		app.WaitExit()
-	}
-	b.mockApps = make(map[utils.MockAppName]docker.AppAPI)
-}
-
-// Free stop and release bridge mocked apps.
-func (b *MockApp) Free() {
-	b.WaitExit()
-	_ = os.Remove(b.bridgeFile)
-}
-
-// MockConfig creates a new bridge config.
-func (b *MockApp) MockConfig(store bool) error {
-	base := b.base
-	// Load origin bridge config file.
-	cfg, err := config.NewConfig(b.originFile)
-	if err != nil {
-		return err
-	}
-
-	cfg.L1Config.Endpoint = base.L1gethImg.Endpoint()
-	cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = base.L1gethImg.Endpoint()
-	cfg.L2Config.Endpoint = base.L2gethImg.Endpoint()
-	cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = base.L2gethImg.Endpoint()
-	cfg.DBConfig.DSN = base.DBImg.Endpoint()
-	b.Config = cfg
-
-	if !store {
-		return nil
-	}
-	// Store changed bridge config into a temp file.
-	data, err := json.Marshal(b.Config)
-	if err != nil {
-		return err
-	}
-	return os.WriteFile(b.bridgeFile, data, 0600)
-}

bridge/cmd/msg_relayer/app/app.go

@@ -1,118 +0,0 @@
-package app
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"os/signal"
-	"time"
-
-	"github.com/scroll-tech/go-ethereum/ethclient"
-	"github.com/scroll-tech/go-ethereum/log"
-	"github.com/urfave/cli/v2"
-
-	"scroll-tech/database"
-
-	"scroll-tech/common/metrics"
-	"scroll-tech/common/version"
-
-	"scroll-tech/bridge/config"
-	"scroll-tech/bridge/relayer"
-
-	cutils "scroll-tech/common/utils"
-)
-
-var (
-	app *cli.App
-)
-
-func init() {
-	// Set up message-relayer app info.
-	app = cli.NewApp()
-
-	app.Action = action
-	app.Name = "message-relayer"
-	app.Usage = "The Scroll Message Relayer"
-	app.Description = "Message Relayer contains two main service: 1) relay l1 message to l2. 2) relay l2 message to l1."
-	app.Version = version.Version
-	app.Flags = append(app.Flags, cutils.CommonFlags...)
-	app.Commands = []*cli.Command{}
-
-	app.Before = func(ctx *cli.Context) error {
-		return cutils.LogSetup(ctx)
-	}
-
-	// Register `message-relayer-test` app for integration-test.
-	cutils.RegisterSimulation(app, cutils.MessageRelayerApp)
-}
-
-func action(ctx *cli.Context) error {
-	// Load config file.
-	cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
-	cfg, err := config.NewConfig(cfgFile)
-	if err != nil {
-		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
-	}
-	subCtx, cancel := context.WithCancel(ctx.Context)
-
-	// Init db connection
-	var ormFactory database.OrmFactory
-	if ormFactory, err = database.NewOrmFactory(cfg.DBConfig); err != nil {
-		log.Crit("failed to init db connection", "err", err)
-	}
-
-	defer func() {
-		cancel()
-		err = ormFactory.Close()
-		if err != nil {
-			log.Error("can not close ormFactory", "error", err)
-		}
-	}()
-
-	// Start metrics server.
-	metrics.Serve(subCtx, ctx)
-
-	// Init l2geth connection
-	l2client, err := ethclient.Dial(cfg.L2Config.Endpoint)
-	if err != nil {
-		log.Error("failed to connect l2 geth", "config file", cfgFile, "error", err)
-		return err
-	}
-
-	l1relayer, err := relayer.NewLayer1Relayer(ctx.Context, ormFactory, cfg.L1Config.RelayerConfig)
-	if err != nil {
-		log.Error("failed to create new l1 relayer", "config file", cfgFile, "error", err)
-		return err
-	}
-	l2relayer, err := relayer.NewLayer2Relayer(ctx.Context, l2client, ormFactory, cfg.L2Config.RelayerConfig)
-	if err != nil {
-		log.Error("failed to create new l2 relayer", "config file", cfgFile, "error", err)
-		return err
-	}
-
-	// Start l1relayer process
-	go cutils.Loop(subCtx, 10*time.Second, l1relayer.ProcessSavedEvents)
-
-	// Start l2relayer process
-	go cutils.Loop(subCtx, 2*time.Second, l2relayer.ProcessSavedEvents)
-
-	// Finish start all message relayer functions
-	log.Info("Start message-relayer successfully")
-
-	// Catch CTRL-C to ensure a graceful shutdown.
-	interrupt := make(chan os.Signal, 1)
-	signal.Notify(interrupt, os.Interrupt)
-
-	// Wait until the interrupt signal is received from an OS signal.
-	<-interrupt
-
-	return nil
-}
-
-// Run message_relayer cmd instance.
-func Run() {
-	if err := app.Run(os.Args); err != nil {
-		_, _ = fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-}

bridge/cmd/msg_relayer/main.go

@@ -1,7 +0,0 @@
-package main
-
-import "scroll-tech/bridge/cmd/msg_relayer/app"
-
-func main() {
-	app.Run()
-}

bridge/cmd/rollup_relayer/app/app.go

@@ -1,133 +0,0 @@
-package app
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"os/signal"
-	"time"
-
-	"github.com/scroll-tech/go-ethereum/ethclient"
-	"github.com/scroll-tech/go-ethereum/log"
-	"github.com/urfave/cli/v2"
-
-	"scroll-tech/database"
-
-	"scroll-tech/common/metrics"
-	"scroll-tech/common/version"
-
-	"scroll-tech/bridge/config"
-	"scroll-tech/bridge/relayer"
-	"scroll-tech/bridge/utils"
-	"scroll-tech/bridge/watcher"
-
-	cutils "scroll-tech/common/utils"
-)
-
-var (
-	app *cli.App
-)
-
-func init() {
-	// Set up rollup-relayer app info.
-	app = cli.NewApp()
-
-	app.Action = action
-	app.Name = "rollup-relayer"
-	app.Usage = "The Scroll Rollup Relayer"
-	app.Version = version.Version
-	app.Flags = append(app.Flags, cutils.CommonFlags...)
-	app.Commands = []*cli.Command{}
-
-	app.Before = func(ctx *cli.Context) error {
-		return cutils.LogSetup(ctx)
-	}
-	// Register `rollup-relayer-test` app for integration-test.
-	cutils.RegisterSimulation(app, cutils.RollupRelayerApp)
-}
-
-func action(ctx *cli.Context) error {
-	// Load config file.
-	cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
-	cfg, err := config.NewConfig(cfgFile)
-	if err != nil {
-		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
-	}
-
-	subCtx, cancel := context.WithCancel(ctx.Context)
-
-	// init db connection
-	var ormFactory database.OrmFactory
-	if ormFactory, err = database.NewOrmFactory(cfg.DBConfig); err != nil {
-		log.Crit("failed to init db connection", "err", err)
-	}
-	defer func() {
-		cancel()
-		err = ormFactory.Close()
-		if err != nil {
-			log.Error("can not close ormFactory", "error", err)
-		}
-	}()
-
-	// Start metrics server.
-	metrics.Serve(subCtx, ctx)
-
-	// Init l2geth connection
-	l2client, err := ethclient.Dial(cfg.L2Config.Endpoint)
-	if err != nil {
-		log.Error("failed to connect l2 geth", "config file", cfgFile, "error", err)
-		return err
-	}
-
-	l2relayer, err := relayer.NewLayer2Relayer(ctx.Context, l2client, ormFactory, cfg.L2Config.RelayerConfig)
-	if err != nil {
-		log.Error("failed to create l2 relayer", "config file", cfgFile, "error", err)
-		return err
-	}
-
-	batchProposer := watcher.NewBatchProposer(subCtx, cfg.L2Config.BatchProposerConfig, l2relayer, ormFactory)
-	if err != nil {
-		log.Error("failed to create batchProposer", "config file", cfgFile, "error", err)
-		return err
-	}
-
-	l2watcher := watcher.NewL2WatcherClient(subCtx, l2client, cfg.L2Config.Confirmations, cfg.L2Config.L2MessengerAddress, cfg.L2Config.L2MessageQueueAddress, cfg.L2Config.WithdrawTrieRootSlot, ormFactory)
-
-	// Watcher loop to fetch missing blocks
-	go cutils.LoopWithContext(subCtx, 2*time.Second, func(ctx context.Context) {
-		number, loopErr := utils.GetLatestConfirmedBlockNumber(ctx, l2client, cfg.L2Config.Confirmations)
-		if loopErr != nil {
-			log.Error("failed to get block number", "err", loopErr)
-			return
-		}
-		l2watcher.TryFetchRunningMissingBlocks(ctx, number)
-	})
-
-	// Batch proposer loop
-	go cutils.Loop(subCtx, 2*time.Second, func() {
-		batchProposer.TryProposeBatch()
-		batchProposer.TryCommitBatches()
-	})
-
-	go cutils.Loop(subCtx, 2*time.Second, l2relayer.ProcessCommittedBatches)
-
-	// Finish start all rollup relayer functions.
-	log.Info("Start rollup-relayer successfully")
-
-	// Catch CTRL-C to ensure a graceful shutdown.
-	interrupt := make(chan os.Signal, 1)
-	signal.Notify(interrupt, os.Interrupt)
-
-	// Wait until the interrupt signal is received from an OS signal.
-	<-interrupt
-
-	return nil
-}
-
-// Run rollup relayer cmd instance.
-func Run() {
-	if err := app.Run(os.Args); err != nil {
-		_, _ = fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-}

bridge/cmd/rollup_relayer/main.go

@@ -1,7 +0,0 @@
-package main
-
-import "scroll-tech/bridge/cmd/rollup_relayer/app"
-
-func main() {
-	app.Run()
-}

bridge/config.json

@@ -1,95 +1,53 @@
 {
   "l1_config": {
-    "confirmations": "0x6",
+    "confirmations": 6,
+    "chain_id": 4,
     "endpoint": "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
     "l1_messenger_address": "0x0000000000000000000000000000000000000000",
-    "l1_message_queue_address": "0x0000000000000000000000000000000000000000",
-    "scroll_chain_address": "0x0000000000000000000000000000000000000000",
     "start_height": 0,
     "relayer_config": {
       "messenger_contract_address": "0x0000000000000000000000000000000000000000",
-      "gas_price_oracle_address": "0x0000000000000000000000000000000000000000",
       "sender_config": {
         "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc",
-        "check_pending_time": 2,
-        "check_balance_time": 100,
+        "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",
-        "min_balance": 100000000000000000000,
-        "pending_limit": 10
+        "tx_type": "AccessListTx"
       },
-      "gas_oracle_config": {
-        "min_gas_price": 0,
-        "gas_price_diff": 50000
-      },
-      "finalize_batch_interval_sec": 0,
-      "message_sender_private_keys": [
-        "1212121212121212121212121212121212121212121212121212121212121212"
-      ],
-      "gas_oracle_sender_private_keys": [
-        "1212121212121212121212121212121212121212121212121212121212121212"
-      ]
+      "private_key": "abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc1"
     }
   },
   "l2_config": {
-    "confirmations": "0x1",
+    "confirmations": 1,
+    "chain_id": 53077,
+    "proof_generation_freq": 1,
+    "skipped_opcodes": [
+      "CREATE2",
+      "DELEGATECALL"
+    ],
     "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",
+      "rollup_contract_address": "0x0000000000000000000000000000000000000000",
       "sender_config": {
         "endpoint": "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
         "check_pending_time": 10,
-        "check_balance_time": 100,
         "escalate_blocks": 100,
-        "confirmations": "0x6",
+        "confirmations": 6,
         "escalate_multiple_num": 11,
         "escalate_multiple_den": 10,
         "max_gas_price": 10000000000,
-        "tx_type": "LegacyTx",
-        "min_balance": 100000000000000000000,
-        "pending_limit": 10
+        "tx_type": "DynamicFeeTx"
       },
-      "gas_oracle_config": {
-        "min_gas_price": 0,
-        "gas_price_diff": 50000
-      },
-      "finalize_batch_interval_sec": 0,
-      "message_sender_private_keys": [
-        "1212121212121212121212121212121212121212121212121212121212121212"
-      ],
-      "gas_oracle_sender_private_keys": [
-        "1212121212121212121212121212121212121212121212121212121212121212"
-      ],
-      "rollup_sender_private_keys": [
-        "1212121212121212121212121212121212121212121212121212121212121212"
-      ]
-    },
-    "batch_proposer_config": {
-      "proof_generation_freq": 1,
-      "batch_gas_threshold": 3000000,
-      "batch_tx_num_threshold": 44,
-      "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"
-      }
+      "private_key": "1212121212121212121212121212121212121212121212121212121212121212"
     }
   },
   "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.go

@@ -5,14 +5,84 @@ import (
 	"os"
 	"path/filepath"
 
-	"scroll-tech/database"
+	"github.com/scroll-tech/go-ethereum/common"
+
+	"scroll-tech/common/utils"
+
+	db_config "scroll-tech/database"
 )
 
+// SenderConfig The config for transaction sender
+type SenderConfig struct {
+	// The RPC endpoint of the ethereum or scroll public node.
+	Endpoint string `json:"endpoint"`
+	// The time to trigger check pending txs in sender.
+	CheckPendingTime uint64 `json:"check_pending_time"`
+	// The number of blocks to wait to escalate increase gas price of the transaction.
+	EscalateBlocks uint64 `json:"escalate_blocks"`
+	// The gap number between a block be confirmed and the latest block.
+	Confirmations uint64 `json:"confirmations"`
+	// The numerator of gas price escalate multiple.
+	EscalateMultipleNum uint64 `json:"escalate_multiple_num"`
+	// The denominator of gas price escalate multiple.
+	EscalateMultipleDen uint64 `json:"escalate_multiple_den"`
+	// The maximum gas price can be used to send transaction.
+	MaxGasPrice uint64 `json:"max_gas_price"`
+	// the transaction type to use: LegacyTx, AccessListTx, DynamicFeeTx
+	TxType string `json:"tx_type"`
+}
+
+// L1Config loads l1eth configuration items.
+type L1Config struct {
+	// Confirmations block height confirmations number.
+	Confirmations uint64 `json:"confirmations"`
+	// l1 chainID.
+	ChainID int64 `json:"chain_id"`
+	// l1 eth node url.
+	Endpoint string `json:"endpoint"`
+	// The start height to sync event from layer 1
+	StartHeight uint64 `json:"start_height"`
+	// The messenger contract address deployed on layer 1 chain.
+	L1MessengerAddress common.Address `json:"l1_messenger_address,omitempty"`
+	// The relayer config
+	RelayerConfig *RelayerConfig `json:"relayer_config"`
+}
+
+// L2Config loads l2geth configuration items.
+type L2Config struct {
+	// Confirmations block height confirmations number.
+	Confirmations uint64 `json:"confirmations"`
+	// l2geth chainId.
+	ChainID int64 `json:"chain_id"`
+	// l2geth node url.
+	Endpoint string `json:"endpoint"`
+	// The messenger contract address deployed on layer 2 chain.
+	L2MessengerAddress common.Address `json:"l2_messenger_address,omitempty"`
+	// Proof generation frequency, generating proof every k blocks
+	ProofGenerationFreq uint64 `json:"proof_generation_freq"`
+	// Skip generating proof when that opcodes appeared
+	SkippedOpcodes []string `json:"skipped_opcodes"`
+	// The relayer config
+	RelayerConfig *RelayerConfig `json:"relayer_config"`
+}
+
+// RelayerConfig loads relayer configuration items.
+type RelayerConfig struct {
+	// RollupContractAddress store the rollup contract address.
+	RollupContractAddress common.Address `json:"rollup_contract_address,omitempty"`
+	// MessengerContractAddress store the scroll messenger contract address.
+	MessengerContractAddress common.Address `json:"messenger_contract_address"`
+	// sender config
+	SenderConfig *SenderConfig `json:"sender_config"`
+	// The private key of the relayer
+	PrivateKey string `json:"private_key"`
+}
+
 // Config load configuration items.
 type Config struct {
-	L1Config *L1Config          `json:"l1_config"`
-	L2Config *L2Config          `json:"l2_config"`
-	DBConfig *database.DBConfig `json:"db_config"`
+	L1Config *L1Config           `json:"l1_config"`
+	L2Config *L2Config           `json:"l2_config"`
+	DBConfig *db_config.DBConfig `json:"db_config"`
 }
 
 // NewConfig returns a new instance of Config.
@@ -28,5 +98,9 @@ func NewConfig(file string) (*Config, error) {
 		return nil, err
 	}
 
+	// cover value by env fields
+	cfg.DBConfig.DSN = utils.GetEnvWithDefault("DB_DSN", cfg.DBConfig.DSN)
+	cfg.DBConfig.DriverName = utils.GetEnvWithDefault("DB_DRIVER", cfg.DBConfig.DriverName)
+
 	return cfg, nil
 }

bridge/config/config_test.go

@@ -1,55 +0,0 @@
-package config
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestConfig(t *testing.T) {
-	t.Run("Success Case", func(t *testing.T) {
-		cfg, err := NewConfig("../config.json")
-		assert.NoError(t, err, "failed to load config")
-
-		assert.Len(t, cfg.L1Config.RelayerConfig.MessageSenderPrivateKeys, 1)
-		assert.Len(t, cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys, 1)
-		assert.Len(t, cfg.L2Config.RelayerConfig.RollupSenderPrivateKeys, 1)
-
-		data, err := json.Marshal(cfg)
-		assert.NoError(t, err)
-
-		tmpJSON := fmt.Sprintf("/tmp/%d_bridge_config.json", time.Now().Nanosecond())
-		defer func() { _ = os.Remove(tmpJSON) }()
-
-		assert.NoError(t, os.WriteFile(tmpJSON, data, 0644))
-
-		cfg2, err := NewConfig(tmpJSON)
-		assert.NoError(t, err)
-
-		assert.Equal(t, cfg.L1Config, cfg2.L1Config)
-		assert.Equal(t, cfg.L2Config, cfg2.L2Config)
-		assert.Equal(t, cfg.DBConfig, cfg2.DBConfig)
-	})
-
-	t.Run("File Not Found", func(t *testing.T) {
-		_, err := NewConfig("non_existent_file.json")
-		assert.ErrorIs(t, err, os.ErrNotExist)
-	})
-
-	t.Run("Invalid JSON Content", func(t *testing.T) {
-		// Create a temporary file with invalid JSON content
-		tempFile, err := os.CreateTemp("", "invalid_json_config.json")
-		assert.NoError(t, err)
-		defer os.Remove(tempFile.Name())
-
-		_, err = tempFile.WriteString("{ invalid_json: ")
-		assert.NoError(t, err)
-
-		_, err = NewConfig(tempFile.Name())
-		assert.Error(t, err)
-	})
-}

bridge/config/l1_config.go

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

bridge/config/l2_config.go

@@ -1,49 +0,0 @@
-package config
-
-import (
-	"github.com/scroll-tech/go-ethereum/rpc"
-
-	"github.com/scroll-tech/go-ethereum/common"
-
-	"scroll-tech/common/types"
-)
-
-// L2Config loads l2geth configuration items.
-type L2Config struct {
-	// Confirmations block height confirmations number.
-	Confirmations rpc.BlockNumber `json:"confirmations"`
-	// l2geth node url.
-	Endpoint string `json:"endpoint"`
-	// The messenger contract address deployed on layer 2 chain.
-	L2MessengerAddress common.Address `json:"l2_messenger_address"`
-	// The L2MessageQueue contract address deployed on layer 2 chain.
-	L2MessageQueueAddress common.Address `json:"l2_message_queue_address"`
-	// The WithdrawTrieRootSlot in L2MessageQueue contract.
-	WithdrawTrieRootSlot common.Hash `json:"withdraw_trie_root_slot,omitempty"`
-	// The relayer config
-	RelayerConfig *RelayerConfig `json:"relayer_config"`
-	// The batch_proposer config
-	BatchProposerConfig *BatchProposerConfig `json:"batch_proposer_config"`
-}
-
-// BatchProposerConfig loads l2watcher batch_proposer configuration items.
-type BatchProposerConfig struct {
-	// Proof generation frequency, generating proof every k blocks
-	ProofGenerationFreq uint64 `json:"proof_generation_freq"`
-	// Txnum threshold in a batch
-	BatchTxNumThreshold uint64 `json:"batch_tx_num_threshold"`
-	// Gas threshold in a batch
-	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"`
-	// Commit tx calldata min size limit in bytes
-	CommitTxCalldataMinSize uint64 `json:"commit_tx_calldata_min_size,omitempty"`
-	// The public input hash config
-	PublicInputConfig *types.PublicInputHashConfig `json:"public_input_config"`
-}

bridge/config/relayer_config.go

@@ -1,146 +0,0 @@
-package config
-
-import (
-	"crypto/ecdsa"
-	"encoding/json"
-	"fmt"
-	"math/big"
-
-	"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
-type SenderConfig struct {
-	// The RPC endpoint of the ethereum or scroll public node.
-	Endpoint string `json:"endpoint"`
-	// The time to trigger check pending txs in sender.
-	CheckPendingTime uint64 `json:"check_pending_time"`
-	// 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"`
-	// The numerator of gas price escalate multiple.
-	EscalateMultipleNum uint64 `json:"escalate_multiple_num"`
-	// The denominator of gas price escalate multiple.
-	EscalateMultipleDen uint64 `json:"escalate_multiple_den"`
-	// The maximum gas price can be used to send transaction.
-	MaxGasPrice uint64 `json:"max_gas_price"`
-	// The transaction type to use: LegacyTx, AccessListTx, DynamicFeeTx
-	TxType string `json:"tx_type"`
-	// The min balance set for check and set balance for sender's accounts.
-	MinBalance *big.Int `json:"min_balance"`
-	// The interval (in seconds) to check balance and top up sender's accounts
-	CheckBalanceTime uint64 `json:"check_balance_time"`
-	// The sender's pending count limit.
-	PendingLimit int `json:"pending_limit,omitempty"`
-}
-
-// RelayerConfig loads relayer configuration items.
-// What we need to pay attention to is that
-// `MessageSenderPrivateKeys` and `RollupSenderPrivateKeys` cannot have common private keys.
-type RelayerConfig struct {
-	// RollupContractAddress store the rollup contract address.
-	RollupContractAddress common.Address `json:"rollup_contract_address,omitempty"`
-	// MessengerContractAddress store the scroll messenger contract address.
-	MessengerContractAddress common.Address `json:"messenger_contract_address"`
-	// GasPriceOracleContractAddress store the scroll messenger contract address.
-	GasPriceOracleContractAddress common.Address `json:"gas_price_oracle_contract_address"`
-	// sender config
-	SenderConfig *SenderConfig `json:"sender_config"`
-	// gas oracle config
-	GasOracleConfig *GasOracleConfig `json:"gas_oracle_config"`
-	// The interval in which we send finalize batch transactions.
-	FinalizeBatchIntervalSec uint64 `json:"finalize_batch_interval_sec"`
-	// MessageRelayMinGasLimit to avoid OutOfGas error
-	MessageRelayMinGasLimit uint64 `json:"message_relay_min_gas_limit,omitempty"`
-	// The private key of the relayer
-	MessageSenderPrivateKeys   []*ecdsa.PrivateKey `json:"-"`
-	GasOracleSenderPrivateKeys []*ecdsa.PrivateKey `json:"-"`
-	RollupSenderPrivateKeys    []*ecdsa.PrivateKey `json:"-"`
-}
-
-// GasOracleConfig The config for updating gas price oracle.
-type GasOracleConfig struct {
-	// MinGasPrice store the minimum gas price to set.
-	MinGasPrice uint64 `json:"min_gas_price"`
-	// GasPriceDiff store the percentage of gas price difference.
-	GasPriceDiff uint64 `json:"gas_price_diff"`
-}
-
-// relayerConfigAlias RelayerConfig alias name
-type relayerConfigAlias RelayerConfig
-
-// UnmarshalJSON unmarshal relayer_config struct.
-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"`
-	}
-	if err := json.Unmarshal(input, &jsonConfig); err != nil {
-		return err
-	}
-
-	*r = RelayerConfig(jsonConfig.relayerConfigAlias)
-
-	// Get messenger private key list.
-	for _, privStr := range jsonConfig.MessageSenderPrivateKeys {
-		priv, err := crypto.ToECDSA(common.FromHex(privStr))
-		if err != nil {
-			return fmt.Errorf("incorrect private_key_list format, err: %v", err)
-		}
-		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))
-		if err != nil {
-			return fmt.Errorf("incorrect roller_private_key format, err: %v", err)
-		}
-		r.RollupSenderPrivateKeys = append(r.RollupSenderPrivateKeys, priv)
-	}
-
-	return nil
-}
-
-// MarshalJSON marshal RelayerConfig config, transfer private keys.
-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}
-
-	// 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)))
-	}
-
-	return json.Marshal(&jsonConfig)
-}

bridge/go.mod

@@ -3,51 +3,40 @@ module scroll-tech/bridge
 go 1.18
 
 require (
-	github.com/agiledragon/gomonkey/v2 v2.9.0
+	github.com/ethereum/go-ethereum v1.10.13
+	github.com/gorilla/websocket v1.4.2
+	github.com/jmoiron/sqlx v1.3.5
 	github.com/orcaman/concurrent-map v1.0.0
-	github.com/orcaman/concurrent-map/v2 v2.0.1
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20230321020420-127af384ed04
-	github.com/smartystreets/goconvey v1.8.0
-	github.com/stretchr/testify v1.8.2
-	github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa
-	golang.org/x/sync v0.1.0
-	modernc.org/mathutil v1.4.1
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20221012120556-b3a7c9b6917d
+	github.com/stretchr/testify v1.8.0
+	github.com/urfave/cli/v2 v2.3.0
+	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
 )
 
 require (
 	github.com/btcsuite/btcd v0.20.1-beta // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // 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.4 // indirect
+	github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea // 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/google/uuid v1.3.0 // indirect
-	github.com/gopherjs/gopherjs v1.17.2 // indirect
-	github.com/gorilla/websocket v1.5.0 // indirect
-	github.com/iden3/go-iden3-crypto v0.0.14 // indirect
-	github.com/jtolds/gls v4.20.0+incompatible // indirect
-	github.com/mattn/go-isatty v0.0.18 // indirect
-	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/holiman/uint256 v1.2.0 // indirect
+	github.com/iden3/go-iden3-crypto v0.0.12 // indirect
+	github.com/lib/pq v1.10.6 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-sqlite3 v1.14.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/rivo/uniseg v0.4.4 // indirect
 	github.com/rjeczalik/notify v0.9.1 // indirect
-	github.com/rogpeppe/go-internal v1.10.0 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/scroll-tech/zktrie v0.5.2 // indirect
+	github.com/russross/blackfriday/v2 v2.0.1 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
-	github.com/smartystreets/assertions v1.13.1 // indirect
-	github.com/tklauser/go-sysconf v0.3.11 // indirect
-	github.com/tklauser/numcpus v0.6.0 // indirect
-	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.10 // indirect
+	github.com/tklauser/numcpus v0.4.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/crypto v0.7.0 // indirect
-	golang.org/x/sys v0.7.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
-	golang.org/x/time v0.1.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
+	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
+	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

bridge/go.sum

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

bridge/l1/backend.go

@@ -0,0 +1,63 @@
+package l1
+
+import (
+	"context"
+
+	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/log"
+
+	"scroll-tech/database/orm"
+
+	bridge_abi "scroll-tech/bridge/abi"
+	"scroll-tech/bridge/config"
+)
+
+// Backend manage the resources and services of L1 backend.
+// The backend should monitor events in layer 1 and relay transactions to layer 2
+type Backend struct {
+	cfg     *config.L1Config
+	watcher *Watcher
+	relayer *Layer1Relayer
+	orm     orm.Layer1MessageOrm
+}
+
+// New returns a new instance of Backend.
+func New(ctx context.Context, cfg *config.L1Config, orm orm.Layer1MessageOrm) (*Backend, error) {
+	client, err := ethclient.Dial(cfg.Endpoint)
+	if err != nil {
+		return nil, err
+	}
+
+	l1MessengerABI, err := bridge_abi.L1MessengerMetaData.GetAbi()
+	if err != nil {
+		log.Warn("new L1MessengerABI failed", "err", err)
+		return nil, err
+	}
+
+	relayer, err := NewLayer1Relayer(ctx, client, int64(cfg.Confirmations), orm, cfg.RelayerConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	watcher := NewWatcher(ctx, client, cfg.StartHeight, cfg.Confirmations, cfg.L1MessengerAddress, l1MessengerABI, orm)
+
+	return &Backend{
+		cfg:     cfg,
+		watcher: watcher,
+		relayer: relayer,
+		orm:     orm,
+	}, nil
+}
+
+// Start Backend module.
+func (l1 *Backend) Start() error {
+	l1.watcher.Start()
+	l1.relayer.Start()
+	return nil
+}
+
+// Stop Backend module.
+func (l1 *Backend) Stop() {
+	l1.watcher.Stop()
+	l1.relayer.Stop()
+}

bridge/l1/relayer.go

@@ -0,0 +1,150 @@
+package l1
+
+import (
+	"context"
+	"math/big"
+	"time"
+
+	// not sure if this will make problems when relay with l1geth
+
+	"github.com/scroll-tech/go-ethereum/accounts/abi"
+	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/crypto"
+	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/log"
+
+	"scroll-tech/database/orm"
+
+	bridge_abi "scroll-tech/bridge/abi"
+	"scroll-tech/bridge/config"
+	"scroll-tech/bridge/sender"
+)
+
+// Layer1Relayer is responsible for
+//  1. fetch pending Layer1Message from db
+//  2. relay pending message to layer 2 node
+//
+// Actions are triggered by new head from layer 1 geth node.
+// @todo It's better to be triggered by watcher.
+type Layer1Relayer struct {
+	ctx    context.Context
+	client *ethclient.Client
+	sender *sender.Sender
+
+	db  orm.Layer1MessageOrm
+	cfg *config.RelayerConfig
+
+	// channel used to communicate with transaction sender
+	confirmationCh <-chan *sender.Confirmation
+	l2MessengerABI *abi.ABI
+
+	stopCh chan struct{}
+}
+
+// NewLayer1Relayer will return a new instance of Layer1RelayerClient
+func NewLayer1Relayer(ctx context.Context, ethClient *ethclient.Client, l1ConfirmNum int64, db orm.Layer1MessageOrm, cfg *config.RelayerConfig) (*Layer1Relayer, error) {
+	l2MessengerABI, err := bridge_abi.L2MessengerMetaData.GetAbi()
+	if err != nil {
+		log.Warn("new L2MessengerABI failed", "err", err)
+		return nil, err
+	}
+
+	prv, err := crypto.HexToECDSA(cfg.PrivateKey)
+	if err != nil {
+		log.Error("Failed to import private key from config file")
+		return nil, err
+	}
+
+	sender, err := sender.NewSender(ctx, cfg.SenderConfig, prv)
+	if err != nil {
+		log.Error("new sender failed", "err", err)
+		return nil, err
+	}
+
+	return &Layer1Relayer{
+		ctx:            ctx,
+		client:         ethClient,
+		sender:         sender,
+		db:             db,
+		l2MessengerABI: l2MessengerABI,
+		cfg:            cfg,
+		stopCh:         make(chan struct{}),
+		confirmationCh: sender.ConfirmChan(),
+	}, nil
+}
+
+// ProcessSavedEvents relays saved un-processed cross-domain transactions to desired blockchain
+func (r *Layer1Relayer) ProcessSavedEvents() {
+	// msgs are sorted by nonce in increasing order
+	msgs, err := r.db.GetL1UnprocessedMessages()
+	if err != nil {
+		log.Error("Failed to fetch unprocessed L1 messages", "err", err)
+		return
+	}
+	if len(msgs) == 0 {
+		return
+	}
+	msg := msgs[0]
+	// @todo add support to relay multiple messages
+	sender := common.HexToAddress(msg.Sender)
+	target := common.HexToAddress(msg.Target)
+	value, ok := big.NewInt(0).SetString(msg.Value, 10)
+	if !ok {
+		// @todo maybe panic?
+		log.Error("Failed to parse message value", "msg.nonce", msg.Nonce, "msg.height", msg.Height)
+		// TODO: need to skip this message by changing its status to MsgError
+	}
+	fee, _ := big.NewInt(0).SetString(msg.Fee, 10)
+	deadline := big.NewInt(int64(msg.Deadline))
+	msgNonce := big.NewInt(int64(msg.Nonce))
+	calldata := common.Hex2Bytes(msg.Calldata)
+	data, err := r.l2MessengerABI.Pack("relayMessage", sender, target, value, fee, deadline, msgNonce, calldata)
+	if err != nil {
+		log.Error("Failed to pack relayMessage", "msg.nonce", msg.Nonce, "msg.height", msg.Height, "err", err)
+		// TODO: need to skip this message by changing its status to MsgError
+		return
+	}
+
+	hash, err := r.sender.SendTransaction(msg.Layer1Hash, &r.cfg.MessengerContractAddress, big.NewInt(0), data)
+	if err != nil {
+		log.Error("Failed to send relayMessage tx to L2", "msg.nonce", msg.Nonce, "msg.height", msg.Height, "err", err)
+		return
+	}
+	log.Info("relayMessage to layer2", "layer1 hash", msg.Layer1Hash, "tx hash", hash)
+
+	err = r.db.UpdateLayer1StatusAndLayer2Hash(r.ctx, msg.Layer1Hash, hash.String(), orm.MsgSubmitted)
+	if err != nil {
+		log.Error("UpdateLayer1StatusAndLayer2Hash failed", "msg.layer1hash", msg.Layer1Hash, "msg.height", msg.Height, "err", err)
+	}
+}
+
+// Start the relayer process
+func (r *Layer1Relayer) Start() {
+	go func() {
+		// trigger by timer
+		ticker := time.NewTicker(3 * time.Second)
+		defer ticker.Stop()
+
+		for {
+			select {
+			case <-ticker.C:
+				// number, err := r.client.BlockNumber(r.ctx)
+				// log.Info("receive header", "height", number)
+				r.ProcessSavedEvents()
+			case cfm := <-r.confirmationCh: // @todo handle db error
+				err := r.db.UpdateLayer1StatusAndLayer2Hash(r.ctx, cfm.ID, cfm.TxHash.String(), orm.MsgConfirmed)
+				if err != nil {
+					log.Warn("UpdateLayer1StatusAndLayer2Hash failed", "err", err)
+				}
+				log.Info("transaction confirmed in layer2", "confirmation", cfm)
+			case <-r.stopCh:
+				return
+			}
+		}
+	}()
+}
+
+// Stop the relayer module, for a graceful shutdown.
+func (r *Layer1Relayer) Stop() {
+	close(r.stopCh)
+}

bridge/l1/relayer_test.go

@@ -0,0 +1,58 @@
+package l1_test
+
+import (
+	"context"
+	"testing"
+
+	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/stretchr/testify/assert"
+
+	"scroll-tech/database"
+
+	"scroll-tech/bridge/mock"
+
+	"scroll-tech/bridge/config"
+	"scroll-tech/bridge/l1"
+
+	"scroll-tech/common/utils"
+)
+
+var TEST_CONFIG = &mock.TestConfig{
+	L1GethTestConfig: mock.L1GethTestConfig{
+		HPort: 0,
+		WPort: 8570,
+	},
+	DbTestconfig: mock.DbTestconfig{
+		DbName: "testl1relayer_db",
+		DbPort: 5440,
+		DB_CONFIG: &database.DBConfig{
+			DriverName: utils.GetEnvWithDefault("TEST_DB_DRIVER", "postgres"),
+			DSN:        utils.GetEnvWithDefault("TEST_DB_DSN", "postgres://postgres:123456@localhost:5440/testl1relayer_db?sslmode=disable"),
+		},
+	},
+}
+
+// TestCreateNewRelayer test create new relayer instance and stop
+func TestCreateNewL1Relayer(t *testing.T) {
+	cfg, err := config.NewConfig("../config.json")
+	assert.NoError(t, err)
+	l1docker := mock.NewTestL1Docker(t, TEST_CONFIG)
+	defer l1docker.Stop()
+
+	client, err := ethclient.Dial(l1docker.Endpoint())
+	assert.NoError(t, err)
+
+	dbImg := mock.GetDbDocker(t, TEST_CONFIG)
+	dbImg.Start()
+	defer dbImg.Stop()
+	db, err := database.NewOrmFactory(TEST_CONFIG.DB_CONFIG)
+	assert.NoError(t, err)
+
+	relayer, err := l1.NewLayer1Relayer(context.Background(), client, 1, db, cfg.L2Config.RelayerConfig)
+	assert.NoError(t, err)
+
+	relayer.Start()
+
+	defer relayer.Stop()
+
+}

bridge/l1/watcher.go

@@ -0,0 +1,180 @@
+package l1
+
+import (
+	"context"
+	"math/big"
+	"time"
+
+	"github.com/scroll-tech/go-ethereum"
+	"github.com/scroll-tech/go-ethereum/accounts/abi"
+	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/log"
+
+	"scroll-tech/database/orm"
+)
+
+const (
+
+	// keccak256("SentMessage(address,address,uint256,uint256,uint256,bytes,uint256,uint256)")
+	sentMessageEventSignature = "806b28931bc6fbe6c146babfb83d5c2b47e971edb43b4566f010577a0ee7d9f4"
+)
+
+// Watcher will listen for smart contract events from Eth L1.
+type Watcher struct {
+	ctx    context.Context
+	client *ethclient.Client
+	db     orm.Layer1MessageOrm
+
+	// The number of new blocks to wait for a block to be confirmed
+	confirmations    uint64
+	messengerAddress common.Address
+	messengerABI     *abi.ABI
+
+	// The height of the block that the watcher has retrieved event logs
+	processedMsgHeight uint64
+
+	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 uint64, messengerAddress common.Address, messengerABI *abi.ABI, db orm.Layer1MessageOrm) *Watcher {
+	savedHeight, err := db.GetLayer1LatestWatchedHeight()
+	if err != nil {
+		log.Warn("Failed to fetch height from db", "err", err)
+		savedHeight = 0
+	}
+	if savedHeight < int64(startHeight) {
+		savedHeight = int64(startHeight)
+	}
+
+	stop := make(chan bool)
+
+	return &Watcher{
+		ctx:                ctx,
+		client:             client,
+		db:                 db,
+		confirmations:      confirmations,
+		messengerAddress:   messengerAddress,
+		messengerABI:       messengerABI,
+		processedMsgHeight: uint64(savedHeight),
+		stop:               stop,
+	}
+}
+
+// Start the Watcher module.
+func (r *Watcher) Start() {
+	go func() {
+		// trigger by timer
+		ticker := time.NewTicker(10 * time.Second)
+		defer ticker.Stop()
+
+		for {
+			select {
+			case <-ticker.C:
+				blockNumber, err := r.client.BlockNumber(r.ctx)
+				if err != nil {
+					log.Error("Failed to get block number", "err", err)
+				}
+				if err := r.fetchContractEvent(blockNumber); err != nil {
+					log.Error("Failed to fetch bridge contract", "err", err)
+				}
+			case <-r.stop:
+				return
+			}
+		}
+	}()
+}
+
+// Stop the Watcher module, for a graceful shutdown.
+func (r *Watcher) Stop() {
+	r.stop <- true
+}
+
+// FetchContractEvent pull latest event logs from given contract address and save in DB
+func (r *Watcher) fetchContractEvent(blockHeight uint64) error {
+	fromBlock := int64(r.processedMsgHeight) + 1
+	toBlock := int64(blockHeight) - int64(r.confirmations)
+
+	if toBlock < fromBlock {
+		return nil
+	}
+
+	// warning: uint int conversion...
+	query := ethereum.FilterQuery{
+		FromBlock: big.NewInt(fromBlock), // inclusive
+		ToBlock:   big.NewInt(toBlock),   // inclusive
+		Addresses: []common.Address{
+			r.messengerAddress,
+		},
+		Topics: make([][]common.Hash, 1),
+	}
+	query.Topics[0] = make([]common.Hash, 1)
+	query.Topics[0][0] = common.HexToHash(sentMessageEventSignature)
+
+	logs, err := r.client.FilterLogs(r.ctx, query)
+	if err != nil {
+		log.Warn("Failed to get event logs", "err", err)
+		return err
+	}
+	if len(logs) == 0 {
+		return nil
+	}
+	log.Info("Received new L1 messages", "fromBlock", fromBlock, "toBlock", toBlock,
+		"cnt", len(logs))
+
+	eventLogs, err := parseBridgeEventLogs(logs, r.messengerABI)
+	if err != nil {
+		log.Error("Failed to parse emitted events log", "err", err)
+		return err
+	}
+
+	err = r.db.SaveLayer1Messages(r.ctx, eventLogs)
+	if err == nil {
+		r.processedMsgHeight = uint64(toBlock)
+	}
+	return err
+}
+
+func parseBridgeEventLogs(logs []types.Log, messengerABI *abi.ABI) ([]*orm.Layer1Message, error) {
+	// Need use contract abi to parse event Log
+	// Can only be tested after we have our contracts set up
+
+	var parsedlogs []*orm.Layer1Message
+	for _, vLog := range logs {
+		event := struct {
+			Target       common.Address
+			Sender       common.Address
+			Value        *big.Int // uint256
+			Fee          *big.Int // uint256
+			Deadline     *big.Int // uint256
+			Message      []byte
+			MessageNonce *big.Int // uint256
+			GasLimit     *big.Int // uint256
+		}{}
+
+		err := messengerABI.UnpackIntoInterface(&event, "SentMessage", vLog.Data)
+		if err != nil {
+			log.Warn("Failed to unpack layer1 SentMessage event", "err", err)
+			return parsedlogs, err
+		}
+		// target is in topics[1]
+		event.Target = common.HexToAddress(vLog.Topics[1].String())
+		parsedlogs = append(parsedlogs, &orm.Layer1Message{
+			Nonce:      event.MessageNonce.Uint64(),
+			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),
+			Layer1Hash: vLog.TxHash.Hex(),
+		})
+	}
+
+	return parsedlogs, nil
+}

bridge/l2/backend.go

@@ -0,0 +1,93 @@
+package l2
+
+import (
+	"context"
+
+	"github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/log"
+	"github.com/scroll-tech/go-ethereum/rpc"
+
+	"scroll-tech/database"
+
+	bridge_abi "scroll-tech/bridge/abi"
+	"scroll-tech/bridge/config"
+)
+
+// Backend manage the resources and services of L2 backend.
+// The backend should monitor events in layer 2 and relay transactions to layer 1
+type Backend struct {
+	cfg       *config.L2Config
+	l2Watcher *WatcherClient
+	relayer   *Layer2Relayer
+	orm       database.OrmFactory
+}
+
+// New returns a new instance of Backend.
+func New(ctx context.Context, cfg *config.L2Config, orm database.OrmFactory) (*Backend, error) {
+	client, err := ethclient.Dial(cfg.Endpoint)
+	if err != nil {
+		return nil, err
+	}
+
+	l2MessengerABI, err := bridge_abi.L2MessengerMetaData.GetAbi()
+	if err != nil {
+		log.Warn("new L2MessengerABI failed", "err", err)
+		return nil, err
+	}
+
+	skippedOpcodes := make(map[string]struct{}, len(cfg.SkippedOpcodes))
+	for _, op := range cfg.SkippedOpcodes {
+		skippedOpcodes[op] = struct{}{}
+	}
+
+	proofGenerationFreq := cfg.ProofGenerationFreq
+	if proofGenerationFreq == 0 {
+		log.Warn("receive 0 proof_generation_freq, change to 1")
+		proofGenerationFreq = 1
+	}
+
+	relayer, err := NewLayer2Relayer(ctx, client, proofGenerationFreq, skippedOpcodes, int64(cfg.Confirmations), orm, cfg.RelayerConfig)
+	if err != nil {
+		return nil, err
+	}
+
+	l2Watcher := NewL2WatcherClient(ctx, client, cfg.Confirmations, proofGenerationFreq, skippedOpcodes, cfg.L2MessengerAddress, l2MessengerABI, orm)
+
+	return &Backend{
+		cfg:       cfg,
+		l2Watcher: l2Watcher,
+		relayer:   relayer,
+		orm:       orm,
+	}, nil
+}
+
+// Start Backend module.
+func (l2 *Backend) Start() error {
+	l2.l2Watcher.Start()
+	l2.relayer.Start()
+	return nil
+}
+
+// Stop Backend module.
+func (l2 *Backend) Stop() {
+	l2.l2Watcher.Stop()
+	l2.relayer.Stop()
+}
+
+// APIs collect API modules.
+func (l2 *Backend) APIs() []rpc.API {
+	return []rpc.API{
+		{
+			Namespace: "l2",
+			Version:   "1.0",
+			Service:   WatcherAPI(l2.l2Watcher),
+			Public:    true,
+		},
+	}
+}
+
+// MockBlockResult for test case
+func (l2 *Backend) MockBlockResult(blockResult *types.BlockResult) {
+	l2.l2Watcher.Send(blockResult)
+}

bridge/l2/checkTrace.go

@@ -0,0 +1,95 @@
+package l2
+
+import (
+	"fmt"
+
+	"golang.org/x/sync/errgroup"
+
+	"github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/core/vm"
+	"github.com/scroll-tech/go-ethereum/log"
+)
+
+func blockTraceIsValid(trace *types.BlockResult) bool {
+	if trace == nil {
+		log.Warn("block trace is empty")
+		return false
+	}
+	flag := true
+	for _, tx := range trace.ExecutionResults {
+		flag = structLogResIsValid(tx.StructLogs) && flag
+	}
+	return flag
+}
+
+func structLogResIsValid(txLogs []*types.StructLogRes) bool {
+	res := true
+	for i := 0; i < len(txLogs); i++ {
+		txLog := txLogs[i]
+		flag := true
+		switch vm.StringToOp(txLog.Op) {
+		case vm.CALL, vm.CALLCODE:
+			flag = codeIsValid(txLog, 2) && flag
+			flag = stateIsValid(txLog, 2) && flag
+		case vm.DELEGATECALL, vm.STATICCALL:
+			flag = codeIsValid(txLog, 2) && flag
+		case vm.CREATE, vm.CREATE2:
+			flag = stateIsValid(txLog, 1) && flag
+		case vm.SLOAD, vm.SSTORE, vm.SELFBALANCE:
+			flag = stateIsValid(txLog, 1) && flag
+		case vm.SELFDESTRUCT:
+			flag = stateIsValid(txLog, 2) && flag
+		case vm.EXTCODEHASH, vm.BALANCE:
+			flag = stateIsValid(txLog, 1) && flag
+		}
+		res = res && flag
+	}
+
+	return res
+}
+
+func codeIsValid(txLog *types.StructLogRes, n int) bool {
+	extraData := txLog.ExtraData
+	if extraData == nil {
+		log.Warn("extraData is empty", "pc", txLog.Pc, "opcode", txLog.Op)
+		return false
+	} else if len(extraData.CodeList) < n {
+		log.Warn("code list is too short", "opcode", txLog.Op, "expect length", n, "actual length", len(extraData.CodeList))
+		return false
+	}
+	return true
+}
+
+func stateIsValid(txLog *types.StructLogRes, n int) bool {
+	extraData := txLog.ExtraData
+	if extraData == nil {
+		log.Warn("extraData is empty", "pc", txLog.Pc, "opcode", txLog.Op)
+		return false
+	} else if len(extraData.StateList) < n {
+		log.Warn("stateList list is too short", "opcode", txLog.Op, "expect length", n, "actual length", len(extraData.StateList))
+		return false
+	}
+	return true
+}
+
+// TraceHasUnsupportedOpcodes check if exist unsupported opcodes
+func TraceHasUnsupportedOpcodes(opcodes map[string]struct{}, trace *types.BlockResult) bool {
+	if trace == nil {
+		return false
+	}
+	eg := errgroup.Group{}
+	for _, res := range trace.ExecutionResults {
+		res := res
+		eg.Go(func() error {
+			for _, lg := range res.StructLogs {
+				if _, ok := opcodes[lg.Op]; ok {
+					return fmt.Errorf("unsupported opcde: %s", lg.Op)
+				}
+			}
+			return nil
+		})
+	}
+
+	err := eg.Wait()
+	return err != nil
+}

bridge/l2/relayer.go

@@ -0,0 +1,522 @@
+package l2
+
+import (
+	"context"
+	"math/big"
+	"strconv"
+	"time"
+
+	// not sure if this will make problems when relay with l1geth
+
+	"github.com/scroll-tech/go-ethereum/accounts/abi"
+	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/crypto"
+	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/log"
+
+	"scroll-tech/database"
+	"scroll-tech/database/orm"
+
+	bridge_abi "scroll-tech/bridge/abi"
+	"scroll-tech/bridge/config"
+	"scroll-tech/bridge/sender"
+)
+
+// Layer2Relayer is responsible for
+//  1. Committing and finalizing L2 blocks on L1
+//  2. Relaying messages from L2 to L1
+//
+// Actions are triggered by new head from layer 1 geth node.
+// @todo It's better to be triggered by watcher.
+type Layer2Relayer struct {
+	ctx    context.Context
+	client *ethclient.Client
+	sender *sender.Sender
+
+	proofGenerationFreq uint64
+	skippedOpcodes      map[string]struct{}
+
+	db  database.OrmFactory
+	cfg *config.RelayerConfig
+
+	l1MessengerABI *abi.ABI
+	l1RollupABI    *abi.ABI
+
+	// a list of processing message, indexed by layer2 hash
+	processingMessage map[string]string
+
+	// a list of processing block, indexed by block height
+	processingBlock map[string]uint64
+
+	// a list of processing proof, indexed by block height
+	processingProof map[string]uint64
+
+	// channel used to communicate with transaction sender
+	confirmationCh <-chan *sender.Confirmation
+	stopCh         chan struct{}
+}
+
+// NewLayer2Relayer will return a new instance of Layer2RelayerClient
+func NewLayer2Relayer(ctx context.Context, ethClient *ethclient.Client, proofGenFreq uint64, skippedOpcodes map[string]struct{}, l2ConfirmNum int64, db database.OrmFactory, cfg *config.RelayerConfig) (*Layer2Relayer, error) {
+
+	l1MessengerABI, err := bridge_abi.L1MessengerMetaData.GetAbi()
+	if err != nil {
+		log.Error("Get L1MessengerABI failed", "err", err)
+		return nil, err
+	}
+
+	l1RollupABI, err := bridge_abi.RollupMetaData.GetAbi()
+	if err != nil {
+		log.Error("Get RollupABI failed", "err", err)
+		return nil, err
+	}
+
+	prv, err := crypto.HexToECDSA(cfg.PrivateKey)
+	if err != nil {
+		log.Error("Failed to import private key from config file")
+		return nil, err
+	}
+
+	// @todo use different sender for relayer, block commit and proof finalize
+	sender, err := sender.NewSender(ctx, cfg.SenderConfig, prv)
+	if err != nil {
+		log.Error("Failed to create sender", "err", err)
+		return nil, err
+	}
+
+	return &Layer2Relayer{
+		ctx:                 ctx,
+		client:              ethClient,
+		sender:              sender,
+		db:                  db,
+		l1MessengerABI:      l1MessengerABI,
+		l1RollupABI:         l1RollupABI,
+		cfg:                 cfg,
+		proofGenerationFreq: proofGenFreq,
+		skippedOpcodes:      skippedOpcodes,
+		processingMessage:   map[string]string{},
+		processingBlock:     map[string]uint64{},
+		processingProof:     map[string]uint64{},
+		stopCh:              make(chan struct{}),
+		confirmationCh:      sender.ConfirmChan(),
+	}, nil
+}
+
+// ProcessSavedEvents relays saved un-processed cross-domain transactions to desired blockchain
+func (r *Layer2Relayer) ProcessSavedEvents() {
+	// msgs are sorted by nonce in increasing order
+	msgs, err := r.db.GetL2UnprocessedMessages()
+	if err != nil {
+		log.Error("Failed to fetch unprocessed L2 messages", "err", err)
+		return
+	}
+	if len(msgs) == 0 {
+		return
+	}
+	msg := msgs[0]
+	// @todo add support to relay multiple messages
+	latestFinalizeHeight, err := r.db.GetLatestFinalizedBlock()
+	if err != nil {
+		log.Error("GetLatestFinalizedBlock failed", "err", err)
+		return
+	}
+	if latestFinalizeHeight < msg.Height {
+		// log.Warn("corresponding block not finalized", "status", status)
+		return
+	}
+
+	// @todo fetch merkle proof from l2geth
+	log.Info("Processing L2 Message", "msg.nonce", msg.Nonce, "msg.height", msg.Height)
+
+	proof := bridge_abi.IL1ScrollMessengerL2MessageProof{
+		BlockNumber: big.NewInt(int64(msg.Height)),
+		MerkleProof: make([]byte, 0),
+	}
+	sender := common.HexToAddress(msg.Sender)
+	target := common.HexToAddress(msg.Target)
+	value, ok := big.NewInt(0).SetString(msg.Value, 10)
+	if !ok {
+		// @todo maybe panic?
+		log.Error("Failed to parse message value", "msg.nonce", msg.Nonce, "msg.height", msg.Height)
+		// TODO: need to skip this message by changing its status to MsgError
+	}
+	fee, _ := big.NewInt(0).SetString(msg.Fee, 10)
+	deadline := big.NewInt(int64(msg.Deadline))
+	msgNonce := big.NewInt(int64(msg.Nonce))
+	calldata := common.Hex2Bytes(msg.Calldata)
+	data, err := r.l1MessengerABI.Pack("relayMessageWithProof", sender, 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
+		return
+	}
+
+	hash, err := r.sender.SendTransaction(msg.Layer2Hash, &r.cfg.MessengerContractAddress, big.NewInt(0), data)
+	if err != nil {
+		log.Error("Failed to send relayMessageWithProof tx to L1", "err", err)
+		return
+	}
+	log.Info("relayMessageWithProof to layer1", "layer2hash", msg.Layer2Hash, "txhash", hash.String())
+
+	// save status in db
+	// @todo handle db error
+	err = r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, msg.Layer2Hash, hash.String(), orm.MsgSubmitted)
+	if err != nil {
+		log.Error("UpdateLayer2StatusAndLayer1Hash failed", "layer2hash", msg.Layer2Hash, "err", err)
+	}
+	r.processingMessage[msg.Layer2Hash] = msg.Layer2Hash
+}
+
+// ProcessPendingBlocks submit block data to layer rollup contract
+func (r *Layer2Relayer) ProcessPendingBlocks() {
+	// blocks are sorted by height in increasing order
+	blocksInDB, err := r.db.GetPendingBlocks()
+	if err != nil {
+		log.Error("Failed to fetch pending L2 blocks", "err", err)
+		return
+	}
+	if len(blocksInDB) == 0 {
+		return
+	}
+	height := blocksInDB[0]
+	// @todo add support to relay multiple blocks
+
+	// will fetch missing block result from l2geth
+	trace, err := r.getOrFetchBlockResultByHeight(height)
+	if err != nil {
+		log.Error("getOrFetchBlockResultByHeight failed",
+			"height", height,
+			"err", err,
+		)
+		return
+	}
+	if trace == nil {
+		return
+	}
+	parentHash, err := r.getOrFetchBlockHashByHeight(height - 1)
+	if err != nil {
+		log.Error("getOrFetchBlockHashByHeight for parent block failed",
+			"parent height", height-1,
+			"err", err,
+		)
+		return
+	}
+	if parentHash == nil {
+		log.Error("parent hash is empty",
+			"height", height,
+			"err", err,
+		)
+		return
+	}
+
+	header := bridge_abi.IZKRollupBlockHeader{
+		BlockHash:   trace.BlockTrace.Hash,
+		ParentHash:  *parentHash,
+		BaseFee:     trace.BlockTrace.BaseFee.ToInt(),
+		StateRoot:   trace.StorageTrace.RootAfter,
+		BlockHeight: trace.BlockTrace.Number.ToInt().Uint64(),
+		GasUsed:     0,
+		Timestamp:   trace.BlockTrace.Time,
+		ExtraData:   make([]byte, 0),
+	}
+	txns := make([]bridge_abi.IZKRollupLayer2Transaction, len(trace.BlockTrace.Transactions))
+	for i, tx := range trace.BlockTrace.Transactions {
+		txns[i] = bridge_abi.IZKRollupLayer2Transaction{
+			Caller:   tx.From,
+			Nonce:    tx.Nonce,
+			Gas:      tx.Gas,
+			GasPrice: tx.GasPrice.ToInt(),
+			Value:    tx.Value.ToInt(),
+			Data:     common.Hex2Bytes(tx.Data),
+		}
+		if tx.To != nil {
+			txns[i].Target = *tx.To
+		}
+		header.GasUsed += trace.ExecutionResults[i].Gas
+	}
+
+	data, err := r.l1RollupABI.Pack("commitBlock", header, txns)
+	if err != nil {
+		log.Error("Failed to pack commitBlock", "height", height, "err", err)
+		return
+	}
+	hash, err := r.sender.SendTransaction(strconv.FormatUint(height, 10), &r.cfg.RollupContractAddress, big.NewInt(0), data)
+	if err != nil {
+		log.Error("Failed to send commitBlock tx to layer1 ", "height", height, "err", err)
+		return
+	}
+	log.Info("commitBlock in layer1", "height", height, "hash", hash)
+
+	// record and sync with db, @todo handle db error
+	err = r.db.UpdateRollupTxHashAndStatus(r.ctx, height, hash.String(), orm.RollupCommitting)
+	if err != nil {
+		log.Error("UpdateRollupTxHashAndStatus failed", "height", height, "err", err)
+	}
+	r.processingBlock[strconv.FormatUint(height, 10)] = height
+}
+
+// ProcessCommittedBlocks submit proof to layer rollup contract
+func (r *Layer2Relayer) ProcessCommittedBlocks() {
+	// blocks are sorted by height in increasing order
+	blocksInDB, err := r.db.GetCommittedBlocks()
+	if err != nil {
+		log.Error("Failed to fetch committed L2 blocks", "err", err)
+		return
+	}
+	if len(blocksInDB) == 0 {
+		return
+	}
+	height := blocksInDB[0]
+	// @todo add support to relay multiple blocks
+
+	status, err := r.db.GetBlockStatusByNumber(height)
+	if err != nil {
+		log.Error("GetBlockStatusByNumber failed", "height", height, "err", err)
+		return
+	}
+
+	switch status {
+	case orm.BlockUnassigned, orm.BlockAssigned:
+		// The proof for this block is not ready yet.
+		return
+
+	case orm.BlockProved:
+		// It's an intermediate state. The roller manager received the proof but has not verified
+		// the proof yet. We don't roll up the proof until it's verified.
+		return
+
+	case orm.BlockFailed, orm.BlockSkipped:
+		if err = r.db.UpdateRollupStatus(r.ctx, height, orm.RollupFinalizationSkipped); err != nil {
+			log.Warn("UpdateRollupStatus failed", "height", height, "err", err)
+		}
+
+	case orm.BlockVerified:
+		log.Info("Start to roll up zk proof", "height", height)
+		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", "height", height)
+				if err = r.db.UpdateRollupStatus(r.ctx, height, orm.RollupFinalizationSkipped); err != nil {
+					log.Warn("UpdateRollupStatus failed", "height", height, "err", err)
+				}
+			}
+		}()
+
+		proofBuffer, instanceBuffer, err := r.db.GetVerifiedProofAndInstanceByNumber(height)
+		if err != nil {
+			log.Warn("fetch get proof by height failed", "height", height, "err", err)
+			return
+		}
+		if proofBuffer == nil || instanceBuffer == nil {
+			log.Warn("proof or instance not ready", "height", height)
+			return
+		}
+		if len(proofBuffer)%32 != 0 {
+			log.Error("proof buffer has wrong length", "height", height, "length", len(proofBuffer))
+			return
+		}
+		if len(instanceBuffer)%32 != 0 {
+			log.Warn("instance buffer has wrong length", "height", height, "length", len(instanceBuffer))
+			return
+		}
+
+		proof := bufferToUint256Le(proofBuffer)
+		instance := bufferToUint256Le(instanceBuffer)
+
+		// it must in db
+		hash, err := r.db.GetHashByNumber(height)
+		if err != nil {
+			log.Warn("fetch missing block result by height failed", "height", height, "err", err)
+		}
+		if hash == nil {
+			// only happen when trace validate failed
+			return
+		}
+		data, err := r.l1RollupABI.Pack("finalizeBlockWithProof", hash, proof, instance)
+		if err != nil {
+			log.Error("Pack finalizeBlockWithProof failed", err)
+			return
+		}
+		txHash, err := r.sender.SendTransaction(strconv.FormatUint(height, 10), &r.cfg.RollupContractAddress, big.NewInt(0), data)
+		hash = &txHash
+		if err != nil {
+			log.Error("finalizeBlockWithProof in layer1 failed",
+				"height", height,
+				"err", err,
+			)
+			return
+		}
+		log.Info("finalizeBlockWithProof in layer1", "height", height, "hash", hash)
+
+		// record and sync with db, @todo handle db error
+		err = r.db.UpdateFinalizeTxHashAndStatus(r.ctx, height, hash.String(), orm.RollupFinalizing)
+		if err != nil {
+			log.Warn("UpdateFinalizeTxHashAndStatus failed", "height", height, "err", err)
+		}
+		success = true
+		r.processingProof[strconv.FormatUint(height, 10)] = height
+
+	default:
+		log.Error("encounter unreachable case in ProcessCommittedBlocks",
+			"block_status", status,
+		)
+	}
+}
+
+// Start the relayer process
+func (r *Layer2Relayer) Start() {
+	go func() {
+		// trigger by timer
+		ticker := time.NewTicker(time.Second)
+		defer ticker.Stop()
+
+		for {
+			select {
+			case <-ticker.C:
+				r.ProcessSavedEvents()
+				r.ProcessPendingBlocks()
+				r.ProcessCommittedBlocks()
+			case confirmation := <-r.confirmationCh:
+				r.handleConfirmation(confirmation)
+			case <-r.stopCh:
+				return
+			}
+		}
+	}()
+}
+
+// Stop the relayer module, for a graceful shutdown.
+func (r *Layer2Relayer) Stop() {
+	close(r.stopCh)
+}
+
+func (r *Layer2Relayer) getOrFetchBlockHashByHeight(height uint64) (*common.Hash, error) {
+	hash, err := r.db.GetHashByNumber(height)
+	if err != nil {
+		block, err := r.client.BlockByNumber(r.ctx, big.NewInt(int64(height)))
+		if err != nil {
+			return nil, err
+		}
+		x := block.Hash()
+		return &x, err
+	}
+	return hash, nil
+}
+
+func (r *Layer2Relayer) getOrFetchBlockResultByHeight(height uint64) (*types.BlockResult, error) {
+	tracesInDB, err := r.db.GetBlockResults(map[string]interface{}{"number": height})
+	if err != nil {
+		log.Warn("GetBlockResults failed", "height", height, "err", err)
+		return nil, err
+	}
+	if len(tracesInDB) == 0 {
+		return r.fetchMissingBlockResultByHeight(height)
+	}
+	return tracesInDB[0], nil
+}
+
+func (r *Layer2Relayer) fetchMissingBlockResultByHeight(height uint64) (*types.BlockResult, error) {
+	header, err := r.client.HeaderByNumber(r.ctx, big.NewInt(int64(height)))
+	if err != nil {
+		return nil, err
+	}
+	trace, err := r.client.GetBlockResultByHash(r.ctx, header.Hash())
+	if err != nil {
+		return nil, err
+	}
+	if blockTraceIsValid(trace) {
+		// skip verify for unsupported block
+		skip := false
+		if height%r.proofGenerationFreq != 0 {
+			log.Info("skip proof generation", "block", height)
+			skip = true
+		} else if TraceHasUnsupportedOpcodes(r.skippedOpcodes, trace) {
+			log.Info("block has unsupported opcodes, skip proof generation", "block", height)
+			skip = true
+		}
+		if skip {
+			if err = r.db.InsertBlockResultsWithStatus(r.ctx, []*types.BlockResult{trace}, orm.BlockSkipped); err != nil {
+				log.Error("failed to store missing blockResult", "err", err)
+			}
+		} else {
+			if err = r.db.InsertBlockResultsWithStatus(r.ctx, []*types.BlockResult{trace}, orm.BlockUnassigned); err != nil {
+				log.Error("failed to store missing blockResult", "err", err)
+			}
+		}
+		return trace, nil
+	}
+	return nil, nil
+}
+
+func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) {
+	transactionType := "Unknown"
+	// check whether it is message relay transaction
+	if layer2Hash, ok := r.processingMessage[confirmation.ID]; ok {
+		transactionType = "MessageRelay"
+		// @todo handle db error
+		err := r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, layer2Hash, confirmation.TxHash.String(), orm.MsgConfirmed)
+		if err != nil {
+			log.Warn("UpdateLayer2StatusAndLayer1Hash failed", "err", err)
+		}
+		delete(r.processingMessage, confirmation.ID)
+	}
+
+	// check whether it is block commitment transaction
+	if blockHeight, ok := r.processingBlock[confirmation.ID]; ok {
+		transactionType = "BlockCommitment"
+		// @todo handle db error
+		err := r.db.UpdateRollupTxHashAndStatus(r.ctx, blockHeight, confirmation.TxHash.String(), orm.RollupCommitted)
+		if err != nil {
+			log.Warn("UpdateRollupTxHashAndStatus failed", "err", err)
+		}
+		delete(r.processingBlock, confirmation.ID)
+	}
+
+	// check whether it is proof finalization transaction
+	if blockHeight, ok := r.processingProof[confirmation.ID]; ok {
+		transactionType = "ProofFinalization"
+		// @todo handle db error
+		err := r.db.UpdateFinalizeTxHashAndStatus(r.ctx, blockHeight, confirmation.TxHash.String(), orm.RollupFinalized)
+		if err != nil {
+			log.Warn("UpdateFinalizeTxHashAndStatus failed", "err", err)
+		}
+		delete(r.processingProof, confirmation.ID)
+
+		// try to delete block trace
+		err = r.db.DeleteTraceByNumber(blockHeight)
+		if err != nil {
+			log.Warn("DeleteTraceByNumber failed", "err", err)
+		}
+	}
+	log.Info("transaction confirmed in layer1", "type", transactionType, "confirmation", confirmation)
+}
+
+//nolint:unused
+func bufferToUint256Be(buffer []byte) []*big.Int {
+	buffer256 := make([]*big.Int, len(buffer)/32)
+	for i := 0; i < len(buffer)/32; i++ {
+		buffer256[i] = big.NewInt(0)
+		for j := 0; j < 32; j++ {
+			buffer256[i] = buffer256[i].Lsh(buffer256[i], 8)
+			buffer256[i] = buffer256[i].Add(buffer256[i], big.NewInt(int64(buffer[i*32+j])))
+		}
+	}
+	return buffer256
+}
+
+func bufferToUint256Le(buffer []byte) []*big.Int {
+	buffer256 := make([]*big.Int, len(buffer)/32)
+	for i := 0; i < len(buffer)/32; i++ {
+		v := big.NewInt(0)
+		shft := big.NewInt(1)
+		for j := 0; j < 32; j++ {
+			v = new(big.Int).Add(v, new(big.Int).Mul(shft, big.NewInt(int64(buffer[i*32+j]))))
+			shft = new(big.Int).Mul(shft, big.NewInt(256))
+		}
+		buffer256[i] = v
+	}
+	return buffer256
+}

bridge/l2/relayer_test.go

@@ -0,0 +1,234 @@
+package l2_test
+
+import (
+	"context"
+	"encoding/json"
+	"os"
+	"testing"
+	"time"
+
+	"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/database"
+	"scroll-tech/database/orm"
+
+	"scroll-tech/bridge/config"
+
+	"scroll-tech/bridge/l2"
+	"scroll-tech/bridge/mock"
+)
+
+var (
+	templateLayer2Message = []*orm.Layer2Message{
+		{
+			Nonce:      1,
+			Height:     1,
+			Sender:     "0x596a746661dbed76a84556111c2872249b070e15",
+			Value:      "100",
+			Fee:        "100",
+			GasLimit:   11529940,
+			Deadline:   uint64(time.Now().Unix()),
+			Target:     "0x2c73620b223808297ea734d946813f0dd78eb8f7",
+			Calldata:   "testdata",
+			Layer2Hash: "hash0",
+		},
+	}
+	l1Docker docker.ImgInstance
+	l2Docker docker.ImgInstance
+	dbDocker docker.ImgInstance
+)
+
+func setupEnv(t *testing.T) {
+	l1Docker = mock.NewTestL1Docker(t, TEST_CONFIG)
+	l2Docker = mock.NewTestL2Docker(t, TEST_CONFIG)
+	dbDocker = mock.GetDbDocker(t, TEST_CONFIG)
+}
+
+func TestRelayerFunction(t *testing.T) {
+	// Setup
+	setupEnv(t)
+
+	t.Run("TestCreateNewRelayer", func(t *testing.T) {
+		cfg, err := config.NewConfig("../config.json")
+		assert.NoError(t, err)
+		cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = l1Docker.Endpoint()
+
+		client, err := ethclient.Dial(l2Docker.Endpoint())
+		assert.NoError(t, err)
+
+		db, err := database.NewOrmFactory(TEST_CONFIG.DB_CONFIG)
+		assert.NoError(t, err)
+
+		skippedOpcodes := make(map[string]struct{}, len(cfg.L2Config.SkippedOpcodes))
+		for _, op := range cfg.L2Config.SkippedOpcodes {
+			skippedOpcodes[op] = struct{}{}
+		}
+
+		relayer, err := l2.NewLayer2Relayer(context.Background(), client, cfg.L2Config.ProofGenerationFreq, skippedOpcodes, int64(cfg.L2Config.Confirmations), db, cfg.L2Config.RelayerConfig)
+		assert.NoError(t, err)
+
+		relayer.Start()
+
+		defer relayer.Stop()
+	})
+
+	t.Run("TestL2RelayerProcessSaveEvents", func(t *testing.T) {
+		cfg, err := config.NewConfig("../config.json")
+		assert.NoError(t, err)
+		cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = l1Docker.Endpoint()
+
+		client, err := ethclient.Dial(l2Docker.Endpoint())
+		assert.NoError(t, err)
+
+		mock.ClearDB(t, TEST_CONFIG.DB_CONFIG)
+		db := mock.PrepareDB(t, TEST_CONFIG.DB_CONFIG)
+
+		skippedOpcodes := make(map[string]struct{}, len(cfg.L2Config.SkippedOpcodes))
+		for _, op := range cfg.L2Config.SkippedOpcodes {
+			skippedOpcodes[op] = struct{}{}
+		}
+		relayer, err := l2.NewLayer2Relayer(context.Background(), client, cfg.L2Config.ProofGenerationFreq, skippedOpcodes, int64(cfg.L2Config.Confirmations), db, cfg.L2Config.RelayerConfig)
+		assert.NoError(t, err)
+
+		err = db.SaveLayer2Messages(context.Background(), templateLayer2Message)
+		assert.NoError(t, err)
+		blocks := []*orm.RollupResult{
+			{
+				Number:         3,
+				Status:         orm.RollupFinalized,
+				RollupTxHash:   "Rollup Test Hash",
+				FinalizeTxHash: "Finalized Hash",
+			},
+		}
+		err = db.InsertPendingBlocks(context.Background(), []uint64{uint64(blocks[0].Number)})
+		assert.NoError(t, err)
+		err = db.UpdateRollupStatus(context.Background(), uint64(blocks[0].Number), orm.RollupFinalized)
+		assert.NoError(t, err)
+		relayer.ProcessSavedEvents()
+
+		msg, err := db.GetLayer2MessageByNonce(templateLayer2Message[0].Nonce)
+		assert.NoError(t, err)
+		assert.Equal(t, orm.MsgSubmitted, msg.Status)
+
+	})
+
+	t.Run("TestL2RelayerProcessPendingBlocks", func(t *testing.T) {
+		cfg, err := config.NewConfig("../config.json")
+		assert.NoError(t, err)
+		cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = l1Docker.Endpoint()
+
+		client, err := ethclient.Dial(l2Docker.Endpoint())
+		assert.NoError(t, err)
+
+		mock.ClearDB(t, TEST_CONFIG.DB_CONFIG)
+		db := mock.PrepareDB(t, TEST_CONFIG.DB_CONFIG)
+
+		skippedOpcodes := make(map[string]struct{}, len(cfg.L2Config.SkippedOpcodes))
+		for _, op := range cfg.L2Config.SkippedOpcodes {
+			skippedOpcodes[op] = struct{}{}
+		}
+		relayer, err := l2.NewLayer2Relayer(context.Background(), client, cfg.L2Config.ProofGenerationFreq, skippedOpcodes, int64(cfg.L2Config.Confirmations), db, cfg.L2Config.RelayerConfig)
+		assert.NoError(t, err)
+
+		// 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 results []*types.BlockResult
+
+		templateBlockResult, err := os.ReadFile("../../common/testdata/blockResult_relayer_parent.json")
+		assert.NoError(t, err)
+		blockResult := &types.BlockResult{}
+		err = json.Unmarshal(templateBlockResult, blockResult)
+		assert.NoError(t, err)
+		results = append(results, blockResult)
+		templateBlockResult, err = os.ReadFile("../../common/testdata/blockResult_relayer.json")
+		assert.NoError(t, err)
+		blockResult = &types.BlockResult{}
+		err = json.Unmarshal(templateBlockResult, blockResult)
+		assert.NoError(t, err)
+		results = append(results, blockResult)
+
+		err = db.InsertBlockResultsWithStatus(context.Background(), results, orm.BlockUnassigned)
+		assert.NoError(t, err)
+
+		blocks := []*orm.RollupResult{
+			{
+				Number:         4,
+				Status:         1,
+				RollupTxHash:   "Rollup Test Hash",
+				FinalizeTxHash: "Finalized Hash",
+			},
+		}
+		err = db.InsertPendingBlocks(context.Background(), []uint64{uint64(blocks[0].Number)})
+		assert.NoError(t, err)
+		err = db.UpdateRollupStatus(context.Background(), uint64(blocks[0].Number), orm.RollupPending)
+		assert.NoError(t, err)
+
+		relayer.ProcessPendingBlocks()
+
+		// Check if Rollup Result is changed successfully
+		status, err := db.GetRollupStatus(uint64(blocks[0].Number))
+		assert.NoError(t, err)
+		assert.Equal(t, orm.RollupCommitting, status)
+	})
+
+	t.Run("TestL2RelayerProcessCommittedBlocks", func(t *testing.T) {
+		cfg, err := config.NewConfig("../config.json")
+		assert.NoError(t, err)
+		cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = l1Docker.Endpoint()
+
+		client, err := ethclient.Dial(l2Docker.Endpoint())
+		assert.NoError(t, err)
+
+		mock.ClearDB(t, TEST_CONFIG.DB_CONFIG)
+		db := mock.PrepareDB(t, TEST_CONFIG.DB_CONFIG)
+
+		skippedOpcodes := make(map[string]struct{}, len(cfg.L2Config.SkippedOpcodes))
+		for _, op := range cfg.L2Config.SkippedOpcodes {
+			skippedOpcodes[op] = struct{}{}
+		}
+		relayer, err := l2.NewLayer2Relayer(context.Background(), client, cfg.L2Config.ProofGenerationFreq, skippedOpcodes, int64(cfg.L2Config.Confirmations), db, cfg.L2Config.RelayerConfig)
+		assert.NoError(t, err)
+
+		templateBlockResult, err := os.ReadFile("../../common/testdata/blockResult_relayer.json")
+		assert.NoError(t, err)
+		blockResult := &types.BlockResult{}
+		err = json.Unmarshal(templateBlockResult, blockResult)
+		assert.NoError(t, err)
+		err = db.InsertBlockResultsWithStatus(context.Background(), []*types.BlockResult{blockResult}, orm.BlockVerified)
+		assert.NoError(t, err)
+
+		blocks := []*orm.RollupResult{
+			{
+				Number:         4,
+				Status:         1,
+				RollupTxHash:   "Rollup Test Hash",
+				FinalizeTxHash: "Finalized Hash",
+			},
+		}
+		err = db.InsertPendingBlocks(context.Background(), []uint64{uint64(blocks[0].Number)})
+		assert.NoError(t, err)
+		err = db.UpdateRollupStatus(context.Background(), uint64(blocks[0].Number), 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}
+		tStateProof := []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.UpdateProofByNumber(context.Background(), uint64(blocks[0].Number), tProof, tStateProof, 100)
+		assert.NoError(t, err)
+		relayer.ProcessCommittedBlocks()
+
+		status, err := db.GetRollupStatus(uint64(blocks[0].Number))
+		assert.NoError(t, err)
+		assert.Equal(t, orm.RollupFinalizing, status)
+	})
+
+	// Teardown
+	t.Cleanup(func() {
+		assert.NoError(t, l1Docker.Stop())
+		assert.NoError(t, l2Docker.Stop())
+		assert.NoError(t, dbDocker.Stop())
+	})
+}

bridge/l2/watcher.go

@@ -0,0 +1,265 @@
+package l2
+
+import (
+	"context"
+	"fmt"
+	"math/big"
+	"time"
+
+	"github.com/scroll-tech/go-ethereum"
+	"github.com/scroll-tech/go-ethereum/accounts/abi"
+	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/event"
+	"github.com/scroll-tech/go-ethereum/log"
+
+	"scroll-tech/database"
+	"scroll-tech/database/orm"
+)
+
+const (
+	// BufferSize for the BlockResult channel
+	BufferSize = 16
+
+	// BlockResultCacheSize for the latest handled blockresults in memory.
+	BlockResultCacheSize = 64
+
+	// keccak256("SentMessage(address,address,uint256,uint256,uint256,bytes,uint256,uint256)")
+	sentMessageEventSignature = "806b28931bc6fbe6c146babfb83d5c2b47e971edb43b4566f010577a0ee7d9f4"
+)
+
+// WatcherClient provide APIs which support others to subscribe to various event from l2geth
+type WatcherClient struct {
+	ctx context.Context
+	event.Feed
+
+	*ethclient.Client
+
+	orm database.OrmFactory
+
+	confirmations       uint64
+	proofGenerationFreq uint64
+	skippedOpcodes      map[string]struct{}
+	messengerAddress    common.Address
+	messengerABI        *abi.ABI
+
+	// The height of the block that the watcher has retrieved event logs
+	processedMsgHeight uint64
+
+	stopped uint64
+	stopCh  chan struct{}
+}
+
+// NewL2WatcherClient take a l2geth instance to generate a l2watcherclient instance
+func NewL2WatcherClient(ctx context.Context, client *ethclient.Client, confirmations uint64, proofGenFreq uint64, skippedOpcodes map[string]struct{}, messengerAddress common.Address, messengerABI *abi.ABI, orm database.OrmFactory) *WatcherClient {
+	savedHeight, err := orm.GetLayer2LatestWatchedHeight()
+	if err != nil {
+		log.Warn("fetch height from db failed", "err", err)
+		savedHeight = 0
+	}
+
+	return &WatcherClient{
+		ctx:                 ctx,
+		Client:              client,
+		orm:                 orm,
+		processedMsgHeight:  uint64(savedHeight),
+		confirmations:       confirmations,
+		proofGenerationFreq: proofGenFreq,
+		skippedOpcodes:      skippedOpcodes,
+		messengerAddress:    messengerAddress,
+		messengerABI:        messengerABI,
+		stopCh:              make(chan struct{}),
+		stopped:             0,
+	}
+}
+
+// Start the Listening process
+func (w *WatcherClient) Start() {
+	go func() {
+		if w.orm == nil {
+			panic("must run L2 watcher with DB")
+		}
+
+		// trigger by timer
+		ticker := time.NewTicker(10 * time.Second)
+		defer ticker.Stop()
+
+		for {
+			select {
+			case <-ticker.C:
+				// get current height
+				number, err := w.BlockNumber(w.ctx)
+				if err != nil {
+					log.Error("Failed to get_BlockNumber", "err", err)
+					continue
+				}
+				if err = w.tryFetchRunningMissingBlocks(w.ctx, number); err != nil {
+					log.Error("Failed to fetchRunningMissingBlocks", "err", err)
+				}
+
+				// @todo handle error
+				err = w.fetchContractEvent(number)
+				if err != nil {
+					log.Error("Failed to fetchContractEvent", "err", err)
+				}
+
+			case <-w.stopCh:
+				return
+			}
+		}
+	}()
+}
+
+// Stop the Watcher module, for a graceful shutdown.
+func (w *WatcherClient) Stop() {
+	w.stopCh <- struct{}{}
+}
+
+// try fetch missing blocks if inconsistent
+func (w *WatcherClient) tryFetchRunningMissingBlocks(ctx context.Context, backTrackFrom uint64) error {
+	// Get newest block in DB. must have blocks at that time.
+	// Don't use "block_result" table "content" column's BlockTrace.Number,
+	// because it might be empty if the corresponding rollup_result is finalized/finalization_skipped
+	heightInDB, err := w.orm.GetBlockResultsLatestHeight()
+	if err != nil {
+		return fmt.Errorf("Failed to GetBlockResults in DB: %v", err)
+	}
+	backTrackTo := uint64(0)
+	if heightInDB > 0 {
+		backTrackTo = uint64(heightInDB)
+	}
+
+	// start backtracking
+	heights := []uint64{}
+	toSkipped := []*types.BlockResult{}
+	toUnassigned := []*types.BlockResult{}
+
+	var (
+		header *types.Header
+		trace  *types.BlockResult
+	)
+	for number := backTrackFrom; number > backTrackTo; number-- {
+		header, err = w.HeaderByNumber(ctx, big.NewInt(int64(number)))
+		if err != nil {
+			return fmt.Errorf("Failed to get HeaderByNumber: %v. number: %v", err, number)
+		}
+		trace, err = w.GetBlockResultByHash(ctx, header.Hash())
+		if err != nil {
+			return fmt.Errorf("Failed to GetBlockResultByHash: %v. number: %v", err, number)
+		}
+		log.Info("Retrieved block result", "height", header.Number, "hash", header.Hash())
+
+		heights = append(heights, number)
+		if number%w.proofGenerationFreq != 0 {
+			toSkipped = append(toSkipped, trace)
+		} else if TraceHasUnsupportedOpcodes(w.skippedOpcodes, trace) {
+			toSkipped = append(toSkipped, trace)
+		} else {
+			toUnassigned = append(toUnassigned, trace)
+		}
+	}
+
+	if len(heights) > 0 {
+		if err = w.orm.InsertPendingBlocks(ctx, heights); err != nil {
+			return fmt.Errorf("Failed to batch insert PendingBlocks: %v", err)
+		}
+	}
+	if len(toSkipped) > 0 {
+		if err = w.orm.InsertBlockResultsWithStatus(ctx, toSkipped, orm.BlockSkipped); err != nil {
+			return fmt.Errorf("failed to batch insert PendingBlocks: %v", err)
+		}
+	}
+	if len(toUnassigned) > 0 {
+		if err = w.orm.InsertBlockResultsWithStatus(ctx, toUnassigned, orm.BlockUnassigned); err != nil {
+			return fmt.Errorf("failed to batch insert PendingBlocks: %v", err)
+		}
+	}
+	return nil
+}
+
+// FetchContractEvent pull latest event logs from given contract address and save in DB
+func (w *WatcherClient) fetchContractEvent(blockHeight uint64) error {
+	fromBlock := int64(w.processedMsgHeight) + 1
+	toBlock := int64(blockHeight) - int64(w.confirmations)
+
+	if toBlock < fromBlock {
+		return nil
+	}
+
+	// warning: uint int conversion...
+	query := ethereum.FilterQuery{
+		FromBlock: big.NewInt(fromBlock), // inclusive
+		ToBlock:   big.NewInt(toBlock),   // inclusive
+		Addresses: []common.Address{
+			w.messengerAddress,
+		},
+		Topics: make([][]common.Hash, 1),
+	}
+	query.Topics[0] = make([]common.Hash, 1)
+	query.Topics[0][0] = common.HexToHash(sentMessageEventSignature)
+
+	logs, err := w.FilterLogs(w.ctx, query)
+	if err != nil {
+		log.Error("Failed to get event logs", "err", err)
+		return err
+	}
+	if len(logs) == 0 {
+		return nil
+	}
+	log.Info("Received new L2 messages", "fromBlock", fromBlock, "toBlock", toBlock,
+		"cnt", len(logs))
+
+	eventLogs, err := parseBridgeEventLogs(logs, w.messengerABI)
+	if err != nil {
+		log.Error("Failed to parse emitted event log", "err", err)
+		return err
+	}
+
+	err = w.orm.SaveLayer2Messages(w.ctx, eventLogs)
+	if err == nil {
+		w.processedMsgHeight = uint64(toBlock)
+	}
+	return err
+}
+
+func parseBridgeEventLogs(logs []types.Log, messengerABI *abi.ABI) ([]*orm.Layer2Message, error) {
+	// Need use contract abi to parse event Log
+	// Can only be tested after we have our contracts set up
+
+	var parsedlogs []*orm.Layer2Message
+	for _, vLog := range logs {
+		event := struct {
+			Target       common.Address
+			Sender       common.Address
+			Value        *big.Int // uint256
+			Fee          *big.Int // uint256
+			Deadline     *big.Int // uint256
+			Message      []byte
+			MessageNonce *big.Int // uint256
+			GasLimit     *big.Int // uint256
+		}{}
+
+		err := messengerABI.UnpackIntoInterface(&event, "SentMessage", vLog.Data)
+		if err != nil {
+			log.Error("Failed to unpack layer2 SentMessage event", "err", err)
+			return parsedlogs, err
+		}
+		// target is in topics[1]
+		event.Target = common.HexToAddress(vLog.Topics[1].String())
+		parsedlogs = append(parsedlogs, &orm.Layer2Message{
+			Nonce:      event.MessageNonce.Uint64(),
+			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(),
+		})
+	}
+
+	return parsedlogs, nil
+}

bridge/l2/watcher_api.go

@@ -0,0 +1,33 @@
+package l2
+
+import (
+	"errors"
+
+	"github.com/scroll-tech/go-ethereum/rpc"
+)
+
+// WatcherAPI watcher api service
+type WatcherAPI interface {
+	ReplayBlockResultByHash(blockNrOrHash rpc.BlockNumberOrHash) (bool, error)
+}
+
+// ReplayBlockResultByHash temporary interface for easy testing.
+func (r *WatcherClient) ReplayBlockResultByHash(blockNrOrHash rpc.BlockNumberOrHash) (bool, error) {
+	orm := r.orm
+	params := make(map[string]interface{})
+	if number, ok := blockNrOrHash.Number(); ok {
+		params["number"] = int64(number)
+	}
+	if hash, ok := blockNrOrHash.Hash(); ok {
+		params["hash"] = hash.String()
+	}
+	if len(params) == 0 {
+		return false, errors.New("empty params")
+	}
+	trace, err := orm.GetBlockResults(params)
+	if err != nil {
+		return false, err
+	}
+	r.Send(&trace[0])
+	return true, nil
+}

bridge/l2/watcher_test.go

@@ -0,0 +1,319 @@
+package l2_test
+
+import (
+	"context"
+	"crypto/ecdsa"
+	"encoding/json"
+	"math/big"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+
+	"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"
+
+	bridge_abi "scroll-tech/bridge/abi"
+	"scroll-tech/bridge/l2"
+
+	"scroll-tech/common/docker"
+	"scroll-tech/common/utils"
+
+	"scroll-tech/database"
+
+	db_config "scroll-tech/database"
+
+	"scroll-tech/bridge/config"
+	"scroll-tech/bridge/mock"
+	"scroll-tech/bridge/mock_bridge"
+)
+
+const TEST_BUFFER = 500
+
+var TEST_CONFIG = &mock.TestConfig{
+	L1GethTestConfig: mock.L1GethTestConfig{
+		HPort: 0,
+		WPort: 8571,
+	},
+	L2GethTestConfig: mock.L2GethTestConfig{
+		HPort: 0,
+		WPort: 8567,
+	},
+	DbTestconfig: mock.DbTestconfig{
+		DbName: "testwatcher_db",
+		DbPort: 5438,
+		DB_CONFIG: &db_config.DBConfig{
+			DriverName: utils.GetEnvWithDefault("TEST_DB_DRIVER", "postgres"),
+			DSN:        utils.GetEnvWithDefault("TEST_DB_DSN", "postgres://postgres:123456@localhost:5438/testwatcher_db?sslmode=disable"),
+		},
+	},
+}
+
+var (
+	// previousHeight store previous chain height
+	previousHeight uint64
+	l1gethImg      docker.ImgInstance
+	l2gethImg      docker.ImgInstance
+	dbImg          docker.ImgInstance
+	l2Backend      *l2.Backend
+)
+
+func setenv(t *testing.T) {
+	cfg, err := config.NewConfig("../config.json")
+	assert.NoError(t, err)
+	l1gethImg = mock.NewTestL1Docker(t, TEST_CONFIG)
+	cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = l1gethImg.Endpoint()
+	l2Backend, l2gethImg, dbImg = mock.L2gethDocker(t, cfg, TEST_CONFIG)
+}
+
+func TestWatcherFunction(t *testing.T) {
+	setenv(t)
+	t.Run("TestL2Backend", func(t *testing.T) {
+		err := l2Backend.Start()
+		assert.NoError(t, err)
+		l2Backend.Stop()
+	})
+	t.Run("TestCreateNewWatcherAndStop", func(t *testing.T) {
+		cfg, err := config.NewConfig("../config.json")
+		assert.NoError(t, err)
+
+		cfg.L2Config.Endpoint = l2gethImg.Endpoint()
+		client, err := ethclient.Dial(cfg.L2Config.Endpoint)
+		assert.NoError(t, err)
+		mock.ClearDB(t, TEST_CONFIG.DB_CONFIG)
+
+		messengerABI, err := bridge_abi.L2MessengerMetaData.GetAbi()
+		assert.NoError(t, err)
+
+		l2db := mock.PrepareDB(t, TEST_CONFIG.DB_CONFIG)
+
+		skippedOpcodes := make(map[string]struct{}, len(cfg.L2Config.SkippedOpcodes))
+		for _, op := range cfg.L2Config.SkippedOpcodes {
+			skippedOpcodes[op] = struct{}{}
+		}
+		proofGenerationFreq := cfg.L2Config.ProofGenerationFreq
+		if proofGenerationFreq == 0 {
+			proofGenerationFreq = 1
+		}
+		rc := l2.NewL2WatcherClient(context.Background(), client, cfg.L2Config.Confirmations, proofGenerationFreq, skippedOpcodes, cfg.L2Config.L2MessengerAddress, messengerABI, l2db)
+		rc.Start()
+
+		// Create several transactions and commit to block
+		numTransactions := 3
+
+		for i := 0; i < numTransactions; i++ {
+			tx := mock.SendTxToL2Client(t, client, cfg.L2Config.RelayerConfig.PrivateKey)
+			// wait for mining
+			_, err = bind.WaitMined(context.Background(), client, tx)
+			assert.NoError(t, err)
+		}
+
+		<-time.After(10 * time.Second)
+		blockNum, err := client.BlockNumber(context.Background())
+		assert.NoError(t, err)
+		assert.GreaterOrEqual(t, blockNum, uint64(numTransactions))
+
+		rc.Stop()
+		l2db.Close()
+	})
+
+	t.Run("TestMonitorBridgeContract", func(t *testing.T) {
+		cfg, err := config.NewConfig("../config.json")
+		assert.NoError(t, err)
+		t.Log("confirmations:", cfg.L2Config.Confirmations)
+
+		cfg.L2Config.Endpoint = l2gethImg.Endpoint()
+		client, err := ethclient.Dial(cfg.L2Config.Endpoint)
+		assert.NoError(t, err)
+
+		mock.ClearDB(t, TEST_CONFIG.DB_CONFIG)
+		previousHeight, err = client.BlockNumber(context.Background())
+		assert.NoError(t, err)
+
+		auth := prepareAuth(t, client, cfg.L2Config.RelayerConfig.PrivateKey)
+
+		// deploy mock bridge
+		_, tx, instance, err := mock_bridge.DeployMockBridge(auth, client)
+		assert.NoError(t, err)
+		address, err := bind.WaitDeployed(context.Background(), client, tx)
+		assert.NoError(t, err)
+
+		db := mock.PrepareDB(t, TEST_CONFIG.DB_CONFIG)
+		rc := prepareRelayerClient(client, db, address)
+		rc.Start()
+
+		// Call mock_bridge instance sendMessage to trigger emit events
+		addr := common.HexToAddress("0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63")
+		nonce, err := client.PendingNonceAt(context.Background(), addr)
+		assert.NoError(t, err)
+		auth.Nonce = big.NewInt(int64(nonce))
+		toAddress := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
+		message := []byte("testbridgecontract")
+		tx, err = instance.SendMessage(auth, toAddress, message, auth.GasPrice)
+		assert.NoError(t, err)
+		receipt, err := bind.WaitMined(context.Background(), client, tx)
+		if receipt.Status != types.ReceiptStatusSuccessful || err != nil {
+			t.Fatalf("Call failed")
+		}
+
+		//extra block mined
+		addr = common.HexToAddress("0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63")
+		nonce, nounceErr := client.PendingNonceAt(context.Background(), addr)
+		assert.NoError(t, nounceErr)
+		auth.Nonce = big.NewInt(int64(nonce))
+		toAddress = common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
+		message = []byte("testbridgecontract")
+		tx, err = instance.SendMessage(auth, toAddress, message, auth.GasPrice)
+		assert.NoError(t, err)
+		receipt, err = bind.WaitMined(context.Background(), client, tx)
+		if receipt.Status != types.ReceiptStatusSuccessful || err != nil {
+			t.Fatalf("Call failed")
+		}
+
+		// wait for dealing time
+		<-time.After(6 * time.Second)
+
+		var latestHeight uint64
+		latestHeight, err = client.BlockNumber(context.Background())
+		assert.NoError(t, err)
+		t.Log("Latest height is", latestHeight)
+
+		// check if we successfully stored events
+		height, err := db.GetLayer2LatestWatchedHeight()
+		assert.NoError(t, err)
+		t.Log("Height in DB is", height)
+		assert.Greater(t, height, int64(previousHeight))
+		msgs, err := db.GetL2UnprocessedMessages()
+		assert.NoError(t, err)
+		assert.Equal(t, 2, len(msgs))
+
+		rc.Stop()
+		db.Close()
+	})
+
+	t.Run("TestFetchMultipleSentMessageInOneBlock", func(t *testing.T) {
+		cfg, err := config.NewConfig("../config.json")
+		assert.NoError(t, err)
+
+		cfg.L2Config.Endpoint = l2gethImg.Endpoint()
+		client, err := ethclient.Dial(cfg.L2Config.Endpoint)
+		assert.NoError(t, err)
+
+		mock.ClearDB(t, TEST_CONFIG.DB_CONFIG)
+
+		previousHeight, err := client.BlockNumber(context.Background()) // shallow the global previousHeight
+		assert.NoError(t, err)
+
+		auth := prepareAuth(t, client, cfg.L2Config.RelayerConfig.PrivateKey)
+
+		_, trx, instance, err := mock_bridge.DeployMockBridge(auth, client)
+		assert.NoError(t, err)
+		address, err := bind.WaitDeployed(context.Background(), client, trx)
+		assert.NoError(t, err)
+
+		db := mock.PrepareDB(t, TEST_CONFIG.DB_CONFIG)
+		rc := prepareRelayerClient(client, db, address)
+		rc.Start()
+
+		// Call mock_bridge instance sendMessage to trigger emit events multiple times
+		numTransactions := 4
+		var tx *types.Transaction
+
+		for i := 0; i < numTransactions; i++ {
+			addr := common.HexToAddress("0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63")
+			nonce, nounceErr := client.PendingNonceAt(context.Background(), addr)
+			assert.NoError(t, nounceErr)
+			auth.Nonce = big.NewInt(int64(nonce))
+			toAddress := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
+			message := []byte("testbridgecontract")
+			tx, err = instance.SendMessage(auth, toAddress, message, auth.GasPrice)
+			assert.NoError(t, err)
+		}
+
+		receipt, err := bind.WaitMined(context.Background(), client, tx)
+		if receipt.Status != types.ReceiptStatusSuccessful || err != nil {
+			t.Fatalf("Call failed")
+		}
+
+		// extra block mined
+		addr := common.HexToAddress("0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63")
+		nonce, nounceErr := client.PendingNonceAt(context.Background(), addr)
+		assert.NoError(t, nounceErr)
+		auth.Nonce = big.NewInt(int64(nonce))
+		toAddress := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
+		message := []byte("testbridgecontract")
+		tx, err = instance.SendMessage(auth, toAddress, message, auth.GasPrice)
+		assert.NoError(t, err)
+		receipt, err = bind.WaitMined(context.Background(), client, tx)
+		if receipt.Status != types.ReceiptStatusSuccessful || err != nil {
+			t.Fatalf("Call failed")
+		}
+
+		// wait for dealing time
+		<-time.After(6 * time.Second)
+
+		// check if we successfully stored events
+		height, err := db.GetLayer2LatestWatchedHeight()
+		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.GetL2UnprocessedMessages()
+		assert.NoError(t, err)
+		assert.Equal(t, 5, len(msgs))
+
+		rc.Stop()
+		db.Close()
+	})
+
+	// Teardown
+	t.Cleanup(func() {
+		assert.NoError(t, l1gethImg.Stop())
+		assert.NoError(t, l2gethImg.Stop())
+		assert.NoError(t, dbImg.Stop())
+	})
+
+}
+
+func TestTraceHasUnsupportedOpcodes(t *testing.T) {
+	cfg, err := config.NewConfig("../config.json")
+	assert.NoError(t, err)
+
+	delegateTrace, err := os.ReadFile("../../common/testdata/blockResult_delegate.json")
+	assert.NoError(t, err)
+
+	trace := &types.BlockResult{}
+	assert.NoError(t, json.Unmarshal(delegateTrace, &trace))
+
+	unsupportedOpcodes := make(map[string]struct{})
+	for _, val := range cfg.L2Config.SkippedOpcodes {
+		unsupportedOpcodes[val] = struct{}{}
+	}
+}
+
+func prepareRelayerClient(client *ethclient.Client, db database.OrmFactory, contractAddr common.Address) *l2.WatcherClient {
+	messengerABI, _ := bridge_abi.L1MessengerMetaData.GetAbi()
+	return l2.NewL2WatcherClient(context.Background(), client, 0, 1, map[string]struct{}{}, contractAddr, messengerABI, db)
+}
+
+func prepareAuth(t *testing.T, client *ethclient.Client, private string) *bind.TransactOpts {
+	privateKey, err := crypto.HexToECDSA(private)
+	assert.NoError(t, err)
+	publicKey := privateKey.Public()
+	publicKeyECDSA, ok := publicKey.(*ecdsa.PublicKey)
+	assert.True(t, ok)
+	fromAddress := crypto.PubkeyToAddress(*publicKeyECDSA)
+	nonce, err := client.PendingNonceAt(context.Background(), fromAddress)
+	assert.NoError(t, err)
+	auth, err := bind.NewKeyedTransactorWithChainID(privateKey, big.NewInt(53077))
+	assert.NoError(t, err)
+	auth.Nonce = big.NewInt(int64(nonce))
+	auth.Value = big.NewInt(0)       // in wei
+	auth.GasLimit = uint64(30000000) // in units
+	auth.GasPrice, err = client.SuggestGasPrice(context.Background())
+	assert.NoError(t, err)
+	return auth
+}

bridge/mock/mock.go

@@ -0,0 +1,251 @@
+package mock
+
+import (
+	"context"
+	"crypto/ecdsa"
+	"crypto/elliptic"
+	"crypto/rand"
+	"encoding/binary"
+	"encoding/json"
+	"io"
+	"math/big"
+	"net"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/ethereum/go-ethereum/crypto/secp256k1"
+	"github.com/gorilla/websocket"
+	"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/stretchr/testify/assert"
+
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
+
+	"scroll-tech/common/message"
+	"scroll-tech/coordinator"
+	coordinator_config "scroll-tech/coordinator/config"
+
+	bridge_config "scroll-tech/bridge/config"
+	"scroll-tech/bridge/l2"
+
+	"scroll-tech/common/docker"
+
+	docker_db "scroll-tech/database/docker"
+)
+
+// PerformHandshake sets up a websocket client to connect to the roller manager.
+func PerformHandshake(t *testing.T, c *websocket.Conn) {
+	// Try to perform handshake
+	pk, sk := generateKeyPair()
+	authMsg := &message.AuthMessage{
+		Identity: message.Identity{
+			Name:      "testRoller",
+			Timestamp: time.Now().UnixNano(),
+			PublicKey: common.Bytes2Hex(pk),
+		},
+		Signature: "",
+	}
+
+	hash, err := authMsg.Identity.Hash()
+	assert.NoError(t, err)
+	sig, err := secp256k1.Sign(hash, sk)
+	assert.NoError(t, err)
+
+	authMsg.Signature = common.Bytes2Hex(sig)
+
+	b, err := json.Marshal(authMsg)
+	assert.NoError(t, err)
+
+	msg := &message.Msg{
+		Type:    message.Register,
+		Payload: b,
+	}
+
+	b, err = json.Marshal(msg)
+	assert.NoError(t, err)
+
+	assert.NoError(t, c.WriteMessage(websocket.BinaryMessage, b))
+}
+
+func generateKeyPair() (pubkey, privkey []byte) {
+	key, err := ecdsa.GenerateKey(secp256k1.S256(), rand.Reader)
+	if err != nil {
+		panic(err)
+	}
+	pubkey = elliptic.Marshal(secp256k1.S256(), key.X, key.Y)
+
+	privkey = make([]byte, 32)
+	blob := key.D.Bytes()
+	copy(privkey[32-len(blob):], blob)
+
+	return pubkey, privkey
+}
+
+// SetupMockVerifier sets up a mocked verifier for a test case.
+func SetupMockVerifier(t *testing.T, verifierEndpoint string) {
+	err := os.RemoveAll(verifierEndpoint)
+	assert.NoError(t, err)
+
+	l, err := net.Listen("unix", verifierEndpoint)
+	assert.NoError(t, err)
+
+	go func() {
+		conn, err := l.Accept()
+		assert.NoError(t, err)
+
+		// Simply read all incoming messages and send a true boolean straight back.
+		for {
+			// Read length
+			buf := make([]byte, 4)
+			_, err = io.ReadFull(conn, buf)
+			assert.NoError(t, err)
+
+			// Read message
+			msgLength := binary.LittleEndian.Uint64(buf)
+			buf = make([]byte, msgLength)
+			_, err = io.ReadFull(conn, buf)
+			assert.NoError(t, err)
+
+			// Return boolean
+			buf = []byte{1}
+			_, err = conn.Write(buf)
+			assert.NoError(t, err)
+		}
+	}()
+
+}
+
+// L1GethTestConfig is the http and web socket port of l1geth docker
+type L1GethTestConfig struct {
+	HPort int
+	WPort int
+}
+
+// L2GethTestConfig is the http and web socket port of l2geth docker
+type L2GethTestConfig struct {
+	HPort int
+	WPort int
+}
+
+// DbTestconfig is the test config of database docker
+type DbTestconfig struct {
+	DbName    string
+	DbPort    int
+	DB_CONFIG *database.DBConfig
+}
+
+// TestConfig is the config for test
+type TestConfig struct {
+	L1GethTestConfig
+	L2GethTestConfig
+	DbTestconfig
+}
+
+// NewTestL1Docker starts and returns l1geth docker
+func NewTestL1Docker(t *testing.T, tcfg *TestConfig) docker.ImgInstance {
+	img_geth := docker.NewImgGeth(t, "scroll_l1geth", "", "", tcfg.L1GethTestConfig.HPort, tcfg.L1GethTestConfig.WPort)
+	assert.NoError(t, img_geth.Start())
+	return img_geth
+}
+
+// NewTestL2Docker starts and returns l2geth docker
+func NewTestL2Docker(t *testing.T, tcfg *TestConfig) docker.ImgInstance {
+	img_geth := docker.NewImgGeth(t, "scroll_l2geth", "", "", tcfg.L2GethTestConfig.HPort, tcfg.L2GethTestConfig.WPort)
+	assert.NoError(t, img_geth.Start())
+	return img_geth
+}
+
+// GetDbDocker starts and returns database docker
+func GetDbDocker(t *testing.T, tcfg *TestConfig) docker.ImgInstance {
+	img_db := docker_db.NewImgDB(t, "postgres", "123456", tcfg.DbName, tcfg.DbPort)
+	assert.NoError(t, img_db.Start())
+	return img_db
+}
+
+// L2gethDocker return mock l2geth client created with docker for test
+func L2gethDocker(t *testing.T, cfg *bridge_config.Config, tcfg *TestConfig) (*l2.Backend, docker.ImgInstance, docker.ImgInstance) {
+	// initialize l2geth docker image
+	img_geth := NewTestL2Docker(t, tcfg)
+
+	cfg.L2Config.Endpoint = img_geth.Endpoint()
+
+	// initialize db docker image
+	img_db := GetDbDocker(t, tcfg)
+
+	db, err := database.NewOrmFactory(&database.DBConfig{
+		DriverName: "postgres",
+		DSN:        img_db.Endpoint(),
+	})
+	assert.NoError(t, err)
+
+	client, err := l2.New(context.Background(), cfg.L2Config, db)
+	assert.NoError(t, err)
+
+	return client, img_geth, img_db
+}
+
+// SetupRollerManager return coordinator.Manager for testcase
+func SetupRollerManager(t *testing.T, cfg *coordinator_config.Config, orm database.OrmFactory) *coordinator.Manager {
+	// Load config file.
+	ctx := context.Background()
+
+	SetupMockVerifier(t, cfg.RollerManagerConfig.VerifierEndpoint)
+	rollerManager, err := coordinator.New(ctx, cfg.RollerManagerConfig, orm)
+	assert.NoError(t, err)
+
+	// Start rollermanager modules.
+	err = rollerManager.Start()
+	assert.NoError(t, err)
+	return rollerManager
+}
+
+// ClearDB clears db
+func ClearDB(t *testing.T, db_cfg *database.DBConfig) {
+	factory, err := database.NewOrmFactory(db_cfg)
+	assert.NoError(t, err)
+	db := factory.GetDB()
+	version0 := int64(0)
+	err = migrate.Rollback(db.DB, &version0)
+	assert.NoError(t, err)
+	err = migrate.Migrate(db.DB)
+	assert.NoError(t, err)
+	err = db.DB.Close()
+	assert.NoError(t, err)
+}
+
+// PrepareDB will return DB for testcase
+func PrepareDB(t *testing.T, db_cfg *database.DBConfig) database.OrmFactory {
+	db, err := database.NewOrmFactory(db_cfg)
+	assert.NoError(t, err)
+	return db
+}
+
+// SendTxToL2Client will send a default Tx by calling l2geth client
+func SendTxToL2Client(t *testing.T, client *ethclient.Client, private string) *types.Transaction {
+	privateKey, err := crypto.HexToECDSA(private)
+	assert.NoError(t, err)
+	publicKey := privateKey.Public()
+	publicKeyECDSA, ok := publicKey.(*ecdsa.PublicKey)
+	assert.True(t, ok)
+	fromAddress := crypto.PubkeyToAddress(*publicKeyECDSA)
+	nonce, err := client.PendingNonceAt(context.Background(), fromAddress)
+	assert.NoError(t, err)
+	value := big.NewInt(1000000000) // in wei
+	gasLimit := uint64(30000000)    // in units
+	gasPrice, err := client.SuggestGasPrice(context.Background())
+	assert.NoError(t, err)
+	toAddress := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
+	tx := types.NewTransaction(nonce, toAddress, value, gasLimit, gasPrice, nil)
+	chainID, err := client.ChainID(context.Background())
+	assert.NoError(t, err)
+
+	signedTx, err := types.SignTx(tx, types.NewEIP155Signer(chainID), privateKey)
+	assert.NoError(t, err)
+
+	assert.NoError(t, client.SendTransaction(context.Background(), signedTx))
+	return signedTx
+}

bridge/mock_bridge/MockBridgeL1.sol

@@ -1,380 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-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,
-    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);
-
-  /// @dev The maximum number of transaction in on batch.
-  uint256 public immutable maxNumTxInBatch;
-
-  /// @dev The hash used for padding public inputs.
-  bytes32 public immutable paddingTxHash;
-
-  /***************************
-   * Events from ScrollChain *
-   ***************************/
-
-  /// @notice Emitted when a new batch is commited.
-  /// @param batchHash The hash of the batch
-  event CommitBatch(bytes32 indexed batchHash);
-
-  /// @notice Emitted when a batch is reverted.
-  /// @param batchHash The identification of the batch.
-  event RevertBatch(bytes32 indexed batchHash);
-
-  /// @notice Emitted when a batch is finalized.
-  /// @param batchHash The hash of the batch
-  event FinalizeBatch(bytes32 indexed batchHash);
-
-  /***********
-   * 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 batchHash;
-    // Concatenation of merkle proof for withdraw merkle trie.
-    bytes merkleProof;
-  }
-
-  /*************
-   * Variables *
-   *************/
-
-  /// @notice Message nonce, used to avoid relay attack.
-  uint256 public messageNonce;
-
-  /***************
-   * Constructor *
-   ***************/
-
-  constructor() {
-    maxNumTxInBatch = 44;
-    paddingTxHash = 0x0000000000000000000000000000000000000000000000000000000000000000;
-  }
-
-  /***********************************
-   * Functions from L2GasPriceOracle *
-   ***********************************/
-
-  function setL2BaseFee(uint256) external {
-  }
-
-  /************************************
-   * Functions from L1ScrollMessenger *
-   ************************************/
-
-  function sendMessage(
-    address target,
-    uint256 value,
-    bytes calldata 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);
-    }
-
-    emit SentMessage(msg.sender, target, value, messageNonce, gasLimit, message);
-    messageNonce += 1;
-  }
-
-  function relayMessageWithProof(
-    address _from,
-    address _to,
-    uint256 _value,
-    uint256 _nonce,
-    bytes memory _message,
-    L2MessageProof memory
-  ) external {
-    bytes memory _xDomainCalldata = _encodeXDomainCalldata(_from, _to, _value, _nonce, _message);
-    bytes32 _xDomainCalldataHash = keccak256(_xDomainCalldata);
-    emit RelayedMessage(_xDomainCalldataHash);
-  }
-
-  /******************************
-   * Functions from ScrollChain *
-   ******************************/
-
-  function commitBatch(Batch memory _batch) external {
-    _commitBatch(_batch);
-  }
-
-  function commitBatches(Batch[] memory _batches) external {
-    for (uint256 i = 0; i < _batches.length; i++) {
-      _commitBatch(_batches[i]);
-    }
-  }
-
-  function revertBatch(bytes32 _batchHash) external {
-    emit RevertBatch(_batchHash);
-  }
-
-  function finalizeBatchWithProof(
-    bytes32 _batchHash,
-    uint256[] memory,
-    uint256[] memory
-  ) external {
-    emit FinalizeBatch(_batchHash);
-  }
-
-  /**********************
-   * Internal Functions *
-   **********************/
-
-  function _commitBatch(Batch memory _batch) internal {
-    bytes32 _batchHash = _computePublicInputHash(_batch);
-    emit CommitBatch(_batchHash);
-  }
-
-  /// @dev Internal function to generate the correct cross domain calldata for a message.
-  /// @param _sender Message sender address.
-  /// @param _target Target contract address.
-  /// @param _value The amount of ETH pass to the target.
-  /// @param _messageNonce Nonce for the provided message.
-  /// @param _message Message to send to the target.
-  /// @return ABI encoded cross domain calldata.
-  function _encodeXDomainCalldata(
-    address _sender,
-    address _target,
-    uint256 _value,
-    uint256 _messageNonce,
-    bytes memory _message
-  ) internal pure returns (bytes memory) {
-    return
-      abi.encodeWithSignature(
-        "relayMessage(address,address,uint256,uint256,bytes)",
-        _sender,
-        _target,
-        _value,
-        _messageNonce,
-        _message
-      );
-  }
-
-  function applyL1ToL2Alias(address l1Address) internal pure returns (address l2Address) {
-    uint160 offset = uint160(0x1111000000000000000000000000000000001111);
-    unchecked {
-      l2Address = address(uint160(l1Address) + offset);
-    }
-  }
-
-  /// @dev Internal function to compute the public input hash.
-  /// @param batch The batch to compute.
-  function _computePublicInputHash(Batch memory batch)
-    internal
-    view
-    returns (
-      bytes32
-    )
-  {
-    uint256 publicInputsPtr;
-    // 1. append prevStateRoot, newStateRoot and withdrawTrieRoot to public inputs
-    {
-      bytes32 prevStateRoot = batch.prevStateRoot;
-      bytes32 newStateRoot = batch.newStateRoot;
-      bytes32 withdrawTrieRoot = batch.withdrawTrieRoot;
-      // number of bytes in public inputs: 32 * 3 + 124 * blocks + 32 * MAX_NUM_TXS
-      uint256 publicInputsSize = 32 * 3 + batch.blocks.length * 124 + 32 * maxNumTxInBatch;
-      assembly {
-        publicInputsPtr := mload(0x40)
-        mstore(0x40, add(publicInputsPtr, publicInputsSize))
-        mstore(publicInputsPtr, prevStateRoot)
-        publicInputsPtr := add(publicInputsPtr, 0x20)
-        mstore(publicInputsPtr, newStateRoot)
-        publicInputsPtr := add(publicInputsPtr, 0x20)
-        mstore(publicInputsPtr, withdrawTrieRoot)
-        publicInputsPtr := add(publicInputsPtr, 0x20)
-      }
-    }
-
-    uint64 numTransactionsInBatch;
-    BlockContext memory _block;
-    // 2. append block information to public inputs.
-    for (uint256 i = 0; i < batch.blocks.length; i++) {
-      // validate blocks, we won't check first block against previous batch.
-      {
-        BlockContext memory _currentBlock = batch.blocks[i];
-        if (i > 0) {
-          require(_block.blockHash == _currentBlock.parentHash, "Parent hash mismatch");
-          require(_block.blockNumber + 1 == _currentBlock.blockNumber, "Block number mismatch");
-        }
-        _block = _currentBlock;
-      }
-
-      // append blockHash and parentHash to public inputs
-      {
-        bytes32 blockHash = _block.blockHash;
-        bytes32 parentHash = _block.parentHash;
-        assembly {
-          mstore(publicInputsPtr, blockHash)
-          publicInputsPtr := add(publicInputsPtr, 0x20)
-          mstore(publicInputsPtr, parentHash)
-          publicInputsPtr := add(publicInputsPtr, 0x20)
-        }
-      }
-      // append blockNumber and blockTimestamp to public inputs
-      {
-        uint256 blockNumber = _block.blockNumber;
-        uint256 blockTimestamp = _block.timestamp;
-        assembly {
-          mstore(publicInputsPtr, shl(192, blockNumber))
-          publicInputsPtr := add(publicInputsPtr, 0x8)
-          mstore(publicInputsPtr, shl(192, blockTimestamp))
-          publicInputsPtr := add(publicInputsPtr, 0x8)
-        }
-      }
-      // append baseFee to public inputs
-      {
-        uint256 baseFee = _block.baseFee;
-        assembly {
-          mstore(publicInputsPtr, baseFee)
-          publicInputsPtr := add(publicInputsPtr, 0x20)
-        }
-      }
-      uint64 numTransactionsInBlock = _block.numTransactions;
-      // gasLimit, numTransactions and numL1Messages to public inputs
-      {
-        uint256 gasLimit = _block.gasLimit;
-        uint256 numL1MessagesInBlock = _block.numL1Messages;
-        assembly {
-          mstore(publicInputsPtr, shl(192, gasLimit))
-          publicInputsPtr := add(publicInputsPtr, 0x8)
-          mstore(publicInputsPtr, shl(240, numTransactionsInBlock))
-          publicInputsPtr := add(publicInputsPtr, 0x2)
-          mstore(publicInputsPtr, shl(240, numL1MessagesInBlock))
-          publicInputsPtr := add(publicInputsPtr, 0x2)
-        }
-      }
-      numTransactionsInBatch += numTransactionsInBlock;
-    }
-    require(numTransactionsInBatch <= maxNumTxInBatch, "Too many transactions in batch");
-
-    // 3. append transaction hash to public inputs.
-    uint256 _l2TxnPtr;
-    {
-      bytes memory l2Transactions = batch.l2Transactions;
-      assembly {
-        _l2TxnPtr := add(l2Transactions, 0x20)
-      }
-    }
-    for (uint256 i = 0; i < batch.blocks.length; i++) {
-      uint256 numL1MessagesInBlock = batch.blocks[i].numL1Messages;
-      require(numL1MessagesInBlock == 0);
-      uint256 numTransactionsInBlock = batch.blocks[i].numTransactions;
-      for (uint256 j = numL1MessagesInBlock; j < numTransactionsInBlock; ++j) {
-        bytes32 hash;
-        assembly {
-          let txPayloadLength := shr(224, mload(_l2TxnPtr))
-          _l2TxnPtr := add(_l2TxnPtr, 4)
-          _l2TxnPtr := add(_l2TxnPtr, txPayloadLength)
-          hash := keccak256(sub(_l2TxnPtr, txPayloadLength), txPayloadLength)
-          mstore(publicInputsPtr, hash)
-          publicInputsPtr := add(publicInputsPtr, 0x20)
-        }
-      }
-    }
-
-    // 4. append padding transaction to public inputs.
-    bytes32 txHashPadding = paddingTxHash;
-    for (uint256 i = numTransactionsInBatch; i < maxNumTxInBatch; i++) {
-      assembly {
-        mstore(publicInputsPtr, txHashPadding)
-        publicInputsPtr := add(publicInputsPtr, 0x20)
-      }
-    }
-
-    // 5. compute public input hash
-    bytes32 publicInputHash;
-    {
-      uint256 publicInputsSize = 32 * 3 + batch.blocks.length * 124 + 32 * maxNumTxInBatch;
-      assembly {
-        publicInputHash := keccak256(sub(publicInputsPtr, publicInputsSize), publicInputsSize)
-      }
-    }
-
-    return publicInputHash;
-  }
-}

bridge/mock_bridge/MockBridgeL2.sol

@@ -1,129 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity ^0.8.0;
-
-contract MockBridgeL2 {
-  /******************************
-   * Events from L2MessageQueue *
-   ******************************/
-
-  /// @notice Emitted when a new message is added to the merkle tree.
-  /// @param index The index of the corresponding message.
-  /// @param messageHash The hash of the corresponding message.
-  event AppendMessage(uint256 index, bytes32 messageHash);
-
-  /********************************
-   * Events from L1BlockContainer *
-   ********************************/
-
-  /// @notice Emitted when a block is imported.
-  /// @param blockHash The hash of the imported block.
-  /// @param blockHeight The height of the imported block.
-  /// @param blockTimestamp The timestamp of the imported block.
-  /// @param baseFee The base fee of the imported block.
-  /// @param stateRoot The state root of the imported block.
-  event ImportBlock(
-    bytes32 indexed blockHash,
-    uint256 blockHeight,
-    uint256 blockTimestamp,
-    uint256 baseFee,
-    bytes32 stateRoot
-  );
-
-  /*********************************
-   * Events from L2ScrollMessenger *
-   *********************************/
-
-  /// @notice Emitted when a cross domain message is sent.
-  /// @param sender The address of the sender who initiates the message.
-  /// @param target The address of target contract to call.
-  /// @param value The amount of value passed to the target contract.
-  /// @param messageNonce The nonce of the message.
-  /// @param gasLimit The optional gas limit passed to L1 or L2.
-  /// @param message The calldata passed to the target contract.
-  event SentMessage(
-    address indexed sender,
-    address indexed target,
-    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);
-
-  /*************
-   * Variables *
-   *************/
-
-  /// @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,
-    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;
-  }
-
-  function relayMessage(
-    address _from,
-    address _to,
-    uint256 _value,
-    uint256 _nonce,
-    bytes calldata _message
-  ) external {
-    bytes memory _xDomainCalldata = _encodeXDomainCalldata(_from, _to, _value, _nonce, _message);
-    bytes32 _xDomainCalldataHash = keccak256(_xDomainCalldata);
-    emit RelayedMessage(_xDomainCalldataHash);
-  }
-
-  /**********************
-   * Internal Functions *
-   **********************/
-
-  /// @dev Internal function to generate the correct cross domain calldata for a message.
-  /// @param _sender Message sender address.
-  /// @param _target Target contract address.
-  /// @param _value The amount of ETH pass to the target.
-  /// @param _messageNonce Nonce for the provided message.
-  /// @param _message Message to send to the target.
-  /// @return ABI encoded cross domain calldata.
-  function _encodeXDomainCalldata(
-    address _sender,
-    address _target,
-    uint256 _value,
-    uint256 _messageNonce,
-    bytes memory _message
-  ) internal pure returns (bytes memory) {
-    return
-      abi.encodeWithSignature(
-        "relayMessage(address,address,uint256,uint256,bytes)",
-        _sender,
-        _target,
-        _value,
-        _messageNonce,
-        _message
-      );
-  }
-}

bridge/mock_bridge/Mock_Bridge.sol

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

bridge/relayer/l1_relayer.go

@@ -1,248 +0,0 @@
-package relayer
-
-import (
-	"context"
-	"errors"
-	"math/big"
-
-	// not sure if this will make problems when relay with l1geth
-
-	"github.com/scroll-tech/go-ethereum/accounts/abi"
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/crypto"
-	"github.com/scroll-tech/go-ethereum/log"
-	geth_metrics "github.com/scroll-tech/go-ethereum/metrics"
-
-	"scroll-tech/common/types"
-
-	"scroll-tech/database"
-
-	"scroll-tech/common/metrics"
-
-	bridge_abi "scroll-tech/bridge/abi"
-	"scroll-tech/bridge/config"
-	"scroll-tech/bridge/sender"
-)
-
-var (
-	bridgeL1MsgsRelayedTotalCounter          = geth_metrics.NewRegisteredCounter("bridge/l1/msgs/relayed/total", metrics.ScrollRegistry)
-	bridgeL1MsgsRelayedConfirmedTotalCounter = geth_metrics.NewRegisteredCounter("bridge/l1/msgs/relayed/confirmed/total", metrics.ScrollRegistry)
-)
-
-// Layer1Relayer is responsible for
-//  1. fetch pending L1Message from db
-//  2. relay pending message to layer 2 node
-//
-// Actions are triggered by new head from layer 1 geth node.
-// @todo It's better to be triggered by watcher.
-type Layer1Relayer struct {
-	ctx context.Context
-
-	db  database.OrmFactory
-	cfg *config.RelayerConfig
-
-	// channel used to communicate with transaction sender
-	messageSender  *sender.Sender
-	l2MessengerABI *abi.ABI
-
-	gasOracleSender *sender.Sender
-	l1GasOracleABI  *abi.ABI
-
-	minGasLimitForMessageRelay uint64
-
-	lastGasPrice uint64
-	minGasPrice  uint64
-	gasPriceDiff uint64
-}
-
-// 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)
-	if err != nil {
-		addr := crypto.PubkeyToAddress(cfg.MessageSenderPrivateKeys[0].PublicKey)
-		log.Error("new MessageSender 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
-	}
-
-	minGasLimitForMessageRelay := uint64(defaultL1MessageRelayMinGasLimit)
-	if cfg.MessageRelayMinGasLimit != 0 {
-		minGasLimitForMessageRelay = cfg.MessageRelayMinGasLimit
-	}
-
-	l1Relayer := &Layer1Relayer{
-		ctx: ctx,
-		db:  db,
-
-		messageSender:  messageSender,
-		l2MessengerABI: bridge_abi.L2ScrollMessengerABI,
-
-		gasOracleSender: gasOracleSender,
-		l1GasOracleABI:  bridge_abi.L1GasPriceOracleABI,
-
-		minGasLimitForMessageRelay: minGasLimitForMessageRelay,
-
-		minGasPrice:  minGasPrice,
-		gasPriceDiff: gasPriceDiff,
-
-		cfg: cfg,
-	}
-
-	go l1Relayer.handleConfirmLoop(ctx)
-	return l1Relayer, nil
-}
-
-// ProcessSavedEvents relays saved un-processed cross-domain transactions to desired blockchain
-func (r *Layer1Relayer) ProcessSavedEvents() {
-	// msgs are sorted by nonce in increasing order
-	msgs, err := r.db.GetL1MessagesByStatus(types.MsgPending, 100)
-	if err != nil {
-		log.Error("Failed to fetch unprocessed L1 messages", "err", err)
-		return
-	}
-
-	if len(msgs) > 0 {
-		log.Info("Processing L1 messages", "count", len(msgs))
-	}
-
-	for _, msg := range msgs {
-		if err = r.processSavedEvent(msg); err != nil {
-			if !errors.Is(err, sender.ErrNoAvailableAccount) && !errors.Is(err, sender.ErrFullPending) {
-				log.Error("failed to process event", "msg.msgHash", msg.MsgHash, "err", err)
-			}
-			return
-		}
-	}
-}
-
-func (r *Layer1Relayer) processSavedEvent(msg *types.L1Message) error {
-	calldata := common.Hex2Bytes(msg.Calldata)
-
-	hash, err := r.messageSender.SendTransaction(msg.MsgHash, &r.cfg.MessengerContractAddress, big.NewInt(0), calldata, r.minGasLimitForMessageRelay)
-	if err != nil && err.Error() == "execution reverted: Message expired" {
-		return r.db.UpdateLayer1Status(r.ctx, msg.MsgHash, types.MsgExpired)
-	}
-	if err != nil && err.Error() == "execution reverted: Message was already successfully executed" {
-		return r.db.UpdateLayer1Status(r.ctx, msg.MsgHash, types.MsgConfirmed)
-	}
-	if err != nil {
-		return err
-	}
-	bridgeL1MsgsRelayedTotalCounter.Inc(1)
-	log.Info("relayMessage to layer2", "msg hash", msg.MsgHash, "tx hash", hash)
-
-	err = r.db.UpdateLayer1StatusAndLayer2Hash(r.ctx, msg.MsgHash, types.MsgSubmitted, hash.String())
-	if err != nil {
-		log.Error("UpdateLayer1StatusAndLayer2Hash failed", "msg.msgHash", msg.MsgHash, "msg.height", msg.Height, "err", err)
-	}
-	return err
-}
-
-// ProcessGasPriceOracle imports gas price to layer2
-func (r *Layer1Relayer) ProcessGasPriceOracle() {
-	latestBlockHeight, err := r.db.GetLatestL1BlockHeight()
-	if err != nil {
-		log.Warn("Failed to fetch latest L1 block height from db", "err", err)
-		return
-	}
-
-	blocks, err := r.db.GetL1BlockInfos(map[string]interface{}{
-		"number": latestBlockHeight,
-	})
-	if err != nil {
-		log.Error("Failed to GetL1BlockInfos from db", "height", latestBlockHeight, "err", err)
-		return
-	}
-	if len(blocks) != 1 {
-		log.Error("Block not exist", "height", latestBlockHeight)
-		return
-	}
-	block := blocks[0]
-
-	if block.GasOracleStatus == types.GasOraclePending {
-		expectedDelta := r.lastGasPrice * r.gasPriceDiff / gasPriceDiffPrecision
-		// last is undefine or (block.BaseFee >= minGasPrice && exceed diff)
-		if r.lastGasPrice == 0 || (block.BaseFee >= r.minGasPrice && (block.BaseFee >= r.lastGasPrice+expectedDelta || block.BaseFee <= r.lastGasPrice-expectedDelta)) {
-			baseFee := big.NewInt(int64(block.BaseFee))
-			data, err := r.l1GasOracleABI.Pack("setL1BaseFee", baseFee)
-			if err != nil {
-				log.Error("Failed to pack setL1BaseFee", "block.Hash", block.Hash, "block.Height", block.Number, "block.BaseFee", block.BaseFee, "err", err)
-				return
-			}
-
-			hash, err := r.gasOracleSender.SendTransaction(block.Hash, &r.cfg.GasPriceOracleContractAddress, big.NewInt(0), data, 0)
-			if err != nil {
-				if !errors.Is(err, sender.ErrNoAvailableAccount) && !errors.Is(err, sender.ErrFullPending) {
-					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)
-		}
-	}
-}
-
-func (r *Layer1Relayer) handleConfirmLoop(ctx context.Context) {
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case cfm := <-r.messageSender.ConfirmChan():
-			bridgeL1MsgsRelayedConfirmedTotalCounter.Inc(1)
-			if !cfm.IsSuccessful {
-				err := r.db.UpdateLayer1StatusAndLayer2Hash(r.ctx, cfm.ID, types.MsgRelayFailed, cfm.TxHash.String())
-				if err != nil {
-					log.Warn("UpdateLayer1StatusAndLayer2Hash failed", "err", err)
-				}
-				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.gasOracleSender.ConfirmChan():
-			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)
-			}
-		}
-	}
-}

bridge/relayer/l1_relayer_test.go

@@ -1,155 +0,0 @@
-package relayer
-
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"scroll-tech/common/types"
-	"scroll-tech/common/utils"
-	"scroll-tech/database/migrate"
-
-	"scroll-tech/bridge/sender"
-
-	"scroll-tech/database"
-)
-
-var (
-	templateL1Message = []*types.L1Message{
-		{
-			QueueIndex: 1,
-			MsgHash:    "msg_hash1",
-			Height:     1,
-			Sender:     "0x596a746661dbed76a84556111c2872249b070e15",
-			Value:      "0x19ece",
-			GasLimit:   11529940,
-			Target:     "0x2c73620b223808297ea734d946813f0dd78eb8f7",
-			Calldata:   "testdata",
-			Layer1Hash: "hash0",
-		},
-		{
-			QueueIndex: 2,
-			MsgHash:    "msg_hash2",
-			Height:     2,
-			Sender:     "0x596a746661dbed76a84556111c2872249b070e15",
-			Value:      "0x19ece",
-			GasLimit:   11529940,
-			Target:     "0x2c73620b223808297ea734d946813f0dd78eb8f7",
-			Calldata:   "testdata",
-			Layer1Hash: "hash1",
-		},
-	}
-)
-
-// testCreateNewRelayer test create new relayer instance and stop
-func testCreateNewL1Relayer(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 := NewLayer1Relayer(context.Background(), db, cfg.L2Config.RelayerConfig)
-	assert.NoError(t, err)
-	assert.NotNil(t, relayer)
-}
-
-func testL1RelayerProcessSaveEvents(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()
-	l1Cfg := cfg.L1Config
-	relayer, err := NewLayer1Relayer(context.Background(), db, l1Cfg.RelayerConfig)
-	assert.NoError(t, err)
-	assert.NoError(t, db.SaveL1Messages(context.Background(), templateL1Message))
-	relayer.ProcessSavedEvents()
-	msg1, err := db.GetL1MessageByQueueIndex(1)
-	assert.NoError(t, err)
-	assert.Equal(t, msg1.Status, types.MsgSubmitted)
-	msg2, err := db.GetL1MessageByQueueIndex(2)
-	assert.NoError(t, err)
-	assert.Equal(t, msg2.Status, types.MsgSubmitted)
-}
-
-func testL1RelayerMsgConfirm(t *testing.T) {
-	// Set up the database and defer closing it.
-	db, err := database.NewOrmFactory(cfg.DBConfig)
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
-	defer db.Close()
-
-	// Insert test data.
-	assert.NoError(t, db.SaveL1Messages(context.Background(),
-		[]*types.L1Message{
-			{MsgHash: "msg-1", QueueIndex: 0},
-			{MsgHash: "msg-2", QueueIndex: 1},
-		}))
-
-	// Create and set up the Layer1 Relayer.
-	l1Cfg := cfg.L1Config
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	l1Relayer, err := NewLayer1Relayer(ctx, db, l1Cfg.RelayerConfig)
-	assert.NoError(t, err)
-
-	// Simulate message confirmations.
-	l1Relayer.messageSender.SendConfirmation(&sender.Confirmation{
-		ID:           "msg-1",
-		IsSuccessful: true,
-	})
-	l1Relayer.messageSender.SendConfirmation(&sender.Confirmation{
-		ID:           "msg-2",
-		IsSuccessful: false,
-	})
-
-	// Check the database for the updated status using TryTimes.
-	utils.TryTimes(5, func() bool {
-		msg1, err1 := db.GetL1MessageByMsgHash("msg-1")
-		msg2, err2 := db.GetL1MessageByMsgHash("msg-2")
-		return err1 == nil && msg1.Status == types.MsgConfirmed &&
-			err2 == nil && msg2.Status == types.MsgRelayFailed
-	})
-}
-
-func testL1RelayerGasOracleConfirm(t *testing.T) {
-	// Set up the database and defer closing it.
-	db, err := database.NewOrmFactory(cfg.DBConfig)
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
-	defer db.Close()
-
-	// Insert test data.
-	assert.NoError(t, db.InsertL1Blocks(context.Background(),
-		[]*types.L1BlockInfo{
-			{Hash: "gas-oracle-1", Number: 0},
-			{Hash: "gas-oracle-2", Number: 1},
-		}))
-
-	// Create and set up the Layer2 Relayer.
-	l1Cfg := cfg.L1Config
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	l1Relayer, err := NewLayer1Relayer(ctx, db, l1Cfg.RelayerConfig)
-	assert.NoError(t, err)
-
-	// Simulate message confirmations.
-	l1Relayer.gasOracleSender.SendConfirmation(&sender.Confirmation{
-		ID:           "gas-oracle-1",
-		IsSuccessful: true,
-	})
-	l1Relayer.gasOracleSender.SendConfirmation(&sender.Confirmation{
-		ID:           "gas-oracle-2",
-		IsSuccessful: false,
-	})
-
-	// Check the database for the updated status using TryTimes.
-	utils.TryTimes(5, func() bool {
-		msg1, err1 := db.GetL1BlockInfos(map[string]interface{}{"hash": "gas-oracle-1"})
-		msg2, err2 := db.GetL1BlockInfos(map[string]interface{}{"hash": "gas-oracle-2"})
-		return err1 == nil && len(msg1) == 1 && msg1[0].GasOracleStatus == types.GasOracleImported &&
-			err2 == nil && len(msg2) == 1 && msg2[0].GasOracleStatus == types.GasOracleFailed
-	})
-}

bridge/relayer/l2_relayer.go

@@ -1,593 +0,0 @@
-package relayer
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"math/big"
-	"runtime"
-	"sync"
-
-	"github.com/scroll-tech/go-ethereum/accounts/abi"
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/crypto"
-	"github.com/scroll-tech/go-ethereum/ethclient"
-	"github.com/scroll-tech/go-ethereum/log"
-	geth_metrics "github.com/scroll-tech/go-ethereum/metrics"
-	"golang.org/x/sync/errgroup"
-	"modernc.org/mathutil"
-
-	"scroll-tech/common/metrics"
-	"scroll-tech/common/types"
-
-	"scroll-tech/database"
-
-	bridge_abi "scroll-tech/bridge/abi"
-	"scroll-tech/bridge/config"
-	"scroll-tech/bridge/sender"
-	"scroll-tech/bridge/utils"
-)
-
-var (
-	bridgeL2MsgsRelayedTotalCounter               = geth_metrics.NewRegisteredCounter("bridge/l2/msgs/relayed/total", metrics.ScrollRegistry)
-	bridgeL2BatchesFinalizedTotalCounter          = geth_metrics.NewRegisteredCounter("bridge/l2/batches/finalized/total", metrics.ScrollRegistry)
-	bridgeL2BatchesCommittedTotalCounter          = geth_metrics.NewRegisteredCounter("bridge/l2/batches/committed/total", metrics.ScrollRegistry)
-	bridgeL2MsgsRelayedConfirmedTotalCounter      = geth_metrics.NewRegisteredCounter("bridge/l2/msgs/relayed/confirmed/total", metrics.ScrollRegistry)
-	bridgeL2BatchesFinalizedConfirmedTotalCounter = geth_metrics.NewRegisteredCounter("bridge/l2/batches/finalized/confirmed/total", metrics.ScrollRegistry)
-	bridgeL2BatchesCommittedConfirmedTotalCounter = geth_metrics.NewRegisteredCounter("bridge/l2/batches/committed/confirmed/total", metrics.ScrollRegistry)
-	bridgeL2BatchesSkippedTotalCounter            = geth_metrics.NewRegisteredCounter("bridge/l2/batches/skipped/total", metrics.ScrollRegistry)
-)
-
-// Layer2Relayer is responsible for
-//  1. Committing and finalizing L2 blocks on L1
-//  2. Relaying messages from L2 to L1
-//
-// Actions are triggered by new head from layer 1 geth node.
-// @todo It's better to be triggered by watcher.
-type Layer2Relayer struct {
-	ctx context.Context
-
-	l2Client *ethclient.Client
-
-	db  database.OrmFactory
-	cfg *config.RelayerConfig
-
-	messageSender  *sender.Sender
-	l1MessengerABI *abi.ABI
-
-	rollupSender *sender.Sender
-	l1RollupABI  *abi.ABI
-
-	gasOracleSender *sender.Sender
-	l2GasOracleABI  *abi.ABI
-
-	minGasLimitForMessageRelay uint64
-
-	lastGasPrice uint64
-	minGasPrice  uint64
-	gasPriceDiff uint64
-
-	// A list of processing message.
-	// key(string): confirmation ID, value(string): layer2 hash.
-	processingMessage sync.Map
-
-	// A list of processing batches commitment.
-	// key(string): confirmation ID, value([]string): batch hashes.
-	processingBatchesCommitment sync.Map
-
-	// A list of processing batch finalization.
-	// key(string): confirmation ID, value(string): batch hash.
-	processingFinalization sync.Map
-}
-
-// NewLayer2Relayer will return a new instance of Layer2RelayerClient
-func NewLayer2Relayer(ctx context.Context, l2Client *ethclient.Client, db database.OrmFactory, cfg *config.RelayerConfig) (*Layer2Relayer, error) {
-	// @todo use different sender for relayer, block commit and proof finalize
-	messageSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.MessageSenderPrivateKeys)
-	if err != nil {
-		log.Error("Failed to create messenger sender", "err", err)
-		return nil, err
-	}
-
-	rollupSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.RollupSenderPrivateKeys)
-	if err != nil {
-		log.Error("Failed to create rollup sender", "err", err)
-		return nil, err
-	}
-
-	gasOracleSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.GasOracleSenderPrivateKeys)
-	if err != nil {
-		log.Error("Failed to create gas oracle sender", "err", err)
-		return nil, err
-	}
-
-	var minGasPrice uint64
-	var gasPriceDiff uint64
-	if cfg.GasOracleConfig != nil {
-		minGasPrice = cfg.GasOracleConfig.MinGasPrice
-		gasPriceDiff = cfg.GasOracleConfig.GasPriceDiff
-	} else {
-		minGasPrice = 0
-		gasPriceDiff = defaultGasPriceDiff
-	}
-
-	minGasLimitForMessageRelay := uint64(defaultL2MessageRelayMinGasLimit)
-	if cfg.MessageRelayMinGasLimit != 0 {
-		minGasLimitForMessageRelay = cfg.MessageRelayMinGasLimit
-	}
-
-	layer2Relayer := &Layer2Relayer{
-		ctx: ctx,
-		db:  db,
-
-		l2Client: l2Client,
-
-		messageSender:  messageSender,
-		l1MessengerABI: bridge_abi.L1ScrollMessengerABI,
-
-		rollupSender: rollupSender,
-		l1RollupABI:  bridge_abi.ScrollChainABI,
-
-		gasOracleSender: gasOracleSender,
-		l2GasOracleABI:  bridge_abi.L2GasPriceOracleABI,
-
-		minGasLimitForMessageRelay: minGasLimitForMessageRelay,
-
-		minGasPrice:  minGasPrice,
-		gasPriceDiff: gasPriceDiff,
-
-		cfg:                         cfg,
-		processingMessage:           sync.Map{},
-		processingBatchesCommitment: sync.Map{},
-		processingFinalization:      sync.Map{},
-	}
-	go layer2Relayer.handleConfirmLoop(ctx)
-	return layer2Relayer, nil
-}
-
-const processMsgLimit = 100
-
-// ProcessSavedEvents relays saved un-processed cross-domain transactions to desired blockchain
-func (r *Layer2Relayer) ProcessSavedEvents() {
-	batch, err := r.db.GetLatestFinalizedBatch()
-	if err != nil {
-		log.Error("GetLatestFinalizedBatch failed", "err", err)
-		return
-	}
-
-	// msgs are sorted by nonce in increasing order
-	msgs, err := r.db.GetL2Messages(
-		map[string]interface{}{"status": types.MsgPending},
-		fmt.Sprintf("AND height<=%d", batch.EndBlockNumber),
-		fmt.Sprintf("ORDER BY nonce ASC LIMIT %d", processMsgLimit),
-	)
-
-	if err != nil {
-		log.Error("Failed to fetch unprocessed L2 messages", "err", err)
-		return
-	}
-
-	// process messages in batches
-	batchSize := mathutil.Min((runtime.GOMAXPROCS(0)+1)/2, r.messageSender.NumberOfAccounts())
-	for size := 0; len(msgs) > 0; msgs = msgs[size:] {
-		if size = len(msgs); size > batchSize {
-			size = batchSize
-		}
-		var g errgroup.Group
-		for _, msg := range msgs[:size] {
-			msg := msg
-			g.Go(func() error {
-				return r.processSavedEvent(msg)
-			})
-		}
-		if err := g.Wait(); err != nil {
-			if !errors.Is(err, sender.ErrNoAvailableAccount) && !errors.Is(err, sender.ErrFullPending) {
-				log.Error("failed to process l2 saved event", "err", err)
-			}
-			return
-		}
-	}
-}
-
-func (r *Layer2Relayer) processSavedEvent(msg *types.L2Message) error {
-	// @todo fetch merkle proof from l2geth
-	log.Info("Processing L2 Message", "msg.nonce", msg.Nonce, "msg.height", msg.Height)
-
-	// Get the block info that contains the message
-	blockInfos, err := r.db.GetL2BlockInfos(map[string]interface{}{"number": msg.Height})
-	if err != nil {
-		log.Error("Failed to GetL2BlockInfos from DB", "number", msg.Height)
-	}
-	blockInfo := blockInfos[0]
-	if !blockInfo.BatchHash.Valid {
-		log.Error("Block has not been batched yet", "number", blockInfo.Number, "msg.nonce", msg.Nonce)
-		return nil
-	}
-
-	// TODO: rebuild the withdraw trie to generate the merkle proof
-	proof := bridge_abi.IL1ScrollMessengerL2MessageProof{
-		BatchHash:   common.HexToHash(blockInfo.BatchHash.String),
-		MerkleProof: make([]byte, 0),
-	}
-	from := common.HexToAddress(msg.Sender)
-	target := common.HexToAddress(msg.Target)
-	value, ok := big.NewInt(0).SetString(msg.Value, 10)
-	if !ok {
-		// @todo maybe panic?
-		log.Error("Failed to parse message value", "msg.nonce", msg.Nonce, "msg.height", msg.Height)
-		// TODO: need to skip this message by changing its status to MsgError
-	}
-	msgNonce := big.NewInt(int64(msg.Nonce))
-	calldata := common.Hex2Bytes(msg.Calldata)
-	data, err := r.l1MessengerABI.Pack("relayMessageWithProof", from, target, value, msgNonce, calldata, proof)
-	if err != nil {
-		log.Error("Failed to pack relayMessageWithProof", "msg.nonce", msg.Nonce, "err", err)
-		// TODO: need to skip this message by changing its status to MsgError
-		return err
-	}
-
-	hash, err := r.messageSender.SendTransaction(msg.MsgHash, &r.cfg.MessengerContractAddress, big.NewInt(0), data, r.minGasLimitForMessageRelay)
-	if err != nil && err.Error() == "execution reverted: Message expired" {
-		return r.db.UpdateLayer2Status(r.ctx, msg.MsgHash, types.MsgExpired)
-	}
-	if err != nil && err.Error() == "execution reverted: Message was already successfully executed" {
-		return r.db.UpdateLayer2Status(r.ctx, msg.MsgHash, types.MsgConfirmed)
-	}
-	if err != nil {
-		if !errors.Is(err, sender.ErrNoAvailableAccount) && !errors.Is(err, sender.ErrFullPending) {
-			log.Error("Failed to send relayMessageWithProof tx to layer1 ", "msg.height", msg.Height, "msg.MsgHash", msg.MsgHash, "err", err)
-		}
-		return err
-	}
-	bridgeL2MsgsRelayedTotalCounter.Inc(1)
-	log.Info("relayMessageWithProof to layer1", "msgHash", msg.MsgHash, "txhash", hash.String())
-
-	// save status in db
-	// @todo handle db error
-	err = r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, msg.MsgHash, types.MsgSubmitted, hash.String())
-	if err != nil {
-		log.Error("UpdateLayer2StatusAndLayer1Hash failed", "msgHash", msg.MsgHash, "err", err)
-		return err
-	}
-	r.processingMessage.Store(msg.MsgHash, msg.MsgHash)
-	return nil
-}
-
-// ProcessGasPriceOracle imports gas price to layer1
-func (r *Layer2Relayer) ProcessGasPriceOracle() {
-	batch, err := r.db.GetLatestBatch()
-	if err != nil {
-		log.Error("Failed to GetLatestBatch", "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
-		}
-		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
-			}
-
-			hash, err := r.gasOracleSender.SendTransaction(batch.Hash, &r.cfg.GasPriceOracleContractAddress, big.NewInt(0), data, 0)
-			if err != nil {
-				if !errors.Is(err, sender.ErrNoAvailableAccount) && !errors.Is(err, sender.ErrFullPending) {
-					log.Error("Failed to send setL2BaseFee tx to layer2 ", "batch.Hash", batch.Hash, "err", err)
-				}
-				return
-			}
-
-			err = r.db.UpdateL2GasOracleStatusAndOracleTxHash(r.ctx, batch.Hash, types.GasOracleImporting, hash.String())
-			if err != nil {
-				log.Error("UpdateGasOracleStatusAndOracleTxHash failed", "batch.Hash", batch.Hash, "err", err)
-				return
-			}
-			r.lastGasPrice = suggestGasPriceUint64
-			log.Info("Update l2 gas price", "txHash", hash.String(), "GasPrice", suggestGasPrice)
-		}
-	}
-}
-
-// SendCommitTx sends commitBatches tx to L1.
-func (r *Layer2Relayer) SendCommitTx(batchData []*types.BatchData) error {
-	if len(batchData) == 0 {
-		log.Error("SendCommitTx receives empty batch")
-		return nil
-	}
-
-	// pack calldata
-	commitBatches := make([]bridge_abi.IScrollChainBatch, len(batchData))
-	for i, batch := range batchData {
-		commitBatches[i] = batch.Batch
-	}
-	calldata, err := r.l1RollupABI.Pack("commitBatches", commitBatches)
-	if err != nil {
-		log.Error("Failed to pack commitBatches",
-			"error", err,
-			"start_batch_index", commitBatches[0].BatchIndex,
-			"end_batch_index", commitBatches[len(commitBatches)-1].BatchIndex)
-		return err
-	}
-
-	// generate a unique txID and send transaction
-	var bytes []byte
-	for _, batch := range batchData {
-		bytes = append(bytes, batch.Hash().Bytes()...)
-	}
-	txID := crypto.Keccak256Hash(bytes).String()
-	txHash, err := r.rollupSender.SendTransaction(txID, &r.cfg.RollupContractAddress, big.NewInt(0), calldata, 0)
-	if err != nil {
-		if !errors.Is(err, sender.ErrNoAvailableAccount) && !errors.Is(err, sender.ErrFullPending) {
-			log.Error("Failed to send commitBatches tx to layer1 ", "err", err)
-		}
-		return err
-	}
-	bridgeL2BatchesCommittedTotalCounter.Inc(int64(len(commitBatches)))
-	log.Info("Sent the commitBatches tx to layer1",
-		"tx_hash", txHash.Hex(),
-		"start_batch_index", commitBatches[0].BatchIndex,
-		"end_batch_index", commitBatches[len(commitBatches)-1].BatchIndex)
-
-	// record and sync with db, @todo handle db error
-	batchHashes := make([]string, len(batchData))
-	for i, batch := range batchData {
-		batchHashes[i] = batch.Hash().Hex()
-		err = r.db.UpdateCommitTxHashAndRollupStatus(r.ctx, batchHashes[i], txHash.String(), types.RollupCommitting)
-		if err != nil {
-			log.Error("UpdateCommitTxHashAndRollupStatus failed", "hash", batchHashes[i], "index", batch.Batch.BatchIndex, "err", err)
-		}
-	}
-	r.processingBatchesCommitment.Store(txID, batchHashes)
-	return nil
-}
-
-// ProcessCommittedBatches submit proof to layer 1 rollup contract
-func (r *Layer2Relayer) ProcessCommittedBatches() {
-	// set skipped batches in a single db operation
-	if count, err := r.db.UpdateSkippedBatches(); err != nil {
-		log.Error("UpdateSkippedBatches failed", "err", err)
-		// continue anyway
-	} else if count > 0 {
-		bridgeL2BatchesSkippedTotalCounter.Inc(count)
-		log.Info("Skipping batches", "count", count)
-	}
-
-	// batches are sorted by batch index in increasing order
-	batchHashes, err := r.db.GetCommittedBatches(1)
-	if err != nil {
-		log.Error("Failed to fetch committed L2 batches", "err", err)
-		return
-	}
-	if len(batchHashes) == 0 {
-		return
-	}
-	hash := batchHashes[0]
-	// @todo add support to relay multiple batches
-
-	batches, err := r.db.GetBlockBatches(map[string]interface{}{"hash": hash}, "LIMIT 1")
-	if err != nil {
-		log.Error("Failed to fetch committed L2 batch", "hash", hash, "err", err)
-		return
-	}
-	if len(batches) == 0 {
-		log.Error("Unexpected result for GetBlockBatches", "hash", hash, "len", 0)
-		return
-	}
-
-	batch := batches[0]
-	status := batch.ProvingStatus
-
-	switch status {
-	case types.ProvingTaskUnassigned, types.ProvingTaskAssigned:
-		// The proof for this block is not ready yet.
-		return
-
-	case types.ProvingTaskProved:
-		// It's an intermediate state. The roller manager received the proof but has not verified
-		// the proof yet. We don't roll up the proof until it's verified.
-		return
-
-	case types.ProvingTaskFailed, types.ProvingTaskSkipped:
-		// note: this is covered by UpdateSkippedBatches, but we keep it for completeness's sake
-
-		if err = r.db.UpdateRollupStatus(r.ctx, hash, types.RollupFinalizationSkipped); err != nil {
-			log.Warn("UpdateRollupStatus failed", "hash", hash, "err", err)
-		}
-
-	case types.ProvingTaskVerified:
-		log.Info("Start to roll up zk proof", "hash", hash)
-		success := false
-
-		previousBatch, err := r.db.GetLatestFinalizingOrFinalizedBatch()
-
-		// skip submitting proof
-		if err == nil && uint64(batch.CreatedAt.Sub(*previousBatch.CreatedAt).Seconds()) < r.cfg.FinalizeBatchIntervalSec {
-			log.Info(
-				"Not enough time passed, skipping",
-				"hash", hash,
-				"createdAt", batch.CreatedAt,
-				"lastFinalizingHash", previousBatch.Hash,
-				"lastFinalizingStatus", previousBatch.RollupStatus,
-				"lastFinalizingCreatedAt", previousBatch.CreatedAt,
-			)
-
-			if err = r.db.UpdateRollupStatus(r.ctx, hash, types.RollupFinalizationSkipped); err != nil {
-				log.Warn("UpdateRollupStatus failed", "hash", hash, "err", err)
-			} else {
-				success = true
-			}
-
-			return
-		}
-
-		// handle unexpected db error
-		if err != nil && err.Error() != "sql: no rows in result set" {
-			log.Error("Failed to get latest finalized batch", "err", err)
-			return
-		}
-
-		defer func() {
-			// TODO: need to revisit this and have a more fine-grained error handling
-			if !success {
-				log.Info("Failed to upload the proof, change rollup status to FinalizationSkipped", "hash", hash)
-				if err = r.db.UpdateRollupStatus(r.ctx, hash, types.RollupFinalizationSkipped); err != nil {
-					log.Warn("UpdateRollupStatus failed", "hash", hash, "err", err)
-				}
-			}
-		}()
-
-		proofBuffer, icBuffer, err := r.db.GetVerifiedProofAndInstanceCommitmentsByHash(hash)
-		if err != nil {
-			log.Warn("fetch get proof by hash failed", "hash", hash, "err", err)
-			return
-		}
-		if proofBuffer == nil || icBuffer == nil {
-			log.Warn("proof or instance not ready", "hash", hash)
-			return
-		}
-		if len(proofBuffer)%32 != 0 {
-			log.Error("proof buffer has wrong length", "hash", hash, "length", len(proofBuffer))
-			return
-		}
-		if len(icBuffer)%32 != 0 {
-			log.Warn("instance buffer has wrong length", "hash", hash, "length", len(icBuffer))
-			return
-		}
-
-		proof := utils.BufferToUint256Le(proofBuffer)
-		instance := utils.BufferToUint256Le(icBuffer)
-		data, err := r.l1RollupABI.Pack("finalizeBatchWithProof", common.HexToHash(hash), proof, instance)
-		if err != nil {
-			log.Error("Pack finalizeBatchWithProof failed", "err", err)
-			return
-		}
-
-		txID := hash + "-finalize"
-		// add suffix `-finalize` to avoid duplication with commit tx in unit tests
-		txHash, err := r.rollupSender.SendTransaction(txID, &r.cfg.RollupContractAddress, big.NewInt(0), data, 0)
-		finalizeTxHash := &txHash
-		if err != nil {
-			if !errors.Is(err, sender.ErrNoAvailableAccount) && !errors.Is(err, sender.ErrFullPending) {
-				log.Error("finalizeBatchWithProof in layer1 failed", "hash", hash, "err", err)
-			}
-			return
-		}
-		bridgeL2BatchesFinalizedTotalCounter.Inc(1)
-		log.Info("finalizeBatchWithProof in layer1", "batch_hash", hash, "tx_hash", hash)
-
-		// record and sync with db, @todo handle db error
-		err = r.db.UpdateFinalizeTxHashAndRollupStatus(r.ctx, hash, finalizeTxHash.String(), types.RollupFinalizing)
-		if err != nil {
-			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "batch_hash", hash, "err", err)
-		}
-		success = true
-		r.processingFinalization.Store(txID, hash)
-
-	default:
-		log.Error("encounter unreachable case in ProcessCommittedBatches",
-			"block_status", status,
-		)
-	}
-}
-
-func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) {
-	transactionType := "Unknown"
-	// check whether it is message relay transaction
-	if msgHash, ok := r.processingMessage.Load(confirmation.ID); ok {
-		transactionType = "MessageRelay"
-		var status types.MsgStatus
-		if confirmation.IsSuccessful {
-			status = types.MsgConfirmed
-		} else {
-			status = types.MsgRelayFailed
-			log.Warn("transaction confirmed but failed in layer1", "confirmation", confirmation)
-		}
-		// @todo handle db error
-		err := r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, msgHash.(string), status, confirmation.TxHash.String())
-		if err != nil {
-			log.Warn("UpdateLayer2StatusAndLayer1Hash failed", "msgHash", msgHash.(string), "err", err)
-		}
-		bridgeL2MsgsRelayedConfirmedTotalCounter.Inc(1)
-		r.processingMessage.Delete(confirmation.ID)
-	}
-
-	// check whether it is CommitBatches transaction
-	if batchBatches, ok := r.processingBatchesCommitment.Load(confirmation.ID); ok {
-		transactionType = "BatchesCommitment"
-		batchHashes := batchBatches.([]string)
-		var status types.RollupStatus
-		if confirmation.IsSuccessful {
-			status = types.RollupCommitted
-		} else {
-			status = types.RollupCommitFailed
-			log.Warn("transaction confirmed but failed in layer1", "confirmation", confirmation)
-		}
-		for _, batchHash := range batchHashes {
-			// @todo handle db error
-			err := r.db.UpdateCommitTxHashAndRollupStatus(r.ctx, batchHash, confirmation.TxHash.String(), status)
-			if err != nil {
-				log.Warn("UpdateCommitTxHashAndRollupStatus failed", "batch_hash", batchHash, "err", err)
-			}
-		}
-		bridgeL2BatchesCommittedConfirmedTotalCounter.Inc(int64(len(batchHashes)))
-		r.processingBatchesCommitment.Delete(confirmation.ID)
-	}
-
-	// check whether it is proof finalization transaction
-	if batchHash, ok := r.processingFinalization.Load(confirmation.ID); ok {
-		transactionType = "ProofFinalization"
-		var status types.RollupStatus
-		if confirmation.IsSuccessful {
-			status = types.RollupFinalized
-		} else {
-			status = types.RollupFinalizeFailed
-			log.Warn("transaction confirmed but failed in layer1", "confirmation", confirmation)
-		}
-		// @todo handle db error
-		err := r.db.UpdateFinalizeTxHashAndRollupStatus(r.ctx, batchHash.(string), confirmation.TxHash.String(), status)
-		if err != nil {
-			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "batch_hash", batchHash.(string), "err", err)
-		}
-		bridgeL2BatchesFinalizedConfirmedTotalCounter.Inc(1)
-		r.processingFinalization.Delete(confirmation.ID)
-	}
-	log.Info("transaction confirmed in layer1", "type", transactionType, "confirmation", confirmation)
-}
-
-func (r *Layer2Relayer) handleConfirmLoop(ctx context.Context) {
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		case confirmation := <-r.messageSender.ConfirmChan():
-			r.handleConfirmation(confirmation)
-		case confirmation := <-r.rollupSender.ConfirmChan():
-			r.handleConfirmation(confirmation)
-		case cfm := <-r.gasOracleSender.ConfirmChan():
-			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)
-			}
-		}
-	}
-}

bridge/relayer/l2_relayer_test.go

@@ -1,384 +0,0 @@
-package relayer
-
-import (
-	"context"
-	"encoding/json"
-	"math/big"
-	"os"
-	"strconv"
-	"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/common/utils"
-
-	"scroll-tech/bridge/sender"
-
-	"scroll-tech/database"
-	"scroll-tech/database/migrate"
-)
-
-var (
-	templateL2Message = []*types.L2Message{
-		{
-			Nonce:      1,
-			Height:     1,
-			Sender:     "0x596a746661dbed76a84556111c2872249b070e15",
-			Value:      "100",
-			Target:     "0x2c73620b223808297ea734d946813f0dd78eb8f7",
-			Calldata:   "testdata",
-			Layer2Hash: "hash0",
-		},
-	}
-)
-
-func testCreateNewRelayer(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)
-	assert.NotNil(t, relayer)
-}
-
-func testL2RelayerProcessSaveEvents(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(), l2Cli, db, l2Cfg.RelayerConfig)
-	assert.NoError(t, err)
-
-	err = db.SaveL2Messages(context.Background(), templateL2Message)
-	assert.NoError(t, err)
-
-	traces := []*types.WrappedBlock{
-		{
-			Header: &geth_types.Header{
-				Number: big.NewInt(int64(templateL2Message[0].Height)),
-			},
-			Transactions:     nil,
-			WithdrawTrieRoot: common.Hash{},
-		},
-		{
-			Header: &geth_types.Header{
-				Number: big.NewInt(int64(templateL2Message[0].Height + 1)),
-			},
-			Transactions:     nil,
-			WithdrawTrieRoot: common.Hash{},
-		},
-	}
-	assert.NoError(t, db.InsertWrappedBlocks(traces))
-
-	parentBatch1 := &types.BlockBatch{
-		Index:     0,
-		Hash:      common.Hash{}.Hex(),
-		StateRoot: common.Hash{}.Hex(),
-	}
-	batchData1 := types.NewBatchData(parentBatch1, []*types.WrappedBlock{wrappedBlock1}, nil)
-	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)
-	assert.NoError(t, err)
-
-	relayer.ProcessSavedEvents()
-
-	msg, err := db.GetL2MessageByNonce(templateL2Message[0].Nonce)
-	assert.NoError(t, err)
-	assert.Equal(t, types.MsgSubmitted, msg.Status)
-}
-
-func testL2RelayerProcessCommittedBatches(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(), l2Cli, db, l2Cfg.RelayerConfig)
-	assert.NoError(t, err)
-
-	parentBatch1 := &types.BlockBatch{
-		Index:     0,
-		Hash:      common.Hash{}.Hex(),
-		StateRoot: common.Hash{}.Hex(),
-	}
-	batchData1 := types.NewBatchData(parentBatch1, []*types.WrappedBlock{wrappedBlock1}, nil)
-	dbTx, err := db.Beginx()
-	assert.NoError(t, err)
-	assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData1))
-	batchHash := batchData1.Hash().Hex()
-	err = dbTx.Commit()
-	assert.NoError(t, err)
-
-	err = db.UpdateRollupStatus(context.Background(), batchHash, types.RollupCommitted)
-	assert.NoError(t, err)
-
-	tProof := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-	tInstanceCommitments := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-	err = db.UpdateProofByHash(context.Background(), batchHash, tProof, tInstanceCommitments, 100)
-	assert.NoError(t, err)
-	err = db.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
-	assert.NoError(t, err)
-
-	relayer.ProcessCommittedBatches()
-
-	status, err := db.GetRollupStatus(batchHash)
-	assert.NoError(t, err)
-	assert.Equal(t, types.RollupFinalizing, status)
-}
-
-func testL2RelayerSkipBatches(t *testing.T) {
-	// Create db handler and reset db.
-	db, err := database.NewOrmFactory(cfg.DBConfig)
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
-	defer db.Close()
-
-	l2Cfg := cfg.L2Config
-	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig)
-	assert.NoError(t, err)
-
-	createBatch := func(rollupStatus types.RollupStatus, provingStatus types.ProvingStatus, index uint64) string {
-		dbTx, err := db.Beginx()
-		assert.NoError(t, err)
-		batchData := genBatchData(t, index)
-		assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData))
-		batchHash := batchData.Hash().Hex()
-		err = dbTx.Commit()
-		assert.NoError(t, err)
-
-		err = db.UpdateRollupStatus(context.Background(), batchHash, rollupStatus)
-		assert.NoError(t, err)
-
-		tProof := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-		tInstanceCommitments := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-		err = db.UpdateProofByHash(context.Background(), batchHash, tProof, tInstanceCommitments, 100)
-		assert.NoError(t, err)
-		err = db.UpdateProvingStatus(batchHash, provingStatus)
-		assert.NoError(t, err)
-
-		return batchHash
-	}
-
-	skipped := []string{
-		createBatch(types.RollupCommitted, types.ProvingTaskSkipped, 1),
-		createBatch(types.RollupCommitted, types.ProvingTaskFailed, 2),
-	}
-
-	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),
-	}
-
-	relayer.ProcessCommittedBatches()
-
-	for _, id := range skipped {
-		status, err := db.GetRollupStatus(id)
-		assert.NoError(t, err)
-		assert.Equal(t, types.RollupFinalizationSkipped, status)
-	}
-
-	for _, id := range notSkipped {
-		status, err := db.GetRollupStatus(id)
-		assert.NoError(t, err)
-		assert.NotEqual(t, types.RollupFinalizationSkipped, status)
-	}
-}
-
-func testL2RelayerMsgConfirm(t *testing.T) {
-	// Set up the database and defer closing it.
-	db, err := database.NewOrmFactory(cfg.DBConfig)
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
-	defer db.Close()
-
-	// Insert test data.
-	assert.NoError(t, db.SaveL2Messages(context.Background(), []*types.L2Message{
-		{MsgHash: "msg-1", Nonce: 0}, {MsgHash: "msg-2", Nonce: 1},
-	}))
-
-	// Create and set up the Layer2 Relayer.
-	l2Cfg := cfg.L2Config
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	l2Relayer, err := NewLayer2Relayer(ctx, l2Cli, db, l2Cfg.RelayerConfig)
-	assert.NoError(t, err)
-
-	// Simulate message confirmations.
-	l2Relayer.processingMessage.Store("msg-1", "msg-1")
-	l2Relayer.messageSender.SendConfirmation(&sender.Confirmation{
-		ID:           "msg-1",
-		IsSuccessful: true,
-	})
-	l2Relayer.processingMessage.Store("msg-2", "msg-2")
-	l2Relayer.messageSender.SendConfirmation(&sender.Confirmation{
-		ID:           "msg-2",
-		IsSuccessful: false,
-	})
-
-	// Check the database for the updated status using TryTimes.
-	utils.TryTimes(5, func() bool {
-		msg1, err1 := db.GetL2MessageByMsgHash("msg-1")
-		msg2, err2 := db.GetL2MessageByMsgHash("msg-2")
-		return err1 == nil && msg1.Status == types.MsgConfirmed &&
-			err2 == nil && msg2.Status == types.MsgRelayFailed
-	})
-}
-
-func testL2RelayerRollupConfirm(t *testing.T) {
-	// Set up the database and defer closing it.
-	db, err := database.NewOrmFactory(cfg.DBConfig)
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
-	defer db.Close()
-
-	// Insert test data.
-	batches := make([]*types.BatchData, 6)
-	for i := 0; i < 6; i++ {
-		batches[i] = genBatchData(t, uint64(i))
-	}
-
-	dbTx, err := db.Beginx()
-	assert.NoError(t, err)
-	for _, batch := range batches {
-		assert.NoError(t, db.NewBatchInDBTx(dbTx, batch))
-	}
-	assert.NoError(t, dbTx.Commit())
-
-	// Create and set up the Layer2 Relayer.
-	l2Cfg := cfg.L2Config
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	l2Relayer, err := NewLayer2Relayer(ctx, l2Cli, db, l2Cfg.RelayerConfig)
-	assert.NoError(t, err)
-
-	// Simulate message confirmations.
-	processingKeys := []string{"committed-1", "committed-2", "finalized-1", "finalized-2"}
-	isSuccessful := []bool{true, false, true, false}
-
-	for i, key := range processingKeys[:2] {
-		batchHashes := []string{batches[i*2].Hash().Hex(), batches[i*2+1].Hash().Hex()}
-		l2Relayer.processingBatchesCommitment.Store(key, batchHashes)
-		l2Relayer.messageSender.SendConfirmation(&sender.Confirmation{
-			ID:           key,
-			IsSuccessful: isSuccessful[i],
-		})
-	}
-
-	for i, key := range processingKeys[2:] {
-		batchHash := batches[i+4].Hash().Hex()
-		l2Relayer.processingFinalization.Store(key, batchHash)
-		l2Relayer.rollupSender.SendConfirmation(&sender.Confirmation{
-			ID:           key,
-			IsSuccessful: isSuccessful[i+2],
-			TxHash:       common.HexToHash("0x56789abcdef1234"),
-		})
-	}
-
-	// Check the database for the updated status using TryTimes.
-	utils.TryTimes(5, func() bool {
-		expectedStatuses := []types.RollupStatus{
-			types.RollupCommitted,
-			types.RollupCommitted,
-			types.RollupCommitFailed,
-			types.RollupCommitFailed,
-			types.RollupFinalized,
-			types.RollupFinalizeFailed,
-		}
-
-		for i, batch := range batches[:6] {
-			batchInDB, err := db.GetBlockBatches(map[string]interface{}{"hash": batch.Hash().Hex()})
-			if err != nil || len(batchInDB) != 1 || batchInDB[0].RollupStatus != expectedStatuses[i] {
-				return false
-			}
-		}
-		return true
-	})
-}
-
-func testL2RelayerGasOracleConfirm(t *testing.T) {
-	// Set up the database and defer closing it.
-	db, err := database.NewOrmFactory(cfg.DBConfig)
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
-	defer db.Close()
-
-	// Insert test data.
-	batches := make([]*types.BatchData, 2)
-	for i := 0; i < 2; i++ {
-		batches[i] = genBatchData(t, uint64(i))
-	}
-
-	dbTx, err := db.Beginx()
-	assert.NoError(t, err)
-	for _, batch := range batches {
-		assert.NoError(t, db.NewBatchInDBTx(dbTx, batch))
-	}
-	assert.NoError(t, dbTx.Commit())
-
-	// Create and set up the Layer2 Relayer.
-	l2Cfg := cfg.L2Config
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	l2Relayer, err := NewLayer2Relayer(ctx, l2Cli, db, l2Cfg.RelayerConfig)
-	assert.NoError(t, err)
-
-	// Simulate message confirmations.
-	isSuccessful := []bool{true, false}
-	for i, batch := range batches {
-		l2Relayer.gasOracleSender.SendConfirmation(&sender.Confirmation{
-			ID:           batch.Hash().Hex(),
-			IsSuccessful: isSuccessful[i],
-		})
-	}
-
-	// Check the database for the updated status using TryTimes.
-	utils.TryTimes(5, func() bool {
-		expectedStatuses := []types.GasOracleStatus{types.GasOracleImported, types.GasOracleFailed}
-		for i, batch := range batches {
-			gasOracle, err := db.GetBlockBatches(map[string]interface{}{"hash": batch.Hash().Hex()})
-			if err != nil || len(gasOracle) != 1 || gasOracle[0].OracleStatus != expectedStatuses[i] {
-				return false
-			}
-		}
-		return true
-	})
-}
-
-func genBatchData(t *testing.T, index uint64) *types.BatchData {
-	templateBlockTrace, err := os.ReadFile("../../common/testdata/blockTrace_02.json")
-	assert.NoError(t, err)
-	// unmarshal blockTrace
-	wrappedBlock := &types.WrappedBlock{}
-	err = json.Unmarshal(templateBlockTrace, wrappedBlock)
-	assert.NoError(t, err)
-	wrappedBlock.Header.ParentHash = common.HexToHash("0x" + strconv.FormatUint(index+1, 16))
-	parentBatch := &types.BlockBatch{
-		Index: index,
-		Hash:  "0x0000000000000000000000000000000000000000",
-	}
-	return types.NewBatchData(parentBatch, []*types.WrappedBlock{wrappedBlock}, nil)
-}

bridge/relayer/params.go

@@ -1,11 +0,0 @@
-package relayer
-
-const (
-	gasPriceDiffPrecision = 1000000
-
-	defaultGasPriceDiff = 50000 // 5%
-
-	defaultL1MessageRelayMinGasLimit = 130000 // should be enough for both ERC20 and ETH relay
-
-	defaultL2MessageRelayMinGasLimit = 200000
-)

bridge/relayer/relayer_test.go

@@ -1,113 +0,0 @@
-package relayer
-
-import (
-	"encoding/json"
-	"os"
-	"testing"
-
-	"github.com/scroll-tech/go-ethereum/ethclient"
-	"github.com/scroll-tech/go-ethereum/log"
-	"github.com/stretchr/testify/assert"
-
-	"scroll-tech/common/docker"
-	"scroll-tech/common/types"
-
-	"scroll-tech/bridge/config"
-)
-
-var (
-	// config
-	cfg *config.Config
-
-	base *docker.App
-
-	// l2geth client
-	l2Cli *ethclient.Client
-
-	// block trace
-	wrappedBlock1 *types.WrappedBlock
-	wrappedBlock2 *types.WrappedBlock
-
-	// batch data
-	batchData1 *types.BatchData
-	batchData2 *types.BatchData
-)
-
-func setupEnv(t *testing.T) (err error) {
-	// Load config.
-	cfg, err = config.NewConfig("../config.json")
-	assert.NoError(t, err)
-
-	base.RunImages(t)
-
-	cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = base.L1gethImg.Endpoint()
-	cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = base.L2gethImg.Endpoint()
-	cfg.DBConfig = base.DBConfig
-
-	// Create l2geth client.
-	l2Cli, err = base.L2Client()
-	assert.NoError(t, err)
-
-	templateBlockTrace1, err := os.ReadFile("../../common/testdata/blockTrace_02.json")
-	if err != nil {
-		return err
-	}
-	// unmarshal blockTrace
-	wrappedBlock1 = &types.WrappedBlock{}
-	if err = json.Unmarshal(templateBlockTrace1, wrappedBlock1); err != nil {
-		return err
-	}
-	parentBatch1 := &types.BlockBatch{
-		Index:     0,
-		Hash:      "0x0cc6b102c2924402c14b2e3a19baccc316252bfdc44d9ec62e942d34e39ec729",
-		StateRoot: "0x2579122e8f9ec1e862e7d415cef2fb495d7698a8e5f0dddc5651ba4236336e7d",
-	}
-	batchData1 = types.NewBatchData(parentBatch1, []*types.WrappedBlock{wrappedBlock1}, nil)
-
-	templateBlockTrace2, err := os.ReadFile("../../common/testdata/blockTrace_03.json")
-	if err != nil {
-		return err
-	}
-	// unmarshal blockTrace
-	wrappedBlock2 = &types.WrappedBlock{}
-	if err = json.Unmarshal(templateBlockTrace2, wrappedBlock2); err != nil {
-		return err
-	}
-	parentBatch2 := &types.BlockBatch{
-		Index:     batchData1.Batch.BatchIndex,
-		Hash:      batchData1.Hash().Hex(),
-		StateRoot: batchData1.Batch.NewStateRoot.String(),
-	}
-	batchData2 = types.NewBatchData(parentBatch2, []*types.WrappedBlock{wrappedBlock2}, nil)
-
-	log.Info("batchHash", "batchhash1", batchData1.Hash().Hex(), "batchhash2", batchData2.Hash().Hex())
-
-	return err
-}
-
-func TestMain(m *testing.M) {
-	base = docker.NewDockerApp()
-
-	m.Run()
-
-	base.Free()
-}
-
-func TestFunctions(t *testing.T) {
-	if err := setupEnv(t); err != nil {
-		t.Fatal(err)
-	}
-	// Run l1 relayer test cases.
-	t.Run("TestCreateNewL1Relayer", testCreateNewL1Relayer)
-	t.Run("TestL1RelayerProcessSaveEvents", testL1RelayerProcessSaveEvents)
-	t.Run("TestL1RelayerMsgConfirm", testL1RelayerMsgConfirm)
-	t.Run("TestL1RelayerGasOracleConfirm", testL1RelayerGasOracleConfirm)
-	// Run l2 relayer test cases.
-	t.Run("TestCreateNewRelayer", testCreateNewRelayer)
-	t.Run("TestL2RelayerProcessSaveEvents", testL2RelayerProcessSaveEvents)
-	t.Run("TestL2RelayerProcessCommittedBatches", testL2RelayerProcessCommittedBatches)
-	t.Run("TestL2RelayerSkipBatches", testL2RelayerSkipBatches)
-	t.Run("TestL2RelayerMsgConfirm", testL2RelayerMsgConfirm)
-	t.Run("TestL2RelayerRollupConfirm", testL2RelayerRollupConfirm)
-	t.Run("TestL2RelayerGasOracleConfirm", testL2RelayerGasOracleConfirm)
-}

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

@@ -1,165 +0,0 @@
-package sender
-
-import (
-	"context"
-	"crypto/ecdsa"
-	"fmt"
-	"math/big"
-
-	"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/ethclient"
-	"github.com/scroll-tech/go-ethereum/log"
-)
-
-type accountPool struct {
-	client *ethclient.Client
-
-	minBalance *big.Int
-	accounts   map[common.Address]*bind.TransactOpts
-	accsCh     chan *bind.TransactOpts
-}
-
-// newAccounts creates an accountPool instance.
-func newAccountPool(ctx context.Context, minBalance *big.Int, client *ethclient.Client, privs []*ecdsa.PrivateKey) (*accountPool, error) {
-	accs := &accountPool{
-		client:     client,
-		minBalance: minBalance,
-		accounts:   make(map[common.Address]*bind.TransactOpts, len(privs)),
-		accsCh:     make(chan *bind.TransactOpts, len(privs)+2),
-	}
-
-	// get chainID from client
-	chainID, err := client.ChainID(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, privStr := range privs {
-		auth, err := bind.NewKeyedTransactorWithChainID(privStr, chainID)
-		if err != nil {
-			log.Error("failed to create account", "chainID", chainID.String(), "err", err)
-			return nil, err
-		}
-
-		// Set pending nonce
-		nonce, err := client.PendingNonceAt(ctx, auth.From)
-		if err != nil {
-			return nil, err
-		}
-		auth.Nonce = big.NewInt(int64(nonce))
-		accs.accounts[auth.From] = auth
-		accs.accsCh <- auth
-	}
-
-	return accs, accs.checkAndSetBalances(ctx)
-}
-
-// getAccount get auth from channel.
-func (a *accountPool) getAccount() *bind.TransactOpts {
-	select {
-	case auth := <-a.accsCh:
-		return auth
-	default:
-		return nil
-	}
-}
-
-// releaseAccount set used auth into channel.
-func (a *accountPool) releaseAccount(auth *bind.TransactOpts) {
-	a.accsCh <- auth
-}
-
-// reSetNonce reset nonce if send signed tx failed.
-func (a *accountPool) resetNonce(ctx context.Context, auth *bind.TransactOpts) {
-	nonce, err := a.client.PendingNonceAt(ctx, auth.From)
-	if err != nil {
-		log.Warn("failed to reset nonce", "address", auth.From.String(), "err", err)
-		return
-	}
-	auth.Nonce = big.NewInt(int64(nonce))
-}
-
-// checkAndSetBalance check balance and set min balance.
-func (a *accountPool) checkAndSetBalances(ctx context.Context) error {
-	var (
-		root      *bind.TransactOpts
-		maxBls    = big.NewInt(0)
-		lostAuths []*bind.TransactOpts
-	)
-
-	for addr, auth := range a.accounts {
-		bls, err := a.client.BalanceAt(ctx, addr, nil)
-		if err != nil || bls.Cmp(a.minBalance) < 0 {
-			if err != nil {
-				log.Warn("failed to get balance", "address", addr.String(), "err", err)
-				return err
-			}
-			lostAuths = append(lostAuths, auth)
-			continue
-		} else if bls.Cmp(maxBls) > 0 { // Find the biggest balance account.
-			root, maxBls = auth, bls
-		}
-	}
-	if root == nil {
-		return fmt.Errorf("no account has enough balance")
-	}
-	if len(lostAuths) == 0 {
-		return nil
-	}
-
-	var (
-		tx  *types.Transaction
-		err error
-	)
-	for _, auth := range lostAuths {
-		tx, err = a.createSignedTx(root, &auth.From, a.minBalance)
-		if err != nil {
-			return err
-		}
-		err = a.client.SendTransaction(ctx, tx)
-		if err != nil {
-			log.Error("Failed to send balance to account", "err", err)
-			return err
-		}
-		log.Debug("send balance to account", "account", auth.From.String(), "balance", a.minBalance.String())
-	}
-	// wait util mined
-	if _, err = bind.WaitMined(ctx, a.client, tx); err != nil {
-		return err
-	}
-
-	// Reset root's nonce.
-	a.resetNonce(ctx, root)
-
-	return nil
-}
-
-func (a *accountPool) createSignedTx(from *bind.TransactOpts, to *common.Address, value *big.Int) (*types.Transaction, error) {
-	gasPrice, err := a.client.SuggestGasPrice(context.Background())
-	if err != nil {
-		return nil, err
-	}
-	gasPrice.Mul(gasPrice, big.NewInt(2))
-
-	// Get pending nonce
-	nonce, err := a.client.PendingNonceAt(context.Background(), from.From)
-	if err != nil {
-		return nil, err
-	}
-
-	tx := types.NewTx(&types.LegacyTx{
-		Nonce:    nonce,
-		To:       to,
-		Value:    value,
-		Gas:      500000,
-		GasPrice: gasPrice,
-	})
-	signedTx, err := from.Signer(from.From, tx)
-	if err != nil {
-		return nil, err
-	}
-
-	return signedTx, nil
-}

bridge/sender/estimategas.go

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

bridge/sender/sender.go

@@ -3,22 +3,22 @@ package sender
 import (
 	"context"
 	"crypto/ecdsa"
-	"errors"
 	"fmt"
 	"math/big"
 	"strings"
+	"sync"
 	"sync/atomic"
 	"time"
 
-	cmapV2 "github.com/orcaman/concurrent-map/v2"
+	"github.com/scroll-tech/go-ethereum"
 	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
 	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/common/math"
 	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
 
 	"scroll-tech/bridge/config"
-	"scroll-tech/bridge/utils"
 )
 
 const (
@@ -32,16 +32,15 @@ const (
 	LegacyTxType = "LegacyTx"
 )
 
-var (
-	// ErrNoAvailableAccount indicates no available account error in the account pool.
-	ErrNoAvailableAccount = errors.New("sender has no available account to send transaction")
-	// ErrFullPending sender's pending pool is full.
-	ErrFullPending = errors.New("sender's pending pool is full")
-)
-
-var (
-	defaultPendingLimit = 10
-)
+// 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 {
@@ -64,7 +63,6 @@ type PendingTransaction struct {
 	submitAt uint64
 	id       string
 	feeData  *FeeData
-	signer   *bind.TransactOpts
 	tx       *types.Transaction
 }
 
@@ -75,20 +73,23 @@ type Sender struct {
 	chainID *big.Int          // The chain id of the endpoint
 	ctx     context.Context
 
-	// account fields.
-	auths *accountPool
-
-	blockNumber   uint64                                            // Current block number on chain.
-	baseFeePerGas uint64                                            // Current base fee per gas on chain
-	pendingTxs    cmapV2.ConcurrentMap[string, *PendingTransaction] // Mapping from nonce to pending transaction
+	mu            sync.Mutex
+	auth          *bind.TransactOpts
+	blockNumber   uint64   // Current block number on chain.
+	baseFeePerGas uint64   // Current base fee per gas on chain
+	pendingTxs    sync.Map // Mapping from nonce to pending transaction
 	confirmCh     chan *Confirmation
+	sendTxErrCh   chan error
 
 	stopCh chan 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) {
+func NewSender(ctx context.Context, config *config.SenderConfig, prv *ecdsa.PrivateKey) (*Sender, error) {
+	if config == nil {
+		config = &DefaultSenderConfig
+	}
 	client, err := ethclient.Dial(config.Endpoint)
 	if err != nil {
 		return nil, err
@@ -100,10 +101,20 @@ func NewSender(ctx context.Context, config *config.SenderConfig, privs []*ecdsa.
 		return nil, err
 	}
 
-	auths, err := newAccountPool(ctx, config.MinBalance, client, privs)
+	auth, err := bind.NewKeyedTransactorWithChainID(prv, chainID)
 	if err != nil {
-		return nil, fmt.Errorf("failed to create account pool, err: %v", err)
+		log.Error("failed to create account", "chainID", chainID.String(), "err", err)
+		return nil, err
 	}
+	log.Info("sender", "chainID", chainID.String(), "address", auth.From.String())
+
+	// set nonce
+	nonce, err := client.PendingNonceAt(ctx, auth.From)
+	if err != nil {
+		log.Error("failed to get pending nonce", "address", auth.From.String(), "err", err)
+		return nil, err
+	}
+	auth.Nonce = big.NewInt(int64(nonce))
 
 	// get header by number
 	header, err := client.HeaderByNumber(ctx, nil)
@@ -111,53 +122,24 @@ 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")
-		}
-	}
-
-	// initialize pending limit with a default value
-	if config.PendingLimit == 0 {
-		config.PendingLimit = defaultPendingLimit
-	}
-
 	sender := &Sender{
 		ctx:           ctx,
 		config:        config,
 		client:        client,
 		chainID:       chainID,
-		auths:         auths,
+		auth:          auth,
+		sendTxErrCh:   make(chan error, 4),
 		confirmCh:     make(chan *Confirmation, 128),
-		blockNumber:   header.Number.Uint64(),
-		baseFeePerGas: baseFeePerGas,
-		pendingTxs:    cmapV2.New[*PendingTransaction](),
+		baseFeePerGas: header.BaseFee.Uint64(),
+		pendingTxs:    sync.Map{},
 		stopCh:        make(chan struct{}),
 	}
 
-	go sender.loop(ctx)
+	go sender.loop()
 
 	return sender, nil
 }
 
-// PendingCount returns the current number of pending txs.
-func (s *Sender) PendingCount() int {
-	return s.pendingTxs.Count()
-}
-
-// PendingLimit returns the maximum number of pending txs the sender can handle.
-func (s *Sender) PendingLimit() int {
-	return s.config.PendingLimit
-}
-
-// IsFull returns true if the sender's pending tx pool is full.
-func (s *Sender) IsFull() bool {
-	return s.pendingTxs.Count() >= s.config.PendingLimit
-}
-
 // Stop stop the sender module.
 func (s *Sender) Stop() {
 	close(s.stopCh)
@@ -169,82 +151,88 @@ func (s *Sender) ConfirmChan() <-chan *Confirmation {
 	return s.confirmCh
 }
 
-// SendConfirmation sends a confirmation to the confirmation channel.
-// Note: This function is only used in tests.
-func (s *Sender) SendConfirmation(cfm *Confirmation) {
-	s.confirmCh <- cfm
-}
-
-// NumberOfAccounts return the count of accounts.
-func (s *Sender) NumberOfAccounts() int {
-	return len(s.auths.accounts)
-}
-
-func (s *Sender) getFeeData(auth *bind.TransactOpts, target *common.Address, value *big.Int, data []byte, minGasLimit uint64) (*FeeData, error) {
-	if s.config.TxType == DynamicFeeTxType {
-		return s.estimateDynamicGas(auth, target, value, data, minGasLimit)
+func (s *Sender) getFeeData(msg ethereum.CallMsg) (*FeeData, error) {
+	gasLimit, err := s.client.EstimateGas(s.ctx, msg)
+	if err != nil {
+		return nil, err
 	}
-	return s.estimateLegacyGas(auth, target, value, data, minGasLimit)
+	gasLimit = gasLimit * 15 / 10 // 50% extra gas to void out of gas error
+	// @todo change it when Scroll enable EIP1559
+	if s.config.TxType != DynamicFeeTxType {
+		// estimate gas price
+		var gasPrice *big.Int
+		gasPrice, err = s.client.SuggestGasPrice(s.ctx)
+		if err != nil {
+			return nil, err
+		}
+		return &FeeData{
+			gasPrice: gasPrice,
+			gasLimit: gasLimit,
+		}, nil
+	}
+	gasTipCap, err := s.client.SuggestGasTipCap(s.ctx)
+	if err != nil {
+		return nil, err
+	}
+	// Make sure feeCap is bigger than txpool's gas price. 1000000000 is l2geth's default pool.gas value.
+	baseFee := atomic.LoadUint64(&s.baseFeePerGas)
+	maxFeePerGas := math.BigMax(big.NewInt(int64(baseFee)), big.NewInt(1000000000))
+	return &FeeData{
+		gasFeeCap: math.BigMax(maxFeePerGas, gasTipCap),
+		gasTipCap: math.BigMin(maxFeePerGas, gasTipCap),
+		gasLimit:  gasLimit,
+	}, nil
 }
 
 // SendTransaction send a signed L2tL1 transaction.
-func (s *Sender) SendTransaction(ID string, target *common.Address, value *big.Int, data []byte, minGasLimit uint64) (hash common.Hash, err error) {
-	if s.IsFull() {
-		return common.Hash{}, ErrFullPending
-	}
-	// We occupy the ID, in case some other threads call with the same ID in the same time
-	if ok := s.pendingTxs.SetIfAbsent(ID, nil); !ok {
+func (s *Sender) SendTransaction(ID string, target *common.Address, value *big.Int, data []byte) (hash common.Hash, err error) {
+	if _, ok := s.pendingTxs.Load(ID); ok {
 		return common.Hash{}, fmt.Errorf("has the repeat tx ID, ID: %s", ID)
 	}
-	// get
-	auth := s.auths.getAccount()
-	if auth == nil {
-		s.pendingTxs.Remove(ID) // release the ID on failure
-		return common.Hash{}, ErrNoAvailableAccount
-	}
-
-	defer s.auths.releaseAccount(auth)
-	defer func() {
-		if err != nil {
-			s.pendingTxs.Remove(ID) // release the ID on failure
-		}
-	}()
-
 	var (
+		// estimate gas limit
+		call = ethereum.CallMsg{
+			From:       s.auth.From,
+			To:         target,
+			Gas:        0,
+			GasPrice:   nil,
+			GasFeeCap:  nil,
+			GasTipCap:  nil,
+			Value:      value,
+			Data:       data,
+			AccessList: make(types.AccessList, 0),
+		}
 		feeData *FeeData
 		tx      *types.Transaction
 	)
+
 	// estimate gas fee
-	if feeData, err = s.getFeeData(auth, target, value, data, minGasLimit); err != nil {
+	if feeData, err = s.getFeeData(call); err != nil {
 		return
 	}
-	if tx, err = s.createAndSendTx(auth, feeData, target, value, data, nil); err == nil {
+	if tx, err = s.createAndSendTx(feeData, target, value, data); err == nil {
 		// add pending transaction to queue
 		pending := &PendingTransaction{
 			tx:       tx,
 			id:       ID,
-			signer:   auth,
 			submitAt: atomic.LoadUint64(&s.blockNumber),
 			feeData:  feeData,
 		}
-		s.pendingTxs.Set(ID, pending)
+		s.pendingTxs.Store(ID, pending)
 		return tx.Hash(), nil
 	}
 
 	return
 }
 
-func (s *Sender) createAndSendTx(auth *bind.TransactOpts, feeData *FeeData, target *common.Address, value *big.Int, data []byte, overrideNonce *uint64) (tx *types.Transaction, err error) {
+func (s *Sender) createAndSendTx(feeData *FeeData, target *common.Address, value *big.Int, data []byte) (tx *types.Transaction, err error) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+
 	var (
-		nonce  = auth.Nonce.Uint64()
+		nonce  = s.auth.Nonce.Uint64()
 		txData types.TxData
 	)
-
-	// this is a resubmit call, override the nonce
-	if overrideNonce != nil {
-		nonce = *overrideNonce
-	}
-
 	// lock here to avoit blocking when call `SuggestGasPrice`
 	switch s.config.TxType {
 	case LegacyTxType:
@@ -292,29 +280,25 @@ func (s *Sender) createAndSendTx(auth *bind.TransactOpts, feeData *FeeData, targ
 	}
 
 	// sign and send
-	tx, err = auth.Signer(auth.From, types.NewTx(txData))
+	tx, err = s.auth.Signer(s.auth.From, types.NewTx(txData))
 	if err != nil {
 		log.Error("failed to sign tx", "err", err)
 		return
 	}
 	if err = s.client.SendTransaction(s.ctx, tx); err != nil {
 		log.Error("failed to send tx", "tx hash", tx.Hash().String(), "err", err)
-		// Check if contain nonce, and reset nonce
-		// only reset nonce when it is not from resubmit
-		if strings.Contains(err.Error(), "nonce") && overrideNonce == nil {
-			s.auths.resetNonce(context.Background(), auth)
-		}
+		s.sendTxErrCh <- err
 		return
 	}
 
-	// update nonce when it is not from resubmit
-	if overrideNonce == nil {
-		auth.Nonce = big.NewInt(int64(nonce + 1))
-	}
+	// update nonce
+	s.auth.Nonce = big.NewInt(int64(nonce + 1))
 	return
 }
 
-func (s *Sender) resubmitTransaction(feeData *FeeData, auth *bind.TransactOpts, tx *types.Transaction) (*types.Transaction, error) {
+func (s *Sender) resubmitTransaction(feeData *FeeData, tx *types.Transaction) (*types.Transaction, error) {
+	// @todo move query out of lock scope
+
 	escalateMultipleNum := new(big.Int).SetUint64(s.config.EscalateMultipleNum)
 	escalateMultipleDen := new(big.Int).SetUint64(s.config.EscalateMultipleDen)
 	maxGasPrice := new(big.Int).SetUint64(s.config.MaxGasPrice)
@@ -350,35 +334,20 @@ func (s *Sender) resubmitTransaction(feeData *FeeData, auth *bind.TransactOpts,
 		feeData.gasTipCap = gasTipCap
 	}
 
-	nonce := tx.Nonce()
-	return s.createAndSendTx(auth, feeData, tx.To(), tx.Value(), tx.Data(), &nonce)
+	return s.createAndSendTx(feeData, tx.To(), tx.Value(), tx.Data())
 }
 
-// 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")
-		}
-	}
-
-	for item := range s.pendingTxs.IterBuffered() {
-		key, pending := item.Key, item.Val
-		// ignore empty id, since we use empty id to occupy pending task
-		if pending == nil {
-			continue
-		}
-
+	atomic.StoreUint64(&s.baseFeePerGas, header.BaseFee.Uint64())
+	s.pendingTxs.Range(func(key, value interface{}) bool {
+		pending := value.(*PendingTransaction)
 		receipt, err := s.client.TransactionReceipt(s.ctx, pending.tx.Hash())
 		if (err == nil) && (receipt != nil) {
-			if receipt.BlockNumber.Uint64() <= confirmed {
-				s.pendingTxs.Remove(key)
+			if number >= receipt.BlockNumber.Uint64()+s.config.Confirmations {
+				s.pendingTxs.Delete(key)
 				// send confirm message
 				s.confirmCh <- &Confirmation{
 					ID:           pending.id,
@@ -388,60 +357,24 @@ func (s *Sender) checkPendingTransaction(header *types.Header, confirmed uint64)
 			}
 		} else if s.config.EscalateBlocks+pending.submitAt < number {
 			var tx *types.Transaction
-			tx, err := s.resubmitTransaction(pending.feeData, pending.signer, pending.tx)
+			tx, err := s.resubmitTransaction(pending.feeData, pending.tx)
 			if err != nil {
-				// If account pool is empty, it will try again in next loop.
-				if !errors.Is(err, ErrNoAvailableAccount) {
-					log.Error("failed to resubmit transaction, reset submitAt", "tx hash", pending.tx.Hash().String(), "err", err)
-				}
-				// This means one of the old transactions is confirmed
-				// One scenario is
-				//   1. Initially, we replace the tx three times and submit it to local node.
-				//      Currently, we keep the last tx hash in the memory.
-				//   2. Other node packed the 2-nd tx or 3-rd tx, and the local node has received the block now.
-				//   3. When we resubmit the 4-th tx, we got a nonce error.
-				//   4. We need to check the status of 3-rd tx stored in our memory
-				//     4.1 If the 3-rd tx is packed, we got a receipt and 3-nd is marked as confirmed.
-				//     4.2 If the 2-nd tx is packed, we got nothing from `TransactionReceipt` call. Since we
-				//         cannot do  anything about, we just log some information. In this case, the caller
-				//         of `sender.SendTransaction` should write extra code to handle the situation.
-				// Another scenario is private key leaking and someone send a transaction with the same nonce.
-				// We need to stop the program and manually handle the situation.
-				if strings.Contains(err.Error(), "nonce") {
-					// This key can be deleted
-					s.pendingTxs.Remove(key)
-					// Try get receipt by the latest replaced tx hash
-					receipt, err := s.client.TransactionReceipt(s.ctx, pending.tx.Hash())
-					if (err == nil) && (receipt != nil) {
-						// send confirm message
-						s.confirmCh <- &Confirmation{
-							ID:           pending.id,
-							IsSuccessful: receipt.Status == types.ReceiptStatusSuccessful,
-							TxHash:       pending.tx.Hash(),
-						}
-					} else {
-						// The receipt can be nil since the confirmed transaction may not be the latest one.
-						// We just ignore it, the caller of the sender pool should handle this situation.
-						log.Warn("Pending transaction is confirmed by one of the replaced transactions", "key", key, "signer", pending.signer.From, "nonce", pending.tx.Nonce())
-					}
-				}
+				log.Error("failed to resubmit transaction, reset submitAt", "tx hash", pending.tx.Hash().String(), "err", err)
 			} else {
 				// flush submitAt
 				pending.tx = tx
 				pending.submitAt = number
 			}
 		}
-	}
+		return true
+	})
 }
 
 // Loop is the main event loop
-func (s *Sender) loop(ctx context.Context) {
-	checkTick := time.NewTicker(time.Duration(s.config.CheckPendingTime) * time.Second)
+func (s *Sender) loop() {
+	t := time.Duration(s.config.CheckPendingTime) * time.Second
+	checkTick := time.NewTicker(t)
 	defer checkTick.Stop()
-
-	checkBalanceTicker := time.NewTicker(time.Duration(s.config.CheckBalanceTime) * time.Second)
-	defer checkBalanceTicker.Stop()
-
 	for {
 		select {
 		case <-checkTick.C:
@@ -450,19 +383,18 @@ 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)
+		case err := <-s.sendTxErrCh:
+			// redress nonce
+			if strings.Contains(err.Error(), "nonce") {
+				if nonce, err := s.client.PendingNonceAt(s.ctx, s.auth.From); err != nil {
+					log.Error("failed to get pending nonce", "address", s.auth.From.String(), "err", err)
+				} else {
+					s.mu.Lock()
+					s.auth.Nonce = big.NewInt(int64(nonce))
+					s.mu.Unlock()
+				}
 			}
-
-			s.checkPendingTransaction(header, confirmed)
-		case <-checkBalanceTicker.C:
-			// Check and set balance.
-			_ = s.auths.checkAndSetBalances(ctx)
-		case <-ctx.Done():
-			return
 		case <-s.stopCh:
 			return
 		}

bridge/sender/sender_test.go

@@ -1,9 +1,8 @@
-package sender
+package sender_test
 
 import (
 	"context"
 	"crypto/ecdsa"
-	"errors"
 	"math/big"
 	"strconv"
 	"testing"
@@ -13,204 +12,108 @@ import (
 
 	cmap "github.com/orcaman/concurrent-map"
 	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/crypto"
-	"github.com/scroll-tech/go-ethereum/ethclient"
-	"github.com/scroll-tech/go-ethereum/rpc"
 	"github.com/stretchr/testify/assert"
 
 	"scroll-tech/common/docker"
 
 	"scroll-tech/bridge/config"
+	"scroll-tech/bridge/mock"
+	"scroll-tech/bridge/sender"
 )
 
-const TXBatch = 50
+const TX_BATCH = 100
 
 var (
-	privateKeys []*ecdsa.PrivateKey
-	cfg         *config.Config
-	base        *docker.App
-	txTypes     = []string{"LegacyTx", "AccessListTx", "DynamicFeeTx"}
+	TestConfig = &mock.TestConfig{
+		L1GethTestConfig: mock.L1GethTestConfig{
+			HPort: 0,
+			WPort: 8576,
+		},
+	}
+
+	l1gethImg docker.ImgInstance
+	private   *ecdsa.PrivateKey
 )
 
-func TestMain(m *testing.M) {
-	base = docker.NewDockerApp()
-
-	m.Run()
-
-	base.Free()
-}
-
 func setupEnv(t *testing.T) {
-	var err error
-	cfg, err = config.NewConfig("../config.json")
+	cfg, err := config.NewConfig("../config.json")
 	assert.NoError(t, err)
-	base.RunImages(t)
-	priv, err := crypto.HexToECDSA("1212121212121212121212121212121212121212121212121212121212121212")
+	prv, err := crypto.HexToECDSA(cfg.L2Config.RelayerConfig.PrivateKey)
 	assert.NoError(t, err)
-	// Load default private key.
-	privateKeys = []*ecdsa.PrivateKey{priv}
-
-	cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = base.L1gethImg.Endpoint()
-	cfg.L1Config.RelayerConfig.SenderConfig.CheckBalanceTime = 1
+	private = prv
+	l1gethImg = mock.NewTestL1Docker(t, TestConfig)
 }
 
-func TestSender(t *testing.T) {
+func TestFunction(t *testing.T) {
 	// Setup
 	setupEnv(t)
-
-	t.Run("test new sender", testNewSender)
-	t.Run("test pending limit", testPendLimit)
-
-	t.Run("test min gas limit", testMinGasLimit)
-	t.Run("test resubmit transaction", func(t *testing.T) { testResubmitTransaction(t) })
-
-	t.Run("test 1 account sender", func(t *testing.T) { testBatchSender(t, 1) })
-	t.Run("test 3 account sender", func(t *testing.T) { testBatchSender(t, 3) })
-	t.Run("test 8 account sender", func(t *testing.T) { testBatchSender(t, 8) })
-}
-
-func testNewSender(t *testing.T) {
-	for _, txType := range txTypes {
-		// exit by Stop()
-		cfgCopy1 := *cfg.L1Config.RelayerConfig.SenderConfig
-		cfgCopy1.TxType = txType
-		newSender1, err := NewSender(context.Background(), &cfgCopy1, privateKeys)
+	t.Run("test Run sender", func(t *testing.T) {
+		// set config
+		cfg, err := config.NewConfig("../config.json")
 		assert.NoError(t, err)
-		newSender1.Stop()
+		cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = l1gethImg.Endpoint()
 
-		// exit by ctx.Done()
-		cfgCopy2 := *cfg.L1Config.RelayerConfig.SenderConfig
-		cfgCopy2.TxType = txType
-		subCtx, cancel := context.WithCancel(context.Background())
-		_, err = NewSender(subCtx, &cfgCopy2, privateKeys)
+		// create newSender
+		newSender, err := sender.NewSender(context.Background(), cfg.L2Config.RelayerConfig.SenderConfig, private)
 		assert.NoError(t, err)
-		cancel()
-	}
-}
+		defer newSender.Stop()
 
-func testPendLimit(t *testing.T) {
-	for _, txType := range txTypes {
-		cfgCopy := *cfg.L1Config.RelayerConfig.SenderConfig
-		cfgCopy.TxType = txType
-		cfgCopy.Confirmations = rpc.LatestBlockNumber
-		cfgCopy.PendingLimit = 2
-		newSender, err := NewSender(context.Background(), &cfgCopy, privateKeys)
-		assert.NoError(t, err)
-
-		for i := 0; i < 2*newSender.PendingLimit(); i++ {
-			_, err = newSender.SendTransaction(strconv.Itoa(i), &common.Address{}, big.NewInt(1), nil, 0)
-			assert.True(t, err == nil || (err != nil && err.Error() == "sender's pending pool is full"))
-		}
-		assert.True(t, newSender.PendingCount() <= newSender.PendingLimit())
-		newSender.Stop()
-	}
-}
-
-func testMinGasLimit(t *testing.T) {
-	for _, txType := range txTypes {
-		cfgCopy := *cfg.L1Config.RelayerConfig.SenderConfig
-		cfgCopy.TxType = txType
-		cfgCopy.Confirmations = rpc.LatestBlockNumber
-		newSender, err := NewSender(context.Background(), &cfgCopy, privateKeys)
-		assert.NoError(t, err)
-
-		client, err := ethclient.Dial(cfgCopy.Endpoint)
-		assert.NoError(t, err)
-
-		// MinGasLimit = 0
-		txHash0, err := newSender.SendTransaction("0", &common.Address{}, big.NewInt(1), nil, 0)
-		assert.NoError(t, err)
-		tx0, _, err := client.TransactionByHash(context.Background(), txHash0)
-		assert.NoError(t, err)
-		assert.Greater(t, tx0.Gas(), uint64(0))
-
-		// MinGasLimit = 100000
-		txHash1, err := newSender.SendTransaction("1", &common.Address{}, big.NewInt(1), nil, 100000)
-		assert.NoError(t, err)
-		tx1, _, err := client.TransactionByHash(context.Background(), txHash1)
-		assert.NoError(t, err)
-		assert.Equal(t, tx1.Gas(), uint64(150000))
-
-		newSender.Stop()
-	}
-}
-
-func testResubmitTransaction(t *testing.T) {
-	for _, txType := range txTypes {
-		cfgCopy := *cfg.L1Config.RelayerConfig.SenderConfig
-		cfgCopy.TxType = txType
-		s, err := NewSender(context.Background(), &cfgCopy, privateKeys)
-		assert.NoError(t, err)
-		auth := s.auths.getAccount()
-		tx := types.NewTransaction(auth.Nonce.Uint64(), common.Address{}, big.NewInt(0), 0, big.NewInt(0), nil)
-		feeData, err := s.getFeeData(auth, &common.Address{}, big.NewInt(0), nil, 0)
-		assert.NoError(t, err)
-		_, err = s.resubmitTransaction(feeData, auth, tx)
-		assert.NoError(t, err)
-		s.Stop()
-	}
-}
-
-func testBatchSender(t *testing.T, batchSize int) {
-	for _, txType := range txTypes {
-		for len(privateKeys) < batchSize {
-			priv, err := crypto.GenerateKey()
-			assert.NoError(t, err)
-			privateKeys = append(privateKeys, priv)
-		}
-
-		cfgCopy := *cfg.L1Config.RelayerConfig.SenderConfig
-		cfgCopy.Confirmations = rpc.LatestBlockNumber
-		cfgCopy.PendingLimit = batchSize * TXBatch
-		cfgCopy.TxType = txType
-		newSender, err := NewSender(context.Background(), &cfgCopy, privateKeys)
 		assert.NoError(t, err)
 
 		// send transactions
+		idCache := cmap.New()
+		confirmCh := newSender.ConfirmChan()
 		var (
-			eg        errgroup.Group
-			idCache   = cmap.New()
-			confirmCh = newSender.ConfirmChan()
+			eg    errgroup.Group
+			errCh chan error
 		)
-		for idx := 0; idx < newSender.NumberOfAccounts(); idx++ {
-			index := idx
-			eg.Go(func() error {
-				for i := 0; i < TXBatch; i++ {
-					toAddr := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
-					id := strconv.Itoa(i + index*1000)
-					_, err := newSender.SendTransaction(id, &toAddr, big.NewInt(1), nil, 0)
-					if errors.Is(err, ErrNoAvailableAccount) || errors.Is(err, ErrFullPending) {
-						<-time.After(time.Second)
-						continue
+		go func() {
+			for i := 0; i < TX_BATCH; i++ {
+				//toAddr := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
+				toAddr := common.BigToAddress(big.NewInt(int64(i + 1000)))
+				id := strconv.Itoa(i + 1000)
+				eg.Go(func() error {
+					txHash, err := newSender.SendTransaction(id, &toAddr, big.NewInt(1), nil)
+					if err != nil {
+						t.Error("failed to send tx", "err", err)
+						return err
 					}
-					assert.NoError(t, err)
+					t.Log("successful send a tx", "ID", id, "tx hash", txHash.String())
 					idCache.Set(id, struct{}{})
-				}
-				return nil
-			})
-		}
-		assert.NoError(t, eg.Wait())
-		t.Logf("successful send batch txs, batch size: %d, total count: %d", newSender.NumberOfAccounts(), TXBatch*newSender.NumberOfAccounts())
+					return nil
+				})
+			}
+			errCh <- eg.Wait()
+		}()
 
 		// avoid 10 mins cause testcase panic
-		after := time.After(80 * time.Second)
-		isDone := false
-		for !isDone {
+		after := time.After(60 * time.Second)
+		for {
 			select {
 			case cmsg := <-confirmCh:
+				t.Log("get confirmations of", "ID: ", cmsg.ID, "status: ", cmsg.IsSuccessful)
 				assert.Equal(t, true, cmsg.IsSuccessful)
 				_, exist := idCache.Pop(cmsg.ID)
 				assert.Equal(t, true, exist)
 				// Receive all confirmed txs.
 				if idCache.Count() == 0 {
-					isDone = true
+					return
 				}
+			case err := <-errCh:
+				if err != nil {
+					t.Errorf("failed to send tx, err: %v", err)
+					return
+				}
+				assert.NoError(t, err)
 			case <-after:
-				t.Error("newSender test failed because of timeout")
-				isDone = true
+				t.Logf("newSender test failed because timeout")
+				t.FailNow()
 			}
 		}
-		newSender.Stop()
-	}
+	})
+	// Teardown
+	t.Cleanup(func() {
+		assert.NoError(t, l1gethImg.Stop())
+	})
 }

bridge/tests/bridge_test.go

@@ -1,210 +0,0 @@
-package tests
-
-import (
-	"context"
-	"crypto/ecdsa"
-	"math/big"
-	"testing"
-
-	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/scroll-tech/go-ethereum/crypto"
-	"github.com/scroll-tech/go-ethereum/ethclient"
-	"github.com/scroll-tech/go-ethereum/rpc"
-	"github.com/stretchr/testify/assert"
-
-	"scroll-tech/bridge/config"
-	"scroll-tech/bridge/mock_bridge"
-
-	"scroll-tech/common/docker"
-)
-
-var (
-	// config
-	cfg *config.Config
-
-	// private key
-	privateKey *ecdsa.PrivateKey
-	base       *docker.App
-
-	// clients
-	l1Client *ethclient.Client
-	l2Client *ethclient.Client
-
-	// auth
-	l1Auth *bind.TransactOpts
-	l2Auth *bind.TransactOpts
-
-	// l1 messenger contract
-	l1MessengerInstance *mock_bridge.MockBridgeL1
-	l1MessengerAddress  common.Address
-
-	// l1 rollup contract
-	scrollChainInstance *mock_bridge.MockBridgeL1
-	scrollChainAddress  common.Address
-
-	// l2 messenger contract
-	l2MessengerInstance *mock_bridge.MockBridgeL2
-	l2MessengerAddress  common.Address
-)
-
-func TestMain(m *testing.M) {
-	base = docker.NewDockerApp()
-
-	m.Run()
-
-	base.Free()
-}
-
-func setupEnv(t *testing.T) {
-	var err error
-	privateKey, err = crypto.ToECDSA(common.FromHex("1212121212121212121212121212121212121212121212121212121212121212"))
-	assert.NoError(t, err)
-	messagePrivateKey, err := crypto.ToECDSA(common.FromHex("1212121212121212121212121212121212121212121212121212121212121213"))
-	assert.NoError(t, err)
-	rollupPrivateKey, err := crypto.ToECDSA(common.FromHex("1212121212121212121212121212121212121212121212121212121212121214"))
-	assert.NoError(t, err)
-	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.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.RelayerConfig.MessageSenderPrivateKeys = []*ecdsa.PrivateKey{messagePrivateKey}
-	cfg.L2Config.RelayerConfig.RollupSenderPrivateKeys = []*ecdsa.PrivateKey{rollupPrivateKey}
-	cfg.L2Config.RelayerConfig.GasOracleSenderPrivateKeys = []*ecdsa.PrivateKey{gasOraclePrivateKey}
-	base.RunImages(t)
-
-	// Create l1geth container.
-	cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = base.L1gethImg.Endpoint()
-	cfg.L1Config.Endpoint = base.L1gethImg.Endpoint()
-
-	// Create l2geth container.
-	cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = base.L2gethImg.Endpoint()
-	cfg.L2Config.Endpoint = base.L2gethImg.Endpoint()
-
-	// Create db container.
-	cfg.DBConfig = base.DBConfig
-
-	// Create l1geth and l2geth client.
-	l1Client, err = ethclient.Dial(cfg.L1Config.Endpoint)
-	assert.NoError(t, err)
-	l2Client, err = ethclient.Dial(cfg.L2Config.Endpoint)
-	assert.NoError(t, err)
-
-	// Create l1 and l2 auth
-	l1Auth = prepareAuth(t, l1Client, privateKey)
-	l2Auth = prepareAuth(t, l2Client, privateKey)
-
-	// send some balance to message and rollup sender
-	transferEther(t, l1Auth, l1Client, messagePrivateKey)
-	transferEther(t, l1Auth, l1Client, rollupPrivateKey)
-	transferEther(t, l1Auth, l1Client, gasOraclePrivateKey)
-	transferEther(t, l2Auth, l2Client, messagePrivateKey)
-	transferEther(t, l2Auth, l2Client, rollupPrivateKey)
-	transferEther(t, l2Auth, l2Client, gasOraclePrivateKey)
-}
-
-func transferEther(t *testing.T, auth *bind.TransactOpts, client *ethclient.Client, privateKey *ecdsa.PrivateKey) {
-	targetAddress := crypto.PubkeyToAddress(privateKey.PublicKey)
-
-	gasPrice, err := client.SuggestGasPrice(context.Background())
-	assert.NoError(t, err)
-	gasPrice.Mul(gasPrice, big.NewInt(2))
-
-	// Get pending nonce
-	nonce, err := client.PendingNonceAt(context.Background(), auth.From)
-	assert.NoError(t, err)
-
-	// 200 ether should be enough
-	value, ok := big.NewInt(0).SetString("0xad78ebc5ac6200000", 0)
-	assert.Equal(t, ok, true)
-
-	tx := types.NewTx(&types.LegacyTx{
-		Nonce:    nonce,
-		To:       &targetAddress,
-		Value:    value,
-		Gas:      500000,
-		GasPrice: gasPrice,
-	})
-	signedTx, err := auth.Signer(auth.From, tx)
-	assert.NoError(t, err)
-
-	err = client.SendTransaction(context.Background(), signedTx)
-	assert.NoError(t, err)
-
-	receipt, err := bind.WaitMined(context.Background(), client, signedTx)
-	assert.NoError(t, err)
-	if receipt.Status != types.ReceiptStatusSuccessful {
-		t.Fatalf("Call failed")
-	}
-}
-
-func prepareContracts(t *testing.T) {
-	var err error
-	var tx *types.Transaction
-
-	// L1 messenger contract
-	_, tx, l1MessengerInstance, err = mock_bridge.DeployMockBridgeL1(l1Auth, l1Client)
-	assert.NoError(t, err)
-	l1MessengerAddress, err = bind.WaitDeployed(context.Background(), l1Client, tx)
-	assert.NoError(t, err)
-
-	// L1 ScrolChain contract
-	_, tx, scrollChainInstance, err = mock_bridge.DeployMockBridgeL1(l1Auth, l1Client)
-	assert.NoError(t, err)
-	scrollChainAddress, err = bind.WaitDeployed(context.Background(), l1Client, tx)
-	assert.NoError(t, err)
-
-	// L2 messenger contract
-	_, tx, l2MessengerInstance, err = mock_bridge.DeployMockBridgeL2(l2Auth, l2Client)
-	assert.NoError(t, err)
-	l2MessengerAddress, err = bind.WaitDeployed(context.Background(), l2Client, tx)
-	assert.NoError(t, err)
-
-	cfg.L1Config.L1MessengerAddress = l1MessengerAddress
-	cfg.L1Config.L1MessageQueueAddress = l1MessengerAddress
-	cfg.L1Config.ScrollChainContractAddress = scrollChainAddress
-	cfg.L1Config.RelayerConfig.MessengerContractAddress = l2MessengerAddress
-	cfg.L1Config.RelayerConfig.GasPriceOracleContractAddress = l1MessengerAddress
-
-	cfg.L2Config.L2MessengerAddress = l2MessengerAddress
-	cfg.L2Config.L2MessageQueueAddress = l2MessengerAddress
-	cfg.L2Config.RelayerConfig.MessengerContractAddress = l1MessengerAddress
-	cfg.L2Config.RelayerConfig.RollupContractAddress = scrollChainAddress
-	cfg.L2Config.RelayerConfig.GasPriceOracleContractAddress = l2MessengerAddress
-}
-
-func prepareAuth(t *testing.T, client *ethclient.Client, privateKey *ecdsa.PrivateKey) *bind.TransactOpts {
-	chainID, err := client.ChainID(context.Background())
-	assert.NoError(t, err)
-	auth, err := bind.NewKeyedTransactorWithChainID(privateKey, chainID)
-	assert.NoError(t, err)
-	auth.Value = big.NewInt(0) // in wei
-	assert.NoError(t, err)
-	return auth
-}
-
-func TestFunction(t *testing.T) {
-	setupEnv(t)
-
-	// l1 rollup and watch rollup events
-	t.Run("TestCommitBatchAndFinalizeBatch", testCommitBatchAndFinalizeBatch)
-
-	// l1 message
-	t.Run("TestRelayL1MessageSucceed", testRelayL1MessageSucceed)
-
-	// l2 message
-	t.Run("TestRelayL2MessageSucceed", testRelayL2MessageSucceed)
-
-	// l1/l2 gas oracle
-	t.Run("TestImportL1GasPrice", testImportL1GasPrice)
-	t.Run("TestImportL2GasPrice", testImportL2GasPrice)
-
-}

bridge/tests/gas_oracle_test.go

@@ -1,127 +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/relayer"
-	"scroll-tech/bridge/watcher"
-
-	"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 := relayer.NewLayer1Relayer(context.Background(), db, l1Cfg.RelayerConfig)
-	assert.NoError(t, err)
-
-	// Create L1Watcher
-	startHeight, err := l1Client.BlockNumber(context.Background())
-	assert.NoError(t, err)
-	l1Watcher := watcher.NewL1WatcherClient(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 := relayer.NewLayer2Relayer(context.Background(), l2Client, db, l2Cfg.RelayerConfig)
-	assert.NoError(t, err)
-
-	// add fake blocks
-	traces := []*types.WrappedBlock{
-		{
-			Header: &geth_types.Header{
-				Number:     big.NewInt(1),
-				ParentHash: common.Hash{},
-				Difficulty: big.NewInt(0),
-				BaseFee:    big.NewInt(0),
-			},
-			Transactions:     nil,
-			WithdrawTrieRoot: common.Hash{},
-		},
-	}
-	assert.NoError(t, db.InsertWrappedBlocks(traces))
-
-	parentBatch := &types.BlockBatch{
-		Index: 0,
-		Hash:  "0x0000000000000000000000000000000000000000",
-	}
-	batchData := types.NewBatchData(parentBatch, []*types.WrappedBlock{
-		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,84 +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/relayer"
-	"scroll-tech/bridge/watcher"
-
-	"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 := relayer.NewLayer1Relayer(context.Background(), db, l1Cfg.RelayerConfig)
-	assert.NoError(t, err)
-	// Create L1Watcher
-	confirmations := rpc.LatestBlockNumber
-	l1Watcher := watcher.NewL1WatcherClient(context.Background(), l1Client, 0, confirmations, l1Cfg.L1MessengerAddress, l1Cfg.L1MessageQueueAddress, l1Cfg.ScrollChainContractAddress, db)
-
-	// Create L2Watcher
-	l2Watcher := watcher.NewL2WatcherClient(context.Background(), l2Client, confirmations, l2Cfg.L2MessengerAddress, l2Cfg.L2MessageQueueAddress, l2Cfg.WithdrawTrieRootSlot, 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()
-
-	// 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()
-	msg, err = db.GetL1MessageByQueueIndex(nonce.Uint64())
-	assert.NoError(t, err)
-	assert.Equal(t, msg.Status, types.MsgConfirmed)
-}

bridge/tests/l2_message_relay_test.go

@@ -1,173 +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/relayer"
-	"scroll-tech/bridge/watcher"
-
-	"scroll-tech/database"
-	"scroll-tech/database/migrate"
-)
-
-func testRelayL2MessageSucceed(t *testing.T) {
-	// Create db handler and reset db.
-	db, err := database.NewOrmFactory(cfg.DBConfig)
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
-	defer db.Close()
-
-	prepareContracts(t)
-
-	l2Cfg := cfg.L2Config
-
-	// Create L2Watcher
-	confirmations := rpc.LatestBlockNumber
-	l2Watcher := watcher.NewL2WatcherClient(context.Background(), l2Client, confirmations, l2Cfg.L2MessengerAddress, l2Cfg.L2MessageQueueAddress, l2Cfg.WithdrawTrieRootSlot, db)
-
-	// Create L2Relayer
-	l2Relayer, err := relayer.NewLayer2Relayer(context.Background(), l2Client, db, l2Cfg.RelayerConfig)
-	assert.NoError(t, err)
-
-	// Create L1Watcher
-	l1Cfg := cfg.L1Config
-	l1Watcher := watcher.NewL1WatcherClient(context.Background(), l1Client, 0, confirmations, l1Cfg.L1MessengerAddress, l1Cfg.L1MessageQueueAddress, l1Cfg.ScrollChainContractAddress, db)
-
-	// send message through l2 messenger contract
-	nonce, err := l2MessengerInstance.MessageNonce(&bind.CallOpts{})
-	assert.NoError(t, err)
-	sendTx, err := l2MessengerInstance.SendMessage(l2Auth, l1Auth.From, big.NewInt(0), common.Hex2Bytes("00112233"), big.NewInt(0))
-	assert.NoError(t, err)
-	sendReceipt, err := bind.WaitMined(context.Background(), l2Client, sendTx)
-	assert.NoError(t, err)
-	if sendReceipt.Status != geth_types.ReceiptStatusSuccessful || err != nil {
-		t.Fatalf("Call failed")
-	}
-
-	// l2 watch process events
-	l2Watcher.FetchContractEvent()
-
-	// check db status
-	msg, err := db.GetL2MessageByNonce(nonce.Uint64())
-	assert.NoError(t, err)
-	assert.Equal(t, msg.Status, types.MsgPending)
-	assert.Equal(t, msg.Sender, l2Auth.From.String())
-	assert.Equal(t, msg.Target, l1Auth.From.String())
-
-	// add fake blocks
-	traces := []*types.WrappedBlock{
-		{
-			Header: &geth_types.Header{
-				Number:     sendReceipt.BlockNumber,
-				ParentHash: common.Hash{},
-				Difficulty: big.NewInt(0),
-				BaseFee:    big.NewInt(0),
-			},
-			Transactions:     nil,
-			WithdrawTrieRoot: common.Hash{},
-		},
-	}
-	assert.NoError(t, db.InsertWrappedBlocks(traces))
-
-	parentBatch := &types.BlockBatch{
-		Index: 0,
-		Hash:  "0x0000000000000000000000000000000000000000",
-	}
-	batchData := types.NewBatchData(parentBatch, []*types.WrappedBlock{
-		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)
-	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)
-	assert.NoError(t, err)
-	err = db.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
-	assert.NoError(t, err)
-
-	// process pending batch and check status
-	l2Relayer.SendCommitTx([]*types.BatchData{batchData})
-	status, err := db.GetRollupStatus(batchHash)
-	assert.NoError(t, err)
-	assert.Equal(t, types.RollupCommitting, status)
-	commitTxHash, err := db.GetCommitTxHash(batchHash)
-	assert.NoError(t, err)
-	assert.Equal(t, true, commitTxHash.Valid)
-	commitTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(commitTxHash.String))
-	assert.NoError(t, err)
-	commitTxReceipt, err := bind.WaitMined(context.Background(), l1Client, commitTx)
-	assert.NoError(t, err)
-	assert.Equal(t, len(commitTxReceipt.Logs), 1)
-
-	// fetch CommitBatch rollup events
-	err = l1Watcher.FetchContractEvent()
-	assert.NoError(t, err)
-	status, err = db.GetRollupStatus(batchHash)
-	assert.NoError(t, err)
-	assert.Equal(t, types.RollupCommitted, status)
-
-	// process committed batch and check status
-	l2Relayer.ProcessCommittedBatches()
-	status, err = db.GetRollupStatus(batchHash)
-	assert.NoError(t, err)
-	assert.Equal(t, types.RollupFinalizing, status)
-	finalizeTxHash, err := db.GetFinalizeTxHash(batchHash)
-	assert.NoError(t, err)
-	assert.Equal(t, true, finalizeTxHash.Valid)
-	finalizeTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(finalizeTxHash.String))
-	assert.NoError(t, err)
-	finalizeTxReceipt, err := bind.WaitMined(context.Background(), l1Client, finalizeTx)
-	assert.NoError(t, err)
-	assert.Equal(t, len(finalizeTxReceipt.Logs), 1)
-
-	// fetch FinalizeBatch events
-	err = l1Watcher.FetchContractEvent()
-	assert.NoError(t, err)
-	status, err = db.GetRollupStatus(batchHash)
-	assert.NoError(t, err)
-	assert.Equal(t, types.RollupFinalized, status)
-
-	// process l2 messages
-	l2Relayer.ProcessSavedEvents()
-	msg, err = db.GetL2MessageByNonce(nonce.Uint64())
-	assert.NoError(t, err)
-	assert.Equal(t, msg.Status, types.MsgSubmitted)
-	relayTxHash, err := db.GetRelayL2MessageTxHash(nonce.Uint64())
-	assert.NoError(t, err)
-	assert.Equal(t, true, relayTxHash.Valid)
-	relayTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(relayTxHash.String))
-	assert.NoError(t, err)
-	relayTxReceipt, err := bind.WaitMined(context.Background(), l1Client, relayTx)
-	assert.NoError(t, err)
-	assert.Equal(t, len(relayTxReceipt.Logs), 1)
-
-	// fetch message relayed events
-	err = l1Watcher.FetchContractEvent()
-	assert.NoError(t, err)
-	msg, err = db.GetL2MessageByNonce(nonce.Uint64())
-	assert.NoError(t, err)
-	assert.Equal(t, msg.Status, types.MsgConfirmed)
-}

bridge/tests/rollup_test.go

@@ -1,133 +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/stretchr/testify/assert"
-
-	"scroll-tech/common/types"
-
-	"scroll-tech/bridge/relayer"
-	"scroll-tech/bridge/watcher"
-
-	"scroll-tech/database"
-	"scroll-tech/database/migrate"
-)
-
-func testCommitBatchAndFinalizeBatch(t *testing.T) {
-	// Create db handler and reset db.
-	db, err := database.NewOrmFactory(cfg.DBConfig)
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
-	defer db.Close()
-
-	prepareContracts(t)
-
-	// Create L2Relayer
-	l2Cfg := cfg.L2Config
-	l2Relayer, err := relayer.NewLayer2Relayer(context.Background(), l2Client, db, l2Cfg.RelayerConfig)
-	assert.NoError(t, err)
-
-	// Create L1Watcher
-	l1Cfg := cfg.L1Config
-	l1Watcher := watcher.NewL1WatcherClient(context.Background(), l1Client, 0, l1Cfg.Confirmations, l1Cfg.L1MessengerAddress, l1Cfg.L1MessageQueueAddress, l1Cfg.ScrollChainContractAddress, db)
-
-	// add some blocks to db
-	var wrappedBlocks []*types.WrappedBlock
-	var parentHash common.Hash
-	for i := 1; i <= 10; i++ {
-		header := geth_types.Header{
-			Number:     big.NewInt(int64(i)),
-			ParentHash: parentHash,
-			Difficulty: big.NewInt(0),
-			BaseFee:    big.NewInt(0),
-		}
-		wrappedBlocks = append(wrappedBlocks, &types.WrappedBlock{
-			Header:           &header,
-			Transactions:     nil,
-			WithdrawTrieRoot: common.Hash{},
-		})
-		parentHash = header.Hash()
-	}
-	assert.NoError(t, db.InsertWrappedBlocks(wrappedBlocks))
-
-	parentBatch := &types.BlockBatch{
-		Index: 0,
-		Hash:  "0x0000000000000000000000000000000000000000",
-	}
-	batchData := types.NewBatchData(parentBatch, []*types.WrappedBlock{
-		wrappedBlocks[0],
-		wrappedBlocks[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)
-	assert.NoError(t, err)
-	assert.NoError(t, dbTx.Commit())
-
-	// process pending batch and check status
-	l2Relayer.SendCommitTx([]*types.BatchData{batchData})
-
-	status, err := db.GetRollupStatus(batchHash)
-	assert.NoError(t, err)
-	assert.Equal(t, types.RollupCommitting, status)
-	commitTxHash, err := db.GetCommitTxHash(batchHash)
-	assert.NoError(t, err)
-	assert.Equal(t, true, commitTxHash.Valid)
-	commitTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(commitTxHash.String))
-	assert.NoError(t, err)
-	commitTxReceipt, err := bind.WaitMined(context.Background(), l1Client, commitTx)
-	assert.NoError(t, err)
-	assert.Equal(t, len(commitTxReceipt.Logs), 1)
-
-	// fetch rollup events
-	err = l1Watcher.FetchContractEvent()
-	assert.NoError(t, err)
-	status, err = db.GetRollupStatus(batchHash)
-	assert.NoError(t, err)
-	assert.Equal(t, types.RollupCommitted, status)
-
-	// add dummy proof
-	tProof := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-	tInstanceCommitments := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
-	err = db.UpdateProofByHash(context.Background(), batchHash, tProof, tInstanceCommitments, 100)
-	assert.NoError(t, err)
-	err = db.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
-	assert.NoError(t, err)
-
-	// process committed batch and check status
-	l2Relayer.ProcessCommittedBatches()
-
-	status, err = db.GetRollupStatus(batchHash)
-	assert.NoError(t, err)
-	assert.Equal(t, types.RollupFinalizing, status)
-	finalizeTxHash, err := db.GetFinalizeTxHash(batchHash)
-	assert.NoError(t, err)
-	assert.Equal(t, true, finalizeTxHash.Valid)
-	finalizeTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(finalizeTxHash.String))
-	assert.NoError(t, err)
-	finalizeTxReceipt, err := bind.WaitMined(context.Background(), l1Client, finalizeTx)
-	assert.NoError(t, err)
-	assert.Equal(t, len(finalizeTxReceipt.Logs), 1)
-
-	// fetch rollup events
-	err = l1Watcher.FetchContractEvent()
-	assert.NoError(t, err)
-	status, err = db.GetRollupStatus(batchHash)
-	assert.NoError(t, err)
-	assert.Equal(t, types.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,134 +0,0 @@
-package utils
-
-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"
-)
-
-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.NoError(t, err)
-		if !test.mustFail {
-			err = json.Unmarshal([]byte(test.input), &num)
-			assert.NoError(t, err)
-			got, err := json.Marshal(&num)
-			assert.NoError(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) {
-	var blockNumber int64
-	switch number.Int64() {
-	case int64(rpc.LatestBlockNumber):
-		blockNumber = int64(e.val)
-	case int64(rpc.SafeBlockNumber):
-		blockNumber = int64(e.val) - 6
-	case int64(rpc.FinalizedBlockNumber):
-		blockNumber = int64(e.val) - 12
-	default:
-		blockNumber = number.Int64()
-	}
-	if blockNumber < 0 {
-		blockNumber = 0
-	}
-
-	return &types.Header{Number: new(big.Int).SetInt64(blockNumber)}, nil
-}
-
-func TestGetLatestConfirmedBlockNumber(t *testing.T) {
-	ctx := context.Background()
-	client := MockEthClient{}
-
-	testCases := []struct {
-		blockNumber    uint64
-		confirmation   rpc.BlockNumber
-		expectedResult uint64
-	}{
-		{5, 6, 0},
-		{7, 6, 1},
-		{10, 2, 8},
-		{0, 1, 0},
-		{3, 0, 3},
-		{15, 15, 0},
-		{16, rpc.SafeBlockNumber, 10},
-		{22, rpc.FinalizedBlockNumber, 10},
-		{10, rpc.LatestBlockNumber, 10},
-		{5, rpc.SafeBlockNumber, 0},
-		{11, rpc.FinalizedBlockNumber, 0},
-	}
-
-	for _, testCase := range testCases {
-		client.val = testCase.blockNumber
-		confirmed, err := GetLatestConfirmedBlockNumber(ctx, &client, testCase.confirmation)
-		assert.NoError(t, err)
-		assert.Equal(t, testCase.expectedResult, confirmed)
-	}
-}

bridge/utils/utils.go

@@ -1,65 +0,0 @@
-package utils
-
-import (
-	"fmt"
-	"math/big"
-
-	"github.com/scroll-tech/go-ethereum/accounts/abi"
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/scroll-tech/go-ethereum/crypto"
-
-	bridgeabi "scroll-tech/bridge/abi"
-)
-
-// Keccak2 compute the keccack256 of two concatenations of bytes32
-func Keccak2(a common.Hash, b common.Hash) common.Hash {
-	return common.BytesToHash(crypto.Keccak256(append(a.Bytes()[:], b.Bytes()[:]...)))
-}
-
-// ComputeMessageHash compute the message hash
-func ComputeMessageHash(
-	sender common.Address,
-	target common.Address,
-	value *big.Int,
-	messageNonce *big.Int,
-	message []byte,
-) common.Hash {
-	data, _ := bridgeabi.L2ScrollMessengerABI.Pack("relayMessage", sender, target, value, messageNonce, message)
-	return common.BytesToHash(crypto.Keccak256(data))
-}
-
-// BufferToUint256Le convert bytes array to uint256 array assuming little-endian
-func BufferToUint256Le(buffer []byte) []*big.Int {
-	buffer256 := make([]*big.Int, len(buffer)/32)
-	for i := 0; i < len(buffer)/32; i++ {
-		v := big.NewInt(0)
-		shft := big.NewInt(1)
-		for j := 0; j < 32; j++ {
-			v = new(big.Int).Add(v, new(big.Int).Mul(shft, big.NewInt(int64(buffer[i*32+j]))))
-			shft = new(big.Int).Mul(shft, big.NewInt(256))
-		}
-		buffer256[i] = v
-	}
-	return buffer256
-}
-
-// UnpackLog unpacks a retrieved log into the provided output structure.
-// @todo: add unit test.
-func UnpackLog(c *abi.ABI, out interface{}, event string, log types.Log) error {
-	if log.Topics[0] != c.Events[event].ID {
-		return fmt.Errorf("event signature mismatch")
-	}
-	if len(log.Data) > 0 {
-		if err := c.UnpackIntoInterface(out, event, log.Data); err != nil {
-			return err
-		}
-	}
-	var indexed abi.Arguments
-	for _, arg := range c.Events[event].Inputs {
-		if arg.Indexed {
-			indexed = append(indexed, arg)
-		}
-	}
-	return abi.ParseTopics(out, indexed, log.Topics[1:])
-}

bridge/utils/utils_test.go

@@ -1,49 +0,0 @@
-package utils
-
-import (
-	"math/big"
-	"testing"
-
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestKeccak2(t *testing.T) {
-	hash := Keccak2(common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000000"), common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000000"))
-	if hash != common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5") {
-		t.Fatalf("Invalid keccak, want %s, got %s", "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5", hash.Hex())
-	}
-
-	hash = Keccak2(common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5"), common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5"))
-	if hash != common.HexToHash("0xb4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d30") {
-		t.Fatalf("Invalid keccak, want %s, got %s", "0xb4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d30", hash.Hex())
-	}
-
-	hash = Keccak2(common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000001"), common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000002"))
-	if hash != common.HexToHash("0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0") {
-		t.Fatalf("Invalid keccak, want %s, got %s", "0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0", hash.Hex())
-	}
-}
-
-func TestComputeMessageHash(t *testing.T) {
-	hash := ComputeMessageHash(
-		common.HexToAddress("0x1C5A77d9FA7eF466951B2F01F724BCa3A5820b63"),
-		common.HexToAddress("0x4592D8f8D7B001e72Cb26A73e4Fa1806a51aC79d"),
-		big.NewInt(0),
-		big.NewInt(1),
-		[]byte("testbridgecontract"),
-	)
-	assert.Equal(t, "0xda253c04595a49017bb54b1b46088c69752b5ad2f0c47971ac76b8b25abec202", hash.String())
-}
-
-func TestBufferToUint256Le(t *testing.T) {
-	input := []byte{
-		0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	}
-	expectedOutput := []*big.Int{big.NewInt(1)}
-	result := BufferToUint256Le(input)
-	assert.Equal(t, expectedOutput, result)
-}

bridge/watcher/batch_proposer.go

@@ -1,408 +0,0 @@
-package watcher
-
-import (
-	"context"
-	"fmt"
-	"math"
-	"sync"
-	"time"
-
-	"github.com/scroll-tech/go-ethereum/log"
-	geth_metrics "github.com/scroll-tech/go-ethereum/metrics"
-
-	"scroll-tech/common/metrics"
-	"scroll-tech/common/types"
-
-	"scroll-tech/database"
-
-	bridgeabi "scroll-tech/bridge/abi"
-	"scroll-tech/bridge/config"
-	"scroll-tech/bridge/relayer"
-)
-
-var (
-	bridgeL2BatchesGasOverThresholdTotalCounter = geth_metrics.NewRegisteredCounter("bridge/l2/batches/gas/over/threshold/total", metrics.ScrollRegistry)
-	bridgeL2BatchesTxsOverThresholdTotalCounter = geth_metrics.NewRegisteredCounter("bridge/l2/batches/txs/over/threshold/total", metrics.ScrollRegistry)
-	bridgeL2BatchesBlocksCreatedTotalCounter    = geth_metrics.NewRegisteredCounter("bridge/l2/batches/blocks/created/total", metrics.ScrollRegistry)
-	bridgeL2BatchesCommitsSentTotalCounter      = geth_metrics.NewRegisteredCounter("bridge/l2/batches/commits/sent/total", metrics.ScrollRegistry)
-
-	bridgeL2BatchesTxsCreatedPerBatchGauge = geth_metrics.NewRegisteredGauge("bridge/l2/batches/txs/created/per/batch", metrics.ScrollRegistry)
-	bridgeL2BatchesGasCreatedPerBatchGauge = geth_metrics.NewRegisteredGauge("bridge/l2/batches/gas/created/per/batch", metrics.ScrollRegistry)
-)
-
-// AddBatchInfoToDB inserts the batch information to the BlockBatch table and updates the batch_hash
-// in all blocks included in the batch.
-func AddBatchInfoToDB(db database.OrmFactory, batchData *types.BatchData) error {
-	dbTx, err := db.Beginx()
-	if err != nil {
-		return err
-	}
-
-	var dbTxErr error
-	defer func() {
-		if dbTxErr != nil {
-			if err := dbTx.Rollback(); err != nil {
-				log.Error("dbTx.Rollback()", "err", err)
-			}
-		}
-	}()
-
-	if dbTxErr = db.NewBatchInDBTx(dbTx, batchData); 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 {
-		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
-	commitCalldataMinSize    uint64
-
-	proofGenerationFreq uint64
-	batchDataBuffer     []*types.BatchData
-	relayer             *relayer.Layer2Relayer
-
-	piCfg *types.PublicInputHashConfig
-}
-
-// NewBatchProposer will return a new instance of BatchProposer.
-func NewBatchProposer(ctx context.Context, cfg *config.BatchProposerConfig, relayer *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,
-		commitCalldataMinSize:    cfg.CommitTxCalldataMinSize,
-		batchDataBufferSizeLimit: 100*cfg.CommitTxCalldataSizeLimit + 1*1024*1024, // @todo: determine the value.
-		proofGenerationFreq:      cfg.ProofGenerationFreq,
-		piCfg:                    cfg.PublicInputConfig,
-		relayer:                  relayer,
-	}
-
-	// for graceful restart.
-	p.recoverBatchDataBuffer()
-
-	// try to commit the leftover pending batches
-	p.TryCommitBatches()
-
-	return p
-}
-
-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)
-	}
-}
-
-// TryProposeBatch will try to propose a batch.
-func (p *BatchProposer) TryProposeBatch() {
-	p.mutex.Lock()
-	defer p.mutex.Unlock()
-
-	for 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
-		}
-
-		batchCreated := p.proposeBatch(blocks)
-
-		// while size of batchDataBuffer < commitCalldataMinSize,
-		// proposer keeps fetching and porposing batches.
-		if p.getBatchDataBufferSize() >= p.commitCalldataMinSize {
-			return
-		}
-
-		if !batchCreated {
-			// wait for watcher to insert l2 traces.
-			time.Sleep(time.Second)
-		}
-	}
-}
-
-// TryCommitBatches will try to commit the pending batches.
-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
-		bridgeL2BatchesCommitsSentTotalCounter.Inc(1)
-		p.batchDataBuffer = p.batchDataBuffer[index:]
-	}
-}
-
-func (p *BatchProposer) proposeBatch(blocks []*types.BlockInfo) bool {
-	if len(blocks) == 0 {
-		return false
-	}
-
-	approximatePayloadSize := func(hash string) (uint64, error) {
-		traces, err := p.orm.GetL2WrappedBlocks(map[string]interface{}{"hash": hash})
-		if err != nil {
-			return 0, err
-		}
-		if len(traces) != 1 {
-			return 0, fmt.Errorf("unexpected traces length, expected = 1, actual = %d", len(traces))
-		}
-		size := 0
-		for _, tx := range traces[0].Transactions {
-			size += len(tx.Data)
-		}
-		return uint64(size), nil
-	}
-
-	firstSize, err := approximatePayloadSize(blocks[0].Hash)
-	if err != nil {
-		log.Error("failed to create batch", "number", blocks[0].Number, "err", err)
-		return false
-	}
-
-	if firstSize > p.commitCalldataSizeLimit {
-		log.Warn("oversized payload even for only 1 block", "height", blocks[0].Number, "size", firstSize)
-		// note: we should probably fail here once we can ensure this will not happen
-		if err := p.createBatchForBlocks(blocks[:1]); err != nil {
-			log.Error("failed to create batch", "number", blocks[0].Number, "err", err)
-			return false
-		}
-		bridgeL2BatchesTxsCreatedPerBatchGauge.Update(int64(blocks[0].TxNum))
-		bridgeL2BatchesGasCreatedPerBatchGauge.Update(int64(blocks[0].GasUsed))
-		bridgeL2BatchesBlocksCreatedTotalCounter.Inc(1)
-		return true
-	}
-
-	if blocks[0].GasUsed > p.batchGasThreshold {
-		bridgeL2BatchesGasOverThresholdTotalCounter.Inc(1)
-		log.Warn("gas overflow even for only 1 block", "height", blocks[0].Number, "gas", blocks[0].GasUsed)
-		if err := p.createBatchForBlocks(blocks[:1]); err != nil {
-			log.Error("failed to create batch", "number", blocks[0].Number, "err", err)
-		} else {
-			bridgeL2BatchesTxsCreatedPerBatchGauge.Update(int64(blocks[0].TxNum))
-			bridgeL2BatchesGasCreatedPerBatchGauge.Update(int64(blocks[0].GasUsed))
-			bridgeL2BatchesBlocksCreatedTotalCounter.Inc(1)
-		}
-		return true
-	}
-
-	if blocks[0].TxNum > p.batchTxNumThreshold {
-		bridgeL2BatchesTxsOverThresholdTotalCounter.Inc(1)
-		log.Warn("too many txs even for only 1 block", "height", blocks[0].Number, "tx_num", blocks[0].TxNum)
-		if err := p.createBatchForBlocks(blocks[:1]); err != nil {
-			log.Error("failed to create batch", "number", blocks[0].Number, "err", err)
-		} else {
-			bridgeL2BatchesTxsCreatedPerBatchGauge.Update(int64(blocks[0].TxNum))
-			bridgeL2BatchesGasCreatedPerBatchGauge.Update(int64(blocks[0].GasUsed))
-			bridgeL2BatchesBlocksCreatedTotalCounter.Inc(1)
-		}
-		return true
-	}
-
-	var gasUsed, txNum, payloadSize uint64
-	reachThreshold := false
-	// add blocks into batch until reach batchGasThreshold
-	for i, block := range blocks {
-		size, err := approximatePayloadSize(block.Hash)
-		if err != nil {
-			log.Error("failed to create batch", "number", block.Number, "err", err)
-			return false
-		}
-
-		if (gasUsed+block.GasUsed > p.batchGasThreshold) || (txNum+block.TxNum > p.batchTxNumThreshold) || (payloadSize+size > p.commitCalldataSizeLimit) {
-			blocks = blocks[:i]
-			reachThreshold = true
-			break
-		}
-		gasUsed += block.GasUsed
-		txNum += block.TxNum
-		payloadSize += size
-	}
-
-	// 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 false
-	}
-
-	if err := p.createBatchForBlocks(blocks); err != nil {
-		log.Error("failed to create batch", "from", blocks[0].Number, "to", blocks[len(blocks)-1].Number, "err", err)
-	} else {
-		bridgeL2BatchesTxsCreatedPerBatchGauge.Update(int64(txNum))
-		bridgeL2BatchesGasCreatedPerBatchGauge.Update(int64(gasUsed))
-		bridgeL2BatchesBlocksCreatedTotalCounter.Inc(int64(len(blocks)))
-	}
-
-	return true
-}
-
-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 wrappedBlocks []*types.WrappedBlock
-	for _, block := range blocks {
-		trs, err := p.orm.GetL2WrappedBlocks(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
-		}
-		wrappedBlocks = append(wrappedBlocks, trs[0])
-	}
-	return types.NewBatchData(parentBatch, wrappedBlocks, p.piCfg), nil
-}
-
-func (p *BatchProposer) getBatchDataBufferSize() (size uint64) {
-	for _, batchData := range p.batchDataBuffer {
-		size += bridgeabi.GetBatchCalldataLength(&batchData.Batch)
-	}
-	return
-}

bridge/watcher/batch_proposer_test.go

@@ -1,199 +0,0 @@
-package watcher
-
-import (
-	"context"
-	"fmt"
-	"math"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/agiledragon/gomonkey/v2"
-	"github.com/scroll-tech/go-ethereum/common"
-	geth_types "github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/stretchr/testify/assert"
-
-	"scroll-tech/database"
-	"scroll-tech/database/migrate"
-
-	"scroll-tech/bridge/config"
-	"scroll-tech/bridge/relayer"
-
-	"scroll-tech/common/types"
-)
-
-func testBatchProposerProposeBatch(t *testing.T) {
-	// Create db handler and reset db.
-	db, err := database.NewOrmFactory(cfg.DBConfig)
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
-	defer db.Close()
-
-	p := &BatchProposer{
-		batchGasThreshold:       1000,
-		batchTxNumThreshold:     10,
-		batchTimeSec:            300,
-		commitCalldataSizeLimit: 500,
-		orm:                     db,
-	}
-	patchGuard := gomonkey.ApplyMethodFunc(p.orm, "GetL2WrappedBlocks", func(fields map[string]interface{}, args ...string) ([]*types.WrappedBlock, error) {
-		hash, _ := fields["hash"].(string)
-		if hash == "blockWithLongData" {
-			longData := strings.Repeat("0", 1000)
-			return []*types.WrappedBlock{{
-				Transactions: []*geth_types.TransactionData{{
-					Data: longData,
-				}},
-			}}, nil
-		}
-		return []*types.WrappedBlock{{
-			Transactions: []*geth_types.TransactionData{{
-				Data: "short",
-			}},
-		}}, nil
-	})
-	defer patchGuard.Reset()
-	patchGuard.ApplyPrivateMethod(p, "createBatchForBlocks", func(*BatchProposer, []*types.BlockInfo) error {
-		return nil
-	})
-
-	block1 := &types.BlockInfo{Number: 1, GasUsed: 100, TxNum: 1, BlockTimestamp: uint64(time.Now().Unix()) - 200}
-	block2 := &types.BlockInfo{Number: 2, GasUsed: 200, TxNum: 2, BlockTimestamp: uint64(time.Now().Unix())}
-	block3 := &types.BlockInfo{Number: 3, GasUsed: 300, TxNum: 11, BlockTimestamp: uint64(time.Now().Unix())}
-	block4 := &types.BlockInfo{Number: 4, GasUsed: 1001, TxNum: 3, BlockTimestamp: uint64(time.Now().Unix())}
-	blockOutdated := &types.BlockInfo{Number: 1, GasUsed: 100, TxNum: 1, BlockTimestamp: uint64(time.Now().Add(-400 * time.Second).Unix())}
-	blockWithLongData := &types.BlockInfo{Hash: "blockWithLongData", Number: 5, GasUsed: 500, TxNum: 1, BlockTimestamp: uint64(time.Now().Unix())}
-
-	testCases := []struct {
-		description string
-		blocks      []*types.BlockInfo
-		expectedRes bool
-	}{
-		{"Empty block list", []*types.BlockInfo{}, false},
-		{"Single block exceeding gas threshold", []*types.BlockInfo{block4}, true},
-		{"Single block exceeding transaction number threshold", []*types.BlockInfo{block3}, true},
-		{"Multiple blocks meeting thresholds", []*types.BlockInfo{block1, block2, block3}, true},
-		{"Multiple blocks not meeting thresholds", []*types.BlockInfo{block1, block2}, false},
-		{"Outdated and valid block", []*types.BlockInfo{blockOutdated, block2}, true},
-		{"Single block with long data", []*types.BlockInfo{blockWithLongData}, true},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.description, func(t *testing.T) {
-			assert.Equal(t, tc.expectedRes, p.proposeBatch(tc.blocks), "Failed on: %s", tc.description)
-		})
-	}
-}
-
-func testBatchProposerBatchGeneration(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))
-	ctx := context.Background()
-	subCtx, cancel := context.WithCancel(ctx)
-
-	defer func() {
-		cancel()
-		db.Close()
-	}()
-
-	// Insert traces into db.
-	assert.NoError(t, db.InsertWrappedBlocks([]*types.WrappedBlock{wrappedBlock1}))
-
-	l2cfg := cfg.L2Config
-	wc := NewL2WatcherClient(context.Background(), l2Cli, l2cfg.Confirmations, l2cfg.L2MessengerAddress, l2cfg.L2MessageQueueAddress, l2cfg.WithdrawTrieRootSlot, db)
-	loopToFetchEvent(subCtx, wc)
-
-	batch, err := db.GetLatestBatch()
-	assert.NoError(t, err)
-
-	// Create a new batch.
-	batchData := types.NewBatchData(&types.BlockBatch{
-		Index:     0,
-		Hash:      batch.Hash,
-		StateRoot: batch.StateRoot,
-	}, []*types.WrappedBlock{wrappedBlock1}, nil)
-
-	relayer, err := relayer.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(batchData.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 := relayer.NewLayer2Relayer(context.Background(), l2Cli, db, cfg.L2Config.RelayerConfig)
-	assert.NoError(t, err)
-
-	// Insert traces into db.
-	assert.NoError(t, db.InsertWrappedBlocks([]*types.WrappedBlock{wrappedBlock2}))
-
-	// Insert block batch into db.
-	batchData1 := types.NewBatchData(&types.BlockBatch{
-		Index:     0,
-		Hash:      common.Hash{}.String(),
-		StateRoot: common.Hash{}.String(),
-	}, []*types.WrappedBlock{wrappedBlock1}, nil)
-
-	parentBatch2 := &types.BlockBatch{
-		Index:     batchData1.Batch.BatchIndex,
-		Hash:      batchData1.Hash().Hex(),
-		StateRoot: batchData1.Batch.NewStateRoot.String(),
-	}
-	batchData2 := types.NewBatchData(parentBatch2, []*types.WrappedBlock{wrappedBlock2}, nil)
-
-	dbTx, err := db.Beginx()
-	assert.NoError(t, err)
-	assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData1))
-	assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData2))
-	assert.NoError(t, db.SetBatchHashForL2BlocksInDBTx(dbTx, []uint64{
-		batchData1.Batch.Blocks[0].BlockNumber}, batchData1.Hash().Hex()))
-	assert.NoError(t, db.SetBatchHashForL2BlocksInDBTx(dbTx, []uint64{
-		batchData2.Batch.Blocks[0].BlockNumber}, batchData2.Hash().Hex()))
-	assert.NoError(t, dbTx.Commit())
-
-	assert.NoError(t, db.UpdateRollupStatus(context.Background(), batchData1.Hash().Hex(), types.RollupFinalized))
-
-	batchHashes, err := db.GetPendingBatches(math.MaxInt32)
-	assert.NoError(t, err)
-	assert.Equal(t, 1, len(batchHashes))
-	assert.Equal(t, batchData2.Hash().Hex(), batchHashes[0])
-	// test p.recoverBatchDataBuffer().
-	_ = NewBatchProposer(context.Background(), &config.BatchProposerConfig{
-		ProofGenerationFreq: 1,
-		BatchGasThreshold:   3000000,
-		BatchTxNumThreshold: 135,
-		BatchTimeSec:        1,
-		BatchBlocksLimit:    100,
-	}, relayer, db)
-
-	batchHashes, err = db.GetPendingBatches(math.MaxInt32)
-	assert.NoError(t, err)
-	assert.Equal(t, 0, len(batchHashes))
-
-	exist, err := db.BatchRecordExist(batchData2.Hash().Hex())
-	assert.NoError(t, err)
-	assert.Equal(t, true, exist)
-}

bridge/watcher/common.go

@@ -1,11 +0,0 @@
-package watcher
-
-import "github.com/scroll-tech/go-ethereum/common"
-
-const contractEventsBlocksFetchLimit = int64(10)
-
-type relayedMessage struct {
-	msgHash      common.Hash
-	txHash       common.Hash
-	isSuccessful bool
-}

bridge/watcher/l1_watcher.go

@@ -1,378 +0,0 @@
-package watcher
-
-import (
-	"context"
-	"math/big"
-
-	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/ethclient"
-	"github.com/scroll-tech/go-ethereum/log"
-	geth_metrics "github.com/scroll-tech/go-ethereum/metrics"
-	"github.com/scroll-tech/go-ethereum/rpc"
-
-	"scroll-tech/common/metrics"
-	"scroll-tech/common/types"
-
-	"scroll-tech/database"
-
-	bridge_abi "scroll-tech/bridge/abi"
-	"scroll-tech/bridge/utils"
-)
-
-var (
-	bridgeL1MsgsSyncHeightGauge = geth_metrics.NewRegisteredGauge("bridge/l1/msgs/sync/height", metrics.ScrollRegistry)
-
-	bridgeL1MsgsSentEventsTotalCounter    = geth_metrics.NewRegisteredCounter("bridge/l1/msgs/sent/events/total", metrics.ScrollRegistry)
-	bridgeL1MsgsRelayedEventsTotalCounter = geth_metrics.NewRegisteredCounter("bridge/l1/msgs/relayed/events/total", metrics.ScrollRegistry)
-	bridgeL1MsgsRollupEventsTotalCounter  = geth_metrics.NewRegisteredCounter("bridge/l1/msgs/rollup/events/total", metrics.ScrollRegistry)
-)
-
-type rollupEvent struct {
-	batchHash common.Hash
-	txHash    common.Hash
-	status    types.RollupStatus
-}
-
-// L1WatcherClient will listen for smart contract events from Eth L1.
-type L1WatcherClient struct {
-	ctx    context.Context
-	client *ethclient.Client
-	db     database.OrmFactory
-
-	// The number of new blocks to wait for a block to be confirmed
-	confirmations rpc.BlockNumber
-
-	messengerAddress common.Address
-	messengerABI     *abi.ABI
-
-	messageQueueAddress common.Address
-	messageQueueABI     *abi.ABI
-
-	scrollChainAddress common.Address
-	scrollChainABI     *abi.ABI
-
-	// The height of the block that the watcher has retrieved event logs
-	processedMsgHeight uint64
-	// The height of the block that the watcher has retrieved header rlp
-	processedBlockHeight uint64
-}
-
-// NewL1WatcherClient returns a new instance of L1WatcherClient.
-func NewL1WatcherClient(ctx context.Context, client *ethclient.Client, startHeight uint64, confirmations rpc.BlockNumber, messengerAddress, messageQueueAddress, scrollChainAddress common.Address, db database.OrmFactory) *L1WatcherClient {
-	savedHeight, err := db.GetLayer1LatestWatchedHeight()
-	if err != nil {
-		log.Warn("Failed to fetch height from db", "err", err)
-		savedHeight = 0
-	}
-	if savedHeight < int64(startHeight) {
-		savedHeight = int64(startHeight)
-	}
-
-	savedL1BlockHeight, err := db.GetLatestL1BlockHeight()
-	if err != nil {
-		log.Warn("Failed to fetch latest L1 block height from db", "err", err)
-		savedL1BlockHeight = 0
-	}
-	if savedL1BlockHeight < startHeight {
-		savedL1BlockHeight = startHeight
-	}
-
-	return &L1WatcherClient{
-		ctx:           ctx,
-		client:        client,
-		db:            db,
-		confirmations: confirmations,
-
-		messengerAddress: messengerAddress,
-		messengerABI:     bridge_abi.L1ScrollMessengerABI,
-
-		messageQueueAddress: messageQueueAddress,
-		messageQueueABI:     bridge_abi.L1MessageQueueABI,
-
-		scrollChainAddress: scrollChainAddress,
-		scrollChainABI:     bridge_abi.ScrollChainABI,
-
-		processedMsgHeight:   uint64(savedHeight),
-		processedBlockHeight: savedL1BlockHeight,
-	}
-}
-
-// ProcessedBlockHeight get processedBlockHeight
-// Currently only use for unit test
-func (w *L1WatcherClient) ProcessedBlockHeight() uint64 {
-	return w.processedBlockHeight
-}
-
-// Confirmations get confirmations
-// Currently only use for unit test
-func (w *L1WatcherClient) Confirmations() rpc.BlockNumber {
-	return w.confirmations
-}
-
-// SetConfirmations set the confirmations for L1WatcherClient
-// Currently only use for unit test
-func (w *L1WatcherClient) SetConfirmations(confirmations rpc.BlockNumber) {
-	w.confirmations = confirmations
-}
-
-// FetchBlockHeader pull latest L1 blocks and save in DB
-func (w *L1WatcherClient) FetchBlockHeader(blockHeight uint64) error {
-	fromBlock := int64(w.processedBlockHeight) + 1
-	toBlock := int64(blockHeight)
-	if toBlock < fromBlock {
-		return nil
-	}
-	if toBlock > fromBlock+contractEventsBlocksFetchLimit {
-		toBlock = fromBlock + contractEventsBlocksFetchLimit - 1
-	}
-
-	var blocks []*types.L1BlockInfo
-	var err error
-	height := fromBlock
-	for ; height <= toBlock; height++ {
-		var block *geth_types.Header
-		block, err = w.client.HeaderByNumber(w.ctx, big.NewInt(height))
-		if err != nil {
-			log.Warn("Failed to get block", "height", height, "err", err)
-			break
-		}
-		blocks = append(blocks, &types.L1BlockInfo{
-			Number:  uint64(height),
-			Hash:    block.Hash().String(),
-			BaseFee: block.BaseFee.Uint64(),
-		})
-	}
-
-	// failed at first block, return with the error
-	if height == fromBlock {
-		return err
-	}
-	toBlock = height - 1
-
-	// insert succeed blocks
-	err = w.db.InsertL1Blocks(w.ctx, blocks)
-	if err != nil {
-		log.Warn("Failed to insert L1 block to db", "fromBlock", fromBlock, "toBlock", toBlock, "err", err)
-		return err
-	}
-
-	// update processed height
-	w.processedBlockHeight = uint64(toBlock)
-	return nil
-}
-
-// FetchContractEvent pull latest event logs from given contract address and save in DB
-func (w *L1WatcherClient) FetchContractEvent() error {
-	defer func() {
-		log.Info("l1 watcher fetchContractEvent", "w.processedMsgHeight", w.processedMsgHeight)
-	}()
-	blockHeight, err := utils.GetLatestConfirmedBlockNumber(w.ctx, w.client, w.confirmations)
-	if err != nil {
-		log.Error("failed to get block number", "err", err)
-		return err
-	}
-
-	fromBlock := int64(w.processedMsgHeight) + 1
-	toBlock := int64(blockHeight)
-
-	for from := fromBlock; from <= toBlock; from += contractEventsBlocksFetchLimit {
-		to := from + contractEventsBlocksFetchLimit - 1
-
-		if to > toBlock {
-			to = toBlock
-		}
-
-		// warning: uint int conversion...
-		query := geth.FilterQuery{
-			FromBlock: big.NewInt(from), // inclusive
-			ToBlock:   big.NewInt(to),   // inclusive
-			Addresses: []common.Address{
-				w.messengerAddress,
-				w.scrollChainAddress,
-				w.messageQueueAddress,
-			},
-			Topics: make([][]common.Hash, 1),
-		}
-		query.Topics[0] = make([]common.Hash, 5)
-		query.Topics[0][0] = bridge_abi.L1QueueTransactionEventSignature
-		query.Topics[0][1] = bridge_abi.L1RelayedMessageEventSignature
-		query.Topics[0][2] = bridge_abi.L1FailedRelayedMessageEventSignature
-		query.Topics[0][3] = bridge_abi.L1CommitBatchEventSignature
-		query.Topics[0][4] = bridge_abi.L1FinalizeBatchEventSignature
-
-		logs, err := w.client.FilterLogs(w.ctx, query)
-		if err != nil {
-			log.Warn("Failed to get event logs", "err", err)
-			return err
-		}
-		if len(logs) == 0 {
-			w.processedMsgHeight = uint64(to)
-			bridgeL1MsgsSyncHeightGauge.Update(to)
-			continue
-		}
-		log.Info("Received new L1 events", "fromBlock", from, "toBlock", to, "cnt", len(logs))
-
-		sentMessageEvents, relayedMessageEvents, rollupEvents, err := w.parseBridgeEventLogs(logs)
-		if err != nil {
-			log.Error("Failed to parse emitted events log", "err", err)
-			return err
-		}
-		sentMessageCount := int64(len(sentMessageEvents))
-		relayedMessageCount := int64(len(relayedMessageEvents))
-		rollupEventCount := int64(len(rollupEvents))
-		bridgeL1MsgsSentEventsTotalCounter.Inc(sentMessageCount)
-		bridgeL1MsgsRelayedEventsTotalCounter.Inc(relayedMessageCount)
-		bridgeL1MsgsRollupEventsTotalCounter.Inc(rollupEventCount)
-		log.Info("L1 events types", "SentMessageCount", sentMessageCount, "RelayedMessageCount", relayedMessageCount, "RollupEventCount", rollupEventCount)
-
-		// use rollup event to update rollup results db status
-		var batchHashes []string
-		for _, event := range rollupEvents {
-			batchHashes = append(batchHashes, event.batchHash.String())
-		}
-		statuses, err := w.db.GetRollupStatusByHashList(batchHashes)
-		if err != nil {
-			log.Error("Failed to GetRollupStatusByHashList", "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))
-			return nil
-		}
-
-		for index, event := range rollupEvents {
-			batchHash := event.batchHash.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 err != nil {
-					log.Error("Failed to update Rollup/Finalize TxHash and Status", "err", err)
-					return err
-				}
-			}
-		}
-
-		// 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
-			} else {
-				msgStatus = types.MsgFailed
-			}
-			if err = w.db.UpdateLayer2StatusAndLayer1Hash(w.ctx, msg.msgHash.String(), msgStatus, msg.txHash.String()); err != nil {
-				log.Error("Failed to update layer1 status and layer2 hash", "err", err)
-				return err
-			}
-		}
-
-		if err = w.db.SaveL1Messages(w.ctx, sentMessageEvents); err != nil {
-			return err
-		}
-
-		w.processedMsgHeight = uint64(to)
-		bridgeL1MsgsSyncHeightGauge.Update(to)
-	}
-
-	return nil
-}
-
-func (w *L1WatcherClient) parseBridgeEventLogs(logs []geth_types.Log) ([]*types.L1Message, []relayedMessage, []rollupEvent, error) {
-	// Need use contract abi to parse event Log
-	// Can only be tested after we have our contracts set up
-
-	var l1Messages []*types.L1Message
-	var relayedMessages []relayedMessage
-	var rollupEvents []rollupEvent
-	for _, vLog := range logs {
-		switch vLog.Topics[0] {
-		case bridge_abi.L1QueueTransactionEventSignature:
-			event := bridge_abi.L1QueueTransactionEvent{}
-			err := utils.UnpackLog(w.messageQueueABI, &event, "QueueTransaction", vLog)
-			if err != nil {
-				log.Warn("Failed to unpack layer1 QueueTransaction event", "err", err)
-				return l1Messages, relayedMessages, rollupEvents, err
-			}
-
-			msgHash := common.BytesToHash(crypto.Keccak256(event.Data))
-
-			l1Messages = append(l1Messages, &types.L1Message{
-				QueueIndex: event.QueueIndex.Uint64(),
-				MsgHash:    msgHash.String(),
-				Height:     vLog.BlockNumber,
-				Sender:     event.Sender.String(),
-				Value:      event.Value.String(),
-				Target:     event.Target.String(),
-				Calldata:   common.Bytes2Hex(event.Data),
-				GasLimit:   event.GasLimit.Uint64(),
-				Layer1Hash: vLog.TxHash.Hex(),
-			})
-		case bridge_abi.L1RelayedMessageEventSignature:
-			event := bridge_abi.L1RelayedMessageEvent{}
-			err := utils.UnpackLog(w.messengerABI, &event, "RelayedMessage", vLog)
-			if err != nil {
-				log.Warn("Failed to unpack layer1 RelayedMessage event", "err", err)
-				return l1Messages, relayedMessages, rollupEvents, err
-			}
-
-			relayedMessages = append(relayedMessages, relayedMessage{
-				msgHash:      event.MessageHash,
-				txHash:       vLog.TxHash,
-				isSuccessful: true,
-			})
-		case bridge_abi.L1FailedRelayedMessageEventSignature:
-			event := bridge_abi.L1FailedRelayedMessageEvent{}
-			err := utils.UnpackLog(w.messengerABI, &event, "FailedRelayedMessage", vLog)
-			if err != nil {
-				log.Warn("Failed to unpack layer1 FailedRelayedMessage event", "err", err)
-				return l1Messages, relayedMessages, rollupEvents, err
-			}
-
-			relayedMessages = append(relayedMessages, relayedMessage{
-				msgHash:      event.MessageHash,
-				txHash:       vLog.TxHash,
-				isSuccessful: false,
-			})
-		case bridge_abi.L1CommitBatchEventSignature:
-			event := bridge_abi.L1CommitBatchEvent{}
-			err := utils.UnpackLog(w.scrollChainABI, &event, "CommitBatch", vLog)
-			if err != nil {
-				log.Warn("Failed to unpack layer1 CommitBatch event", "err", err)
-				return l1Messages, relayedMessages, rollupEvents, err
-			}
-
-			rollupEvents = append(rollupEvents, rollupEvent{
-				batchHash: event.BatchHash,
-				txHash:    vLog.TxHash,
-				status:    types.RollupCommitted,
-			})
-		case bridge_abi.L1FinalizeBatchEventSignature:
-			event := bridge_abi.L1FinalizeBatchEvent{}
-			err := utils.UnpackLog(w.scrollChainABI, &event, "FinalizeBatch", vLog)
-			if err != nil {
-				log.Warn("Failed to unpack layer1 FinalizeBatch event", "err", err)
-				return l1Messages, relayedMessages, rollupEvents, err
-			}
-
-			rollupEvents = append(rollupEvents, rollupEvent{
-				batchHash: event.BatchHash,
-				txHash:    vLog.TxHash,
-				status:    types.RollupFinalized,
-			})
-		default:
-			log.Error("Unknown event", "topic", vLog.Topics[0], "txHash", vLog.TxHash)
-		}
-	}
-
-	return l1Messages, relayedMessages, rollupEvents, nil
-}

bridge/watcher/l1_watcher_test.go

@@ -1,514 +0,0 @@
-package watcher
-
-import (
-	"context"
-	"errors"
-	"math/big"
-	"testing"
-
-	"github.com/agiledragon/gomonkey/v2"
-	"github.com/scroll-tech/go-ethereum"
-	"github.com/scroll-tech/go-ethereum/accounts/abi"
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/core/types"
-	geth_types "github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/scroll-tech/go-ethereum/ethclient"
-	"github.com/scroll-tech/go-ethereum/rpc"
-	"github.com/smartystreets/goconvey/convey"
-	"github.com/stretchr/testify/assert"
-
-	bridge_abi "scroll-tech/bridge/abi"
-	"scroll-tech/bridge/utils"
-
-	commonTypes "scroll-tech/common/types"
-
-	"scroll-tech/database"
-	"scroll-tech/database/migrate"
-)
-
-func setupL1Watcher(t *testing.T) (*L1WatcherClient, database.OrmFactory) {
-	db, err := database.NewOrmFactory(cfg.DBConfig)
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
-
-	client, err := ethclient.Dial(base.L1gethImg.Endpoint())
-	assert.NoError(t, err)
-
-	l1Cfg := cfg.L1Config
-
-	watcher := NewL1WatcherClient(context.Background(), client, l1Cfg.StartHeight, l1Cfg.Confirmations, l1Cfg.L1MessengerAddress, l1Cfg.L1MessageQueueAddress, l1Cfg.RelayerConfig.RollupContractAddress, db)
-	assert.NoError(t, watcher.FetchContractEvent())
-	return watcher, db
-}
-
-func testFetchContractEvent(t *testing.T) {
-	watcher, db := setupL1Watcher(t)
-	defer db.Close()
-	assert.NoError(t, watcher.FetchContractEvent())
-}
-
-func testL1WatcherClientFetchBlockHeader(t *testing.T) {
-	watcher, db := setupL1Watcher(t)
-	defer db.Close()
-	convey.Convey("test toBlock < fromBlock", t, func() {
-		var blockHeight uint64
-		if watcher.ProcessedBlockHeight() <= 0 {
-			blockHeight = 0
-		} else {
-			blockHeight = watcher.ProcessedBlockHeight() - 1
-		}
-		err := watcher.FetchBlockHeader(blockHeight)
-		assert.NoError(t, err)
-	})
-
-	convey.Convey("test get header from client error", t, func() {
-		var c *ethclient.Client
-		patchGuard := gomonkey.ApplyMethodFunc(c, "HeaderByNumber", func(ctx context.Context, height *big.Int) (*types.Header, error) {
-			return nil, ethereum.NotFound
-		})
-		defer patchGuard.Reset()
-
-		var blockHeight uint64 = 10
-		err := watcher.FetchBlockHeader(blockHeight)
-		assert.Error(t, err)
-	})
-
-	convey.Convey("insert l1 block error", t, func() {
-		var c *ethclient.Client
-		patchGuard := gomonkey.ApplyMethodFunc(c, "HeaderByNumber", func(ctx context.Context, height *big.Int) (*types.Header, error) {
-			if height == nil {
-				height = big.NewInt(100)
-			}
-			t.Log(height)
-			return &types.Header{
-				BaseFee: big.NewInt(100),
-			}, nil
-		})
-		defer patchGuard.Reset()
-
-		patchGuard.ApplyMethodFunc(db, "InsertL1Blocks", func(ctx context.Context, blocks []*commonTypes.L1BlockInfo) error {
-			return errors.New("insert failed")
-		})
-
-		var blockHeight uint64 = 10
-		err := watcher.FetchBlockHeader(blockHeight)
-		assert.Error(t, err)
-	})
-
-	convey.Convey("fetch block header success", t, func() {
-		var c *ethclient.Client
-		patchGuard := gomonkey.ApplyMethodFunc(c, "HeaderByNumber", func(ctx context.Context, height *big.Int) (*types.Header, error) {
-			if height == nil {
-				height = big.NewInt(100)
-			}
-			t.Log(height)
-			return &types.Header{
-				BaseFee: big.NewInt(100),
-			}, nil
-		})
-		defer patchGuard.Reset()
-
-		patchGuard.ApplyMethodFunc(db, "InsertL1Blocks", func(ctx context.Context, blocks []*commonTypes.L1BlockInfo) error {
-			return nil
-		})
-
-		var blockHeight uint64 = 10
-		err := watcher.FetchBlockHeader(blockHeight)
-		assert.NoError(t, err)
-	})
-}
-
-func testL1WatcherClientFetchContractEvent(t *testing.T) {
-	watcher, db := setupL1Watcher(t)
-	defer db.Close()
-
-	watcher.SetConfirmations(rpc.SafeBlockNumber)
-	convey.Convey("get latest confirmed block number failure", t, func() {
-		var c *ethclient.Client
-		patchGuard := gomonkey.ApplyMethodFunc(c, "HeaderByNumber", func(ctx context.Context, height *big.Int) (*types.Header, error) {
-			return nil, ethereum.NotFound
-		})
-		defer patchGuard.Reset()
-		err := watcher.FetchContractEvent()
-		assert.Error(t, err)
-	})
-
-	var c *ethclient.Client
-	patchGuard := gomonkey.ApplyMethodFunc(c, "HeaderByNumber", func(ctx context.Context, height *big.Int) (*types.Header, error) {
-		if height == nil {
-			height = big.NewInt(100)
-		}
-		t.Log(height)
-		return &types.Header{
-			Number:  big.NewInt(100),
-			BaseFee: big.NewInt(100),
-		}, nil
-	})
-	defer patchGuard.Reset()
-
-	convey.Convey("filter logs failure", t, func() {
-		targetErr := errors.New("call filter failure")
-		patchGuard.ApplyMethodFunc(c, "FilterLogs", func(ctx context.Context, q ethereum.FilterQuery) ([]types.Log, error) {
-			return nil, targetErr
-		})
-		err := watcher.FetchContractEvent()
-		assert.EqualError(t, err, targetErr.Error())
-	})
-
-	patchGuard.ApplyMethodFunc(c, "FilterLogs", func(ctx context.Context, q ethereum.FilterQuery) ([]types.Log, error) {
-		return []types.Log{
-			{
-				Address: common.HexToAddress("0x0000000000000000000000000000000000000000"),
-			},
-		}, nil
-	})
-
-	convey.Convey("parse bridge event logs failure", t, func() {
-		targetErr := errors.New("parse log failure")
-		patchGuard.ApplyPrivateMethod(watcher, "parseBridgeEventLogs", func(*L1WatcherClient, []geth_types.Log) ([]*commonTypes.L1Message, []relayedMessage, []rollupEvent, error) {
-			return nil, nil, nil, targetErr
-		})
-		err := watcher.FetchContractEvent()
-		assert.Equal(t, err.Error(), targetErr.Error())
-	})
-
-	patchGuard.ApplyPrivateMethod(watcher, "parseBridgeEventLogs", func(*L1WatcherClient, []geth_types.Log) ([]*commonTypes.L1Message, []relayedMessage, []rollupEvent, error) {
-		rollupEvents := []rollupEvent{
-			{
-				batchHash: common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-				txHash:    common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5"),
-				status:    commonTypes.RollupFinalized,
-			},
-			{
-				batchHash: common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5"),
-				txHash:    common.HexToHash("0xb4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d30"),
-				status:    commonTypes.RollupCommitted,
-			},
-		}
-
-		relayedMessageEvents := []relayedMessage{
-			{
-				msgHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-				txHash:       common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5"),
-				isSuccessful: true,
-			},
-			{
-				msgHash:      common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5"),
-				txHash:       common.HexToHash("0xb4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d30"),
-				isSuccessful: false,
-			},
-		}
-		return nil, relayedMessageEvents, rollupEvents, nil
-	})
-
-	convey.Convey("db get rollup status by hash list failure", t, func() {
-		targetErr := errors.New("get db failure")
-		patchGuard.ApplyMethodFunc(db, "GetRollupStatusByHashList", func(hashes []string) ([]commonTypes.RollupStatus, error) {
-			return nil, targetErr
-		})
-		err := watcher.FetchContractEvent()
-		assert.Equal(t, err.Error(), targetErr.Error())
-	})
-
-	convey.Convey("rollup status mismatch batch hashes length", t, func() {
-		patchGuard.ApplyMethodFunc(db, "GetRollupStatusByHashList", func(hashes []string) ([]commonTypes.RollupStatus, error) {
-			s := []commonTypes.RollupStatus{
-				commonTypes.RollupFinalized,
-			}
-			return s, nil
-		})
-		err := watcher.FetchContractEvent()
-		assert.NoError(t, err)
-	})
-
-	patchGuard.ApplyMethodFunc(db, "GetRollupStatusByHashList", func(hashes []string) ([]commonTypes.RollupStatus, error) {
-		s := []commonTypes.RollupStatus{
-			commonTypes.RollupPending,
-			commonTypes.RollupCommitting,
-		}
-		return s, nil
-	})
-
-	convey.Convey("db update RollupFinalized status failure", t, func() {
-		targetErr := errors.New("UpdateFinalizeTxHashAndRollupStatus RollupFinalized failure")
-		patchGuard.ApplyMethodFunc(db, "UpdateFinalizeTxHashAndRollupStatus", func(context.Context, string, string, commonTypes.RollupStatus) error {
-			return targetErr
-		})
-		err := watcher.FetchContractEvent()
-		assert.Equal(t, targetErr.Error(), err.Error())
-	})
-
-	patchGuard.ApplyMethodFunc(db, "UpdateFinalizeTxHashAndRollupStatus", func(context.Context, string, string, commonTypes.RollupStatus) error {
-		return nil
-	})
-
-	convey.Convey("db update RollupCommitted status failure", t, func() {
-		targetErr := errors.New("UpdateCommitTxHashAndRollupStatus RollupCommitted failure")
-		patchGuard.ApplyMethodFunc(db, "UpdateCommitTxHashAndRollupStatus", func(context.Context, string, string, commonTypes.RollupStatus) error {
-			return targetErr
-		})
-		err := watcher.FetchContractEvent()
-		assert.Equal(t, targetErr.Error(), err.Error())
-	})
-
-	patchGuard.ApplyMethodFunc(db, "UpdateCommitTxHashAndRollupStatus", func(context.Context, string, string, commonTypes.RollupStatus) error {
-		return nil
-	})
-
-	convey.Convey("db update layer2 status and layer1 hash failure", t, func() {
-		targetErr := errors.New("UpdateLayer2StatusAndLayer1Hash failure")
-		patchGuard.ApplyMethodFunc(db, "UpdateLayer2StatusAndLayer1Hash", func(context.Context, string, commonTypes.MsgStatus, string) error {
-			return targetErr
-		})
-		err := watcher.FetchContractEvent()
-		assert.Equal(t, targetErr.Error(), err.Error())
-	})
-
-	patchGuard.ApplyMethodFunc(db, "UpdateLayer2StatusAndLayer1Hash", func(context.Context, string, commonTypes.MsgStatus, string) error {
-		return nil
-	})
-
-	convey.Convey("db save l1 message failure", t, func() {
-		targetErr := errors.New("SaveL1Messages failure")
-		patchGuard.ApplyMethodFunc(db, "SaveL1Messages", func(context.Context, []*commonTypes.L1Message) error {
-			return targetErr
-		})
-		err := watcher.FetchContractEvent()
-		assert.Equal(t, targetErr.Error(), err.Error())
-	})
-
-	patchGuard.ApplyMethodFunc(db, "SaveL1Messages", func(context.Context, []*commonTypes.L1Message) error {
-		return nil
-	})
-
-	convey.Convey("FetchContractEvent success", t, func() {
-		err := watcher.FetchContractEvent()
-		assert.NoError(t, err)
-	})
-}
-
-func testParseBridgeEventLogsL1QueueTransactionEventSignature(t *testing.T) {
-	watcher, db := setupL1Watcher(t)
-	defer db.Close()
-
-	logs := []geth_types.Log{
-		{
-			Topics:      []common.Hash{bridge_abi.L1QueueTransactionEventSignature},
-			BlockNumber: 100,
-			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-		},
-	}
-
-	convey.Convey("unpack QueueTransaction log failure", t, func() {
-		targetErr := errors.New("UnpackLog QueueTransaction failure")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log types.Log) error {
-			return targetErr
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
-		assert.EqualError(t, err, targetErr.Error())
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-		assert.Empty(t, rollupEvents)
-	})
-
-	convey.Convey("L1QueueTransactionEventSignature success", t, func() {
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log types.Log) error {
-			tmpOut := out.(*bridge_abi.L1QueueTransactionEvent)
-			tmpOut.QueueIndex = big.NewInt(100)
-			tmpOut.Data = []byte("test data")
-			tmpOut.Sender = common.HexToAddress("0xb4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d30")
-			tmpOut.Value = big.NewInt(1000)
-			tmpOut.Target = common.HexToAddress("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5")
-			tmpOut.GasLimit = big.NewInt(10)
-			return nil
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
-		assert.NoError(t, err)
-		assert.Empty(t, relayedMessages)
-		assert.Empty(t, rollupEvents)
-		assert.Len(t, l2Messages, 1)
-		assert.Equal(t, l2Messages[0].Value, big.NewInt(1000).String())
-	})
-}
-
-func testParseBridgeEventLogsL1RelayedMessageEventSignature(t *testing.T) {
-	watcher, db := setupL1Watcher(t)
-	defer db.Close()
-
-	logs := []geth_types.Log{
-		{
-			Topics:      []common.Hash{bridge_abi.L1RelayedMessageEventSignature},
-			BlockNumber: 100,
-			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-		},
-	}
-
-	convey.Convey("unpack RelayedMessage log failure", t, func() {
-		targetErr := errors.New("UnpackLog RelayedMessage failure")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log types.Log) error {
-			return targetErr
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
-		assert.EqualError(t, err, targetErr.Error())
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-		assert.Empty(t, rollupEvents)
-	})
-
-	convey.Convey("L1RelayedMessageEventSignature success", t, func() {
-		msgHash := common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log types.Log) error {
-			tmpOut := out.(*bridge_abi.L1RelayedMessageEvent)
-			tmpOut.MessageHash = msgHash
-			return nil
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
-		assert.NoError(t, err)
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, rollupEvents)
-		assert.Len(t, relayedMessages, 1)
-		assert.Equal(t, relayedMessages[0].msgHash, msgHash)
-	})
-}
-
-func testParseBridgeEventLogsL1FailedRelayedMessageEventSignature(t *testing.T) {
-	watcher, db := setupL1Watcher(t)
-	defer db.Close()
-
-	logs := []geth_types.Log{
-		{
-			Topics:      []common.Hash{bridge_abi.L1FailedRelayedMessageEventSignature},
-			BlockNumber: 100,
-			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-		},
-	}
-
-	convey.Convey("unpack FailedRelayedMessage log failure", t, func() {
-		targetErr := errors.New("UnpackLog FailedRelayedMessage failure")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log types.Log) error {
-			return targetErr
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
-		assert.EqualError(t, err, targetErr.Error())
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-		assert.Empty(t, rollupEvents)
-	})
-
-	convey.Convey("L1FailedRelayedMessageEventSignature success", t, func() {
-		msgHash := common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log types.Log) error {
-			tmpOut := out.(*bridge_abi.L1FailedRelayedMessageEvent)
-			tmpOut.MessageHash = msgHash
-			return nil
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
-		assert.NoError(t, err)
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, rollupEvents)
-		assert.Len(t, relayedMessages, 1)
-		assert.Equal(t, relayedMessages[0].msgHash, msgHash)
-	})
-}
-
-func testParseBridgeEventLogsL1CommitBatchEventSignature(t *testing.T) {
-	watcher, db := setupL1Watcher(t)
-	defer db.Close()
-
-	logs := []geth_types.Log{
-		{
-			Topics:      []common.Hash{bridge_abi.L1CommitBatchEventSignature},
-			BlockNumber: 100,
-			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-		},
-	}
-
-	convey.Convey("unpack CommitBatch log failure", t, func() {
-		targetErr := errors.New("UnpackLog CommitBatch failure")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log types.Log) error {
-			return targetErr
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
-		assert.EqualError(t, err, targetErr.Error())
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-		assert.Empty(t, rollupEvents)
-	})
-
-	convey.Convey("L1CommitBatchEventSignature success", t, func() {
-		msgHash := common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log types.Log) error {
-			tmpOut := out.(*bridge_abi.L1CommitBatchEvent)
-			tmpOut.BatchHash = msgHash
-			return nil
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
-		assert.NoError(t, err)
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-		assert.Len(t, rollupEvents, 1)
-		assert.Equal(t, rollupEvents[0].batchHash, msgHash)
-		assert.Equal(t, rollupEvents[0].status, commonTypes.RollupCommitted)
-	})
-}
-
-func testParseBridgeEventLogsL1FinalizeBatchEventSignature(t *testing.T) {
-	watcher, db := setupL1Watcher(t)
-	defer db.Close()
-
-	logs := []geth_types.Log{
-		{
-			Topics:      []common.Hash{bridge_abi.L1FinalizeBatchEventSignature},
-			BlockNumber: 100,
-			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-		},
-	}
-
-	convey.Convey("unpack FinalizeBatch log failure", t, func() {
-		targetErr := errors.New("UnpackLog FinalizeBatch failure")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log types.Log) error {
-			return targetErr
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
-		assert.EqualError(t, err, targetErr.Error())
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-		assert.Empty(t, rollupEvents)
-	})
-
-	convey.Convey("L1FinalizeBatchEventSignature success", t, func() {
-		msgHash := common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log types.Log) error {
-			tmpOut := out.(*bridge_abi.L1FinalizeBatchEvent)
-			tmpOut.BatchHash = msgHash
-			return nil
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
-		assert.NoError(t, err)
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-		assert.Len(t, rollupEvents, 1)
-		assert.Equal(t, rollupEvents[0].batchHash, msgHash)
-		assert.Equal(t, rollupEvents[0].status, commonTypes.RollupFinalized)
-	})
-}

bridge/watcher/l2_watcher.go

@@ -1,406 +0,0 @@
-package watcher
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"math/big"
-
-	geth "github.com/scroll-tech/go-ethereum"
-	"github.com/scroll-tech/go-ethereum/accounts/abi"
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/common/hexutil"
-	geth_types "github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/scroll-tech/go-ethereum/ethclient"
-	"github.com/scroll-tech/go-ethereum/event"
-	"github.com/scroll-tech/go-ethereum/log"
-	geth_metrics "github.com/scroll-tech/go-ethereum/metrics"
-	"github.com/scroll-tech/go-ethereum/rpc"
-
-	"scroll-tech/common/metrics"
-	"scroll-tech/common/types"
-
-	"scroll-tech/database"
-
-	bridge_abi "scroll-tech/bridge/abi"
-	"scroll-tech/bridge/utils"
-)
-
-// Metrics
-var (
-	bridgeL2MsgsSyncHeightGauge      = geth_metrics.NewRegisteredGauge("bridge/l2/msgs/sync/height", metrics.ScrollRegistry)
-	bridgeL2BlocksFetchedHeightGauge = geth_metrics.NewRegisteredGauge("bridge/l2/blocks/fetched/height", metrics.ScrollRegistry)
-	bridgeL2BlocksFetchedGapGauge    = geth_metrics.NewRegisteredGauge("bridge/l2/blocks/fetched/gap", metrics.ScrollRegistry)
-
-	bridgeL2MsgsSentEventsTotalCounter    = geth_metrics.NewRegisteredCounter("bridge/l2/msgs/sent/events/total", metrics.ScrollRegistry)
-	bridgeL2MsgsAppendEventsTotalCounter  = geth_metrics.NewRegisteredCounter("bridge/l2/msgs/append/events/total", metrics.ScrollRegistry)
-	bridgeL2MsgsRelayedEventsTotalCounter = geth_metrics.NewRegisteredCounter("bridge/l2/msgs/relayed/events/total", metrics.ScrollRegistry)
-)
-
-// L2WatcherClient provide APIs which support others to subscribe to various event from l2geth
-type L2WatcherClient struct {
-	ctx context.Context
-	event.Feed
-
-	*ethclient.Client
-
-	orm database.OrmFactory
-
-	confirmations rpc.BlockNumber
-
-	messengerAddress common.Address
-	messengerABI     *abi.ABI
-
-	messageQueueAddress  common.Address
-	messageQueueABI      *abi.ABI
-	withdrawTrieRootSlot common.Hash
-
-	// The height of the block that the watcher has retrieved event logs
-	processedMsgHeight uint64
-
-	stopped uint64
-}
-
-// 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, withdrawTrieRootSlot common.Hash, orm database.OrmFactory) *L2WatcherClient {
-	savedHeight, err := orm.GetLayer2LatestWatchedHeight()
-	if err != nil {
-		log.Warn("fetch height from db failed", "err", err)
-		savedHeight = 0
-	}
-
-	w := L2WatcherClient{
-		ctx:                ctx,
-		Client:             client,
-		orm:                orm,
-		processedMsgHeight: uint64(savedHeight),
-		confirmations:      confirmations,
-
-		messengerAddress: messengerAddress,
-		messengerABI:     bridge_abi.L2ScrollMessengerABI,
-
-		messageQueueAddress:  messageQueueAddress,
-		messageQueueABI:      bridge_abi.L2MessageQueueABI,
-		withdrawTrieRootSlot: withdrawTrieRootSlot,
-
-		stopped: 0,
-	}
-
-	// Initialize genesis before we do anything else
-	if err := w.initializeGenesis(); err != nil {
-		panic(fmt.Sprintf("failed to initialize L2 genesis batch, err: %v", err))
-	}
-
-	return &w
-}
-
-func (w *L2WatcherClient) 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 := &types.WrappedBlock{Header: genesis, Transactions: nil, WithdrawTrieRoot: common.Hash{}}
-	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
-}
-
-const blockTracesFetchLimit = uint64(10)
-
-// TryFetchRunningMissingBlocks try fetch missing blocks if inconsistent
-func (w *L2WatcherClient) TryFetchRunningMissingBlocks(ctx context.Context, blockHeight uint64) {
-	// Get newest block in DB. must have blocks at that time.
-	// Don't use "block_trace" table "trace" column's BlockTrace.Number,
-	// because it might be empty if the corresponding rollup_result is finalized/finalization_skipped
-	heightInDB, err := w.orm.GetL2BlocksLatestHeight()
-	if err != nil {
-		log.Error("failed to GetL2BlocksLatestHeight", "err", err)
-		return
-	}
-
-	// Can't get trace from genesis block, so the default start number is 1.
-	var from = uint64(1)
-	if heightInDB > 0 {
-		from = uint64(heightInDB) + 1
-	}
-
-	for ; from <= blockHeight; from += blockTracesFetchLimit {
-		to := from + blockTracesFetchLimit - 1
-
-		if to > blockHeight {
-			to = blockHeight
-		}
-
-		// Get block traces and insert into db.
-		if err = w.getAndStoreBlockTraces(ctx, from, to); err != nil {
-			log.Error("fail to getAndStoreBlockTraces", "from", from, "to", to, "err", err)
-			return
-		}
-		bridgeL2BlocksFetchedHeightGauge.Update(int64(to))
-		bridgeL2BlocksFetchedGapGauge.Update(int64(blockHeight - to))
-	}
-}
-
-func txsToTxsData(txs geth_types.Transactions) []*geth_types.TransactionData {
-	txsData := make([]*geth_types.TransactionData, len(txs))
-	for i, tx := range txs {
-		v, r, s := tx.RawSignatureValues()
-		txsData[i] = &geth_types.TransactionData{
-			Type:     tx.Type(),
-			TxHash:   tx.Hash().String(),
-			Nonce:    tx.Nonce(),
-			ChainId:  (*hexutil.Big)(tx.ChainId()),
-			Gas:      tx.Gas(),
-			GasPrice: (*hexutil.Big)(tx.GasPrice()),
-			To:       tx.To(),
-			Value:    (*hexutil.Big)(tx.Value()),
-			Data:     hexutil.Encode(tx.Data()),
-			IsCreate: tx.To() == nil,
-			V:        (*hexutil.Big)(v),
-			R:        (*hexutil.Big)(r),
-			S:        (*hexutil.Big)(s),
-		}
-	}
-	return txsData
-}
-
-func (w *L2WatcherClient) getAndStoreBlockTraces(ctx context.Context, from, to uint64) error {
-	var blocks []*types.WrappedBlock
-
-	for number := from; number <= to; number++ {
-		log.Debug("retrieving block", "height", number)
-		block, err2 := w.BlockByNumber(ctx, big.NewInt(int64(number)))
-		if err2 != nil {
-			return fmt.Errorf("failed to GetBlockByNumber: %v. number: %v", err2, number)
-		}
-
-		log.Info("retrieved block", "height", block.Header().Number, "hash", block.Header().Hash().String())
-
-		withdrawTrieRoot, err3 := w.StorageAt(ctx, w.messageQueueAddress, w.withdrawTrieRootSlot, big.NewInt(int64(number)))
-		if err3 != nil {
-			return fmt.Errorf("failed to get withdrawTrieRoot: %v. number: %v", err3, number)
-		}
-
-		blocks = append(blocks, &types.WrappedBlock{
-			Header:           block.Header(),
-			Transactions:     txsToTxsData(block.Transactions()),
-			WithdrawTrieRoot: common.BytesToHash(withdrawTrieRoot),
-		})
-	}
-
-	if len(blocks) > 0 {
-		if err := w.orm.InsertWrappedBlocks(blocks); err != nil {
-			return fmt.Errorf("failed to batch insert BlockTraces: %v", err)
-		}
-	}
-
-	return nil
-}
-
-// FetchContractEvent pull latest event logs from given contract address and save in DB
-func (w *L2WatcherClient) FetchContractEvent() {
-	defer func() {
-		log.Info("l2 watcher fetchContractEvent", "w.processedMsgHeight", w.processedMsgHeight)
-	}()
-
-	blockHeight, err := utils.GetLatestConfirmedBlockNumber(w.ctx, w.Client, w.confirmations)
-	if err != nil {
-		log.Error("failed to get block number", "err", err)
-		return
-	}
-
-	fromBlock := int64(w.processedMsgHeight) + 1
-	toBlock := int64(blockHeight)
-
-	for from := fromBlock; from <= toBlock; from += contractEventsBlocksFetchLimit {
-		to := from + contractEventsBlocksFetchLimit - 1
-
-		if to > toBlock {
-			to = toBlock
-		}
-
-		// warning: uint int conversion...
-		query := geth.FilterQuery{
-			FromBlock: big.NewInt(from), // inclusive
-			ToBlock:   big.NewInt(to),   // inclusive
-			Addresses: []common.Address{
-				w.messengerAddress,
-				w.messageQueueAddress,
-			},
-			Topics: make([][]common.Hash, 1),
-		}
-		query.Topics[0] = make([]common.Hash, 4)
-		query.Topics[0][0] = bridge_abi.L2SentMessageEventSignature
-		query.Topics[0][1] = bridge_abi.L2RelayedMessageEventSignature
-		query.Topics[0][2] = bridge_abi.L2FailedRelayedMessageEventSignature
-		query.Topics[0][3] = bridge_abi.L2AppendMessageEventSignature
-
-		logs, err := w.FilterLogs(w.ctx, query)
-		if err != nil {
-			log.Error("failed to get event logs", "err", err)
-			return
-		}
-		if len(logs) == 0 {
-			w.processedMsgHeight = uint64(to)
-			bridgeL2MsgsSyncHeightGauge.Update(to)
-			continue
-		}
-		log.Info("received new L2 messages", "fromBlock", from, "toBlock", to, "cnt", len(logs))
-
-		sentMessageEvents, relayedMessageEvents, err := w.parseBridgeEventLogs(logs)
-		if err != nil {
-			log.Error("failed to parse emitted event log", "err", err)
-			return
-		}
-
-		sentMessageCount := int64(len(sentMessageEvents))
-		relayedMessageCount := int64(len(relayedMessageEvents))
-		bridgeL2MsgsSentEventsTotalCounter.Inc(sentMessageCount)
-		bridgeL2MsgsRelayedEventsTotalCounter.Inc(relayedMessageCount)
-		log.Info("L2 events types", "SentMessageCount", sentMessageCount, "RelayedMessageCount", relayedMessageCount)
-
-		// Update relayed message first to make sure we don't forget to update submited message.
-		// Since, we always start sync from the latest unprocessed message.
-		for _, msg := range relayedMessageEvents {
-			var msgStatus types.MsgStatus
-			if msg.isSuccessful {
-				msgStatus = types.MsgConfirmed
-			} else {
-				msgStatus = types.MsgFailed
-			}
-			if err = w.orm.UpdateLayer1StatusAndLayer2Hash(w.ctx, msg.msgHash.String(), msgStatus, msg.txHash.String()); err != nil {
-				log.Error("Failed to update layer1 status and layer2 hash", "err", err)
-				return
-			}
-		}
-
-		if err = w.orm.SaveL2Messages(w.ctx, sentMessageEvents); err != nil {
-			log.Error("failed to save l2 messages", "err", err)
-			return
-		}
-
-		w.processedMsgHeight = uint64(to)
-		bridgeL2MsgsSyncHeightGauge.Update(to)
-	}
-}
-
-func (w *L2WatcherClient) parseBridgeEventLogs(logs []geth_types.Log) ([]*types.L2Message, []relayedMessage, error) {
-	// Need use contract abi to parse event Log
-	// Can only be tested after we have our contracts set up
-
-	var l2Messages []*types.L2Message
-	var relayedMessages []relayedMessage
-	var lastAppendMsgHash common.Hash
-	var lastAppendMsgNonce uint64
-	for _, vLog := range logs {
-		switch vLog.Topics[0] {
-		case bridge_abi.L2SentMessageEventSignature:
-			event := bridge_abi.L2SentMessageEvent{}
-			err := utils.UnpackLog(w.messengerABI, &event, "SentMessage", vLog)
-			if err != nil {
-				log.Error("failed to unpack layer2 SentMessage event", "err", err)
-				return l2Messages, relayedMessages, err
-			}
-
-			computedMsgHash := utils.ComputeMessageHash(
-				event.Sender,
-				event.Target,
-				event.Value,
-				event.MessageNonce,
-				event.Message,
-			)
-
-			// `AppendMessage` event is always emitted before `SentMessage` event
-			// So they should always match, just double check
-			if event.MessageNonce.Uint64() != lastAppendMsgNonce {
-				errMsg := fmt.Sprintf("l2 message nonces mismatch: AppendMessage.nonce=%v, SentMessage.nonce=%v, tx_hash=%v",
-					lastAppendMsgNonce, event.MessageNonce.Uint64(), vLog.TxHash.Hex())
-				return l2Messages, relayedMessages, errors.New(errMsg)
-			}
-			if computedMsgHash != lastAppendMsgHash {
-				errMsg := fmt.Sprintf("l2 message hashes mismatch: AppendMessage.msg_hash=%v, SentMessage.msg_hash=%v, tx_hash=%v",
-					lastAppendMsgHash.Hex(), computedMsgHash.Hex(), vLog.TxHash.Hex())
-				return l2Messages, relayedMessages, errors.New(errMsg)
-			}
-
-			l2Messages = append(l2Messages, &types.L2Message{
-				Nonce:      event.MessageNonce.Uint64(),
-				MsgHash:    computedMsgHash.String(),
-				Height:     vLog.BlockNumber,
-				Sender:     event.Sender.String(),
-				Value:      event.Value.String(),
-				Target:     event.Target.String(),
-				Calldata:   common.Bytes2Hex(event.Message),
-				Layer2Hash: vLog.TxHash.Hex(),
-			})
-		case bridge_abi.L2RelayedMessageEventSignature:
-			event := bridge_abi.L2RelayedMessageEvent{}
-			err := utils.UnpackLog(w.messengerABI, &event, "RelayedMessage", vLog)
-			if err != nil {
-				log.Warn("Failed to unpack layer2 RelayedMessage event", "err", err)
-				return l2Messages, relayedMessages, err
-			}
-
-			relayedMessages = append(relayedMessages, relayedMessage{
-				msgHash:      event.MessageHash,
-				txHash:       vLog.TxHash,
-				isSuccessful: true,
-			})
-		case bridge_abi.L2FailedRelayedMessageEventSignature:
-			event := bridge_abi.L2FailedRelayedMessageEvent{}
-			err := utils.UnpackLog(w.messengerABI, &event, "FailedRelayedMessage", vLog)
-			if err != nil {
-				log.Warn("Failed to unpack layer2 FailedRelayedMessage event", "err", err)
-				return l2Messages, relayedMessages, err
-			}
-
-			relayedMessages = append(relayedMessages, relayedMessage{
-				msgHash:      event.MessageHash,
-				txHash:       vLog.TxHash,
-				isSuccessful: false,
-			})
-		case bridge_abi.L2AppendMessageEventSignature:
-			event := bridge_abi.L2AppendMessageEvent{}
-			err := utils.UnpackLog(w.messageQueueABI, &event, "AppendMessage", vLog)
-			if err != nil {
-				log.Warn("Failed to unpack layer2 AppendMessage event", "err", err)
-				return l2Messages, relayedMessages, err
-			}
-
-			lastAppendMsgHash = event.MessageHash
-			lastAppendMsgNonce = event.Index.Uint64()
-			bridgeL2MsgsAppendEventsTotalCounter.Inc(1)
-		default:
-			log.Error("Unknown event", "topic", vLog.Topics[0], "txHash", vLog.TxHash)
-		}
-	}
-
-	return l2Messages, relayedMessages, nil
-}

bridge/watcher/l2_watcher_test.go

@@ -1,442 +0,0 @@
-package watcher
-
-import (
-	"context"
-	"crypto/ecdsa"
-	"errors"
-	"math/big"
-	"strconv"
-	"testing"
-	"time"
-
-	"github.com/agiledragon/gomonkey/v2"
-	"github.com/scroll-tech/go-ethereum/accounts/abi"
-	"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/ethclient"
-	"github.com/scroll-tech/go-ethereum/rpc"
-	"github.com/smartystreets/goconvey/convey"
-	"github.com/stretchr/testify/assert"
-
-	"scroll-tech/common/types"
-
-	bridge_abi "scroll-tech/bridge/abi"
-	"scroll-tech/bridge/mock_bridge"
-	"scroll-tech/bridge/sender"
-	"scroll-tech/bridge/utils"
-
-	cutils "scroll-tech/common/utils"
-
-	"scroll-tech/database"
-	"scroll-tech/database/migrate"
-)
-
-func setupL2Watcher(t *testing.T) *L2WatcherClient {
-	db, err := database.NewOrmFactory(cfg.DBConfig)
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
-	defer db.Close()
-
-	l2cfg := cfg.L2Config
-	watcher := NewL2WatcherClient(context.Background(), l2Cli, l2cfg.Confirmations, l2cfg.L2MessengerAddress, l2cfg.L2MessageQueueAddress, l2cfg.WithdrawTrieRootSlot, db)
-	return watcher
-}
-
-func testCreateNewWatcherAndStop(t *testing.T) {
-	// Create db handler and reset db.
-	l2db, err := database.NewOrmFactory(cfg.DBConfig)
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(l2db.GetDB().DB))
-	ctx := context.Background()
-	subCtx, cancel := context.WithCancel(ctx)
-	defer func() {
-		cancel()
-		l2db.Close()
-	}()
-
-	l2cfg := cfg.L2Config
-	wc := NewL2WatcherClient(context.Background(), l2Cli, l2cfg.Confirmations, l2cfg.L2MessengerAddress, l2cfg.L2MessageQueueAddress, l2cfg.WithdrawTrieRootSlot, l2db)
-	loopToFetchEvent(subCtx, wc)
-
-	l1cfg := cfg.L1Config
-	l1cfg.RelayerConfig.SenderConfig.Confirmations = rpc.LatestBlockNumber
-	newSender, err := sender.NewSender(context.Background(), l1cfg.RelayerConfig.SenderConfig, l1cfg.RelayerConfig.MessageSenderPrivateKeys)
-	assert.NoError(t, err)
-
-	// Create several transactions and commit to block
-	numTransactions := 3
-	toAddress := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
-	for i := 0; i < numTransactions; i++ {
-		_, err = newSender.SendTransaction(strconv.Itoa(1000+i), &toAddress, big.NewInt(1000000000), nil, 0)
-		assert.NoError(t, err)
-		<-newSender.ConfirmChan()
-	}
-
-	blockNum, err := l2Cli.BlockNumber(context.Background())
-	assert.NoError(t, err)
-	assert.GreaterOrEqual(t, blockNum, uint64(numTransactions))
-}
-
-func testMonitorBridgeContract(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))
-	ctx := context.Background()
-	subCtx, cancel := context.WithCancel(ctx)
-
-	defer func() {
-		cancel()
-		db.Close()
-	}()
-
-	l2cfg := cfg.L2Config
-	wc := NewL2WatcherClient(context.Background(), l2Cli, l2cfg.Confirmations, l2cfg.L2MessengerAddress, l2cfg.L2MessageQueueAddress, l2cfg.WithdrawTrieRootSlot, db)
-	loopToFetchEvent(subCtx, wc)
-
-	previousHeight, err := l2Cli.BlockNumber(context.Background())
-	assert.NoError(t, err)
-
-	auth := prepareAuth(t, l2Cli, cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys[0])
-
-	// deploy mock bridge
-	_, tx, instance, err := mock_bridge.DeployMockBridgeL2(auth, l2Cli)
-	assert.NoError(t, err)
-	address, err := bind.WaitDeployed(context.Background(), l2Cli, tx)
-	assert.NoError(t, err)
-
-	rc := prepareWatcherClient(l2Cli, db, address)
-	loopToFetchEvent(subCtx, rc)
-	// Call mock_bridge instance sendMessage to trigger emit events
-	toAddress := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
-	message := []byte("testbridgecontract")
-	fee := big.NewInt(0)
-	gasLimit := big.NewInt(1)
-
-	tx, err = instance.SendMessage(auth, toAddress, fee, message, gasLimit)
-	assert.NoError(t, err)
-	receipt, err := bind.WaitMined(context.Background(), l2Cli, tx)
-	if receipt.Status != geth_types.ReceiptStatusSuccessful || err != nil {
-		t.Fatalf("Call failed")
-	}
-
-	// extra block mined
-	toAddress = common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
-	message = []byte("testbridgecontract")
-	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 {
-		t.Fatalf("Call failed")
-	}
-
-	// wait for dealing time
-	<-time.After(6 * time.Second)
-
-	var latestHeight uint64
-	latestHeight, err = l2Cli.BlockNumber(context.Background())
-	assert.NoError(t, err)
-	t.Log("Latest height is", latestHeight)
-
-	// check if we successfully stored events
-	height, err := db.GetLayer2LatestWatchedHeight()
-	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})
-	assert.NoError(t, err)
-	assert.Equal(t, 2, len(msgs))
-}
-
-func testFetchMultipleSentMessageInOneBlock(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))
-	ctx := context.Background()
-	subCtx, cancel := context.WithCancel(ctx)
-
-	defer func() {
-		cancel()
-		db.Close()
-	}()
-
-	previousHeight, err := l2Cli.BlockNumber(context.Background()) // shallow the global previousHeight
-	assert.NoError(t, err)
-
-	auth := prepareAuth(t, l2Cli, cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys[0])
-
-	_, trx, instance, err := mock_bridge.DeployMockBridgeL2(auth, l2Cli)
-	assert.NoError(t, err)
-	address, err := bind.WaitDeployed(context.Background(), l2Cli, trx)
-	assert.NoError(t, err)
-
-	wc := prepareWatcherClient(l2Cli, db, address)
-	loopToFetchEvent(subCtx, wc)
-
-	// Call mock_bridge instance sendMessage to trigger emit events multiple times
-	numTransactions := 4
-	var tx *geth_types.Transaction
-
-	for i := 0; i < numTransactions; i++ {
-		addr := common.HexToAddress("0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63")
-		nonce, nounceErr := l2Cli.PendingNonceAt(context.Background(), addr)
-		assert.NoError(t, nounceErr)
-		auth.Nonce = big.NewInt(int64(nonce))
-		toAddress := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
-		message := []byte("testbridgecontract")
-		fee := big.NewInt(0)
-		gasLimit := big.NewInt(1)
-		tx, err = instance.SendMessage(auth, toAddress, fee, message, gasLimit)
-		assert.NoError(t, err)
-	}
-
-	receipt, err := bind.WaitMined(context.Background(), l2Cli, tx)
-	if receipt.Status != geth_types.ReceiptStatusSuccessful || err != nil {
-		t.Fatalf("Call failed")
-	}
-
-	// extra block mined
-	addr := common.HexToAddress("0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63")
-	nonce, nounceErr := l2Cli.PendingNonceAt(context.Background(), addr)
-	assert.NoError(t, nounceErr)
-	auth.Nonce = big.NewInt(int64(nonce))
-	toAddress := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
-	message := []byte("testbridgecontract")
-	fee := big.NewInt(0)
-	gasLimit := big.NewInt(1)
-	tx, err = instance.SendMessage(auth, toAddress, fee, message, gasLimit)
-	assert.NoError(t, err)
-	receipt, err = bind.WaitMined(context.Background(), l2Cli, tx)
-	if receipt.Status != geth_types.ReceiptStatusSuccessful || err != nil {
-		t.Fatalf("Call failed")
-	}
-
-	// wait for dealing time
-	<-time.After(6 * time.Second)
-
-	// check if we successfully stored events
-	height, err := db.GetLayer2LatestWatchedHeight()
-	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})
-	assert.NoError(t, err)
-	assert.Equal(t, 5, len(msgs))
-}
-
-func testFetchRunningMissingBlocks(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()
-
-	auth := prepareAuth(t, l2Cli, cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys[0])
-
-	// deploy mock bridge
-	_, tx, _, err := mock_bridge.DeployMockBridgeL2(auth, l2Cli)
-	assert.NoError(t, err)
-	address, err := bind.WaitDeployed(context.Background(), l2Cli, tx)
-	assert.NoError(t, err)
-
-	// wait for dealing time
-	<-time.After(3 * time.Second)
-
-	latestHeight, err := l2Cli.BlockNumber(context.Background())
-	assert.NoError(t, err)
-	wc := prepareWatcherClient(l2Cli, db, address)
-	wc.TryFetchRunningMissingBlocks(context.Background(), latestHeight)
-	fetchedHeight, err := db.GetL2BlocksLatestHeight()
-	assert.NoError(t, err)
-	assert.Equal(t, uint64(fetchedHeight), latestHeight)
-}
-
-func prepareWatcherClient(l2Cli *ethclient.Client, db database.OrmFactory, contractAddr common.Address) *L2WatcherClient {
-	confirmations := rpc.LatestBlockNumber
-	return NewL2WatcherClient(context.Background(), l2Cli, confirmations, contractAddr, contractAddr, common.Hash{}, db)
-}
-
-func prepareAuth(t *testing.T, l2Cli *ethclient.Client, privateKey *ecdsa.PrivateKey) *bind.TransactOpts {
-	auth, err := bind.NewKeyedTransactorWithChainID(privateKey, big.NewInt(53077))
-	assert.NoError(t, err)
-	auth.Value = big.NewInt(0) // in wei
-	assert.NoError(t, err)
-	auth.GasPrice, err = l2Cli.SuggestGasPrice(context.Background())
-	assert.NoError(t, err)
-	return auth
-}
-
-func loopToFetchEvent(subCtx context.Context, watcher *L2WatcherClient) {
-	go cutils.Loop(subCtx, 2*time.Second, watcher.FetchContractEvent)
-}
-
-func testParseBridgeEventLogsL2SentMessageEventSignature(t *testing.T) {
-	watcher := setupL2Watcher(t)
-	logs := []geth_types.Log{
-		{
-			Topics: []common.Hash{
-				bridge_abi.L2SentMessageEventSignature,
-			},
-			BlockNumber: 100,
-			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-		},
-	}
-
-	convey.Convey("unpack SentMessage log failure", t, func() {
-		targetErr := errors.New("UnpackLog SentMessage failure")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log geth_types.Log) error {
-			return targetErr
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, err := watcher.parseBridgeEventLogs(logs)
-		assert.EqualError(t, err, targetErr.Error())
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-	})
-
-	convey.Convey("L2SentMessageEventSignature success", t, func() {
-		tmpSendAddr := common.HexToAddress("0xb4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d30")
-		tmpTargetAddr := common.HexToAddress("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5")
-		tmpValue := big.NewInt(1000)
-		tmpMessageNonce := big.NewInt(100)
-		tmpMessage := []byte("test for L2SentMessageEventSignature")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log geth_types.Log) error {
-			tmpOut := out.(*bridge_abi.L2SentMessageEvent)
-			tmpOut.Sender = tmpSendAddr
-			tmpOut.Value = tmpValue
-			tmpOut.Target = tmpTargetAddr
-			tmpOut.MessageNonce = tmpMessageNonce
-			tmpOut.Message = tmpMessage
-			return nil
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, err := watcher.parseBridgeEventLogs(logs)
-		assert.Error(t, err)
-		assert.Empty(t, relayedMessages)
-		assert.Empty(t, l2Messages)
-	})
-}
-
-func testParseBridgeEventLogsL2RelayedMessageEventSignature(t *testing.T) {
-	watcher := setupL2Watcher(t)
-	logs := []geth_types.Log{
-		{
-			Topics:      []common.Hash{bridge_abi.L2RelayedMessageEventSignature},
-			BlockNumber: 100,
-			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-		},
-	}
-
-	convey.Convey("unpack RelayedMessage log failure", t, func() {
-		targetErr := errors.New("UnpackLog RelayedMessage failure")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log geth_types.Log) error {
-			return targetErr
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, err := watcher.parseBridgeEventLogs(logs)
-		assert.EqualError(t, err, targetErr.Error())
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-	})
-
-	convey.Convey("L2RelayedMessageEventSignature success", t, func() {
-		msgHash := common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log geth_types.Log) error {
-			tmpOut := out.(*bridge_abi.L2RelayedMessageEvent)
-			tmpOut.MessageHash = msgHash
-			return nil
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, err := watcher.parseBridgeEventLogs(logs)
-		assert.NoError(t, err)
-		assert.Empty(t, l2Messages)
-		assert.Len(t, relayedMessages, 1)
-		assert.Equal(t, relayedMessages[0].msgHash, msgHash)
-	})
-}
-
-func testParseBridgeEventLogsL2FailedRelayedMessageEventSignature(t *testing.T) {
-	watcher := setupL2Watcher(t)
-	logs := []geth_types.Log{
-		{
-			Topics:      []common.Hash{bridge_abi.L2FailedRelayedMessageEventSignature},
-			BlockNumber: 100,
-			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-		},
-	}
-
-	convey.Convey("unpack FailedRelayedMessage log failure", t, func() {
-		targetErr := errors.New("UnpackLog FailedRelayedMessage failure")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log geth_types.Log) error {
-			return targetErr
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, err := watcher.parseBridgeEventLogs(logs)
-		assert.EqualError(t, err, targetErr.Error())
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-	})
-
-	convey.Convey("L2FailedRelayedMessageEventSignature success", t, func() {
-		msgHash := common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log geth_types.Log) error {
-			tmpOut := out.(*bridge_abi.L2FailedRelayedMessageEvent)
-			tmpOut.MessageHash = msgHash
-			return nil
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, err := watcher.parseBridgeEventLogs(logs)
-		assert.NoError(t, err)
-		assert.Empty(t, l2Messages)
-		assert.Len(t, relayedMessages, 1)
-		assert.Equal(t, relayedMessages[0].msgHash, msgHash)
-	})
-}
-
-func testParseBridgeEventLogsL2AppendMessageEventSignature(t *testing.T) {
-	watcher := setupL2Watcher(t)
-	logs := []geth_types.Log{
-		{
-			Topics:      []common.Hash{bridge_abi.L2AppendMessageEventSignature},
-			BlockNumber: 100,
-			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-		},
-	}
-
-	convey.Convey("unpack AppendMessage log failure", t, func() {
-		targetErr := errors.New("UnpackLog AppendMessage failure")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log geth_types.Log) error {
-			return targetErr
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, err := watcher.parseBridgeEventLogs(logs)
-		assert.EqualError(t, err, targetErr.Error())
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-	})
-
-	convey.Convey("L2AppendMessageEventSignature success", t, func() {
-		msgHash := common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log geth_types.Log) error {
-			tmpOut := out.(*bridge_abi.L2AppendMessageEvent)
-			tmpOut.MessageHash = msgHash
-			tmpOut.Index = big.NewInt(100)
-			return nil
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, err := watcher.parseBridgeEventLogs(logs)
-		assert.NoError(t, err)
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-	})
-}

bridge/watcher/watcher_test.go

@@ -1,105 +0,0 @@
-package watcher
-
-import (
-	"encoding/json"
-	"os"
-	"testing"
-
-	"github.com/scroll-tech/go-ethereum/ethclient"
-	"github.com/stretchr/testify/assert"
-
-	"scroll-tech/common/docker"
-	"scroll-tech/common/types"
-
-	"scroll-tech/bridge/config"
-)
-
-var (
-	// config
-	cfg *config.Config
-
-	base *docker.App
-
-	// l2geth client
-	l2Cli *ethclient.Client
-
-	// block trace
-	wrappedBlock1 *types.WrappedBlock
-	wrappedBlock2 *types.WrappedBlock
-)
-
-func setupEnv(t *testing.T) (err error) {
-	// Load config.
-	cfg, err = config.NewConfig("../config.json")
-	assert.NoError(t, err)
-
-	base.RunImages(t)
-
-	cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = base.L1gethImg.Endpoint()
-	cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = base.L2gethImg.Endpoint()
-	cfg.DBConfig = base.DBConfig
-
-	// Create l2geth client.
-	l2Cli, err = base.L2Client()
-	assert.NoError(t, err)
-
-	templateBlockTrace1, err := os.ReadFile("../../common/testdata/blockTrace_02.json")
-	if err != nil {
-		return err
-	}
-	// unmarshal blockTrace
-	wrappedBlock1 = &types.WrappedBlock{}
-	if err = json.Unmarshal(templateBlockTrace1, wrappedBlock1); err != nil {
-		return err
-	}
-
-	templateBlockTrace2, err := os.ReadFile("../../common/testdata/blockTrace_03.json")
-	if err != nil {
-		return err
-	}
-	// unmarshal blockTrace
-	wrappedBlock2 = &types.WrappedBlock{}
-	if err = json.Unmarshal(templateBlockTrace2, wrappedBlock2); err != nil {
-		return err
-	}
-	return err
-}
-
-func TestMain(m *testing.M) {
-	base = docker.NewDockerApp()
-
-	m.Run()
-
-	base.Free()
-}
-
-func TestFunction(t *testing.T) {
-	if err := setupEnv(t); err != nil {
-		t.Fatal(err)
-	}
-
-	// Run l1 watcher test cases.
-	t.Run("TestStartWatcher", testFetchContractEvent)
-	t.Run("TestL1WatcherClientFetchBlockHeader", testL1WatcherClientFetchBlockHeader)
-	t.Run("TestL1WatcherClientFetchContractEvent", testL1WatcherClientFetchContractEvent)
-	t.Run("TestParseBridgeEventLogsL1QueueTransactionEventSignature", testParseBridgeEventLogsL1QueueTransactionEventSignature)
-	t.Run("TestParseBridgeEventLogsL1RelayedMessageEventSignature", testParseBridgeEventLogsL1RelayedMessageEventSignature)
-	t.Run("TestParseBridgeEventLogsL1FailedRelayedMessageEventSignature", testParseBridgeEventLogsL1FailedRelayedMessageEventSignature)
-	t.Run("TestParseBridgeEventLogsL1CommitBatchEventSignature", testParseBridgeEventLogsL1CommitBatchEventSignature)
-	t.Run("TestParseBridgeEventLogsL1FinalizeBatchEventSignature", testParseBridgeEventLogsL1FinalizeBatchEventSignature)
-
-	// Run l2 watcher test cases.
-	t.Run("TestCreateNewWatcherAndStop", testCreateNewWatcherAndStop)
-	t.Run("TestMonitorBridgeContract", testMonitorBridgeContract)
-	t.Run("TestFetchMultipleSentMessageInOneBlock", testFetchMultipleSentMessageInOneBlock)
-	t.Run("TestFetchRunningMissingBlocks", testFetchRunningMissingBlocks)
-	t.Run("TestParseBridgeEventLogsL2SentMessageEventSignature", testParseBridgeEventLogsL2SentMessageEventSignature)
-	t.Run("TestParseBridgeEventLogsL2RelayedMessageEventSignature", testParseBridgeEventLogsL2RelayedMessageEventSignature)
-	t.Run("TestParseBridgeEventLogsL2FailedRelayedMessageEventSignature", testParseBridgeEventLogsL2FailedRelayedMessageEventSignature)
-	t.Run("TestParseBridgeEventLogsL2AppendMessageEventSignature", testParseBridgeEventLogsL2AppendMessageEventSignature)
-
-	// Run batch proposer test cases.
-	t.Run("TestBatchProposerProposeBatch", testBatchProposerProposeBatch)
-	t.Run("TestBatchProposerBatchGeneration", testBatchProposerBatchGeneration)
-	t.Run("TestBatchProposerGracefulRestart", testBatchProposerGracefulRestart)
-}

build/.golangci.yml

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

build/dockerfiles/bridge.Dockerfile

@@ -0,0 +1,13 @@
+# Build bridge in a stock Go builder container
+FROM scrolltech/go-builder:1.18 as builder
+
+COPY ./ /
+
+RUN cd /bridge/cmd && go build -v -p 4 -o bridge
+
+# Pull bridge into a second stage deploy alpine container
+FROM alpine:latest
+
+COPY --from=builder /bridge/cmd/bridge /bin/
+
+ENTRYPOINT ["bridge"]

build/dockerfiles/bridge.Dockerfile.dockerignore

@@ -0,0 +1,7 @@
+assets/
+coordinator/
+docs/
+integration-test/
+l2geth/
+roller/
+rpc-gateway/

build/dockerfiles/coordinator.Dockerfile

@@ -1,49 +1,13 @@
-# Build libzkp dependency
-FROM scrolltech/go-rust-builder:go-1.18-rust-nightly-2022-12-10 as chef
-WORKDIR app
+# Build scroll in a stock Go builder container
+FROM scrolltech/go-builder:1.18 as builder
 
-FROM chef as planner
-COPY ./common/libzkp/impl/ .
-RUN cargo chef prepare --recipe-path recipe.json
+COPY ./ /
 
-FROM chef as zkp-builder
-COPY ./common/libzkp/impl/rust-toolchain ./
-COPY --from=planner /app/recipe.json recipe.json
-RUN cargo chef cook --release --recipe-path recipe.json
+RUN cd /coordinator/cmd && go build -v -p 4 -o coordinator
 
-COPY ./common/libzkp/impl .
-RUN cargo build --release
-RUN find ./ | grep libzktrie.so | xargs -I{} cp {} /app/target/release/
+# Pull scroll into a second stage deploy alpine container
+FROM alpine:latest
 
+COPY --from=builder /coordinator/cmd/coordinator /bin/
 
-# Download Go dependencies
-FROM scrolltech/go-rust-builder:go-1.18-rust-nightly-2022-12-10 as base
-WORKDIR /src
-COPY go.work* ./
-COPY ./bridge/go.* ./bridge/
-COPY ./common/go.* ./common/
-COPY ./coordinator/go.* ./coordinator/
-COPY ./database/go.* ./database/
-COPY ./roller/go.* ./roller/
-COPY ./tests/integration-test/go.* ./tests/integration-test/
-RUN go mod download -x
-
-
-# Build coordinator
-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/
-
-# 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"]
+ENTRYPOINT ["coordinator"]

build/dockerfiles/coordinator.Dockerfile.dockerignore

@@ -1,6 +1,8 @@
 assets/
+bridge/
 contracts/
 docs/
+integration-test/
 l2geth/
+roller/
 rpc-gateway/
-*target/*

build/dockerfiles/db_cli.Dockerfile

@@ -1,26 +0,0 @@
-# Download Go dependencies
-FROM scrolltech/go-alpine-builder:1.18 as base
-
-WORKDIR /src
-COPY go.work* ./
-COPY ./bridge/go.* ./bridge/
-COPY ./common/go.* ./common/
-COPY ./coordinator/go.* ./coordinator/
-COPY ./database/go.* ./database/
-COPY ./roller/go.* ./roller/
-COPY ./tests/integration-test/go.* ./tests/integration-test/
-RUN go mod download -x
-
-# Build db_cli
-FROM base as builder
-
-RUN --mount=target=. \
-    --mount=type=cache,target=/root/.cache/go-build \
-    cd /src/database/cmd && go build -v -p 4 -o /bin/db_cli
-
-# Pull db_cli into a second stage deploy alpine container
-FROM alpine:latest
-
-COPY --from=builder /bin/db_cli /bin/
-
-ENTRYPOINT ["db_cli"]

build/dockerfiles/db_cli.Dockerfile.dockerignore

@@ -1,6 +0,0 @@
-assets/
-contracts/
-docs/
-l2geth/
-rpc-gateway/
-*target/*

build/dockerfiles/event_watcher.Dockerfile

@@ -1,26 +0,0 @@
-# Download Go dependencies
-FROM scrolltech/go-alpine-builder:1.18 as base
-
-WORKDIR /src
-COPY go.work* ./
-COPY ./bridge/go.* ./bridge/
-COPY ./common/go.* ./common/
-COPY ./coordinator/go.* ./coordinator/
-COPY ./database/go.* ./database/
-COPY ./roller/go.* ./roller/
-COPY ./tests/integration-test/go.* ./tests/integration-test/
-RUN go mod download -x
-
-# Build event_watcher
-FROM base as builder
-
-RUN --mount=target=. \
-    --mount=type=cache,target=/root/.cache/go-build \
-    cd /src/bridge/cmd/event_watcher/ && go build -v -p 4 -o /bin/event_watcher
-
-# Pull event_watcher into a second stage deploy alpine container
-FROM alpine:latest
-
-COPY --from=builder /bin/event_watcher /bin/
-
-ENTRYPOINT ["event_watcher"]

build/dockerfiles/event_watcher.Dockerfile.dockerignore

@@ -1,5 +0,0 @@
-assets/
-docs/
-l2geth/
-rpc-gateway/
-*target/*

build/dockerfiles/gas_oracle.Dockerfile

@@ -1,26 +0,0 @@
-# Download Go dependencies
-FROM scrolltech/go-alpine-builder:1.18 as base
-
-WORKDIR /src
-COPY go.work* ./
-COPY ./bridge/go.* ./bridge/
-COPY ./common/go.* ./common/
-COPY ./coordinator/go.* ./coordinator/
-COPY ./database/go.* ./database/
-COPY ./roller/go.* ./roller/
-COPY ./tests/integration-test/go.* ./tests/integration-test/
-RUN go mod download -x
-
-# Build gas_oracle
-FROM base as builder
-
-RUN --mount=target=. \
-    --mount=type=cache,target=/root/.cache/go-build \
-    cd /src/bridge/cmd/gas_oracle/ && go build -v -p 4 -o /bin/gas_oracle
-
-# Pull gas_oracle into a second stage deploy alpine container
-FROM alpine:latest
-
-COPY --from=builder /bin/gas_oracle /bin/
-
-ENTRYPOINT ["gas_oracle"]

build/dockerfiles/gas_oracle.Dockerfile.dockerignore

@@ -1,5 +0,0 @@
-assets/
-docs/
-l2geth/
-rpc-gateway/
-*target/*

build/dockerfiles/intermediate/Makefile

@@ -1,16 +1,12 @@
 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
+.PHONY: all go-builder rust-builder rust-alpine-builder go-rust-builder py-runner
 
-go-rust-builder:
-	docker build -t scrolltech/go-rust-builder:latest -f go-rust-builder.Dockerfile ./
-	docker image tag scrolltech/go-rust-builder:latest scrolltech/go-rust-builder:go-$(GO_VERSION)-rust-$(RUST_VERSION)
-
-go-alpine-builder:
-	docker build -t scrolltech/go-alpine-builder:latest -f go-alpine-builder.Dockerfile ./
-	docker image tag scrolltech/go-alpine-builder:latest scrolltech/go-alpine-builder:$(GO_VERSION)
+go-builder:
+	docker build -t scrolltech/go-builder:latest -f go-builder.Dockerfile ./
+	docker image tag scrolltech/go-builder:latest scrolltech/go-builder:$(GO_VERSION)
 
 rust-builder:
 	docker build -t scrolltech/rust-builder:latest -f rust-builder.Dockerfile ./
@@ -20,25 +16,23 @@ rust-alpine-builder:
 	docker build -t scrolltech/rust-alpine-builder:latest -f rust-alpine-builder.Dockerfile ./
 	docker image tag scrolltech/rust-alpine-builder:latest scrolltech/rust-alpine-builder:$(RUST_VERSION)
 
-go-rust-alpine-builder:
-	docker build -t scrolltech/go-rust-alpine-builder:latest -f go-rust-alpine-builder.Dockerfile ./
-	docker image tag scrolltech/go-rust-alpine-builder:latest scrolltech/go-rust-alpine-builder:go-$(GO_VERSION)-rust-$(RUST_VERSION)
+go-rust-builder:
+	docker build -t scrolltech/go-rust-builder:latest -f go-rust-builder.Dockerfile ./
+	docker image tag scrolltech/go-rust-builder:latest scrolltech/go-rust-builder:go-$(GO_VERSION)-rust-$(RUST_VERSION)
 
 py-runner:
 	docker build -t scrolltech/py-runner:latest -f py-runner.Dockerfile ./
 	docker image tag scrolltech/py-runner:latest scrolltech/py-runner:$(PYTHON_VERSION)
 
-all: go-alpine-builder rust-builder rust-alpine-builder go-rust-alpine-builder go-rust-builder py-runner
+all: go-builder rust-builder rust-alpine-builder go-rust-builder py-runner
 
 publish:
-	docker push scrolltech/go-alpine-builder:latest
-	docker push scrolltech/go-alpine-builder:$(GO_VERSION)
+	docker push scrolltech/go-builder:latest
+	docker push scrolltech/go-builder:$(GO_VERSION)
 	docker push scrolltech/rust-builder:latest
 	docker push scrolltech/rust-builder:$(RUST_VERSION)
 	docker push scrolltech/rust-alpine-builder:latest
 	docker push scrolltech/rust-alpine-builder:$(RUST_VERSION)
-	docker push scrolltech/go-rust-alpine-builder:latest
-	docker push scrolltech/go-rust-alpine-builder:go-$(GO_VERSION)-rust-$(RUST_VERSION)
 	docker push scrolltech/go-rust-builder:latest
 	docker push scrolltech/go-rust-builder:go-$(GO_VERSION)-rust-$(RUST_VERSION)
 	docker push scrolltech/py-runner:latest

build/dockerfiles/intermediate/go-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,35 +0,0 @@
-FROM golang:1.18-alpine
-ARG CARGO_CHEF_TAG=0.1.41
-ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-12-10
-
-RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates openssl-dev
-
-# RUN apk add --no-cache libc6-compat
-# RUN apk add --no-cache gcompat
-
-ENV RUSTUP_HOME=/usr/local/rustup \
-    CARGO_HOME=/usr/local/cargo \
-    PATH=/usr/local/cargo/bin:$PATH \
-    CARGO_NET_GIT_FETCH_WITH_CLI=true
-
-RUN set -eux; \
-    apkArch="$(apk --print-arch)"; \
-    case "$apkArch" in \
-        x86_64) rustArch='x86_64-unknown-linux-musl' ;; \
-        aarch64) rustArch='aarch64-unknown-linux-musl' ;; \
-        *) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \
-    esac; \
-    \
-    url="https://static.rust-lang.org/rustup/dist/${rustArch}/rustup-init"; \
-    wget "$url"; \
-    chmod +x rustup-init;
-
-RUN ./rustup-init -y --no-modify-path --default-toolchain ${DEFAULT_RUST_TOOLCHAIN}; \
-    rm rustup-init; \
-    chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
-    rustup --version; \
-    cargo --version; \
-    rustc --version;
-
-RUN cargo install cargo-chef --locked --version ${CARGO_CHEF_TAG} \
-    && rm -rf $CARGO_HOME/registry/

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

@@ -1,34 +1,31 @@
-FROM ubuntu:20.04
+FROM golang:1.18-alpine
+ARG CARGO_CHEF_TAG=0.1.41
+ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-08-23
 
-RUN apt-get update && ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
+RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates
 
-# Install basic packages
-RUN apt-get install build-essential curl wget git pkg-config -y
+ENV RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH=/usr/local/cargo/bin:$PATH
 
-# Install dev-packages
-RUN apt-get install libclang-dev libssl-dev llvm -y
+RUN set -eux; \
+    apkArch="$(apk --print-arch)"; \
+    case "$apkArch" in \
+        x86_64) rustArch='x86_64-unknown-linux-musl' ;; \
+        aarch64) rustArch='aarch64-unknown-linux-musl' ;; \
+        *) echo >&2 "unsupported architecture: $apkArch"; exit 1 ;; \
+    esac; \
+    \
+    url="https://static.rust-lang.org/rustup/dist/${rustArch}/rustup-init"; \
+    wget "$url"; \
+    chmod +x rustup-init;
 
-# Install Rust
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-ENV PATH="/root/.cargo/bin:${PATH}"
-ENV CARGO_HOME=/root/.cargo
-
-# Add Toolchain
-RUN rustup toolchain install nightly-2022-12-10
-
-# TODO: make this ARG
-ENV CARGO_CHEF_TAG=0.1.41
+RUN ./rustup-init -y --no-modify-path --default-toolchain ${DEFAULT_RUST_TOOLCHAIN}; \
+    rm rustup-init; \
+    chmod -R a+w $RUSTUP_HOME $CARGO_HOME; \
+    rustup --version; \
+    cargo --version; \
+    rustc --version;
 
 RUN cargo install cargo-chef --locked --version ${CARGO_CHEF_TAG} \
     && rm -rf $CARGO_HOME/registry/
-
-# Install Go
-RUN rm -rf /usr/local/go
-# for 1.17
-# RUN wget https://go.dev/dl/go1.17.13.linux-amd64.tar.gz
-# RUN tar -C /usr/local -xzf go1.17.13.linux-amd64.tar.gz
-# for 1.18
-RUN wget https://go.dev/dl/go1.18.9.linux-amd64.tar.gz
-RUN tar -C /usr/local -xzf go1.18.9.linux-amd64.tar.gz
-
-ENV PATH="/usr/local/go/bin:${PATH}"

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

@@ -1,19 +1,16 @@
 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
 
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
-    PATH=/usr/local/cargo/bin:$PATH \
-    CARGO_NET_GIT_FETCH_WITH_CLI=true
+    PATH=/usr/local/cargo/bin:$PATH
 
 RUN set -eux; \
     apkArch="$(apk --print-arch)"; \

build/dockerfiles/intermediate/rust-builder.Dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:20.04
 RUN apt-get update && ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
 
 # Install basic packages
-RUN apt-get install build-essential curl wget git pkg-config -y
+RUN apt-get install build-essential curl git pkg-config -y
 
 # Install dev-packages
 RUN apt-get install libclang-dev libssl-dev llvm -y
@@ -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/dockerfiles/msg_relayer.Dockerfile

@@ -1,26 +0,0 @@
-# Download Go dependencies
-FROM scrolltech/go-alpine-builder:1.18 as base
-
-WORKDIR /src
-COPY go.work* ./
-COPY ./bridge/go.* ./bridge/
-COPY ./common/go.* ./common/
-COPY ./coordinator/go.* ./coordinator/
-COPY ./database/go.* ./database/
-COPY ./roller/go.* ./roller/
-COPY ./tests/integration-test/go.* ./tests/integration-test/
-RUN go mod download -x
-
-# Build msg_relayer
-FROM base as builder
-
-RUN --mount=target=. \
-    --mount=type=cache,target=/root/.cache/go-build \
-    cd /src/bridge/cmd/msg_relayer/ && go build -v -p 4 -o /bin/msg_relayer
-
-# Pull msg_relayer into a second stage deploy alpine container
-FROM alpine:latest
-
-COPY --from=builder /bin/msg_relayer /bin/
-
-ENTRYPOINT ["msg_relayer"]

build/dockerfiles/msg_relayer.Dockerfile.dockerignore

@@ -1,5 +0,0 @@
-assets/
-docs/
-l2geth/
-rpc-gateway/
-*target/*

build/dockerfiles/rollup_relayer.Dockerfile

@@ -1,26 +0,0 @@
-# Download Go dependencies
-FROM scrolltech/go-alpine-builder:1.18 as base
-
-WORKDIR /src
-COPY go.work* ./
-COPY ./bridge/go.* ./bridge/
-COPY ./common/go.* ./common/
-COPY ./coordinator/go.* ./coordinator/
-COPY ./database/go.* ./database/
-COPY ./roller/go.* ./roller/
-COPY ./tests/integration-test/go.* ./tests/integration-test/
-RUN go mod download -x
-
-# Build rollup_relayer
-FROM base as builder
-
-RUN --mount=target=. \
-    --mount=type=cache,target=/root/.cache/go-build \
-    cd /src/bridge/cmd/rollup_relayer/ && go build -v -p 4 -o /bin/rollup_relayer
-
-# Pull rollup_relayer into a second stage deploy alpine container
-FROM alpine:latest
-
-COPY --from=builder /bin/rollup_relayer /bin/
-
-ENTRYPOINT ["rollup_relayer"]