Use on postgres container

.github/pull_request_template.md

@@ -1,9 +1,9 @@
-### Purpose or design rationale of this PR
+## 1. Purpose or design rationale of this PR
 
-*Describe your change. Make sure to answer these three questions: What does this PR do? Why does it do it? How does it do it?*
+...
 
 
-### PR title
+## 2. PR title
 
 Your PR title must follow [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/#summary) (as we are doing squash merge for each PR), so it must start with one of the following [types](https://github.com/angular/angular/blob/22b96b9/CONTRIBUTING.md#type):
 
@@ -18,17 +18,17 @@ Your PR title must follow [conventional commits](https://www.conventionalcommits
 - [ ] test: Adding missing tests or correcting existing tests
 
 
-### Deployment tag versioning
+## 3. Deployment tag versioning
 
 Has `tag` in `common/version.go` been updated?
 
-- [ ] No, this PR doesn't involve a new deployment, git tag, docker image tag
+- [ ] This PR doesn't involve a new deployment, git tag, docker image tag
 - [ ] Yes
 
 
-### Breaking change label
+## 4. Breaking change label
 
 Does this PR have the `breaking-change` label?
 
-- [ ] No, this PR is not a breaking change
+- [ ] This PR is not a breaking change
 - [ ] Yes

.github/workflows/bridge.yml

@@ -9,8 +9,6 @@ on:
       - alpha
     paths:
       - 'bridge/**'
-      - 'common/**'
-      - 'database/**'
       - '.github/workflows/bridge.yml'
   pull_request:
     types:
@@ -20,61 +18,14 @@ on:
       - ready_for_review
     paths:
       - 'bridge/**'
-      - 'common/**'
-      - 'database/**'
       - '.github/workflows/bridge.yml'
 
+defaults:
+  run:
+    working-directory: 'bridge'
+
 jobs:
   check:
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-    steps:
-    - name: Install Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.19.x
-    - 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'
-    - name: Install Geth Tools
-      uses: gacts/install-geth-tools@v1
-    - name: Lint
-      working-directory: 'bridge'
-      run: |
-        rm -rf $HOME/.cache/golangci-lint
-        make mock_abi
-        make lint
-  goimports-lint:
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-    steps:
-    - name: Install Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.19.x
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Install goimports
-      run: go install golang.org/x/tools/cmd/goimports
-    - name: Run goimports lint
-      run: goimports -local scroll-tech/bridge/ -w .
-      working-directory: 'bridge'
-    - name: Run go mod tidy
-      run: go mod tidy
-      working-directory: 'bridge'
-    # If there are any diffs from goimports or go mod tidy, fail.
-    - name: Verify no changes from goimports and go mod tidy
-      working-directory: 'bridge'
-      run: |
-        if [ -n "$(git status --porcelain)" ]; then
-          exit 1
-        fi
-  tests:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
@@ -92,24 +43,31 @@ jobs:
         version: '0.8.16'
     - name: Install Geth Tools
       uses: gacts/install-geth-tools@v1
-    - name: Build prerequisites
+    - name: Lint
       run: |
-        make dev_docker
-        make -C bridge mock_abi
-    - name: Build bridge binaries
-      working-directory: 'bridge'
-      run: |
-        make bridge_bins
-    - name: Test bridge packages
-      working-directory: 'bridge'
-      run: |
-        go test -v -race -gcflags="-l" -ldflags="-s=false" -coverprofile=coverage.txt -covermode=atomic ./...
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v3
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        rm -rf $HOME/.cache/golangci-lint
+        make mock_abi
+        make lint
+  goimports-lint:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install Go
+      uses: actions/setup-go@v2
       with:
-        flags: bridge
+        go-version: 1.18.x
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Install goimports
+      run: go install golang.org/x/tools/cmd/goimports
+    - run: goimports -local scroll-tech/bridge/ -w .
+    - run: go mod tidy
+    # If there are any diffs from goimports or go mod tidy, fail.
+    - name: Verify no changes from goimports and go mod tidy
+      run: |
+        if [ -n "$(git status --porcelain)" ]; then
+          exit 1
+        fi
   # docker-build:
   #   if: github.event.pull_request.draft == false
   #   runs-on: ubuntu-latest

.github/workflows/bridge_history_api.yml

@@ -1,4 +1,4 @@
-name: BridgeHistoryAPI
+name: BridgeHistoryApi
 
 on:
   push:
@@ -32,7 +32,7 @@ jobs:
   #   - name: Install Go
   #     uses: actions/setup-go@v2
   #     with:
-  #       go-version: 1.19.x
+  #       go-version: 1.20.x
   #   - name: Checkout code
   #     uses: actions/checkout@v2
   #   - name: Lint
@@ -46,19 +46,13 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.19.x
+        go-version: 1.20.x
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Test
       run: |
         go get ./...
         make test
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v3
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      with:
-        flags: bridge-history-api
   goimports-lint:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
@@ -66,7 +60,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.19.x
+        go-version: 1.20.x
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Install goimports
@@ -79,3 +73,4 @@ jobs:
         if [ -n "$(git status --porcelain)" ]; then
           exit 1
         fi
+

.github/workflows/common.yml

@@ -20,6 +20,10 @@ on:
       - 'common/**'
       - '.github/workflows/common.yml'
 
+defaults:
+  run:
+    working-directory: 'common'
+
 jobs:
   check:
     if: github.event.pull_request.draft == false
@@ -33,7 +37,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.19.x
+        go-version: 1.18.x
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Cache cargo
@@ -41,7 +45,6 @@ jobs:
       with:
         workspaces: "common/libzkp/impl -> target"
     - name: Lint
-      working-directory: 'common'
       run: |
         rm -rf $HOME/.cache/golangci-lint
         make lint
@@ -52,52 +55,16 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.19.x
+        go-version: 1.18.x
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Install goimports
       run: go install golang.org/x/tools/cmd/goimports
-    - name: Run goimports lint
-      working-directory: 'common'
-      run: goimports -local scroll-tech/common/ -w .
-    - name: Run go mod tidy
-      working-directory: 'common'
-      run: go mod tidy
+    - run: goimports -local scroll-tech/common/ -w .
+    - run: go mod tidy
     # If there are any diffs from goimports or go mod tidy, fail.
     - name: Verify no changes from goimports and go mod tidy
-      working-directory: 'common'
       run: |
         if [ -n "$(git status --porcelain)" ]; then
           exit 1
         fi
-  tests:
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-    steps:
-    - name: Install Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.18.x
-    - 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'
-    - name: Install Geth Tools
-      uses: gacts/install-geth-tools@v1
-    - name: Build prerequisites
-      run: |
-        make dev_docker
-    - name: Test common packages
-      working-directory: 'common'
-      run: |
-        go test -v -race -gcflags="-l" -ldflags="-s=false" -coverprofile=coverage.txt -covermode=atomic ./...
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v3
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      with:
-        flags: common

.github/workflows/coordinator.yml

@@ -9,8 +9,6 @@ on:
       - alpha
     paths:
       - 'coordinator/**'
-      - 'common/**'
-      - 'database/**'
       - '.github/workflows/coordinator.yml'
   pull_request:
     types:
@@ -20,10 +18,12 @@ on:
       - ready_for_review
     paths:
       - 'coordinator/**'
-      - 'common/**'
-      - 'database/**'
       - '.github/workflows/coordinator.yml'
 
+defaults:
+  run:
+    working-directory: 'coordinator'
+
 jobs:
   check:
     if: github.event.pull_request.draft == false
@@ -37,11 +37,10 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.19.x
+        go-version: 1.18.x
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Lint
-      working-directory: 'coordinator'
       run: |
         rm -rf $HOME/.cache/golangci-lint
         make lint
@@ -52,20 +51,15 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.19.x
+        go-version: 1.18.x
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Install goimports
       run: go install golang.org/x/tools/cmd/goimports
-    - name: Run goimports lint
-      working-directory: 'coordinator'
-      run: goimports -local scroll-tech/coordinator/ -w .
-    - name: Run go mod tidy
-      working-directory: 'coordinator'
-      run: go mod tidy
+    - run: goimports -local scroll-tech/coordinator/ -w .
+    - run: go mod tidy
     # If there are any diffs from goimports or go mod tidy, fail.
     - name: Verify no changes from goimports and go mod tidy
-      working-directory: 'coordinator'
       run: |
         if [ -n "$(git status --porcelain)" ]; then
           exit 1
@@ -86,35 +80,3 @@ jobs:
   #       push: false
   #       # cache-from: type=gha,scope=${{ github.workflow }}
   #       # cache-to: type=gha,scope=${{ github.workflow }}
-  tests:
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-    steps:
-    - name: Install Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.18.x
-    - 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'
-    - name: Install Geth Tools
-      uses: gacts/install-geth-tools@v1
-    - name: Build prerequisites
-      run: |
-        make dev_docker
-    - name: Test coordinator packages
-      working-directory: 'coordinator'
-      run: |
-        # go test -exec "env LD_LIBRARY_PATH=${PWD}/verifier/lib" -v -race -gcflags="-l" -ldflags="-s=false" -coverpkg="scroll-tech/coordinator" -coverprofile=coverage.txt -covermode=atomic ./...
-        go test -v -race -gcflags="-l" -ldflags="-s=false" -coverprofile=coverage.txt -covermode=atomic -tags mock_verifier ./...
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v3
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      with:
-        flags: coordinator

.github/workflows/database.yml

@@ -9,7 +9,6 @@ on:
       - alpha
     paths:
       - 'database/**'
-      - 'common/**'
       - '.github/workflows/database.yml'
   pull_request:
     types:
@@ -19,9 +18,12 @@ on:
       - ready_for_review
     paths:
       - 'database/**'
-      - 'common/**'
       - '.github/workflows/database.yml'
 
+defaults:
+  run:
+    working-directory: 'database'
+
 jobs:
   check:
     if: github.event.pull_request.draft == false
@@ -30,11 +32,10 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.19.x
+        go-version: 1.18.x
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Lint
-      working-directory: 'database'
       run: |
         rm -rf $HOME/.cache/golangci-lint
         make lint
@@ -45,52 +46,16 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.19.x
+        go-version: 1.18.x
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Install goimports
       run: go install golang.org/x/tools/cmd/goimports
-    - name: Run goimports lint
-      working-directory: 'database'
-      run: goimports -local scroll-tech/database/ -w .
-    - name: Run go mod tidy
-      working-directory: 'database'
-      run: go mod tidy
+    - run: goimports -local scroll-tech/database/ -w .
+    - run: go mod tidy
     # If there are any diffs from goimports or go mod tidy, fail.
     - name: Verify no changes from goimports and go mod tidy
-      working-directory: 'database'
       run: |
         if [ -n "$(git status --porcelain)" ]; then
           exit 1
         fi
-  tests:
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-    steps:
-    - name: Install Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.18.x
-    - 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'
-    - name: Install Geth Tools
-      uses: gacts/install-geth-tools@v1
-    - name: Build prerequisites
-      run: |
-        make dev_docker
-    - name: Test database packages
-      working-directory: 'database'
-      run: |
-        go test -v -race -gcflags="-l" -ldflags="-s=false" -coverprofile=coverage.txt -covermode=atomic ./...
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v3
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      with:
-        flags: database

.github/workflows/integration.yaml

@@ -1,43 +0,0 @@
-name: Integration
-
-on:
-  push:
-    branches:
-      - main
-      - staging
-      - develop
-      - alpha
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
-
-jobs:
-  tests:
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-    steps:
-    - name: Install Go
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.18.x
-    - 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'
-    - name: Install Geth Tools
-      uses: gacts/install-geth-tools@v1
-    - name: Build prerequisites
-      run: |
-        make dev_docker
-        make -C bridge mock_abi
-        make -C common/bytecode all
-    - name: Run integration tests
-      run: |
-        go test -v -tags="mock_prover mock_verifier" -p 1 -coverprofile=coverage.txt scroll-tech/integration-test/...

.github/workflows/intermediate-docker.yml

@@ -1,59 +0,0 @@
-name: Intermediate Docker
-
-on:
-  workflow_dispatch:
-    inputs:
-      GO_VERSION:
-        description: 'Go version'
-        required: true
-        type: string
-        default: '1.19'
-      RUST_VERSION:
-        description: 'Rust toolchain version'
-        required: true
-        type: string
-        default: 'nightly-2022-12-10'
-      PYTHON_VERSION:
-        description: 'Python version'
-        required: false
-        type: string
-        default: '3.10'
-      CUDA_VERSION:
-        description: 'Cuda version'
-        required: false
-        type: string
-        default: '11.7.1'
-
-defaults:
-  run:
-    working-directory: 'build/dockerfiles/intermediate'
-
-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
-      run: |
-        make all
-      env:
-        GO_VERSION: ${{ inputs.GO_VERSION }}
-        RUST_VERSION: ${{ inputs.RUST_VERSION }}
-        PYTHON_VERSION: ${{ inputs.PYTHON_VERSION }}
-        CUDA_VERSION: ${{ inputs.CUDA_VERSION }}
-    - name: Publish
-      run: |
-        make publish
-      env:
-        GO_VERSION: ${{ inputs.GO_VERSION }}
-        RUST_VERSION: ${{ inputs.RUST_VERSION }}
-        PYTHON_VERSION: ${{ inputs.PYTHON_VERSION }}
-        CUDA_VERSION: ${{ inputs.CUDA_VERSION }}

.github/workflows/roller.yml

@@ -37,7 +37,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.19.x
+        go-version: 1.18.x
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Cache cargo
@@ -47,13 +47,7 @@ jobs:
     - name: Test
       run: |
         make roller
-        go test -tags="mock_prover" -v -coverprofile=coverage.txt ./...
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v3
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      with:
-        flags: roller
+        go test -tags="mock_prover" -v ./...
   check:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
@@ -61,7 +55,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.19.x
+        go-version: 1.18.x
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Lint
@@ -75,7 +69,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v2
       with:
-        go-version: 1.19.x
+        go-version: 1.18.x
     - name: Checkout code
       uses: actions/checkout@v2
     - name: Install goimports

Jenkinsfile

@@ -0,0 +1,99 @@
+imagePrefix = 'scrolltech'
+credentialDocker = 'dockerhub'
+
+pipeline {
+    agent any
+    options {
+        timeout (20)
+    }
+    tools {
+        go 'go-1.18'
+        nodejs "nodejs"
+    }
+    environment {
+        GO111MODULE = 'on'
+        PATH="/home/ubuntu/.cargo/bin:$PATH"
+        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'
+                    }
+                }
+            }
+        }
+        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 && go test -exec "env LD_LIBRARY_PATH=${PWD}/verifier/lib" -v -race -gcflags="-l" -ldflags="-s=false" -coverpkg="scroll-tech/coordinator" -coverprofile=../coverage.coordinator.txt -covermode=atomic ./...'
+                    }
+                }
+                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/...'
+                    }
+                }
+            }
+        }
+        stage('Compare Coverage') {
+            steps {
+                sh "./build/post-test-report-coverage.sh"
+                script {
+                    currentBuild.result = 'SUCCESS'
+                }
+                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') 
+            cleanWs() 
+            slackSend(message: "${JOB_BASE_NAME} ${GIT_COMMIT} #${BUILD_NUMBER} deploy ${currentBuild.result}")
+        }
+    }
+}

README.md

@@ -1,9 +1,9 @@
 # Scroll Monorepo
 
-[![codecov](https://codecov.io/gh/scroll-tech/scroll/branch/develop/graph/badge.svg?token=VJVHNQWGGW)](https://codecov.io/gh/scroll-tech/scroll)
+[![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
-+ Go 1.19
++ Go 1.18
 + Rust (for version, see [rust-toolchain](./common/libzkp/impl/rust-toolchain))
 + Hardhat / Foundry
 + Docker

bridge-history-api/abi/backend_abi.go

@@ -325,26 +325,3 @@ type L2FailedRelayedMessageEvent struct {
 type L2RelayedMessageEvent struct {
 	MessageHash common.Hash
 }
-
-// IScrollChainBatch is an auto generated low-level Go binding around an user-defined struct.
-type IScrollChainBatch struct {
-	Blocks           []IScrollChainBlockContext
-	PrevStateRoot    common.Hash
-	NewStateRoot     common.Hash
-	WithdrawTrieRoot common.Hash
-	BatchIndex       uint64
-	ParentBatchHash  common.Hash
-	L2Transactions   []byte
-}
-
-// 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
-}

bridge-history-api/cmd/backend_server/app/app.go

@@ -5,7 +5,6 @@ import (
 	"os"
 
 	"github.com/ethereum/go-ethereum/log"
-	"github.com/iris-contrib/middleware/cors"
 	"github.com/kataras/iris/v12"
 	"github.com/kataras/iris/v12/mvc"
 	"github.com/urfave/cli/v2"
@@ -61,11 +60,6 @@ func init() {
 }
 
 func action(ctx *cli.Context) error {
-	corsOptions := cors.New(cors.Options{
-		AllowedOrigins:   []string{"*"},
-		AllowedMethods:   []string{"GET", "POST", "PUT", "DELETE"},
-		AllowCredentials: true,
-	})
 	// Load config file.
 	cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
 	cfg, err := config.NewConfig(cfgFile)
@@ -78,14 +72,13 @@ func action(ctx *cli.Context) error {
 	}
 	defer database.Close()
 	bridgeApp := iris.New()
-	bridgeApp.UseRouter(corsOptions)
 	bridgeApp.Get("/ping", pong).Describe("healthcheck")
 
 	mvc.Configure(bridgeApp.Party("/api/txs"), setupQueryByAddressHandler)
 	mvc.Configure(bridgeApp.Party("/api/txsbyhashes"), setupQueryByHashHandler)
 
 	// TODO: make debug mode configurable
-	err = bridgeApp.Listen(cfg.Server.HostPort, iris.WithLogLevel("debug"))
+	err = bridgeApp.Listen(":8080", iris.WithLogLevel("debug"))
 	if err != nil {
 		log.Crit("can not start server", "err", err)
 	}

bridge-history-api/cmd/cross_msg_fetcher/app/app.go

@@ -98,14 +98,6 @@ func action(ctx *cli.Context) error {
 	go l2crossMsgFetcher.Start()
 	defer l2crossMsgFetcher.Stop()
 
-	l1BlocktimeFetcher := cross_msg.NewBlocktimestampFetcher(subCtx, uint(cfg.L1.Confirmation), int(cfg.L1.BlockTime), l1client, db.UpdateL1Blocktimestamp, db.GetL1EarliestNoBlocktimestampHeight)
-	go l1BlocktimeFetcher.Start()
-	defer l1BlocktimeFetcher.Stop()
-
-	l2BlocktimeFetcher := cross_msg.NewBlocktimestampFetcher(subCtx, uint(cfg.L2.Confirmation), int(cfg.L2.BlockTime), l2client, db.UpdateL2Blocktimestamp, db.GetL2EarliestNoBlocktimestampHeight)
-	go l2BlocktimeFetcher.Start()
-	defer l2BlocktimeFetcher.Stop()
-
 	// Catch CTRL-C to ensure a graceful shutdown.
 	interrupt := make(chan os.Signal, 1)
 	signal.Notify(interrupt, os.Interrupt)

bridge-history-api/config.json

@@ -2,36 +2,33 @@
 	"l1": {
 		"confirmation": 64,
 		"endpoint": "https://rpc.ankr.com/eth_goerli",
-		"startHeight": 9090194 ,
+		"startHeight": 8890194 ,
 		"blockTime": 10,
-		"MessengerAddr": "0x326517Eb8eB1Ce5eaB5b513C2e9A24839b402d90",
-		"ETHGatewayAddr": "0x8305cB7B8448677736095965B63d7431017328fe",
-		"WETHGatewayAddr": "0xe3bA3c60d99a2d9a5f817734bC85353470b23931",
-		"StandardERC20Gateway": "0x16c1079B27eD9c363B7D08aC5Ae937A398972A5C",
-		"CustomERC20GatewayAddr": "0x61f08caD3d6F77801167d3bA8669433701586643",
-		"ERC721GatewayAddr": "0x4A73D25A4C99CB912acaf6C5B5e554f2982201c5",
-		"ERC1155GatewayAddr": "0xa3F5DD3033698c2832C53f3C3Fe6E062F58cD808"
+		"MessengerAddr": "0x5260e38080BFe97e6C4925d9209eCc5f964373b6",
+		"ETHGatewayAddr": "0x429b73A21cF3BF1f3E696a21A95408161daF311f",
+		"WETHGatewayAddr": "0x8be69E499D8848DfFb4cF9bac909f3e2cF2FeFa0",
+		"StandardERC20Gateway": "0xeF37207c1A1efF6D6a9d7BfF3cF4270e406d319b",
+		"CustomERC20GatewayAddr": "0x920f906B814597cF5DC76F95100F09CBAF9c5748",
+		"ERC721GatewayAddr": "0x1C441Dfc5C2eD7A2AA8636748A664E59CB029157",
+		"ERC1155GatewayAddr": "0xd1bE599aaCBC21448fD6373bbc7c1b4c7806f135"
 	},
 	"l2": {
 		"confirmation": 1,
-		"endpoint": "http://staging-l2geth-rpc0.scroll.tech:8545",
+		"endpoint": "https://alpha-rpc.scroll.io/l2",
 		"blockTime": 3,
-		"startHeight": 0,
-		"CustomERC20GatewayAddr": "0x905db21f836749fEeD12de781afc4A5Ab4Dd0d51",
-		"ERC721GatewayAddr": "0xC53D835514780664BCd7eCfcE7c2E5d9554dc41B",
-		"StandardERC20Gateway": "0x90271634BCB020e06ea4840C3f7aa61b8F860651",
-		"MessengerAddr": "0xE8b0956Ac75c65Aa1669e83888DA13afF2E108f4",
-		"ETHGatewayAddr": "0xD5938590D5dD8ce95812D4D515a219C12C551D67",
-		"WETHGatewayAddr": "0xb0aaA582564fade4232a16fdB1383004A6A7247F",
-		"ERC1155GatewayAddr": "0x4f33B1655619c2C0B7C450128Df760B4365Cb549"
+		"startHeight": 1600068,
+		"CustomERC20GatewayAddr": "0xa07Cb742657294C339fB4d5d6CdF3fdBeE8C1c68",
+		"ERC721GatewayAddr": "0x8Fee20e0C0Ef16f2898a8073531a857D11b9C700",
+		"StandardERC20Gateway": "0xB878F37BB278bf0e4974856fFe86f5e6F66BD725",
+		"MessengerAddr": "0xb75d7e84517e1504C151B270255B087Fd746D34C",
+		"ETHGatewayAddr": "0x32139B5C8838E94fFcD83E60dff95Daa7F0bA14c",
+		"WETHGatewayAddr": "0xBb88bF582F2BBa46702621dae5CB9271057bC85b",
+		"ERC1155GatewayAddr": "0x2946cB860028276b3C4bccE1767841641C2E0828"
 	},
 	"db": {
 		"dsn": "postgres://postgres:1234@localhost:5444/test?sslmode=disable",
 		"driverName": "postgres",
 		"maxOpenNum": 200,
 		"maxIdleNum": 20
-	},
-	"server": {
-		"hostPort": "0.0.0.0:20006"
 	}
 }

bridge-history-api/config/config.go

@@ -30,10 +30,6 @@ type LayerConfig struct {
 	CustomERC20GatewayAddr string `json:"CustomERC20GatewayAddr"`
 }
 
-type ServerConfig struct {
-	HostPort string `json:"hostPort"`
-}
-
 // Config is the configuration of the bridge history backend
 type Config struct {
 	// chain config
@@ -41,8 +37,7 @@ type Config struct {
 	L2 *LayerConfig `json:"l2"`
 
 	// data source name
-	DB     *DBConfig     `json:"db"`
-	Server *ServerConfig `json:"server"`
+	DB *DBConfig `json:"db"`
 }
 
 // NewConfig returns a new instance of Config.

bridge-history-api/controller/controller.go

@@ -16,7 +16,7 @@ type QueryHashController struct {
 }
 
 func (c *QueryAddressController) Get(req model.QueryByAddressRequest) (*model.QueryByAddressResponse, error) {
-	message, total, err := c.Service.GetTxsByAddress(common.HexToAddress(req.Address), int64(req.Offset), int64(req.Limit))
+	message, err := c.Service.GetTxsByAddress(common.HexToAddress(req.Address), int64(req.Offset), int64(req.Limit))
 	if err != nil {
 		return &model.QueryByAddressResponse{Message: "500", Data: &model.Data{}}, err
 	}
@@ -24,7 +24,7 @@ func (c *QueryAddressController) Get(req model.QueryByAddressRequest) (*model.Qu
 	return &model.QueryByAddressResponse{Message: "ok",
 		Data: &model.Data{
 			Result: message,
-			Total:  total,
+			Total:  len(message),
 		}}, nil
 }
 

bridge-history-api/cross_msg/block_timestamp_fetcher.go

@@ -1,79 +0,0 @@
-package cross_msg
-
-import (
-	"context"
-	"math/big"
-	"time"
-
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/ethereum/go-ethereum/log"
-)
-
-type GetEarliestNoBlocktimestampHeightFunc func() (uint64, error)
-type UpdateBlocktimestampFunc func(height uint64, timestamp time.Time) error
-
-type BlocktimestampFetcher struct {
-	ctx                                   context.Context
-	confirmation                          uint
-	blockTimeInSec                        int
-	client                                *ethclient.Client
-	updateBlocktimestampFunc              UpdateBlocktimestampFunc
-	getEarliestNoBlocktimestampHeightFunc GetEarliestNoBlocktimestampHeightFunc
-}
-
-func NewBlocktimestampFetcher(ctx context.Context, confirmation uint, blockTimeInSec int, client *ethclient.Client, updateBlocktimestampFunc UpdateBlocktimestampFunc, getEarliestNoBlocktimestampHeightFunc GetEarliestNoBlocktimestampHeightFunc) *BlocktimestampFetcher {
-	return &BlocktimestampFetcher{
-		ctx:                                   ctx,
-		confirmation:                          confirmation,
-		blockTimeInSec:                        blockTimeInSec,
-		client:                                client,
-		getEarliestNoBlocktimestampHeightFunc: getEarliestNoBlocktimestampHeightFunc,
-		updateBlocktimestampFunc:              updateBlocktimestampFunc,
-	}
-}
-
-func (b *BlocktimestampFetcher) Start() {
-	go func() {
-		tick := time.NewTicker(time.Duration(b.blockTimeInSec) * time.Second)
-		for {
-			select {
-			case <-b.ctx.Done():
-				tick.Stop()
-				return
-			case <-tick.C:
-				number, err := b.client.BlockNumber(b.ctx)
-				if err != nil {
-					log.Error("Can not get latest block number", "err", err)
-					continue
-				}
-				startHeight, err := b.getEarliestNoBlocktimestampHeightFunc()
-				if err != nil {
-					log.Error("Can not get latest record without block timestamp", "err", err)
-					continue
-				}
-				for height := startHeight; number >= height+uint64(b.confirmation) && height > 0; {
-					block, err := b.client.HeaderByNumber(b.ctx, new(big.Int).SetUint64(height))
-					if err != nil {
-						log.Error("Can not get block by number", "err", err)
-						break
-					}
-					err = b.updateBlocktimestampFunc(height, time.Unix(int64(block.Time), 0))
-					if err != nil {
-						log.Error("Can not update blocktimstamp into DB ", "err", err)
-						break
-					}
-					height, err = b.getEarliestNoBlocktimestampHeightFunc()
-					if err != nil {
-						log.Error("Can not get latest record without block timestamp", "err", err)
-						break
-					}
-				}
-			}
-		}
-	}()
-}
-
-func (b *BlocktimestampFetcher) Stop() {
-	log.Info("BlocktimestampFetcher Stop")
-	b.ctx.Done()
-}

bridge-history-api/cross_msg/msg_fetcher_test.go

@@ -1,6 +1,7 @@
 package cross_msg_test
 
 import (
+	"bridge-history-api/cross_msg"
 	"crypto/rand"
 	"math/big"
 	"testing"
@@ -8,8 +9,6 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/stretchr/testify/assert"
-
-	"bridge-history-api/cross_msg"
 )
 
 func TestMergeIntoList(t *testing.T) {

bridge-history-api/cross_msg/withdraw_trie.go

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

bridge-history-api/cross_msg/withdraw_trie_test.go

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

bridge-history-api/db/migrate/migrations/00001_cross_msg.sql

@@ -2,24 +2,23 @@
 -- +goose StatementBegin
 create table cross_message
 (
-    id              BIGSERIAL PRIMARY KEY,
-    msg_hash        VARCHAR NOT NULL DEFAULT '',
-    height          BIGINT  NOT NULL,
-    sender          VARCHAR NOT NULL,
-    target          VARCHAR NOT NULL,
-    amount          VARCHAR NOT NULL,
-    layer1_hash     VARCHAR NOT NULL DEFAULT '',
-    layer2_hash     VARCHAR NOT NULL DEFAULT '',
-    layer1_token    VARCHAR NOT NULL DEFAULT '',
-    layer2_token    VARCHAR NOT NULL DEFAULT '',
-    token_id        BIGINT NOT NULL DEFAULT 0,
-    asset           SMALLINT NOT NULL,
-    msg_type        SMALLINT NOT NULL,
-    is_deleted      BOOLEAN NOT NULL DEFAULT FALSE,
-    block_timestamp TIMESTAMP(0) DEFAULT NULL,
-    created_at      TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated_at      TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    deleted_at      TIMESTAMP(0) DEFAULT NULL
+    id           BIGSERIAL PRIMARY KEY,
+    msg_hash     VARCHAR NOT NULL DEFAULT '',
+    height       BIGINT  NOT NULL,
+    sender       VARCHAR NOT NULL,
+    target       VARCHAR NOT NULL,
+    amount       VARCHAR NOT NULL,
+    layer1_hash  VARCHAR NOT NULL DEFAULT '',
+    layer2_hash  VARCHAR NOT NULL DEFAULT '',
+    layer1_token VARCHAR NOT NULL DEFAULT '',
+    layer2_token VARCHAR NOT NULL DEFAULT '',
+    token_id     BIGINT NOT NULL DEFAULT 0,
+    asset        SMALLINT NOT NULL,
+    msg_type     SMALLINT NOT NULL,
+    is_deleted   BOOLEAN NOT NULL DEFAULT FALSE,
+    created_at   TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    updated_at   TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    deleted_at   TIMESTAMP(0) DEFAULT NULL
 );
 
 comment
@@ -49,20 +48,20 @@ CREATE TRIGGER update_timestamp BEFORE UPDATE
 ON cross_message FOR EACH ROW EXECUTE PROCEDURE
 update_timestamp();
 
-CREATE OR REPLACE FUNCTION deleted_at_trigger()
+CREATE OR REPLACE FUNCTION delete_at_trigger()
 RETURNS TRIGGER AS $$
 BEGIN
     IF NEW.is_deleted AND OLD.is_deleted != NEW.is_deleted THEN
-        UPDATE cross_message SET deleted_at = NOW() WHERE id = NEW.id;
+        UPDATE cross_message SET delete_at = NOW() WHERE id = NEW.id;
     END IF;
     RETURN NEW;
 END;
 $$ LANGUAGE plpgsql;
 
-CREATE TRIGGER deleted_at_trigger
+CREATE TRIGGER delete_at_trigger
 AFTER UPDATE ON cross_message
 FOR EACH ROW
-EXECUTE FUNCTION deleted_at_trigger();
+EXECUTE FUNCTION delete_at_trigger();
 
 
 -- +goose StatementEnd

bridge-history-api/db/migrate/migrations/00002_relayed_msg.sql

@@ -31,20 +31,20 @@ CREATE TRIGGER update_timestamp BEFORE UPDATE
 ON relayed_msg FOR EACH ROW EXECUTE PROCEDURE
 update_timestamp();
 
-CREATE OR REPLACE FUNCTION deleted_at_trigger()
+CREATE OR REPLACE FUNCTION delete_at_trigger()
 RETURNS TRIGGER AS $$
 BEGIN
     IF NEW.is_deleted AND OLD.is_deleted != NEW.is_deleted THEN
-        UPDATE relayed_msg SET deleted_at = NOW() WHERE id = NEW.id;
+        UPDATE relayed_msg SET delete_at = NOW() WHERE id = NEW.id;
     END IF;
     RETURN NEW;
 END;
 $$ LANGUAGE plpgsql;
 
-CREATE TRIGGER deleted_at_trigger
+CREATE TRIGGER delete_at_trigger
 AFTER UPDATE ON relayed_msg
 FOR EACH ROW
-EXECUTE FUNCTION deleted_at_trigger();
+EXECUTE FUNCTION delete_at_trigger();
 
 
 -- +goose StatementEnd

bridge-history-api/db/orm/interface.go

@@ -54,7 +54,6 @@ type CrossMsg struct {
 	Asset       int        `json:"asset" db:"asset"`
 	MsgType     int        `json:"msg_type" db:"msg_type"`
 	IsDeleted   bool       `json:"is_deleted" db:"is_deleted"`
-	Timestamp   *time.Time `json:"timestamp" db:"block_timestamp"`
 	CreatedAt   *time.Time `json:"created_at" db:"created_at"`
 	UpdatedAt   *time.Time `json:"updated_at" db:"updated_at"`
 	DeletedAt   *time.Time `json:"deleted_at" db:"deleted_at"`
@@ -77,8 +76,6 @@ type L1CrossMsgOrm interface {
 	UpdateL1CrossMsgHash(ctx context.Context, l1Hash, msgHash common.Hash) error
 	GetLatestL1ProcessedHeight() (int64, error)
 	DeleteL1CrossMsgAfterHeightDBTx(dbTx *sqlx.Tx, height int64) error
-	UpdateL1Blocktimestamp(height uint64, timestamp time.Time) error
-	GetL1EarliestNoBlocktimestampHeight() (uint64, error)
 }
 
 // L2CrossMsgOrm provides operations on l2_cross_message table
@@ -91,8 +88,6 @@ type L2CrossMsgOrm interface {
 	UpdateL2CrossMsgHash(ctx context.Context, l2Hash, msgHash common.Hash) error
 	GetLatestL2ProcessedHeight() (int64, error)
 	DeleteL2CrossMsgFromHeightDBTx(dbTx *sqlx.Tx, height int64) error
-	UpdateL2Blocktimestamp(height uint64, timestamp time.Time) error
-	GetL2EarliestNoBlocktimestampHeight() (uint64, error)
 }
 
 type RelayedMsgOrm interface {

bridge-history-api/db/orm/l1_cross_msg.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"database/sql"
 	"errors"
-	"time"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
@@ -119,22 +118,3 @@ func (l *l1CrossMsgOrm) DeleteL1CrossMsgAfterHeightDBTx(dbTx *sqlx.Tx, height in
 	}
 	return nil
 }
-
-func (l *l1CrossMsgOrm) UpdateL1Blocktimestamp(height uint64, timestamp time.Time) error {
-	if _, err := l.db.Exec(`UPDATE cross_message SET block_timestamp = $1 where height = $2 AND msg_type = $3 AND NOT is_deleted`, timestamp, height, Layer1Msg); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (l *l1CrossMsgOrm) GetL1EarliestNoBlocktimestampHeight() (uint64, error) {
-	row := l.db.QueryRowx(`SELECT height FROM cross_message WHERE block_timestamp IS NULL AND msg_type = $1 AND NOT is_deleted ORDER BY height ASC LIMIT 1;`, Layer1Msg)
-	var result uint64
-	if err := row.Scan(&result); err != nil {
-		if err == sql.ErrNoRows {
-			return 0, nil
-		}
-		return 0, err
-	}
-	return result, nil
-}

bridge-history-api/db/orm/l2_cross_msg.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"database/sql"
 	"errors"
-	"time"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
@@ -22,7 +21,7 @@ func NewL2CrossMsgOrm(db *sqlx.DB) L2CrossMsgOrm {
 
 func (l *l2CrossMsgOrm) GetL2CrossMsgByHash(l2Hash common.Hash) (*CrossMsg, error) {
 	result := &CrossMsg{}
-	row := l.db.QueryRowx(`SELECT * FROM cross_message WHERE layer2_hash = $1 AND NOT is_deleted;`, l2Hash.String())
+	row := l.db.QueryRowx(`SELECT * FROM l2_cross_message WHERE layer2_hash = $1 AND NOT is_deleted;`, l2Hash.String())
 	if err := row.StructScan(result); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
 			return nil, nil
@@ -122,22 +121,3 @@ func (l *l2CrossMsgOrm) GetLatestL2ProcessedHeight() (int64, error) {
 	}
 	return 0, nil
 }
-
-func (l *l2CrossMsgOrm) UpdateL2Blocktimestamp(height uint64, timestamp time.Time) error {
-	if _, err := l.db.Exec(`UPDATE cross_message SET block_timestamp = $1 where height = $2 AND msg_type = $3 AND NOT is_deleted`, timestamp, height, Layer2Msg); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (l *l2CrossMsgOrm) GetL2EarliestNoBlocktimestampHeight() (uint64, error) {
-	row := l.db.QueryRowx(`SELECT height FROM cross_message WHERE block_timestamp IS NULL AND msg_type = $1 AND NOT is_deleted ORDER BY height ASC LIMIT 1;`, Layer2Msg)
-	var result uint64
-	if err := row.Scan(&result); err != nil {
-		if err == sql.ErrNoRows {
-			return 0, nil
-		}
-		return 0, err
-	}
-	return result, nil
-}

bridge-history-api/db/orm_factory.go

@@ -16,7 +16,6 @@ type OrmFactory interface {
 	orm.L1CrossMsgOrm
 	orm.L2CrossMsgOrm
 	orm.RelayedMsgOrm
-	GetTotalCrossMsgCountByAddress(sender string) (uint64, error)
 	GetCrossMsgsByAddressWithOffset(sender string, offset int64, limit int64) ([]*orm.CrossMsg, error)
 	GetDB() *sqlx.DB
 	Beginx() (*sqlx.Tx, error)
@@ -60,19 +59,10 @@ func (o *ormFactory) Beginx() (*sqlx.Tx, error) {
 	return o.DB.Beginx()
 }
 
-func (o *ormFactory) GetTotalCrossMsgCountByAddress(sender string) (uint64, error) {
-	var count uint64
-	row := o.DB.QueryRowx(`SELECT COUNT(*) FROM cross_message WHERE sender = $1 AND NOT is_deleted;`, sender)
-	if err := row.Scan(&count); err != nil {
-		return 0, err
-	}
-	return count, nil
-}
-
 func (o *ormFactory) GetCrossMsgsByAddressWithOffset(sender string, offset int64, limit int64) ([]*orm.CrossMsg, error) {
 	para := sender
 	var results []*orm.CrossMsg
-	rows, err := o.DB.Queryx(`SELECT * FROM cross_message WHERE sender = $1 AND NOT is_deleted ORDER BY block_timestamp DESC NULLS FIRST, id DESC LIMIT $2 OFFSET $3;`, para, limit, offset)
+	rows, err := o.DB.Queryx(`SELECT * FROM cross_message WHERE sender = $1 AND NOT is_deleted ORDER BY id DESC LIMIT $2 OFFSET $3;`, para, limit, offset)
 	if err != nil || rows == nil {
 		return nil, err
 	}

bridge-history-api/go.mod

@@ -1,10 +1,9 @@
 module bridge-history-api
 
-go 1.19
+go 1.20
 
 require (
-	github.com/ethereum/go-ethereum v1.12.0
-	github.com/iris-contrib/middleware/cors v0.0.0-20230531125531-980d3a09a458
+	github.com/ethereum/go-ethereum v1.11.6
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/kataras/iris/v12 v12.2.0
 	github.com/lib/pq v1.10.7
@@ -27,7 +26,6 @@ require (
 	github.com/andybalholm/brotli v1.0.5 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bits-and-blooms/bitset v1.7.0 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/btcsuite/btcd v0.20.1-beta // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
@@ -36,17 +34,14 @@ require (
 	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
 	github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 // indirect
 	github.com/cockroachdb/redact v1.1.3 // indirect
-	github.com/consensys/bavard v0.1.13 // indirect
-	github.com/consensys/gnark-crypto v0.10.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	github.com/crate-crypto/go-kzg-4844 v0.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set/v2 v2.1.0 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
 	github.com/deepmap/oapi-codegen v1.8.2 // indirect
 	github.com/docker/docker v20.10.21+incompatible // indirect
+	github.com/edsrzf/mmap-go v1.0.0 // indirect
 	github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 // indirect
-	github.com/ethereum/c-kzg-4844 v0.2.0 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // indirect
 	github.com/flosch/pongo2/v4 v4.0.2 // indirect
@@ -97,7 +92,6 @@ require (
 	github.com/microcosm-cc/bluemonday v1.0.23 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/pointerstructure v1.2.0 // indirect
-	github.com/mmcloughlin/addchain v0.4.0 // indirect
 	github.com/nats-io/nats.go v1.23.0 // indirect
 	github.com/nats-io/nkeys v0.3.0 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
@@ -121,7 +115,6 @@ require (
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/status-im/keycard-go v0.2.0 // indirect
-	github.com/supranational/blst v0.3.11-0.20230406105308-e9dfc5ee724b // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
 	github.com/tdewolff/minify/v2 v2.12.4 // indirect
 	github.com/tdewolff/parse/v2 v2.6.4 // indirect
@@ -149,6 +142,5 @@ require (
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	rsc.io/tmplfunc v0.0.3 // indirect
 
 )

bridge-history-api/go.sum

@@ -32,8 +32,6 @@ github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd3
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bits-and-blooms/bitset v1.7.0 h1:YjAGVd3XmtK9ktAbX8Zg2g2PwLIMjGREZJHlV4j7NEo=
-github.com/bits-and-blooms/bitset v1.7.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/btcsuite/btcd v0.20.1-beta h1:Ik4hyJqN8Jfyv3S4AGBOmyouMsYE3EdYODkMbQjwPGw=
@@ -67,18 +65,12 @@ github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811/go.mod h1:Nb5lg
 github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ=
 github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
 github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM=
-github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ=
-github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI=
-github.com/consensys/gnark-crypto v0.10.0 h1:zRh22SR7o4K35SoNqouS9J/TKHTyU2QWaj5ldehyXtA=
-github.com/consensys/gnark-crypto v0.10.0/go.mod h1:Iq/P3HHl0ElSjsg2E1gsMwhAyxnxoKK5nVyZKd+/KhU=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 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/crate-crypto/go-kzg-4844 v0.2.0 h1:UVuHOE+5tIWrim4zf/Xaa43+MIsDCPyW76QhUpiMGj4=
-github.com/crate-crypto/go-kzg-4844 v0.2.0/go.mod h1:SBP7ikXEgDnUPONgm33HtuDZEDtWa3L4QtN1ocJSEQ4=
 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/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -100,6 +92,8 @@ github.com/djherbis/atime v1.1.0/go.mod h1:28OF6Y8s3NQWwacXc5eZTsEsiMzp7LF8MbXE+
 github.com/docker/docker v20.10.21+incompatible h1:UTLdBmHk3bEY+w8qeO5KttOhy6OmXWsl/FEet9Uswog=
 github.com/docker/docker v20.10.21+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
+github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385 h1:clC1lXBpe2kTj2VHdaIu9ajZQe4kcEY9j0NsnDDBZ3o=
 github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -107,10 +101,8 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
-github.com/ethereum/c-kzg-4844 v0.2.0 h1:+cUvymlnoDDQgMInp25Bo3OmLajmmY8mLJ/tLjqd77Q=
-github.com/ethereum/c-kzg-4844 v0.2.0/go.mod h1:WI2Nd82DMZAAZI1wV2neKGost9EKjvbpQR9OqE5Qqa8=
-github.com/ethereum/go-ethereum v1.12.0 h1:bdnhLPtqETd4m3mS8BGMNvBTf36bO5bx/hxE2zljOa0=
-github.com/ethereum/go-ethereum v1.12.0/go.mod h1:/oo2X/dZLJjf2mJ6YT9wcWxa4nNJDBKDBU6sFIpx1Gs=
+github.com/ethereum/go-ethereum v1.11.6 h1:2VF8Mf7XiSUfmoNOy3D+ocfl9Qu8baQBrCNbo2CXQ8E=
+github.com/ethereum/go-ethereum v1.11.6/go.mod h1:+a8pUj1tOyJ2RinsNQD4326YS+leSoKGiG/uVVb0x6Y=
 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
 github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo=
 github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
@@ -201,7 +193,6 @@ github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/uuid v1.1.2/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=
@@ -242,8 +233,6 @@ github.com/iris-contrib/go.uuid v2.0.0+incompatible h1:XZubAYg61/JwnJNbZilGjf3b3
 github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
 github.com/iris-contrib/httpexpect/v2 v2.12.1 h1:3cTZSyBBen/kfjCtgNFoUKi1u0FVXNaAjyRJOo6AVS4=
 github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk=
-github.com/iris-contrib/middleware/cors v0.0.0-20230531125531-980d3a09a458 h1:V60rHQJc6DieKV1BqHIGclraPdO4kinuFAZIrPGHN7s=
-github.com/iris-contrib/middleware/cors v0.0.0-20230531125531-980d3a09a458/go.mod h1:7eVziAp1yUwFB/ZMg71n84VWQH+7wukvxcHuF2e7cbg=
 github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g=
 github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw=
 github.com/iris-contrib/schema v0.0.6 h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw=
@@ -301,7 +290,6 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
 github.com/labstack/echo/v4 v4.5.0/go.mod h1:czIriw4a0C1dFun+ObrXp7ok03xON0N1awStJ6ArI7Y=
 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/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
 github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
@@ -353,9 +341,6 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
 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/mmcloughlin/addchain v0.4.0 h1:SobOdjm2xLj1KkXN5/n0xTIWyZA2+s99UCY1iPfkHRY=
-github.com/mmcloughlin/addchain v0.4.0/go.mod h1:A86O+tHqZLMNO4w6ZZ4FlVQEadcoqkyU72HC5wJ4RlU=
-github.com/mmcloughlin/profile v0.1.1/go.mod h1:IhHD7q1ooxgwTgjxQYkACGA77oFTDdFVejUS1/tS/qU=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
@@ -468,8 +453,6 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 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/supranational/blst v0.3.11-0.20230406105308-e9dfc5ee724b h1:u49mjRnygnB34h8OKbnNJFVUtWSKIKb1KukdV8bILUM=
-github.com/supranational/blst v0.3.11-0.20230406105308-e9dfc5ee724b/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
 github.com/tdewolff/minify/v2 v2.12.4 h1:kejsHQMM17n6/gwdw53qsi6lg0TGddZADVyQOz1KMdE=
@@ -737,5 +720,3 @@ modernc.org/sqlite v1.18.1 h1:ko32eKt3jf7eqIkCgPAeHMBXw3riNSLhl2f3loEF7o8=
 modernc.org/strutil v1.1.2 h1:iFBDH6j1Z0bN/Q9udJnnFoFpENA4252qe/7/5woE5MI=
 modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk=
 moul.io/http2curl/v2 v2.3.0 h1:9r3JfDzWPcbIklMOs2TnIFzDYvfAZvjeavG6EzP7jYs=
-rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU=
-rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA=

bridge-history-api/model/response.go

@@ -4,7 +4,7 @@ import "bridge-history-api/service"
 
 type Data struct {
 	Result []*service.TxHistoryInfo `json:"result"`
-	Total  uint64                   `json:"total"`
+	Total  int                      `json:"total"`
 }
 
 type QueryByAddressResponse struct {

bridge-history-api/service/service.go

@@ -32,7 +32,7 @@ type TxHistoryInfo struct {
 
 // HistoryService example service.
 type HistoryService interface {
-	GetTxsByAddress(address common.Address, offset int64, limit int64) ([]*TxHistoryInfo, uint64, error)
+	GetTxsByAddress(address common.Address, offset int64, limit int64) ([]*TxHistoryInfo, error)
 	GetTxsByHashes(hashes []string) ([]*TxHistoryInfo, error)
 }
 
@@ -69,25 +69,20 @@ func updateCrossTxHash(msgHash string, txInfo *TxHistoryInfo, db db.OrmFactory)
 
 }
 
-func (h *historyBackend) GetTxsByAddress(address common.Address, offset int64, limit int64) ([]*TxHistoryInfo, uint64, error) {
-	var txHistories []*TxHistoryInfo
-	total, err := h.db.GetTotalCrossMsgCountByAddress(address.String())
-	if err != nil || total == 0 {
-		return txHistories, 0, err
-	}
+func (h *historyBackend) GetTxsByAddress(address common.Address, offset int64, limit int64) ([]*TxHistoryInfo, error) {
+	txHistories := make([]*TxHistoryInfo, 0)
 	result, err := h.db.GetCrossMsgsByAddressWithOffset(address.String(), offset, limit)
 	if err != nil {
-		return nil, 0, err
+		return nil, err
 	}
 	for _, msg := range result {
 		txHistory := &TxHistoryInfo{
-			Hash:           msg.Layer1Hash + msg.Layer2Hash,
-			Amount:         msg.Amount,
-			To:             msg.Target,
-			IsL1:           msg.MsgType == int(orm.Layer1Msg),
-			BlockNumber:    msg.Height,
-			BlockTimestamp: msg.Timestamp,
-			CreatedAt:      msg.CreatedAt,
+			Hash:        msg.MsgHash,
+			Amount:      msg.Amount,
+			To:          msg.Target,
+			IsL1:        msg.MsgType == int(orm.Layer1Msg),
+			BlockNumber: msg.Height,
+			CreatedAt:   msg.CreatedAt,
 			FinalizeTx: &Finalized{
 				Hash: "",
 			},
@@ -95,7 +90,7 @@ func (h *historyBackend) GetTxsByAddress(address common.Address, offset int64, l
 		updateCrossTxHash(msg.MsgHash, txHistory, h.db)
 		txHistories = append(txHistories, txHistory)
 	}
-	return txHistories, total, nil
+	return txHistories, nil
 }
 
 func (h *historyBackend) GetTxsByHashes(hashes []string) ([]*TxHistoryInfo, error) {
@@ -107,13 +102,12 @@ func (h *historyBackend) GetTxsByHashes(hashes []string) ([]*TxHistoryInfo, erro
 		}
 		if l1result != nil {
 			txHistory := &TxHistoryInfo{
-				Hash:           l1result.Layer1Hash,
-				Amount:         l1result.Amount,
-				To:             l1result.Target,
-				IsL1:           true,
-				BlockNumber:    l1result.Height,
-				BlockTimestamp: l1result.Timestamp,
-				CreatedAt:      l1result.CreatedAt,
+				Hash:        l1result.Layer1Hash,
+				Amount:      l1result.Amount,
+				To:          l1result.Target,
+				IsL1:        true,
+				BlockNumber: l1result.Height,
+				CreatedAt:   l1result.CreatedAt,
 				FinalizeTx: &Finalized{
 					Hash: "",
 				},
@@ -128,13 +122,12 @@ func (h *historyBackend) GetTxsByHashes(hashes []string) ([]*TxHistoryInfo, erro
 		}
 		if l2result != nil {
 			txHistory := &TxHistoryInfo{
-				Hash:           l2result.Layer2Hash,
-				Amount:         l2result.Amount,
-				To:             l2result.Target,
-				IsL1:           false,
-				BlockNumber:    l2result.Height,
-				BlockTimestamp: l2result.Timestamp,
-				CreatedAt:      l2result.CreatedAt,
+				Hash:        l2result.Layer2Hash,
+				Amount:      l2result.Amount,
+				To:          l2result.Target,
+				IsL1:        false,
+				BlockNumber: l2result.Height,
+				CreatedAt:   l2result.CreatedAt,
 				FinalizeTx: &Finalized{
 					Hash: "",
 				},

bridge-history-api/utils/utils.go

@@ -1,9 +1,7 @@
 package utils
 
 import (
-	"bytes"
 	"context"
-	"errors"
 	"fmt"
 	"math/big"
 
@@ -16,11 +14,6 @@ import (
 	backendabi "bridge-history-api/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()[:]...)))
-}
-
 func GetSafeBlockNumber(ctx context.Context, client *ethclient.Client, confirmations uint64) (uint64, error) {
 	number, err := client.BlockNumber(ctx)
 	if err != nil || number <= confirmations {
@@ -61,48 +54,3 @@ func ComputeMessageHash(
 	data, _ := backendabi.L2ScrollMessengerABI.Pack("relayMessage", sender, target, value, messageNonce, message)
 	return common.BytesToHash(crypto.Keccak256(data))
 }
-
-// GetBatchRangeFromCalldataV1 find the block range from calldata, both inclusive.
-func GetBatchRangeFromCalldataV1(calldata []byte) ([]uint64, []uint64, []uint64, error) {
-	var batchIndices []uint64
-	var startBlocks []uint64
-	var finishBlocks []uint64
-	if bytes.Equal(calldata[0:4], common.Hex2Bytes("cb905499")) {
-		// commitBatches
-		method := backendabi.ScrollChainABI.Methods["commitBatches"]
-		values, err := method.Inputs.Unpack(calldata[4:])
-		if err != nil {
-			return batchIndices, startBlocks, finishBlocks, err
-		}
-		args := make([]backendabi.IScrollChainBatch, len(values))
-		err = method.Inputs.Copy(&args, values)
-		if err != nil {
-			return batchIndices, startBlocks, finishBlocks, err
-		}
-
-		for i := 0; i < len(args); i++ {
-			batchIndices = append(batchIndices, args[i].BatchIndex)
-			startBlocks = append(startBlocks, args[i].Blocks[0].BlockNumber)
-			finishBlocks = append(finishBlocks, args[i].Blocks[len(args[i].Blocks)-1].BlockNumber)
-		}
-	} else if bytes.Equal(calldata[0:4], common.Hex2Bytes("8c73235d")) {
-		// commitBatch
-		method := backendabi.ScrollChainABI.Methods["commitBatch"]
-		values, err := method.Inputs.Unpack(calldata[4:])
-		if err != nil {
-			return batchIndices, startBlocks, finishBlocks, err
-		}
-
-		args := backendabi.IScrollChainBatch{}
-		err = method.Inputs.Copy(&args, values)
-		if err != nil {
-			return batchIndices, startBlocks, finishBlocks, err
-		}
-		batchIndices = append(batchIndices, args.BatchIndex)
-		startBlocks = append(startBlocks, args.Blocks[0].BlockNumber)
-		finishBlocks = append(finishBlocks, args.Blocks[len(args.Blocks)-1].BlockNumber)
-	} else {
-		return batchIndices, startBlocks, finishBlocks, errors.New("invalid selector")
-	}
-	return batchIndices, startBlocks, finishBlocks, nil
-}

bridge-history-api/utils/utils_test.go

@@ -1,48 +0,0 @@
-package utils_test
-
-import (
-	"os"
-	"testing"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/stretchr/testify/assert"
-
-	"bridge-history-api/utils"
-)
-
-func TestKeccak2(t *testing.T) {
-	a := common.HexToHash("0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0")
-	b := common.HexToHash("0x222ff5e0b5877792c2bc1670e2ccd0c2c97cd7bb1672a57d598db05092d3d72c")
-	c := utils.Keccak2(a, b)
-	assert.NotEmpty(t, c)
-	assert.NotEqual(t, a, c)
-	assert.NotEqual(t, b, c)
-	assert.Equal(t, "0xc0ffbd7f501bd3d49721b0724b2bff657cb2378f15d5a9b97cd7ea5bf630d512", c.Hex())
-}
-
-func TestGetBatchRangeFromCalldataV1(t *testing.T) {
-	calldata, err := os.ReadFile("../testdata/commit-batches-0x3095e91db7ba4a6fbf4654d607db322e58ff5579c502219c8024acaea74cf311.txt")
-	assert.NoError(t, err)
-
-	// multiple batches
-	batchIndices, startBlocks, finishBlocks, err := utils.GetBatchRangeFromCalldataV1(common.Hex2Bytes(string(calldata[:])))
-	assert.NoError(t, err)
-	assert.Equal(t, len(batchIndices), 5)
-	assert.Equal(t, len(startBlocks), 5)
-	assert.Equal(t, len(finishBlocks), 5)
-	assert.Equal(t, batchIndices[0], uint64(1))
-	assert.Equal(t, batchIndices[1], uint64(2))
-	assert.Equal(t, batchIndices[2], uint64(3))
-	assert.Equal(t, batchIndices[3], uint64(4))
-	assert.Equal(t, batchIndices[4], uint64(5))
-	assert.Equal(t, startBlocks[0], uint64(1))
-	assert.Equal(t, startBlocks[1], uint64(6))
-	assert.Equal(t, startBlocks[2], uint64(7))
-	assert.Equal(t, startBlocks[3], uint64(19))
-	assert.Equal(t, startBlocks[4], uint64(20))
-	assert.Equal(t, finishBlocks[0], uint64(5))
-	assert.Equal(t, finishBlocks[1], uint64(6))
-	assert.Equal(t, finishBlocks[2], uint64(18))
-	assert.Equal(t, finishBlocks[3], uint64(19))
-	assert.Equal(t, finishBlocks[4], uint64(20))
-}

bridge/abi/bridge_abi_test.go

@@ -1,4 +1,4 @@
-package bridgeabi
+package bridgeabi_test
 
 import (
 	"math/big"
@@ -6,35 +6,37 @@ import (
 
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/stretchr/testify/assert"
+
+	bridge_abi "scroll-tech/bridge/abi"
 )
 
 func TestEventSignature(t *testing.T) {
 	assert := assert.New(t)
 
-	assert.Equal(L1SentMessageEventSignature, common.HexToHash("104371f3b442861a2a7b82a070afbbaab748bb13757bf47769e170e37809ec1e"))
-	assert.Equal(L1RelayedMessageEventSignature, common.HexToHash("4641df4a962071e12719d8c8c8e5ac7fc4d97b927346a3d7a335b1f7517e133c"))
-	assert.Equal(L1FailedRelayedMessageEventSignature, common.HexToHash("99d0e048484baa1b1540b1367cb128acd7ab2946d1ed91ec10e3c85e4bf51b8f"))
+	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(L1CommitBatchEventSignature, common.HexToHash("2cdc615c74452778c0fb6184735e014c13aad2b62774fe0b09bd1dcc2cc14a62"))
-	assert.Equal(L1FinalizeBatchEventSignature, common.HexToHash("6be443154c959a7a1645b4392b6fa97d8e8ab6e8fd853d7085e8867083737d79"))
+	assert.Equal(bridge_abi.L1CommitBatchEventSignature, common.HexToHash("2cdc615c74452778c0fb6184735e014c13aad2b62774fe0b09bd1dcc2cc14a62"))
+	assert.Equal(bridge_abi.L1FinalizeBatchEventSignature, common.HexToHash("6be443154c959a7a1645b4392b6fa97d8e8ab6e8fd853d7085e8867083737d79"))
 
-	assert.Equal(L1QueueTransactionEventSignature, common.HexToHash("bdcc7517f8fe3db6506dfd910942d0bbecaf3d6a506dadea65b0d988e75b9439"))
+	assert.Equal(bridge_abi.L1QueueTransactionEventSignature, common.HexToHash("bdcc7517f8fe3db6506dfd910942d0bbecaf3d6a506dadea65b0d988e75b9439"))
 
-	assert.Equal(L2SentMessageEventSignature, common.HexToHash("104371f3b442861a2a7b82a070afbbaab748bb13757bf47769e170e37809ec1e"))
-	assert.Equal(L2RelayedMessageEventSignature, common.HexToHash("4641df4a962071e12719d8c8c8e5ac7fc4d97b927346a3d7a335b1f7517e133c"))
-	assert.Equal(L2FailedRelayedMessageEventSignature, common.HexToHash("99d0e048484baa1b1540b1367cb128acd7ab2946d1ed91ec10e3c85e4bf51b8f"))
+	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(L2ImportBlockEventSignature, common.HexToHash("a7823f45e1ee21f9530b77959b57507ad515a14fa9fa24d262ee80e79b2b5745"))
+	assert.Equal(bridge_abi.L2ImportBlockEventSignature, common.HexToHash("a7823f45e1ee21f9530b77959b57507ad515a14fa9fa24d262ee80e79b2b5745"))
 
-	assert.Equal(L2AppendMessageEventSignature, common.HexToHash("faa617c2d8ce12c62637dbce76efcc18dae60574aa95709bdcedce7e76071693"))
+	assert.Equal(bridge_abi.L2AppendMessageEventSignature, common.HexToHash("faa617c2d8ce12c62637dbce76efcc18dae60574aa95709bdcedce7e76071693"))
 }
 
 func TestPackRelayL2MessageWithProof(t *testing.T) {
 	assert := assert.New(t)
-	l1MessengerABI, err := L1ScrollMessengerMetaData.GetAbi()
+	l1MessengerABI, err := bridge_abi.L1ScrollMessengerMetaData.GetAbi()
 	assert.NoError(err)
 
-	proof := IL1ScrollMessengerL2MessageProof{
+	proof := bridge_abi.IL1ScrollMessengerL2MessageProof{
 		BatchHash:   common.Hash{},
 		MerkleProof: make([]byte, 0),
 	}
@@ -45,10 +47,10 @@ func TestPackRelayL2MessageWithProof(t *testing.T) {
 func TestPackCommitBatch(t *testing.T) {
 	assert := assert.New(t)
 
-	scrollChainABI, err := ScrollChainMetaData.GetAbi()
+	scrollChainABI, err := bridge_abi.ScrollChainMetaData.GetAbi()
 	assert.NoError(err)
 
-	header := IScrollChainBlockContext{
+	header := bridge_abi.IScrollChainBlockContext{
 		BlockHash:       common.Hash{},
 		ParentHash:      common.Hash{},
 		BlockNumber:     0,
@@ -59,8 +61,8 @@ func TestPackCommitBatch(t *testing.T) {
 		NumL1Messages:   0,
 	}
 
-	batch := IScrollChainBatch{
-		Blocks:           []IScrollChainBlockContext{header},
+	batch := bridge_abi.IScrollChainBatch{
+		Blocks:           []bridge_abi.IScrollChainBlockContext{header},
 		PrevStateRoot:    common.Hash{},
 		NewStateRoot:     common.Hash{},
 		WithdrawTrieRoot: common.Hash{},
@@ -75,7 +77,7 @@ func TestPackCommitBatch(t *testing.T) {
 func TestPackFinalizeBatchWithProof(t *testing.T) {
 	assert := assert.New(t)
 
-	l1RollupABI, err := ScrollChainMetaData.GetAbi()
+	l1RollupABI, err := bridge_abi.ScrollChainMetaData.GetAbi()
 	assert.NoError(err)
 
 	proof := make([]*big.Int, 10)
@@ -92,7 +94,7 @@ func TestPackFinalizeBatchWithProof(t *testing.T) {
 func TestPackRelayL1Message(t *testing.T) {
 	assert := assert.New(t)
 
-	l2MessengerABI, err := L2ScrollMessengerMetaData.GetAbi()
+	l2MessengerABI, err := bridge_abi.L2ScrollMessengerMetaData.GetAbi()
 	assert.NoError(err)
 
 	_, err = l2MessengerABI.Pack("relayMessage", common.Address{}, common.Address{}, big.NewInt(0), big.NewInt(0), make([]byte, 0))
@@ -102,7 +104,7 @@ func TestPackRelayL1Message(t *testing.T) {
 func TestPackSetL1BaseFee(t *testing.T) {
 	assert := assert.New(t)
 
-	l1GasOracleABI, err := L1GasPriceOracleMetaData.GetAbi()
+	l1GasOracleABI, err := bridge_abi.L1GasPriceOracleMetaData.GetAbi()
 	assert.NoError(err)
 
 	baseFee := big.NewInt(2333)
@@ -113,7 +115,7 @@ func TestPackSetL1BaseFee(t *testing.T) {
 func TestPackSetL2BaseFee(t *testing.T) {
 	assert := assert.New(t)
 
-	l2GasOracleABI, err := L2GasPriceOracleMetaData.GetAbi()
+	l2GasOracleABI, err := bridge_abi.L2GasPriceOracleMetaData.GetAbi()
 	assert.NoError(err)
 
 	baseFee := big.NewInt(2333)
@@ -124,7 +126,7 @@ func TestPackSetL2BaseFee(t *testing.T) {
 func TestPackImportBlock(t *testing.T) {
 	assert := assert.New(t)
 
-	l1BlockContainerABI := L1BlockContainerABI
+	l1BlockContainerABI := bridge_abi.L1BlockContainerABI
 
 	_, err := l1BlockContainerABI.Pack("importBlockHeader", common.Hash{}, make([]byte, 0), false)
 	assert.NoError(err)

bridge/cmd/event_watcher/app/app.go

@@ -11,29 +11,36 @@ import (
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/urfave/cli/v2"
 
+	"scroll-tech/database"
+
 	"scroll-tech/common/metrics"
-	cutils "scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
-	"scroll-tech/bridge/internal/config"
-	"scroll-tech/bridge/internal/controller/watcher"
-	"scroll-tech/bridge/internal/utils"
+	"scroll-tech/bridge/config"
+	"scroll-tech/bridge/watcher"
+
+	cutils "scroll-tech/common/utils"
 )
 
-var app *cli.App
+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)
 }
@@ -48,13 +55,15 @@ func action(ctx *cli.Context) error {
 
 	subCtx, cancel := context.WithCancel(ctx.Context)
 	// Init db connection
-	db, err := utils.InitDB(cfg.DBConfig)
-	if err != nil {
+	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()
-		if err = utils.CloseDB(db); err != nil {
+		err = ormFactory.Close()
+		if err != nil {
 			log.Error("can not close ormFactory", "error", err)
 		}
 	}()
@@ -72,8 +81,8 @@ func action(ctx *cli.Context) error {
 		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, db)
-	l2watcher := watcher.NewL2WatcherClient(ctx.Context, l2client, cfg.L2Config.Confirmations, cfg.L2Config.L2MessengerAddress, cfg.L2Config.L2MessageQueueAddress, cfg.L2Config.WithdrawTrieRootSlot, db)
+	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 {

bridge/cmd/gas_oracle/app/app.go

@@ -11,21 +11,27 @@ import (
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/urfave/cli/v2"
 
+	"scroll-tech/database"
+
 	"scroll-tech/common/metrics"
-	cutils "scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
-	"scroll-tech/bridge/internal/config"
-	"scroll-tech/bridge/internal/controller/relayer"
-	"scroll-tech/bridge/internal/controller/watcher"
-	"scroll-tech/bridge/internal/utils"
+	"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
+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"
@@ -33,9 +39,11 @@ func init() {
 	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)
 }
@@ -49,17 +57,18 @@ func action(ctx *cli.Context) error {
 	}
 	subCtx, cancel := context.WithCancel(ctx.Context)
 	// Init db connection
-	db, err := utils.InitDB(cfg.DBConfig)
-	if err != nil {
+	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()
-		if err = utils.CloseDB(db); err != nil {
+		err = ormFactory.Close()
+		if err != nil {
 			log.Error("can not close ormFactory", "error", err)
 		}
 	}()
-
 	// Start metrics server.
 	metrics.Serve(subCtx, ctx)
 
@@ -76,14 +85,14 @@ func action(ctx *cli.Context) error {
 		return err
 	}
 
-	l1watcher := watcher.NewL1WatcherClient(ctx.Context, l1client, cfg.L1Config.StartHeight, cfg.L1Config.Confirmations, cfg.L1Config.L1MessengerAddress, cfg.L1Config.L1MessageQueueAddress, cfg.L1Config.ScrollChainContractAddress, db)
+	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, db, cfg.L1Config.RelayerConfig)
+	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, db, cfg.L2Config.RelayerConfig)
+	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

bridge/cmd/mock_app.go

@@ -11,7 +11,7 @@ import (
 	"scroll-tech/common/docker"
 	"scroll-tech/common/utils"
 
-	"scroll-tech/bridge/internal/config"
+	"scroll-tech/bridge/config"
 )
 
 // MockApp mockApp-test client manager.

bridge/cmd/msg_relayer/app/app.go

@@ -11,20 +11,25 @@ import (
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/urfave/cli/v2"
 
+	"scroll-tech/database"
+
 	"scroll-tech/common/metrics"
-	cutils "scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
-	"scroll-tech/bridge/internal/config"
-	"scroll-tech/bridge/internal/controller/relayer"
-	"scroll-tech/bridge/internal/utils"
+	"scroll-tech/bridge/config"
+	"scroll-tech/bridge/relayer"
+
+	cutils "scroll-tech/common/utils"
 )
 
-var app *cli.App
+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"
@@ -32,9 +37,11 @@ func init() {
 	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)
 }
@@ -46,16 +53,18 @@ func action(ctx *cli.Context) error {
 	if err != nil {
 		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
 	}
-
 	subCtx, cancel := context.WithCancel(ctx.Context)
+
 	// Init db connection
-	db, err := utils.InitDB(cfg.DBConfig)
-	if err != nil {
+	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()
-		if err = utils.CloseDB(db); err != nil {
+		err = ormFactory.Close()
+		if err != nil {
 			log.Error("can not close ormFactory", "error", err)
 		}
 	}()
@@ -70,12 +79,12 @@ func action(ctx *cli.Context) error {
 		return err
 	}
 
-	l1relayer, err := relayer.NewLayer1Relayer(ctx.Context, db, cfg.L1Config.RelayerConfig)
+	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, db, cfg.L2Config.RelayerConfig)
+	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

bridge/cmd/rollup_relayer/app/app.go

@@ -11,27 +11,34 @@ import (
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/urfave/cli/v2"
 
+	"scroll-tech/database"
+
 	"scroll-tech/common/metrics"
-	cutils "scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
-	"scroll-tech/bridge/internal/config"
-	"scroll-tech/bridge/internal/controller/relayer"
-	"scroll-tech/bridge/internal/controller/watcher"
-	"scroll-tech/bridge/internal/utils"
+	"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
+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)
 	}
@@ -48,14 +55,16 @@ func action(ctx *cli.Context) error {
 	}
 
 	subCtx, cancel := context.WithCancel(ctx.Context)
-	// Init db connection
-	db, err := utils.InitDB(cfg.DBConfig)
-	if err != nil {
+
+	// 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()
-		if err = utils.CloseDB(db); err != nil {
+		err = ormFactory.Close()
+		if err != nil {
 			log.Error("can not close ormFactory", "error", err)
 		}
 	}()
@@ -70,19 +79,19 @@ func action(ctx *cli.Context) error {
 		return err
 	}
 
-	l2relayer, err := relayer.NewLayer2Relayer(ctx.Context, l2client, db, cfg.L2Config.RelayerConfig)
+	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, db)
+	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, db)
+	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) {

bridge/config.json

@@ -80,7 +80,6 @@
       "batch_commit_time_sec": 1200,
       "batch_blocks_limit": 100,
       "commit_tx_calldata_size_limit": 200000,
-      "commit_tx_batch_count_limit": 30,
       "public_input_config": {
         "max_tx_num": 44,
         "padding_tx_hash": "0x0000000000000000000000000000000000000000000000000000000000000000"

bridge/config/config.go

@@ -4,13 +4,15 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
+
+	"scroll-tech/database"
 )
 
 // Config load configuration items.
 type Config struct {
-	L1Config *L1Config `json:"l1_config"`
-	L2Config *L2Config `json:"l2_config"`
-	DBConfig *DBConfig `json:"db_config"`
+	L1Config *L1Config          `json:"l1_config"`
+	L2Config *L2Config          `json:"l2_config"`
+	DBConfig *database.DBConfig `json:"db_config"`
 }
 
 // NewConfig returns a new instance of Config.

bridge/config/config_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestConfig(t *testing.T) {
 	t.Run("Success Case", func(t *testing.T) {
-		cfg, err := NewConfig("../../conf/config.json")
+		cfg, err := NewConfig("../config.json")
 		assert.NoError(t, err)
 
 		assert.Len(t, cfg.L1Config.RelayerConfig.MessageSenderPrivateKeys, 1)

bridge/config/l2_config.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/scroll-tech/go-ethereum/common"
 
-	"scroll-tech/bridge/internal/types"
+	"scroll-tech/common/types"
 )
 
 // L2Config loads l2geth configuration items.
@@ -44,8 +44,6 @@ type BatchProposerConfig struct {
 	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"`
-	// Max number of batches in a commit transaction
-	CommitTxBatchCountLimit uint64 `json:"commit_tx_batch_count_limit"`
 	// The public input hash config
 	PublicInputConfig *types.PublicInputHashConfig `json:"public_input_config"`
 }

bridge/go.mod

@@ -1,21 +1,16 @@
 module scroll-tech/bridge
 
-go 1.19
+go 1.18
 
 require (
 	github.com/agiledragon/gomonkey/v2 v2.9.0
-	github.com/jmoiron/sqlx v1.3.5
-	github.com/lib/pq v1.10.7
 	github.com/orcaman/concurrent-map v1.0.0
 	github.com/orcaman/concurrent-map/v2 v2.0.1
-	github.com/pressly/goose/v3 v3.7.0
 	github.com/scroll-tech/go-ethereum v1.10.14-0.20230508165858-27a3830afa61
 	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
-	gorm.io/driver/postgres v1.5.0
-	gorm.io/gorm v1.25.1
 	modernc.org/mathutil v1.4.1
 )
 
@@ -26,27 +21,19 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set v1.8.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-sql-driver/mysql v1.7.0 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // 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/holiman/uint256 v1.2.2 // indirect
 	github.com/huin/goupnp v1.0.3 // indirect
 	github.com/iden3/go-iden3-crypto v0.0.15 // indirect
-	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
-	github.com/jackc/pgx/v5 v5.3.0 // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
-	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.18 // indirect
 	github.com/mattn/go-runewidth 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
@@ -64,9 +51,8 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	golang.org/x/crypto v0.9.0 // indirect
 	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.8.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

bridge/go.sum

@@ -29,14 +29,10 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI=
 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-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
-github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
 github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb h1:PBC98N2aIaM3XXiurYmW7fx4GZkL8feAMVq7nEjURHk=
-github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
 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/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
@@ -47,38 +43,21 @@ github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
 github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
-github.com/holiman/uint256 v1.2.2 h1:TXKcSGc2WaxPD2+bmzAsVthL4+pEN0YwXcL5qED83vk=
-github.com/holiman/uint256 v1.2.2/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw=
+github.com/holiman/uint256 v1.2.0 h1:gpSYcPLWGv4sG43I2mVLiDZCNDh/EpGjSk8tmtxitHM=
 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/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y=
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
 github.com/iden3/go-iden3-crypto v0.0.15 h1:4MJYlrot1l31Fzlo2sF56u7EVFeHHJkxGXXZCtESgK4=
 github.com/iden3/go-iden3-crypto v0.0.15/go.mod h1:dLpM4vEPJ3nDHzhWFXDjzkn1qHoBeOT/3UEhXsEsP3E=
-github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
-github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.3.0 h1:/NQi8KHMpKWHInxXesC8yD4DhkXPrVhmnwYkjp9AmBA=
-github.com/jackc/pgx/v5 v5.3.0/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8=
-github.com/jackc/puddle/v2 v2.2.0/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
-github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
-github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-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/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -86,9 +65,6 @@ 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/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
-github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
-github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
@@ -96,10 +72,8 @@ github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp9
 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/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/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/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -113,8 +87,6 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsK
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 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/pressly/goose/v3 v3.7.0 h1:jblaZul15uCIEKHRu5KUdA+5wDA7E60JC0TOthdrtf8=
-github.com/pressly/goose/v3 v3.7.0/go.mod h1:N5gqPdIzdxf3BiPWdmoPreIwHStkxsvKWE5xjUvfYNk=
 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=
@@ -123,7 +95,6 @@ github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
 github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 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.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 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=
@@ -147,11 +118,8 @@ github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9
 github.com/stretchr/objx v0.1.0/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.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-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/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 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=
@@ -165,68 +133,37 @@ github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa h1:5SqCsI/2Qya2bC
 github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
 golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/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-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/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-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/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-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-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/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-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/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 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.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
-golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 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=
@@ -236,19 +173,5 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 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=
-gorm.io/driver/postgres v1.5.0 h1:u2FXTy14l45qc3UeCJ7QaAXZmZfDDv0YrthvmRq1l0U=
-gorm.io/driver/postgres v1.5.0/go.mod h1:FUZXzO+5Uqg5zzwzv4KK49R8lvGIyscBOqYrtI1Ce9A=
-gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-gorm.io/gorm v1.25.1 h1:nsSALe5Pr+cM3V1qwwQ7rOkw+6UeLrX5O4v3llhHa64=
-gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
-modernc.org/cc/v3 v3.36.1 h1:CICrjwr/1M4+6OQ4HJZ/AHxjcwe67r5vPUF518MkO8A=
-modernc.org/ccgo/v3 v3.16.8 h1:G0QNlTqI5uVgczBWfGKs7B++EPwCfXPWGD2MdeKloDs=
-modernc.org/libc v1.16.19 h1:S8flPn5ZeXx6iw/8yNa986hwTQDrY8RXU7tObZuAozo=
 modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8=
 modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
-modernc.org/memory v1.1.1 h1:bDOL0DIDLQv7bWhP3gMvIrnoFw+Eo6F7a2QK9HPDiFU=
-modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
-modernc.org/sqlite v1.18.1 h1:ko32eKt3jf7eqIkCgPAeHMBXw3riNSLhl2f3loEF7o8=
-modernc.org/strutil v1.1.2 h1:iFBDH6j1Z0bN/Q9udJnnFoFpENA4252qe/7/5woE5MI=
-modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk=

bridge/internal/config/db.go

@@ -1,33 +0,0 @@
-package config
-
-import (
-	"encoding/json"
-	"os"
-	"path/filepath"
-)
-
-// DBConfig db config
-type DBConfig struct {
-	// data source name
-	DSN        string `json:"dsn"`
-	DriverName string `json:"driver_name"`
-
-	MaxOpenNum int `json:"maxOpenNum"`
-	MaxIdleNum int `json:"maxIdleNum"`
-}
-
-// NewDBConfig returns a new instance of Config.
-func NewDBConfig(file string) (*DBConfig, error) {
-	buf, err := os.ReadFile(filepath.Clean(file))
-	if err != nil {
-		return nil, err
-	}
-
-	cfg := &DBConfig{}
-	err = json.Unmarshal(buf, cfg)
-	if err != nil {
-		return nil, err
-	}
-
-	return cfg, nil
-}

bridge/internal/controller/relayer/common.go

@@ -1,20 +0,0 @@
-package relayer
-
-import "errors"
-
-const (
-	gasPriceDiffPrecision = 1000000
-
-	defaultGasPriceDiff = 50000 // 5%
-
-	defaultL1MessageRelayMinGasLimit = 130000 // should be enough for both ERC20 and ETH relay
-
-	defaultL2MessageRelayMinGasLimit = 200000
-)
-
-var (
-	// ErrExecutionRevertedMessageExpired error of Message expired
-	ErrExecutionRevertedMessageExpired = errors.New("execution reverted: Message expired")
-	// ErrExecutionRevertedAlreadySuccessExecuted error of Message was already successfully executed
-	ErrExecutionRevertedAlreadySuccessExecuted = errors.New("execution reverted: Message was already successfully executed")
-)

bridge/internal/controller/watcher/batch_proposer_test.go

@@ -1,208 +0,0 @@
-package watcher
-
-import (
-	"context"
-	"math"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/agiledragon/gomonkey/v2"
-	"github.com/scroll-tech/go-ethereum/common"
-	gethTtypes "github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/stretchr/testify/assert"
-	"gorm.io/gorm"
-
-	"scroll-tech/common/types"
-
-	"scroll-tech/bridge/internal/config"
-	"scroll-tech/bridge/internal/controller/relayer"
-	"scroll-tech/bridge/internal/orm"
-	bridgeTypes "scroll-tech/bridge/internal/types"
-	bridgeUtils "scroll-tech/bridge/internal/utils"
-)
-
-func testBatchProposerProposeBatch(t *testing.T) {
-	db := setupDB(t)
-	defer bridgeUtils.CloseDB(db)
-
-	p := &BatchProposer{
-		batchGasThreshold:       1000,
-		batchTxNumThreshold:     10,
-		batchTimeSec:            300,
-		commitCalldataSizeLimit: 500,
-	}
-
-	var blockTrace *orm.BlockTrace
-	patchGuard := gomonkey.ApplyMethodFunc(blockTrace, "GetL2WrappedBlocks", func(fields map[string]interface{}) ([]*bridgeTypes.WrappedBlock, error) {
-		hash, _ := fields["hash"].(string)
-		if hash == "blockWithLongData" {
-			longData := strings.Repeat("0", 1000)
-			return []*bridgeTypes.WrappedBlock{{
-				Transactions: []*gethTtypes.TransactionData{{
-					Data: longData,
-				}},
-			}}, nil
-		}
-		return []*bridgeTypes.WrappedBlock{{
-			Transactions: []*gethTtypes.TransactionData{{
-				Data: "short",
-			}},
-		}}, nil
-	})
-	defer patchGuard.Reset()
-	patchGuard.ApplyPrivateMethod(p, "createBatchForBlocks", func(*BatchProposer, []*types.BlockInfo) error {
-		return nil
-	})
-
-	block1 := orm.BlockTrace{Number: 1, GasUsed: 100, TxNum: 1, BlockTimestamp: uint64(time.Now().Unix()) - 200}
-	block2 := orm.BlockTrace{Number: 2, GasUsed: 200, TxNum: 2, BlockTimestamp: uint64(time.Now().Unix())}
-	block3 := orm.BlockTrace{Number: 3, GasUsed: 300, TxNum: 11, BlockTimestamp: uint64(time.Now().Unix())}
-	block4 := orm.BlockTrace{Number: 4, GasUsed: 1001, TxNum: 3, BlockTimestamp: uint64(time.Now().Unix())}
-	blockOutdated := orm.BlockTrace{Number: 1, GasUsed: 100, TxNum: 1, BlockTimestamp: uint64(time.Now().Add(-400 * time.Second).Unix())}
-	blockWithLongData := orm.BlockTrace{Hash: "blockWithLongData", Number: 5, GasUsed: 500, TxNum: 1, BlockTimestamp: uint64(time.Now().Unix())}
-
-	testCases := []struct {
-		description string
-		blocks      []orm.BlockTrace
-		expectedRes bool
-	}{
-		{"Empty block list", []orm.BlockTrace{}, false},
-		{"Single block exceeding gas threshold", []orm.BlockTrace{block4}, true},
-		{"Single block exceeding transaction number threshold", []orm.BlockTrace{block3}, true},
-		{"Multiple blocks meeting thresholds", []orm.BlockTrace{block1, block2, block3}, true},
-		{"Multiple blocks not meeting thresholds", []orm.BlockTrace{block1, block2}, false},
-		{"Outdated and valid block", []orm.BlockTrace{blockOutdated, block2}, true},
-		{"Single block with long data", []orm.BlockTrace{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) {
-	db := setupDB(t)
-	subCtx, cancel := context.WithCancel(context.Background())
-	defer func() {
-		bridgeUtils.CloseDB(db)
-		cancel()
-	}()
-	blockTraceOrm := orm.NewBlockTrace(db)
-	// Insert traces into db.
-	assert.NoError(t, blockTraceOrm.InsertWrappedBlocks([]*bridgeTypes.WrappedBlock{wrappedBlock1}))
-
-	l2cfg := cfg.L2Config
-	wc := NewL2WatcherClient(context.Background(), l2Cli, l2cfg.Confirmations, l2cfg.L2MessengerAddress, l2cfg.L2MessageQueueAddress, l2cfg.WithdrawTrieRootSlot, db)
-	loopToFetchEvent(subCtx, wc)
-
-	blockBatchOrm := orm.NewBlockBatch(db)
-	batch, err := blockBatchOrm.GetLatestBatch()
-	assert.NoError(t, err)
-
-	// Create a new batch.
-	batchData := bridgeTypes.NewBatchData(&bridgeTypes.BatchInfo{
-		Index:     0,
-		Hash:      batch.Hash,
-		StateRoot: batch.StateRoot,
-	}, []*bridgeTypes.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,
-		CommitTxBatchCountLimit: 30,
-	}, relayer, db)
-	proposer.TryProposeBatch()
-
-	infos, err := blockTraceOrm.GetUnbatchedL2Blocks(map[string]interface{}{}, []string{"number ASC"}, 100)
-	assert.NoError(t, err)
-	assert.Equal(t, 0, len(infos))
-
-	batches, err := blockBatchOrm.GetBlockBatches(map[string]interface{}{"hash": batchData.Hash().Hex()}, nil, 1)
-	assert.NoError(t, err)
-	assert.Equal(t, 1, len(batches))
-}
-
-func testBatchProposerGracefulRestart(t *testing.T) {
-	db := setupDB(t)
-	defer bridgeUtils.CloseDB(db)
-
-	relayer, err := relayer.NewLayer2Relayer(context.Background(), l2Cli, db, cfg.L2Config.RelayerConfig)
-	assert.NoError(t, err)
-
-	blockTraceOrm := orm.NewBlockTrace(db)
-	// Insert traces into db.
-	assert.NoError(t, blockTraceOrm.InsertWrappedBlocks([]*bridgeTypes.WrappedBlock{wrappedBlock2}))
-
-	// Insert block batch into db.
-	parentBatch1 := &bridgeTypes.BatchInfo{
-		Index:     0,
-		Hash:      common.Hash{}.String(),
-		StateRoot: common.Hash{}.String(),
-	}
-	batchData1 := bridgeTypes.NewBatchData(parentBatch1, []*bridgeTypes.WrappedBlock{wrappedBlock1}, nil)
-
-	parentBatch2 := &bridgeTypes.BatchInfo{
-		Index:     batchData1.Batch.BatchIndex,
-		Hash:      batchData1.Hash().Hex(),
-		StateRoot: batchData1.Batch.NewStateRoot.String(),
-	}
-	batchData2 := bridgeTypes.NewBatchData(parentBatch2, []*bridgeTypes.WrappedBlock{wrappedBlock2}, nil)
-
-	blockBatchOrm := orm.NewBlockBatch(db)
-	err = db.Transaction(func(tx *gorm.DB) error {
-		_, dbTxErr := blockBatchOrm.InsertBlockBatchByBatchData(tx, batchData1)
-		if dbTxErr != nil {
-			return dbTxErr
-		}
-		_, dbTxErr = blockBatchOrm.InsertBlockBatchByBatchData(tx, batchData2)
-		if dbTxErr != nil {
-			return dbTxErr
-		}
-		numbers1 := []uint64{batchData1.Batch.Blocks[0].BlockNumber}
-		hash1 := batchData1.Hash().Hex()
-		dbTxErr = blockTraceOrm.UpdateBatchHashForL2Blocks(tx, numbers1, hash1)
-		if dbTxErr != nil {
-			return dbTxErr
-		}
-		numbers2 := []uint64{batchData2.Batch.Blocks[0].BlockNumber}
-		hash2 := batchData2.Hash().Hex()
-		dbTxErr = blockTraceOrm.UpdateBatchHashForL2Blocks(tx, numbers2, hash2)
-		if dbTxErr != nil {
-			return dbTxErr
-		}
-		return nil
-	})
-	assert.NoError(t, err)
-	err = blockBatchOrm.UpdateRollupStatus(context.Background(), batchData1.Hash().Hex(), types.RollupFinalized)
-	assert.NoError(t, err)
-	batchHashes, err := blockBatchOrm.GetBlockBatchesHashByRollupStatus(types.RollupPending, 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,
-		CommitTxBatchCountLimit: 30,
-	}, relayer, db)
-
-	batchHashes, err = blockBatchOrm.GetBlockBatchesHashByRollupStatus(types.RollupPending, math.MaxInt32)
-	assert.NoError(t, err)
-	assert.Equal(t, 0, len(batchHashes))
-
-	batches, err := blockBatchOrm.GetBlockBatches(map[string]interface{}{"hash": batchData2.Hash().Hex()}, nil, 1)
-	assert.NoError(t, err)
-	assert.Equal(t, 1, len(batches))
-}

bridge/internal/orm/block_batch.go

@@ -1,314 +0,0 @@
-package orm
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"time"
-
-	"github.com/scroll-tech/go-ethereum/log"
-	"gorm.io/gorm"
-
-	"scroll-tech/common/types"
-	"scroll-tech/common/types/message"
-
-	bridgeTypes "scroll-tech/bridge/internal/types"
-)
-
-// BlockBatch is structure of stored block batch message
-type BlockBatch struct {
-	db *gorm.DB `gorm:"column:-"`
-
-	Hash             string     `json:"hash" gorm:"column:hash"`
-	Index            uint64     `json:"index" gorm:"column:index"`
-	StartBlockNumber uint64     `json:"start_block_number" gorm:"column:start_block_number"`
-	StartBlockHash   string     `json:"start_block_hash" gorm:"column:start_block_hash"`
-	EndBlockNumber   uint64     `json:"end_block_number" gorm:"column:end_block_number"`
-	EndBlockHash     string     `json:"end_block_hash" gorm:"column:end_block_hash"`
-	ParentHash       string     `json:"parent_hash" gorm:"column:parent_hash"`
-	StateRoot        string     `json:"state_root" gorm:"column:state_root"`
-	TotalTxNum       uint64     `json:"total_tx_num" gorm:"column:total_tx_num"`
-	TotalL1TxNum     uint64     `json:"total_l1_tx_num" gorm:"column:total_l1_tx_num"`
-	TotalL2Gas       uint64     `json:"total_l2_gas" gorm:"column:total_l2_gas"`
-	ProvingStatus    int        `json:"proving_status" gorm:"column:proving_status;default:1"`
-	Proof            []byte     `json:"proof" gorm:"column:proof"`
-	ProofTimeSec     uint64     `json:"proof_time_sec" gorm:"column:proof_time_sec;default:0"`
-	RollupStatus     int        `json:"rollup_status" gorm:"column:rollup_status;default:1"`
-	CommitTxHash     string     `json:"commit_tx_hash" gorm:"column:commit_tx_hash;default:NULL"`
-	OracleStatus     int        `json:"oracle_status" gorm:"column:oracle_status;default:1"`
-	OracleTxHash     string     `json:"oracle_tx_hash" gorm:"column:oracle_tx_hash;default:NULL"`
-	FinalizeTxHash   string     `json:"finalize_tx_hash" gorm:"column:finalize_tx_hash;default:NULL"`
-	CreatedAt        time.Time  `json:"created_at" gorm:"column:created_at;default:CURRENT_TIMESTAMP()"`
-	ProverAssignedAt *time.Time `json:"prover_assigned_at" gorm:"column:prover_assigned_at;default:NULL"`
-	ProvedAt         *time.Time `json:"proved_at" gorm:"column:proved_at;default:NULL"`
-	CommittedAt      *time.Time `json:"committed_at" gorm:"column:committed_at;default:NULL"`
-	FinalizedAt      *time.Time `json:"finalized_at" gorm:"column:finalized_at;default:NULL"`
-}
-
-// NewBlockBatch create an blockBatchOrm instance
-func NewBlockBatch(db *gorm.DB) *BlockBatch {
-	return &BlockBatch{db: db}
-}
-
-// TableName define the BlockBatch table name
-func (*BlockBatch) TableName() string {
-	return "block_batch"
-}
-
-// GetBatchCount get the batch count
-func (o *BlockBatch) GetBatchCount() (int64, error) {
-	var count int64
-	if err := o.db.Model(&BlockBatch{}).Count(&count).Error; err != nil {
-		return 0, err
-	}
-	return count, nil
-}
-
-// GetBlockBatches get the select block batches
-func (o *BlockBatch) GetBlockBatches(fields map[string]interface{}, orderByList []string, limit int) ([]BlockBatch, error) {
-	var blockBatches []BlockBatch
-	db := o.db
-	for key, value := range fields {
-		db = db.Where(key, value)
-	}
-
-	for _, orderBy := range orderByList {
-		db = db.Order(orderBy)
-	}
-
-	if limit != 0 {
-		db = db.Limit(limit)
-	}
-
-	if err := db.Find(&blockBatches).Error; err != nil {
-		return nil, err
-	}
-	return blockBatches, nil
-}
-
-// GetBlockBatchesHashByRollupStatus get the block batches by rollup status
-func (o *BlockBatch) GetBlockBatchesHashByRollupStatus(status types.RollupStatus, limit int) ([]string, error) {
-	var blockBatches []BlockBatch
-	err := o.db.Select("hash").Where("rollup_status", int(status)).Order("index ASC").Limit(limit).Find(&blockBatches).Error
-	if err != nil {
-		return nil, err
-	}
-
-	var hashes []string
-	for _, v := range blockBatches {
-		hashes = append(hashes, v.Hash)
-	}
-	return hashes, nil
-}
-
-// GetVerifiedProofByHash get verified proof and instance comments by hash
-func (o *BlockBatch) GetVerifiedProofByHash(hash string) (*message.AggProof, error) {
-	result := o.db.Model(&BlockBatch{}).Select("proof").Where("hash", hash).Where("proving_status", int(types.ProvingTaskVerified)).Row()
-	if result.Err() != nil {
-		return nil, result.Err()
-	}
-
-	var proofBytes []byte
-	if err := result.Scan(&proofBytes); err != nil {
-		return nil, err
-	}
-
-	var proof message.AggProof
-	if err := json.Unmarshal(proofBytes, &proof); err != nil {
-		return nil, err
-	}
-
-	return &proof, nil
-}
-
-// GetLatestBatch get the latest batch
-// because we will `initializeGenesis()` when we start the `L2Watcher`, so a batch must exist.
-func (o *BlockBatch) GetLatestBatch() (*BlockBatch, error) {
-	var blockBatch BlockBatch
-	err := o.db.Order("index DESC").Limit(1).First(&blockBatch).Error
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-		return nil, err
-	}
-	return &blockBatch, nil
-}
-
-// GetLatestBatchByRollupStatus get the latest block batch by rollup status
-func (o *BlockBatch) GetLatestBatchByRollupStatus(rollupStatuses []types.RollupStatus) (*BlockBatch, error) {
-	var tmpRollupStatus []int
-	for _, v := range rollupStatuses {
-		tmpRollupStatus = append(tmpRollupStatus, int(v))
-	}
-	var blockBatch BlockBatch
-	err := o.db.Where("rollup_status IN (?)", tmpRollupStatus).Order("index DESC").Limit(1).First(&blockBatch).Error
-	if err != nil {
-		return nil, err
-	}
-	return &blockBatch, nil
-}
-
-// GetRollupStatusByHashList get rollup status by hash list
-func (o *BlockBatch) GetRollupStatusByHashList(hashes []string) ([]types.RollupStatus, error) {
-	if len(hashes) == 0 {
-		return nil, nil
-	}
-
-	var blockBatches []BlockBatch
-	err := o.db.Select("hash, rollup_status").Where("hash IN (?)", hashes).Find(&blockBatches).Error
-	if err != nil {
-		return nil, err
-	}
-
-	var (
-		statuses   []types.RollupStatus
-		_statusMap = make(map[string]types.RollupStatus, len(hashes))
-	)
-	for _, _batch := range blockBatches {
-		_statusMap[_batch.Hash] = types.RollupStatus(_batch.RollupStatus)
-	}
-	for _, _hash := range hashes {
-		statuses = append(statuses, _statusMap[_hash])
-	}
-
-	return statuses, nil
-}
-
-// InsertBlockBatchByBatchData insert a block batch data by the BatchData
-func (o *BlockBatch) InsertBlockBatchByBatchData(tx *gorm.DB, batchData *bridgeTypes.BatchData) (int64, error) {
-	var db *gorm.DB
-	if tx != nil {
-		db = tx
-	} else {
-		db = o.db
-	}
-
-	numBlocks := len(batchData.Batch.Blocks)
-	insertBlockBatch := BlockBatch{
-		Hash:             batchData.Hash().Hex(),
-		Index:            batchData.Batch.BatchIndex,
-		StartBlockNumber: batchData.Batch.Blocks[0].BlockNumber,
-		StartBlockHash:   batchData.Batch.Blocks[0].BlockHash.Hex(),
-		EndBlockNumber:   batchData.Batch.Blocks[numBlocks-1].BlockNumber,
-		EndBlockHash:     batchData.Batch.Blocks[numBlocks-1].BlockHash.Hex(),
-		ParentHash:       batchData.Batch.ParentBatchHash.Hex(),
-		StateRoot:        batchData.Batch.NewStateRoot.Hex(),
-		TotalTxNum:       batchData.TotalTxNum,
-		TotalL1TxNum:     batchData.TotalL1TxNum,
-		TotalL2Gas:       batchData.TotalL2Gas,
-		CreatedAt:        time.Now(),
-	}
-	result := db.Create(&insertBlockBatch)
-	if result.Error != nil {
-		log.Error("failed to insert block batch by batchData", "err", result.Error)
-		return 0, result.Error
-	}
-	return result.RowsAffected, nil
-}
-
-// UpdateProvingStatus update the proving status
-func (o *BlockBatch) UpdateProvingStatus(hash string, status types.ProvingStatus) error {
-	updateFields := make(map[string]interface{})
-	updateFields["proving_status"] = int(status)
-
-	switch status {
-	case types.ProvingTaskAssigned:
-		updateFields["prover_assigned_at"] = time.Now()
-	case types.ProvingTaskUnassigned:
-		updateFields["prover_assigned_at"] = nil
-	case types.ProvingTaskProved, types.ProvingTaskVerified:
-		updateFields["proved_at"] = time.Now()
-	default:
-	}
-
-	if err := o.db.Model(&BlockBatch{}).Where("hash", hash).Updates(updateFields).Error; err != nil {
-		return err
-	}
-	return nil
-}
-
-// UpdateRollupStatus update the rollup status
-func (o *BlockBatch) UpdateRollupStatus(ctx context.Context, hash string, status types.RollupStatus) error {
-	updateFields := make(map[string]interface{})
-	updateFields["rollup_status"] = int(status)
-
-	switch status {
-	case types.RollupCommitted:
-		updateFields["committed_at"] = time.Now()
-	case types.RollupFinalized:
-		updateFields["finalized_at"] = time.Now()
-	}
-	if err := o.db.Model(&BlockBatch{}).WithContext(ctx).Where("hash", hash).Updates(updateFields).Error; err != nil {
-		return err
-	}
-	return nil
-}
-
-// UpdateSkippedBatches update the skipped batches
-func (o *BlockBatch) UpdateSkippedBatches() (int64, error) {
-	provingStatusList := []interface{}{
-		int(types.ProvingTaskSkipped),
-		int(types.ProvingTaskFailed),
-	}
-	result := o.db.Model(&BlockBatch{}).Where("rollup_status", int(types.RollupCommitted)).
-		Where("proving_status IN (?)", provingStatusList).Update("rollup_status", int(types.RollupFinalizationSkipped))
-	if result.Error != nil {
-		return 0, result.Error
-	}
-	return result.RowsAffected, nil
-}
-
-// UpdateCommitTxHashAndRollupStatus update the commit tx hash and rollup status
-func (o *BlockBatch) UpdateCommitTxHashAndRollupStatus(ctx context.Context, hash string, commitTxHash string, status types.RollupStatus) error {
-	updateFields := make(map[string]interface{})
-	updateFields["commit_tx_hash"] = commitTxHash
-	updateFields["rollup_status"] = int(status)
-	if status == types.RollupCommitted {
-		updateFields["committed_at"] = time.Now()
-	}
-	if err := o.db.WithContext(ctx).Model(&BlockBatch{}).Where("hash", hash).Updates(updateFields).Error; err != nil {
-		return err
-	}
-	return nil
-}
-
-// UpdateFinalizeTxHashAndRollupStatus update the finalize tx hash and rollup status
-func (o *BlockBatch) UpdateFinalizeTxHashAndRollupStatus(ctx context.Context, hash string, finalizeTxHash string, status types.RollupStatus) error {
-	updateFields := make(map[string]interface{})
-	updateFields["finalize_tx_hash"] = finalizeTxHash
-	updateFields["rollup_status"] = int(status)
-	if status == types.RollupFinalized {
-		updateFields["finalized_at"] = time.Now()
-	}
-	if err := o.db.WithContext(ctx).Model(&BlockBatch{}).Where("hash", hash).Updates(updateFields).Error; err != nil {
-		return err
-	}
-	return nil
-}
-
-// UpdateL2GasOracleStatusAndOracleTxHash update the l2 gas oracle status and oracle tx hash
-func (o *BlockBatch) UpdateL2GasOracleStatusAndOracleTxHash(ctx context.Context, hash string, status types.GasOracleStatus, txHash string) error {
-	updateFields := make(map[string]interface{})
-	updateFields["oracle_status"] = int(status)
-	updateFields["oracle_tx_hash"] = txHash
-	if err := o.db.WithContext(ctx).Model(&BlockBatch{}).Where("hash", hash).Updates(updateFields).Error; err != nil {
-		return err
-	}
-	return nil
-}
-
-// UpdateProofByHash update the block batch proof by hash
-// for unit test
-func (o *BlockBatch) UpdateProofByHash(ctx context.Context, hash string, proof *message.AggProof, proofTimeSec uint64) error {
-	proofBytes, err := json.Marshal(proof)
-	if err != nil {
-		return err
-	}
-
-	updateFields := make(map[string]interface{})
-	updateFields["proof"] = proofBytes
-	updateFields["proof_time_sec"] = proofTimeSec
-	err = o.db.WithContext(ctx).Model(&BlockBatch{}).Where("hash", hash).Updates(updateFields).Error
-	if err != nil {
-		log.Error("failed to update proof", "err", err)
-	}
-	return err
-}

bridge/internal/orm/block_trace.go

@@ -1,155 +0,0 @@
-package orm
-
-import (
-	"encoding/json"
-
-	"github.com/scroll-tech/go-ethereum/log"
-	"gorm.io/gorm"
-
-	"scroll-tech/bridge/internal/types"
-)
-
-// BlockTrace is structure of stored block trace message
-type BlockTrace struct {
-	db *gorm.DB `gorm:"column:-"`
-
-	Number         uint64 `json:"number" gorm:"number"`
-	Hash           string `json:"hash" gorm:"hash"`
-	ParentHash     string `json:"parent_hash" gorm:"parent_hash"`
-	Trace          string `json:"trace" gorm:"column:trace"`
-	BatchHash      string `json:"batch_hash" gorm:"batch_hash;default:NULL"`
-	TxNum          uint64 `json:"tx_num" gorm:"tx_num"`
-	GasUsed        uint64 `json:"gas_used" gorm:"gas_used"`
-	BlockTimestamp uint64 `json:"block_timestamp" gorm:"block_timestamp"`
-}
-
-// NewBlockTrace create an blockTraceOrm instance
-func NewBlockTrace(db *gorm.DB) *BlockTrace {
-	return &BlockTrace{db: db}
-}
-
-// TableName define the BlockTrace table name
-func (*BlockTrace) TableName() string {
-	return "block_trace"
-}
-
-// GetL2BlocksLatestHeight get the l2 blocks latest height
-func (o *BlockTrace) GetL2BlocksLatestHeight() (int64, error) {
-	result := o.db.Model(&BlockTrace{}).Select("COALESCE(MAX(number), -1)").Row()
-	if result.Err() != nil {
-		return -1, result.Err()
-	}
-	var maxNumber int64
-	if err := result.Scan(&maxNumber); err != nil {
-		return -1, err
-	}
-	return maxNumber, nil
-}
-
-// GetL2WrappedBlocks get the l2 wrapped blocks
-func (o *BlockTrace) GetL2WrappedBlocks(fields map[string]interface{}) ([]*types.WrappedBlock, error) {
-	var blockTraces []BlockTrace
-	db := o.db.Select("trace")
-	for key, value := range fields {
-		db = db.Where(key, value)
-	}
-	if err := db.Find(&blockTraces).Error; err != nil {
-		return nil, err
-	}
-
-	var wrappedBlocks []*types.WrappedBlock
-	for _, v := range blockTraces {
-		var wrappedBlock types.WrappedBlock
-		if err := json.Unmarshal([]byte(v.Trace), &wrappedBlock); err != nil {
-			break
-		}
-		wrappedBlocks = append(wrappedBlocks, &wrappedBlock)
-	}
-	return wrappedBlocks, nil
-}
-
-// GetL2BlockInfos get l2 block infos
-func (o *BlockTrace) GetL2BlockInfos(fields map[string]interface{}, orderByList []string, limit int) ([]BlockTrace, error) {
-	var blockTraces []BlockTrace
-	db := o.db.Select("number, hash, parent_hash, batch_hash, tx_num, gas_used, block_timestamp")
-	for key, value := range fields {
-		db = db.Where(key, value)
-	}
-
-	for _, orderBy := range orderByList {
-		db = db.Order(orderBy)
-	}
-
-	if limit != 0 {
-		db = db.Limit(limit)
-	}
-
-	if err := db.Find(&blockTraces).Error; err != nil {
-		return nil, err
-	}
-	return blockTraces, nil
-}
-
-// GetUnbatchedL2Blocks get unbatched l2 blocks
-func (o *BlockTrace) GetUnbatchedL2Blocks(fields map[string]interface{}, orderByList []string, limit int) ([]BlockTrace, error) {
-	var unbatchedBlockTraces []BlockTrace
-	db := o.db.Select("number, hash, parent_hash, batch_hash, tx_num, gas_used, block_timestamp").Where("batch_hash is NULL")
-	for key, value := range fields {
-		db = db.Where(key, value)
-	}
-	if err := db.Find(&unbatchedBlockTraces).Error; err != nil {
-		return nil, err
-	}
-	return unbatchedBlockTraces, nil
-}
-
-// InsertWrappedBlocks insert block to block trace
-func (o *BlockTrace) InsertWrappedBlocks(blocks []*types.WrappedBlock) error {
-	var blockTraces []BlockTrace
-	for _, block := range blocks {
-		number := block.Header.Number.Uint64()
-		hash := block.Header.Hash().String()
-		txNum := len(block.Transactions)
-		mtime := block.Header.Time
-		gasCost := block.Header.GasUsed
-
-		data, err := json.Marshal(block)
-		if err != nil {
-			log.Error("failed to marshal block", "hash", hash, "err", err)
-			return err
-		}
-
-		tmpBlockTrace := BlockTrace{
-			Number:         number,
-			Hash:           hash,
-			ParentHash:     block.Header.ParentHash.String(),
-			Trace:          string(data),
-			TxNum:          uint64(txNum),
-			GasUsed:        gasCost,
-			BlockTimestamp: mtime,
-		}
-		blockTraces = append(blockTraces, tmpBlockTrace)
-	}
-
-	if err := o.db.Create(&blockTraces).Error; err != nil {
-		log.Error("failed to insert blockTraces", "err", err)
-		return err
-	}
-	return nil
-}
-
-// UpdateBatchHashForL2Blocks update the batch_hash of block trace
-func (o *BlockTrace) UpdateBatchHashForL2Blocks(tx *gorm.DB, numbers []uint64, batchHash string) error {
-	var db *gorm.DB
-	if tx != nil {
-		db = tx
-	} else {
-		db = o.db
-	}
-
-	err := db.Model(&BlockTrace{}).Where("number IN (?)", numbers).Update("batch_hash", batchHash).Error
-	if err != nil {
-		return err
-	}
-	return nil
-}

bridge/internal/orm/common.go

@@ -1,38 +0,0 @@
-package orm
-
-import (
-	"errors"
-
-	"gorm.io/gorm"
-
-	bridgeTypes "scroll-tech/bridge/internal/types"
-)
-
-// AddBatchInfoToDB inserts the batch information to the BlockBatch table and updates the batch_hash
-// in all blocks included in the batch.
-func AddBatchInfoToDB(db *gorm.DB, batchData *bridgeTypes.BatchData) error {
-	blockBatch := NewBlockBatch(db)
-	blockTrace := NewBlockTrace(db)
-	err := db.Transaction(func(tx *gorm.DB) error {
-		rowsAffected, dbTxErr := blockBatch.InsertBlockBatchByBatchData(tx, batchData)
-		if dbTxErr != nil {
-			return dbTxErr
-		}
-		if rowsAffected != 1 {
-			dbTxErr = errors.New("the InsertBlockBatchByBatchData affected row is not 1")
-			return dbTxErr
-		}
-
-		var blockIDs = make([]uint64, len(batchData.Batch.Blocks))
-		for i, block := range batchData.Batch.Blocks {
-			blockIDs[i] = block.BlockNumber
-		}
-
-		dbTxErr = blockTrace.UpdateBatchHashForL2Blocks(tx, blockIDs, batchData.Hash().Hex())
-		if dbTxErr != nil {
-			return dbTxErr
-		}
-		return nil
-	})
-	return err
-}

bridge/internal/orm/l1_block.go

@@ -1,87 +0,0 @@
-package orm
-
-import (
-	"context"
-
-	"github.com/scroll-tech/go-ethereum/log"
-	"gorm.io/gorm"
-
-	"scroll-tech/common/types"
-)
-
-// L1Block is structure of stored l1 block message
-type L1Block struct {
-	db *gorm.DB `gorm:"column:-"`
-
-	Number          uint64 `json:"number" gorm:"column:number"`
-	Hash            string `json:"hash" gorm:"column:hash"`
-	HeaderRLP       string `json:"header_rlp" gorm:"column:header_rlp"`
-	BaseFee         uint64 `json:"base_fee" gorm:"column:base_fee"`
-	BlockStatus     int    `json:"block_status" gorm:"column:block_status;default:1"`
-	ImportTxHash    string `json:"import_tx_hash" gorm:"column:import_tx_hash;default:NULL"`
-	GasOracleStatus int    `json:"oracle_status" gorm:"column:oracle_status;default:1"`
-	OracleTxHash    string `json:"oracle_tx_hash" gorm:"column:oracle_tx_hash;default:NULL"`
-}
-
-// NewL1Block create an l1Block instance
-func NewL1Block(db *gorm.DB) *L1Block {
-	return &L1Block{db: db}
-}
-
-// TableName define the L1Block table name
-func (*L1Block) TableName() string {
-	return "l1_block"
-}
-
-// GetLatestL1BlockHeight get the latest l1 block height
-func (l *L1Block) GetLatestL1BlockHeight() (uint64, error) {
-	result := l.db.Model(&L1Block{}).Select("COALESCE(MAX(number), 0)").Row()
-	if result.Err() != nil {
-		return 0, result.Err()
-	}
-
-	var maxNumber uint64
-	if err := result.Scan(&maxNumber); err != nil {
-		return 0, err
-	}
-	return maxNumber, nil
-}
-
-// GetL1Blocks get the l1 blocks
-func (l *L1Block) GetL1Blocks(fields map[string]interface{}) ([]L1Block, error) {
-	var l1Blocks []L1Block
-	db := l.db
-	for key, value := range fields {
-		db = db.Where(key, value)
-	}
-	db = db.Order("number ASC")
-	if err := db.Find(&l1Blocks).Error; err != nil {
-		return nil, err
-	}
-	return l1Blocks, nil
-}
-
-// InsertL1Blocks batch insert l1 blocks
-func (l *L1Block) InsertL1Blocks(ctx context.Context, blocks []L1Block) error {
-	if len(blocks) == 0 {
-		return nil
-	}
-
-	err := l.db.WithContext(ctx).Create(&blocks).Error
-	if err != nil {
-		log.Error("failed to insert L1 Blocks", "err", err)
-	}
-	return err
-}
-
-// UpdateL1GasOracleStatusAndOracleTxHash update l1 gas oracle status and oracle tx hash
-func (l *L1Block) UpdateL1GasOracleStatusAndOracleTxHash(ctx context.Context, blockHash string, status types.GasOracleStatus, txHash string) error {
-	updateFields := map[string]interface{}{
-		"oracle_status":  int(status),
-		"oracle_tx_hash": txHash,
-	}
-	if err := l.db.WithContext(ctx).Model(&L1Block{}).Where("hash", blockHash).Updates(updateFields).Error; err != nil {
-		return err
-	}
-	return nil
-}

bridge/internal/orm/l1_message.go

@@ -1,124 +0,0 @@
-package orm
-
-import (
-	"context"
-	"database/sql"
-
-	"github.com/scroll-tech/go-ethereum/log"
-	"gorm.io/gorm"
-
-	"scroll-tech/common/types"
-)
-
-// L1Message is structure of stored layer1 bridge message
-type L1Message struct {
-	db *gorm.DB `gorm:"column:-"`
-
-	QueueIndex uint64 `json:"queue_index" gorm:"column:queue_index"`
-	MsgHash    string `json:"msg_hash" gorm:"column:msg_hash"`
-	Height     uint64 `json:"height" gorm:"column:height"`
-	GasLimit   uint64 `json:"gas_limit" gorm:"column:gas_limit"`
-	Sender     string `json:"sender" gorm:"column:sender"`
-	Target     string `json:"target" gorm:"column:target"`
-	Value      string `json:"value" gorm:"column:value"`
-	Calldata   string `json:"calldata" gorm:"column:calldata"`
-	Layer1Hash string `json:"layer1_hash" gorm:"column:layer1_hash"`
-	Layer2Hash string `json:"layer2_hash" gorm:"column:layer2_hash;default:NULL"`
-	Status     int    `json:"status" gorm:"column:status;default:1"`
-}
-
-// NewL1Message create an L1MessageOrm instance
-func NewL1Message(db *gorm.DB) *L1Message {
-	return &L1Message{db: db}
-}
-
-// TableName define the L1Message table name
-func (*L1Message) TableName() string {
-	return "l1_message"
-}
-
-// GetLayer1LatestWatchedHeight returns latest height stored in the table
-func (m *L1Message) GetLayer1LatestWatchedHeight() (int64, error) {
-	// @note It's not correct, since we may don't have message in some blocks.
-	// But it will only be called at start, some redundancy is acceptable.
-	var maxHeight sql.NullInt64
-	result := m.db.Model(&L1Message{}).Select("MAX(height)").Scan(&maxHeight)
-	if result.Error != nil {
-		return -1, result.Error
-	}
-	if maxHeight.Valid {
-		return maxHeight.Int64, nil
-	}
-	return -1, nil
-}
-
-// GetL1MessagesByStatus fetch list of unprocessed messages given msg status
-func (m *L1Message) GetL1MessagesByStatus(status types.MsgStatus, limit uint64) ([]L1Message, error) {
-	var msgs []L1Message
-	err := m.db.Where("status", int(status)).Order("queue_index ASC").Limit(int(limit)).Find(&msgs).Error
-	if err != nil {
-		return nil, err
-	}
-	return msgs, nil
-}
-
-// GetL1MessageByQueueIndex fetch message by queue_index
-// for unit test
-func (m *L1Message) GetL1MessageByQueueIndex(queueIndex uint64) (*L1Message, error) {
-	var msg L1Message
-	err := m.db.Where("queue_index", queueIndex).First(&msg).Error
-	if err != nil {
-		return nil, err
-	}
-	return &msg, nil
-}
-
-// GetL1MessageByMsgHash fetch message by queue_index
-// for unit test
-func (m *L1Message) GetL1MessageByMsgHash(msgHash string) (*L1Message, error) {
-	var msg L1Message
-	err := m.db.Where("msg_hash", msgHash).First(&msg).Error
-	if err != nil {
-		return nil, err
-	}
-	return &msg, nil
-}
-
-// SaveL1Messages batch save a list of layer1 messages
-func (m *L1Message) SaveL1Messages(ctx context.Context, messages []*L1Message) error {
-	if len(messages) == 0 {
-		return nil
-	}
-
-	err := m.db.WithContext(ctx).Create(&messages).Error
-	if err != nil {
-		queueIndices := make([]uint64, 0, len(messages))
-		heights := make([]uint64, 0, len(messages))
-		for _, msg := range messages {
-			queueIndices = append(queueIndices, msg.QueueIndex)
-			heights = append(heights, msg.Height)
-		}
-		log.Error("failed to insert l1Messages", "queueIndices", queueIndices, "heights", heights, "err", err)
-	}
-	return err
-}
-
-// UpdateLayer1Status updates message stauts, given message hash
-func (m *L1Message) UpdateLayer1Status(ctx context.Context, msgHash string, status types.MsgStatus) error {
-	if err := m.db.Model(&L1Message{}).WithContext(ctx).Where("msg_hash", msgHash).Update("status", int(status)).Error; err != nil {
-		return err
-	}
-	return nil
-}
-
-// UpdateLayer1StatusAndLayer2Hash updates message status and layer2 transaction hash, given message hash
-func (m *L1Message) UpdateLayer1StatusAndLayer2Hash(ctx context.Context, msgHash string, status types.MsgStatus, layer2Hash string) error {
-	updateFields := map[string]interface{}{
-		"status":      int(status),
-		"layer2_hash": layer2Hash,
-	}
-	if err := m.db.Model(&L1Message{}).WithContext(ctx).Where("msg_hash", msgHash).Updates(updateFields).Error; err != nil {
-		return err
-	}
-	return nil
-}

bridge/internal/orm/l2_message.go

@@ -1,127 +0,0 @@
-package orm
-
-import (
-	"context"
-
-	"github.com/scroll-tech/go-ethereum/log"
-	"gorm.io/gorm"
-
-	"scroll-tech/common/types"
-)
-
-// L2Message is structure of stored layer2 bridge message
-type L2Message struct {
-	db *gorm.DB `gorm:"column:-"`
-
-	Nonce      uint64 `json:"nonce" gorm:"column:nonce"`
-	MsgHash    string `json:"msg_hash" gorm:"column:msg_hash"`
-	Height     uint64 `json:"height" gorm:"column:height"`
-	Sender     string `json:"sender" gorm:"column:sender"`
-	Value      string `json:"value" gorm:"column:value"`
-	Target     string `json:"target" gorm:"column:target"`
-	Calldata   string `json:"calldata" gorm:"column:calldata"`
-	Layer2Hash string `json:"layer2_hash" gorm:"column:layer2_hash"`
-	Layer1Hash string `json:"layer1_hash" gorm:"column:layer1_hash;default:NULL"`
-	Proof      string `json:"proof" gorm:"column:proof;default:NULL"`
-	Status     int    `json:"status" gorm:"column:status;default:1"`
-}
-
-// NewL2Message create an L2Message instance
-func NewL2Message(db *gorm.DB) *L2Message {
-	return &L2Message{db: db}
-}
-
-// TableName define the L2Message table name
-func (*L2Message) TableName() string {
-	return "l2_message"
-}
-
-// GetL2Messages fetch list of messages given msg status
-func (m *L2Message) GetL2Messages(fields map[string]interface{}, orderByList []string, limit int) ([]L2Message, error) {
-	var l2MsgList []L2Message
-	db := m.db
-	for key, value := range fields {
-		db = db.Where(key, value)
-	}
-
-	for _, orderBy := range orderByList {
-		db = db.Order(orderBy)
-	}
-
-	if limit != 0 {
-		db = db.Limit(limit)
-	}
-
-	if err := db.Find(&l2MsgList).Error; err != nil {
-		return nil, err
-	}
-	return l2MsgList, nil
-}
-
-// GetLayer2LatestWatchedHeight returns latest height stored in the table
-func (m *L2Message) GetLayer2LatestWatchedHeight() (int64, error) {
-	// @note It's not correct, since we may don't have message in some blocks.
-	// But it will only be called at start, some redundancy is acceptable.
-	result := m.db.Model(&L2Message{}).Select("COALESCE(MAX(height), -1)").Row()
-	if result.Err() != nil {
-		return -1, result.Err()
-	}
-
-	var maxNumber int64
-	if err := result.Scan(&maxNumber); err != nil {
-		return 0, err
-	}
-	return maxNumber, nil
-}
-
-// GetL2MessageByNonce fetch message by nonce
-// for unit test
-func (m *L2Message) GetL2MessageByNonce(nonce uint64) (*L2Message, error) {
-	var msg L2Message
-	err := m.db.Where("nonce", nonce).First(&msg).Error
-	if err != nil {
-		return nil, err
-	}
-	return &msg, nil
-}
-
-// SaveL2Messages batch save a list of layer2 messages
-func (m *L2Message) SaveL2Messages(ctx context.Context, messages []L2Message) error {
-	if len(messages) == 0 {
-		return nil
-	}
-
-	err := m.db.WithContext(ctx).Create(&messages).Error
-	if err != nil {
-		nonces := make([]uint64, 0, len(messages))
-		heights := make([]uint64, 0, len(messages))
-		for _, msg := range messages {
-			nonces = append(nonces, msg.Nonce)
-			heights = append(heights, msg.Height)
-		}
-		log.Error("failed to insert layer2Messages", "nonces", nonces, "heights", heights, "err", err)
-	}
-	return err
-}
-
-// UpdateLayer2Status updates message stauts, given message hash
-func (m *L2Message) UpdateLayer2Status(ctx context.Context, msgHash string, status types.MsgStatus) error {
-	err := m.db.Model(&L2Message{}).WithContext(ctx).Where("msg_hash", msgHash).Update("status", int(status)).Error
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// UpdateLayer2StatusAndLayer1Hash updates message stauts and layer1 transaction hash, given message hash
-func (m *L2Message) UpdateLayer2StatusAndLayer1Hash(ctx context.Context, msgHash string, status types.MsgStatus, layer1Hash string) error {
-	updateFields := map[string]interface{}{
-		"status":      int(status),
-		"layer1_hash": layer1Hash,
-	}
-	err := m.db.Model(&L2Message{}).WithContext(ctx).Where("msg_hash", msgHash).Updates(updateFields).Error
-	if err != nil {
-		return err
-	}
-	return nil
-}

bridge/internal/orm/migrate/migrate.go

@@ -1,61 +0,0 @@
-package migrate
-
-import (
-	"database/sql"
-	"embed"
-	"os"
-	"strconv"
-
-	"github.com/pressly/goose/v3"
-)
-
-//go:embed migrations/*.sql
-var embedMigrations embed.FS
-
-// MigrationsDir migration dir
-const MigrationsDir string = "migrations"
-
-func init() {
-	goose.SetBaseFS(embedMigrations)
-	goose.SetSequential(true)
-	goose.SetTableName("scroll_migrations")
-
-	verbose, _ := strconv.ParseBool(os.Getenv("LOG_SQL_MIGRATIONS"))
-	goose.SetVerbose(verbose)
-}
-
-// Migrate migrate db
-func Migrate(db *sql.DB) error {
-	return goose.Up(db, MigrationsDir, goose.WithAllowMissing())
-}
-
-// Rollback rollback to the given version
-func Rollback(db *sql.DB, version *int64) error {
-	if version != nil {
-		return goose.DownTo(db, MigrationsDir, *version)
-	}
-	return goose.Down(db, MigrationsDir)
-}
-
-// ResetDB clean and migrate db.
-func ResetDB(db *sql.DB) error {
-	if err := Rollback(db, new(int64)); err != nil {
-		return err
-	}
-	return Migrate(db)
-}
-
-// Current get current version
-func Current(db *sql.DB) (int64, error) {
-	return goose.GetDBVersion(db)
-}
-
-// Status is normal or not
-func Status(db *sql.DB) error {
-	return goose.Version(db, MigrationsDir)
-}
-
-// Create a new migration folder
-func Create(db *sql.DB, name, migrationType string) error {
-	return goose.Create(db, MigrationsDir, name, migrationType)
-}

bridge/internal/orm/migrate/migrate_test.go

@@ -1,86 +0,0 @@
-package migrate
-
-import (
-	"testing"
-
-	"github.com/jmoiron/sqlx"
-	_ "github.com/lib/pq"
-	"github.com/stretchr/testify/assert"
-
-	"scroll-tech/common/docker"
-
-	"scroll-tech/database"
-)
-
-var (
-	base *docker.App
-	pgDB *sqlx.DB
-)
-
-func initEnv(t *testing.T) error {
-	// Start db container.
-	base.RunDBImage(t)
-
-	// Create db orm handler.
-	factory, err := database.NewOrmFactory(base.DBConfig)
-	if err != nil {
-		return err
-	}
-	pgDB = factory.GetDB()
-	return nil
-}
-
-func TestMigrate(t *testing.T) {
-	base = docker.NewDockerApp()
-	if err := initEnv(t); err != nil {
-		t.Fatal(err)
-	}
-
-	t.Run("testCurrent", testCurrent)
-	t.Run("testStatus", testStatus)
-	t.Run("testResetDB", testResetDB)
-	t.Run("testMigrate", testMigrate)
-	t.Run("testRollback", testRollback)
-
-	t.Cleanup(func() {
-		base.Free()
-	})
-}
-
-func testCurrent(t *testing.T) {
-	cur, err := Current(pgDB.DB)
-	assert.NoError(t, err)
-	assert.Equal(t, 0, int(cur))
-}
-
-func testStatus(t *testing.T) {
-	status := Status(pgDB.DB)
-	assert.NoError(t, status)
-}
-
-func testResetDB(t *testing.T) {
-	assert.NoError(t, ResetDB(pgDB.DB))
-	cur, err := Current(pgDB.DB)
-	assert.NoError(t, err)
-	// total number of tables.
-	assert.Equal(t, 5, int(cur))
-}
-
-func testMigrate(t *testing.T) {
-	assert.NoError(t, Migrate(pgDB.DB))
-	cur, err := Current(pgDB.DB)
-	assert.NoError(t, err)
-	assert.Equal(t, true, cur > 0)
-}
-
-func testRollback(t *testing.T) {
-	version, err := Current(pgDB.DB)
-	assert.NoError(t, err)
-	assert.Equal(t, true, version > 0)
-
-	assert.NoError(t, Rollback(pgDB.DB, nil))
-
-	cur, err := Current(pgDB.DB)
-	assert.NoError(t, err)
-	assert.Equal(t, true, cur+1 == version)
-}

bridge/internal/orm/migrate/migrations/00001_block_trace.sql

@@ -1,38 +0,0 @@
--- +goose Up
--- +goose StatementBegin
-
--- TODO: use foreign key for batch_id?
--- TODO: why tx_num is bigint?
-create table block_trace
-(
-    number                  BIGINT          NOT NULL,
-    hash                    VARCHAR         NOT NULL,
-    parent_hash             VARCHAR         NOT NULL,
-    trace                   JSON            NOT NULL,
-    batch_hash              VARCHAR         DEFAULT NULL,
-    tx_num                  INTEGER         NOT NULL,
-    gas_used                BIGINT          NOT NULL,
-    block_timestamp         NUMERIC         NOT NULL
-);
-
-create unique index block_trace_hash_uindex
-    on block_trace (hash);
-
-create unique index block_trace_number_uindex
-    on block_trace (number);
-
-create unique index block_trace_parent_uindex
-    on block_trace (number, parent_hash);
-
-create unique index block_trace_parent_hash_uindex
-    on block_trace (hash, parent_hash);
-
-create index block_trace_batch_hash_index
-    on block_trace (batch_hash);
-
--- +goose StatementEnd
-
--- +goose Down
--- +goose StatementBegin
-drop table if exists block_trace;
--- +goose StatementEnd

bridge/internal/orm/migrate/migrations/00002_l1_message.sql

@@ -1,50 +0,0 @@
--- +goose Up
--- +goose StatementBegin
-create table l1_message
-(
-    queue_index  BIGINT  NOT NULL,
-    msg_hash     VARCHAR NOT NULL,
-    height       BIGINT  NOT NULL,
-    gas_limit    BIGINT  NOT NULL,
-    sender       VARCHAR NOT NULL,
-    target       VARCHAR NOT NULL,
-    value        VARCHAR NOT NULL,
-    calldata     TEXT    NOT NULL,
-    layer1_hash  VARCHAR NOT NULL,
-    layer2_hash  VARCHAR DEFAULT NULL,
-    status       INTEGER  DEFAULT 1,
-    created_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP
-);
-
-comment
-on column l1_message.status is 'undefined, pending, submitted, confirmed, failed, expired, relay_failed';
-
-create unique index l1_message_hash_uindex
-on l1_message (msg_hash);
-
-create unique index l1_message_nonce_uindex
-on l1_message (queue_index);
-
-create index l1_message_height_index
-    on l1_message (height);
-
-CREATE OR REPLACE FUNCTION update_timestamp()
-RETURNS TRIGGER AS $$
-BEGIN
-   NEW.updated_at = CURRENT_TIMESTAMP;
-   RETURN NEW;
-END;
-$$ language 'plpgsql';
-
-CREATE TRIGGER update_timestamp BEFORE UPDATE
-ON l1_message FOR EACH ROW EXECUTE PROCEDURE
-update_timestamp();
-
-
--- +goose StatementEnd
-
--- +goose Down
--- +goose StatementBegin
-drop table if exists l1_message;
--- +goose StatementEnd

bridge/internal/orm/migrate/migrations/00003_l2_message.sql

@@ -1,50 +0,0 @@
--- +goose Up
--- +goose StatementBegin
-create table l2_message
-(
-    nonce        BIGINT  NOT NULL,
-    msg_hash     VARCHAR NOT NULL,
-    height       BIGINT  NOT NULL,
-    sender       VARCHAR NOT NULL,
-    target       VARCHAR NOT NULL,
-    value        VARCHAR NOT NULL,
-    calldata     TEXT    NOT NULL,
-    layer2_hash  VARCHAR NOT NULL,
-    layer1_hash  VARCHAR DEFAULT NULL,
-    proof        TEXT    DEFAULT NULL,
-    status       INTEGER  DEFAULT 1,
-    created_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP
-);
-
-comment
-on column l2_message.status is 'undefined, pending, submitted, confirmed, failed, expired, relay_failed';
-
-create unique index l2_message_hash_uindex
-on l2_message (msg_hash);
-
-create unique index l2_message_nonce_uindex
-on l2_message (nonce);
-
-create index l2_message_height_index
-    on l2_message (height);
-
-CREATE OR REPLACE FUNCTION update_timestamp()
-RETURNS TRIGGER AS $$
-BEGIN
-   NEW.updated_at = CURRENT_TIMESTAMP;
-   RETURN NEW;
-END;
-$$ language 'plpgsql';
-
-CREATE TRIGGER update_timestamp BEFORE UPDATE
-ON l2_message FOR EACH ROW EXECUTE PROCEDURE
-update_timestamp();
-
-
--- +goose StatementEnd
-
--- +goose Down
--- +goose StatementBegin
-drop table if exists l2_message;
--- +goose StatementEnd

bridge/internal/orm/migrate/migrations/00004_block_batch.sql

@@ -1,49 +0,0 @@
--- +goose Up
--- +goose StatementBegin
-
-create table block_batch
-(
-    hash                    VARCHAR         NOT NULL,
-    index                   BIGINT          NOT NULL,
-    start_block_number      BIGINT          NOT NULL,
-    start_block_hash        VARCHAR         NOT NULL,
-    end_block_number        BIGINT          NOT NULL,
-    end_block_hash          VARCHAR         NOT NULL,
-    parent_hash             VARCHAR         NOT NULL,
-    state_root              VARCHAR         NOT NULL,
-    total_tx_num            BIGINT          NOT NULL,
-    total_l1_tx_num         BIGINT          NOT NULL,
-    total_l2_gas            BIGINT          NOT NULL,
-    proving_status          INTEGER         DEFAULT 1,
-    proof                   BYTEA           DEFAULT NULL,
-    proof_time_sec          INTEGER         DEFAULT 0,
-    rollup_status           INTEGER         DEFAULT 1,
-    commit_tx_hash          VARCHAR         DEFAULT NULL,
-    finalize_tx_hash        VARCHAR         DEFAULT NULL,
-    oracle_status           INTEGER         DEFAULT 1,
-    oracle_tx_hash          VARCHAR         DEFAULT NULL,
-    created_at              TIMESTAMP(0)    NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    prover_assigned_at      TIMESTAMP(0)    DEFAULT NULL,
-    proved_at               TIMESTAMP(0)    DEFAULT NULL,
-    committed_at            TIMESTAMP(0)    DEFAULT NULL,
-    finalized_at            TIMESTAMP(0)    DEFAULT NULL
-);
-
-comment
-on column block_batch.proving_status is 'undefined, unassigned, skipped, assigned, proved, verified, failed';
-comment
-on column block_batch.rollup_status is 'undefined, pending, committing, committed, finalizing, finalized, finalization_skipped, commit_failed, finalize_failed';
-comment
-on column block_batch.oracle_status is 'undefined, pending, importing, imported, failed';
-
-create unique index block_batch_hash_uindex
-    on block_batch (hash);
-create unique index block_batch_index_uindex
-    on block_batch (index);
-
--- +goose StatementEnd
-
--- +goose Down
--- +goose StatementBegin
-drop table if exists  block_batch;
--- +goose StatementEnd

bridge/internal/orm/migrate/migrations/00005_l1_block.sql

@@ -1,33 +0,0 @@
--- +goose Up
--- +goose StatementBegin
-
-create table l1_block
-(
-    number                  BIGINT          NOT NULL,
-    hash                    VARCHAR         NOT NULL,
-    header_rlp              TEXT            NOT NULL,
-    base_fee                BIGINT          NOT NULL,
-    block_status            INTEGER         DEFAULT 1,
-    import_tx_hash          VARCHAR         DEFAULT NULL,
-    oracle_status           INTEGER         DEFAULT 1,
-    oracle_tx_hash          VARCHAR         DEFAULT NULL
-);
-
-comment
-on column l1_block.block_status is 'undefined, pending, importing, imported, failed';
-
-comment
-on column l1_block.oracle_status is 'undefined, pending, importing, imported, failed';
-
-create unique index l1_block_hash_uindex
-on l1_block (hash);
-
-create unique index l1_block_number_uindex
-on l1_block (number);
-
--- +goose StatementEnd
-
--- +goose Down
--- +goose StatementBegin
-drop table if exists l1_block;
--- +goose StatementEnd

bridge/internal/types/batch.go

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

bridge/internal/types/batch_test.go

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

bridge/internal/types/block.go

@@ -1,21 +0,0 @@
-package types
-
-import (
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/core/types"
-)
-
-// WrappedBlock contains the block's Header, Transactions and WithdrawTrieRoot hash.
-type WrappedBlock struct {
-	Header *types.Header `json:"header"`
-	// Transactions is only used for recover types.Transactions, the from of types.TransactionData field is missing.
-	Transactions     []*types.TransactionData `json:"transactions"`
-	WithdrawTrieRoot common.Hash              `json:"withdraw_trie_root,omitempty"`
-}
-
-// BatchInfo contains the BlockBatch's main info
-type BatchInfo struct {
-	Index     uint64 `json:"index"`
-	Hash      string `json:"hash"`
-	StateRoot string `json:"state_root"`
-}

bridge/internal/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/internal/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/internal/utils/db.go

@@ -1,43 +0,0 @@
-package utils
-
-import (
-	"gorm.io/driver/postgres"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-
-	"scroll-tech/bridge/internal/config"
-)
-
-// InitDB init the db handler
-func InitDB(config *config.DBConfig) (*gorm.DB, error) {
-	db, err := gorm.Open(postgres.Open(config.DSN), &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Info),
-	})
-	if err != nil {
-		return nil, err
-	}
-	sqlDB, err := db.DB()
-	if err != nil {
-		return nil, err
-	}
-
-	sqlDB.SetMaxOpenConns(config.MaxOpenNum)
-	sqlDB.SetMaxIdleConns(config.MaxIdleNum)
-
-	if err = sqlDB.Ping(); err != nil {
-		return nil, err
-	}
-	return db, nil
-}
-
-// CloseDB close the db handler. notice the db handler only can close when then program exit.
-func CloseDB(db *gorm.DB) error {
-	sqlDB, err := db.DB()
-	if err != nil {
-		return err
-	}
-	if err := sqlDB.Close(); err != nil {
-		return err
-	}
-	return nil
-}

bridge/internal/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/internal/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/relayer/l1_relayer.go

@@ -6,25 +6,27 @@ import (
 	"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"
-	gethMetrics "github.com/scroll-tech/go-ethereum/metrics"
-	"gorm.io/gorm"
+	geth_metrics "github.com/scroll-tech/go-ethereum/metrics"
 
-	"scroll-tech/common/metrics"
 	"scroll-tech/common/types"
 
-	bridgeAbi "scroll-tech/bridge/abi"
-	"scroll-tech/bridge/internal/config"
-	"scroll-tech/bridge/internal/controller/sender"
-	"scroll-tech/bridge/internal/orm"
+	"scroll-tech/database"
+
+	"scroll-tech/common/metrics"
+
+	bridge_abi "scroll-tech/bridge/abi"
+	"scroll-tech/bridge/config"
+	"scroll-tech/bridge/sender"
 )
 
 var (
-	bridgeL1MsgsRelayedTotalCounter          = gethMetrics.NewRegisteredCounter("bridge/l1/msgs/relayed/total", metrics.ScrollRegistry)
-	bridgeL1MsgsRelayedConfirmedTotalCounter = gethMetrics.NewRegisteredCounter("bridge/l1/msgs/relayed/confirmed/total", metrics.ScrollRegistry)
+	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
@@ -36,6 +38,7 @@ var (
 type Layer1Relayer struct {
 	ctx context.Context
 
+	db  database.OrmFactory
 	cfg *config.RelayerConfig
 
 	// channel used to communicate with transaction sender
@@ -50,13 +53,10 @@ type Layer1Relayer struct {
 	lastGasPrice uint64
 	minGasPrice  uint64
 	gasPriceDiff uint64
-
-	l1MessageOrm *orm.L1Message
-	l1Block      *orm.L1Block
 }
 
 // NewLayer1Relayer will return a new instance of Layer1RelayerClient
-func NewLayer1Relayer(ctx context.Context, db *gorm.DB, cfg *config.RelayerConfig) (*Layer1Relayer, error) {
+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)
@@ -88,15 +88,14 @@ func NewLayer1Relayer(ctx context.Context, db *gorm.DB, cfg *config.RelayerConfi
 	}
 
 	l1Relayer := &Layer1Relayer{
-		ctx:          ctx,
-		l1MessageOrm: orm.NewL1Message(db),
-		l1Block:      orm.NewL1Block(db),
+		ctx: ctx,
+		db:  db,
 
 		messageSender:  messageSender,
-		l2MessengerABI: bridgeAbi.L2ScrollMessengerABI,
+		l2MessengerABI: bridge_abi.L2ScrollMessengerABI,
 
 		gasOracleSender: gasOracleSender,
-		l1GasOracleABI:  bridgeAbi.L1GasPriceOracleABI,
+		l1GasOracleABI:  bridge_abi.L1GasPriceOracleABI,
 
 		minGasLimitForMessageRelay: minGasLimitForMessageRelay,
 
@@ -113,7 +112,7 @@ func NewLayer1Relayer(ctx context.Context, db *gorm.DB, cfg *config.RelayerConfi
 // 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.l1MessageOrm.GetL1MessagesByStatus(types.MsgPending, 100)
+	msgs, err := r.db.GetL1MessagesByStatus(types.MsgPending, 100)
 	if err != nil {
 		log.Error("Failed to fetch unprocessed L1 messages", "err", err)
 		return
@@ -124,8 +123,7 @@ func (r *Layer1Relayer) ProcessSavedEvents() {
 	}
 
 	for _, msg := range msgs {
-		tmpMsg := msg
-		if err = r.processSavedEvent(&tmpMsg); err != nil {
+		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)
 			}
@@ -134,15 +132,15 @@ func (r *Layer1Relayer) ProcessSavedEvents() {
 	}
 }
 
-func (r *Layer1Relayer) processSavedEvent(msg *orm.L1Message) error {
+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 && errors.Is(err, ErrExecutionRevertedMessageExpired) {
-		return r.l1MessageOrm.UpdateLayer1Status(r.ctx, msg.MsgHash, types.MsgExpired)
-	}
 
-	if err != nil && errors.Is(err, ErrExecutionRevertedAlreadySuccessExecuted) {
-		return r.l1MessageOrm.UpdateLayer1Status(r.ctx, msg.MsgHash, types.MsgConfirmed)
+	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
@@ -150,7 +148,7 @@ func (r *Layer1Relayer) processSavedEvent(msg *orm.L1Message) error {
 	bridgeL1MsgsRelayedTotalCounter.Inc(1)
 	log.Info("relayMessage to layer2", "msg hash", msg.MsgHash, "tx hash", hash)
 
-	err = r.l1MessageOrm.UpdateLayer1StatusAndLayer2Hash(r.ctx, msg.MsgHash, types.MsgSubmitted, hash.String())
+	err = r.db.UpdateLayer1StatusAndLayer2Hash(r.ctx, msg.MsgHash, types.MsgSubmitted, hash.String())
 	if err != nil {
 		log.Error("UpdateLayer1StatusAndLayer2Hash failed", "msg.msgHash", msg.MsgHash, "msg.height", msg.Height, "err", err)
 	}
@@ -159,17 +157,17 @@ func (r *Layer1Relayer) processSavedEvent(msg *orm.L1Message) error {
 
 // ProcessGasPriceOracle imports gas price to layer2
 func (r *Layer1Relayer) ProcessGasPriceOracle() {
-	latestBlockHeight, err := r.l1Block.GetLatestL1BlockHeight()
+	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.l1Block.GetL1Blocks(map[string]interface{}{
+	blocks, err := r.db.GetL1BlockInfos(map[string]interface{}{
 		"number": latestBlockHeight,
 	})
 	if err != nil {
-		log.Error("Failed to GetL1Blocks from db", "height", latestBlockHeight, "err", err)
+		log.Error("Failed to GetL1BlockInfos from db", "height", latestBlockHeight, "err", err)
 		return
 	}
 	if len(blocks) != 1 {
@@ -178,7 +176,7 @@ func (r *Layer1Relayer) ProcessGasPriceOracle() {
 	}
 	block := blocks[0]
 
-	if types.GasOracleStatus(block.GasOracleStatus) == types.GasOraclePending {
+	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)) {
@@ -197,7 +195,7 @@ func (r *Layer1Relayer) ProcessGasPriceOracle() {
 				return
 			}
 
-			err = r.l1Block.UpdateL1GasOracleStatusAndOracleTxHash(r.ctx, block.Hash, types.GasOracleImporting, hash.String())
+			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
@@ -216,14 +214,14 @@ func (r *Layer1Relayer) handleConfirmLoop(ctx context.Context) {
 		case cfm := <-r.messageSender.ConfirmChan():
 			bridgeL1MsgsRelayedConfirmedTotalCounter.Inc(1)
 			if !cfm.IsSuccessful {
-				err := r.l1MessageOrm.UpdateLayer1StatusAndLayer2Hash(r.ctx, cfm.ID, types.MsgRelayFailed, cfm.TxHash.String())
+				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.l1MessageOrm.UpdateLayer1StatusAndLayer2Hash(r.ctx, cfm.ID, types.MsgConfirmed, cfm.TxHash.String())
+				err := r.db.UpdateLayer1StatusAndLayer2Hash(r.ctx, cfm.ID, types.MsgConfirmed, cfm.TxHash.String())
 				if err != nil {
 					log.Warn("UpdateLayer1StatusAndLayer2Hash failed", "err", err)
 				}
@@ -232,14 +230,14 @@ func (r *Layer1Relayer) handleConfirmLoop(ctx context.Context) {
 		case cfm := <-r.gasOracleSender.ConfirmChan():
 			if !cfm.IsSuccessful {
 				// @discuss: maybe make it pending again?
-				err := r.l1Block.UpdateL1GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleFailed, cfm.TxHash.String())
+				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.l1Block.UpdateL1GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleImported, cfm.TxHash.String())
+				err := r.db.UpdateL1GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleImported, cfm.TxHash.String())
 				if err != nil {
 					log.Warn("UpdateGasOracleStatusAndOracleTxHash failed", "err", err)
 				}

bridge/relayer/l1_relayer_test.go

@@ -9,20 +9,20 @@ import (
 	"github.com/agiledragon/gomonkey/v2"
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/smartystreets/goconvey/convey"
+
 	"github.com/stretchr/testify/assert"
-	"gorm.io/gorm"
+
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
 
 	"scroll-tech/common/types"
 	"scroll-tech/common/utils"
 
-	"scroll-tech/bridge/internal/controller/sender"
-	"scroll-tech/bridge/internal/orm"
-	"scroll-tech/bridge/internal/orm/migrate"
-	bridgeUtils "scroll-tech/bridge/internal/utils"
+	"scroll-tech/bridge/sender"
 )
 
 var (
-	templateL1Message = []*orm.L1Message{
+	templateL1Message = []*types.L1Message{
 		{
 			QueueIndex: 1,
 			MsgHash:    "msg_hash1",
@@ -48,58 +48,59 @@ var (
 	}
 )
 
-func setupL1RelayerDB(t *testing.T) *gorm.DB {
-	db, err := bridgeUtils.InitDB(cfg.DBConfig)
-	assert.NoError(t, err)
-	sqlDB, err := db.DB()
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(sqlDB))
-	return db
-}
-
 // testCreateNewRelayer test create new relayer instance and stop
 func testCreateNewL1Relayer(t *testing.T) {
-	db := setupL1RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	// 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) {
-	db := setupL1RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
-	l1MessageOrm := orm.NewL1Message(db)
+	// 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.NotNil(t, relayer)
-	assert.NoError(t, l1MessageOrm.SaveL1Messages(context.Background(), templateL1Message))
+	assert.NoError(t, db.SaveL1Messages(context.Background(), templateL1Message))
 	relayer.ProcessSavedEvents()
-	msg1, err := l1MessageOrm.GetL1MessageByQueueIndex(1)
+	msg1, err := db.GetL1MessageByQueueIndex(1)
 	assert.NoError(t, err)
-	assert.Equal(t, types.MsgStatus(msg1.Status), types.MsgSubmitted)
-	msg2, err := l1MessageOrm.GetL1MessageByQueueIndex(2)
+	assert.Equal(t, msg1.Status, types.MsgSubmitted)
+	msg2, err := db.GetL1MessageByQueueIndex(2)
 	assert.NoError(t, err)
-	assert.Equal(t, types.MsgStatus(msg2.Status), types.MsgSubmitted)
+	assert.Equal(t, msg2.Status, types.MsgSubmitted)
 }
 
 func testL1RelayerMsgConfirm(t *testing.T) {
-	db := setupL1RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
-	l1MessageOrm := orm.NewL1Message(db)
-	l1Messages := []*orm.L1Message{
-		{MsgHash: "msg-1", QueueIndex: 0},
-		{MsgHash: "msg-2", QueueIndex: 1},
-	}
-	err := l1MessageOrm.SaveL1Messages(context.Background(), l1Messages)
+	// 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)
+	assert.NotNil(t, l1Relayer)
 
 	// Simulate message confirmations.
 	l1Relayer.messageSender.SendConfirmation(&sender.Confirmation{
@@ -113,25 +114,27 @@ func testL1RelayerMsgConfirm(t *testing.T) {
 
 	// Check the database for the updated status using TryTimes.
 	ok := utils.TryTimes(5, func() bool {
-		msg1, err1 := l1MessageOrm.GetL1MessageByMsgHash("msg-1")
-		msg2, err2 := l1MessageOrm.GetL1MessageByMsgHash("msg-2")
-		return err1 == nil && types.MsgStatus(msg1.Status) == types.MsgConfirmed &&
-			err2 == nil && types.MsgStatus(msg2.Status) == types.MsgRelayFailed
+		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
 	})
 	assert.True(t, ok)
 }
 
 func testL1RelayerGasOracleConfirm(t *testing.T) {
-	db := setupL1RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
-	l1BlockOrm := orm.NewL1Block(db)
+	// 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()
 
-	l1Block := []orm.L1Block{
-		{Hash: "gas-oracle-1", Number: 0},
-		{Hash: "gas-oracle-2", Number: 1},
-	}
 	// Insert test data.
-	assert.NoError(t, l1BlockOrm.InsertL1Blocks(context.Background(), l1Block))
+	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
@@ -139,6 +142,7 @@ func testL1RelayerGasOracleConfirm(t *testing.T) {
 	defer cancel()
 	l1Relayer, err := NewLayer1Relayer(ctx, db, l1Cfg.RelayerConfig)
 	assert.NoError(t, err)
+	assert.NotNil(t, l1Relayer)
 
 	// Simulate message confirmations.
 	l1Relayer.gasOracleSender.SendConfirmation(&sender.Confirmation{
@@ -152,17 +156,19 @@ func testL1RelayerGasOracleConfirm(t *testing.T) {
 
 	// Check the database for the updated status using TryTimes.
 	ok := utils.TryTimes(5, func() bool {
-		msg1, err1 := l1BlockOrm.GetL1Blocks(map[string]interface{}{"hash": "gas-oracle-1"})
-		msg2, err2 := l1BlockOrm.GetL1Blocks(map[string]interface{}{"hash": "gas-oracle-2"})
-		return err1 == nil && len(msg1) == 1 && types.GasOracleStatus(msg1[0].GasOracleStatus) == types.GasOracleImported &&
-			err2 == nil && len(msg2) == 1 && types.GasOracleStatus(msg2[0].GasOracleStatus) == types.GasOracleFailed
+		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
 	})
 	assert.True(t, ok)
 }
 
 func testL1RelayerProcessGasPriceOracle(t *testing.T) {
-	db := setupL1RelayerDB(t)
-	defer bridgeUtils.CloseDB(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
 	ctx, cancel := context.WithCancel(context.Background())
@@ -171,32 +177,31 @@ func testL1RelayerProcessGasPriceOracle(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, l1Relayer)
 
-	var l1BlockOrm *orm.L1Block
 	convey.Convey("GetLatestL1BlockHeight failure", t, func() {
 		targetErr := errors.New("GetLatestL1BlockHeight error")
-		patchGuard := gomonkey.ApplyMethodFunc(l1BlockOrm, "GetLatestL1BlockHeight", func() (uint64, error) {
+		patchGuard := gomonkey.ApplyMethodFunc(db, "GetLatestL1BlockHeight", func() (uint64, error) {
 			return 0, targetErr
 		})
 		defer patchGuard.Reset()
 		l1Relayer.ProcessGasPriceOracle()
 	})
 
-	patchGuard := gomonkey.ApplyMethodFunc(l1BlockOrm, "GetLatestL1BlockHeight", func() (uint64, error) {
+	patchGuard := gomonkey.ApplyMethodFunc(db, "GetLatestL1BlockHeight", func() (uint64, error) {
 		return 100, nil
 	})
 	defer patchGuard.Reset()
 
-	convey.Convey("GetL1Blocks failure", t, func() {
-		targetErr := errors.New("GetL1Blocks error")
-		patchGuard.ApplyMethodFunc(l1BlockOrm, "GetL1Blocks", func(fields map[string]interface{}) ([]orm.L1Block, error) {
+	convey.Convey("GetL1BlockInfos failure", t, func() {
+		targetErr := errors.New("GetL1BlockInfos error")
+		patchGuard.ApplyMethodFunc(db, "GetL1BlockInfos", func(fields map[string]interface{}, args ...string) ([]*types.L1BlockInfo, error) {
 			return nil, targetErr
 		})
 		l1Relayer.ProcessGasPriceOracle()
 	})
 
 	convey.Convey("Block not exist", t, func() {
-		patchGuard.ApplyMethodFunc(l1BlockOrm, "GetL1Blocks", func(fields map[string]interface{}) ([]orm.L1Block, error) {
-			tmpInfo := []orm.L1Block{
+		patchGuard.ApplyMethodFunc(db, "GetL1BlockInfos", func(fields map[string]interface{}, args ...string) ([]*types.L1BlockInfo, error) {
+			tmpInfo := []*types.L1BlockInfo{
 				{Hash: "gas-oracle-1", Number: 0},
 				{Hash: "gas-oracle-2", Number: 1},
 			}
@@ -205,12 +210,12 @@ func testL1RelayerProcessGasPriceOracle(t *testing.T) {
 		l1Relayer.ProcessGasPriceOracle()
 	})
 
-	patchGuard.ApplyMethodFunc(l1BlockOrm, "GetL1Blocks", func(fields map[string]interface{}) ([]orm.L1Block, error) {
-		tmpInfo := []orm.L1Block{
+	patchGuard.ApplyMethodFunc(db, "GetL1BlockInfos", func(fields map[string]interface{}, args ...string) ([]*types.L1BlockInfo, error) {
+		tmpInfo := []*types.L1BlockInfo{
 			{
 				Hash:            "gas-oracle-1",
 				Number:          0,
-				GasOracleStatus: int(types.GasOraclePending),
+				GasOracleStatus: types.GasOraclePending,
 			},
 		}
 		return tmpInfo, nil
@@ -242,13 +247,13 @@ func testL1RelayerProcessGasPriceOracle(t *testing.T) {
 
 	convey.Convey("UpdateL1GasOracleStatusAndOracleTxHash failure", t, func() {
 		targetErr := errors.New("UpdateL1GasOracleStatusAndOracleTxHash failure")
-		patchGuard.ApplyMethodFunc(l1BlockOrm, "UpdateL1GasOracleStatusAndOracleTxHash", func(context.Context, string, types.GasOracleStatus, string) error {
+		patchGuard.ApplyMethodFunc(db, "UpdateL1GasOracleStatusAndOracleTxHash", func(context.Context, string, types.GasOracleStatus, string) error {
 			return targetErr
 		})
 		l1Relayer.ProcessGasPriceOracle()
 	})
 
-	patchGuard.ApplyMethodFunc(l1BlockOrm, "UpdateL1GasOracleStatusAndOracleTxHash", func(context.Context, string, types.GasOracleStatus, string) error {
+	patchGuard.ApplyMethodFunc(db, "UpdateL1GasOracleStatusAndOracleTxHash", func(context.Context, string, types.GasOracleStatus, string) error {
 		return nil
 	})
 

bridge/relayer/l2_relayer.go

@@ -3,6 +3,7 @@ package relayer
 import (
 	"context"
 	"errors"
+	"fmt"
 	"math/big"
 	"runtime"
 	"sync"
@@ -12,30 +13,29 @@ import (
 	"github.com/scroll-tech/go-ethereum/crypto"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
-	gethMetrics "github.com/scroll-tech/go-ethereum/metrics"
+	geth_metrics "github.com/scroll-tech/go-ethereum/metrics"
 	"golang.org/x/sync/errgroup"
-	"gorm.io/gorm"
 	"modernc.org/mathutil"
 
 	"scroll-tech/common/metrics"
 	"scroll-tech/common/types"
 
-	bridgeAbi "scroll-tech/bridge/abi"
-	"scroll-tech/bridge/internal/config"
-	"scroll-tech/bridge/internal/controller/sender"
-	"scroll-tech/bridge/internal/orm"
-	bridgeTypes "scroll-tech/bridge/internal/types"
-	"scroll-tech/bridge/internal/utils"
+	"scroll-tech/database"
+
+	bridge_abi "scroll-tech/bridge/abi"
+	"scroll-tech/bridge/config"
+	"scroll-tech/bridge/sender"
+	"scroll-tech/bridge/utils"
 )
 
 var (
-	bridgeL2MsgsRelayedTotalCounter               = gethMetrics.NewRegisteredCounter("bridge/l2/msgs/relayed/total", metrics.ScrollRegistry)
-	bridgeL2BatchesFinalizedTotalCounter          = gethMetrics.NewRegisteredCounter("bridge/l2/batches/finalized/total", metrics.ScrollRegistry)
-	bridgeL2BatchesCommittedTotalCounter          = gethMetrics.NewRegisteredCounter("bridge/l2/batches/committed/total", metrics.ScrollRegistry)
-	bridgeL2MsgsRelayedConfirmedTotalCounter      = gethMetrics.NewRegisteredCounter("bridge/l2/msgs/relayed/confirmed/total", metrics.ScrollRegistry)
-	bridgeL2BatchesFinalizedConfirmedTotalCounter = gethMetrics.NewRegisteredCounter("bridge/l2/batches/finalized/confirmed/total", metrics.ScrollRegistry)
-	bridgeL2BatchesCommittedConfirmedTotalCounter = gethMetrics.NewRegisteredCounter("bridge/l2/batches/committed/confirmed/total", metrics.ScrollRegistry)
-	bridgeL2BatchesSkippedTotalCounter            = gethMetrics.NewRegisteredCounter("bridge/l2/batches/skipped/total", metrics.ScrollRegistry)
+	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
@@ -49,10 +49,7 @@ type Layer2Relayer struct {
 
 	l2Client *ethclient.Client
 
-	blockBatchOrm *orm.BlockBatch
-	blockTraceOrm *orm.BlockTrace
-	l2MessageOrm  *orm.L2Message
-
+	db  database.OrmFactory
 	cfg *config.RelayerConfig
 
 	messageSender  *sender.Sender
@@ -84,7 +81,7 @@ type Layer2Relayer struct {
 }
 
 // NewLayer2Relayer will return a new instance of Layer2RelayerClient
-func NewLayer2Relayer(ctx context.Context, l2Client *ethclient.Client, db *gorm.DB, cfg *config.RelayerConfig) (*Layer2Relayer, error) {
+func NewLayer2Relayer(ctx context.Context, l2Client *ethclient.Client, db database.OrmFactory, cfg *config.RelayerConfig) (*Layer2Relayer, error) {
 	// @todo use different sender for relayer, block commit and proof finalize
 	messageSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.MessageSenderPrivateKeys)
 	if err != nil {
@@ -121,21 +118,18 @@ func NewLayer2Relayer(ctx context.Context, l2Client *ethclient.Client, db *gorm.
 
 	layer2Relayer := &Layer2Relayer{
 		ctx: ctx,
-
-		blockBatchOrm: orm.NewBlockBatch(db),
-		l2MessageOrm:  orm.NewL2Message(db),
-		blockTraceOrm: orm.NewBlockTrace(db),
+		db:  db,
 
 		l2Client: l2Client,
 
 		messageSender:  messageSender,
-		l1MessengerABI: bridgeAbi.L1ScrollMessengerABI,
+		l1MessengerABI: bridge_abi.L1ScrollMessengerABI,
 
 		rollupSender: rollupSender,
-		l1RollupABI:  bridgeAbi.ScrollChainABI,
+		l1RollupABI:  bridge_abi.ScrollChainABI,
 
 		gasOracleSender: gasOracleSender,
-		l2GasOracleABI:  bridgeAbi.L2GasPriceOracleABI,
+		l2GasOracleABI:  bridge_abi.L2GasPriceOracleABI,
 
 		minGasLimitForMessageRelay: minGasLimitForMessageRelay,
 
@@ -155,23 +149,19 @@ const processMsgLimit = 100
 
 // ProcessSavedEvents relays saved un-processed cross-domain transactions to desired blockchain
 func (r *Layer2Relayer) ProcessSavedEvents() {
-	batch, err := r.blockBatchOrm.GetLatestBatchByRollupStatus([]types.RollupStatus{types.RollupFinalized})
+	batch, err := r.db.GetLatestFinalizedBatch()
 	if err != nil {
 		log.Error("GetLatestFinalizedBatch failed", "err", err)
 		return
 	}
 
 	// msgs are sorted by nonce in increasing order
-	fields := map[string]interface{}{
-		"status":        int(types.MsgPending),
-		"height <= (?)": batch.EndBlockNumber,
-	}
-	orderByList := []string{
-		"nonce ASC",
-	}
-	limit := processMsgLimit
+	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),
+	)
 
-	msgs, err := r.l2MessageOrm.GetL2Messages(fields, orderByList, limit)
 	if err != nil {
 		log.Error("Failed to fetch unprocessed L2 messages", "err", err)
 		return
@@ -187,7 +177,7 @@ func (r *Layer2Relayer) ProcessSavedEvents() {
 		for _, msg := range msgs[:size] {
 			msg := msg
 			g.Go(func() error {
-				return r.processSavedEvent(&msg)
+				return r.processSavedEvent(msg)
 			})
 		}
 		if err := g.Wait(); err != nil {
@@ -199,28 +189,24 @@ func (r *Layer2Relayer) ProcessSavedEvents() {
 	}
 }
 
-func (r *Layer2Relayer) processSavedEvent(msg *orm.L2Message) error {
+func (r *Layer2Relayer) processSavedEvent(msg *types.L2Message) error {
 	// @todo fetch merkle proof from l2geth
 	log.Info("Processing L2 Message", "msg.nonce", msg.Nonce, "msg.height", msg.Height)
 
 	// Get the block info that contains the message
-	blockInfos, err := r.blockTraceOrm.GetL2BlockInfos(map[string]interface{}{"number": msg.Height}, nil, 0)
+	blockInfos, err := r.db.GetL2BlockInfos(map[string]interface{}{"number": msg.Height})
 	if err != nil {
 		log.Error("Failed to GetL2BlockInfos from DB", "number", msg.Height)
 	}
-	if len(blockInfos) == 0 {
-		return errors.New("get block trace len is 0, exit")
-	}
-
 	blockInfo := blockInfos[0]
-	if blockInfo.BatchHash == "" {
+	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 := bridgeAbi.IL1ScrollMessengerL2MessageProof{
-		BatchHash:   common.HexToHash(blockInfo.BatchHash),
+	proof := bridge_abi.IL1ScrollMessengerL2MessageProof{
+		BatchHash:   common.HexToHash(blockInfo.BatchHash.String),
 		MerkleProof: make([]byte, 0),
 	}
 	from := common.HexToAddress(msg.Sender)
@@ -241,11 +227,11 @@ func (r *Layer2Relayer) processSavedEvent(msg *orm.L2Message) error {
 	}
 
 	hash, err := r.messageSender.SendTransaction(msg.MsgHash, &r.cfg.MessengerContractAddress, big.NewInt(0), data, r.minGasLimitForMessageRelay)
-	if err != nil && errors.Is(err, ErrExecutionRevertedMessageExpired) {
-		return r.l2MessageOrm.UpdateLayer2Status(r.ctx, msg.MsgHash, types.MsgExpired)
+	if err != nil && err.Error() == "execution reverted: Message expired" {
+		return r.db.UpdateLayer2Status(r.ctx, msg.MsgHash, types.MsgExpired)
 	}
-	if err != nil && errors.Is(err, ErrExecutionRevertedAlreadySuccessExecuted) {
-		return r.l2MessageOrm.UpdateLayer2Status(r.ctx, msg.MsgHash, types.MsgConfirmed)
+	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) {
@@ -258,7 +244,7 @@ func (r *Layer2Relayer) processSavedEvent(msg *orm.L2Message) error {
 
 	// save status in db
 	// @todo handle db error
-	err = r.l2MessageOrm.UpdateLayer2StatusAndLayer1Hash(r.ctx, msg.MsgHash, types.MsgSubmitted, hash.String())
+	err = r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, msg.MsgHash, types.MsgSubmitted, hash.String())
 	if err != nil {
 		log.Error("UpdateLayer2StatusAndLayer1Hash failed", "msgHash", msg.MsgHash, "err", err)
 		return err
@@ -269,13 +255,13 @@ func (r *Layer2Relayer) processSavedEvent(msg *orm.L2Message) error {
 
 // ProcessGasPriceOracle imports gas price to layer1
 func (r *Layer2Relayer) ProcessGasPriceOracle() {
-	batch, err := r.blockBatchOrm.GetLatestBatch()
+	batch, err := r.db.GetLatestBatch()
 	if err != nil {
 		log.Error("Failed to GetLatestBatch", "err", err)
 		return
 	}
 
-	if types.GasOracleStatus(batch.OracleStatus) == types.GasOraclePending {
+	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)
@@ -300,7 +286,7 @@ func (r *Layer2Relayer) ProcessGasPriceOracle() {
 				return
 			}
 
-			err = r.blockBatchOrm.UpdateL2GasOracleStatusAndOracleTxHash(r.ctx, batch.Hash, types.GasOracleImporting, hash.String())
+			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
@@ -312,14 +298,14 @@ func (r *Layer2Relayer) ProcessGasPriceOracle() {
 }
 
 // SendCommitTx sends commitBatches tx to L1.
-func (r *Layer2Relayer) SendCommitTx(batchData []*bridgeTypes.BatchData) error {
+func (r *Layer2Relayer) SendCommitTx(batchData []*types.BatchData) error {
 	if len(batchData) == 0 {
 		log.Error("SendCommitTx receives empty batch")
 		return nil
 	}
 
 	// pack calldata
-	commitBatches := make([]bridgeAbi.IScrollChainBatch, len(batchData))
+	commitBatches := make([]bridge_abi.IScrollChainBatch, len(batchData))
 	for i, batch := range batchData {
 		commitBatches[i] = batch.Batch
 	}
@@ -355,7 +341,7 @@ func (r *Layer2Relayer) SendCommitTx(batchData []*bridgeTypes.BatchData) error {
 	batchHashes := make([]string, len(batchData))
 	for i, batch := range batchData {
 		batchHashes[i] = batch.Hash().Hex()
-		err = r.blockBatchOrm.UpdateCommitTxHashAndRollupStatus(r.ctx, batchHashes[i], txHash.String(), types.RollupCommitting)
+		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)
 		}
@@ -367,7 +353,7 @@ func (r *Layer2Relayer) SendCommitTx(batchData []*bridgeTypes.BatchData) error {
 // ProcessCommittedBatches submit proof to layer 1 rollup contract
 func (r *Layer2Relayer) ProcessCommittedBatches() {
 	// set skipped batches in a single db operation
-	if count, err := r.blockBatchOrm.UpdateSkippedBatches(); err != nil {
+	if count, err := r.db.UpdateSkippedBatches(); err != nil {
 		log.Error("UpdateSkippedBatches failed", "err", err)
 		// continue anyway
 	} else if count > 0 {
@@ -376,7 +362,7 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 	}
 
 	// batches are sorted by batch index in increasing order
-	batchHashes, err := r.blockBatchOrm.GetBlockBatchesHashByRollupStatus(types.RollupCommitted, 1)
+	batchHashes, err := r.db.GetCommittedBatches(1)
 	if err != nil {
 		log.Error("Failed to fetch committed L2 batches", "err", err)
 		return
@@ -387,7 +373,7 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 	hash := batchHashes[0]
 	// @todo add support to relay multiple batches
 
-	batches, err := r.blockBatchOrm.GetBlockBatches(map[string]interface{}{"hash": hash}, nil, 1)
+	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
@@ -398,31 +384,33 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 	}
 
 	batch := batches[0]
-	status := types.ProvingStatus(batch.ProvingStatus)
+	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.blockBatchOrm.UpdateRollupStatus(r.ctx, hash, types.RollupFinalizationSkipped); err != nil {
+
+		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
 
-		rollupStatues := []types.RollupStatus{
-			types.RollupFinalizing,
-			types.RollupFinalized,
-		}
-		previousBatch, err := r.blockBatchOrm.GetLatestBatchByRollupStatus(rollupStatues)
+		previousBatch, err := r.db.GetLatestFinalizingOrFinalizedBatch()
+
 		// skip submitting proof
-		if err == nil && uint64(batch.CreatedAt.Sub(previousBatch.CreatedAt).Seconds()) < r.cfg.FinalizeBatchIntervalSec {
+		if err == nil && uint64(batch.CreatedAt.Sub(*previousBatch.CreatedAt).Seconds()) < r.cfg.FinalizeBatchIntervalSec {
 			log.Info(
 				"Not enough time passed, skipping",
 				"hash", hash,
@@ -432,7 +420,7 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 				"lastFinalizingCreatedAt", previousBatch.CreatedAt,
 			)
 
-			if err = r.blockBatchOrm.UpdateRollupStatus(r.ctx, hash, types.RollupFinalizationSkipped); err != nil {
+			if err = r.db.UpdateRollupStatus(r.ctx, hash, types.RollupFinalizationSkipped); err != nil {
 				log.Warn("UpdateRollupStatus failed", "hash", hash, "err", err)
 			} else {
 				success = true
@@ -442,7 +430,7 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 		}
 
 		// handle unexpected db error
-		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+		if err != nil && err.Error() != "sql: no rows in result set" {
 			log.Error("Failed to get latest finalized batch", "err", err)
 			return
 		}
@@ -451,26 +439,33 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 			// 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.blockBatchOrm.UpdateRollupStatus(r.ctx, hash, types.RollupFinalizationSkipped); err != nil {
+				if err = r.db.UpdateRollupStatus(r.ctx, hash, types.RollupFinalizationSkipped); err != nil {
 					log.Warn("UpdateRollupStatus failed", "hash", hash, "err", err)
 				}
 			}
 		}()
 
-		aggProof, err := r.blockBatchOrm.GetVerifiedProofByHash(hash)
+		proofBuffer, icBuffer, err := r.db.GetVerifiedProofAndInstanceCommitmentsByHash(hash)
 		if err != nil {
-			log.Warn("get verified proof by hash failed", "hash", hash, "err", err)
+			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
 		}
 
-		if err = aggProof.SanityCheck(); err != nil {
-			log.Warn("agg_proof sanity check fails", "hash", hash, "error", err)
-			return
-		}
-
-		proof := utils.BufferToUint256Le(aggProof.Proof)
-		finalPair := utils.BufferToUint256Le(aggProof.FinalPair)
-		data, err := r.l1RollupABI.Pack("finalizeBatchWithProof", common.HexToHash(hash), proof, finalPair)
+		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
@@ -490,7 +485,7 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 		log.Info("finalizeBatchWithProof in layer1", "batch_hash", hash, "tx_hash", hash)
 
 		// record and sync with db, @todo handle db error
-		err = r.blockBatchOrm.UpdateFinalizeTxHashAndRollupStatus(r.ctx, hash, finalizeTxHash.String(), types.RollupFinalizing)
+		err = r.db.UpdateFinalizeTxHashAndRollupStatus(r.ctx, hash, finalizeTxHash.String(), types.RollupFinalizing)
 		if err != nil {
 			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed", "batch_hash", hash, "err", err)
 		}
@@ -517,7 +512,7 @@ func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) {
 			log.Warn("transaction confirmed but failed in layer1", "confirmation", confirmation)
 		}
 		// @todo handle db error
-		err := r.l2MessageOrm.UpdateLayer2StatusAndLayer1Hash(r.ctx, msgHash.(string), status, confirmation.TxHash.String())
+		err := r.db.UpdateLayer2StatusAndLayer1Hash(r.ctx, msgHash.(string), status, confirmation.TxHash.String())
 		if err != nil {
 			log.Warn("UpdateLayer2StatusAndLayer1Hash failed", "msgHash", msgHash.(string), "err", err)
 		}
@@ -538,7 +533,7 @@ func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) {
 		}
 		for _, batchHash := range batchHashes {
 			// @todo handle db error
-			err := r.blockBatchOrm.UpdateCommitTxHashAndRollupStatus(r.ctx, batchHash, confirmation.TxHash.String(), status)
+			err := r.db.UpdateCommitTxHashAndRollupStatus(r.ctx, batchHash, confirmation.TxHash.String(), status)
 			if err != nil {
 				log.Warn("UpdateCommitTxHashAndRollupStatus failed", "batch_hash", batchHash, "err", err)
 			}
@@ -558,7 +553,7 @@ func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) {
 			log.Warn("transaction confirmed but failed in layer1", "confirmation", confirmation)
 		}
 		// @todo handle db error
-		err := r.blockBatchOrm.UpdateFinalizeTxHashAndRollupStatus(r.ctx, batchHash.(string), confirmation.TxHash.String(), status)
+		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)
 		}
@@ -580,14 +575,14 @@ func (r *Layer2Relayer) handleConfirmLoop(ctx context.Context) {
 		case cfm := <-r.gasOracleSender.ConfirmChan():
 			if !cfm.IsSuccessful {
 				// @discuss: maybe make it pending again?
-				err := r.blockBatchOrm.UpdateL2GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleFailed, cfm.TxHash.String())
+				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.blockBatchOrm.UpdateL2GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleImported, cfm.TxHash.String())
+				err := r.db.UpdateL2GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleImported, cfm.TxHash.String())
 				if err != nil {
 					log.Warn("UpdateL2GasOracleStatusAndOracleTxHash failed", "err", err)
 				}

bridge/relayer/l2_relayer_test.go

@@ -12,24 +12,21 @@ import (
 	"github.com/agiledragon/gomonkey/v2"
 	"github.com/scroll-tech/go-ethereum/accounts/abi"
 	"github.com/scroll-tech/go-ethereum/common"
-	gethTypes "github.com/scroll-tech/go-ethereum/core/types"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/smartystreets/goconvey/convey"
 	"github.com/stretchr/testify/assert"
-	"gorm.io/gorm"
 
 	"scroll-tech/common/types"
-	"scroll-tech/common/types/message"
 	"scroll-tech/common/utils"
 
-	"scroll-tech/bridge/internal/controller/sender"
-	"scroll-tech/bridge/internal/orm"
-	"scroll-tech/bridge/internal/orm/migrate"
-	bridgeTypes "scroll-tech/bridge/internal/types"
-	bridgeUtils "scroll-tech/bridge/internal/utils"
+	"scroll-tech/bridge/sender"
+
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
 )
 
 var (
-	templateL2Message = []orm.L2Message{
+	templateL2Message = []*types.L2Message{
 		{
 			Nonce:      1,
 			Height:     1,
@@ -42,174 +39,144 @@ var (
 	}
 )
 
-func setupL2RelayerDB(t *testing.T) *gorm.DB {
-	db, err := bridgeUtils.InitDB(cfg.DBConfig)
-	assert.NoError(t, err)
-	sqlDB, err := db.DB()
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(sqlDB))
-	return db
-}
-
 func testCreateNewRelayer(t *testing.T) {
-	db := setupL2RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	// 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) {
-	db := setupL2RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	// 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)
 
-	l2MessageOrm := orm.NewL2Message(db)
-	err = l2MessageOrm.SaveL2Messages(context.Background(), templateL2Message)
+	err = db.SaveL2Messages(context.Background(), templateL2Message)
 	assert.NoError(t, err)
 
-	traces := []*bridgeTypes.WrappedBlock{
+	traces := []*types.WrappedBlock{
 		{
-			Header: &gethTypes.Header{
+			Header: &geth_types.Header{
 				Number: big.NewInt(int64(templateL2Message[0].Height)),
 			},
 			Transactions:     nil,
 			WithdrawTrieRoot: common.Hash{},
 		},
 		{
-			Header: &gethTypes.Header{
+			Header: &geth_types.Header{
 				Number: big.NewInt(int64(templateL2Message[0].Height + 1)),
 			},
 			Transactions:     nil,
 			WithdrawTrieRoot: common.Hash{},
 		},
 	}
+	assert.NoError(t, db.InsertWrappedBlocks(traces))
 
-	blockTraceOrm := orm.NewBlockTrace(db)
-	assert.NoError(t, blockTraceOrm.InsertWrappedBlocks(traces))
-	blockBatchOrm := orm.NewBlockBatch(db)
-	parentBatch1 := &bridgeTypes.BatchInfo{
+	parentBatch1 := &types.BlockBatch{
 		Index:     0,
 		Hash:      common.Hash{}.Hex(),
 		StateRoot: common.Hash{}.Hex(),
 	}
-	batchData1 := bridgeTypes.NewBatchData(parentBatch1, []*bridgeTypes.WrappedBlock{wrappedBlock1}, nil)
-	batchHash := batchData1.Hash().Hex()
-	err = db.Transaction(func(tx *gorm.DB) error {
-		rowsAffected, dbTxErr := blockBatchOrm.InsertBlockBatchByBatchData(tx, batchData1)
-		if dbTxErr != nil {
-			return dbTxErr
-		}
-		if rowsAffected != 1 {
-			dbTxErr = errors.New("the InsertBlockBatchByBatchData affected row is not 1")
-			return dbTxErr
-		}
-		dbTxErr = blockTraceOrm.UpdateBatchHashForL2Blocks(tx, []uint64{1}, batchHash)
-		if dbTxErr != nil {
-			return dbTxErr
-		}
-		return nil
-	})
+	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 = blockBatchOrm.UpdateRollupStatus(context.Background(), batchHash, types.RollupFinalized)
+	err = db.UpdateRollupStatus(context.Background(), batchHash, types.RollupFinalized)
 	assert.NoError(t, err)
 
 	relayer.ProcessSavedEvents()
 
-	msg, err := l2MessageOrm.GetL2MessageByNonce(templateL2Message[0].Nonce)
+	msg, err := db.GetL2MessageByNonce(templateL2Message[0].Nonce)
 	assert.NoError(t, err)
-	assert.Equal(t, types.MsgSubmitted, types.MsgStatus(msg.Status))
+	assert.Equal(t, types.MsgSubmitted, msg.Status)
 }
 
 func testL2RelayerProcessCommittedBatches(t *testing.T) {
-	db := setupL2RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	// 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 := &bridgeTypes.BatchInfo{
+	parentBatch1 := &types.BlockBatch{
 		Index:     0,
 		Hash:      common.Hash{}.Hex(),
 		StateRoot: common.Hash{}.Hex(),
 	}
-
-	blockBatchOrm := orm.NewBlockBatch(db)
-	batchData1 := bridgeTypes.NewBatchData(parentBatch1, []*bridgeTypes.WrappedBlock{wrappedBlock1}, nil)
+	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 = db.Transaction(func(tx *gorm.DB) error {
-		rowsAffected, dbTxErr := blockBatchOrm.InsertBlockBatchByBatchData(tx, batchData1)
-		if dbTxErr != nil {
-			return dbTxErr
-		}
-		if rowsAffected != 1 {
-			dbTxErr = errors.New("the InsertBlockBatchByBatchData affected row is not 1")
-			return dbTxErr
-		}
-		return nil
-	})
+	err = dbTx.Commit()
 	assert.NoError(t, err)
 
-	err = blockBatchOrm.UpdateRollupStatus(context.Background(), batchHash, types.RollupCommitted)
+	err = db.UpdateRollupStatus(context.Background(), batchHash, types.RollupCommitted)
 	assert.NoError(t, err)
 
-	proof := &message.AggProof{
-		Proof:     []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},
-		FinalPair: []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 = blockBatchOrm.UpdateProofByHash(context.Background(), batchHash, proof, 100)
+	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 = blockBatchOrm.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
+	err = db.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
 	assert.NoError(t, err)
 
 	relayer.ProcessCommittedBatches()
 
-	statuses, err := blockBatchOrm.GetRollupStatusByHashList([]string{batchHash})
+	status, err := db.GetRollupStatus(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, 1, len(statuses))
-	assert.Equal(t, types.RollupFinalizing, statuses[0])
+	assert.Equal(t, types.RollupFinalizing, status)
 }
 
 func testL2RelayerSkipBatches(t *testing.T) {
-	db := setupL2RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	// 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)
 
-	blockBatchOrm := orm.NewBlockBatch(db)
 	createBatch := func(rollupStatus types.RollupStatus, provingStatus types.ProvingStatus, index uint64) string {
+		dbTx, err := db.Beginx()
+		assert.NoError(t, err)
 		batchData := genBatchData(t, index)
-		err = db.Transaction(func(tx *gorm.DB) error {
-			rowsAffected, dbTxErr := blockBatchOrm.InsertBlockBatchByBatchData(tx, batchData)
-			if dbTxErr != nil {
-				return dbTxErr
-			}
-			if rowsAffected != 1 {
-				dbTxErr = errors.New("the InsertBlockBatchByBatchData affected row is not 1")
-				return dbTxErr
-			}
-			return nil
-		})
-		assert.NoError(t, err)
-
+		assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData))
 		batchHash := batchData.Hash().Hex()
-		err = blockBatchOrm.UpdateRollupStatus(context.Background(), batchHash, rollupStatus)
+		err = dbTx.Commit()
 		assert.NoError(t, err)
 
-		proof := &message.AggProof{
-			Proof:     []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},
-			FinalPair: []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 = blockBatchOrm.UpdateProofByHash(context.Background(), batchHash, proof, 100)
+		err = db.UpdateRollupStatus(context.Background(), batchHash, rollupStatus)
 		assert.NoError(t, err)
-		err = blockBatchOrm.UpdateProvingStatus(batchHash, provingStatus)
+
+		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
 	}
 
@@ -233,30 +200,29 @@ func testL2RelayerSkipBatches(t *testing.T) {
 	relayer.ProcessCommittedBatches()
 
 	for _, id := range skipped {
-		statuses, err := blockBatchOrm.GetRollupStatusByHashList([]string{id})
+		status, err := db.GetRollupStatus(id)
 		assert.NoError(t, err)
-		assert.Equal(t, 1, len(statuses))
-		assert.Equal(t, types.RollupFinalizationSkipped, statuses[0])
+		assert.Equal(t, types.RollupFinalizationSkipped, status)
 	}
 
 	for _, id := range notSkipped {
-		statuses, err := blockBatchOrm.GetRollupStatusByHashList([]string{id})
+		status, err := db.GetRollupStatus(id)
 		assert.NoError(t, err)
-		assert.Equal(t, 1, len(statuses))
-		assert.NotEqual(t, types.RollupFinalizationSkipped, statuses[0])
+		assert.NotEqual(t, types.RollupFinalizationSkipped, status)
 	}
 }
 
 func testL2RelayerMsgConfirm(t *testing.T) {
-	db := setupL2RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
-	l2MessageOrm := orm.NewL2Message(db)
-	insertL2Messages := []orm.L2Message{
-		{MsgHash: "msg-1", Nonce: 0},
-		{MsgHash: "msg-2", Nonce: 1},
-	}
-	err := l2MessageOrm.SaveL2Messages(context.Background(), insertL2Messages)
+	// 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
@@ -279,46 +245,32 @@ func testL2RelayerMsgConfirm(t *testing.T) {
 
 	// Check the database for the updated status using TryTimes.
 	assert.True(t, utils.TryTimes(5, func() bool {
-		fields1 := map[string]interface{}{"msg_hash": "msg-1"}
-		msg1, err1 := l2MessageOrm.GetL2Messages(fields1, nil, 0)
-		if len(msg1) != 1 {
-			return false
-		}
-		fields2 := map[string]interface{}{"msg_hash": "msg-2"}
-		msg2, err2 := l2MessageOrm.GetL2Messages(fields2, nil, 0)
-		if len(msg2) != 1 {
-			return false
-		}
-		return err1 == nil && types.MsgStatus(msg1[0].Status) == types.MsgConfirmed &&
-			err2 == nil && types.MsgStatus(msg2[0].Status) == types.MsgRelayFailed
+		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) {
-	db := setupL2RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	// 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([]*bridgeTypes.BatchData, 6)
+	batches := make([]*types.BatchData, 6)
 	for i := 0; i < 6; i++ {
 		batches[i] = genBatchData(t, uint64(i))
 	}
 
-	blockBatchOrm := orm.NewBlockBatch(db)
-	err := db.Transaction(func(tx *gorm.DB) error {
-		for _, batch := range batches {
-			rowsAffected, dbTxErr := blockBatchOrm.InsertBlockBatchByBatchData(tx, batch)
-			if dbTxErr != nil {
-				return dbTxErr
-			}
-			if rowsAffected != 1 {
-				dbTxErr = errors.New("the InsertBlockBatchByBatchData affected row is not 1")
-				return dbTxErr
-			}
-		}
-		return nil
-	})
+	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
@@ -362,8 +314,8 @@ func testL2RelayerRollupConfirm(t *testing.T) {
 		}
 
 		for i, batch := range batches[:6] {
-			batchInDB, err := blockBatchOrm.GetBlockBatches(map[string]interface{}{"hash": batch.Hash().Hex()}, nil, 0)
-			if err != nil || len(batchInDB) != 1 || types.RollupStatus(batchInDB[0].RollupStatus) != expectedStatuses[i] {
+			batchInDB, err := db.GetBlockBatches(map[string]interface{}{"hash": batch.Hash().Hex()})
+			if err != nil || len(batchInDB) != 1 || batchInDB[0].RollupStatus != expectedStatuses[i] {
 				return false
 			}
 		}
@@ -373,30 +325,24 @@ func testL2RelayerRollupConfirm(t *testing.T) {
 }
 
 func testL2RelayerGasOracleConfirm(t *testing.T) {
-	db := setupL2RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	// 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([]*bridgeTypes.BatchData, 2)
+	batches := make([]*types.BatchData, 2)
 	for i := 0; i < 2; i++ {
 		batches[i] = genBatchData(t, uint64(i))
 	}
 
-	blockBatchOrm := orm.NewBlockBatch(db)
-	err := db.Transaction(func(tx *gorm.DB) error {
-		for _, batch := range batches {
-			rowsAffected, dbTxErr := blockBatchOrm.InsertBlockBatchByBatchData(tx, batch)
-			if dbTxErr != nil {
-				return dbTxErr
-			}
-			if rowsAffected != 1 {
-				dbTxErr = errors.New("the InsertBlockBatchByBatchData affected row is not 1")
-				return dbTxErr
-			}
-		}
-		return nil
-	})
+	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
@@ -418,8 +364,8 @@ func testL2RelayerGasOracleConfirm(t *testing.T) {
 	ok := utils.TryTimes(5, func() bool {
 		expectedStatuses := []types.GasOracleStatus{types.GasOracleImported, types.GasOracleFailed}
 		for i, batch := range batches {
-			gasOracle, err := blockBatchOrm.GetBlockBatches(map[string]interface{}{"hash": batch.Hash().Hex()}, nil, 0)
-			if err != nil || len(gasOracle) != 1 || types.GasOracleStatus(gasOracle[0].OracleStatus) != expectedStatuses[i] {
+			gasOracle, err := db.GetBlockBatches(map[string]interface{}{"hash": batch.Hash().Hex()})
+			if err != nil || len(gasOracle) != 1 || gasOracle[0].OracleStatus != expectedStatuses[i] {
 				return false
 			}
 		}
@@ -428,42 +374,43 @@ func testL2RelayerGasOracleConfirm(t *testing.T) {
 	assert.True(t, ok)
 }
 
-func genBatchData(t *testing.T, index uint64) *bridgeTypes.BatchData {
-	templateBlockTrace, err := os.ReadFile("../../../testdata/blockTrace_02.json")
+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 := &bridgeTypes.WrappedBlock{}
+	wrappedBlock := &types.WrappedBlock{}
 	err = json.Unmarshal(templateBlockTrace, wrappedBlock)
 	assert.NoError(t, err)
 	wrappedBlock.Header.ParentHash = common.HexToHash("0x" + strconv.FormatUint(index+1, 16))
-	parentBatch := &bridgeTypes.BatchInfo{
+	parentBatch := &types.BlockBatch{
 		Index: index,
 		Hash:  "0x0000000000000000000000000000000000000000",
 	}
-	return bridgeTypes.NewBatchData(parentBatch, []*bridgeTypes.WrappedBlock{wrappedBlock}, nil)
+	return types.NewBatchData(parentBatch, []*types.WrappedBlock{wrappedBlock}, nil)
 }
 
 func testLayer2RelayerProcessGasPriceOracle(t *testing.T) {
-	db := setupL2RelayerDB(t)
-	defer bridgeUtils.CloseDB(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)
 
-	var blockBatchOrm *orm.BlockBatch
 	convey.Convey("Failed to GetLatestBatch", t, func() {
 		targetErr := errors.New("GetLatestBatch error")
-		patchGuard := gomonkey.ApplyMethodFunc(blockBatchOrm, "GetLatestBatch", func() (*orm.BlockBatch, error) {
+		patchGuard := gomonkey.ApplyMethodFunc(db, "GetLatestBatch", func() (*types.BlockBatch, error) {
 			return nil, targetErr
 		})
 		defer patchGuard.Reset()
 		relayer.ProcessGasPriceOracle()
 	})
 
-	patchGuard := gomonkey.ApplyMethodFunc(blockBatchOrm, "GetLatestBatch", func() (*orm.BlockBatch, error) {
-		batch := orm.BlockBatch{
-			OracleStatus: int(types.GasOraclePending),
+	patchGuard := gomonkey.ApplyMethodFunc(db, "GetLatestBatch", func() (*types.BlockBatch, error) {
+		batch := types.BlockBatch{
+			OracleStatus: types.GasOraclePending,
 			Hash:         "0x0000000000000000000000000000000000000000",
 		}
 		return &batch, nil
@@ -508,40 +455,42 @@ func testLayer2RelayerProcessGasPriceOracle(t *testing.T) {
 
 	convey.Convey("UpdateGasOracleStatusAndOracleTxHash failed", t, func() {
 		targetErr := errors.New("UpdateL2GasOracleStatusAndOracleTxHash error")
-		patchGuard.ApplyMethodFunc(blockBatchOrm, "UpdateL2GasOracleStatusAndOracleTxHash", func(ctx context.Context, hash string, status types.GasOracleStatus, txHash string) error {
+		patchGuard.ApplyMethodFunc(db, "UpdateL2GasOracleStatusAndOracleTxHash", func(ctx context.Context, hash string, status types.GasOracleStatus, txHash string) error {
 			return targetErr
 		})
 		relayer.ProcessGasPriceOracle()
 	})
 
-	patchGuard.ApplyMethodFunc(blockBatchOrm, "UpdateL2GasOracleStatusAndOracleTxHash", func(ctx context.Context, hash string, status types.GasOracleStatus, txHash string) error {
+	patchGuard.ApplyMethodFunc(db, "UpdateL2GasOracleStatusAndOracleTxHash", func(ctx context.Context, hash string, status types.GasOracleStatus, txHash string) error {
 		return nil
 	})
 	relayer.ProcessGasPriceOracle()
 }
 
 func testLayer2RelayerSendCommitTx(t *testing.T) {
-	db := setupL2RelayerDB(t)
-	defer bridgeUtils.CloseDB(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)
 
-	var batchDataList []*bridgeTypes.BatchData
+	var batchDataList []*types.BatchData
 	convey.Convey("SendCommitTx receives empty batch", t, func() {
 		err = relayer.SendCommitTx(batchDataList)
 		assert.NoError(t, err)
 	})
 
-	parentBatch := &bridgeTypes.BatchInfo{
+	parentBatch := &types.BlockBatch{
 		Index: 0,
 		Hash:  "0x0000000000000000000000000000000000000000",
 	}
 
-	traces := []*bridgeTypes.WrappedBlock{
+	traces := []*types.WrappedBlock{
 		{
-			Header: &gethTypes.Header{
+			Header: &geth_types.Header{
 				Number:     big.NewInt(1000),
 				ParentHash: common.Hash{},
 				Difficulty: big.NewInt(0),
@@ -552,8 +501,8 @@ func testLayer2RelayerSendCommitTx(t *testing.T) {
 		},
 	}
 
-	blocks := []*bridgeTypes.WrappedBlock{traces[0]}
-	tmpBatchData := bridgeTypes.NewBatchData(parentBatch, blocks, cfg.L2Config.BatchProposerConfig.PublicInputConfig)
+	blocks := []*types.WrappedBlock{traces[0]}
+	tmpBatchData := types.NewBatchData(parentBatch, blocks, cfg.L2Config.BatchProposerConfig.PublicInputConfig)
 	batchDataList = append(batchDataList, tmpBatchData)
 
 	var s abi.ABI
@@ -586,17 +535,16 @@ func testLayer2RelayerSendCommitTx(t *testing.T) {
 		return common.HexToHash("0x56789abcdef1234"), nil
 	})
 
-	var blockBatchOrm *orm.BlockBatch
 	convey.Convey("UpdateCommitTxHashAndRollupStatus failed", t, func() {
 		targetErr := errors.New("UpdateCommitTxHashAndRollupStatus failure")
-		patchGuard.ApplyMethodFunc(blockBatchOrm, "UpdateCommitTxHashAndRollupStatus", func(ctx context.Context, hash string, commitTxHash string, status types.RollupStatus) error {
+		patchGuard.ApplyMethodFunc(db, "UpdateCommitTxHashAndRollupStatus", func(ctx context.Context, hash string, commitTxHash string, status types.RollupStatus) error {
 			return targetErr
 		})
 		err = relayer.SendCommitTx(batchDataList)
 		assert.NoError(t, err)
 	})
 
-	patchGuard.ApplyMethodFunc(blockBatchOrm, "UpdateCommitTxHashAndRollupStatus", func(ctx context.Context, hash string, commitTxHash string, status types.RollupStatus) error {
+	patchGuard.ApplyMethodFunc(db, "UpdateCommitTxHashAndRollupStatus", func(ctx context.Context, hash string, commitTxHash string, status types.RollupStatus) error {
 		return nil
 	})
 	err = relayer.SendCommitTx(batchDataList)

bridge/relayer/params.go

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

@@ -10,9 +10,9 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"scroll-tech/common/docker"
+	"scroll-tech/common/types"
 
-	"scroll-tech/bridge/internal/config"
-	bridgeTypes "scroll-tech/bridge/internal/types"
+	"scroll-tech/bridge/config"
 )
 
 var (
@@ -25,65 +25,60 @@ var (
 	l2Cli *ethclient.Client
 
 	// block trace
-	wrappedBlock1 *bridgeTypes.WrappedBlock
-	wrappedBlock2 *bridgeTypes.WrappedBlock
+	wrappedBlock1 *types.WrappedBlock
+	wrappedBlock2 *types.WrappedBlock
 
 	// batch data
-	batchData1 *bridgeTypes.BatchData
-	batchData2 *bridgeTypes.BatchData
+	batchData1 *types.BatchData
+	batchData2 *types.BatchData
 )
 
 func setupEnv(t *testing.T) (err error) {
 	// Load config.
-	cfg, err = config.NewConfig("../../../conf/config.json")
+	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 = &config.DBConfig{
-		DSN:        base.DBConfig.DSN,
-		DriverName: base.DBConfig.DriverName,
-		MaxOpenNum: base.DBConfig.MaxOpenNum,
-		MaxIdleNum: base.DBConfig.MaxIdleNum,
-	}
+	cfg.DBConfig = base.DBConfig
 
 	// Create l2geth client.
 	l2Cli, err = base.L2Client()
 	assert.NoError(t, err)
 
-	templateBlockTrace1, err := os.ReadFile("../../../testdata/blockTrace_02.json")
+	templateBlockTrace1, err := os.ReadFile("../../common/testdata/blockTrace_02.json")
 	if err != nil {
 		return err
 	}
 	// unmarshal blockTrace
-	wrappedBlock1 = &bridgeTypes.WrappedBlock{}
+	wrappedBlock1 = &types.WrappedBlock{}
 	if err = json.Unmarshal(templateBlockTrace1, wrappedBlock1); err != nil {
 		return err
 	}
-	parentBatch1 := &bridgeTypes.BatchInfo{
+	parentBatch1 := &types.BlockBatch{
 		Index:     0,
 		Hash:      "0x0cc6b102c2924402c14b2e3a19baccc316252bfdc44d9ec62e942d34e39ec729",
 		StateRoot: "0x2579122e8f9ec1e862e7d415cef2fb495d7698a8e5f0dddc5651ba4236336e7d",
 	}
-	batchData1 = bridgeTypes.NewBatchData(parentBatch1, []*bridgeTypes.WrappedBlock{wrappedBlock1}, nil)
+	batchData1 = types.NewBatchData(parentBatch1, []*types.WrappedBlock{wrappedBlock1}, nil)
 
-	templateBlockTrace2, err := os.ReadFile("../../../testdata/blockTrace_03.json")
+	templateBlockTrace2, err := os.ReadFile("../../common/testdata/blockTrace_03.json")
 	if err != nil {
 		return err
 	}
 	// unmarshal blockTrace
-	wrappedBlock2 = &bridgeTypes.WrappedBlock{}
+	wrappedBlock2 = &types.WrappedBlock{}
 	if err = json.Unmarshal(templateBlockTrace2, wrappedBlock2); err != nil {
 		return err
 	}
-	parentBatch2 := &bridgeTypes.BatchInfo{
+	parentBatch2 := &types.BlockBatch{
 		Index:     batchData1.Batch.BatchIndex,
 		Hash:      batchData1.Hash().Hex(),
 		StateRoot: batchData1.Batch.NewStateRoot.String(),
 	}
-	batchData2 = bridgeTypes.NewBatchData(parentBatch2, []*bridgeTypes.WrappedBlock{wrappedBlock2}, nil)
+	batchData2 = types.NewBatchData(parentBatch2, []*types.WrappedBlock{wrappedBlock2}, nil)
 
 	log.Info("batchHash", "batchhash1", batchData1.Hash().Hex(), "batchhash2", batchData2.Hash().Hex())
 

bridge/sender/sender.go

@@ -17,8 +17,8 @@ import (
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
 
-	"scroll-tech/bridge/internal/config"
-	"scroll-tech/bridge/internal/utils"
+	"scroll-tech/bridge/config"
+	"scroll-tech/bridge/utils"
 )
 
 const (

bridge/sender/sender_test.go

@@ -9,6 +9,8 @@ import (
 	"testing"
 	"time"
 
+	"golang.org/x/sync/errgroup"
+
 	"github.com/agiledragon/gomonkey/v2"
 	cmap "github.com/orcaman/concurrent-map"
 	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
@@ -18,11 +20,10 @@ import (
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/rpc"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/sync/errgroup"
 
 	"scroll-tech/common/docker"
 
-	"scroll-tech/bridge/internal/config"
+	"scroll-tech/bridge/config"
 )
 
 const TXBatch = 50
@@ -44,7 +45,7 @@ func TestMain(m *testing.M) {
 
 func setupEnv(t *testing.T) {
 	var err error
-	cfg, err = config.NewConfig("../../../conf/config.json")
+	cfg, err = config.NewConfig("../config.json")
 	assert.NoError(t, err)
 	base.RunImages(t)
 	priv, err := crypto.HexToECDSA("1212121212121212121212121212121212121212121212121212121212121212")

bridge/testdata/blockTrace_02.json

@@ -1,545 +0,0 @@
-{
-    "withdrawTrieRoot": "0x0000000000000000000000000000000000000000",
-    "coinbase": {
-        "address": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63",
-        "nonce": 2,
-        "balance": "0x1ffffffffffffffffffffffffffffffffffffffffffd5a5fa703d6a00d4dd70",
-        "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-    },
-    "header": {
-        "parentHash": "0xe17f08d25ef61a8ee12aa29704b901345a597f5e45a9a0f603ae0f70845b54dc",
-        "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-        "miner": "0x0000000000000000000000000000000000000000",
-        "stateRoot": "0x25b792bfd6d6456451f996e9383225e026fff469da205bb916768c0a78fd16af",
-        "transactionsRoot": "0x3057754c197f33e1fe799e996db6232b5257412feea05b3c1754738f0b33fe32",
-        "receiptsRoot": "0xd95b673818fa493deec414e01e610d97ee287c9421c8eff4102b1647c1a184e4",
-        "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-        "difficulty": "0x2",
-        "number": "0x2",
-        "gasLimit": "0x355418d1e8184",
-        "gasUsed": "0xa410",
-        "timestamp": "0x63807b2a",
-        "extraData": "0xd983010a0d846765746889676f312e31372e3133856c696e75780000000000004b54a94f0df14333e63c8a13dfe6097c1a08b5fd2c225a8dc0f199dae245aead55d6f774a980a0c925be407748d56a14106afda7ddc1dec342e7ee3b0d58a8df01",
-        "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-        "nonce": "0x0000000000000000",
-        "baseFeePerGas": "0x1de9",
-        "hash": "0xc7b6c7022c8386cdaf6fcd3d4f8d03dce257ae3664a072fdce511ecefce73ad0"
-    },
-    "transactions": [
-        {
-            "type": 0,
-            "nonce": 0,
-            "txHash": "0xb2febc1213baec968f6575789108e175273b8da8f412468098893084229f1542",
-            "gas": 500000,
-            "gasPrice": "0x3b9aec2e",
-            "from": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63",
-            "to": "0xc0c4c8baea3f6acb49b6e1fb9e2adeceeacb0ca2",
-            "chainId": "0xcf55",
-            "value": "0x152d02c7e14af6000000",
-            "data": "0x",
-            "isCreate": false,
-            "v": "0x19ece",
-            "r": "0xab07ae99c67aa78e7ba5cf6781e90cc32b219b1de102513d56548a41e86df514",
-            "s": "0x34cbd19feacd73e8ce64d00c4d1996b9b5243c578fd7f51bfaec288bbaf42a8b"
-        },
-        {
-            "type": 0,
-            "nonce": 1,
-            "txHash": "0xe6ac2ffc543d07f1e280912a2abe3aa659bf83773740681151297ada1bb211dd",
-            "gas": 500000,
-            "gasPrice": "0x3b9aec2e",
-            "from": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63",
-            "to": "0x01bae6bf68e9a03fb2bc0615b1bf0d69ce9411ed",
-            "chainId": "0xcf55",
-            "value": "0x152d02c7e14af6000000",
-            "data": "0x",
-            "isCreate": false,
-            "v": "0x19ece",
-            "r": "0xf039985866d8256f10c1be4f7b2cace28d8f20bde27e2604393eb095b7f77316",
-            "s": "0x5a3e6e81065f2b4604bcec5bd4aba684835996fc3f879380aac1c09c6eed32f1"
-        }
-    ],
-    "storageTrace": {
-        "rootBefore": "0x2579122e8f9ec1e862e7d415cef2fb495d7698a8e5f0dddc5651ba4236336e7d",
-        "rootAfter": "0x25b792bfd6d6456451f996e9383225e026fff469da205bb916768c0a78fd16af",
-        "proofs": {
-            "0x01bae6BF68E9A03Fb2bc0615b1bf0d69ce9411eD": [
-                "0x01204920151d7e3cd9d1b5ba09d3ad6ea157c82d1cc425731f209e71a007165a9c0404000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a4700000000000000000000000000000000000000000000000000000000000000000201c5a77d9fa7ef466951b2f01f724bca3a5820b63000000000000000000000000",
-                "0x5448495320495320534f4d45204d4147494320425954455320464f5220534d54206d3172525867503278704449"
-            ],
-            "0x1C5A77d9FA7eF466951B2F01F724BCa3A5820b63": [
-                "0x01204920151d7e3cd9d1b5ba09d3ad6ea157c82d1cc425731f209e71a007165a9c0404000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a4700000000000000000000000000000000000000000000000000000000000000000201c5a77d9fa7ef466951b2f01f724bca3a5820b63000000000000000000000000",
-                "0x5448495320495320534f4d45204d4147494320425954455320464f5220534d54206d3172525867503278704449"
-            ],
-            "0xc0c4C8bAEA3f6Acb49b6E1fb9e2ADEcEeaCB0cA2": [
-                "0x01204920151d7e3cd9d1b5ba09d3ad6ea157c82d1cc425731f209e71a007165a9c0404000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a4700000000000000000000000000000000000000000000000000000000000000000201c5a77d9fa7ef466951b2f01f724bca3a5820b63000000000000000000000000",
-                "0x5448495320495320534f4d45204d4147494320425954455320464f5220534d54206d3172525867503278704449"
-            ]
-        }
-    },
-    "executionResults": [
-        {
-            "gas": 21000,
-            "failed": false,
-            "returnValue": "",
-            "from": {
-                "address": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63",
-                "nonce": 0,
-                "balance": "0x200000000000000000000000000000000000000000000000000000000000000",
-                "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-            },
-            "to": {
-                "address": "0xc0c4c8baea3f6acb49b6e1fb9e2adeceeacb0ca2",
-                "nonce": 0,
-                "balance": "0x0",
-                "codeHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-            },
-            "accountAfter": [
-                {
-                    "address": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63",
-                    "nonce": 1,
-                    "balance": "0x1ffffffffffffffffffffffffffffffffffffffffffead2fd381eb5006a6eb8",
-                    "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-                },
-                {
-                    "address": "0xc0c4c8baea3f6acb49b6e1fb9e2adeceeacb0ca2",
-                    "nonce": 0,
-                    "balance": "0x152d02c7e14af6000000",
-                    "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-                },
-                {
-                    "address": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63",
-                    "nonce": 1,
-                    "balance": "0x1ffffffffffffffffffffffffffffffffffffffffffead2fd381eb5006a6eb8",
-                    "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-                }
-            ],
-            "structLogs": []
-        },
-        {
-            "gas": 21000,
-            "failed": false,
-            "returnValue": "",
-            "from": {
-                "address": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63",
-                "nonce": 1,
-                "balance": "0x1ffffffffffffffffffffffffffffffffffffffffffead2fd381eb5006a6eb8",
-                "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-            },
-            "to": {
-                "address": "0x01bae6bf68e9a03fb2bc0615b1bf0d69ce9411ed",
-                "nonce": 0,
-                "balance": "0x0",
-                "codeHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-            },
-            "accountAfter": [
-                {
-                    "address": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63",
-                    "nonce": 2,
-                    "balance": "0x1ffffffffffffffffffffffffffffffffffffffffffd5a5fa703d6a00d4dd70",
-                    "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-                },
-                {
-                    "address": "0x01bae6bf68e9a03fb2bc0615b1bf0d69ce9411ed",
-                    "nonce": 0,
-                    "balance": "0x152d02c7e14af6000000",
-                    "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-                },
-                {
-                    "address": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63",
-                    "nonce": 2,
-                    "balance": "0x1ffffffffffffffffffffffffffffffffffffffffffd5a5fa703d6a00d4dd70",
-                    "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-                }
-            ],
-            "structLogs": []
-        }
-    ],
-    "mptwitness": [
-        {
-            "address": "0x01bae6bf68e9a03fb2bc0615b1bf0d69ce9411ed",
-            "accountKey": "0x7f53dc37d5a264eb72d8ae1a31c82239a385d9f6df23b81c48e97862d6d92314",
-            "accountPath": [
-                {
-                    "pathPart": "0x0",
-                    "root": "0x7d6e333642ba5156dcddf0e5a898765d49fbf2ce15d4e762e8c19e8f2e127925",
-                    "leaf": {
-                        "value": "0xdf92dc6c0dd1c7fde78079ea62863977463f07e542966c6393f4d8cd6cce3117",
-                        "sibling": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920"
-                    }
-                },
-                {
-                    "pathPart": "0x0",
-                    "root": "0x7d6e333642ba5156dcddf0e5a898765d49fbf2ce15d4e762e8c19e8f2e127925",
-                    "leaf": {
-                        "value": "0xdf92dc6c0dd1c7fde78079ea62863977463f07e542966c6393f4d8cd6cce3117",
-                        "sibling": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920"
-                    }
-                }
-            ],
-            "accountUpdate": [
-                null,
-                null
-            ],
-            "commonStateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "statePath": [
-                null,
-                null
-            ],
-            "stateUpdate": [
-                null,
-                null
-            ]
-        },
-        {
-            "address": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63",
-            "accountKey": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920",
-            "accountPath": [
-                {
-                    "pathPart": "0x0",
-                    "root": "0x7d6e333642ba5156dcddf0e5a898765d49fbf2ce15d4e762e8c19e8f2e127925",
-                    "leaf": {
-                        "value": "0xdf92dc6c0dd1c7fde78079ea62863977463f07e542966c6393f4d8cd6cce3117",
-                        "sibling": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920"
-                    }
-                },
-                {
-                    "pathPart": "0x0",
-                    "root": "0xf6b9a9f1e25add11bf5d0705e58f4b7a968b281ec23a8d41e719a0e27d87450c",
-                    "leaf": {
-                        "value": "0x716491d19f5e25dc565d05bbde1f30b343b1489b2d923feb30141d24a87c0a00",
-                        "sibling": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920"
-                    }
-                }
-            ],
-            "accountUpdate": [
-                {
-                    "nonce": 0,
-                    "balance": "0x200000000000000000000000000000000000000000000000000000000000000",
-                    "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-                },
-                {
-                    "nonce": 2,
-                    "balance": "0x200000000000000000000000000000000000000000000000000000000000000",
-                    "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-                }
-            ],
-            "commonStateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "statePath": [
-                null,
-                null
-            ],
-            "stateUpdate": [
-                null,
-                null
-            ]
-        },
-        {
-            "address": "0xc0c4c8baea3f6acb49b6e1fb9e2adeceeacb0ca2",
-            "accountKey": "0x9b38091c0e341793f0e755a1ea7b64bfb06455aced31334598fcfd02d1d94616",
-            "accountPath": [
-                {
-                    "pathPart": "0x0",
-                    "root": "0xf6b9a9f1e25add11bf5d0705e58f4b7a968b281ec23a8d41e719a0e27d87450c",
-                    "leaf": {
-                        "value": "0x716491d19f5e25dc565d05bbde1f30b343b1489b2d923feb30141d24a87c0a00",
-                        "sibling": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920"
-                    }
-                },
-                {
-                    "pathPart": "0x0",
-                    "root": "0xf6b9a9f1e25add11bf5d0705e58f4b7a968b281ec23a8d41e719a0e27d87450c",
-                    "leaf": {
-                        "value": "0x716491d19f5e25dc565d05bbde1f30b343b1489b2d923feb30141d24a87c0a00",
-                        "sibling": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920"
-                    }
-                }
-            ],
-            "accountUpdate": [
-                null,
-                null
-            ],
-            "commonStateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "statePath": [
-                null,
-                null
-            ],
-            "stateUpdate": [
-                null,
-                null
-            ]
-        },
-        {
-            "address": "0x01bae6bf68e9a03fb2bc0615b1bf0d69ce9411ed",
-            "accountKey": "0x7f53dc37d5a264eb72d8ae1a31c82239a385d9f6df23b81c48e97862d6d92314",
-            "accountPath": [
-                {
-                    "pathPart": "0x0",
-                    "root": "0xf6b9a9f1e25add11bf5d0705e58f4b7a968b281ec23a8d41e719a0e27d87450c",
-                    "leaf": {
-                        "value": "0x716491d19f5e25dc565d05bbde1f30b343b1489b2d923feb30141d24a87c0a00",
-                        "sibling": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920"
-                    }
-                },
-                {
-                    "pathPart": "0x0",
-                    "root": "0xf6b9a9f1e25add11bf5d0705e58f4b7a968b281ec23a8d41e719a0e27d87450c",
-                    "leaf": {
-                        "value": "0x716491d19f5e25dc565d05bbde1f30b343b1489b2d923feb30141d24a87c0a00",
-                        "sibling": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920"
-                    }
-                }
-            ],
-            "accountUpdate": [
-                null,
-                null
-            ],
-            "commonStateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "statePath": [
-                null,
-                null
-            ],
-            "stateUpdate": [
-                null,
-                null
-            ]
-        },
-        {
-            "address": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63",
-            "accountKey": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920",
-            "accountPath": [
-                {
-                    "pathPart": "0x0",
-                    "root": "0xf6b9a9f1e25add11bf5d0705e58f4b7a968b281ec23a8d41e719a0e27d87450c",
-                    "leaf": {
-                        "value": "0x716491d19f5e25dc565d05bbde1f30b343b1489b2d923feb30141d24a87c0a00",
-                        "sibling": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920"
-                    }
-                },
-                {
-                    "pathPart": "0x0",
-                    "root": "0x34f20c09876841ab1c180877223cc915ca96589b05ecea552aa2b3b9b47de806",
-                    "leaf": {
-                        "value": "0xf199fe1a085b5bb134e90d0bfdaf70579fa703ab3db986a6730b44cfd5207b15",
-                        "sibling": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920"
-                    }
-                }
-            ],
-            "accountUpdate": [
-                {
-                    "nonce": 2,
-                    "balance": "0x200000000000000000000000000000000000000000000000000000000000000",
-                    "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-                },
-                {
-                    "nonce": 2,
-                    "balance": "0x1ffffffffffffffffffffffffffffffffffffffffffd5a5fa703d6a00d4dd70",
-                    "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-                }
-            ],
-            "commonStateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "statePath": [
-                null,
-                null
-            ],
-            "stateUpdate": [
-                null,
-                null
-            ]
-        },
-        {
-            "address": "0xc0c4c8baea3f6acb49b6e1fb9e2adeceeacb0ca2",
-            "accountKey": "0x9b38091c0e341793f0e755a1ea7b64bfb06455aced31334598fcfd02d1d94616",
-            "accountPath": [
-                {
-                    "pathPart": "0x0",
-                    "root": "0x34f20c09876841ab1c180877223cc915ca96589b05ecea552aa2b3b9b47de806",
-                    "leaf": {
-                        "value": "0xf199fe1a085b5bb134e90d0bfdaf70579fa703ab3db986a6730b44cfd5207b15",
-                        "sibling": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920"
-                    }
-                },
-                {
-                    "pathPart": "0x0",
-                    "root": "0x34f20c09876841ab1c180877223cc915ca96589b05ecea552aa2b3b9b47de806",
-                    "leaf": {
-                        "value": "0xf199fe1a085b5bb134e90d0bfdaf70579fa703ab3db986a6730b44cfd5207b15",
-                        "sibling": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920"
-                    }
-                }
-            ],
-            "accountUpdate": [
-                null,
-                null
-            ],
-            "commonStateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "statePath": [
-                null,
-                null
-            ],
-            "stateUpdate": [
-                null,
-                null
-            ]
-        },
-        {
-            "address": "0x01bae6bf68e9a03fb2bc0615b1bf0d69ce9411ed",
-            "accountKey": "0x7f53dc37d5a264eb72d8ae1a31c82239a385d9f6df23b81c48e97862d6d92314",
-            "accountPath": [
-                {
-                    "pathPart": "0x0",
-                    "root": "0x34f20c09876841ab1c180877223cc915ca96589b05ecea552aa2b3b9b47de806",
-                    "leaf": {
-                        "value": "0xf199fe1a085b5bb134e90d0bfdaf70579fa703ab3db986a6730b44cfd5207b15",
-                        "sibling": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920"
-                    }
-                },
-                {
-                    "pathPart": "0x1",
-                    "root": "0x06954857b2b6569c7dfe8380f8c7fe72d6b7fefca206b1fe74dc6ffbf97c132e",
-                    "path": [
-                        {
-                            "value": "0x1b9da0b70b242af37d53f5bda27315b2dbd178f6b4b1e026be43cab8d46b850b",
-                            "sibling": "0x34f20c09876841ab1c180877223cc915ca96589b05ecea552aa2b3b9b47de806"
-                        }
-                    ],
-                    "leaf": {
-                        "value": "0x45c70c4b7345dd1705ed019271dd1d7fbe2a1054ecefaf3fd2a22388a483072e",
-                        "sibling": "0x7f53dc37d5a264eb72d8ae1a31c82239a385d9f6df23b81c48e97862d6d92314"
-                    }
-                }
-            ],
-            "accountUpdate": [
-                null,
-                {
-                    "nonce": 0,
-                    "balance": "0x152d02c7e14af6000000",
-                    "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-                }
-            ],
-            "commonStateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "statePath": [
-                null,
-                null
-            ],
-            "stateUpdate": [
-                null,
-                null
-            ]
-        },
-        {
-            "address": "0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63",
-            "accountKey": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920",
-            "accountPath": [
-                {
-                    "pathPart": "0x0",
-                    "root": "0x06954857b2b6569c7dfe8380f8c7fe72d6b7fefca206b1fe74dc6ffbf97c132e",
-                    "path": [
-                        {
-                            "value": "0x34f20c09876841ab1c180877223cc915ca96589b05ecea552aa2b3b9b47de806",
-                            "sibling": "0x1b9da0b70b242af37d53f5bda27315b2dbd178f6b4b1e026be43cab8d46b850b"
-                        }
-                    ],
-                    "leaf": {
-                        "value": "0xf199fe1a085b5bb134e90d0bfdaf70579fa703ab3db986a6730b44cfd5207b15",
-                        "sibling": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920"
-                    }
-                },
-                {
-                    "pathPart": "0x0",
-                    "root": "0x06954857b2b6569c7dfe8380f8c7fe72d6b7fefca206b1fe74dc6ffbf97c132e",
-                    "path": [
-                        {
-                            "value": "0x34f20c09876841ab1c180877223cc915ca96589b05ecea552aa2b3b9b47de806",
-                            "sibling": "0x1b9da0b70b242af37d53f5bda27315b2dbd178f6b4b1e026be43cab8d46b850b"
-                        }
-                    ],
-                    "leaf": {
-                        "value": "0xf199fe1a085b5bb134e90d0bfdaf70579fa703ab3db986a6730b44cfd5207b15",
-                        "sibling": "0x9c5a1607a0719e201f7325c41c2dc857a16eadd309bab5d1d93c7e1d15204920"
-                    }
-                }
-            ],
-            "accountUpdate": [
-                {
-                    "nonce": 2,
-                    "balance": "0x1ffffffffffffffffffffffffffffffffffffffffffd5a5fa703d6a00d4dd70",
-                    "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-                },
-                {
-                    "nonce": 2,
-                    "balance": "0x1ffffffffffffffffffffffffffffffffffffffffffd5a5fa703d6a00d4dd70",
-                    "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-                }
-            ],
-            "commonStateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "statePath": [
-                null,
-                null
-            ],
-            "stateUpdate": [
-                null,
-                null
-            ]
-        },
-        {
-            "address": "0xc0c4c8baea3f6acb49b6e1fb9e2adeceeacb0ca2",
-            "accountKey": "0x9b38091c0e341793f0e755a1ea7b64bfb06455aced31334598fcfd02d1d94616",
-            "accountPath": [
-                {
-                    "pathPart": "0x1",
-                    "root": "0x06954857b2b6569c7dfe8380f8c7fe72d6b7fefca206b1fe74dc6ffbf97c132e",
-                    "path": [
-                        {
-                            "value": "0x1b9da0b70b242af37d53f5bda27315b2dbd178f6b4b1e026be43cab8d46b850b",
-                            "sibling": "0x34f20c09876841ab1c180877223cc915ca96589b05ecea552aa2b3b9b47de806"
-                        }
-                    ],
-                    "leaf": {
-                        "value": "0x45c70c4b7345dd1705ed019271dd1d7fbe2a1054ecefaf3fd2a22388a483072e",
-                        "sibling": "0x7f53dc37d5a264eb72d8ae1a31c82239a385d9f6df23b81c48e97862d6d92314"
-                    }
-                },
-                {
-                    "pathPart": "0x3",
-                    "root": "0xaf16fd780a8c7616b95b20da69f4ff26e0253238e996f9516445d6d6bf92b725",
-                    "path": [
-                        {
-                            "value": "0x5bbe97e7e66485b203f9dfea64eb7fa7df06959b12cbde2beba14f8f91133a13",
-                            "sibling": "0x34f20c09876841ab1c180877223cc915ca96589b05ecea552aa2b3b9b47de806"
-                        },
-                        {
-                            "value": "0x2e591357b02ab3117c35ad94a4e1a724fdbd95d6463da1f6c8017e6d000ecf02",
-                            "sibling": "0x0000000000000000000000000000000000000000000000000000000000000000"
-                        },
-                        {
-                            "value": "0x794953bb5d8aa00f90383ff435ce2ea58e30e1da1061e69455c38496766ec10f",
-                            "sibling": "0x1b9da0b70b242af37d53f5bda27315b2dbd178f6b4b1e026be43cab8d46b850b"
-                        }
-                    ],
-                    "leaf": {
-                        "value": "0x45c70c4b7345dd1705ed019271dd1d7fbe2a1054ecefaf3fd2a22388a483072e",
-                        "sibling": "0x9b38091c0e341793f0e755a1ea7b64bfb06455aced31334598fcfd02d1d94616"
-                    }
-                }
-            ],
-            "accountUpdate": [
-                null,
-                {
-                    "nonce": 0,
-                    "balance": "0x152d02c7e14af6000000",
-                    "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
-                }
-            ],
-            "commonStateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "statePath": [
-                null,
-                null
-            ],
-            "stateUpdate": [
-                null,
-                null
-            ]
-        }
-    ]
-}

bridge/tests/bridge_test.go

@@ -9,15 +9,11 @@ import (
 	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/stretchr/testify/assert"
-	"gorm.io/gorm"
-
-	"scroll-tech/common/docker"
 
 	bcmd "scroll-tech/bridge/cmd"
-	"scroll-tech/bridge/internal/config"
-	"scroll-tech/bridge/internal/orm/migrate"
-	"scroll-tech/bridge/internal/utils"
 	"scroll-tech/bridge/mock_bridge"
+
+	"scroll-tech/common/docker"
 )
 
 var (
@@ -45,24 +41,9 @@ var (
 	l2MessengerAddress  common.Address
 )
 
-func setupDB(t *testing.T) *gorm.DB {
-	cfg := &config.DBConfig{
-		DSN:        base.DBConfig.DSN,
-		DriverName: base.DBConfig.DriverName,
-		MaxOpenNum: base.DBConfig.MaxOpenNum,
-		MaxIdleNum: base.DBConfig.MaxIdleNum,
-	}
-	db, err := utils.InitDB(cfg)
-	assert.NoError(t, err)
-	sqlDB, err := db.DB()
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(sqlDB))
-	return db
-}
-
 func TestMain(m *testing.M) {
 	base = docker.NewDockerApp()
-	bridgeApp = bcmd.NewBridgeApp(base, "../conf/config.json")
+	bridgeApp = bcmd.NewBridgeApp(base, "../config.json")
 	m.Run()
 	bridgeApp.Free()
 	base.Free()

bridge/tests/gas_oracle_test.go

@@ -6,22 +6,24 @@ import (
 	"testing"
 
 	"github.com/scroll-tech/go-ethereum/common"
-	gethTypes "github.com/scroll-tech/go-ethereum/core/types"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/stretchr/testify/assert"
-	"gorm.io/gorm"
 
 	"scroll-tech/common/types"
 
-	"scroll-tech/bridge/internal/controller/relayer"
-	"scroll-tech/bridge/internal/controller/watcher"
-	"scroll-tech/bridge/internal/orm"
-	bridgeTypes "scroll-tech/bridge/internal/types"
-	"scroll-tech/bridge/internal/utils"
+	"scroll-tech/bridge/relayer"
+	"scroll-tech/bridge/watcher"
+
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
 )
 
 func testImportL1GasPrice(t *testing.T) {
-	db := setupDB(t)
-	defer utils.CloseDB(db)
+	// Create db handler and reset db.
+	db, err := database.NewOrmFactory(base.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
 
 	prepareContracts(t)
 
@@ -43,39 +45,48 @@ func testImportL1GasPrice(t *testing.T) {
 	err = l1Watcher.FetchBlockHeader(number)
 	assert.NoError(t, err)
 
-	l1BlockOrm := orm.NewL1Block(db)
 	// check db status
-	latestBlockHeight, err := l1BlockOrm.GetLatestL1BlockHeight()
+	latestBlockHeight, err := db.GetLatestL1BlockHeight()
 	assert.NoError(t, err)
 	assert.Equal(t, number, latestBlockHeight)
-	blocks, err := l1BlockOrm.GetL1Blocks(map[string]interface{}{"number": latestBlockHeight})
+	blocks, err := db.GetL1BlockInfos(map[string]interface{}{
+		"number": latestBlockHeight,
+	})
 	assert.NoError(t, err)
 	assert.Equal(t, len(blocks), 1)
-	assert.Empty(t, blocks[0].OracleTxHash)
-	assert.Equal(t, types.GasOracleStatus(blocks[0].GasOracleStatus), types.GasOraclePending)
+	assert.Equal(t, blocks[0].GasOracleStatus, types.GasOraclePending)
+	assert.Equal(t, blocks[0].OracleTxHash.Valid, false)
 
 	// relay gas price
 	l1Relayer.ProcessGasPriceOracle()
-	blocks, err = l1BlockOrm.GetL1Blocks(map[string]interface{}{"number": latestBlockHeight})
+	blocks, err = db.GetL1BlockInfos(map[string]interface{}{
+		"number": latestBlockHeight,
+	})
 	assert.NoError(t, err)
 	assert.Equal(t, len(blocks), 1)
-	assert.NotEmpty(t, blocks[0].OracleTxHash)
-	assert.Equal(t, types.GasOracleStatus(blocks[0].GasOracleStatus), types.GasOracleImporting)
+	assert.Equal(t, blocks[0].GasOracleStatus, types.GasOracleImporting)
+	assert.Equal(t, blocks[0].OracleTxHash.Valid, true)
 }
 
 func testImportL2GasPrice(t *testing.T) {
-	db := setupDB(t)
-	defer utils.CloseDB(db)
+	// Create db handler and reset db.
+	db, err := database.NewOrmFactory(base.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
+
 	prepareContracts(t)
 
 	l2Cfg := bridgeApp.Config.L2Config
+
+	// Create L2Relayer
 	l2Relayer, err := relayer.NewLayer2Relayer(context.Background(), l2Client, db, l2Cfg.RelayerConfig)
 	assert.NoError(t, err)
 
 	// add fake blocks
-	traces := []*bridgeTypes.WrappedBlock{
+	traces := []*types.WrappedBlock{
 		{
-			Header: &gethTypes.Header{
+			Header: &geth_types.Header{
 				Number:     big.NewInt(1),
 				ParentHash: common.Hash{},
 				Difficulty: big.NewInt(0),
@@ -85,35 +96,32 @@ func testImportL2GasPrice(t *testing.T) {
 			WithdrawTrieRoot: common.Hash{},
 		},
 	}
+	assert.NoError(t, db.InsertWrappedBlocks(traces))
 
-	blockTraceOrm := orm.NewBlockTrace(db)
-	assert.NoError(t, blockTraceOrm.InsertWrappedBlocks(traces))
-
-	parentBatch := &bridgeTypes.BatchInfo{
+	parentBatch := &types.BlockBatch{
 		Index: 0,
 		Hash:  "0x0000000000000000000000000000000000000000",
 	}
-	batchData := bridgeTypes.NewBatchData(parentBatch, []*bridgeTypes.WrappedBlock{traces[0]}, l2Cfg.BatchProposerConfig.PublicInputConfig)
-	blockBatchOrm := orm.NewBlockBatch(db)
-	err = db.Transaction(func(tx *gorm.DB) error {
-		_, dbTxErr := blockBatchOrm.InsertBlockBatchByBatchData(tx, batchData)
-		if dbTxErr != nil {
-			return dbTxErr
-		}
-		return nil
-	})
+	batchData := types.NewBatchData(parentBatch, []*types.WrappedBlock{
+		traces[0],
+	}, l2Cfg.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 := blockBatchOrm.GetLatestBatch()
+	batch, err := db.GetLatestBatch()
 	assert.NoError(t, err)
-	assert.Empty(t, batch.OracleTxHash)
-	assert.Equal(t, types.GasOracleStatus(batch.OracleStatus), types.GasOraclePending)
+	assert.Equal(t, batch.OracleStatus, types.GasOraclePending)
+	assert.Equal(t, batch.OracleTxHash.Valid, false)
 
 	// relay gas price
 	l2Relayer.ProcessGasPriceOracle()
-	batch, err = blockBatchOrm.GetLatestBatch()
+	batch, err = db.GetLatestBatch()
 	assert.NoError(t, err)
-	assert.NotEmpty(t, batch.OracleTxHash)
-	assert.Equal(t, types.GasOracleStatus(batch.OracleStatus), types.GasOracleImporting)
+	assert.Equal(t, batch.OracleStatus, types.GasOracleImporting)
+	assert.Equal(t, batch.OracleTxHash.Valid, true)
 }

bridge/tests/l1_message_relay_test.go

@@ -13,15 +13,19 @@ import (
 
 	"scroll-tech/common/types"
 
-	"scroll-tech/bridge/internal/controller/relayer"
-	"scroll-tech/bridge/internal/controller/watcher"
-	"scroll-tech/bridge/internal/orm"
-	"scroll-tech/bridge/internal/utils"
+	"scroll-tech/bridge/relayer"
+	"scroll-tech/bridge/watcher"
+
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
 )
 
 func testRelayL1MessageSucceed(t *testing.T) {
-	db := setupDB(t)
-	defer utils.CloseDB(db)
+	// Create db handler and reset db.
+	db, err := database.NewOrmFactory(base.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
 
 	prepareContracts(t)
 
@@ -52,22 +56,21 @@ func testRelayL1MessageSucceed(t *testing.T) {
 	// l1 watch process events
 	l1Watcher.FetchContractEvent()
 
-	l1MessageOrm := orm.NewL1Message(db)
 	// check db status
-	msg, err := l1MessageOrm.GetL1MessageByQueueIndex(nonce.Uint64())
+	msg, err := db.GetL1MessageByQueueIndex(nonce.Uint64())
 	assert.NoError(t, err)
-	assert.Equal(t, types.MsgStatus(msg.Status), types.MsgPending)
+	assert.Equal(t, msg.Status, types.MsgPending)
 	assert.Equal(t, msg.Target, l2Auth.From.String())
 
 	// process l1 messages
 	l1Relayer.ProcessSavedEvents()
-
-	l1Message, err := l1MessageOrm.GetL1MessageByQueueIndex(nonce.Uint64())
+	msg, err = db.GetL1MessageByQueueIndex(nonce.Uint64())
 	assert.NoError(t, err)
-	assert.NotEmpty(t, l1Message.Layer2Hash)
-	assert.Equal(t, types.MsgStatus(l1Message.Status), types.MsgSubmitted)
-
-	relayTx, _, err := l2Client.TransactionByHash(context.Background(), common.HexToHash(l1Message.Layer2Hash))
+	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)
@@ -75,7 +78,7 @@ func testRelayL1MessageSucceed(t *testing.T) {
 
 	// fetch message relayed events
 	l2Watcher.FetchContractEvent()
-	msg, err = l1MessageOrm.GetL1MessageByQueueIndex(nonce.Uint64())
+	msg, err = db.GetL1MessageByQueueIndex(nonce.Uint64())
 	assert.NoError(t, err)
-	assert.Equal(t, types.MsgStatus(msg.Status), types.MsgConfirmed)
+	assert.Equal(t, msg.Status, types.MsgConfirmed)
 }

bridge/tests/l2_message_relay_test.go

@@ -2,30 +2,30 @@ package tests
 
 import (
 	"context"
-	"errors"
 	"math/big"
 	"testing"
 
 	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
 	"github.com/scroll-tech/go-ethereum/common"
-	gethTypes "github.com/scroll-tech/go-ethereum/core/types"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/rpc"
 	"github.com/stretchr/testify/assert"
-	"gorm.io/gorm"
 
 	"scroll-tech/common/types"
-	"scroll-tech/common/types/message"
 
-	"scroll-tech/bridge/internal/controller/relayer"
-	"scroll-tech/bridge/internal/controller/watcher"
-	"scroll-tech/bridge/internal/orm"
-	bridgeTypes "scroll-tech/bridge/internal/types"
-	"scroll-tech/bridge/internal/utils"
+	"scroll-tech/bridge/relayer"
+	"scroll-tech/bridge/watcher"
+
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
 )
 
 func testRelayL2MessageSucceed(t *testing.T) {
-	db := setupDB(t)
-	defer utils.CloseDB(db)
+	// Create db handler and reset db.
+	db, err := database.NewOrmFactory(base.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
 
 	prepareContracts(t)
 
@@ -50,27 +50,24 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	assert.NoError(t, err)
 	sendReceipt, err := bind.WaitMined(context.Background(), l2Client, sendTx)
 	assert.NoError(t, err)
-	if sendReceipt.Status != gethTypes.ReceiptStatusSuccessful || err != nil {
+	if sendReceipt.Status != geth_types.ReceiptStatusSuccessful || err != nil {
 		t.Fatalf("Call failed")
 	}
 
 	// l2 watch process events
 	l2Watcher.FetchContractEvent()
-	l2MessageOrm := orm.NewL2Message(db)
-	blockTraceOrm := orm.NewBlockTrace(db)
-	blockBatchOrm := orm.NewBlockBatch(db)
 
 	// check db status
-	msg, err := l2MessageOrm.GetL2MessageByNonce(nonce.Uint64())
+	msg, err := db.GetL2MessageByNonce(nonce.Uint64())
 	assert.NoError(t, err)
-	assert.Equal(t, types.MsgStatus(msg.Status), types.MsgPending)
+	assert.Equal(t, msg.Status, types.MsgPending)
 	assert.Equal(t, msg.Sender, l2Auth.From.String())
 	assert.Equal(t, msg.Target, l1Auth.From.String())
 
 	// add fake blocks
-	traces := []*bridgeTypes.WrappedBlock{
+	traces := []*types.WrappedBlock{
 		{
-			Header: &gethTypes.Header{
+			Header: &geth_types.Header{
 				Number:     sendReceipt.BlockNumber,
 				ParentHash: common.Hash{},
 				Difficulty: big.NewInt(0),
@@ -80,56 +77,46 @@ func testRelayL2MessageSucceed(t *testing.T) {
 			WithdrawTrieRoot: common.Hash{},
 		},
 	}
-	assert.NoError(t, blockTraceOrm.InsertWrappedBlocks(traces))
+	assert.NoError(t, db.InsertWrappedBlocks(traces))
 
-	parentBatch := &bridgeTypes.BatchInfo{
+	parentBatch := &types.BlockBatch{
 		Index: 0,
 		Hash:  "0x0000000000000000000000000000000000000000",
 	}
-	batchData := bridgeTypes.NewBatchData(parentBatch, []*bridgeTypes.WrappedBlock{traces[0]}, l2Cfg.BatchProposerConfig.PublicInputConfig)
+	batchData := types.NewBatchData(parentBatch, []*types.WrappedBlock{
+		traces[0],
+	}, l2Cfg.BatchProposerConfig.PublicInputConfig)
 	batchHash := batchData.Hash().String()
+
 	// add fake batch
-	err = db.Transaction(func(tx *gorm.DB) error {
-		rowsAffected, dbTxErr := blockBatchOrm.InsertBlockBatchByBatchData(tx, batchData)
-		if dbTxErr != nil {
-			return dbTxErr
-		}
-		if rowsAffected != 1 {
-			dbTxErr = errors.New("the InsertBlockBatchByBatchData affected row is not 1")
-			return dbTxErr
-		}
-		var blockIDs = make([]uint64, len(batchData.Batch.Blocks))
-		for i, block := range batchData.Batch.Blocks {
-			blockIDs[i] = block.BlockNumber
-		}
-		dbTxErr = blockTraceOrm.UpdateBatchHashForL2Blocks(tx, blockIDs, batchHash)
-		if dbTxErr != nil {
-			return dbTxErr
-		}
-		return nil
-	})
+	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
-	proof := &message.AggProof{
-		Proof:     []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},
-		FinalPair: []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 = blockBatchOrm.UpdateProofByHash(context.Background(), batchHash, proof, 100)
+	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 = blockBatchOrm.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
+	err = db.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
 	assert.NoError(t, err)
 
 	// process pending batch and check status
-	assert.NoError(t, l2Relayer.SendCommitTx([]*bridgeTypes.BatchData{batchData}))
-
-	blockBatches, err := blockBatchOrm.GetBlockBatches(map[string]interface{}{"hash": batchHash}, nil, 1)
+	l2Relayer.SendCommitTx([]*types.BatchData{batchData})
+	status, err := db.GetRollupStatus(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, 1, len(blockBatches))
-	assert.NotEmpty(t, blockBatches[0].CommitTxHash)
-	assert.Equal(t, types.RollupCommitting, types.RollupStatus(blockBatches[0].RollupStatus))
-
-	commitTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(blockBatches[0].CommitTxHash))
+	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)
@@ -138,21 +125,19 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	// fetch CommitBatch rollup events
 	err = l1Watcher.FetchContractEvent()
 	assert.NoError(t, err)
-	statuses, err := blockBatchOrm.GetRollupStatusByHashList([]string{batchHash})
+	status, err = db.GetRollupStatus(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, 1, len(statuses))
-	assert.Equal(t, types.RollupCommitted, statuses[0])
+	assert.Equal(t, types.RollupCommitted, status)
 
 	// process committed batch and check status
 	l2Relayer.ProcessCommittedBatches()
-
-	blockBatchWithFinalizeTxHash, err := blockBatchOrm.GetBlockBatches(map[string]interface{}{"hash": batchHash}, nil, 1)
+	status, err = db.GetRollupStatus(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, 1, len(blockBatchWithFinalizeTxHash))
-	assert.NotEmpty(t, blockBatchWithFinalizeTxHash[0].FinalizeTxHash)
-	assert.Equal(t, types.RollupFinalizing, types.RollupStatus(blockBatchWithFinalizeTxHash[0].RollupStatus))
-
-	finalizeTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(blockBatchWithFinalizeTxHash[0].FinalizeTxHash))
+	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)
@@ -161,21 +146,19 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	// fetch FinalizeBatch events
 	err = l1Watcher.FetchContractEvent()
 	assert.NoError(t, err)
-	statuses, err = blockBatchOrm.GetRollupStatusByHashList([]string{batchHash})
+	status, err = db.GetRollupStatus(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, 1, len(statuses))
-	assert.Equal(t, types.RollupFinalized, statuses[0])
+	assert.Equal(t, types.RollupFinalized, status)
 
 	// process l2 messages
 	l2Relayer.ProcessSavedEvents()
-
-	l2Messages, err := l2MessageOrm.GetL2Messages(map[string]interface{}{"nonce": nonce.Uint64()}, nil, 1)
+	msg, err = db.GetL2MessageByNonce(nonce.Uint64())
 	assert.NoError(t, err)
-	assert.Equal(t, 1, len(l2Messages))
-	assert.NotEmpty(t, l2Messages[0].Layer1Hash)
-	assert.Equal(t, types.MsgStatus(l2Messages[0].Status), types.MsgSubmitted)
-
-	relayTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(l2Messages[0].Layer1Hash))
+	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)
@@ -184,7 +167,7 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	// fetch message relayed events
 	err = l1Watcher.FetchContractEvent()
 	assert.NoError(t, err)
-	msg, err = l2MessageOrm.GetL2MessageByNonce(nonce.Uint64())
+	msg, err = db.GetL2MessageByNonce(nonce.Uint64())
 	assert.NoError(t, err)
-	assert.Equal(t, types.MsgStatus(msg.Status), types.MsgConfirmed)
+	assert.Equal(t, msg.Status, types.MsgConfirmed)
 }

bridge/tests/rollup_test.go

@@ -2,29 +2,30 @@ package tests
 
 import (
 	"context"
-	"errors"
 	"math/big"
 	"testing"
 
 	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
 	"github.com/scroll-tech/go-ethereum/common"
-	gethTypes "github.com/scroll-tech/go-ethereum/core/types"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/stretchr/testify/assert"
-	"gorm.io/gorm"
 
 	"scroll-tech/common/types"
-	"scroll-tech/common/types/message"
+	"scroll-tech/common/utils"
 
-	"scroll-tech/bridge/internal/controller/relayer"
-	"scroll-tech/bridge/internal/controller/watcher"
-	"scroll-tech/bridge/internal/orm"
-	bridgeTypes "scroll-tech/bridge/internal/types"
-	"scroll-tech/bridge/internal/utils"
+	"scroll-tech/bridge/relayer"
+	"scroll-tech/bridge/watcher"
+
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
 )
 
 func testCommitBatchAndFinalizeBatch(t *testing.T) {
-	db := setupDB(t)
-	defer utils.CloseDB(db)
+	// Create db handler and reset db.
+	db, err := database.NewOrmFactory(base.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
 
 	prepareContracts(t)
 
@@ -37,73 +38,58 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 	l1Cfg := bridgeApp.Config.L1Config
 	l1Watcher := watcher.NewL1WatcherClient(context.Background(), l1Client, 0, l1Cfg.Confirmations, l1Cfg.L1MessengerAddress, l1Cfg.L1MessageQueueAddress, l1Cfg.ScrollChainContractAddress, db)
 
-	blockTraceOrm := orm.NewBlockTrace(db)
-
 	// add some blocks to db
-	var wrappedBlocks []*bridgeTypes.WrappedBlock
+	var wrappedBlocks []*types.WrappedBlock
 	var parentHash common.Hash
 	for i := 1; i <= 10; i++ {
-		header := gethTypes.Header{
+		header := geth_types.Header{
 			Number:     big.NewInt(int64(i)),
 			ParentHash: parentHash,
 			Difficulty: big.NewInt(0),
 			BaseFee:    big.NewInt(0),
 		}
-		wrappedBlocks = append(wrappedBlocks, &bridgeTypes.WrappedBlock{
+		wrappedBlocks = append(wrappedBlocks, &types.WrappedBlock{
 			Header:           &header,
 			Transactions:     nil,
 			WithdrawTrieRoot: common.Hash{},
 		})
 		parentHash = header.Hash()
 	}
-	assert.NoError(t, blockTraceOrm.InsertWrappedBlocks(wrappedBlocks))
+	assert.NoError(t, db.InsertWrappedBlocks(wrappedBlocks))
 
-	parentBatch := &bridgeTypes.BatchInfo{
+	parentBatch := &types.BlockBatch{
 		Index: 0,
 		Hash:  "0x0000000000000000000000000000000000000000",
 	}
-
-	tmpWrapBlocks := []*bridgeTypes.WrappedBlock{
+	batchData := types.NewBatchData(parentBatch, []*types.WrappedBlock{
 		wrappedBlocks[0],
 		wrappedBlocks[1],
-	}
-	batchData := bridgeTypes.NewBatchData(parentBatch, tmpWrapBlocks, l2Cfg.BatchProposerConfig.PublicInputConfig)
+	}, l2Cfg.BatchProposerConfig.PublicInputConfig)
 
 	batchHash := batchData.Hash().String()
 
-	blockBatchOrm := orm.NewBlockBatch(db)
-	err = db.Transaction(func(tx *gorm.DB) error {
-		rowsAffected, dbTxErr := blockBatchOrm.InsertBlockBatchByBatchData(tx, batchData)
-		if dbTxErr != nil {
-			return dbTxErr
-		}
-		if rowsAffected != 1 {
-			dbTxErr = errors.New("the InsertBlockBatchByBatchData affected row is not 1")
-			return dbTxErr
-		}
-		var blockIDs = make([]uint64, len(batchData.Batch.Blocks))
-		for i, block := range batchData.Batch.Blocks {
-			blockIDs[i] = block.BlockNumber
-		}
-		dbTxErr = blockTraceOrm.UpdateBatchHashForL2Blocks(tx, blockIDs, batchHash)
-		if dbTxErr != nil {
-			return dbTxErr
-		}
-		return nil
-	})
+	// 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
-	assert.NoError(t, l2Relayer.SendCommitTx([]*bridgeTypes.BatchData{batchData}))
+	assert.NoError(t, l2Relayer.SendCommitTx([]*types.BatchData{batchData}))
 
-	blockBatches, err := blockBatchOrm.GetBlockBatches(map[string]interface{}{"hash": batchHash}, nil, 1)
+	status, err := db.GetRollupStatus(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, 1, len(blockBatches))
-	assert.NotEmpty(t, true, blockBatches[0].CommitTxHash)
-	assert.NotEmpty(t, true, blockBatches[0].RollupStatus)
-	assert.Equal(t, types.RollupStatus(blockBatches[0].RollupStatus), types.RollupCommitting)
-
-	commitTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(blockBatches[0].CommitTxHash))
+	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)
@@ -112,35 +98,33 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 	// fetch rollup events
 	err = l1Watcher.FetchContractEvent()
 	assert.NoError(t, err)
-	statuses, err := blockBatchOrm.GetRollupStatusByHashList([]string{batchHash})
-	assert.NoError(t, err)
-	assert.Equal(t, 1, len(statuses))
-	assert.Equal(t, types.RollupCommitted, statuses[0])
+	ok := utils.TryTimes(20, func() bool {
+		status, err = db.GetRollupStatus(batchHash)
+		return err == nil && status == types.RollupCommitted
+	})
+	assert.True(t, ok)
 
 	// add dummy proof
-	proof := &message.AggProof{
-		Proof:     []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},
-		FinalPair: []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 = blockBatchOrm.UpdateProofByHash(context.Background(), batchHash, proof, 100)
+	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 = blockBatchOrm.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
+	err = db.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
 	assert.NoError(t, err)
 
 	// process committed batch and check status
 	l2Relayer.ProcessCommittedBatches()
 
-	statuses, err = blockBatchOrm.GetRollupStatusByHashList([]string{batchHash})
-	assert.NoError(t, err)
-	assert.Equal(t, 1, len(statuses))
-	assert.Equal(t, types.RollupFinalizing, statuses[0])
+	ok = utils.TryTimes(20, func() bool {
+		status, err = db.GetRollupStatus(batchHash)
+		return err == nil && status == types.RollupFinalizing
+	})
+	assert.True(t, ok)
 
-	blockBatches, err = blockBatchOrm.GetBlockBatches(map[string]interface{}{"hash": batchHash}, nil, 1)
+	finalizeTxHash, err := db.GetFinalizeTxHash(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, 1, len(blockBatches))
-	assert.NotEmpty(t, blockBatches[0].FinalizeTxHash)
-
-	finalizeTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(blockBatches[0].FinalizeTxHash))
+	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)
@@ -149,8 +133,7 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 	// fetch rollup events
 	err = l1Watcher.FetchContractEvent()
 	assert.NoError(t, err)
-	statuses, err = blockBatchOrm.GetRollupStatusByHashList([]string{batchHash})
+	status, err = db.GetRollupStatus(batchHash)
 	assert.NoError(t, err)
-	assert.Equal(t, 1, len(statuses))
-	assert.Equal(t, types.RollupFinalized, statuses[0])
+	assert.Equal(t, types.RollupFinalized, status)
 }

bridge/watcher/batch_proposer.go

@@ -8,35 +8,70 @@ import (
 	"time"
 
 	"github.com/scroll-tech/go-ethereum/log"
-	gethMetrics "github.com/scroll-tech/go-ethereum/metrics"
-	"gorm.io/gorm"
+	geth_metrics "github.com/scroll-tech/go-ethereum/metrics"
 
 	"scroll-tech/common/metrics"
 	"scroll-tech/common/types"
 
-	bridgeAbi "scroll-tech/bridge/abi"
-	"scroll-tech/bridge/internal/config"
-	"scroll-tech/bridge/internal/controller/relayer"
-	"scroll-tech/bridge/internal/orm"
-	bridgeTypes "scroll-tech/bridge/internal/types"
+	"scroll-tech/database"
+
+	bridgeabi "scroll-tech/bridge/abi"
+	"scroll-tech/bridge/config"
+	"scroll-tech/bridge/relayer"
 )
 
 var (
-	bridgeL2BatchesGasOverThresholdTotalCounter = gethMetrics.NewRegisteredCounter("bridge/l2/batches/gas/over/threshold/total", metrics.ScrollRegistry)
-	bridgeL2BatchesTxsOverThresholdTotalCounter = gethMetrics.NewRegisteredCounter("bridge/l2/batches/txs/over/threshold/total", metrics.ScrollRegistry)
-	bridgeL2BatchesBlocksCreatedTotalCounter    = gethMetrics.NewRegisteredCounter("bridge/l2/batches/blocks/created/total", metrics.ScrollRegistry)
-	bridgeL2BatchesCommitsSentTotalCounter      = gethMetrics.NewRegisteredCounter("bridge/l2/batches/commits/sent/total", metrics.ScrollRegistry)
-	bridgeL2BatchesOversizedTotalCounter        = gethMetrics.NewRegisteredCounter("bridge/l2/batches/oversized/total", metrics.ScrollRegistry)
-	bridgeL2BatchesTxsCreatedPerBatchGauge      = gethMetrics.NewRegisteredGauge("bridge/l2/batches/txs/created/per/batch", metrics.ScrollRegistry)
-	bridgeL2BatchesGasCreatedPerBatchGauge      = gethMetrics.NewRegisteredGauge("bridge/l2/batches/gas/created/per/batch", metrics.ScrollRegistry)
-	bridgeL2BatchesPayloadSizePerBatchGauge     = gethMetrics.NewRegisteredGauge("bridge/l2/batches/payload/size/per/batch", metrics.ScrollRegistry)
+	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)
+	bridgeL2BatchesOversizedTotalCounter        = geth_metrics.NewRegisteredCounter("bridge/l2/batches/oversized/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)
+	bridgeL2BatchesPayloadSizePerBatchGauge = geth_metrics.NewRegisteredGauge("bridge/l2/batches/payload/size/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
-	db    *gorm.DB
+
+	ctx context.Context
+	orm database.OrmFactory
 
 	batchTimeSec             uint64
 	batchGasThreshold        uint64
@@ -46,26 +81,20 @@ type BatchProposer struct {
 	commitCalldataSizeLimit  uint64
 	batchDataBufferSizeLimit uint64
 	commitCalldataMinSize    uint64
-	commitBatchCountLimit    int
 
 	proofGenerationFreq uint64
-	batchDataBuffer     []*bridgeTypes.BatchData
+	batchDataBuffer     []*types.BatchData
 	relayer             *relayer.Layer2Relayer
 
-	blockBatchOrm *orm.BlockBatch
-	blockTraceOrm *orm.BlockTrace
-
-	piCfg *bridgeTypes.PublicInputHashConfig
+	piCfg *types.PublicInputHashConfig
 }
 
 // NewBatchProposer will return a new instance of BatchProposer.
-func NewBatchProposer(ctx context.Context, cfg *config.BatchProposerConfig, relayer *relayer.Layer2Relayer, db *gorm.DB) *BatchProposer {
+func NewBatchProposer(ctx context.Context, cfg *config.BatchProposerConfig, relayer *relayer.Layer2Relayer, orm database.OrmFactory) *BatchProposer {
 	p := &BatchProposer{
 		mutex:                    sync.Mutex{},
 		ctx:                      ctx,
-		db:                       db,
-		blockBatchOrm:            orm.NewBlockBatch(db),
-		blockTraceOrm:            orm.NewBlockTrace(db),
+		orm:                      orm,
 		batchTimeSec:             cfg.BatchTimeSec,
 		batchGasThreshold:        cfg.BatchGasThreshold,
 		batchTxNumThreshold:      cfg.BatchTxNumThreshold,
@@ -73,7 +102,6 @@ func NewBatchProposer(ctx context.Context, cfg *config.BatchProposerConfig, rela
 		batchCommitTimeSec:       cfg.BatchCommitTimeSec,
 		commitCalldataSizeLimit:  cfg.CommitTxCalldataSizeLimit,
 		commitCalldataMinSize:    cfg.CommitTxCalldataMinSize,
-		commitBatchCountLimit:    int(cfg.CommitTxBatchCountLimit),
 		batchDataBufferSizeLimit: 100*cfg.CommitTxCalldataSizeLimit + 1*1024*1024, // @todo: determine the value.
 		proofGenerationFreq:      cfg.ProofGenerationFreq,
 		piCfg:                    cfg.PublicInputConfig,
@@ -91,7 +119,7 @@ func NewBatchProposer(ctx context.Context, cfg *config.BatchProposerConfig, rela
 
 func (p *BatchProposer) recoverBatchDataBuffer() {
 	// batches are sorted by batch index in increasing order
-	batchHashes, err := p.blockBatchOrm.GetBlockBatchesHashByRollupStatus(types.RollupPending, math.MaxInt32)
+	batchHashes, err := p.orm.GetPendingBatches(math.MaxInt32)
 	if err != nil {
 		log.Crit("Failed to fetch pending L2 batches", "err", err)
 	}
@@ -101,17 +129,17 @@ func (p *BatchProposer) recoverBatchDataBuffer() {
 	log.Info("Load pending batches into batchDataBuffer")
 
 	// helper function to cache and get BlockBatch from DB
-	blockBatchCache := make(map[string]orm.BlockBatch)
-	getBlockBatch := func(batchHash string) (*orm.BlockBatch, error) {
+	blockBatchCache := make(map[string]*types.BlockBatch)
+	getBlockBatch := func(batchHash string) (*types.BlockBatch, error) {
 		if blockBatch, ok := blockBatchCache[batchHash]; ok {
-			return &blockBatch, nil
+			return blockBatch, nil
 		}
-		blockBatches, err := p.blockBatchOrm.GetBlockBatches(map[string]interface{}{"hash": batchHash}, nil, 0)
+		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
+		return blockBatches[0], nil
 	}
 
 	// recover the in-memory batchData from DB
@@ -129,26 +157,23 @@ func (p *BatchProposer) recoverBatchDataBuffer() {
 			continue
 		}
 
-		whereFileds := map[string]interface{}{
-			"batch_hash": batchHash,
-		}
-		orderByList := []string{
-			"number ASC",
-		}
+		blockInfos, err := p.orm.GetL2BlockInfos(
+			map[string]interface{}{"batch_hash": batchHash},
+			"order by number ASC",
+		)
 
-		blockTraces, err := p.blockTraceOrm.GetL2BlockInfos(whereFileds, orderByList, 0)
 		if err != nil {
 			log.Error("could not GetL2BlockInfos", "batch_hash", batchHash, "error", err)
 			continue
 		}
-		if len(blockTraces) != int(blockBatch.EndBlockNumber-blockBatch.StartBlockNumber+1) {
+		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(blockTraces),
+				"len(blockInfos)", len(blockInfos),
 				"expected", blockBatch.EndBlockNumber-blockBatch.StartBlockNumber+1)
 			continue
 		}
 
-		batchData, err := p.generateBatchData(parentBatch, blockTraces)
+		batchData, err := p.generateBatchData(parentBatch, blockInfos)
 		if err != nil {
 			continue
 		}
@@ -169,14 +194,16 @@ func (p *BatchProposer) TryProposeBatch() {
 	defer p.mutex.Unlock()
 
 	for p.getBatchDataBufferSize() < p.batchDataBufferSizeLimit {
-		orderBy := []string{"number ASC"}
-		blockTraces, err := p.blockTraceOrm.GetUnbatchedL2Blocks(map[string]interface{}{}, orderBy, int(p.batchBlocksLimit))
+		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(blockTraces)
+		batchCreated := p.proposeBatch(blocks)
 
 		// while size of batchDataBuffer < commitCalldataMinSize,
 		// proposer keeps fetching and porposing batches.
@@ -204,8 +231,8 @@ func (p *BatchProposer) TryCommitBatches() {
 	index := 0
 	commit := false
 	calldataByteLen := uint64(0)
-	for ; index < len(p.batchDataBuffer) && index < p.commitBatchCountLimit; index++ {
-		calldataByteLen += bridgeAbi.GetBatchCalldataLength(&p.batchDataBuffer[index].Batch)
+	for ; index < len(p.batchDataBuffer); index++ {
+		calldataByteLen += bridgeabi.GetBatchCalldataLength(&p.batchDataBuffer[index].Batch)
 		if calldataByteLen > p.commitCalldataSizeLimit {
 			commit = true
 			if index == 0 {
@@ -237,13 +264,13 @@ func (p *BatchProposer) TryCommitBatches() {
 	}
 }
 
-func (p *BatchProposer) proposeBatch(blockTraces []orm.BlockTrace) bool {
-	if len(blockTraces) == 0 {
+func (p *BatchProposer) proposeBatch(blocks []*types.BlockInfo) bool {
+	if len(blocks) == 0 {
 		return false
 	}
 
 	approximatePayloadSize := func(hash string) (uint64, error) {
-		traces, err := p.blockTraceOrm.GetL2WrappedBlocks(map[string]interface{}{"hash": hash})
+		traces, err := p.orm.GetL2WrappedBlocks(map[string]interface{}{"hash": hash})
 		if err != nil {
 			return 0, err
 		}
@@ -257,49 +284,49 @@ func (p *BatchProposer) proposeBatch(blockTraces []orm.BlockTrace) bool {
 		return uint64(size), nil
 	}
 
-	firstSize, err := approximatePayloadSize(blockTraces[0].Hash)
+	firstSize, err := approximatePayloadSize(blocks[0].Hash)
 	if err != nil {
-		log.Error("failed to create batch", "number", blockTraces[0].Number, "err", err)
+		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", blockTraces[0].Number, "size", firstSize)
+		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(blockTraces[:1]); err != nil {
-			log.Error("failed to create batch", "number", blockTraces[0].Number, "err", err)
+		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(blockTraces[0].TxNum))
-		bridgeL2BatchesGasCreatedPerBatchGauge.Update(int64(blockTraces[0].GasUsed))
+		bridgeL2BatchesTxsCreatedPerBatchGauge.Update(int64(blocks[0].TxNum))
+		bridgeL2BatchesGasCreatedPerBatchGauge.Update(int64(blocks[0].GasUsed))
 		bridgeL2BatchesPayloadSizePerBatchGauge.Update(int64(firstSize))
 		bridgeL2BatchesBlocksCreatedTotalCounter.Inc(1)
 		bridgeL2BatchesOversizedTotalCounter.Inc(1)
 		return true
 	}
 
-	if blockTraces[0].GasUsed > p.batchGasThreshold {
+	if blocks[0].GasUsed > p.batchGasThreshold {
 		bridgeL2BatchesGasOverThresholdTotalCounter.Inc(1)
-		log.Warn("gas overflow even for only 1 block", "height", blockTraces[0].Number, "gas", blockTraces[0].GasUsed)
-		if err := p.createBatchForBlocks(blockTraces[:1]); err != nil {
-			log.Error("failed to create batch", "number", blockTraces[0].Number, "err", err)
+		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(blockTraces[0].TxNum))
-			bridgeL2BatchesGasCreatedPerBatchGauge.Update(int64(blockTraces[0].GasUsed))
+			bridgeL2BatchesTxsCreatedPerBatchGauge.Update(int64(blocks[0].TxNum))
+			bridgeL2BatchesGasCreatedPerBatchGauge.Update(int64(blocks[0].GasUsed))
 			bridgeL2BatchesPayloadSizePerBatchGauge.Update(int64(firstSize))
 			bridgeL2BatchesBlocksCreatedTotalCounter.Inc(1)
 		}
 		return true
 	}
 
-	if blockTraces[0].TxNum > p.batchTxNumThreshold {
+	if blocks[0].TxNum > p.batchTxNumThreshold {
 		bridgeL2BatchesTxsOverThresholdTotalCounter.Inc(1)
-		log.Warn("too many txs even for only 1 block", "height", blockTraces[0].Number, "tx_num", blockTraces[0].TxNum)
-		if err := p.createBatchForBlocks(blockTraces[:1]); err != nil {
-			log.Error("failed to create batch", "number", blockTraces[0].Number, "err", err)
+		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(blockTraces[0].TxNum))
-			bridgeL2BatchesGasCreatedPerBatchGauge.Update(int64(blockTraces[0].GasUsed))
+			bridgeL2BatchesTxsCreatedPerBatchGauge.Update(int64(blocks[0].TxNum))
+			bridgeL2BatchesGasCreatedPerBatchGauge.Update(int64(blocks[0].GasUsed))
 			bridgeL2BatchesPayloadSizePerBatchGauge.Update(int64(firstSize))
 			bridgeL2BatchesBlocksCreatedTotalCounter.Inc(1)
 		}
@@ -309,7 +336,7 @@ func (p *BatchProposer) proposeBatch(blockTraces []orm.BlockTrace) bool {
 	var gasUsed, txNum, payloadSize uint64
 	reachThreshold := false
 	// add blocks into batch until reach batchGasThreshold
-	for i, block := range blockTraces {
+	for i, block := range blocks {
 		size, err := approximatePayloadSize(block.Hash)
 		if err != nil {
 			log.Error("failed to create batch", "number", block.Number, "err", err)
@@ -317,7 +344,7 @@ func (p *BatchProposer) proposeBatch(blockTraces []orm.BlockTrace) bool {
 		}
 
 		if (gasUsed+block.GasUsed > p.batchGasThreshold) || (txNum+block.TxNum > p.batchTxNumThreshold) || (payloadSize+size > p.commitCalldataSizeLimit) {
-			blockTraces = blockTraces[:i]
+			blocks = blocks[:i]
 			reachThreshold = true
 			break
 		}
@@ -329,24 +356,24 @@ func (p *BatchProposer) proposeBatch(blockTraces []orm.BlockTrace) bool {
 	// 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 && blockTraces[0].BlockTimestamp+p.batchTimeSec > uint64(time.Now().Unix()) {
+	if !reachThreshold && blocks[0].BlockTimestamp+p.batchTimeSec > uint64(time.Now().Unix()) {
 		return false
 	}
 
-	if err := p.createBatchForBlocks(blockTraces); err != nil {
-		log.Error("failed to create batch", "from", blockTraces[0].Number, "to", blockTraces[len(blockTraces)-1].Number, "err", err)
+	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))
 		bridgeL2BatchesPayloadSizePerBatchGauge.Update(int64(payloadSize))
-		bridgeL2BatchesBlocksCreatedTotalCounter.Inc(int64(len(blockTraces)))
+		bridgeL2BatchesBlocksCreatedTotalCounter.Inc(int64(len(blocks)))
 	}
 
 	return true
 }
 
-func (p *BatchProposer) createBatchForBlocks(blocks []orm.BlockTrace) error {
-	lastBatch, err := p.blockBatchOrm.GetLatestBatch()
+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
@@ -358,7 +385,7 @@ func (p *BatchProposer) createBatchForBlocks(blocks []orm.BlockTrace) error {
 		return err
 	}
 
-	if err := orm.AddBatchInfoToDB(p.db, batchData); err != nil {
+	if err := AddBatchInfoToDB(p.orm, batchData); err != nil {
 		log.Error("addBatchInfoToDB failed", "BatchHash", batchData.Hash(), "error", err)
 		return err
 	}
@@ -367,29 +394,22 @@ func (p *BatchProposer) createBatchForBlocks(blocks []orm.BlockTrace) error {
 	return nil
 }
 
-func (p *BatchProposer) generateBatchData(parentBatch *orm.BlockBatch, blocks []orm.BlockTrace) (*bridgeTypes.BatchData, error) {
-	var wrappedBlocks []*bridgeTypes.WrappedBlock
+func (p *BatchProposer) generateBatchData(parentBatch *types.BlockBatch, blocks []*types.BlockInfo) (*types.BatchData, error) {
+	var wrappedBlocks []*types.WrappedBlock
 	for _, block := range blocks {
-		trs, err := p.blockTraceOrm.GetL2WrappedBlocks(map[string]interface{}{"hash": block.Hash})
+		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])
 	}
-
-	parentBatchInfo := bridgeTypes.BatchInfo{
-		Index:     parentBatch.Index,
-		Hash:      parentBatch.Hash,
-		StateRoot: parentBatch.StateRoot,
-	}
-	return bridgeTypes.NewBatchData(&parentBatchInfo, wrappedBlocks, p.piCfg), nil
+	return types.NewBatchData(parentBatch, wrappedBlocks, p.piCfg), nil
 }
 
 func (p *BatchProposer) getBatchDataBufferSize() (size uint64) {
 	for _, batchData := range p.batchDataBuffer {
-		size += bridgeAbi.GetBatchCalldataLength(&batchData.Batch)
+		size += bridgeabi.GetBatchCalldataLength(&batchData.Batch)
 	}
 	return
 }

bridge/watcher/batch_proposer_test.go

@@ -0,0 +1,199 @@
+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/l1_watcher.go

@@ -7,27 +7,28 @@ import (
 	geth "github.com/scroll-tech/go-ethereum"
 	"github.com/scroll-tech/go-ethereum/accounts/abi"
 	"github.com/scroll-tech/go-ethereum/common"
-	gethTypes "github.com/scroll-tech/go-ethereum/core/types"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/crypto"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
-	gethMetrics "github.com/scroll-tech/go-ethereum/metrics"
+	geth_metrics "github.com/scroll-tech/go-ethereum/metrics"
 	"github.com/scroll-tech/go-ethereum/rpc"
-	"gorm.io/gorm"
 
 	"scroll-tech/common/metrics"
 	"scroll-tech/common/types"
 
-	bridgeAbi "scroll-tech/bridge/abi"
-	"scroll-tech/bridge/internal/orm"
-	"scroll-tech/bridge/internal/utils"
+	"scroll-tech/database"
+
+	bridge_abi "scroll-tech/bridge/abi"
+	"scroll-tech/bridge/utils"
 )
 
 var (
-	bridgeL1MsgsSyncHeightGauge           = gethMetrics.NewRegisteredGauge("bridge/l1/msgs/sync/height", metrics.ScrollRegistry)
-	bridgeL1MsgsSentEventsTotalCounter    = gethMetrics.NewRegisteredCounter("bridge/l1/msgs/sent/events/total", metrics.ScrollRegistry)
-	bridgeL1MsgsRelayedEventsTotalCounter = gethMetrics.NewRegisteredCounter("bridge/l1/msgs/relayed/events/total", metrics.ScrollRegistry)
-	bridgeL1MsgsRollupEventsTotalCounter  = gethMetrics.NewRegisteredCounter("bridge/l1/msgs/rollup/events/total", metrics.ScrollRegistry)
+	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 {
@@ -38,12 +39,9 @@ type rollupEvent struct {
 
 // L1WatcherClient will listen for smart contract events from Eth L1.
 type L1WatcherClient struct {
-	ctx          context.Context
-	client       *ethclient.Client
-	l1MessageOrm *orm.L1Message
-	l2MessageOrm *orm.L2Message
-	l1BlockOrm   *orm.L1Block
-	l1BatchOrm   *orm.BlockBatch
+	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
@@ -64,9 +62,8 @@ type L1WatcherClient struct {
 }
 
 // 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 *gorm.DB) *L1WatcherClient {
-	l1MessageOrm := orm.NewL1Message(db)
-	savedHeight, err := l1MessageOrm.GetLayer1LatestWatchedHeight()
+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
@@ -75,8 +72,7 @@ func NewL1WatcherClient(ctx context.Context, client *ethclient.Client, startHeig
 		savedHeight = int64(startHeight)
 	}
 
-	l1BlockOrm := orm.NewL1Block(db)
-	savedL1BlockHeight, err := l1BlockOrm.GetLatestL1BlockHeight()
+	savedL1BlockHeight, err := db.GetLatestL1BlockHeight()
 	if err != nil {
 		log.Warn("Failed to fetch latest L1 block height from db", "err", err)
 		savedL1BlockHeight = 0
@@ -88,20 +84,17 @@ func NewL1WatcherClient(ctx context.Context, client *ethclient.Client, startHeig
 	return &L1WatcherClient{
 		ctx:           ctx,
 		client:        client,
-		l1MessageOrm:  l1MessageOrm,
-		l1BlockOrm:    l1BlockOrm,
-		l1BatchOrm:    orm.NewBlockBatch(db),
-		l2MessageOrm:  orm.NewL2Message(db),
+		db:            db,
 		confirmations: confirmations,
 
 		messengerAddress: messengerAddress,
-		messengerABI:     bridgeAbi.L1ScrollMessengerABI,
+		messengerABI:     bridge_abi.L1ScrollMessengerABI,
 
 		messageQueueAddress: messageQueueAddress,
-		messageQueueABI:     bridgeAbi.L1MessageQueueABI,
+		messageQueueABI:     bridge_abi.L1MessageQueueABI,
 
 		scrollChainAddress: scrollChainAddress,
-		scrollChainABI:     bridgeAbi.ScrollChainABI,
+		scrollChainABI:     bridge_abi.ScrollChainABI,
 
 		processedMsgHeight:   uint64(savedHeight),
 		processedBlockHeight: savedL1BlockHeight,
@@ -137,11 +130,11 @@ func (w *L1WatcherClient) FetchBlockHeader(blockHeight uint64) error {
 		toBlock = fromBlock + contractEventsBlocksFetchLimit - 1
 	}
 
-	var blocks []orm.L1Block
+	var blocks []*types.L1BlockInfo
 	var err error
 	height := fromBlock
 	for ; height <= toBlock; height++ {
-		var block *gethTypes.Header
+		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)
@@ -151,7 +144,7 @@ func (w *L1WatcherClient) FetchBlockHeader(blockHeight uint64) error {
 		if block.BaseFee != nil {
 			baseFee = block.BaseFee.Uint64()
 		}
-		blocks = append(blocks, orm.L1Block{
+		blocks = append(blocks, &types.L1BlockInfo{
 			Number:  uint64(height),
 			Hash:    block.Hash().String(),
 			BaseFee: baseFee,
@@ -165,7 +158,7 @@ func (w *L1WatcherClient) FetchBlockHeader(blockHeight uint64) error {
 	toBlock = height - 1
 
 	// insert succeed blocks
-	err = w.l1BlockOrm.InsertL1Blocks(w.ctx, 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
@@ -209,11 +202,11 @@ func (w *L1WatcherClient) FetchContractEvent() error {
 			Topics: make([][]common.Hash, 1),
 		}
 		query.Topics[0] = make([]common.Hash, 5)
-		query.Topics[0][0] = bridgeAbi.L1QueueTransactionEventSignature
-		query.Topics[0][1] = bridgeAbi.L1RelayedMessageEventSignature
-		query.Topics[0][2] = bridgeAbi.L1FailedRelayedMessageEventSignature
-		query.Topics[0][3] = bridgeAbi.L1CommitBatchEventSignature
-		query.Topics[0][4] = bridgeAbi.L1FinalizeBatchEventSignature
+		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 {
@@ -245,7 +238,7 @@ func (w *L1WatcherClient) FetchContractEvent() error {
 		for _, event := range rollupEvents {
 			batchHashes = append(batchHashes, event.batchHash.String())
 		}
-		statuses, err := w.l1BatchOrm.GetRollupStatusByHashList(batchHashes)
+		statuses, err := w.db.GetRollupStatusByHashList(batchHashes)
 		if err != nil {
 			log.Error("Failed to GetRollupStatusByHashList", "err", err)
 			return err
@@ -261,9 +254,9 @@ func (w *L1WatcherClient) FetchContractEvent() error {
 			// only update when db status is before event status
 			if event.status > status {
 				if event.status == types.RollupFinalized {
-					err = w.l1BatchOrm.UpdateFinalizeTxHashAndRollupStatus(w.ctx, batchHash, event.txHash.String(), event.status)
+					err = w.db.UpdateFinalizeTxHashAndRollupStatus(w.ctx, batchHash, event.txHash.String(), event.status)
 				} else if event.status == types.RollupCommitted {
-					err = w.l1BatchOrm.UpdateCommitTxHashAndRollupStatus(w.ctx, batchHash, event.txHash.String(), event.status)
+					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)
@@ -281,13 +274,13 @@ func (w *L1WatcherClient) FetchContractEvent() error {
 			} else {
 				msgStatus = types.MsgFailed
 			}
-			if err = w.l2MessageOrm.UpdateLayer2StatusAndLayer1Hash(w.ctx, msg.msgHash.String(), msgStatus, msg.txHash.String()); err != nil {
+			if err = w.db.UpdateLayer2StatusAndLayer1Hash(w.ctx, msg.msgHash.String(), msgStatus, msg.txHash.String()); err != nil {
 				log.Error("Failed to update layer1 status and layer2 hash", "err", err)
 				return err
 			}
 		}
 
-		if err = w.l1MessageOrm.SaveL1Messages(w.ctx, sentMessageEvents); err != nil {
+		if err = w.db.SaveL1Messages(w.ctx, sentMessageEvents); err != nil {
 			return err
 		}
 
@@ -298,16 +291,17 @@ func (w *L1WatcherClient) FetchContractEvent() error {
 	return nil
 }
 
-func (w *L1WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]*orm.L1Message, []relayedMessage, []rollupEvent, error) {
+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 []*orm.L1Message
+
+	var l1Messages []*types.L1Message
 	var relayedMessages []relayedMessage
 	var rollupEvents []rollupEvent
 	for _, vLog := range logs {
 		switch vLog.Topics[0] {
-		case bridgeAbi.L1QueueTransactionEventSignature:
-			event := bridgeAbi.L1QueueTransactionEvent{}
+		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)
@@ -316,7 +310,7 @@ func (w *L1WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]*orm.L1M
 
 			msgHash := common.BytesToHash(crypto.Keccak256(event.Data))
 
-			l1Messages = append(l1Messages, &orm.L1Message{
+			l1Messages = append(l1Messages, &types.L1Message{
 				QueueIndex: event.QueueIndex.Uint64(),
 				MsgHash:    msgHash.String(),
 				Height:     vLog.BlockNumber,
@@ -327,8 +321,8 @@ func (w *L1WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]*orm.L1M
 				GasLimit:   event.GasLimit.Uint64(),
 				Layer1Hash: vLog.TxHash.Hex(),
 			})
-		case bridgeAbi.L1RelayedMessageEventSignature:
-			event := bridgeAbi.L1RelayedMessageEvent{}
+		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)
@@ -340,8 +334,8 @@ func (w *L1WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]*orm.L1M
 				txHash:       vLog.TxHash,
 				isSuccessful: true,
 			})
-		case bridgeAbi.L1FailedRelayedMessageEventSignature:
-			event := bridgeAbi.L1FailedRelayedMessageEvent{}
+		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)
@@ -353,8 +347,8 @@ func (w *L1WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]*orm.L1M
 				txHash:       vLog.TxHash,
 				isSuccessful: false,
 			})
-		case bridgeAbi.L1CommitBatchEventSignature:
-			event := bridgeAbi.L1CommitBatchEvent{}
+		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)
@@ -366,8 +360,8 @@ func (w *L1WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]*orm.L1M
 				txHash:    vLog.TxHash,
 				status:    types.RollupCommitted,
 			})
-		case bridgeAbi.L1FinalizeBatchEventSignature:
-			event := bridgeAbi.L1FinalizeBatchEvent{}
+		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)

bridge/watcher/l1_watcher_test.go

@@ -11,24 +11,31 @@ import (
 	"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"
-	"gorm.io/gorm"
+
+	bridge_abi "scroll-tech/bridge/abi"
+	"scroll-tech/bridge/utils"
 
 	commonTypes "scroll-tech/common/types"
 
-	bridgeAbi "scroll-tech/bridge/abi"
-	"scroll-tech/bridge/internal/orm"
-	"scroll-tech/bridge/internal/utils"
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
 )
 
-func setupL1Watcher(t *testing.T) (*L1WatcherClient, *gorm.DB) {
-	db := setupDB(t)
+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
@@ -36,13 +43,13 @@ func setupL1Watcher(t *testing.T) (*L1WatcherClient, *gorm.DB) {
 
 func testFetchContractEvent(t *testing.T) {
 	watcher, db := setupL1Watcher(t)
-	defer utils.CloseDB(db)
+	defer db.Close()
 	assert.NoError(t, watcher.FetchContractEvent())
 }
 
 func testL1WatcherClientFetchBlockHeader(t *testing.T) {
 	watcher, db := setupL1Watcher(t)
-	defer utils.CloseDB(db)
+	defer db.Close()
 	convey.Convey("test toBlock < fromBlock", t, func() {
 		var blockHeight uint64
 		if watcher.ProcessedBlockHeight() <= 0 {
@@ -66,7 +73,6 @@ func testL1WatcherClientFetchBlockHeader(t *testing.T) {
 		assert.Error(t, err)
 	})
 
-	var l1BlockOrm *orm.L1Block
 	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) {
@@ -80,7 +86,7 @@ func testL1WatcherClientFetchBlockHeader(t *testing.T) {
 		})
 		defer patchGuard.Reset()
 
-		patchGuard.ApplyMethodFunc(l1BlockOrm, "InsertL1Blocks", func(ctx context.Context, blocks []orm.L1Block) error {
+		patchGuard.ApplyMethodFunc(db, "InsertL1Blocks", func(ctx context.Context, blocks []*commonTypes.L1BlockInfo) error {
 			return errors.New("insert failed")
 		})
 
@@ -102,7 +108,7 @@ func testL1WatcherClientFetchBlockHeader(t *testing.T) {
 		})
 		defer patchGuard.Reset()
 
-		patchGuard.ApplyMethodFunc(l1BlockOrm, "InsertL1Blocks", func(ctx context.Context, blocks []orm.L1Block) error {
+		patchGuard.ApplyMethodFunc(db, "InsertL1Blocks", func(ctx context.Context, blocks []*commonTypes.L1BlockInfo) error {
 			return nil
 		})
 
@@ -114,7 +120,7 @@ func testL1WatcherClientFetchBlockHeader(t *testing.T) {
 
 func testL1WatcherClientFetchContractEvent(t *testing.T) {
 	watcher, db := setupL1Watcher(t)
-	defer utils.CloseDB(db)
+	defer db.Close()
 
 	watcher.SetConfirmations(rpc.SafeBlockNumber)
 	convey.Convey("get latest confirmed block number failure", t, func() {
@@ -159,14 +165,14 @@ func testL1WatcherClientFetchContractEvent(t *testing.T) {
 
 	convey.Convey("parse bridge event logs failure", t, func() {
 		targetErr := errors.New("parse log failure")
-		patchGuard.ApplyPrivateMethod(watcher, "parseBridgeEventLogs", func(*L1WatcherClient, []types.Log) ([]*orm.L1Message, []relayedMessage, []rollupEvent, error) {
+		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, []types.Log) ([]*orm.L1Message, []relayedMessage, []rollupEvent, error) {
+	patchGuard.ApplyPrivateMethod(watcher, "parseBridgeEventLogs", func(*L1WatcherClient, []geth_types.Log) ([]*commonTypes.L1Message, []relayedMessage, []rollupEvent, error) {
 		rollupEvents := []rollupEvent{
 			{
 				batchHash: common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
@@ -195,10 +201,9 @@ func testL1WatcherClientFetchContractEvent(t *testing.T) {
 		return nil, relayedMessageEvents, rollupEvents, nil
 	})
 
-	var blockBatchOrm *orm.BlockBatch
 	convey.Convey("db get rollup status by hash list failure", t, func() {
 		targetErr := errors.New("get db failure")
-		patchGuard.ApplyMethodFunc(blockBatchOrm, "GetRollupStatusByHashList", func(hashes []string) ([]commonTypes.RollupStatus, error) {
+		patchGuard.ApplyMethodFunc(db, "GetRollupStatusByHashList", func(hashes []string) ([]commonTypes.RollupStatus, error) {
 			return nil, targetErr
 		})
 		err := watcher.FetchContractEvent()
@@ -206,7 +211,7 @@ func testL1WatcherClientFetchContractEvent(t *testing.T) {
 	})
 
 	convey.Convey("rollup status mismatch batch hashes length", t, func() {
-		patchGuard.ApplyMethodFunc(blockBatchOrm, "GetRollupStatusByHashList", func(hashes []string) ([]commonTypes.RollupStatus, error) {
+		patchGuard.ApplyMethodFunc(db, "GetRollupStatusByHashList", func(hashes []string) ([]commonTypes.RollupStatus, error) {
 			s := []commonTypes.RollupStatus{
 				commonTypes.RollupFinalized,
 			}
@@ -216,7 +221,7 @@ func testL1WatcherClientFetchContractEvent(t *testing.T) {
 		assert.NoError(t, err)
 	})
 
-	patchGuard.ApplyMethodFunc(blockBatchOrm, "GetRollupStatusByHashList", func(hashes []string) ([]commonTypes.RollupStatus, error) {
+	patchGuard.ApplyMethodFunc(db, "GetRollupStatusByHashList", func(hashes []string) ([]commonTypes.RollupStatus, error) {
 		s := []commonTypes.RollupStatus{
 			commonTypes.RollupPending,
 			commonTypes.RollupCommitting,
@@ -226,55 +231,53 @@ func testL1WatcherClientFetchContractEvent(t *testing.T) {
 
 	convey.Convey("db update RollupFinalized status failure", t, func() {
 		targetErr := errors.New("UpdateFinalizeTxHashAndRollupStatus RollupFinalized failure")
-		patchGuard.ApplyMethodFunc(blockBatchOrm, "UpdateFinalizeTxHashAndRollupStatus", func(context.Context, string, string, commonTypes.RollupStatus) error {
+		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(blockBatchOrm, "UpdateFinalizeTxHashAndRollupStatus", func(context.Context, string, string, commonTypes.RollupStatus) 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(blockBatchOrm, "UpdateCommitTxHashAndRollupStatus", func(context.Context, string, string, commonTypes.RollupStatus) error {
+		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(blockBatchOrm, "UpdateCommitTxHashAndRollupStatus", func(context.Context, string, string, commonTypes.RollupStatus) error {
+	patchGuard.ApplyMethodFunc(db, "UpdateCommitTxHashAndRollupStatus", func(context.Context, string, string, commonTypes.RollupStatus) error {
 		return nil
 	})
 
-	var l2MessageOrm *orm.L2Message
 	convey.Convey("db update layer2 status and layer1 hash failure", t, func() {
 		targetErr := errors.New("UpdateLayer2StatusAndLayer1Hash failure")
-		patchGuard.ApplyMethodFunc(l2MessageOrm, "UpdateLayer2StatusAndLayer1Hash", func(context.Context, string, commonTypes.MsgStatus, string) error {
+		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(l2MessageOrm, "UpdateLayer2StatusAndLayer1Hash", func(context.Context, string, commonTypes.MsgStatus, string) error {
+	patchGuard.ApplyMethodFunc(db, "UpdateLayer2StatusAndLayer1Hash", func(context.Context, string, commonTypes.MsgStatus, string) error {
 		return nil
 	})
 
-	var l1MessageOrm *orm.L1Message
 	convey.Convey("db save l1 message failure", t, func() {
 		targetErr := errors.New("SaveL1Messages failure")
-		patchGuard.ApplyMethodFunc(l1MessageOrm, "SaveL1Messages", func(context.Context, []*orm.L1Message) error {
+		patchGuard.ApplyMethodFunc(db, "SaveL1Messages", func(context.Context, []*commonTypes.L1Message) error {
 			return targetErr
 		})
 		err := watcher.FetchContractEvent()
 		assert.Equal(t, targetErr.Error(), err.Error())
 	})
 
-	patchGuard.ApplyMethodFunc(l1MessageOrm, "SaveL1Messages", func(context.Context, []*orm.L1Message) error {
+	patchGuard.ApplyMethodFunc(db, "SaveL1Messages", func(context.Context, []*commonTypes.L1Message) error {
 		return nil
 	})
 
@@ -286,11 +289,11 @@ func testL1WatcherClientFetchContractEvent(t *testing.T) {
 
 func testParseBridgeEventLogsL1QueueTransactionEventSignature(t *testing.T) {
 	watcher, db := setupL1Watcher(t)
-	defer utils.CloseDB(db)
+	defer db.Close()
 
-	logs := []types.Log{
+	logs := []geth_types.Log{
 		{
-			Topics:      []common.Hash{bridgeAbi.L1QueueTransactionEventSignature},
+			Topics:      []common.Hash{bridge_abi.L1QueueTransactionEventSignature},
 			BlockNumber: 100,
 			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
 		},
@@ -312,7 +315,7 @@ func testParseBridgeEventLogsL1QueueTransactionEventSignature(t *testing.T) {
 
 	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.(*bridgeAbi.L1QueueTransactionEvent)
+			tmpOut := out.(*bridge_abi.L1QueueTransactionEvent)
 			tmpOut.QueueIndex = big.NewInt(100)
 			tmpOut.Data = []byte("test data")
 			tmpOut.Sender = common.HexToAddress("0xb4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d30")
@@ -334,11 +337,11 @@ func testParseBridgeEventLogsL1QueueTransactionEventSignature(t *testing.T) {
 
 func testParseBridgeEventLogsL1RelayedMessageEventSignature(t *testing.T) {
 	watcher, db := setupL1Watcher(t)
-	defer utils.CloseDB(db)
+	defer db.Close()
 
-	logs := []types.Log{
+	logs := []geth_types.Log{
 		{
-			Topics:      []common.Hash{bridgeAbi.L1RelayedMessageEventSignature},
+			Topics:      []common.Hash{bridge_abi.L1RelayedMessageEventSignature},
 			BlockNumber: 100,
 			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
 		},
@@ -361,7 +364,7 @@ func testParseBridgeEventLogsL1RelayedMessageEventSignature(t *testing.T) {
 	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.(*bridgeAbi.L1RelayedMessageEvent)
+			tmpOut := out.(*bridge_abi.L1RelayedMessageEvent)
 			tmpOut.MessageHash = msgHash
 			return nil
 		})
@@ -378,10 +381,11 @@ func testParseBridgeEventLogsL1RelayedMessageEventSignature(t *testing.T) {
 
 func testParseBridgeEventLogsL1FailedRelayedMessageEventSignature(t *testing.T) {
 	watcher, db := setupL1Watcher(t)
-	defer utils.CloseDB(db)
-	logs := []types.Log{
+	defer db.Close()
+
+	logs := []geth_types.Log{
 		{
-			Topics:      []common.Hash{bridgeAbi.L1FailedRelayedMessageEventSignature},
+			Topics:      []common.Hash{bridge_abi.L1FailedRelayedMessageEventSignature},
 			BlockNumber: 100,
 			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
 		},
@@ -404,7 +408,7 @@ func testParseBridgeEventLogsL1FailedRelayedMessageEventSignature(t *testing.T)
 	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.(*bridgeAbi.L1FailedRelayedMessageEvent)
+			tmpOut := out.(*bridge_abi.L1FailedRelayedMessageEvent)
 			tmpOut.MessageHash = msgHash
 			return nil
 		})
@@ -421,10 +425,11 @@ func testParseBridgeEventLogsL1FailedRelayedMessageEventSignature(t *testing.T)
 
 func testParseBridgeEventLogsL1CommitBatchEventSignature(t *testing.T) {
 	watcher, db := setupL1Watcher(t)
-	defer utils.CloseDB(db)
-	logs := []types.Log{
+	defer db.Close()
+
+	logs := []geth_types.Log{
 		{
-			Topics:      []common.Hash{bridgeAbi.L1CommitBatchEventSignature},
+			Topics:      []common.Hash{bridge_abi.L1CommitBatchEventSignature},
 			BlockNumber: 100,
 			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
 		},
@@ -447,7 +452,7 @@ func testParseBridgeEventLogsL1CommitBatchEventSignature(t *testing.T) {
 	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.(*bridgeAbi.L1CommitBatchEvent)
+			tmpOut := out.(*bridge_abi.L1CommitBatchEvent)
 			tmpOut.BatchHash = msgHash
 			return nil
 		})
@@ -465,10 +470,11 @@ func testParseBridgeEventLogsL1CommitBatchEventSignature(t *testing.T) {
 
 func testParseBridgeEventLogsL1FinalizeBatchEventSignature(t *testing.T) {
 	watcher, db := setupL1Watcher(t)
-	defer utils.CloseDB(db)
-	logs := []types.Log{
+	defer db.Close()
+
+	logs := []geth_types.Log{
 		{
-			Topics:      []common.Hash{bridgeAbi.L1FinalizeBatchEventSignature},
+			Topics:      []common.Hash{bridge_abi.L1FinalizeBatchEventSignature},
 			BlockNumber: 100,
 			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
 		},
@@ -491,7 +497,7 @@ func testParseBridgeEventLogsL1FinalizeBatchEventSignature(t *testing.T) {
 	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.(*bridgeAbi.L1FinalizeBatchEvent)
+			tmpOut := out.(*bridge_abi.L1FinalizeBatchEvent)
 			tmpOut.BatchHash = msgHash
 			return nil
 		})

bridge/watcher/l2_watcher.go

@@ -10,31 +10,31 @@ import (
 	"github.com/scroll-tech/go-ethereum/accounts/abi"
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/common/hexutil"
-	gethTypes "github.com/scroll-tech/go-ethereum/core/types"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/event"
 	"github.com/scroll-tech/go-ethereum/log"
-	gethMetrics "github.com/scroll-tech/go-ethereum/metrics"
+	geth_metrics "github.com/scroll-tech/go-ethereum/metrics"
 	"github.com/scroll-tech/go-ethereum/rpc"
-	"gorm.io/gorm"
 
 	"scroll-tech/common/metrics"
 	"scroll-tech/common/types"
 
-	bridgeAbi "scroll-tech/bridge/abi"
-	"scroll-tech/bridge/internal/orm"
-	bridgeTypes "scroll-tech/bridge/internal/types"
-	"scroll-tech/bridge/internal/utils"
+	"scroll-tech/database"
+
+	bridge_abi "scroll-tech/bridge/abi"
+	"scroll-tech/bridge/utils"
 )
 
 // Metrics
 var (
-	bridgeL2MsgsSyncHeightGauge           = gethMetrics.NewRegisteredGauge("bridge/l2/msgs/sync/height", metrics.ScrollRegistry)
-	bridgeL2BlocksFetchedHeightGauge      = gethMetrics.NewRegisteredGauge("bridge/l2/blocks/fetched/height", metrics.ScrollRegistry)
-	bridgeL2BlocksFetchedGapGauge         = gethMetrics.NewRegisteredGauge("bridge/l2/blocks/fetched/gap", metrics.ScrollRegistry)
-	bridgeL2MsgsSentEventsTotalCounter    = gethMetrics.NewRegisteredCounter("bridge/l2/msgs/sent/events/total", metrics.ScrollRegistry)
-	bridgeL2MsgsAppendEventsTotalCounter  = gethMetrics.NewRegisteredCounter("bridge/l2/msgs/append/events/total", metrics.ScrollRegistry)
-	bridgeL2MsgsRelayedEventsTotalCounter = gethMetrics.NewRegisteredCounter("bridge/l2/msgs/relayed/events/total", metrics.ScrollRegistry)
+	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
@@ -44,11 +44,7 @@ type L2WatcherClient struct {
 
 	*ethclient.Client
 
-	db            *gorm.DB
-	blockBatchOrm *orm.BlockBatch
-	blockTraceOrm *orm.BlockTrace
-	l1MessageOrm  *orm.L1Message
-	l2MessageOrm  *orm.L2Message
+	orm database.OrmFactory
 
 	confirmations rpc.BlockNumber
 
@@ -66,31 +62,25 @@ type L2WatcherClient struct {
 }
 
 // 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, db *gorm.DB) *L2WatcherClient {
-	l2MessageOrm := orm.NewL2Message(db)
-	savedHeight, err := l2MessageOrm.GetLayer2LatestWatchedHeight()
+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,
-		db:     db,
-		Client: client,
-
-		blockBatchOrm:      orm.NewBlockBatch(db),
-		blockTraceOrm:      orm.NewBlockTrace(db),
-		l1MessageOrm:       orm.NewL1Message(db),
-		l2MessageOrm:       l2MessageOrm,
+		ctx:                ctx,
+		Client:             client,
+		orm:                orm,
 		processedMsgHeight: uint64(savedHeight),
 		confirmations:      confirmations,
 
 		messengerAddress: messengerAddress,
-		messengerABI:     bridgeAbi.L2ScrollMessengerABI,
+		messengerABI:     bridge_abi.L2ScrollMessengerABI,
 
 		messageQueueAddress:  messageQueueAddress,
-		messageQueueABI:      bridgeAbi.L2MessageQueueABI,
+		messageQueueABI:      bridge_abi.L2MessageQueueABI,
 		withdrawTrieRootSlot: withdrawTrieRootSlot,
 
 		stopped: 0,
@@ -105,7 +95,7 @@ func NewL2WatcherClient(ctx context.Context, client *ethclient.Client, confirmat
 }
 
 func (w *L2WatcherClient) initializeGenesis() error {
-	if count, err := w.blockBatchOrm.GetBatchCount(); err != nil {
+	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")
@@ -119,25 +109,21 @@ func (w *L2WatcherClient) initializeGenesis() error {
 
 	log.Info("retrieved L2 genesis header", "hash", genesis.Hash().String())
 
-	blockTrace := &bridgeTypes.WrappedBlock{
-		Header:           genesis,
-		Transactions:     nil,
-		WithdrawTrieRoot: common.Hash{},
-	}
-	batchData := bridgeTypes.NewGenesisBatchData(blockTrace)
+	blockTrace := &types.WrappedBlock{Header: genesis, Transactions: nil, WithdrawTrieRoot: common.Hash{}}
+	batchData := types.NewGenesisBatchData(blockTrace)
 
-	if err = orm.AddBatchInfoToDB(w.db, batchData); err != nil {
+	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.blockBatchOrm.UpdateProvingStatus(batchHash, types.ProvingTaskProved); err != nil {
+	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.blockBatchOrm.UpdateRollupStatus(w.ctx, batchHash, types.RollupFinalized); err != nil {
+	if err = w.orm.UpdateRollupStatus(w.ctx, batchHash, types.RollupFinalized); err != nil {
 		return fmt.Errorf("failed to update genesis batch rollup status: %v", err)
 	}
 
@@ -153,7 +139,7 @@ func (w *L2WatcherClient) TryFetchRunningMissingBlocks(ctx context.Context, bloc
 	// 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.blockTraceOrm.GetL2BlocksLatestHeight()
+	heightInDB, err := w.orm.GetL2BlocksLatestHeight()
 	if err != nil {
 		log.Error("failed to GetL2BlocksLatestHeight", "err", err)
 		return
@@ -182,11 +168,11 @@ func (w *L2WatcherClient) TryFetchRunningMissingBlocks(ctx context.Context, bloc
 	}
 }
 
-func txsToTxsData(txs gethTypes.Transactions) []*gethTypes.TransactionData {
-	txsData := make([]*gethTypes.TransactionData, len(txs))
+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] = &gethTypes.TransactionData{
+		txsData[i] = &geth_types.TransactionData{
 			Type:     tx.Type(),
 			TxHash:   tx.Hash().String(),
 			Nonce:    tx.Nonce(),
@@ -206,7 +192,8 @@ func txsToTxsData(txs gethTypes.Transactions) []*gethTypes.TransactionData {
 }
 
 func (w *L2WatcherClient) getAndStoreBlockTraces(ctx context.Context, from, to uint64) error {
-	var blocks []*bridgeTypes.WrappedBlock
+	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)))
@@ -221,7 +208,7 @@ func (w *L2WatcherClient) getAndStoreBlockTraces(ctx context.Context, from, to u
 			return fmt.Errorf("failed to get withdrawTrieRoot: %v. number: %v", err3, number)
 		}
 
-		blocks = append(blocks, &bridgeTypes.WrappedBlock{
+		blocks = append(blocks, &types.WrappedBlock{
 			Header:           block.Header(),
 			Transactions:     txsToTxsData(block.Transactions()),
 			WithdrawTrieRoot: common.BytesToHash(withdrawTrieRoot),
@@ -229,7 +216,7 @@ func (w *L2WatcherClient) getAndStoreBlockTraces(ctx context.Context, from, to u
 	}
 
 	if len(blocks) > 0 {
-		if err := w.blockTraceOrm.InsertWrappedBlocks(blocks); err != nil {
+		if err := w.orm.InsertWrappedBlocks(blocks); err != nil {
 			return fmt.Errorf("failed to batch insert BlockTraces: %v", err)
 		}
 	}
@@ -270,10 +257,10 @@ func (w *L2WatcherClient) FetchContractEvent() {
 			Topics: make([][]common.Hash, 1),
 		}
 		query.Topics[0] = make([]common.Hash, 4)
-		query.Topics[0][0] = bridgeAbi.L2SentMessageEventSignature
-		query.Topics[0][1] = bridgeAbi.L2RelayedMessageEventSignature
-		query.Topics[0][2] = bridgeAbi.L2FailedRelayedMessageEventSignature
-		query.Topics[0][3] = bridgeAbi.L2AppendMessageEventSignature
+		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 {
@@ -308,13 +295,13 @@ func (w *L2WatcherClient) FetchContractEvent() {
 			} else {
 				msgStatus = types.MsgFailed
 			}
-			if err = w.l1MessageOrm.UpdateLayer1StatusAndLayer2Hash(w.ctx, msg.msgHash.String(), msgStatus, msg.txHash.String()); err != nil {
+			if err = w.orm.UpdateLayer1StatusAndLayer2Hash(w.ctx, msg.msgHash.String(), msgStatus, msg.txHash.String()); err != nil {
 				log.Error("Failed to update layer1 status and layer2 hash", "err", err)
 				return
 			}
 		}
 
-		if err = w.l2MessageOrm.SaveL2Messages(w.ctx, sentMessageEvents); err != nil {
+		if err = w.orm.SaveL2Messages(w.ctx, sentMessageEvents); err != nil {
 			log.Error("failed to save l2 messages", "err", err)
 			return
 		}
@@ -324,18 +311,18 @@ func (w *L2WatcherClient) FetchContractEvent() {
 	}
 }
 
-func (w *L2WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]orm.L2Message, []relayedMessage, error) {
+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 []orm.L2Message
+	var l2Messages []*types.L2Message
 	var relayedMessages []relayedMessage
 	var lastAppendMsgHash common.Hash
 	var lastAppendMsgNonce uint64
 	for _, vLog := range logs {
 		switch vLog.Topics[0] {
-		case bridgeAbi.L2SentMessageEventSignature:
-			event := bridgeAbi.L2SentMessageEvent{}
+		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)
@@ -363,7 +350,7 @@ func (w *L2WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]orm.L2Me
 				return l2Messages, relayedMessages, errors.New(errMsg)
 			}
 
-			l2Messages = append(l2Messages, orm.L2Message{
+			l2Messages = append(l2Messages, &types.L2Message{
 				Nonce:      event.MessageNonce.Uint64(),
 				MsgHash:    computedMsgHash.String(),
 				Height:     vLog.BlockNumber,
@@ -373,8 +360,8 @@ func (w *L2WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]orm.L2Me
 				Calldata:   common.Bytes2Hex(event.Message),
 				Layer2Hash: vLog.TxHash.Hex(),
 			})
-		case bridgeAbi.L2RelayedMessageEventSignature:
-			event := bridgeAbi.L2RelayedMessageEvent{}
+		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)
@@ -386,8 +373,8 @@ func (w *L2WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]orm.L2Me
 				txHash:       vLog.TxHash,
 				isSuccessful: true,
 			})
-		case bridgeAbi.L2FailedRelayedMessageEventSignature:
-			event := bridgeAbi.L2FailedRelayedMessageEvent{}
+		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)
@@ -399,8 +386,8 @@ func (w *L2WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]orm.L2Me
 				txHash:       vLog.TxHash,
 				isSuccessful: false,
 			})
-		case bridgeAbi.L2AppendMessageEventSignature:
-			event := bridgeAbi.L2AppendMessageEvent{}
+		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)

bridge/watcher/l2_watcher_test.go

@@ -9,43 +9,54 @@ import (
 	"testing"
 	"time"
 
-	"gorm.io/gorm"
-
 	"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"
-	gethTypes "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"
 
 	"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"
 
-	bridgeAbi "scroll-tech/bridge/abi"
-	"scroll-tech/bridge/internal/controller/sender"
-	"scroll-tech/bridge/internal/orm"
-	"scroll-tech/bridge/internal/utils"
-	"scroll-tech/bridge/mock_bridge"
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
 )
 
-func setupL2Watcher(t *testing.T) (*L2WatcherClient, *gorm.DB) {
-	db := setupDB(t)
+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, db
+	return watcher
 }
 
 func testCreateNewWatcherAndStop(t *testing.T) {
-	wc, db := setupL2Watcher(t)
-	subCtx, cancel := context.WithCancel(context.Background())
+	// 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()
-		defer utils.CloseDB(db)
+		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
@@ -68,13 +79,20 @@ func testCreateNewWatcherAndStop(t *testing.T) {
 }
 
 func testMonitorBridgeContract(t *testing.T) {
-	wc, db := setupL2Watcher(t)
-	subCtx, cancel := context.WithCancel(context.Background())
+	// 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()
-		defer utils.CloseDB(db)
+		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())
@@ -99,7 +117,7 @@ func testMonitorBridgeContract(t *testing.T) {
 	tx, err = instance.SendMessage(auth, toAddress, fee, message, gasLimit)
 	assert.NoError(t, err)
 	receipt, err := bind.WaitMined(context.Background(), l2Cli, tx)
-	if receipt.Status != gethTypes.ReceiptStatusSuccessful || err != nil {
+	if receipt.Status != geth_types.ReceiptStatusSuccessful || err != nil {
 		t.Fatalf("Call failed")
 	}
 
@@ -109,30 +127,34 @@ func testMonitorBridgeContract(t *testing.T) {
 	tx, err = instance.SendMessage(auth, toAddress, fee, message, gasLimit)
 	assert.NoError(t, err)
 	receipt, err = bind.WaitMined(context.Background(), l2Cli, tx)
-	if receipt.Status != gethTypes.ReceiptStatusSuccessful || err != nil {
+	if receipt.Status != geth_types.ReceiptStatusSuccessful || err != nil {
 		t.Fatalf("Call failed")
 	}
 
-	l2MessageOrm := orm.NewL2Message(db)
 	// check if we successfully stored events
 	assert.True(t, cutils.TryTimes(10, func() bool {
-		height, err := l2MessageOrm.GetLayer2LatestWatchedHeight()
+		height, err := db.GetLayer2LatestWatchedHeight()
 		return err == nil && height > int64(previousHeight)
 	}))
 
 	// check l1 messages.
 	assert.True(t, cutils.TryTimes(10, func() bool {
-		msgs, err := l2MessageOrm.GetL2Messages(map[string]interface{}{"status": types.MsgPending}, nil, 0)
+		msgs, err := db.GetL2Messages(map[string]interface{}{"status": types.MsgPending})
 		return err == nil && len(msgs) == 2
 	}))
 }
 
 func testFetchMultipleSentMessageInOneBlock(t *testing.T) {
-	_, db := setupL2Watcher(t)
-	subCtx, cancel := context.WithCancel(context.Background())
+	// 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()
-		defer utils.CloseDB(db)
+		db.Close()
 	}()
 
 	previousHeight, err := l2Cli.BlockNumber(context.Background()) // shallow the global previousHeight
@@ -150,7 +172,8 @@ func testFetchMultipleSentMessageInOneBlock(t *testing.T) {
 
 	// Call mock_bridge instance sendMessage to trigger emit events multiple times
 	numTransactions := 4
-	var tx *gethTypes.Transaction
+	var tx *geth_types.Transaction
+
 	for i := 0; i < numTransactions; i++ {
 		addr := common.HexToAddress("0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63")
 		nonce, nounceErr := l2Cli.PendingNonceAt(context.Background(), addr)
@@ -165,7 +188,7 @@ func testFetchMultipleSentMessageInOneBlock(t *testing.T) {
 	}
 
 	receipt, err := bind.WaitMined(context.Background(), l2Cli, tx)
-	if receipt.Status != gethTypes.ReceiptStatusSuccessful || err != nil {
+	if receipt.Status != geth_types.ReceiptStatusSuccessful || err != nil {
 		t.Fatalf("Call failed")
 	}
 
@@ -181,26 +204,28 @@ func testFetchMultipleSentMessageInOneBlock(t *testing.T) {
 	tx, err = instance.SendMessage(auth, toAddress, fee, message, gasLimit)
 	assert.NoError(t, err)
 	receipt, err = bind.WaitMined(context.Background(), l2Cli, tx)
-	if receipt.Status != gethTypes.ReceiptStatusSuccessful || err != nil {
+	if receipt.Status != geth_types.ReceiptStatusSuccessful || err != nil {
 		t.Fatalf("Call failed")
 	}
 
-	l2MessageOrm := orm.NewL2Message(db)
 	// check if we successfully stored events
 	assert.True(t, cutils.TryTimes(10, func() bool {
-		height, err := l2MessageOrm.GetLayer2LatestWatchedHeight()
+		height, err := db.GetLayer2LatestWatchedHeight()
 		return err == nil && height > int64(previousHeight)
 	}))
 
 	assert.True(t, cutils.TryTimes(10, func() bool {
-		msgs, err := l2MessageOrm.GetL2Messages(map[string]interface{}{"status": types.MsgPending}, nil, 0)
+		msgs, err := db.GetL2Messages(map[string]interface{}{"status": types.MsgPending})
 		return err == nil && len(msgs) == 5
 	}))
 }
 
 func testFetchRunningMissingBlocks(t *testing.T) {
-	_, db := setupL2Watcher(t)
-	defer utils.CloseDB(db)
+	// 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])
 
@@ -210,7 +235,6 @@ func testFetchRunningMissingBlocks(t *testing.T) {
 	address, err := bind.WaitDeployed(context.Background(), l2Cli, tx)
 	assert.NoError(t, err)
 
-	blockTraceOrm := orm.NewBlockTrace(db)
 	ok := cutils.TryTimes(10, func() bool {
 		latestHeight, err := l2Cli.BlockNumber(context.Background())
 		if err != nil {
@@ -218,13 +242,13 @@ func testFetchRunningMissingBlocks(t *testing.T) {
 		}
 		wc := prepareWatcherClient(l2Cli, db, address)
 		wc.TryFetchRunningMissingBlocks(context.Background(), latestHeight)
-		fetchedHeight, err := blockTraceOrm.GetL2BlocksLatestHeight()
+		fetchedHeight, err := db.GetL2BlocksLatestHeight()
 		return err == nil && uint64(fetchedHeight) == latestHeight
 	})
 	assert.True(t, ok)
 }
 
-func prepareWatcherClient(l2Cli *ethclient.Client, db *gorm.DB, contractAddr common.Address) *L2WatcherClient {
+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)
 }
@@ -236,7 +260,6 @@ func prepareAuth(t *testing.T, l2Cli *ethclient.Client, privateKey *ecdsa.Privat
 	assert.NoError(t, err)
 	auth.GasPrice, err = l2Cli.SuggestGasPrice(context.Background())
 	assert.NoError(t, err)
-	auth.GasLimit = 500000
 	return auth
 }
 
@@ -245,13 +268,11 @@ func loopToFetchEvent(subCtx context.Context, watcher *L2WatcherClient) {
 }
 
 func testParseBridgeEventLogsL2SentMessageEventSignature(t *testing.T) {
-	watcher, db := setupL2Watcher(t)
-	defer utils.CloseDB(db)
-
-	logs := []gethTypes.Log{
+	watcher := setupL2Watcher(t)
+	logs := []geth_types.Log{
 		{
 			Topics: []common.Hash{
-				bridgeAbi.L2SentMessageEventSignature,
+				bridge_abi.L2SentMessageEventSignature,
 			},
 			BlockNumber: 100,
 			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
@@ -260,7 +281,7 @@ func testParseBridgeEventLogsL2SentMessageEventSignature(t *testing.T) {
 
 	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 gethTypes.Log) error {
+		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log geth_types.Log) error {
 			return targetErr
 		})
 		defer patchGuard.Reset()
@@ -277,8 +298,8 @@ func testParseBridgeEventLogsL2SentMessageEventSignature(t *testing.T) {
 		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 gethTypes.Log) error {
-			tmpOut := out.(*bridgeAbi.L2SentMessageEvent)
+		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
@@ -296,12 +317,10 @@ func testParseBridgeEventLogsL2SentMessageEventSignature(t *testing.T) {
 }
 
 func testParseBridgeEventLogsL2RelayedMessageEventSignature(t *testing.T) {
-	watcher, db := setupL2Watcher(t)
-	defer utils.CloseDB(db)
-
-	logs := []gethTypes.Log{
+	watcher := setupL2Watcher(t)
+	logs := []geth_types.Log{
 		{
-			Topics:      []common.Hash{bridgeAbi.L2RelayedMessageEventSignature},
+			Topics:      []common.Hash{bridge_abi.L2RelayedMessageEventSignature},
 			BlockNumber: 100,
 			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
 		},
@@ -309,7 +328,7 @@ func testParseBridgeEventLogsL2RelayedMessageEventSignature(t *testing.T) {
 
 	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 gethTypes.Log) error {
+		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log geth_types.Log) error {
 			return targetErr
 		})
 		defer patchGuard.Reset()
@@ -322,8 +341,8 @@ func testParseBridgeEventLogsL2RelayedMessageEventSignature(t *testing.T) {
 
 	convey.Convey("L2RelayedMessageEventSignature success", t, func() {
 		msgHash := common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log gethTypes.Log) error {
-			tmpOut := out.(*bridgeAbi.L2RelayedMessageEvent)
+		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
 		})
@@ -338,12 +357,10 @@ func testParseBridgeEventLogsL2RelayedMessageEventSignature(t *testing.T) {
 }
 
 func testParseBridgeEventLogsL2FailedRelayedMessageEventSignature(t *testing.T) {
-	watcher, db := setupL2Watcher(t)
-	defer utils.CloseDB(db)
-
-	logs := []gethTypes.Log{
+	watcher := setupL2Watcher(t)
+	logs := []geth_types.Log{
 		{
-			Topics:      []common.Hash{bridgeAbi.L2FailedRelayedMessageEventSignature},
+			Topics:      []common.Hash{bridge_abi.L2FailedRelayedMessageEventSignature},
 			BlockNumber: 100,
 			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
 		},
@@ -351,7 +368,7 @@ func testParseBridgeEventLogsL2FailedRelayedMessageEventSignature(t *testing.T)
 
 	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 gethTypes.Log) error {
+		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log geth_types.Log) error {
 			return targetErr
 		})
 		defer patchGuard.Reset()
@@ -364,8 +381,8 @@ func testParseBridgeEventLogsL2FailedRelayedMessageEventSignature(t *testing.T)
 
 	convey.Convey("L2FailedRelayedMessageEventSignature success", t, func() {
 		msgHash := common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log gethTypes.Log) error {
-			tmpOut := out.(*bridgeAbi.L2FailedRelayedMessageEvent)
+		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
 		})
@@ -380,11 +397,10 @@ func testParseBridgeEventLogsL2FailedRelayedMessageEventSignature(t *testing.T)
 }
 
 func testParseBridgeEventLogsL2AppendMessageEventSignature(t *testing.T) {
-	watcher, db := setupL2Watcher(t)
-	defer utils.CloseDB(db)
-	logs := []gethTypes.Log{
+	watcher := setupL2Watcher(t)
+	logs := []geth_types.Log{
 		{
-			Topics:      []common.Hash{bridgeAbi.L2AppendMessageEventSignature},
+			Topics:      []common.Hash{bridge_abi.L2AppendMessageEventSignature},
 			BlockNumber: 100,
 			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
 		},
@@ -392,7 +408,7 @@ func testParseBridgeEventLogsL2AppendMessageEventSignature(t *testing.T) {
 
 	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 gethTypes.Log) error {
+		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log geth_types.Log) error {
 			return targetErr
 		})
 		defer patchGuard.Reset()
@@ -405,8 +421,8 @@ func testParseBridgeEventLogsL2AppendMessageEventSignature(t *testing.T) {
 
 	convey.Convey("L2AppendMessageEventSignature success", t, func() {
 		msgHash := common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log gethTypes.Log) error {
-			tmpOut := out.(*bridgeAbi.L2AppendMessageEvent)
+		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

bridge/watcher/watcher_test.go

@@ -7,14 +7,11 @@ import (
 
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/stretchr/testify/assert"
-	"gorm.io/gorm"
 
 	"scroll-tech/common/docker"
+	"scroll-tech/common/types"
 
-	"scroll-tech/bridge/internal/config"
-	"scroll-tech/bridge/internal/orm/migrate"
-	bridgeTypes "scroll-tech/bridge/internal/types"
-	"scroll-tech/bridge/internal/utils"
+	"scroll-tech/bridge/config"
 )
 
 var (
@@ -27,61 +24,47 @@ var (
 	l2Cli *ethclient.Client
 
 	// block trace
-	wrappedBlock1 *bridgeTypes.WrappedBlock
-	wrappedBlock2 *bridgeTypes.WrappedBlock
+	wrappedBlock1 *types.WrappedBlock
+	wrappedBlock2 *types.WrappedBlock
 )
 
 func setupEnv(t *testing.T) (err error) {
 	// Load config.
-	cfg, err = config.NewConfig("../../../conf/config.json")
+	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 = &config.DBConfig{
-		DSN:        base.DBConfig.DSN,
-		DriverName: base.DBConfig.DriverName,
-		MaxOpenNum: base.DBConfig.MaxOpenNum,
-		MaxIdleNum: base.DBConfig.MaxIdleNum,
-	}
+	cfg.DBConfig = base.DBConfig
 
 	// Create l2geth client.
 	l2Cli, err = base.L2Client()
 	assert.NoError(t, err)
 
-	templateBlockTrace1, err := os.ReadFile("../../../testdata/blockTrace_02.json")
+	templateBlockTrace1, err := os.ReadFile("../../common/testdata/blockTrace_02.json")
 	if err != nil {
 		return err
 	}
 	// unmarshal blockTrace
-	wrappedBlock1 = &bridgeTypes.WrappedBlock{}
+	wrappedBlock1 = &types.WrappedBlock{}
 	if err = json.Unmarshal(templateBlockTrace1, wrappedBlock1); err != nil {
 		return err
 	}
 
-	templateBlockTrace2, err := os.ReadFile("../../../testdata/blockTrace_03.json")
+	templateBlockTrace2, err := os.ReadFile("../../common/testdata/blockTrace_03.json")
 	if err != nil {
 		return err
 	}
 	// unmarshal blockTrace
-	wrappedBlock2 = &bridgeTypes.WrappedBlock{}
+	wrappedBlock2 = &types.WrappedBlock{}
 	if err = json.Unmarshal(templateBlockTrace2, wrappedBlock2); err != nil {
 		return err
 	}
 	return err
 }
 
-func setupDB(t *testing.T) *gorm.DB {
-	db, err := utils.InitDB(cfg.DBConfig)
-	assert.NoError(t, err)
-	sqlDB, err := db.DB()
-	assert.NoError(t, err)
-	assert.NoError(t, migrate.ResetDB(sqlDB))
-	return db
-}
-
 func TestMain(m *testing.M) {
 	base = docker.NewDockerApp()
 

build/dockerfiles/intermediate/Makefile

@@ -1,46 +1,45 @@
-ifeq ($(GO_VERSION),)
-  GO_VERSION=1.19
-endif
-ifeq ($(RUST_VERSION),)
-  RUST_VERSION=nightly-2022-12-10
-endif
-ifeq ($(PYTHON_VERSION),)
-  PYTHON_VERSION=3.10
-endif
-ifeq ($(CUDA_VERSION),)
-  CUDA_VERSION=11.7.1
-endif
+GO_VERSION := 1.18
+PYTHON_VERSION := 3.10
+RUST_VERSION := nightly-2022-12-10
 
-.PHONY: all go-alpine-builder rust-builder rust-alpine-builder go-rust-alpine-builder go-rust-builder cuda-go-rust-builder py-runner
-
-cuda-go-rust-builder:
-	docker build -t scrolltech/cuda-go-rust-builder:cuda-$(CUDA_VERSION)-go-$(GO_VERSION)-rust-$(RUST_VERSION) -f cuda-go-rust-builder.Dockerfile ./ --build-arg CUDA_VERSION=$(CUDA_VERSION) --build-arg GO_VERSION=$(GO_VERSION) --build-arg RUST_VERSION=$(RUST_VERSION)
+.PHONY: all go-alpine-builder rust-builder rust-alpine-builder go-rust-alpine-builder go-rust-builder py-runner
 
 go-rust-builder:
-	docker build -t scrolltech/go-rust-builder:go-$(GO_VERSION)-rust-$(RUST_VERSION) -f go-rust-builder.Dockerfile ./ --build-arg GO_VERSION=$(GO_VERSION) --build-arg RUST_VERSION=$(RUST_VERSION)
+	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:$(GO_VERSION) -f go-alpine-builder.Dockerfile ./ --build-arg GO_VERSION=$(GO_VERSION)
+	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)
 
 rust-builder:
-	docker build -t scrolltech/rust-builder:$(RUST_VERSION) -f rust-builder.Dockerfile ./ --build-arg RUST_VERSION=$(RUST_VERSION)
+	docker build -t scrolltech/rust-builder:latest -f rust-builder.Dockerfile ./
+	docker image tag scrolltech/rust-builder:latest scrolltech/rust-builder:$(RUST_VERSION)
 
 rust-alpine-builder:
-	docker build -t scrolltech/rust-alpine-builder:$(RUST_VERSION) -f rust-alpine-builder.Dockerfile ./ --build-arg RUST_VERSION=$(RUST_VERSION)
+	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:go-$(GO_VERSION)-rust-$(RUST_VERSION) -f go-rust-alpine-builder.Dockerfile ./ --build-arg GO_VERSION=$(GO_VERSION) --build-arg RUST_VERSION=$(RUST_VERSION)
+	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)
 
 py-runner:
-	docker build -t scrolltech/py-runner:$(PYTHON_VERSION) -f py-runner.Dockerfile ./ --build-arg PYTHON_VERSION=$(PYTHON_VERSION)
+	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 cuda-go-rust-builder py-runner
+all: go-alpine-builder rust-builder rust-alpine-builder go-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/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/cuda-go-rust-builder:cuda-$(CUDA_VERSION)-go-$(GO_VERSION)-rust-$(RUST_VERSION)
+	docker push scrolltech/py-runner:latest
 	docker push scrolltech/py-runner:$(PYTHON_VERSION)

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

@@ -1,35 +0,0 @@
-ARG CUDA_VERSION=11.7.1
-ARG GO_VERSION=1.19
-ARG RUST_VERSION=nightly-2022-12-10
-ARG CARGO_CHEF_TAG=0.1.41
-
-FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu22.04
-RUN apt-get update
-# Install basic packages
-RUN apt-get install build-essential curl wget git pkg-config --no-install-recommends -y
-# Install dev-packages
-RUN apt-get install libclang-dev libssl-dev cmake llvm --no-install-recommends -y
-# Install related libs
-RUN apt install libprocps-dev libboost-all-dev libmpfr-dev libgmp-dev --no-install-recommends -y
-# Clean installed cache
-RUN rm -rf /var/lib/apt/lists/*
-
-# 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
-ARG RUST_VERSION
-RUN rustup toolchain install ${RUST_VERSION}
-ARG CARGO_CHEF_TAG
-RUN cargo install cargo-chef --locked --version ${CARGO_CHEF_TAG} \
-    && rm -rf $CARGO_HOME/registry/
-
-# Install Go
-ARG GO_VERSION
-RUN rm -rf /usr/local/go
-RUN wget https://go.dev/dl/go${GO_VERSION}.1.linux-amd64.tar.gz
-RUN tar -C /usr/local -xzf go${GO_VERSION}.1.linux-amd64.tar.gz
-RUN rm go${GO_VERSION}.1.linux-amd64.tar.gz
-ENV PATH="/usr/local/go/bin:${PATH}"