add 30 batch per tx limit

.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 or have you added `bump-version` label to this PR?
+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/scripts/bump_version_dot_go.mjs

@@ -1,37 +0,0 @@
-import { URL } from "url";
-import { readFileSync, writeFileSync } from "fs";
-
-const versionFilePath = new URL(
-  "../../common/version/version.go",
-  import.meta.url
-).pathname;
-
-const versionFileContent = readFileSync(versionFilePath, { encoding: "utf-8" });
-
-const currentVersion = versionFileContent.match(
-  /var tag = "(?<version>v(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+))"/
-);
-
-try {
-  parseInt(currentVersion.groups.major);
-  parseInt(currentVersion.groups.minor);
-  parseInt(currentVersion.groups.patch);
-} catch (err) {
-  console.error(new Error("Failed to parse version in version.go file"));
-  throw err;
-}
-
-// prettier-ignore
-const newVersion = `v${currentVersion.groups.major}.${currentVersion.groups.minor}.${parseInt(currentVersion.groups.patch) + 1}`;
-
-console.log(
-  `Bump version from ${currentVersion.groups.version} to ${newVersion}`
-);
-
-writeFileSync(
-  versionFilePath,
-  versionFileContent.replace(
-    `var tag = "${currentVersion.groups.version}"`,
-    `var tag = "${newVersion}"`
-  )
-);

.github/workflows/bridge.yml

@@ -0,0 +1,79 @@
+name: Bridge
+
+on:
+  push:
+    branches:
+      - main
+      - staging
+      - develop
+      - alpha
+    paths:
+      - 'bridge/**'
+      - '.github/workflows/bridge.yml'
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+    paths:
+      - 'bridge/**'
+      - '.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.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: Lint
+      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.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
+  #   steps:
+  #   - name: Checkout code
+  #     uses: actions/checkout@v2
+  #   - name: Set up Docker Buildx
+  #     uses: docker/setup-buildx-action@v2
+  #   - run: make docker

.github/workflows/bridge_history_api.yml

@@ -1,4 +1,4 @@
-name: BridgeHistoryAPI
+name: BridgeHistoryApi
 
 on:
   push:
@@ -25,20 +25,20 @@ defaults:
     working-directory: 'bridge-history-api'
 
 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: Lint
-      run: |
-        rm -rf $HOME/.cache/golangci-lint
-        make lint
+  # 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.20.x
+  #   - name: Checkout code
+  #     uses: actions/checkout@v2
+  #   - name: Lint
+  #     run: |
+  #       rm -rf $HOME/.cache/golangci-lint
+  #       make lint
   test:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
@@ -46,18 +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
@@ -65,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
@@ -78,3 +73,4 @@ jobs:
         if [ -n "$(git status --porcelain)" ]; then
           exit 1
         fi
+

.github/workflows/bump_version.yml

@@ -1,63 +0,0 @@
-name: Bump Version
-
-on:
-  pull_request:
-    branches: [ develop ]
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
-      - labeled
-
-jobs:
-  try-to-bump:
-    if: contains(github.event.pull_request.labels.*.name, 'bump-version')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.head_ref }}
-      - name: check diff
-        id: check_diff
-        run: |
-          set -euo pipefail
-
-          # fetch develop branch so that we can diff against later
-          git fetch origin develop
-
-          echo 'checking verion changes in diff...'
-
-          # check if version changed in version.go
-          # note: the grep will fail if use \d instead of [0-9]
-          git diff HEAD..origin/develop --text --no-ext-diff --unified=0 --no-prefix common/version/version.go | grep -E '^\+var tag = "v[0-9]+\.[0-9]+\.[0-9]+"$' && true
-
-          exit_code=$?
-
-          # auto bump if version is not bumped manually
-          echo '> require auto version bump?'
-
-          if [ $exit_code -eq 0 ]; then
-            echo '> no, already bumped'
-            echo "result=no-bump" >> "$GITHUB_OUTPUT"
-          else
-            echo '> yes'
-            echo "result=bump" >> "$GITHUB_OUTPUT"
-          fi
-      - name: Install Node.js 16
-        if: steps.check_diff.outputs.result == 'bump'
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-      - name: bump version in common/version/version.go
-        if: steps.check_diff.outputs.result == 'bump'
-        run: node .github/scripts/bump_version_dot_go.mjs
-
-        # Commits made by this Action do not trigger new Workflow runs
-      - uses: stefanzweifel/git-auto-commit-action@3ea6ae190baf489ba007f7c92608f33ce20ef04a
-        if: steps.check_diff.outputs.result == 'bump'
-        with:
-          skip_fetch: true # already did fetch in check diff
-          file_pattern: "common/version/version.go"
-          commit_message: "chore: auto version bump [bot]"

.github/workflows/common.yml

@@ -9,7 +9,6 @@ on:
       - alpha
     paths:
       - 'common/**'
-      - '!common/version/version.go'
       - '.github/workflows/common.yml'
   pull_request:
     types:
@@ -19,9 +18,12 @@ on:
       - ready_for_review
     paths:
       - 'common/**'
-      - '!common/version/version.go'
       - '.github/workflows/common.yml'
 
+defaults:
+  run:
+    working-directory: 'common'
+
 jobs:
   check:
     if: github.event.pull_request.draft == false
@@ -35,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
@@ -43,7 +45,6 @@ jobs:
       with:
         workspaces: "common/libzkp/impl -> target"
     - name: Lint
-      working-directory: 'common'
       run: |
         rm -rf $HOME/.cache/golangci-lint
         make lint
@@ -54,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.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: 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,9 +9,6 @@ on:
       - alpha
     paths:
       - 'coordinator/**'
-      - 'common/**'
-      - '!common/version/version.go'
-      - 'database/**'
       - '.github/workflows/coordinator.yml'
   pull_request:
     types:
@@ -21,11 +18,12 @@ on:
       - ready_for_review
     paths:
       - 'coordinator/**'
-      - 'common/**'
-      - '!common/version/version.go'
-      - 'database/**'
       - '.github/workflows/coordinator.yml'
 
+defaults:
+  run:
+    working-directory: 'coordinator'
+
 jobs:
   check:
     if: github.event.pull_request.draft == false
@@ -39,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
@@ -54,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
@@ -88,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.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: 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,8 +9,6 @@ on:
       - alpha
     paths:
       - 'database/**'
-      - 'common/**'
-      - '!common/version/version.go'
       - '.github/workflows/database.yml'
   pull_request:
     types:
@@ -20,10 +18,12 @@ on:
       - ready_for_review
     paths:
       - 'database/**'
-      - 'common/**'
-      - '!common/version/version.go'
       - '.github/workflows/database.yml'
 
+defaults:
+  run:
+    working-directory: 'database'
+
 jobs:
   check:
     if: github.event.pull_request.draft == false
@@ -32,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
@@ -47,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.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: 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/docker.yaml

@@ -6,7 +6,7 @@ on:
       - v**
 
 jobs:
-  event_watcher:
+  build-and-push:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout code
@@ -27,18 +27,6 @@ jobs:
         tags: scrolltech/event-watcher:${{github.ref_name}}
         # cache-from: type=gha,scope=${{ github.workflow }}
         # cache-to: type=gha,scope=${{ github.workflow }}
-  gas_oracle:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
     - name: Build and push gas_oracle docker
       uses: docker/build-push-action@v2
       with:
@@ -48,18 +36,15 @@ jobs:
         tags: scrolltech/gas-oracle:${{github.ref_name}}
         # cache-from: type=gha,scope=${{ github.workflow }}
         # cache-to: type=gha,scope=${{ github.workflow }}
-  rollup_relayer:
-    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
+    - name: Build and push msg_relayer docker
+      uses: docker/build-push-action@v2
       with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
+        context: .
+        file: ./build/dockerfiles/msg_relayer.Dockerfile
+        push: true
+        tags: scrolltech/msg-relayer:${{github.ref_name}}
+        # cache-from: type=gha,scope=${{ github.workflow }}
+        # cache-to: type=gha,scope=${{ github.workflow }}
     - name: Build and push rollup_relayer docker
       uses: docker/build-push-action@v2
       with:
@@ -69,18 +54,6 @@ jobs:
         tags: scrolltech/rollup-relayer:${{github.ref_name}}
         # cache-from: type=gha,scope=${{ github.workflow }}
         # cache-to: type=gha,scope=${{ github.workflow }}
-  bridgehistoryapi-cross-msg-fetcher:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
     - name: Build and push bridgehistoryapi-cross-msg-fetcher docker
       uses: docker/build-push-action@v2
       with:
@@ -90,18 +63,6 @@ jobs:
         tags: scrolltech/bridgehistoryapi-cross-msg-fetcher:${{github.ref_name}}
         # cache-from: type=gha,scope=${{ github.workflow }}
         # cache-to: type=gha,scope=${{ github.workflow }}
-  bridgehistoryapi-server:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
     - name: Build and push bridgehistoryapi-server docker
       uses: docker/build-push-action@v2
       with:
@@ -111,18 +72,6 @@ jobs:
         tags: scrolltech/bridgehistoryapi-server:${{github.ref_name}}
         # cache-from: type=gha,scope=${{ github.workflow }}
         # cache-to: type=gha,scope=${{ github.workflow }}
-  coordinator:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
     - name: Build and push coordinator docker
       uses: docker/build-push-action@v2
       with:
@@ -132,24 +81,3 @@ jobs:
         tags: scrolltech/coordinator:${{github.ref_name}}
         # cache-from: type=gha,scope=${{ github.workflow }}
         # cache-to: type=gha,scope=${{ github.workflow }}
-  prover-stats-api:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
-    - name: Build and push prover-stats-api docker
-      uses: docker/build-push-action@v2
-      with:
-        context: .
-        file: ./build/dockerfiles/prover-stats-api.Dockerfile
-        push: true
-        tags: scrolltech/prover-stats-api:${{github.ref_name}}
-        # cache-from: type=gha,scope=${{ github.workflow }}
-        # cache-to: type=gha,scope=${{ github.workflow }}

.github/workflows/integration.yml

@@ -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.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: Build prerequisites
-      run: |
-        make dev_docker
-        make -C rollup 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/prover_stats_api.yml

@@ -1,70 +0,0 @@
-name: ProverStatsAPI
-
-on:
-  push:
-    branches:
-      - main
-      - staging
-      - develop
-      - alpha
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
-
-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: Lint
-       run: |
-         rm -rf $HOME/.cache/golangci-lint
-         make lint
-  test:
-    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: Test
-        run: |
-          make test
-      - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-        with:
-          flags: prover-stats-api
-  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
-      - run: goimports -local scroll-tech/prover-stats-api/ -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

.github/workflows/roller.yml

@@ -1,4 +1,4 @@
-name: Prover
+name: Roller
 
 on:
   push:
@@ -8,8 +8,8 @@ on:
       - develop
       - alpha
     paths:
-      - 'prover/**'
-      - '.github/workflows/prover.yml'
+      - 'roller/**'
+      - '.github/workflows/roller.yml'
   pull_request:
     types:
       - opened
@@ -17,37 +17,18 @@ on:
       - synchronize
       - ready_for_review
     paths:
-      - 'prover/**'
-      - '.github/workflows/prover.yml'
+      - 'roller/**'
+      - '.github/workflows/roller.yml'
 
 defaults:
   run:
-    working-directory: 'prover'
+    working-directory: 'roller'
 
 jobs:
   test:
     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: Test
-      run: |
-        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: prover
-  compile:
-    if: github.event_name == 'push' # will only be triggered when pushing to main & staging & develop & alpha
-    runs-on: ubuntu-latest
-    steps:
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: nightly-2022-12-10
@@ -56,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
@@ -65,7 +46,8 @@ jobs:
         workspaces: "common/libzkp/impl -> target"
     - name: Test
       run: |
-        make prover
+        make roller
+        go test -tags="mock_prover" -v ./...
   check:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
@@ -73,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
@@ -87,12 +69,12 @@ 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
-    - run: goimports -local scroll-tech/prover/ -w .
+    - run: goimports -local scroll-tech/roller/ -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

.github/workflows/rollup.yml

@@ -1,123 +0,0 @@
-name: Rollup
-
-on:
-  push:
-    branches:
-      - main
-      - staging
-      - develop
-      - alpha
-    paths:
-      - 'rollup/**'
-      - 'common/**'
-      - '!common/version/version.go'
-      - 'database/**'
-      - '.github/workflows/rollup.yml'
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
-    paths:
-      - 'rollup/**'
-      - 'common/**'
-      - '!common/version/version.go'
-      - 'database/**'
-      - '.github/workflows/rollup.yml'
-
-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: 'rollup'
-      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/rollup/ -w .
-      working-directory: 'rollup'
-    - name: Run go mod tidy
-      run: go mod tidy
-      working-directory: 'rollup'
-    # If there are any diffs from goimports or go mod tidy, fail.
-    - name: Verify no changes from goimports and go mod tidy
-      working-directory: 'rollup'
-      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.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: Build prerequisites
-      run: |
-        make dev_docker
-        make -C rollup mock_abi
-    - name: Build rollup binaries
-      working-directory: 'rollup'
-      run: |
-        make rollup_bins
-    - name: Test rollup packages
-      working-directory: 'rollup'
-      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: rollup
-  # docker-build:
-  #   if: github.event.pull_request.draft == false
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #   - name: Checkout code
-  #     uses: actions/checkout@v2
-  #   - name: Set up Docker Buildx
-  #     uses: docker/setup-buildx-action@v2
-  #   - run: make docker

.gitignore

@@ -1,22 +1,9 @@
-# Asset files
+.idea
 assets/params*
 assets/seed
-
-# Built binaries
-build/bin
-
 coverage.txt
+build/bin
 *.integration.txt
 
-# Visual Studio Code
-.vscode
-
-# IntelliJ
-.idea
-
-# MacOS
-.DS_Store
-
 # misc
 sftp-config.json
-*~

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}")
+        }
+    }
+}

Makefile

@@ -1,6 +1,6 @@
 .PHONY: check update dev_docker build_test_docker run_test_docker clean
 
-L2GETH_TAG=scroll-v4.3.55
+ZKP_VERSION=release-1220
 
 help: ## Display this help message
 	@grep -h \
@@ -8,31 +8,27 @@ help: ## Display this help message
 		awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 lint: ## The code's format and security checks.
-	make -C rollup lint
+	make -C bridge lint
 	make -C common lint
 	make -C coordinator lint
 	make -C database lint
-	make -C prover lint
+	make -C roller lint
 	make -C bridge-history-api lint
 
 update: ## update dependencies
 	go work sync
-	cd $(PWD)/rollup/ && go get -u github.com/scroll-tech/go-ethereum@${L2GETH_TAG} && go mod tidy
+	cd $(PWD)/bridge/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v3.1.12 && go mod tidy
 	cd $(PWD)/bridge-history-api/ && go get -u github.com/ethereum/go-ethereum@latest && go mod tidy
-	cd $(PWD)/common/ && go get -u github.com/scroll-tech/go-ethereum@${L2GETH_TAG} && go mod tidy
-	cd $(PWD)/coordinator/ && go get -u github.com/scroll-tech/go-ethereum@${L2GETH_TAG} && go mod tidy
-	cd $(PWD)/database/ && go get -u github.com/scroll-tech/go-ethereum@${L2GETH_TAG} && go mod tidy
-	cd $(PWD)/prover/ && go get -u github.com/scroll-tech/go-ethereum@${L2GETH_TAG} && go mod tidy
-	cd $(PWD)/prover-stats-api/ && go get -u github.com/scroll-tech/go-ethereum@${L2GETH_TAG} && go mod tidy
-	cd $(PWD)/tests/integration-test/ && go get -u github.com/scroll-tech/go-ethereum@${L2GETH_TAG} && go mod tidy
-	goimports -local $(PWD)/rollup/ -w .
+	cd $(PWD)/common/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v3.1.12 && go mod tidy
+	cd $(PWD)/coordinator/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v3.1.12 && go mod tidy
+	cd $(PWD)/database/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v3.1.12 && go mod tidy
+	cd $(PWD)/roller/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v3.1.12 && go mod tidy
+	goimports -local $(PWD)/bridge/ -w .
 	goimports -local $(PWD)/bridge-history-api/ -w .
 	goimports -local $(PWD)/common/ -w .
 	goimports -local $(PWD)/coordinator/ -w .
 	goimports -local $(PWD)/database/ -w .
-	goimports -local $(PWD)/prover/ -w .
-	goimports -local $(PWD)/prover-stats-api/ -w .
-	goimports -local $(PWD)/tests/integration-test/ -w .
+	goimports -local $(PWD)/roller/ -w .
 
 dev_docker: ## build docker images for development/testing usages
 	docker build -t scroll_l1geth ./common/docker/l1geth/
@@ -44,5 +40,16 @@ build_test_docker: ## build Docker image for local testing on M1/M2 Silicon Mac
 run_test_docker: ## run Docker image for local testing on M1/M2 Silicon Mac
 	docker run -it --rm --name scroll_test_container --network=host -v /var/run/docker.sock:/var/run/docker.sock -v $(PWD):/go/src/app scroll_test_image
 
+
+test_zkp: ## Test zkp prove and verify, roller/prover generates the proof and coordinator/verifier verifies it
+	mkdir -p test_params
+	wget https://circuit-release.s3.us-west-2.amazonaws.com/circuit-release/${ZKP_VERSION}/test_params/params19 -O ./test_params/params19
+	wget https://circuit-release.s3.us-west-2.amazonaws.com/circuit-release/${ZKP_VERSION}/test_params/params26 -O ./test_params/params26
+	wget https://circuit-release.s3.us-west-2.amazonaws.com/circuit-release/${ZKP_VERSION}/test_seed -O test_seed
+	rm -rf ./roller/assets/test_params && mv test_params ./roller/assets/ && mv test_seed ./roller/assets/
+	cd ./roller && make test-gpu-prover
+	rm -rf ./coordinator/assets/test_params && mv ./roller/assets/test_params ./coordinator/assets/ && mv ./roller/assets/agg_proof ./coordinator/assets/
+	cd ./coordinator && make test-gpu-verifier
+
 clean: ## Empty out the bin folder
 	@rm -rf build/bin

README.md

@@ -1,32 +1,9 @@
 # Scroll Monorepo
 
-[![rollup](https://github.com/scroll-tech/scroll/actions/workflows/rollup.yml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/rollup.yml)
-[![contracts](https://github.com/scroll-tech/scroll/actions/workflows/contracts.yml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/contracts.yml)
-[![bridge-history](https://github.com/scroll-tech/scroll/actions/workflows/bridge_history_api.yml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/bridge_history_api.yml)
-[![coordinator](https://github.com/scroll-tech/scroll/actions/workflows/coordinator.yml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/coordinator.yml)
-[![prover](https://github.com/scroll-tech/scroll/actions/workflows/prover.yml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/prover.yml)
-[![integration](https://github.com/scroll-tech/scroll/actions/workflows/integration.yml/badge.svg)](https://github.com/scroll-tech/scroll/actions/workflows/integration.yml)
-[![codecov](https://codecov.io/gh/scroll-tech/scroll/branch/develop/graph/badge.svg?token=VJVHNQWGGW)](https://codecov.io/gh/scroll-tech/scroll)
-
-<a href="https://scroll.io">Scroll</a> is a zkRollup Layer 2 dedicated to enhance Ethereum scalability through a bytecode-equivalent [zkEVM](https://github.com/scroll-tech/zkevm-circuits) circuit. This monorepo encompasses essential infrastructure components of the Scroll protocol. It contains the L1 and L2 contracts, the rollup node, the prover client, and the prover coordinator.
-
-## Directory Structure
-
-<pre>
-├── <a href="./bridge-history-api/">bridge-history-api</a>: Bridge history service that collects deposit and withdraw events from both L1 and L2 chain and generates withdrawal proofs
-├── <a href="./common/">common</a>: Common libraries and types
-├── <a href="./coordinator/">coordinator</a>: Prover coorindator service that dispatches proving tasks to provers
-├── <a href="./database">database</a>: Database client and schema definition
-├── <a href="./src">l2geth</a>: Scroll execution node
-├── <a href="./prover">prover</a>: Prover client that runs proof generation for zkEVM circuit and aggregation circuit
-├── <a href="./prover-stats-api">prover-stats-api</a>: Collect and show prover statistics
-├── <a href="./prover-stats-api">rollup</a>: Rollup-related services
-├── <a href="./rpc-gateway">rpc-gateway</a>: RPC gateway external repo
-└── <a href="./tests">tests</a>: Integration tests
-</pre>
+[![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
@@ -38,14 +15,14 @@ docker pull postgres
 make dev_docker
 ```
 
-## Testing Rollup & Coordinator
+## Testing Bridge & Coordinator
 
 ### For Non-Apple Silicon (M1/M2) Macs
 
 Run the tests using the following commands:
 
 ```bash
-go test -v -race -covermode=atomic scroll-tech/rollup/...
+go test -v -race -covermode=atomic scroll-tech/bridge/...
 go test -tags="mock_verifier" -v -race -covermode=atomic scroll-tech/coordinator/...
 go test -v -race -covermode=atomic scroll-tech/database/...
 go test -v -race -covermode=atomic scroll-tech/common/...
@@ -78,7 +55,7 @@ This command runs a Docker container named `scroll_test_container` from the `scr
 Once the Docker container is running, execute the tests using the following commands:
 
 ```bash
-go test -v -race -covermode=atomic scroll-tech/rollup/...
+go test -v -race -covermode=atomic scroll-tech/bridge/...
 go test -tags="mock_verifier" -v -race -covermode=atomic scroll-tech/coordinator/...
 go test -v -race -covermode=atomic scroll-tech/database/...
 go test -v -race -covermode=atomic scroll-tech/common/...
@@ -86,10 +63,6 @@ go test -v -race -covermode=atomic scroll-tech/common/...
 
 ## Testing Contracts
 
-You can find the unit tests in [`contracts/src/test/`](/contracts/src/test/), and integration tests in [`contracts/integration-test/`](/contracts/integration-test/).
+You can find the unit tests in [`<REPO_DIR>/contracts/src/test/`](/contracts/src/test/), and integration tests in [`<REPO_DIR>/contracts/integration-test/`](/contracts/integration-test/).
 
-See [`contracts`](/contracts) for more details on the contracts.
-
-## License
-
-Scroll Monorepo is licensed under the [MIT](./LICENSE) license.
+For more details on contracts, see [`/contracts`](/contracts).

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

@@ -3,70 +3,85 @@ package app
 import (
 	"fmt"
 	"os"
-	"os/signal"
 
 	"github.com/ethereum/go-ethereum/log"
-	"github.com/gin-gonic/gin"
+	"github.com/kataras/iris/v12"
+	"github.com/kataras/iris/v12/mvc"
 	"github.com/urfave/cli/v2"
 
 	"bridge-history-api/config"
-	"bridge-history-api/internal/controller"
-	"bridge-history-api/internal/route"
-	"bridge-history-api/utils"
+	"bridge-history-api/controller"
+	"bridge-history-api/db"
+	"bridge-history-api/service"
+	cutils "bridge-history-api/utils"
 )
 
 var (
 	app *cli.App
 )
 
+var database db.OrmFactory
+
+func pong(ctx iris.Context) {
+	ctx.WriteString("pong")
+}
+
+func setupQueryByAddressHandler(backend_app *mvc.Application) {
+	// Register Dependencies.
+	backend_app.Register(
+		database,
+		service.NewHistoryService,
+	)
+
+	// Register Controllers.
+	backend_app.Handle(new(controller.QueryAddressController))
+}
+
+func setupQueryByHashHandler(backend_app *mvc.Application) {
+	backend_app.Register(
+		database,
+		service.NewHistoryService,
+	)
+	backend_app.Handle(new(controller.QueryHashController))
+}
+
 func init() {
 	app = cli.NewApp()
 
 	app.Action = action
 	app.Name = "Scroll Bridge History Web Service"
 	app.Usage = "The Scroll Bridge History Web Service"
-	app.Flags = append(app.Flags, utils.CommonFlags...)
+	app.Flags = append(app.Flags, cutils.CommonFlags...)
 	app.Commands = []*cli.Command{}
 
 	app.Before = func(ctx *cli.Context) error {
-		return utils.LogSetup(ctx)
+		return cutils.LogSetup(ctx)
 	}
 }
 
 func action(ctx *cli.Context) error {
 	// Load config file.
-	cfgFile := ctx.String(utils.ConfigFileFlag.Name)
+	cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
 	cfg, err := config.NewConfig(cfgFile)
 	if err != nil {
 		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
 	}
-	db, err := utils.InitDB(cfg.DB)
+	database, err = db.NewOrmFactory(cfg)
 	if err != nil {
-		log.Crit("failed to init db", "err", err)
+		log.Crit("can not connect to database", "err", err)
 	}
-	defer func() {
-		if deferErr := utils.CloseDB(db); deferErr != nil {
-			log.Error("failed to close db", "err", err)
-		}
-	}()
-	// init Prover Stats API
-	port := cfg.Server.HostPort
+	defer database.Close()
+	bridgeApp := iris.New()
+	bridgeApp.Get("/ping", pong).Describe("healthcheck")
 
-	router := gin.Default()
-	controller.InitController(db)
-	route.Route(router, cfg)
+	mvc.Configure(bridgeApp.Party("/api/txs"), setupQueryByAddressHandler)
+	mvc.Configure(bridgeApp.Party("/api/txsbyhashes"), setupQueryByHashHandler)
 
-	go func() {
-		if runServerErr := router.Run(fmt.Sprintf(":%s", port)); runServerErr != nil {
-			log.Crit("run http server failure", "error", runServerErr)
-		}
-	}()
-	// Catch CTRL-C to ensure a graceful shutdown.
-	interrupt := make(chan os.Signal, 1)
-	signal.Notify(interrupt, os.Interrupt)
-
-	// Wait until the interrupt signal is received from an OS signal.
-	<-interrupt
+	// TODO: make debug mode configurable
+	err = bridgeApp.Listen(":8080", iris.WithLogLevel("debug"))
+	if err != nil {
+		log.Crit("can not start server", "err", err)
+	}
 
 	return nil
 }

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

@@ -12,10 +12,9 @@ import (
 	"github.com/urfave/cli/v2"
 
 	"bridge-history-api/config"
-	"bridge-history-api/crossmsg"
-	"bridge-history-api/crossmsg/messageproof"
-	"bridge-history-api/orm"
-	"bridge-history-api/utils"
+	"bridge-history-api/cross_msg"
+	"bridge-history-api/db"
+	cutils "bridge-history-api/utils"
 )
 
 var (
@@ -28,17 +27,17 @@ func init() {
 	app.Action = action
 	app.Name = "Scroll Bridge History API"
 	app.Usage = "The Scroll Bridge Web Backend"
-	app.Flags = append(app.Flags, utils.CommonFlags...)
+	app.Flags = append(app.Flags, cutils.CommonFlags...)
 	app.Commands = []*cli.Command{}
 
 	app.Before = func(ctx *cli.Context) error {
-		return utils.LogSetup(ctx)
+		return cutils.LogSetup(ctx)
 	}
 }
 
 func action(ctx *cli.Context) error {
 	// Load config file.
-	cfgFile := ctx.String(utils.ConfigFileFlag.Name)
+	cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
 	cfg, err := config.NewConfig(cfgFile)
 	if err != nil {
 		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
@@ -54,23 +53,14 @@ func action(ctx *cli.Context) error {
 	if err != nil {
 		log.Crit("failed to connect l2 geth", "config file", cfgFile, "error", err)
 	}
-
-	db, err := utils.InitDB(cfg.DB)
-	if err != nil {
-		log.Crit("failed to init db", "err", err)
-	}
-	defer func() {
-		if deferErr := utils.CloseDB(db); deferErr != nil {
-			log.Error("failed to close db", "err", err)
-		}
-	}()
+	db, err := db.NewOrmFactory(cfg)
 	if err != nil {
 		log.Crit("failed to connect to db", "config file", cfgFile, "error", err)
 	}
 
-	l1worker := &crossmsg.FetchEventWorker{F: crossmsg.L1FetchAndSaveEvents, G: crossmsg.GetLatestL1ProcessedHeight, Name: "L1 events fetch Worker"}
+	l1worker := &cross_msg.FetchEventWorker{F: cross_msg.L1FetchAndSaveEvents, G: cross_msg.GetLatestL1ProcessedHeight, Name: "L1 events fetch Worker"}
 
-	l2worker := &crossmsg.FetchEventWorker{F: crossmsg.L2FetchAndSaveEvents, G: crossmsg.GetLatestL2ProcessedHeight, Name: "L2 events fetch Worker"}
+	l2worker := &cross_msg.FetchEventWorker{F: cross_msg.L2FetchAndSaveEvents, G: cross_msg.GetLatestL2ProcessedHeight, Name: "L2 events fetch Worker"}
 
 	l1AddressList := []common.Address{
 		common.HexToAddress(cfg.L1.CustomERC20GatewayAddr),
@@ -92,7 +82,7 @@ func action(ctx *cli.Context) error {
 		common.HexToAddress(cfg.L2.WETHGatewayAddr),
 	}
 
-	l1crossMsgFetcher, err := crossmsg.NewMsgFetcher(subCtx, cfg.L1, db, l1client, l1worker, l1AddressList, crossmsg.L1ReorgHandling)
+	l1crossMsgFetcher, err := cross_msg.NewCrossMsgFetcher(subCtx, cfg.L1, db, l1client, l1worker, l1AddressList, cross_msg.L1ReorgHandling)
 	if err != nil {
 		log.Crit("failed to create l1 cross message fetcher", "error", err)
 	}
@@ -100,7 +90,7 @@ func action(ctx *cli.Context) error {
 	go l1crossMsgFetcher.Start()
 	defer l1crossMsgFetcher.Stop()
 
-	l2crossMsgFetcher, err := crossmsg.NewMsgFetcher(subCtx, cfg.L2, db, l2client, l2worker, l2AddressList, crossmsg.L2ReorgHandling)
+	l2crossMsgFetcher, err := cross_msg.NewCrossMsgFetcher(subCtx, cfg.L2, db, l2client, l2worker, l2AddressList, cross_msg.L2ReorgHandling)
 	if err != nil {
 		log.Crit("failed to create l2 cross message fetcher", "error", err)
 	}
@@ -108,23 +98,6 @@ func action(ctx *cli.Context) error {
 	go l2crossMsgFetcher.Start()
 	defer l2crossMsgFetcher.Stop()
 
-	CrossMsgOrm := orm.NewCrossMsg(db)
-
-	// BlockTimestamp fetcher for l1 and l2
-	l1BlockTimeFetcher := crossmsg.NewBlockTimestampFetcher(subCtx, cfg.L1.Confirmation, int(cfg.L1.BlockTime), l1client, CrossMsgOrm.UpdateL1BlockTimestamp, CrossMsgOrm.GetL1EarliestNoBlockTimestampHeight)
-	go l1BlockTimeFetcher.Start()
-	defer l1BlockTimeFetcher.Stop()
-
-	l2BlockTimeFetcher := crossmsg.NewBlockTimestampFetcher(subCtx, cfg.L2.Confirmation, int(cfg.L2.BlockTime), l2client, CrossMsgOrm.UpdateL2BlockTimestamp, CrossMsgOrm.GetL2EarliestNoBlockTimestampHeight)
-	go l2BlockTimeFetcher.Start()
-	defer l2BlockTimeFetcher.Stop()
-
-	// Proof updater and batch fetcher
-	l2msgProofUpdater := messageproof.NewMsgProofUpdater(subCtx, cfg.L1.Confirmation, cfg.BatchInfoFetcher.BatchIndexStartBlock, db)
-	batchFetcher := crossmsg.NewBatchInfoFetcher(subCtx, common.HexToAddress(cfg.BatchInfoFetcher.ScrollChainAddr), cfg.BatchInfoFetcher.BatchIndexStartBlock, cfg.L1.Confirmation, int(cfg.L1.BlockTime), l1client, db, l2msgProofUpdater)
-	go batchFetcher.Start()
-	defer batchFetcher.Stop()
-
 	// Catch CTRL-C to ensure a graceful shutdown.
 	interrupt := make(chan os.Signal, 1)
 	signal.Notify(interrupt, os.Interrupt)

bridge-history-api/cmd/db_cli/app/client.go

@@ -2,11 +2,12 @@ package app
 
 import (
 	"github.com/ethereum/go-ethereum/log"
+	"github.com/jmoiron/sqlx"
 	"github.com/urfave/cli/v2"
-	"gorm.io/gorm"
 
 	"bridge-history-api/config"
-	"bridge-history-api/orm/migrate"
+	"bridge-history-api/db"
+	"bridge-history-api/db/migrate"
 	"bridge-history-api/utils"
 )
 
@@ -19,8 +20,14 @@ func getConfig(ctx *cli.Context) (*config.Config, error) {
 	return dbCfg, nil
 }
 
-func initDB(dbCfg *config.DBConfig) (*gorm.DB, error) {
-	return utils.InitDB(dbCfg)
+func initDB(dbCfg *config.Config) (*sqlx.DB, error) {
+	factory, err := db.NewOrmFactory(dbCfg)
+	if err != nil {
+		return nil, err
+	}
+	log.Debug("Got db config from env", "driver name", dbCfg.DB.DriverName, "dsn", dbCfg.DB.DSN)
+
+	return factory.GetDB(), nil
 }
 
 // resetDB clean or reset database.
@@ -29,15 +36,11 @@ func resetDB(ctx *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	gormDB, err := initDB(cfg.DB)
+	db, err := initDB(cfg)
 	if err != nil {
 		return err
 	}
-	db, err := gormDB.DB()
-	if err != nil {
-		return err
-	}
-	err = migrate.ResetDB(db)
+	err = migrate.ResetDB(db.DB)
 	if err != nil {
 		return err
 	}
@@ -51,15 +54,12 @@ func checkDBStatus(ctx *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	gormDB, err := initDB(cfg.DB)
+	db, err := initDB(cfg)
 	if err != nil {
 		return err
 	}
-	db, err := gormDB.DB()
-	if err != nil {
-		return err
-	}
-	return migrate.Status(db)
+
+	return migrate.Status(db.DB)
 }
 
 // dbVersion return the latest version
@@ -68,15 +68,12 @@ func dbVersion(ctx *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	gormDB, err := initDB(cfg.DB)
+	db, err := initDB(cfg)
 	if err != nil {
 		return err
 	}
-	db, err := gormDB.DB()
-	if err != nil {
-		return err
-	}
-	version, err := migrate.Current(db)
+
+	version, err := migrate.Current(db.DB)
 	log.Info("show database version", "db version", version)
 
 	return err
@@ -88,15 +85,12 @@ func migrateDB(ctx *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	gormDB, err := initDB(cfg.DB)
+	db, err := initDB(cfg)
 	if err != nil {
 		return err
 	}
-	db, err := gormDB.DB()
-	if err != nil {
-		return err
-	}
-	return migrate.Migrate(db)
+
+	return migrate.Migrate(db.DB)
 }
 
 // rollbackDB rollback db by version
@@ -105,14 +99,10 @@ func rollbackDB(ctx *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	gormDB, err := initDB(cfg.DB)
-	if err != nil {
-		return err
-	}
-	db, err := gormDB.DB()
+	db, err := initDB(cfg)
 	if err != nil {
 		return err
 	}
 	version := ctx.Int64("version")
-	return migrate.Rollback(db, &version)
+	return migrate.Rollback(db.DB, &version)
 }

bridge-history-api/config.json

@@ -1,41 +1,34 @@
 {
-	"batchInfoFetcher": {
-		"batchIndexStartBlock": 9091265,
-		"ScrollChainAddr": "0xcD00DB804C819175B381b2B44Aa16A391c8a01D6"
-	},
 	"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": "20006"
 	}
-}
+}

bridge-history-api/config/config.go

@@ -6,12 +6,6 @@ import (
 	"path/filepath"
 )
 
-// BatchInfoFetcherConfig is the configuration of BatchInfoFetcher
-type BatchInfoFetcherConfig struct {
-	BatchIndexStartBlock uint64 `json:"batchIndexStartBlock"`
-	ScrollChainAddr      string `json:"ScrollChainAddr"`
-}
-
 // DBConfig db config
 type DBConfig struct {
 	// data source name
@@ -22,7 +16,6 @@ type DBConfig struct {
 	MaxIdleNum int `json:"maxIdleNum"`
 }
 
-// LayerConfig is the configuration of Layer1/Layer2
 type LayerConfig struct {
 	Confirmation           uint64 `json:"confirmation"`
 	Endpoint               string `json:"endpoint"`
@@ -37,11 +30,6 @@ type LayerConfig struct {
 	CustomERC20GatewayAddr string `json:"CustomERC20GatewayAddr"`
 }
 
-// ServerConfig is the configuration of the bridge history backend server port
-type ServerConfig struct {
-	HostPort string `json:"hostPort"`
-}
-
 // Config is the configuration of the bridge history backend
 type Config struct {
 	// chain config
@@ -49,9 +37,7 @@ type Config struct {
 	L2 *LayerConfig `json:"l2"`
 
 	// data source name
-	DB               *DBConfig               `json:"db"`
-	Server           *ServerConfig           `json:"server"`
-	BatchInfoFetcher *BatchInfoFetcherConfig `json:"batchInfoFetcher"`
+	DB *DBConfig `json:"db"`
 }
 
 // NewConfig returns a new instance of Config.

bridge-history-api/controller/controller.go

@@ -0,0 +1,37 @@
+package controller
+
+import (
+	"bridge-history-api/model"
+	"bridge-history-api/service"
+
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type QueryAddressController struct {
+	Service service.HistoryService
+}
+
+type QueryHashController struct {
+	Service service.HistoryService
+}
+
+func (c *QueryAddressController) Get(req model.QueryByAddressRequest) (*model.QueryByAddressResponse, error) {
+	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
+	}
+
+	return &model.QueryByAddressResponse{Message: "ok",
+		Data: &model.Data{
+			Result: message,
+			Total:  len(message),
+		}}, nil
+}
+
+func (c *QueryHashController) Post(req model.QueryByHashRequest) (*model.QueryByHashResponse, error) {
+	result, err := c.Service.GetTxsByHashes(req.Txs)
+	if err != nil {
+		return &model.QueryByHashResponse{Message: "500", Data: &model.Data{}}, err
+	}
+	return &model.QueryByHashResponse{Message: "ok", Data: &model.Data{Result: result}}, nil
+}

bridge-history-api/cross_msg/cross_msg_fetcher.go

@@ -1,4 +1,4 @@
-package crossmsg
+package cross_msg
 
 import (
 	"context"
@@ -12,47 +12,46 @@ import (
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/modern-go/reflect2"
-	"gorm.io/gorm"
 
 	"bridge-history-api/config"
+	"bridge-history-api/db"
 	"bridge-history-api/utils"
 )
 
-// MsgFetcher fetches cross message events from blockchain and saves them to database
-type MsgFetcher struct {
+type CrossMsgFetcher struct {
 	ctx           context.Context
 	config        *config.LayerConfig
-	db            *gorm.DB
+	db            db.OrmFactory
 	client        *ethclient.Client
 	worker        *FetchEventWorker
 	reorgHandling ReorgHandling
 	addressList   []common.Address
 	cachedHeaders []*types.Header
-	mu            sync.Mutex
+	mu            *sync.Mutex
 	reorgStartCh  chan struct{}
 	reorgEndCh    chan struct{}
 }
 
-// NewMsgFetcher creates a new MsgFetcher instance
-func NewMsgFetcher(ctx context.Context, config *config.LayerConfig, db *gorm.DB, client *ethclient.Client, worker *FetchEventWorker, addressList []common.Address, reorg ReorgHandling) (*MsgFetcher, error) {
-	msgFetcher := &MsgFetcher{
+func NewCrossMsgFetcher(ctx context.Context, config *config.LayerConfig, db db.OrmFactory, client *ethclient.Client, worker *FetchEventWorker, addressList []common.Address, reorg ReorgHandling) (*CrossMsgFetcher, error) {
+	newMU := &sync.Mutex{}
+	crossMsgFetcher := &CrossMsgFetcher{
 		ctx:           ctx,
 		config:        config,
 		db:            db,
 		client:        client,
 		worker:        worker,
 		reorgHandling: reorg,
+		mu:            newMU,
 		addressList:   addressList,
 		cachedHeaders: make([]*types.Header, 0),
 		reorgStartCh:  make(chan struct{}),
 		reorgEndCh:    make(chan struct{}),
 	}
-	return msgFetcher, nil
+	return crossMsgFetcher, nil
 }
 
-// Start the MsgFetcher
-func (c *MsgFetcher) Start() {
-	log.Info("MsgFetcher Start")
+func (c *CrossMsgFetcher) Start() {
+	log.Info("CrossMsgFetcher Start")
 	// fetch missing events from finalized blocks, we don't handle reorgs here
 	c.forwardFetchAndSaveMissingEvents(c.config.Confirmation)
 
@@ -78,7 +77,7 @@ func (c *MsgFetcher) Start() {
 				return
 			case <-tick.C:
 				c.mu.Lock()
-				c.forwardFetchAndSaveMissingEvents(1)
+				c.forwardFetchAndSaveMissingEvents(0)
 				c.mu.Unlock()
 			}
 		}
@@ -97,17 +96,17 @@ func (c *MsgFetcher) Start() {
 	}()
 }
 
-// Stop the MsgFetcher and log the info
-func (c *MsgFetcher) Stop() {
-	log.Info("MsgFetcher Stop")
+func (c *CrossMsgFetcher) Stop() {
+	c.db.Close()
+	log.Info("CrossMsgFetcher Stop")
 }
 
 // forwardFetchAndSaveMissingEvents will fetch all events from the latest processed height to the latest block number.
-func (c *MsgFetcher) forwardFetchAndSaveMissingEvents(confirmation uint64) {
+func (c *CrossMsgFetcher) forwardFetchAndSaveMissingEvents(confirmation uint64) {
 	// if we fetch to the latest block, shall not exceed cachedHeaders
 	var number uint64
 	var err error
-	if len(c.cachedHeaders) != 0 && confirmation == 0 {
+	if len(c.cachedHeaders) != 0 && confirmation <= 0 {
 		number = c.cachedHeaders[len(c.cachedHeaders)-1].Number.Uint64() - 1
 	} else {
 		number, err = utils.GetSafeBlockNumber(c.ctx, c.client, confirmation)
@@ -120,23 +119,22 @@ func (c *MsgFetcher) forwardFetchAndSaveMissingEvents(confirmation uint64) {
 		log.Error(fmt.Sprintf("%s: invalid get/fetch function", c.worker.Name))
 		return
 	}
-	processedHeight, err := c.worker.G(c.ctx, c.db)
+	processed_height, err := c.worker.G(c.db)
 	if err != nil {
 		log.Error(fmt.Sprintf("%s: can not get latest processed block height", c.worker.Name))
 	}
-	log.Info(fmt.Sprintf("%s: ", c.worker.Name), "height", processedHeight)
-	if processedHeight <= 0 || processedHeight < c.config.StartHeight {
-		processedHeight = c.config.StartHeight
+	log.Info(fmt.Sprintf("%s: ", c.worker.Name), "height", processed_height)
+	if processed_height <= 0 || processed_height < int64(c.config.StartHeight) {
+		processed_height = int64(c.config.StartHeight)
 	} else {
-		processedHeight++
+		processed_height += 1
 	}
-	for from := processedHeight; from <= number; from += fetchLimit {
-		to := from + fetchLimit - 1
-		if to > number {
-			to = number
+	for n := processed_height; n <= int64(number); n += FETCH_LIMIT {
+		iter_end := n + FETCH_LIMIT - 1
+		if iter_end > int64(number) {
+			iter_end = int64(number)
 		}
-		// watch for overflow here, tho its unlikely to happen
-		err := c.worker.F(c.ctx, c.client, c.db, int64(from), int64(to), c.addressList)
+		err := c.worker.F(c.ctx, c.client, c.db, n, iter_end, c.addressList)
 		if err != nil {
 			log.Error(fmt.Sprintf("%s: failed!", c.worker.Name), "err", err)
 			break
@@ -144,7 +142,7 @@ func (c *MsgFetcher) forwardFetchAndSaveMissingEvents(confirmation uint64) {
 	}
 }
 
-func (c *MsgFetcher) fetchMissingLatestHeaders() {
+func (c *CrossMsgFetcher) fetchMissingLatestHeaders() {
 	var start int64
 	number, err := c.client.BlockNumber(c.ctx)
 	if err != nil {
@@ -164,7 +162,7 @@ func (c *MsgFetcher) fetchMissingLatestHeaders() {
 			close(c.reorgEndCh)
 			return
 		default:
-			header, err := c.client.HeaderByNumber(c.ctx, big.NewInt(i))
+			header, err := c.client.HeaderByNumber(c.ctx, big.NewInt(int64(i)))
 			if err != nil {
 				log.Error("failed to get latest header", "err", err)
 				return
@@ -186,13 +184,13 @@ func (c *MsgFetcher) fetchMissingLatestHeaders() {
 			c.mu.Lock()
 			index, ok, validHeaders := BackwardFindReorgBlock(c.ctx, c.cachedHeaders, c.client, header)
 			if !ok {
-				log.Error("Reorg happened too earlier than cached headers", "reorg height", header.Number)
-				num, getSafeErr := utils.GetSafeBlockNumber(c.ctx, c.client, c.config.Confirmation)
-				if getSafeErr != nil {
+				log.Error("Reorg happended too earlier than cached headers", "reorg height", header.Number)
+				num, err := utils.GetSafeBlockNumber(c.ctx, c.client, c.config.Confirmation)
+				if err != nil {
 					log.Crit("Can not get safe number during reorg, quit the process", "err", err)
 				}
 				// clear all our saved data, because no data is safe now
-				err = c.reorgHandling(c.ctx, num, c.db)
+				err = c.reorgHandling(c.ctx, int64(num), c.db)
 				// if handling success then we can update the cachedHeaders
 				if err == nil {
 					c.cachedHeaders = c.cachedHeaders[:0]
@@ -201,7 +199,7 @@ func (c *MsgFetcher) fetchMissingLatestHeaders() {
 				c.reorgEndCh <- struct{}{}
 				return
 			}
-			err = c.reorgHandling(c.ctx, c.cachedHeaders[index].Number.Uint64(), c.db)
+			err = c.reorgHandling(c.ctx, c.cachedHeaders[index].Number.Int64(), c.db)
 			// if handling success then we can update the cachedHeaders
 			if err == nil {
 				c.cachedHeaders = c.cachedHeaders[:index+1]

bridge-history-api/cross_msg/fetch_missing_event.go

@@ -0,0 +1,429 @@
+package cross_msg
+
+import (
+	"context"
+	"math/big"
+
+	geth "github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/jmoiron/sqlx"
+
+	backendabi "bridge-history-api/abi"
+	"bridge-history-api/db"
+	"bridge-history-api/db/orm"
+	"bridge-history-api/utils"
+)
+
+// Todo : read from config
+var (
+	// the number of blocks fetch per round
+	FETCH_LIMIT = int64(3000)
+)
+
+// FetchAndSave is a function type that fetches events from blockchain and saves them to database
+type FetchAndSave func(ctx context.Context, client *ethclient.Client, database db.OrmFactory, from int64, to int64, addressList []common.Address) error
+
+// GetLatestProcessed is a function type that gets the latest processed block height from database
+type GetLatestProcessed func(db db.OrmFactory) (int64, error)
+type UpdateXHash func(ctx context.Context)
+
+type FetchEventWorker struct {
+	F    FetchAndSave
+	G    GetLatestProcessed
+	Name string
+}
+
+type msgHashWrapper struct {
+	msgHash common.Hash
+	txHash  common.Hash
+}
+
+func GetLatestL1ProcessedHeight(db db.OrmFactory) (int64, error) {
+	crossHeight, err := db.GetLatestL1ProcessedHeight()
+	if err != nil {
+		log.Error("failed to get L1 cross message processed height: ", "err", err)
+		return 0, err
+	}
+	relayedHeight, err := db.GetLatestRelayedHeightOnL1()
+	if err != nil {
+		log.Error("failed to get L1 relayed message processed height: ", "err", err)
+		return 0, err
+	}
+	if crossHeight > relayedHeight {
+		return crossHeight, nil
+	} else {
+		return relayedHeight, nil
+	}
+}
+
+func GetLatestL2ProcessedHeight(db db.OrmFactory) (int64, error) {
+	crossHeight, err := db.GetLatestL2ProcessedHeight()
+	if err != nil {
+		log.Error("failed to get L2 cross message processed height", "err", err)
+		return 0, err
+	}
+	relayedHeight, err := db.GetLatestRelayedHeightOnL2()
+	if err != nil {
+		log.Error("failed to get L2 relayed message processed height", "err", err)
+		return 0, err
+	}
+	if crossHeight > relayedHeight {
+		return crossHeight, nil
+	} else {
+		return relayedHeight, nil
+	}
+}
+
+func L1FetchAndSaveEvents(ctx context.Context, client *ethclient.Client, database db.OrmFactory, from int64, to int64, addrList []common.Address) error {
+
+	query := geth.FilterQuery{
+		FromBlock: big.NewInt(from), // inclusive
+		ToBlock:   big.NewInt(to),   // inclusive
+		Addresses: addrList,
+		Topics:    make([][]common.Hash, 1),
+	}
+	query.Topics[0] = make([]common.Hash, 7)
+	query.Topics[0][0] = backendabi.L1DepositETHSig
+	query.Topics[0][1] = backendabi.L1DepositERC20Sig
+	query.Topics[0][2] = backendabi.L1RelayedMessageEventSignature
+	query.Topics[0][3] = backendabi.L1SentMessageEventSignature
+	query.Topics[0][4] = backendabi.L1DepositERC721Sig
+	query.Topics[0][5] = backendabi.L1DepositERC1155Sig
+	query.Topics[0][6] = backendabi.L1DepositWETHSig
+
+	logs, err := client.FilterLogs(ctx, query)
+	if err != nil {
+		log.Warn("Failed to get l1 event logs", "err", err)
+		return err
+	}
+	depositL1CrossMsgs, msgHashes, relayedMsg, err := parseBackendL1EventLogs(logs)
+	if err != nil {
+		log.Error("l1FetchAndSaveEvents: Failed to parse cross msg event logs", "err", err)
+		return err
+	}
+	dbTx, err := database.Beginx()
+	if err != nil {
+		log.Error("l2FetchAndSaveEvents: Failed to begin db transaction", "err", err)
+		return err
+	}
+	err = database.BatchInsertL1CrossMsgDBTx(dbTx, depositL1CrossMsgs)
+	if err != nil {
+		dbTx.Rollback()
+		log.Crit("l1FetchAndSaveEvents: Failed to insert cross msg event logs", "err", err)
+	}
+
+	err = database.BatchInsertRelayedMsgDBTx(dbTx, relayedMsg)
+	if err != nil {
+		dbTx.Rollback()
+		log.Crit("l1FetchAndSaveEvents: Failed to insert relayed message event logs", "err", err)
+	}
+	err = updateL1CrossMsgMsgHash(ctx, dbTx, database, msgHashes)
+	if err != nil {
+		dbTx.Rollback()
+		log.Crit("l1FetchAndSaveEvents: Failed to update msgHash in L1 cross msg", "err", err)
+	}
+	err = dbTx.Commit()
+	if err != nil {
+		// if we can not insert into DB, there must something wrong, need a on-call member handle the dababase manually
+		dbTx.Rollback()
+		log.Error("l1FetchAndSaveEvents: Failed to commit db transaction", "err", err)
+		return err
+	}
+
+	return nil
+}
+
+func L2FetchAndSaveEvents(ctx context.Context, client *ethclient.Client, database db.OrmFactory, from int64, to int64, addrList []common.Address) error {
+	query := geth.FilterQuery{
+		FromBlock: big.NewInt(from), // inclusive
+		ToBlock:   big.NewInt(to),   // inclusive
+		Addresses: addrList,
+		Topics:    make([][]common.Hash, 1),
+	}
+	query.Topics[0] = make([]common.Hash, 7)
+	query.Topics[0][0] = backendabi.L2WithdrawETHSig
+	query.Topics[0][1] = backendabi.L2WithdrawERC20Sig
+	query.Topics[0][2] = backendabi.L2RelayedMessageEventSignature
+	query.Topics[0][3] = backendabi.L2SentMessageEventSignature
+	query.Topics[0][4] = backendabi.L2WithdrawERC721Sig
+	query.Topics[0][5] = backendabi.L2WithdrawERC1155Sig
+	query.Topics[0][6] = backendabi.L2WithdrawWETHSig
+
+	logs, err := client.FilterLogs(ctx, query)
+	if err != nil {
+		log.Warn("Failed to get l2 event logs", "err", err)
+		return err
+	}
+	depositL2CrossMsgs, msgHashes, relayedMsg, err := parseBackendL2EventLogs(logs)
+	if err != nil {
+		log.Error("l2FetchAndSaveEvents: Failed to parse cross msg event logs", "err", err)
+		return err
+	}
+	dbTx, err := database.Beginx()
+	if err != nil {
+		log.Error("l2FetchAndSaveEvents: Failed to begin db transaction", "err", err)
+		return err
+	}
+	err = database.BatchInsertL2CrossMsgDBTx(dbTx, depositL2CrossMsgs)
+	if err != nil {
+		dbTx.Rollback()
+		log.Crit("l2FetchAndSaveEvents: Failed to insert cross msg event logs", "err", err)
+	}
+
+	err = database.BatchInsertRelayedMsgDBTx(dbTx, relayedMsg)
+	if err != nil {
+		dbTx.Rollback()
+		log.Crit("l2FetchAndSaveEvents: Failed to insert relayed message event logs", "err", err)
+	}
+	err = updateL2CrossMsgMsgHash(ctx, dbTx, database, msgHashes)
+	if err != nil {
+		dbTx.Rollback()
+		log.Crit("l2FetchAndSaveEvents: Failed to update msgHash in L2 cross msg", "err", err)
+	}
+	err = dbTx.Commit()
+	if err != nil {
+		// if we can not insert into DB, there must something wrong, need a on-call member handle the dababase manually
+		dbTx.Rollback()
+		log.Error("l2FetchAndSaveEvents: Failed to commit db transaction", "err", err)
+		return err
+	}
+
+	return nil
+}
+
+func parseBackendL1EventLogs(logs []types.Log) ([]*orm.CrossMsg, []msgHashWrapper, []*orm.RelayedMsg, error) {
+	// Need use contract abi to parse event Log
+	// Can only be tested after we have our contracts set up
+
+	var l1CrossMsg []*orm.CrossMsg
+	var relayedMsgs []*orm.RelayedMsg
+	var msgHashes []msgHashWrapper
+	for _, vlog := range logs {
+		switch vlog.Topics[0] {
+		case backendabi.L1DepositETHSig:
+			event := backendabi.DepositETH{}
+			err := utils.UnpackLog(backendabi.L1ETHGatewayABI, &event, "DepositETH", vlog)
+			if err != nil {
+				log.Warn("Failed to unpack DepositETH event", "err", err)
+				return l1CrossMsg, msgHashes, relayedMsgs, err
+			}
+			l1CrossMsg = append(l1CrossMsg, &orm.CrossMsg{
+				Height:     vlog.BlockNumber,
+				Sender:     event.From.String(),
+				Target:     event.To.String(),
+				Amount:     event.Amount.String(),
+				Asset:      int(orm.ETH),
+				Layer1Hash: vlog.TxHash.Hex(),
+			})
+		case backendabi.L1DepositERC20Sig:
+			event := backendabi.ERC20MessageEvent{}
+			err := utils.UnpackLog(backendabi.L1StandardERC20GatewayABI, &event, "DepositERC20", vlog)
+			if err != nil {
+				log.Warn("Failed to unpack DepositERC20 event", "err", err)
+				return l1CrossMsg, msgHashes, relayedMsgs, err
+			}
+			l1CrossMsg = append(l1CrossMsg, &orm.CrossMsg{
+				Height:      vlog.BlockNumber,
+				Sender:      event.From.String(),
+				Target:      event.To.String(),
+				Amount:      event.Amount.String(),
+				Asset:       int(orm.ERC20),
+				Layer1Hash:  vlog.TxHash.Hex(),
+				Layer1Token: event.L1Token.Hex(),
+				Layer2Token: event.L2Token.Hex(),
+			})
+		case backendabi.L1DepositERC721Sig:
+			event := backendabi.ERC721MessageEvent{}
+			err := utils.UnpackLog(backendabi.L1ERC721GatewayABI, &event, "DepositERC721", vlog)
+			if err != nil {
+				log.Warn("Failed to unpack DepositERC721 event", "err", err)
+				return l1CrossMsg, msgHashes, relayedMsgs, err
+			}
+			l1CrossMsg = append(l1CrossMsg, &orm.CrossMsg{
+				Height:      vlog.BlockNumber,
+				Sender:      event.From.String(),
+				Target:      event.To.String(),
+				Asset:       int(orm.ERC721),
+				Layer1Hash:  vlog.TxHash.Hex(),
+				Layer1Token: event.L1Token.Hex(),
+				Layer2Token: event.L2Token.Hex(),
+				TokenID:     event.TokenID.Uint64(),
+			})
+		case backendabi.L1DepositERC1155Sig:
+			event := backendabi.ERC1155MessageEvent{}
+			err := utils.UnpackLog(backendabi.L1ERC1155GatewayABI, &event, "DepositERC1155", vlog)
+			if err != nil {
+				log.Warn("Failed to unpack DepositERC1155 event", "err", err)
+				return l1CrossMsg, msgHashes, relayedMsgs, err
+			}
+			l1CrossMsg = append(l1CrossMsg, &orm.CrossMsg{
+				Height:      vlog.BlockNumber,
+				Sender:      event.From.String(),
+				Target:      event.To.String(),
+				Asset:       int(orm.ERC1155),
+				Layer1Hash:  vlog.TxHash.Hex(),
+				Layer1Token: event.L1Token.Hex(),
+				Layer2Token: event.L2Token.Hex(),
+				TokenID:     event.TokenID.Uint64(),
+				Amount:      event.Amount.String(),
+			})
+		case backendabi.L1SentMessageEventSignature:
+			event := backendabi.L1SentMessageEvent{}
+			err := utils.UnpackLog(backendabi.L1ScrollMessengerABI, &event, "SentMessage", vlog)
+			if err != nil {
+				log.Warn("Failed to unpack SentMessage event", "err", err)
+				return l1CrossMsg, msgHashes, relayedMsgs, err
+			}
+			msgHash := utils.ComputeMessageHash(event.Sender, event.Target, event.Value, event.MessageNonce, event.Message)
+			msgHashes = append(msgHashes, msgHashWrapper{
+				msgHash: msgHash,
+				txHash:  vlog.TxHash})
+		case backendabi.L1RelayedMessageEventSignature:
+			event := backendabi.L1RelayedMessageEvent{}
+			err := utils.UnpackLog(backendabi.L1ScrollMessengerABI, &event, "RelayedMessage", vlog)
+			if err != nil {
+				log.Warn("Failed to unpack RelayedMessage event", "err", err)
+				return l1CrossMsg, msgHashes, relayedMsgs, err
+			}
+			relayedMsgs = append(relayedMsgs, &orm.RelayedMsg{
+				MsgHash:    event.MessageHash.String(),
+				Height:     vlog.BlockNumber,
+				Layer1Hash: vlog.TxHash.Hex(),
+			})
+
+		}
+
+	}
+	return l1CrossMsg, msgHashes, relayedMsgs, nil
+}
+
+func parseBackendL2EventLogs(logs []types.Log) ([]*orm.CrossMsg, []msgHashWrapper, []*orm.RelayedMsg, error) {
+	// Need use contract abi to parse event Log
+	// Can only be tested after we have our contracts set up
+
+	var l2CrossMsg []*orm.CrossMsg
+	var relayedMsgs []*orm.RelayedMsg
+	var msgHashes []msgHashWrapper
+	for _, vlog := range logs {
+		switch vlog.Topics[0] {
+		case backendabi.L2WithdrawETHSig:
+			event := backendabi.DepositETH{}
+			err := utils.UnpackLog(backendabi.L2ETHGatewayABI, &event, "WithdrawETH", vlog)
+			if err != nil {
+				log.Warn("Failed to unpack WithdrawETH event", "err", err)
+				return l2CrossMsg, msgHashes, relayedMsgs, err
+			}
+			l2CrossMsg = append(l2CrossMsg, &orm.CrossMsg{
+				Height:     vlog.BlockNumber,
+				Sender:     event.From.String(),
+				Target:     event.To.String(),
+				Amount:     event.Amount.String(),
+				Asset:      int(orm.ETH),
+				Layer2Hash: vlog.TxHash.Hex(),
+			})
+		case backendabi.L2WithdrawERC20Sig:
+			event := backendabi.ERC20MessageEvent{}
+			err := utils.UnpackLog(backendabi.L2StandardERC20GatewayABI, &event, "WithdrawERC20", vlog)
+			if err != nil {
+				log.Warn("Failed to unpack WithdrawERC20 event", "err", err)
+				return l2CrossMsg, msgHashes, relayedMsgs, err
+			}
+			l2CrossMsg = append(l2CrossMsg, &orm.CrossMsg{
+				Height:      vlog.BlockNumber,
+				Sender:      event.From.String(),
+				Target:      event.To.String(),
+				Amount:      event.Amount.String(),
+				Asset:       int(orm.ERC20),
+				Layer2Hash:  vlog.TxHash.Hex(),
+				Layer1Token: event.L1Token.Hex(),
+				Layer2Token: event.L2Token.Hex(),
+			})
+		case backendabi.L2WithdrawERC721Sig:
+			event := backendabi.ERC721MessageEvent{}
+			err := utils.UnpackLog(backendabi.L2ERC721GatewayABI, &event, "WithdrawERC721", vlog)
+			if err != nil {
+				log.Warn("Failed to unpack WithdrawERC721 event", "err", err)
+				return l2CrossMsg, msgHashes, relayedMsgs, err
+			}
+			l2CrossMsg = append(l2CrossMsg, &orm.CrossMsg{
+				Height:      vlog.BlockNumber,
+				Sender:      event.From.String(),
+				Target:      event.To.String(),
+				Asset:       int(orm.ERC721),
+				Layer2Hash:  vlog.TxHash.Hex(),
+				Layer1Token: event.L1Token.Hex(),
+				Layer2Token: event.L2Token.Hex(),
+				TokenID:     event.TokenID.Uint64(),
+			})
+		case backendabi.L2WithdrawERC1155Sig:
+			event := backendabi.ERC1155MessageEvent{}
+			err := utils.UnpackLog(backendabi.L2ERC1155GatewayABI, &event, "WithdrawERC1155", vlog)
+			if err != nil {
+				log.Warn("Failed to unpack WithdrawERC1155 event", "err", err)
+				return l2CrossMsg, msgHashes, relayedMsgs, err
+			}
+			l2CrossMsg = append(l2CrossMsg, &orm.CrossMsg{
+				Height:      vlog.BlockNumber,
+				Sender:      event.From.String(),
+				Target:      event.To.String(),
+				Asset:       int(orm.ERC1155),
+				Layer2Hash:  vlog.TxHash.Hex(),
+				Layer1Token: event.L1Token.Hex(),
+				Layer2Token: event.L2Token.Hex(),
+				TokenID:     event.TokenID.Uint64(),
+				Amount:      event.Amount.String(),
+			})
+		case backendabi.L2SentMessageEventSignature:
+			event := backendabi.L2SentMessageEvent{}
+			err := utils.UnpackLog(backendabi.L2ScrollMessengerABI, &event, "SentMessage", vlog)
+			if err != nil {
+				log.Warn("Failed to unpack SentMessage event", "err", err)
+				return l2CrossMsg, msgHashes, relayedMsgs, err
+			}
+			msgHash := utils.ComputeMessageHash(event.Sender, event.Target, event.Value, event.MessageNonce, event.Message)
+			msgHashes = append(msgHashes, msgHashWrapper{
+				msgHash: msgHash,
+				txHash:  vlog.TxHash})
+		case backendabi.L2RelayedMessageEventSignature:
+			event := backendabi.L2RelayedMessageEvent{}
+			err := utils.UnpackLog(backendabi.L2ScrollMessengerABI, &event, "RelayedMessage", vlog)
+			if err != nil {
+				log.Warn("Failed to unpack RelayedMessage event", "err", err)
+				return l2CrossMsg, msgHashes, relayedMsgs, err
+			}
+			relayedMsgs = append(relayedMsgs, &orm.RelayedMsg{
+				MsgHash:    event.MessageHash.String(),
+				Height:     vlog.BlockNumber,
+				Layer2Hash: vlog.TxHash.Hex(),
+			})
+
+		}
+
+	}
+	return l2CrossMsg, msgHashes, relayedMsgs, nil
+}
+
+func updateL1CrossMsgMsgHash(ctx context.Context, dbTx *sqlx.Tx, database db.OrmFactory, msgHashes []msgHashWrapper) error {
+	for _, msgHash := range msgHashes {
+		err := database.UpdateL1CrossMsgHashDBTx(ctx, dbTx, msgHash.txHash, msgHash.msgHash)
+		if err != nil {
+			log.Error("updateL1CrossMsgMsgHash: can not update layer1 cross msg MsgHash", "layer1 hash", msgHash.txHash, "err", err)
+			continue
+		}
+	}
+	return nil
+}
+
+func updateL2CrossMsgMsgHash(ctx context.Context, dbTx *sqlx.Tx, database db.OrmFactory, msgHashes []msgHashWrapper) error {
+	for _, msgHash := range msgHashes {
+		err := database.UpdateL2CrossMsgHashDBTx(ctx, dbTx, msgHash.txHash, msgHash.msgHash)
+		if err != nil {
+			log.Error("updateL2CrossMsgMsgHash: can not update layer2 cross msg MsgHash", "layer2 hash", msgHash.txHash, "err", err)
+			continue
+		}
+	}
+	return nil
+}

bridge-history-api/cross_msg/msg_fetcher_test.go

@@ -1,6 +1,7 @@
-package crossmsg_test
+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/crossmsg"
 )
 
 func TestMergeIntoList(t *testing.T) {
@@ -18,7 +17,7 @@ func TestMergeIntoList(t *testing.T) {
 	assert.Equal(t, headers[0].Hash(), headers[1].ParentHash)
 	headers2, err := generateHeaders(18)
 	assert.NoError(t, err)
-	result := crossmsg.MergeAddIntoHeaderList(headers, headers2, 64)
+	result := cross_msg.MergeAddIntoHeaderList(headers, headers2, 64)
 	assert.Equal(t, 64, len(result))
 	assert.Equal(t, headers2[len(headers2)-1], result[len(result)-1])
 	assert.NotEqual(t, headers[0], result[0])
@@ -53,7 +52,7 @@ func generateHeaders(amount int) ([]*types.Header, error) {
 			Time:        uint64(i * 15),
 			Extra:       []byte{},
 			MixDigest:   common.Hash{},
-			Nonce:       types.EncodeNonce(nonce.Uint64()),
+			Nonce:       types.EncodeNonce(uint64(nonce.Uint64())),
 		}
 		headers[i] = header
 	}

bridge-history-api/cross_msg/reorg_handle.go

@@ -0,0 +1,104 @@
+package cross_msg
+
+import (
+	"context"
+
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/ethclient"
+	"github.com/ethereum/go-ethereum/log"
+
+	"bridge-history-api/db"
+)
+
+type ReorgHandling func(ctx context.Context, reorgHeight int64, db db.OrmFactory) error
+
+func reverseArray(arr []*types.Header) []*types.Header {
+	for i := 0; i < len(arr)/2; i++ {
+		j := len(arr) - i - 1
+		arr[i], arr[j] = arr[j], arr[i]
+	}
+	return arr
+}
+
+func IsParentAndChild(parentHeader *types.Header, header *types.Header) bool {
+	return header.ParentHash == parentHeader.Hash()
+}
+
+func MergeAddIntoHeaderList(baseArr, extraArr []*types.Header, maxLength int) []*types.Header {
+	mergedArr := append(baseArr, extraArr...)
+	if len(mergedArr) <= maxLength {
+		return mergedArr
+	}
+
+	startIndex := len(mergedArr) - maxLength
+	return mergedArr[startIndex:]
+}
+
+func BackwardFindReorgBlock(ctx context.Context, headers []*types.Header, client *ethclient.Client, header *types.Header) (int, bool, []*types.Header) {
+	maxStep := len(headers)
+	backwardHeaderList := []*types.Header{header}
+	for iterRound := 0; iterRound < maxStep; iterRound++ {
+		header, err := client.HeaderByHash(ctx, header.ParentHash)
+		if err != nil {
+			log.Error("BackwardFindReorgBlock failed", "error", err)
+			return -1, false, nil
+		}
+		backwardHeaderList = append(backwardHeaderList, header)
+		for j := len(headers) - 1; j >= 0; j-- {
+			if IsParentAndChild(headers[j], header) {
+				backwardHeaderList = reverseArray(backwardHeaderList)
+				return j, true, backwardHeaderList
+			}
+		}
+	}
+	return -1, false, nil
+}
+
+func L1ReorgHandling(ctx context.Context, reorgHeight int64, db db.OrmFactory) error {
+	dbTx, err := db.Beginx()
+	if err != nil {
+		log.Crit("begin db tx failed", "err", err)
+	}
+	err = db.DeleteL1CrossMsgAfterHeightDBTx(dbTx, reorgHeight)
+	if err != nil {
+		dbTx.Rollback()
+		log.Crit("delete l1 cross msg from height", "height", reorgHeight, "err", err)
+	}
+	err = db.DeleteL1RelayedHashAfterHeightDBTx(dbTx, reorgHeight)
+	if err != nil {
+		dbTx.Rollback()
+		log.Crit("delete l1 relayed hash from height", "height", reorgHeight, "err", err)
+	}
+	err = dbTx.Commit()
+	if err != nil {
+		dbTx.Rollback()
+		log.Error("commit tx failed", "err", err)
+		return err
+	}
+	return nil
+}
+
+func L2ReorgHandling(ctx context.Context, reorgHeight int64, db db.OrmFactory) error {
+	dbTx, err := db.Beginx()
+	if err != nil {
+		dbTx.Rollback()
+		log.Crit("begin db tx failed", "err", err)
+	}
+	err = db.DeleteL2CrossMsgFromHeightDBTx(dbTx, reorgHeight)
+	if err != nil {
+		dbTx.Rollback()
+		log.Crit("delete l2 cross msg from height", "height", reorgHeight, "err", err)
+	}
+	err = db.DeleteL2RelayedHashAfterHeightDBTx(dbTx, reorgHeight)
+	if err != nil {
+		dbTx.Rollback()
+		log.Crit("delete l2 relayed hash from height", "height", reorgHeight, "err", err)
+	}
+	err = dbTx.Commit()
+	if err != nil {
+		dbTx.Rollback()
+		log.Error("commit tx failed", "err", err)
+		return err
+	}
+	return nil
+}

bridge-history-api/crossmsg/batch_info_fetcher.go

@@ -1,116 +0,0 @@
-package crossmsg
-
-import (
-	"context"
-	"time"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/ethereum/go-ethereum/log"
-	"gorm.io/gorm"
-
-	"bridge-history-api/crossmsg/messageproof"
-	"bridge-history-api/orm"
-	"bridge-history-api/utils"
-)
-
-// BatchInfoFetcher fetches batch info from l1 chain and update db
-type BatchInfoFetcher struct {
-	ctx                  context.Context
-	scrollChainAddr      common.Address
-	batchInfoStartNumber uint64
-	confirmation         uint64
-	blockTimeInSec       int
-	client               *ethclient.Client
-	db                   *gorm.DB
-	rollupOrm            *orm.RollupBatch
-	msgProofUpdater      *messageproof.MsgProofUpdater
-}
-
-// NewBatchInfoFetcher creates a new BatchInfoFetcher instance
-func NewBatchInfoFetcher(ctx context.Context, scrollChainAddr common.Address, batchInfoStartNumber uint64, confirmation uint64, blockTimeInSec int, client *ethclient.Client, db *gorm.DB, msgProofUpdater *messageproof.MsgProofUpdater) *BatchInfoFetcher {
-	return &BatchInfoFetcher{
-		ctx:                  ctx,
-		scrollChainAddr:      scrollChainAddr,
-		batchInfoStartNumber: batchInfoStartNumber,
-		confirmation:         confirmation,
-		blockTimeInSec:       blockTimeInSec,
-		client:               client,
-		db:                   db,
-		rollupOrm:            orm.NewRollupBatch(db),
-		msgProofUpdater:      msgProofUpdater,
-	}
-}
-
-// Start the BatchInfoFetcher
-func (b *BatchInfoFetcher) Start() {
-	log.Info("BatchInfoFetcher Start")
-	// Fetch batch info at beginning
-	// Then start msg proof updater after db have some bridge batch
-	err := b.fetchBatchInfo()
-	if err != nil {
-		log.Error("fetch batch info at beginning failed: ", "err", err)
-	}
-
-	go b.msgProofUpdater.Start()
-
-	go func() {
-		tick := time.NewTicker(time.Duration(b.blockTimeInSec) * time.Second)
-		for {
-			select {
-			case <-b.ctx.Done():
-				tick.Stop()
-				return
-			case <-tick.C:
-				err := b.fetchBatchInfo()
-				if err != nil {
-					log.Error("fetch batch info failed: ", "err", err)
-				}
-			}
-		}
-	}()
-}
-
-// Stop the BatchInfoFetcher and call msg proof updater to stop
-func (b *BatchInfoFetcher) Stop() {
-	log.Info("BatchInfoFetcher Stop")
-	b.msgProofUpdater.Stop()
-}
-
-func (b *BatchInfoFetcher) fetchBatchInfo() error {
-	number, err := utils.GetSafeBlockNumber(b.ctx, b.client, b.confirmation)
-	if err != nil {
-		log.Error("Can not get latest block number: ", "err", err)
-		return err
-	}
-	latestBatchHeight, err := b.rollupOrm.GetLatestRollupBatchProcessedHeight(b.ctx)
-	if err != nil {
-		log.Error("Can not get latest BatchInfo: ", "err", err)
-		return err
-	}
-	var startHeight uint64
-	if latestBatchHeight == 0 {
-		log.Info("no batch record in database, start from batchInfoStartNumber", "batchInfoStartNumber", b.batchInfoStartNumber)
-		startHeight = b.batchInfoStartNumber
-	} else {
-		startHeight = latestBatchHeight + 1
-	}
-	if startHeight < b.batchInfoStartNumber {
-		startHeight = b.batchInfoStartNumber
-	}
-	for from := startHeight; number >= from; from += fetchLimit {
-		to := from + fetchLimit - 1
-		// number - confirmation can never less than 0 since the for loop condition
-		// but watch out the overflow
-		if to > number {
-			to = number
-		}
-		// filter logs to fetch batches
-		err = FetchAndSaveBatchIndex(b.ctx, b.client, b.db, int64(from), int64(to), b.scrollChainAddr)
-		if err != nil {
-			log.Error("Can not fetch and save from chain: ", "err", err)
-			return err
-		}
-	}
-	return nil
-}

bridge-history-api/crossmsg/block_timestamp_fetcher.go

@@ -1,85 +0,0 @@
-package crossmsg
-
-import (
-	"context"
-	"math/big"
-	"time"
-
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/ethereum/go-ethereum/log"
-)
-
-// GetEarliestNoBlockTimestampHeightFunc is a function type that gets the earliest record without block timestamp from database
-type GetEarliestNoBlockTimestampHeightFunc func(ctx context.Context) (uint64, error)
-
-// UpdateBlockTimestampFunc is a function type that updates block timestamp into database
-type UpdateBlockTimestampFunc func(ctx context.Context, height uint64, timestamp time.Time) error
-
-// BlockTimestampFetcher fetches block timestamp from blockchain and saves them to database
-type BlockTimestampFetcher struct {
-	ctx                                   context.Context
-	confirmation                          uint64
-	blockTimeInSec                        int
-	client                                *ethclient.Client
-	updateBlockTimestampFunc              UpdateBlockTimestampFunc
-	getEarliestNoBlockTimestampHeightFunc GetEarliestNoBlockTimestampHeightFunc
-}
-
-// NewBlockTimestampFetcher creates a new BlockTimestampFetcher instance
-func NewBlockTimestampFetcher(ctx context.Context, confirmation uint64, blockTimeInSec int, client *ethclient.Client, updateBlockTimestampFunc UpdateBlockTimestampFunc, getEarliestNoBlockTimestampHeightFunc GetEarliestNoBlockTimestampHeightFunc) *BlockTimestampFetcher {
-	return &BlockTimestampFetcher{
-		ctx:                                   ctx,
-		confirmation:                          confirmation,
-		blockTimeInSec:                        blockTimeInSec,
-		client:                                client,
-		getEarliestNoBlockTimestampHeightFunc: getEarliestNoBlockTimestampHeightFunc,
-		updateBlockTimestampFunc:              updateBlockTimestampFunc,
-	}
-}
-
-// Start the BlockTimestampFetcher
-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(b.ctx)
-				if err != nil {
-					log.Error("Can not get latest record without block timestamp", "err", err)
-					continue
-				}
-				for height := startHeight; number >= height+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(b.ctx, height, time.Unix(int64(block.Time), 0))
-					if err != nil {
-						log.Error("Can not update blockTimestamp into DB ", "err", err)
-						break
-					}
-					height, err = b.getEarliestNoBlockTimestampHeightFunc(b.ctx)
-					if err != nil {
-						log.Error("Can not get latest record without block timestamp", "err", err)
-						break
-					}
-				}
-			}
-		}
-	}()
-}
-
-// Stop the BlockTimestampFetcher and log the info
-func (b *BlockTimestampFetcher) Stop() {
-	log.Info("BlockTimestampFetcher Stop")
-}

bridge-history-api/crossmsg/fetch_missing_event.go

@@ -1,213 +0,0 @@
-package crossmsg
-
-import (
-	"context"
-	"math/big"
-
-	geth "github.com/ethereum/go-ethereum"
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/ethereum/go-ethereum/log"
-	"gorm.io/gorm"
-
-	backendabi "bridge-history-api/abi"
-	"bridge-history-api/orm"
-	"bridge-history-api/utils"
-)
-
-// Todo : read from config
-var (
-	// the number of blocks fetch per round
-	fetchLimit = uint64(3000)
-)
-
-// FetchAndSave is a function type that fetches events from blockchain and saves them to database
-type FetchAndSave func(ctx context.Context, client *ethclient.Client, database *gorm.DB, from int64, to int64, addressList []common.Address) error
-
-// GetLatestProcessed is a function type that gets the latest processed block height from database
-type GetLatestProcessed func(ctx context.Context, db *gorm.DB) (uint64, error)
-
-// FetchEventWorker defines worker with fetch and save function, processed number getter, and name
-type FetchEventWorker struct {
-	F    FetchAndSave
-	G    GetLatestProcessed
-	Name string
-}
-
-// GetLatestL1ProcessedHeight get L1 the latest processed height
-func GetLatestL1ProcessedHeight(ctx context.Context, db *gorm.DB) (uint64, error) {
-	l1CrossMsgOrm := orm.NewCrossMsg(db)
-	relayedOrm := orm.NewRelayedMsg(db)
-	crossHeight, err := l1CrossMsgOrm.GetLatestL1ProcessedHeight(ctx)
-	if err != nil {
-		log.Error("failed to get L1 cross message processed height: ", "err", err)
-		return 0, err
-	}
-	relayedHeight, err := relayedOrm.GetLatestRelayedHeightOnL1(ctx)
-	if err != nil {
-		log.Error("failed to get L1 relayed message processed height: ", "err", err)
-		return 0, err
-	}
-	if crossHeight > relayedHeight {
-		return crossHeight, nil
-	}
-	return relayedHeight, nil
-}
-
-// GetLatestL2ProcessedHeight get L2 latest processed height
-func GetLatestL2ProcessedHeight(ctx context.Context, db *gorm.DB) (uint64, error) {
-	l2CrossMsgOrm := orm.NewCrossMsg(db)
-	relayedOrm := orm.NewRelayedMsg(db)
-	l2SentMsgOrm := orm.NewL2SentMsg(db)
-	crossHeight, err := l2CrossMsgOrm.GetLatestL2ProcessedHeight(ctx)
-	if err != nil {
-		log.Error("failed to get L2 cross message processed height", "err", err)
-		return 0, err
-	}
-	relayedHeight, err := relayedOrm.GetLatestRelayedHeightOnL2(ctx)
-	if err != nil {
-		log.Error("failed to get L2 relayed message processed height", "err", err)
-		return 0, err
-	}
-	l2SentHeight, err := l2SentMsgOrm.GetLatestSentMsgHeightOnL2(ctx)
-	if err != nil {
-		log.Error("failed to get L2 sent message processed height", "err", err)
-		return 0, err
-	}
-	maxHeight := crossHeight
-	if maxHeight < relayedHeight {
-		maxHeight = relayedHeight
-	}
-	if maxHeight < l2SentHeight {
-		maxHeight = l2SentHeight
-	}
-	return maxHeight, nil
-}
-
-// L1FetchAndSaveEvents fetch and save events on L1
-func L1FetchAndSaveEvents(ctx context.Context, client *ethclient.Client, db *gorm.DB, from int64, to int64, addrList []common.Address) error {
-	l1CrossMsgOrm := orm.NewCrossMsg(db)
-	relayedOrm := orm.NewRelayedMsg(db)
-	query := geth.FilterQuery{
-		FromBlock: big.NewInt(from), // inclusive
-		ToBlock:   big.NewInt(to),   // inclusive
-		Addresses: addrList,
-		Topics:    make([][]common.Hash, 1),
-	}
-	query.Topics[0] = make([]common.Hash, 7)
-	query.Topics[0][0] = backendabi.L1DepositETHSig
-	query.Topics[0][1] = backendabi.L1DepositERC20Sig
-	query.Topics[0][2] = backendabi.L1RelayedMessageEventSignature
-	query.Topics[0][3] = backendabi.L1SentMessageEventSignature
-	query.Topics[0][4] = backendabi.L1DepositERC721Sig
-	query.Topics[0][5] = backendabi.L1DepositERC1155Sig
-	query.Topics[0][6] = backendabi.L1DepositWETHSig
-
-	logs, err := client.FilterLogs(ctx, query)
-	if err != nil {
-		log.Warn("Failed to get l1 event logs", "err", err)
-		return err
-	}
-	depositL1CrossMsgs, relayedMsg, err := utils.ParseBackendL1EventLogs(logs)
-	if err != nil {
-		log.Error("l1FetchAndSaveEvents: Failed to parse cross msg event logs", "err", err)
-		return err
-	}
-	err = db.Transaction(func(tx *gorm.DB) error {
-		if txErr := l1CrossMsgOrm.InsertL1CrossMsg(ctx, depositL1CrossMsgs, tx); txErr != nil {
-			log.Error("l1FetchAndSaveEvents: Failed to insert cross msg event logs", "err", txErr)
-			return txErr
-		}
-		if txErr := relayedOrm.InsertRelayedMsg(ctx, relayedMsg, tx); txErr != nil {
-			log.Error("l1FetchAndSaveEvents: Failed to insert relayed msg event logs", "err", txErr)
-			return txErr
-		}
-		return nil
-	})
-	if err != nil {
-		log.Crit("l2FetchAndSaveEvents: Failed to finish transaction", "err", err)
-	}
-	return err
-}
-
-// L2FetchAndSaveEvents fetche and save events on L2
-func L2FetchAndSaveEvents(ctx context.Context, client *ethclient.Client, db *gorm.DB, from int64, to int64, addrList []common.Address) error {
-	l2CrossMsgOrm := orm.NewCrossMsg(db)
-	relayedOrm := orm.NewRelayedMsg(db)
-	l2SentMsgOrm := orm.NewL2SentMsg(db)
-	query := geth.FilterQuery{
-		FromBlock: big.NewInt(from), // inclusive
-		ToBlock:   big.NewInt(to),   // inclusive
-		Addresses: addrList,
-		Topics:    make([][]common.Hash, 1),
-	}
-	query.Topics[0] = make([]common.Hash, 7)
-	query.Topics[0][0] = backendabi.L2WithdrawETHSig
-	query.Topics[0][1] = backendabi.L2WithdrawERC20Sig
-	query.Topics[0][2] = backendabi.L2RelayedMessageEventSignature
-	query.Topics[0][3] = backendabi.L2SentMessageEventSignature
-	query.Topics[0][4] = backendabi.L2WithdrawERC721Sig
-	query.Topics[0][5] = backendabi.L2WithdrawERC1155Sig
-	query.Topics[0][6] = backendabi.L2WithdrawWETHSig
-
-	logs, err := client.FilterLogs(ctx, query)
-	if err != nil {
-		log.Warn("Failed to get l2 event logs", "err", err)
-		return err
-	}
-	depositL2CrossMsgs, relayedMsg, l2SentMsgs, err := utils.ParseBackendL2EventLogs(logs)
-	if err != nil {
-		log.Error("l2FetchAndSaveEvents: Failed to parse cross msg event logs", "err", err)
-		return err
-	}
-
-	err = db.Transaction(func(tx *gorm.DB) error {
-		if txErr := l2CrossMsgOrm.InsertL2CrossMsg(ctx, depositL2CrossMsgs, tx); txErr != nil {
-			log.Error("l2FetchAndSaveEvents: Failed to insert cross msg event logs", "err", txErr)
-			return txErr
-		}
-
-		if txErr := relayedOrm.InsertRelayedMsg(ctx, relayedMsg, tx); txErr != nil {
-			log.Error("l2FetchAndSaveEvents: Failed to insert relayed message event logs", "err", txErr)
-			return txErr
-		}
-
-		if txErr := l2SentMsgOrm.InsertL2SentMsg(ctx, l2SentMsgs, tx); txErr != nil {
-			log.Error("l2FetchAndSaveEvents: Failed to insert l2 sent message", "err", txErr)
-			return txErr
-		}
-		return nil
-	})
-	if err != nil {
-		log.Crit("l2FetchAndSaveEvents: Failed to begin db transaction", "err", err)
-	}
-	return err
-}
-
-// FetchAndSaveBatchIndex fetche and save batch index
-func FetchAndSaveBatchIndex(ctx context.Context, client *ethclient.Client, db *gorm.DB, from int64, to int64, scrollChainAddr common.Address) error {
-	rollupBatchOrm := orm.NewRollupBatch(db)
-	query := geth.FilterQuery{
-		FromBlock: big.NewInt(from), // inclusive
-		ToBlock:   big.NewInt(to),   // inclusive
-		Addresses: []common.Address{scrollChainAddr},
-		Topics:    make([][]common.Hash, 1),
-	}
-	query.Topics[0] = make([]common.Hash, 1)
-	query.Topics[0][0] = backendabi.L1CommitBatchEventSignature
-	logs, err := client.FilterLogs(ctx, query)
-	if err != nil {
-		log.Warn("Failed to get batch commit event logs", "err", err)
-		return err
-	}
-	rollupBatches, err := utils.ParseBatchInfoFromScrollChain(ctx, client, logs)
-	if err != nil {
-		log.Error("FetchAndSaveBatchIndex: Failed to parse batch commit msg event logs", "err", err)
-		return err
-	}
-	if txErr := rollupBatchOrm.InsertRollupBatch(ctx, rollupBatches); txErr != nil {
-		log.Crit("FetchAndSaveBatchIndex: Failed to insert batch commit msg event logs", "err", txErr)
-		return txErr
-	}
-	return nil
-}

bridge-history-api/crossmsg/messageproof/msg_proof_updater.go

@@ -1,249 +0,0 @@
-package messageproof
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
-	"gorm.io/gorm"
-
-	"bridge-history-api/orm"
-)
-
-// MsgProofUpdater is used to update message proof in db
-type MsgProofUpdater struct {
-	ctx          context.Context
-	db           *gorm.DB
-	l2SentMsgOrm *orm.L2SentMsg
-	rollupOrm    *orm.RollupBatch
-	withdrawTrie *WithdrawTrie
-}
-
-// NewMsgProofUpdater new MsgProofUpdater instance
-func NewMsgProofUpdater(ctx context.Context, confirmations uint64, startBlock uint64, db *gorm.DB) *MsgProofUpdater {
-	return &MsgProofUpdater{
-		ctx:          ctx,
-		db:           db,
-		l2SentMsgOrm: orm.NewL2SentMsg(db),
-		rollupOrm:    orm.NewRollupBatch(db),
-		withdrawTrie: NewWithdrawTrie(),
-	}
-}
-
-// Start the MsgProofUpdater
-func (m *MsgProofUpdater) Start() {
-	log.Info("MsgProofUpdater Start")
-	m.initialize(m.ctx)
-	go func() {
-		tick := time.NewTicker(10 * time.Second)
-		for {
-			select {
-			case <-m.ctx.Done():
-				tick.Stop()
-				return
-			case <-tick.C:
-				latestBatch, err := m.rollupOrm.GetLatestRollupBatch(m.ctx)
-				if err != nil {
-					log.Warn("MsgProofUpdater: Can not get latest RollupBatch: ", "err", err)
-					continue
-				}
-				if latestBatch == nil {
-					continue
-				}
-				latestBatchIndexWithProof, err := m.l2SentMsgOrm.GetLatestL2SentMsgBatchIndex(m.ctx)
-				if err != nil {
-					log.Error("MsgProofUpdater: Can not get latest L2SentMsgBatchIndex: ", "err", err)
-					continue
-				}
-				log.Info("latest batch with proof", "batch_index", latestBatchIndexWithProof)
-				var start uint64
-				if latestBatchIndexWithProof < 0 {
-					start = 1
-				} else {
-					start = uint64(latestBatchIndexWithProof) + 1
-				}
-				for i := start; i <= latestBatch.BatchIndex; i++ {
-					batch, err := m.rollupOrm.GetRollupBatchByIndex(m.ctx, i)
-					if err != nil {
-						log.Error("MsgProofUpdater: Can not get RollupBatch: ", "err", err, "index", i)
-						break
-					}
-					// get all l2 messages in this batch
-					msgs, proofs, err := m.appendL2Messages(batch.StartBlockNumber, batch.EndBlockNumber)
-					if err != nil {
-						log.Error("MsgProofUpdater: can not append l2messages", "startBlockNumber", batch.StartBlockNumber, "endBlockNumber", batch.EndBlockNumber, "err", err)
-						break
-					}
-					// here we update batch withdraw root
-					err = m.rollupOrm.UpdateRollupBatchWithdrawRoot(m.ctx, batch.BatchIndex, m.withdrawTrie.MessageRoot().Hex())
-					if err != nil {
-						// if failed better restart the binary
-						log.Error("MsgProofUpdater: can not update batch withdraw root", "err", err)
-						break
-					}
-					err = m.updateMsgProof(msgs, proofs, batch.BatchIndex)
-					if err != nil {
-						// if failed better restart the binary
-						log.Error("MsgProofUpdater: can not update msg proof", "err", err)
-						break
-					}
-				}
-
-			}
-		}
-	}()
-
-}
-
-// Stop the MsgProofUpdater
-func (m *MsgProofUpdater) Stop() {
-	log.Info("MsgProofUpdater Stop")
-}
-
-func (m *MsgProofUpdater) initialize(ctx context.Context) {
-	for {
-		select {
-		case <-ctx.Done():
-			return
-		default:
-			err := m.initializeWithdrawTrie()
-			if err != nil {
-				log.Error("can not initialize withdraw trie", "err", err)
-				// give it some time to retry
-				time.Sleep(10 * time.Second)
-				continue
-			}
-			return
-		}
-	}
-}
-
-func (m *MsgProofUpdater) initializeWithdrawTrie() error {
-	var batch *orm.RollupBatch
-	firstMsg, err := m.l2SentMsgOrm.GetL2SentMessageByNonce(m.ctx, 0)
-	if err != nil {
-		return fmt.Errorf("failed to get first l2 message: %v", err)
-	}
-	// no l2 message
-	// 	TO DO: check if we really dont have l2 sent message with nonce 0
-	if firstMsg == nil {
-		log.Info("No first l2sentmsg in db")
-		return nil
-	}
-
-	// if no batch, return and wait for next try round
-	batch, err = m.rollupOrm.GetLatestRollupBatch(m.ctx)
-	if err != nil {
-		return fmt.Errorf("failed to get latest batch: %v", err)
-	}
-	if batch == nil {
-		return fmt.Errorf("no batch found")
-	}
-
-	var batches []*orm.RollupBatch
-	batchIndex := batch.BatchIndex
-	for {
-		var msg *orm.L2SentMsg
-		msg, err = m.l2SentMsgOrm.GetLatestL2SentMsgLEHeight(m.ctx, batch.EndBlockNumber)
-		if err != nil {
-			log.Warn("failed to get l2 sent message less than height", "endBlocknum", batch.EndBlockNumber, "err", err)
-		}
-		if msg != nil && msg.MsgProof != "" {
-			log.Info("Found latest l2 sent msg with proof: ", "msg_proof", msg.MsgProof, "height", msg.Height, "msg_hash", msg.MsgHash)
-			// initialize withdrawTrie
-			proofBytes := common.Hex2Bytes(msg.MsgProof)
-			m.withdrawTrie.Initialize(msg.Nonce, common.HexToHash(msg.MsgHash), proofBytes)
-			break
-		}
-
-		// append unprocessed batch
-		batches = append(batches, batch)
-
-		if batchIndex == 1 {
-			// otherwise overflow
-			// and batchIndex 0 is not in DB
-			// To Do: check if we dont have batch with index 0 in future
-			break
-		}
-		// iterate for next batch
-		batchIndex--
-
-		batch, err = m.rollupOrm.GetRollupBatchByIndex(m.ctx, batchIndex)
-		if err != nil || batch == nil {
-			return fmt.Errorf("failed to get block batch %v: %v", batchIndex, err)
-		}
-	}
-
-	log.Info("Build withdraw trie with pending messages")
-	for i := len(batches) - 1; i >= 0; i-- {
-		b := batches[i]
-		msgs, proofs, err := m.appendL2Messages(b.StartBlockNumber, b.EndBlockNumber)
-		if err != nil {
-			return err
-		}
-		err = m.rollupOrm.UpdateRollupBatchWithdrawRoot(m.ctx, b.BatchIndex, m.withdrawTrie.MessageRoot().Hex())
-		if err != nil {
-			return err
-		}
-		err = m.updateMsgProof(msgs, proofs, b.BatchIndex)
-		if err != nil {
-			return err
-		}
-	}
-	log.Info("Build withdraw trie finished")
-
-	return nil
-}
-
-func (m *MsgProofUpdater) updateMsgProof(msgs []*orm.L2SentMsg, proofs [][]byte, batchIndex uint64) error {
-	if len(msgs) == 0 {
-		return nil
-	}
-	// this should not happen, but double check
-	if len(msgs) != len(proofs) {
-		return fmt.Errorf("illegal state: len(msgs) != len(proofs)")
-	}
-	err := m.db.Transaction(func(tx *gorm.DB) error {
-		for i, msg := range msgs {
-			proofHex := common.Bytes2Hex(proofs[i])
-			log.Debug("updateMsgProof", "msgHash", msg.MsgHash, "batchIndex", batchIndex, "proof", proofHex)
-			if err := m.l2SentMsgOrm.UpdateL2MessageProof(m.ctx, msg.MsgHash, proofHex, batchIndex, tx); err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// appendL2Messages will append all messages between firstBlock and lastBlock (both inclusive) to withdrawTrie and compute corresponding merkle proof of each message.
-func (m *MsgProofUpdater) appendL2Messages(firstBlock, lastBlock uint64) ([]*orm.L2SentMsg, [][]byte, error) {
-	var msgProofs [][]byte
-	messages, err := m.l2SentMsgOrm.GetL2SentMsgMsgHashByHeightRange(m.ctx, firstBlock, lastBlock)
-	if err != nil {
-		log.Error("GetL2SentMsgMsgHashByHeightRange failed", "error", err, "firstBlock", firstBlock, "lastBlock", lastBlock)
-		return messages, msgProofs, err
-	}
-	if len(messages) == 0 {
-		return messages, msgProofs, nil
-	}
-
-	// double check whether nonce is matched
-	if messages[0].Nonce != m.withdrawTrie.NextMessageNonce {
-		log.Error("L2 message nonce mismatch", "expected", m.withdrawTrie.NextMessageNonce, "found", messages[0].Nonce)
-		return messages, msgProofs, fmt.Errorf("l2 message nonce mismatch, expected: %v, found: %v", m.withdrawTrie.NextMessageNonce, messages[0].Nonce)
-	}
-
-	var hashes []common.Hash
-	for _, msg := range messages {
-		hashes = append(hashes, common.HexToHash(msg.MsgHash))
-	}
-	msgProofs = m.withdrawTrie.AppendMessages(hashes)
-
-	return messages, msgProofs, nil
-}

bridge-history-api/crossmsg/messageproof/withdraw_trie.go

@@ -1,189 +0,0 @@
-package messageproof
-
-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/crossmsg/messageproof/withdraw_trie_test.go

@@ -1,212 +0,0 @@
-package messageproof
-
-import (
-	"math/big"
-	"testing"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/stretchr/testify/assert"
-
-	"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])
-	}
-
-	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())
-	}
-
-	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())
-	}
-
-	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())
-	}
-
-	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 := 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 := 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 := UpdateBranchWithNewMessage(zeroes, branches, 0, common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000001"))
-	tmpBranches := 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 = UpdateBranchWithNewMessage(zeroes, branches, 1, common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000002"))
-	tmpBranches = 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 = UpdateBranchWithNewMessage(zeroes, branches, 2, common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000003"))
-	tmpBranches = 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 = UpdateBranchWithNewMessage(zeroes, branches, 3, common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000004"))
-	tmpBranches = 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 := 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 := 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 := 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 := 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/crossmsg/reorg_handle.go

@@ -1,108 +0,0 @@
-package crossmsg
-
-import (
-	"context"
-
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/ethereum/go-ethereum/log"
-	"gorm.io/gorm"
-
-	"bridge-history-api/orm"
-)
-
-// ReorgHandling handles reorg function type
-type ReorgHandling func(ctx context.Context, reorgHeight uint64, db *gorm.DB) error
-
-func reverseArray(arr []*types.Header) []*types.Header {
-	for i := 0; i < len(arr)/2; i++ {
-		j := len(arr) - i - 1
-		arr[i], arr[j] = arr[j], arr[i]
-	}
-	return arr
-}
-
-// IsParentAndChild match the child header ParentHash with parent header Hash
-func IsParentAndChild(parentHeader *types.Header, header *types.Header) bool {
-	return header.ParentHash == parentHeader.Hash()
-}
-
-// MergeAddIntoHeaderList merges two header lists, if exceed the max length then drop the oldest entries
-func MergeAddIntoHeaderList(baseArr, extraArr []*types.Header, maxLength int) []*types.Header {
-	mergedArr := append(baseArr, extraArr...)
-	if len(mergedArr) <= maxLength {
-		return mergedArr
-	}
-
-	startIndex := len(mergedArr) - maxLength
-	return mergedArr[startIndex:]
-}
-
-// BackwardFindReorgBlock finds the reorg block by backward search
-func BackwardFindReorgBlock(ctx context.Context, headers []*types.Header, client *ethclient.Client, lastHeader *types.Header) (int, bool, []*types.Header) {
-	maxStep := len(headers)
-	backwardHeaderList := []*types.Header{lastHeader}
-	for iterRound := 0; iterRound < maxStep; iterRound++ {
-		header, err := client.HeaderByHash(ctx, lastHeader.ParentHash)
-		if err != nil {
-			log.Error("BackwardFindReorgBlock failed", "error", err)
-			return -1, false, nil
-		}
-		backwardHeaderList = append(backwardHeaderList, header)
-		for j := len(headers) - 1; j >= 0; j-- {
-			if IsParentAndChild(headers[j], header) {
-				backwardHeaderList = reverseArray(backwardHeaderList)
-				return j, true, backwardHeaderList
-			}
-		}
-		lastHeader = header
-	}
-	return -1, false, nil
-}
-
-// L1ReorgHandling handles l1 reorg
-func L1ReorgHandling(ctx context.Context, reorgHeight uint64, db *gorm.DB) error {
-	l1CrossMsgOrm := orm.NewCrossMsg(db)
-	relayedOrm := orm.NewRelayedMsg(db)
-	err := db.Transaction(func(tx *gorm.DB) error {
-		if err := l1CrossMsgOrm.DeleteL1CrossMsgAfterHeight(ctx, reorgHeight, tx); err != nil {
-			log.Error("delete l1 cross msg from height", "height", reorgHeight, "err", err)
-			return err
-		}
-		if err := relayedOrm.DeleteL1RelayedHashAfterHeight(ctx, reorgHeight, tx); err != nil {
-			log.Error("delete l1 relayed msg from height", "height", reorgHeight, "err", err)
-			return err
-		}
-		return nil
-	})
-	if err != nil {
-		log.Crit("l1 reorg handling failed", "err", err)
-	}
-	return err
-}
-
-// L2ReorgHandling handles l2 reorg
-func L2ReorgHandling(ctx context.Context, reorgHeight uint64, db *gorm.DB) error {
-	l2CrossMsgOrm := orm.NewCrossMsg(db)
-	relayedOrm := orm.NewRelayedMsg(db)
-	l2SentMsgOrm := orm.NewL2SentMsg(db)
-	err := db.Transaction(func(tx *gorm.DB) error {
-		if err := l2CrossMsgOrm.DeleteL2CrossMsgFromHeight(ctx, reorgHeight, tx); err != nil {
-			log.Error("delete l2 cross msg from height", "height", reorgHeight, "err", err)
-			return err
-		}
-		if err := relayedOrm.DeleteL2RelayedHashAfterHeight(ctx, reorgHeight, tx); err != nil {
-			log.Error("delete l2 relayed msg from height", "height", reorgHeight, "err", err)
-			return err
-		}
-		if err := l2SentMsgOrm.DeleteL2SentMsgAfterHeight(ctx, reorgHeight, tx); err != nil {
-			log.Error("delete l2 sent msg from height", "height", reorgHeight, "err", err)
-			return err
-		}
-		return nil
-	})
-	if err != nil {
-		log.Crit("l2 reorg handling failed", "err", err)
-	}
-	return err
-}

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

@@ -0,0 +1,72 @@
+-- +goose Up
+-- +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,
+    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
+on column cross_message.asset is 'ETH, ERC20, ERC721, ERC1155';
+
+comment
+on column cross_message.msg_type is 'unknown, l1msg, l2msg';
+
+comment 
+on column cross_message.is_deleted is 'NotDeleted false, Deleted true';
+
+CREATE INDEX valid_l1_msg_index ON cross_message (layer1_hash, is_deleted);
+
+CREATE INDEX valid_l2_msg_index ON cross_message (layer2_hash, is_deleted);
+
+CREATE INDEX valid_height_index ON cross_message (height, msg_type, is_deleted);
+
+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 cross_message FOR EACH ROW EXECUTE PROCEDURE
+update_timestamp();
+
+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 delete_at = NOW() WHERE id = NEW.id;
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER delete_at_trigger
+AFTER UPDATE ON cross_message
+FOR EACH ROW
+EXECUTE FUNCTION delete_at_trigger();
+
+
+-- +goose StatementEnd
+
+-- +goose Down
+-- +goose StatementBegin
+drop table if exists cross_message;
+-- +goose StatementEnd

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

@@ -7,19 +7,17 @@ create table relayed_msg
     height      BIGINT NOT NULL,
     layer1_hash VARCHAR NOT NULL DEFAULT '',
     layer2_hash VARCHAR NOT NULL DEFAULT '',
+    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
 );
 
-create unique index uk_msg_hash_l1_hash_l2_hash
-on relayed_msg (msg_hash, layer1_hash, layer2_hash) where deleted_at IS NULL;
+comment 
+on column relayed_msg.is_deleted is 'NotDeleted, Deleted';
 
-CREATE INDEX idx_l1_msg_relayed_msg ON relayed_msg (layer1_hash, deleted_at);
-
-CREATE INDEX idx_l2_msg_relayed_msg ON relayed_msg (layer2_hash, deleted_at);
-
-CREATE INDEX idx_msg_hash_deleted_at_relayed_msg on relayed_msg (msg_hash, deleted_at);
+create unique index relayed_msg_hash_uindex
+on relayed_msg (msg_hash);
 
 CREATE OR REPLACE FUNCTION update_timestamp()
 RETURNS TRIGGER AS $$
@@ -33,6 +31,22 @@ CREATE TRIGGER update_timestamp BEFORE UPDATE
 ON relayed_msg FOR EACH ROW EXECUTE PROCEDURE
 update_timestamp();
 
+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 delete_at = NOW() WHERE id = NEW.id;
+    END IF;
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+CREATE TRIGGER delete_at_trigger
+AFTER UPDATE ON relayed_msg
+FOR EACH ROW
+EXECUTE FUNCTION delete_at_trigger();
+
+
 -- +goose StatementEnd
 
 -- +goose Down

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

@@ -0,0 +1,100 @@
+package orm
+
+import (
+	"context"
+	"time"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/jmoiron/sqlx"
+)
+
+type AssetType int
+type MsgType int
+
+func (a AssetType) String() string {
+	switch a {
+	case ETH:
+		return "ETH"
+	case ERC20:
+		return "ERC20"
+	case ERC1155:
+		return "ERC1155"
+	case ERC721:
+		return "ERC721"
+	}
+	return "Unknown Asset Type"
+}
+
+const (
+	ETH AssetType = iota
+	ERC20
+	ERC721
+	ERC1155
+)
+
+const (
+	UnknownMsg MsgType = iota
+	Layer1Msg
+	Layer2Msg
+)
+
+// CrossMsg represents a cross message from layer 1 to layer 2
+type CrossMsg struct {
+	ID          uint64     `json:"id" db:"id"`
+	MsgHash     string     `json:"msg_hash" db:"msg_hash"`
+	Height      uint64     `json:"height" db:"height"`
+	Sender      string     `json:"sender" db:"sender"`
+	Target      string     `json:"target" db:"target"`
+	Amount      string     `json:"amount" db:"amount"`
+	Layer1Hash  string     `json:"layer1_hash" db:"layer1_hash"`
+	Layer2Hash  string     `json:"layer2_hash" db:"layer2_hash"`
+	Layer1Token string     `json:"layer1_token" db:"layer1_token"`
+	Layer2Token string     `json:"layer2_token" db:"layer2_token"`
+	TokenID     uint64     `json:"token_id" db:"token_id"`
+	Asset       int        `json:"asset" db:"asset"`
+	MsgType     int        `json:"msg_type" db:"msg_type"`
+	IsDeleted   bool       `json:"is_deleted" db:"is_deleted"`
+	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"`
+}
+
+type RelayedMsg struct {
+	MsgHash    string `json:"msg_hash" db:"msg_hash"`
+	Height     uint64 `json:"height" db:"height"`
+	Layer1Hash string `json:"layer1_hash" db:"layer1_hash"`
+	Layer2Hash string `json:"layer2_hash" db:"layer2_hash"`
+}
+
+// L1CrossMsgOrm provides operations on l1_cross_message table
+type L1CrossMsgOrm interface {
+	GetL1CrossMsgByHash(l1Hash common.Hash) (*CrossMsg, error)
+	GetL1CrossMsgsByAddress(sender common.Address) ([]*CrossMsg, error)
+	BatchInsertL1CrossMsgDBTx(dbTx *sqlx.Tx, messages []*CrossMsg) error
+	// UpdateL1CrossMsgHash invoked when SentMessage event is received
+	UpdateL1CrossMsgHashDBTx(ctx context.Context, dbTx *sqlx.Tx, l1Hash, msgHash common.Hash) error
+	UpdateL1CrossMsgHash(ctx context.Context, l1Hash, msgHash common.Hash) error
+	GetLatestL1ProcessedHeight() (int64, error)
+	DeleteL1CrossMsgAfterHeightDBTx(dbTx *sqlx.Tx, height int64) error
+}
+
+// L2CrossMsgOrm provides operations on l2_cross_message table
+type L2CrossMsgOrm interface {
+	GetL2CrossMsgByHash(l2Hash common.Hash) (*CrossMsg, error)
+	GetL2CrossMsgByAddress(sender common.Address) ([]*CrossMsg, error)
+	BatchInsertL2CrossMsgDBTx(dbTx *sqlx.Tx, messages []*CrossMsg) error
+	// UpdateL2CrossMsgHash invoked when SentMessage event is received
+	UpdateL2CrossMsgHashDBTx(ctx context.Context, dbTx *sqlx.Tx, l2Hash, msgHash common.Hash) error
+	UpdateL2CrossMsgHash(ctx context.Context, l2Hash, msgHash common.Hash) error
+	GetLatestL2ProcessedHeight() (int64, error)
+	DeleteL2CrossMsgFromHeightDBTx(dbTx *sqlx.Tx, height int64) error
+}
+
+type RelayedMsgOrm interface {
+	BatchInsertRelayedMsgDBTx(dbTx *sqlx.Tx, messages []*RelayedMsg) error
+	GetRelayedMsgByHash(msg_hash string) (*RelayedMsg, error)
+	GetLatestRelayedHeightOnL1() (int64, error)
+	GetLatestRelayedHeightOnL2() (int64, error)
+	DeleteL1RelayedHashAfterHeightDBTx(dbTx *sqlx.Tx, height int64) error
+	DeleteL2RelayedHashAfterHeightDBTx(dbTx *sqlx.Tx, height int64) error
+}

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

@@ -0,0 +1,120 @@
+package orm
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/jmoiron/sqlx"
+)
+
+type l1CrossMsgOrm struct {
+	db *sqlx.DB
+}
+
+// NewL1CrossMsgOrm create an NewL1CrossMsgOrm instance
+func NewL1CrossMsgOrm(db *sqlx.DB) L1CrossMsgOrm {
+	return &l1CrossMsgOrm{db: db}
+}
+
+func (l *l1CrossMsgOrm) GetL1CrossMsgByHash(l1Hash common.Hash) (*CrossMsg, error) {
+	result := &CrossMsg{}
+	row := l.db.QueryRowx(`SELECT * FROM cross_message WHERE layer1_hash = $1 AND msg_type = $2 AND NOT is_deleted;`, l1Hash.String(), Layer1Msg)
+	if err := row.StructScan(result); err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			return nil, nil
+		}
+		return nil, err
+	}
+	return result, nil
+}
+
+// GetL1CrossMsgsByAddress returns all layer1 cross messages under given address
+// Warning: return empty slice if no data found
+func (l *l1CrossMsgOrm) GetL1CrossMsgsByAddress(sender common.Address) ([]*CrossMsg, error) {
+	var results []*CrossMsg
+	rows, err := l.db.Queryx(`SELECT * FROM cross_message WHERE sender = $1 AND msg_type = 1 AND NOT is_deleted;`, sender.String(), Layer1Msg)
+
+	for rows.Next() {
+		msg := &CrossMsg{}
+		if err = rows.StructScan(msg); err != nil {
+			break
+		}
+		results = append(results, msg)
+	}
+	if len(results) == 0 && errors.Is(err, sql.ErrNoRows) {
+	} else if err != nil {
+		return nil, err
+	}
+	return results, nil
+}
+
+func (l *l1CrossMsgOrm) BatchInsertL1CrossMsgDBTx(dbTx *sqlx.Tx, messages []*CrossMsg) error {
+	if len(messages) == 0 {
+		return nil
+	}
+	var err error
+	messageMaps := make([]map[string]interface{}, len(messages))
+	for i, msg := range messages {
+		messageMaps[i] = map[string]interface{}{
+			"height":       msg.Height,
+			"sender":       msg.Sender,
+			"target":       msg.Target,
+			"amount":       msg.Amount,
+			"asset":        msg.Asset,
+			"layer1_hash":  msg.Layer1Hash,
+			"layer1_token": msg.Layer1Token,
+			"layer2_token": msg.Layer2Token,
+			"token_id":     msg.TokenID,
+			"msg_type":     Layer1Msg,
+		}
+
+		_, err = dbTx.NamedExec(`insert into cross_message(height, sender, target, asset, layer1_hash, layer1_token, layer2_token, token_id, amount, msg_type) select :height, :sender, :target, :asset, :layer1_hash, :layer1_token, :layer2_token, :token_id, :amount, :msg_type WHERE NOT EXISTS (SELECT 1 FROM cross_message WHERE layer1_hash = :layer1_hash AND NOT is_deleted);`, messageMaps[i])
+		if err != nil {
+			log.Error("BatchInsertL1CrossMsgDBTx: failed to insert l1 cross msgs", "l1hashes", msg.Layer1Hash, "heights", msg.Height, "err", err)
+			break
+		}
+	}
+	return err
+}
+
+// UpdateL1CrossMsgHashDBTx update l1 cross msg hash in db, no need to check msg_type since layer1_hash wont be empty if its layer1 msg
+func (l *l1CrossMsgOrm) UpdateL1CrossMsgHashDBTx(ctx context.Context, dbTx *sqlx.Tx, l1Hash, msgHash common.Hash) error {
+	if _, err := dbTx.ExecContext(ctx, l.db.Rebind("update public.cross_message set msg_hash = ? where layer1_hash = ? AND NOT is_deleted;"), msgHash.String(), l1Hash.String()); err != nil {
+		return err
+	}
+	return nil
+
+}
+
+func (l *l1CrossMsgOrm) UpdateL1CrossMsgHash(ctx context.Context, l1Hash, msgHash common.Hash) error {
+	if _, err := l.db.ExecContext(ctx, l.db.Rebind("update public.l1_cross_message set msg_hash = ? where layer1_hash = ? AND NOT is_deleted;"), msgHash.String(), l1Hash.String()); err != nil {
+		return err
+	}
+	return nil
+
+}
+
+func (l *l1CrossMsgOrm) GetLatestL1ProcessedHeight() (int64, error) {
+	row := l.db.QueryRowx(`SELECT height FROM cross_message WHERE msg_type = $1 AND NOT is_deleted ORDER BY id DESC LIMIT 1;`, Layer1Msg)
+	var result sql.NullInt64
+	if err := row.Scan(&result); err != nil {
+		if err == sql.ErrNoRows || !result.Valid {
+			return -1, nil
+		}
+		return 0, err
+	}
+	if result.Valid {
+		return result.Int64, nil
+	}
+	return 0, nil
+}
+
+func (l *l1CrossMsgOrm) DeleteL1CrossMsgAfterHeightDBTx(dbTx *sqlx.Tx, height int64) error {
+	if _, err := l.db.Exec(`UPDATE cross_message SET is_deleted = true WHERE height > $1 AND msg_type = $2;`, height, Layer1Msg); err != nil {
+		return err
+	}
+	return nil
+}

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

@@ -0,0 +1,123 @@
+package orm
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/jmoiron/sqlx"
+)
+
+type l2CrossMsgOrm struct {
+	db *sqlx.DB
+}
+
+// NewL2CrossMsgOrm create an NewL2CrossMsgOrm instance
+func NewL2CrossMsgOrm(db *sqlx.DB) L2CrossMsgOrm {
+	return &l2CrossMsgOrm{db: db}
+}
+
+func (l *l2CrossMsgOrm) GetL2CrossMsgByHash(l2Hash common.Hash) (*CrossMsg, error) {
+	result := &CrossMsg{}
+	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
+		}
+		return nil, err
+	}
+	return result, nil
+}
+
+// GetL2CrossMsgsByAddress returns all layer2 cross messages under given address
+// Warning: return empty slice if no data found
+func (l *l2CrossMsgOrm) GetL2CrossMsgByAddress(sender common.Address) ([]*CrossMsg, error) {
+	var results []*CrossMsg
+	rows, err := l.db.Queryx(`SELECT * FROM cross_message WHERE sender = $1 AND msg_type = $2 AND NOT is_deleted;`, sender.String(), Layer2Msg)
+
+	for rows.Next() {
+		msg := &CrossMsg{}
+		if err = rows.StructScan(msg); err != nil {
+			break
+		}
+		results = append(results, msg)
+	}
+	if len(results) == 0 && errors.Is(err, sql.ErrNoRows) {
+		// log.Warn("no unprocessed layer1 messages in db", "err", err)
+	} else if err != nil {
+		return nil, err
+	}
+	return results, nil
+
+}
+
+func (l *l2CrossMsgOrm) DeleteL2CrossMsgFromHeightDBTx(dbTx *sqlx.Tx, height int64) error {
+	_, err := dbTx.Exec(`UPDATE cross_message SET is_deleted = true where height > $1 AND msg_type = $2 ;`, height, Layer2Msg)
+	if err != nil {
+		log.Error("DeleteL1CrossMsgAfterHeightDBTx: failed to delete", "height", height, "err", err)
+		return err
+	}
+	return nil
+}
+
+func (l *l2CrossMsgOrm) BatchInsertL2CrossMsgDBTx(dbTx *sqlx.Tx, messages []*CrossMsg) error {
+	if len(messages) == 0 {
+		return nil
+	}
+
+	var err error
+	messageMaps := make([]map[string]interface{}, len(messages))
+	for i, msg := range messages {
+
+		messageMaps[i] = map[string]interface{}{
+			"height":       msg.Height,
+			"sender":       msg.Sender,
+			"target":       msg.Target,
+			"asset":        msg.Asset,
+			"layer2_hash":  msg.Layer2Hash,
+			"layer1_token": msg.Layer1Token,
+			"layer2_token": msg.Layer2Token,
+			"token_id":     msg.TokenID,
+			"amount":       msg.Amount,
+			"msg_type":     Layer2Msg,
+		}
+
+		_, err = dbTx.NamedExec(`insert into cross_message(height, sender, target, asset, layer2_hash, layer1_token, layer2_token, token_id, amount, msg_type) select :height, :sender, :target, :asset, :layer2_hash, :layer1_token, :layer2_token, :token_id, :amount, :msg_type WHERE NOT EXISTS (SELECT 1 FROM cross_message WHERE layer2_hash = :layer2_hash AND NOT is_deleted);`, messageMaps[i])
+		if err != nil {
+			log.Error("BatchInsertL2CrossMsgDBTx: failed to insert l2 cross msgs", "layer2hash", msg.Layer2Hash, "heights", msg.Height, "err", err)
+			break
+		}
+	}
+	return err
+}
+
+func (l *l2CrossMsgOrm) UpdateL2CrossMsgHashDBTx(ctx context.Context, dbTx *sqlx.Tx, l2Hash, msgHash common.Hash) error {
+	if _, err := dbTx.ExecContext(ctx, l.db.Rebind("update public.cross_message set msg_hash = ? where layer2_hash = ? AND NOT is_deleted;"), msgHash.String(), l2Hash.String()); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (l *l2CrossMsgOrm) UpdateL2CrossMsgHash(ctx context.Context, l2Hash, msgHash common.Hash) error {
+	if _, err := l.db.ExecContext(ctx, l.db.Rebind("update public.cross_message set msg_hash = ? where layer2_hash = ? AND NOT is_deleted;"), msgHash.String(), l2Hash.String()); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (l *l2CrossMsgOrm) GetLatestL2ProcessedHeight() (int64, error) {
+	row := l.db.QueryRowx(`SELECT height FROM cross_message WHERE msg_type = $1 AND NOT is_deleted ORDER BY id DESC LIMIT 1;`, Layer2Msg)
+	var result sql.NullInt64
+	if err := row.Scan(&result); err != nil {
+		if err == sql.ErrNoRows || !result.Valid {
+			return -1, nil
+		}
+		return 0, err
+	}
+	if result.Valid {
+		return result.Int64, nil
+	}
+	return 0, nil
+}

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

@@ -0,0 +1,94 @@
+package orm
+
+import (
+	"database/sql"
+	"errors"
+	"strings"
+
+	"github.com/ethereum/go-ethereum/log"
+	"github.com/jmoiron/sqlx"
+)
+
+type relayedMsgOrm struct {
+	db *sqlx.DB
+}
+
+// NewRelayedMsgOrm create an NewRelayedMsgOrm instance
+func NewRelayedMsgOrm(db *sqlx.DB) RelayedMsgOrm {
+	return &relayedMsgOrm{db: db}
+}
+
+func (l *relayedMsgOrm) BatchInsertRelayedMsgDBTx(dbTx *sqlx.Tx, messages []*RelayedMsg) error {
+	if len(messages) == 0 {
+		return nil
+	}
+	var err error
+	messageMaps := make([]map[string]interface{}, len(messages))
+	for i, msg := range messages {
+		messageMaps[i] = map[string]interface{}{
+			"msg_hash":    msg.MsgHash,
+			"height":      msg.Height,
+			"layer1_hash": msg.Layer1Hash,
+			"layer2_hash": msg.Layer2Hash,
+		}
+
+		_, err = dbTx.NamedExec(`insert into relayed_msg(msg_hash, height, layer1_hash, layer2_hash) values(:msg_hash, :height, :layer1_hash, :layer2_hash);`, messageMaps[i])
+		if err != nil && !strings.Contains(err.Error(), "pq: duplicate key value violates unique constraint \"relayed_msg_hash_uindex") {
+			log.Error("BatchInsertRelayedMsgDBTx: failed to insert l1 cross msgs", "msg_Hashe", msg.MsgHash, "height", msg.Height, "err", err)
+			break
+		}
+	}
+	return err
+}
+
+func (l *relayedMsgOrm) GetRelayedMsgByHash(msg_hash string) (*RelayedMsg, error) {
+	result := &RelayedMsg{}
+	row := l.db.QueryRowx(`SELECT msg_hash, height, layer1_hash, layer2_hash FROM relayed_msg WHERE msg_hash = $1 AND NOT is_deleted;`, msg_hash)
+	if err := row.StructScan(result); err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			return nil, nil
+		}
+		return nil, err
+	}
+	return result, nil
+}
+
+func (l *relayedMsgOrm) GetLatestRelayedHeightOnL1() (int64, error) {
+	row := l.db.QueryRow(`SELECT height FROM relayed_msg WHERE layer1_hash != '' AND NOT is_deleted ORDER BY height DESC LIMIT 1;`)
+	var result sql.NullInt64
+	if err := row.Scan(&result); err != nil {
+		if err == sql.ErrNoRows || !result.Valid {
+			return -1, nil
+		}
+		return 0, err
+	}
+	if result.Valid {
+		return result.Int64, nil
+	}
+	return 0, nil
+}
+
+func (l *relayedMsgOrm) GetLatestRelayedHeightOnL2() (int64, error) {
+	row := l.db.QueryRow(`SELECT height FROM relayed_msg WHERE layer2_hash != '' AND NOT is_deleted ORDER BY height DESC LIMIT 1;`)
+	var result sql.NullInt64
+	if err := row.Scan(&result); err != nil {
+		if err == sql.ErrNoRows || !result.Valid {
+			return -1, nil
+		}
+		return 0, err
+	}
+	if result.Valid {
+		return result.Int64, nil
+	}
+	return 0, nil
+}
+
+func (l *relayedMsgOrm) DeleteL1RelayedHashAfterHeightDBTx(dbTx *sqlx.Tx, height int64) error {
+	_, err := dbTx.Exec(`UPDATE relayed_msg SET is_deleted = true WHERE height > $1 AND layer1_hash != '';`, height)
+	return err
+}
+
+func (l *relayedMsgOrm) DeleteL2RelayedHashAfterHeightDBTx(dbTx *sqlx.Tx, height int64) error {
+	_, err := dbTx.Exec(`UPDATE relayed_msg SET is_deleted = true WHERE height > $1 AND layer2_hash != '';`, height)
+	return err
+}

bridge-history-api/db/orm_factory.go

@@ -0,0 +1,81 @@
+package db
+
+import (
+	"database/sql"
+	"errors"
+
+	"github.com/jmoiron/sqlx"
+	_ "github.com/lib/pq" //nolint:golint
+
+	"bridge-history-api/config"
+	"bridge-history-api/db/orm"
+)
+
+// OrmFactory include all ormFactory interface
+type OrmFactory interface {
+	orm.L1CrossMsgOrm
+	orm.L2CrossMsgOrm
+	orm.RelayedMsgOrm
+	GetCrossMsgsByAddressWithOffset(sender string, offset int64, limit int64) ([]*orm.CrossMsg, error)
+	GetDB() *sqlx.DB
+	Beginx() (*sqlx.Tx, error)
+	Close() error
+}
+
+type ormFactory struct {
+	orm.L1CrossMsgOrm
+	orm.L2CrossMsgOrm
+	orm.RelayedMsgOrm
+	*sqlx.DB
+}
+
+// NewOrmFactory create an ormFactory factory include all ormFactory interface
+func NewOrmFactory(cfg *config.Config) (OrmFactory, error) {
+	// Initialize sql/sqlx
+	db, err := sqlx.Open(cfg.DB.DriverName, cfg.DB.DSN)
+	if err != nil {
+		return nil, err
+	}
+
+	db.SetMaxOpenConns(cfg.DB.MaxOpenNum)
+	db.SetMaxIdleConns(cfg.DB.MaxIdleNum)
+	if err = db.Ping(); err != nil {
+		return nil, err
+	}
+
+	return &ormFactory{
+		L1CrossMsgOrm: orm.NewL1CrossMsgOrm(db),
+		L2CrossMsgOrm: orm.NewL2CrossMsgOrm(db),
+		RelayedMsgOrm: orm.NewRelayedMsgOrm(db),
+		DB:            db,
+	}, nil
+}
+
+func (o *ormFactory) GetDB() *sqlx.DB {
+	return o.DB
+}
+
+func (o *ormFactory) Beginx() (*sqlx.Tx, error) {
+	return o.DB.Beginx()
+}
+
+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 id DESC LIMIT $2 OFFSET $3;`, para, limit, offset)
+	if err != nil || rows == nil {
+		return nil, err
+	}
+	for rows.Next() {
+		msg := &orm.CrossMsg{}
+		if err = rows.StructScan(msg); err != nil {
+			break
+		}
+		results = append(results, msg)
+	}
+	if len(results) == 0 && errors.Is(err, sql.ErrNoRows) {
+	} else if err != nil {
+		return nil, err
+	}
+	return results, nil
+}

bridge-history-api/go.mod

@@ -1,96 +1,104 @@
 module bridge-history-api
 
-go 1.19
+go 1.20
 
 require (
-	github.com/ethereum/go-ethereum v1.12.2
-	github.com/gin-contrib/cors v1.4.0
-	github.com/gin-gonic/gin v1.9.1
+	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
 	github.com/mattn/go-colorable v0.1.13
-	github.com/mattn/go-isatty v0.0.19
+	github.com/mattn/go-isatty v0.0.18
 	github.com/modern-go/reflect2 v1.0.2
 	github.com/pressly/goose/v3 v3.7.0
-	github.com/stretchr/testify v1.8.3
-	github.com/urfave/cli/v2 v2.25.7
-	gorm.io/driver/postgres v1.5.0
-	gorm.io/gorm v1.25.2
+	github.com/stretchr/testify v1.8.2
+	github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa
 )
 
 require (
+	github.com/BurntSushi/toml v1.2.1 // indirect
+	github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect
+	github.com/CloudyKit/jet/v6 v6.2.0 // indirect
 	github.com/DataDog/zstd v1.5.2 // indirect
+	github.com/Joker/jade v1.1.3 // indirect
+	github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 // indirect
 	github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
+	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
-	github.com/bytedance/sonic v1.9.2 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
 	github.com/cockroachdb/errors v1.9.1 // indirect
 	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.3.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 v23.0.6+incompatible // indirect
-	github.com/ethereum/c-kzg-4844 v0.3.1 // 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/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
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff // indirect
 	github.com/getsentry/sentry-go v0.18.0 // indirect
-	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-playground/locales v0.14.1 // indirect
-	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.14.1 // indirect
+	github.com/go-sql-driver/mysql v1.7.0 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/gobwas/httphead v0.1.0 // indirect
+	github.com/gobwas/pool v0.2.1 // indirect
+	github.com/gobwas/ws v1.1.0 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
 	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/css v1.0.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/graph-gophers/graphql-go v1.3.0 // indirect
 	github.com/hashicorp/go-bexpr v0.1.10 // indirect
-	github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 // indirect
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
-	github.com/holiman/uint256 v1.2.3 // indirect
+	github.com/holiman/uint256 v1.2.2 // indirect
 	github.com/huin/goupnp v1.0.3 // indirect
 	github.com/influxdata/influxdb-client-go/v2 v2.4.0 // indirect
 	github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c // indirect
 	github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 // 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.1 // indirect
+	github.com/iris-contrib/go.uuid v2.0.0+incompatible // indirect
+	github.com/iris-contrib/schema v0.0.6 // 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/json-iterator/go v1.1.12 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/kataras/blocks v0.0.7 // indirect
+	github.com/kataras/golog v0.1.8 // indirect
+	github.com/kataras/neffos v0.0.21 // indirect
+	github.com/kataras/pio v0.0.11 // indirect
+	github.com/kataras/sitemap v0.0.6 // indirect
+	github.com/kataras/tunnel v0.0.4 // indirect
 	github.com/klauspost/compress v1.16.0 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/leodido/go-urn v1.2.4 // indirect
+	github.com/mailgun/raymond/v2 v2.0.48 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/mattn/go-sqlite3 v1.14.14 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/mediocregopher/radix/v3 v3.8.1 // indirect
+	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/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // 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
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/onsi/ginkgo v1.16.5 // indirect
 	github.com/onsi/gomega v1.27.1 // indirect
 	github.com/opentracing/opentracing-go v1.1.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -102,31 +110,37 @@ require (
 	github.com/rogpeppe/go-internal v1.10.0 // indirect
 	github.com/rs/cors v1.7.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/schollz/closestmatch v2.1.0+incompatible // indirect
+	github.com/sergi/go-diff v1.2.0 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/status-im/keycard-go v0.2.0 // indirect
-	github.com/supranational/blst v0.3.11 // 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
 	github.com/tklauser/go-sysconf v0.3.11 // indirect
 	github.com/tklauser/numcpus v0.6.0 // indirect
-	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/tyler-smith/go-bip39 v1.1.0 // indirect
-	github.com/ugorji/go/codec v1.2.11 // indirect
+	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect
+	github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	github.com/yosssi/ace v0.0.5 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/arch v0.4.0 // indirect
-	golang.org/x/crypto v0.12.0 // indirect
-	golang.org/x/exp v0.0.0-20230810033253-352e893a4cad // indirect
-	golang.org/x/net v0.14.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
-	golang.org/x/text v0.12.0 // indirect
+	golang.org/x/crypto v0.9.0 // indirect
+	golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/sync v0.1.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.11.0 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	golang.org/x/tools v0.8.0 // indirect
+	golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
+	google.golang.org/protobuf v1.29.0 // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	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

@@ -1,25 +1,39 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8=
+github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak=
+github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
+github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 h1:sR+/8Yb4slttB4vD+b9btVEnWgL3Q00OBTzVT8B9C0c=
 github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno=
 github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo=
+github.com/CloudyKit/jet/v6 v6.2.0 h1:EpcZ6SR9n28BUGtNJSvlBqf90IpjeFr36Tizxhn/oME=
+github.com/CloudyKit/jet/v6 v6.2.0/go.mod h1:d3ypHeIRNo2+XyqnGA8s+aphtcVpjP5hPwP/Lzo7Ro4=
 github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8=
 github.com/DataDog/zstd v1.5.2/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
+github.com/Joker/hpp v1.0.0 h1:65+iuJYdRXv/XyN62C1uEmmOx3432rNG/rKlX6V7Kkc=
 github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY=
+github.com/Joker/jade v1.1.3 h1:Qbeh12Vq6BxURXT1qZBRHsDxeURB8ztcL6f3EXSGeHk=
+github.com/Joker/jade v1.1.3/go.mod h1:T+2WLyt7VH6Lp0TRxQrUYEs64nRc83wkMQrfeIQKduM=
 github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0=
+github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06 h1:KkH3I3sJuOLP3TjA/dfr4NAY8bghDwnXiU7cTKxQqo0=
+github.com/Shopify/goreferrer v0.0.0-20220729165902-8cddb4f5de06/go.mod h1:7erjKLwalezA0k99cWs5L11HWOAPNjdUZ6RxH1BXbbM=
 github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o=
 github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
+github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
 github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156 h1:eMwmnE/GDgah4HI848JfFxHt+iPb26b4zyfspmqY0/8=
 github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
+github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
+github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
+github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
+github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 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=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=
@@ -31,17 +45,12 @@ github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVa
 github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
 github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
 github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
-github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
-github.com/bytedance/sonic v1.9.2 h1:GDaNjuWSGu09guE9Oql0MSTNhNCLlWwO8y/xM5BzcbM=
-github.com/bytedance/sonic v1.9.2/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
-github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
-github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
+github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD93PBm/jA=
@@ -56,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.3.0 h1:UBlWE0CgyFqqzTI+IFyCzA7A3Zw4iip6uzRv5NIXG0A=
-github.com/crate-crypto/go-kzg-4844 v0.3.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=
@@ -85,29 +88,33 @@ github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRk
 github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
-github.com/docker/docker v23.0.6+incompatible h1:aBD4np894vatVX99UTx/GyOUOK4uEcROwA3+bQhEcoU=
-github.com/docker/docker v23.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/djherbis/atime v1.1.0/go.mod h1:28OF6Y8s3NQWwacXc5eZTsEsiMzp7LF8MbXE+XJPdBE=
+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=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 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.3.1 h1:sR65+68+WdnMKxseNWxSJuAv2tsUrihTpVBTfM/U5Zg=
-github.com/ethereum/c-kzg-4844 v0.3.1/go.mod h1:VewdlzQmpT5QSrVhbBuGoCdFJkpaJlO1aQputP83wc0=
-github.com/ethereum/go-ethereum v1.12.2 h1:eGHJ4ij7oyVqUQn48LBz3B7pvQ8sV0wGJiIE6gDq/6Y=
-github.com/ethereum/go-ethereum v1.12.2/go.mod h1:1cRAEV+rp/xX0zraSCBnu9Py3HQ+geRMj3HdR+k0wfI=
+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=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
+github.com/flosch/pongo2/v4 v4.0.2 h1:gv+5Pe3vaSVmiJvh/BZa82b7/00YUGm0PIyVVLop0Hw=
+github.com/flosch/pongo2/v4 v4.0.2/go.mod h1:B5ObFANs/36VwxxlgKpdchIJHMvHB562PW+BWPhwZD8=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
-github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc=
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI=
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
@@ -117,15 +124,8 @@ github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TB
 github.com/getsentry/sentry-go v0.18.0 h1:MtBW5H9QgdcJabtZcuJG80BMOwaBpkRDZkxRkNC1sN0=
 github.com/getsentry/sentry-go v0.18.0/go.mod h1:Kgon4Mby+FJ7ZWHFUAZgVaIa8sxHtnRJRLTXZr51aKQ=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gin-contrib/cors v1.4.0 h1:oJ6gwtUl3lqV0WEIwM/LxPF1QZ5qe2lGWdY2+bz7y0g=
-github.com/gin-contrib/cors v1.4.0/go.mod h1:bs9pNM0x/UsmHPBWT2xZz9ROh8xYjYkiURUfmBoMlcs=
 github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
-github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
-github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
-github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
 github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98=
 github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs=
 github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
@@ -135,26 +135,21 @@ github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
-github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
-github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
-github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
-github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
-github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
-github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
-github.com/go-playground/validator/v10 v10.14.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+jU0zvx4AqHGnv4k=
-github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+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/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo=
+github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
+github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
 github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
+github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
+github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
-github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/gobwas/ws v1.1.0 h1:7RFti/xnNkMJnrK7D1yQ/iCIB5OrrY/54/H930kIbHA=
+github.com/gobwas/ws v1.1.0/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0=
 github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
 github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
 github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
@@ -196,12 +191,14 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/go-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=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
+github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
@@ -212,17 +209,16 @@ github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpx
 github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0=
 github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 h1:3JQNjnMRil1yD0IfZKHF9GxxWKDJGj8I0IqOUol//sw=
-github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
 github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
-github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o=
-github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw=
+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/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/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE=
+github.com/imkira/go-interpol v1.1.0 h1:KIiKr0VSG2CUW1hl1jpiyuzuJeKUUpC8iM1AIE7N1Vk=
 github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/influxdata/influxdb-client-go/v2 v2.4.0 h1:HGBfZYStlx3Kqvsv1h2pJixbCl/jhnFtxpKFAv9Tu5k=
@@ -233,38 +229,46 @@ github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1
 github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 h1:vilfsDSy7TDxedi9gyBkMvAirat/oRcL0lFdJBf6tdM=
 github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo=
 github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI=
+github.com/iris-contrib/go.uuid v2.0.0+incompatible h1:XZubAYg61/JwnJNbZilGjf3b3pB80+OQg2qf6c8BfWE=
 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/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/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/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8=
-github.com/jackc/pgx/v5 v5.3.1 h1:Fcr8QJ1ZeLi5zsPZqQeUZhNhxfkkKBOgJuYkJHoBOtU=
-github.com/jackc/pgx/v5 v5.3.1/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8=
-github.com/jackc/puddle/v2 v2.2.0/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
+github.com/iris-contrib/schema v0.0.6 h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw=
+github.com/iris-contrib/schema v0.0.6/go.mod h1:iYszG0IOsuIsfzjymw1kMzTL8YQcCWlm65f3wX8J5iA=
 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/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
+github.com/kataras/blocks v0.0.7 h1:cF3RDY/vxnSRezc7vLFlQFTYXG/yAr1o7WImJuZbzC4=
+github.com/kataras/blocks v0.0.7/go.mod h1:UJIU97CluDo0f+zEjbnbkeMRlvYORtmc1304EeyXf4I=
 github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8=
+github.com/kataras/golog v0.1.8 h1:isP8th4PJH2SrbkciKnylaND9xoTtfxv++NB+DF0l9g=
+github.com/kataras/golog v0.1.8/go.mod h1:rGPAin4hYROfk1qT9wZP6VY2rsb4zzc37QpdPjdkqVw=
 github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE=
+github.com/kataras/iris/v12 v12.2.0 h1:WzDY5nGuW/LgVaFS5BtTkW3crdSKJ/FEgWnxPnIVVLI=
+github.com/kataras/iris/v12 v12.2.0/go.mod h1:BLzBpEunc41GbE68OUaQlqX4jzi791mx5HU04uPb90Y=
 github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE=
+github.com/kataras/neffos v0.0.21 h1:UwN/F44jlqdtgFI29y3VhA7IlJ4JbK3UjCbTDg1pYoo=
+github.com/kataras/neffos v0.0.21/go.mod h1:FeGka8lu8cjD2H+0OpBvW8c6xXawy3fj5VX6xcIJ1Fg=
 github.com/kataras/pio v0.0.2/go.mod h1:hAoW0t9UmXi4R5Oyq5Z4irTbaTsOemSrDGUtaTl7Dro=
+github.com/kataras/pio v0.0.11 h1:kqreJ5KOEXGMwHAWHDwIl+mjfNCPhAwZPa8gK7MKlyw=
+github.com/kataras/pio v0.0.11/go.mod h1:38hH6SWH6m4DKSYmRhlrCJ5WItwWgCVrTNU62XZyUvI=
 github.com/kataras/sitemap v0.0.5/go.mod h1:KY2eugMKiPwsJgx7+U103YZehfvNGOXURubcGyk0Bz8=
+github.com/kataras/sitemap v0.0.6 h1:w71CRMMKYMJh6LR2wTgnk5hSgjVNB9KL60n5e2KHvLY=
+github.com/kataras/sitemap v0.0.6/go.mod h1:dW4dOCNs896OR1HmG+dMLdT7JjDk7mYBzoIRwuj5jA4=
+github.com/kataras/tunnel v0.0.4 h1:sCAqWuJV7nPzGrlb0os3j49lk2JhILT0rID38NHNLpA=
+github.com/kataras/tunnel v0.0.4/go.mod h1:9FkU4LaeifdMWqZu7o20ojmW4B7hdhv2CMLwfnHGpYw=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
@@ -274,11 +278,7 @@ github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0
 github.com/klauspost/compress v1.16.0 h1:iULayQNOReoYUe+1qtKOqw9CwJv3aNQu8ivo7lw1HU4=
 github.com/klauspost/compress v1.16.0/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
-github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 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=
@@ -290,14 +290,18 @@ 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/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
-github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
-github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
+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/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
+github.com/mailgun/raymond/v2 v2.0.48 h1:5dmlB680ZkFG2RN/0lvTAghrSxIESeu9/2aeDqACtjw=
+github.com/mailgun/raymond/v2 v2.0.48/go.mod h1:lsgvL50kgt1ylcFJYZiULi5fjPBkkhNfj4KA0W54Z18=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
+github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -310,39 +314,53 @@ github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2y
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
+github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 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/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
+github.com/mediocregopher/radix/v3 v3.8.1 h1:rOkHflVuulFKlwsLY01/M2cM2tWCjDoETcMqKbAWu1M=
+github.com/mediocregopher/radix/v3 v3.8.1/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8=
 github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc=
+github.com/microcosm-cc/bluemonday v1.0.23 h1:SMZe2IGa0NuHvnVNAZ+6B38gsTbi5e4sViiWJyDDqFY=
+github.com/microcosm-cc/bluemonday v1.0.23/go.mod h1:mN70sk7UkkF8TUr2IGBpNN0jAgStuPzlK76QuruE/z4=
+github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A=
 github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4=
-github.com/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 h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 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=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ=
+github.com/nats-io/jwt v0.3.0 h1:xdnzwFETV++jNc4W1mw//qFyJGb2ABOombmZJQS4+Qo=
 github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg=
+github.com/nats-io/jwt/v2 v2.3.0 h1:z2mA1a7tIf5ShggOFlR1oBPgd6hGqcDYsISxZByUzdI=
+github.com/nats-io/nats-server/v2 v2.9.11 h1:4y5SwWvWI59V5mcqtuoqKq6L9NDUydOP3Ekwuwl8cZI=
 github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w=
+github.com/nats-io/nats.go v1.23.0 h1:lR28r7IX44WjYgdiKz9GmUeW0uh/m33uD3yEjLZ2cOE=
+github.com/nats-io/nats.go v1.23.0/go.mod h1:ki/Scsa23edbh8IRZbCuNXR9TDcbvfaSijKtaqQgw+Q=
 github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
+github.com/nats-io/nkeys v0.3.0 h1:cgM5tL53EvYRU+2YLXIK0G2mJtK12Ft9oeooSZMA2G8=
+github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4=
+github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
@@ -363,9 +381,6 @@ github.com/onsi/gomega v1.27.1/go.mod h1:aHX5xOykVYzWOV4WqQy0sy8BQptgukenXpCXfad
 github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
-github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
-github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
-github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
 github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 h1:oYW+YCJ1pachXTQmzR3rNLYGGz4g/UgFcjb28p/viDM=
 github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
 github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
@@ -392,7 +407,6 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ
 github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
 github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
 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=
@@ -403,11 +417,18 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
+github.com/sanity-io/litter v1.5.5 h1:iE+sBxPBzoK6uaEP5Lt3fHNgpKcHXc/A2HGETy0uJQo=
+github.com/schollz/closestmatch v2.1.0+incompatible h1:Uel2GXEpJqOWBrlyI+oY9LTiyyjYS17cCYRqP13/SHk=
 github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=
+github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
@@ -415,6 +436,7 @@ github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
 github.com/status-im/keycard-go v0.2.0 h1:QDLFswOQu1r5jsycloeQh3bVU8n/NatHHaZobtDnDzA=
 github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9+mHxBEeo3Hbg=
@@ -429,57 +451,63 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 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/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/supranational/blst v0.3.11 h1:LyU6FolezeWAhvQk0k6O/d49jqgO52MSDDfYgbeoEm4=
-github.com/supranational/blst v0.3.11/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=
+github.com/tdewolff/minify/v2 v2.12.4/go.mod h1:h+SRvSIX3kwgwTFOpSckvSxgax3uy8kZTSF1Ojrr3bk=
+github.com/tdewolff/parse/v2 v2.6.4 h1:KCkDvNUMof10e3QExio9OPZJT8SbdKojLBumw8YZycQ=
+github.com/tdewolff/parse/v2 v2.6.4/go.mod h1:woz0cgbLwFdtbjJu8PIKxhW05KplTFQkOdX78o+Jgrs=
+github.com/tdewolff/test v1.0.7 h1:8Vs0142DmPFW/bQeHRP3MV19m1gvndjUb1sn8yy74LM=
+github.com/tdewolff/test v1.0.7/go.mod h1:6DAvZliBAAnD7rhVgwaM7DE5/d9NMOAJ09SqYqeK4QE=
 github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
 github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
 github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
 github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
-github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
-github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8=
 github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
-github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
-github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
+github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa h1:5SqCsI/2Qya2bCzK15ozrqo2sZxkh0FHynJZOTVoV6Q=
+github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
 github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
+github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w=
 github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
 github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
+github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU=
+github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
+github.com/vmihailenco/tagparser/v2 v2.0.0 h1:y09buUbR+b5aycVFQs/g70pqKVZNBmxwAhO7/IwNM9g=
+github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 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/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 h1:6fRhSjgLCkTD3JnJxvaJ4Sj+TYblw757bqYgZaOq5ZY=
 github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI=
+github.com/yosssi/ace v0.0.5 h1:tUkIP/BLdKqrlrPwcmH0shwEEhTRHoGnc1wFIWmaBUA=
+github.com/yosssi/ace v0.0.5/go.mod h1:ALfIzm2vT7t5ZE7uoIZqF3TQ7SAOyupFZnkrF5id+K0=
+github.com/yudai/gojsondiff v1.0.0 h1:27cbfqXLVEJ1o8I6v3y9lg8Ydm53EKqHXAOMxEGlCOA=
 github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg=
+github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 h1:BHyfKlQyqbsFN5p3IfnEUduWvb9is428/nNb5L3U01M=
 github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM=
 github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 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/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc=
-golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -489,15 +517,14 @@ golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 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.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
-golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
+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/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20230810033253-352e893a4cad h1:g0bG7Z4uG+OgH2QDODnjp6ggkk1bJDsINcuWmJN1iJU=
-golang.org/x/exp v0.0.0-20230810033253-352e893a4cad/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
+golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
+golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -506,8 +533,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
+golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
+golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -529,10 +556,9 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
-golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
+golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -542,10 +568,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -567,6 +591,7 @@ golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -576,32 +601,28 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/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-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/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.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
-golang.org/x/sys v0.11.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-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/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.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
-golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+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.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
@@ -621,13 +642,15 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.11.0 h1:EMCa6U9S2LtZXLAMoWiR/R8dAQFRqbAitmbJ2UKhoi8=
-golang.org/x/tools v0.11.0/go.mod h1:anzJrxPjNtfgiYQYirP2CPGzGLxrH2u2QBhn6Bf3qY8=
+golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
+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=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618=
+golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@@ -652,19 +675,20 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.29.0 h1:44S3JjaKmLEE4YIkjzexaP+NzZsudE3Zin5Njn/pYX0=
+google.golang.org/protobuf v1.29.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 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-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/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/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
 gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y=
 gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
+gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
@@ -683,11 +707,6 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/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.2 h1:gs1o6Vsa+oVKG/a9ElL3XgyGfghFfkKA2SInQaCyMho=
-gorm.io/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
@@ -700,6 +719,4 @@ 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=
-rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
-rsc.io/tmplfunc v0.0.3 h1:53XFQh69AfOa8Tw0Jm7t+GV7KZhOi6jzsCzTtKbMvzU=
-rsc.io/tmplfunc v0.0.3/go.mod h1:AG3sTPzElb1Io3Yg4voV9AGZJuleGAwaVRxL9M49PhA=
+moul.io/http2curl/v2 v2.3.0 h1:9r3JfDzWPcbIklMOs2TnIFzDYvfAZvjeavG6EzP7jYs=

bridge-history-api/internal/controller/batch_controller.go

@@ -1,37 +0,0 @@
-package controller
-
-import (
-	"github.com/gin-gonic/gin"
-	"gorm.io/gorm"
-
-	"bridge-history-api/internal/logic"
-	"bridge-history-api/internal/types"
-)
-
-// BatchController contains the query claimable txs service
-type BatchController struct {
-	batchLogic *logic.BatchLogic
-}
-
-// NewBatchController return NewBatchController instance
-func NewBatchController(db *gorm.DB) *BatchController {
-	return &BatchController{
-		batchLogic: logic.NewBatchLogic(db),
-	}
-}
-
-// GetWithdrawRootByBatchIndex defines the http get method behavior
-func (b *BatchController) GetWithdrawRootByBatchIndex(ctx *gin.Context) {
-	var req types.QueryByBatchIndexRequest
-	if err := ctx.ShouldBind(&req); err != nil {
-		types.RenderJSON(ctx, types.ErrParameterInvalidNo, err, nil)
-		return
-	}
-	result, err := b.batchLogic.GetWithdrawRootByBatchIndex(ctx, req.BatchIndex)
-	if err != nil {
-		types.RenderJSON(ctx, types.ErrGetWithdrawRootByBatchIndexFailure, err, nil)
-		return
-	}
-
-	types.RenderJSON(ctx, types.Success, nil, result)
-}

bridge-history-api/internal/controller/controller.go

@@ -1,23 +0,0 @@
-package controller
-
-import (
-	"sync"
-
-	"gorm.io/gorm"
-)
-
-var (
-	// HistoryCtrler is controller instance
-	HistoryCtrler *HistoryController
-	// BatchCtrler is controller instance
-	BatchCtrler        *BatchController
-	initControllerOnce sync.Once
-)
-
-// InitController inits Controller with database
-func InitController(db *gorm.DB) {
-	initControllerOnce.Do(func() {
-		HistoryCtrler = NewHistoryController(db)
-		BatchCtrler = NewBatchController(db)
-	})
-}

bridge-history-api/internal/controller/history_controller.go

@@ -1,72 +0,0 @@
-package controller
-
-import (
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/gin-gonic/gin"
-	"gorm.io/gorm"
-
-	"bridge-history-api/internal/logic"
-	"bridge-history-api/internal/types"
-)
-
-// HistoryController contains the query claimable txs service
-type HistoryController struct {
-	historyLogic *logic.HistoryLogic
-}
-
-// NewHistoryController return HistoryController instance
-func NewHistoryController(db *gorm.DB) *HistoryController {
-	return &HistoryController{
-		historyLogic: logic.NewHistoryLogic(db),
-	}
-}
-
-// GetAllClaimableTxsByAddr defines the http get method behavior
-func (c *HistoryController) GetAllClaimableTxsByAddr(ctx *gin.Context) {
-	var req types.QueryByAddressRequest
-	if err := ctx.ShouldBind(&req); err != nil {
-		types.RenderJSON(ctx, types.ErrParameterInvalidNo, err, nil)
-		return
-	}
-	offset := (req.Page - 1) * req.PageSize
-	limit := req.PageSize
-	txs, total, err := c.historyLogic.GetClaimableTxsByAddress(ctx, common.HexToAddress(req.Address), offset, limit)
-	if err != nil {
-		types.RenderJSON(ctx, types.ErrGetClaimablesFailure, err, nil)
-		return
-	}
-
-	types.RenderJSON(ctx, types.Success, nil, &types.ResultData{Result: txs, Total: total})
-}
-
-// GetAllTxsByAddr defines the http get method behavior
-func (c *HistoryController) GetAllTxsByAddr(ctx *gin.Context) {
-	var req types.QueryByAddressRequest
-	if err := ctx.ShouldBind(&req); err != nil {
-		types.RenderJSON(ctx, types.ErrParameterInvalidNo, err, nil)
-		return
-	}
-	offset := (req.Page - 1) * req.PageSize
-	limit := req.PageSize
-	message, total, err := c.historyLogic.GetTxsByAddress(ctx, common.HexToAddress(req.Address), offset, limit)
-	if err != nil {
-		types.RenderJSON(ctx, types.ErrGetTxsByAddrFailure, err, nil)
-		return
-	}
-	types.RenderJSON(ctx, types.Success, nil, &types.ResultData{Result: message, Total: total})
-}
-
-// PostQueryTxsByHash defines the http post method behavior
-func (c *HistoryController) PostQueryTxsByHash(ctx *gin.Context) {
-	var req types.QueryByHashRequest
-	if err := ctx.ShouldBindJSON(&req); err != nil {
-		types.RenderJSON(ctx, types.ErrParameterInvalidNo, err, nil)
-		return
-	}
-	result, err := c.historyLogic.GetTxsByHashes(ctx, req.Txs)
-	if err != nil {
-		types.RenderJSON(ctx, types.ErrGetTxsByHashFailure, err, nil)
-		return
-	}
-	types.RenderJSON(ctx, types.Success, nil, &types.ResultData{Result: result, Total: 0})
-}

bridge-history-api/internal/logic/batch_logic.go

@@ -1,35 +0,0 @@
-package logic
-
-import (
-	"context"
-
-	"github.com/ethereum/go-ethereum/log"
-	"gorm.io/gorm"
-
-	"bridge-history-api/orm"
-)
-
-// BatchLogic example service.
-type BatchLogic struct {
-	rollupOrm *orm.RollupBatch
-}
-
-// NewBatchLogic returns services backed with a "db"
-func NewBatchLogic(db *gorm.DB) *BatchLogic {
-	logic := &BatchLogic{rollupOrm: orm.NewRollupBatch(db)}
-	return logic
-}
-
-// GetWithdrawRootByBatchIndex get withdraw root by batch index from db
-func (b *BatchLogic) GetWithdrawRootByBatchIndex(ctx context.Context, batchIndex uint64) (string, error) {
-	batch, err := b.rollupOrm.GetRollupBatchByIndex(ctx, batchIndex)
-	if err != nil {
-		log.Debug("getWithdrawRootByBatchIndex failed", "error", err)
-		return "", err
-	}
-	if batch == nil {
-		log.Debug("getWithdrawRootByBatchIndex failed", "error", "batch not found")
-		return "", nil
-	}
-	return batch.WithdrawRoot, nil
-}

bridge-history-api/internal/logic/history_logic.go

@@ -1,212 +0,0 @@
-package logic
-
-import (
-	"context"
-	"strconv"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
-	"gorm.io/gorm"
-
-	"bridge-history-api/internal/types"
-	"bridge-history-api/orm"
-)
-
-// HistoryLogic example service.
-type HistoryLogic struct {
-	db *gorm.DB
-}
-
-// NewHistoryLogic returns services backed with a "db"
-func NewHistoryLogic(db *gorm.DB) *HistoryLogic {
-	logic := &HistoryLogic{db: db}
-	return logic
-}
-
-// getCrossTxClaimInfo get UserClaimInfos by address
-func getCrossTxClaimInfo(ctx context.Context, msgHash string, db *gorm.DB) *types.UserClaimInfo {
-	l2SentMsgOrm := orm.NewL2SentMsg(db)
-	rollupOrm := orm.NewRollupBatch(db)
-	l2sentMsg, err := l2SentMsgOrm.GetL2SentMsgByHash(ctx, msgHash)
-	if err != nil || l2sentMsg == nil {
-		log.Debug("getCrossTxClaimInfo failed", "error", err)
-		return &types.UserClaimInfo{}
-	}
-	batch, err := rollupOrm.GetRollupBatchByIndex(ctx, l2sentMsg.BatchIndex)
-	if err != nil {
-		log.Debug("getCrossTxClaimInfo failed", "error", err)
-		return &types.UserClaimInfo{}
-	}
-	return &types.UserClaimInfo{
-		From:       l2sentMsg.Sender,
-		To:         l2sentMsg.Target,
-		Value:      l2sentMsg.Value,
-		Nonce:      strconv.FormatUint(l2sentMsg.Nonce, 10),
-		Message:    l2sentMsg.MsgData,
-		Proof:      "0x" + l2sentMsg.MsgProof,
-		BatchHash:  batch.BatchHash,
-		BatchIndex: strconv.FormatUint(l2sentMsg.BatchIndex, 10),
-	}
-
-}
-
-func updateCrossTxHash(ctx context.Context, msgHash string, txInfo *types.TxHistoryInfo, db *gorm.DB) {
-	relayed := orm.NewRelayedMsg(db)
-	relayed, err := relayed.GetRelayedMsgByHash(ctx, msgHash)
-	if err != nil {
-		log.Debug("updateCrossTxHash failed", "error", err)
-		return
-	}
-	if relayed == nil {
-		return
-	}
-	if relayed.Layer1Hash != "" {
-		txInfo.FinalizeTx.Hash = relayed.Layer1Hash
-		txInfo.FinalizeTx.BlockNumber = relayed.Height
-		return
-	}
-	if relayed.Layer2Hash != "" {
-		txInfo.FinalizeTx.Hash = relayed.Layer2Hash
-		txInfo.FinalizeTx.BlockNumber = relayed.Height
-		return
-	}
-
-}
-
-// GetClaimableTxsByAddress get all claimable txs under given address
-func (h *HistoryLogic) GetClaimableTxsByAddress(ctx context.Context, address common.Address, offset int, limit int) ([]*types.TxHistoryInfo, uint64, error) {
-	var txHistories []*types.TxHistoryInfo
-	l2SentMsgOrm := orm.NewL2SentMsg(h.db)
-	l2CrossMsgOrm := orm.NewCrossMsg(h.db)
-	total, err := l2SentMsgOrm.GetClaimableL2SentMsgByAddressTotalNum(ctx, address.Hex())
-	if err != nil || total == 0 {
-		return txHistories, 0, err
-	}
-	results, err := l2SentMsgOrm.GetClaimableL2SentMsgByAddressWithOffset(ctx, address.Hex(), offset, limit)
-	if err != nil || len(results) == 0 {
-		return txHistories, 0, err
-	}
-	var msgHashList []string
-	for _, result := range results {
-		msgHashList = append(msgHashList, result.MsgHash)
-	}
-	crossMsgs, err := l2CrossMsgOrm.GetL2CrossMsgByMsgHashList(ctx, msgHashList)
-	// crossMsgs can be empty, because they can be emitted by user directly call contract
-	if err != nil {
-		return txHistories, 0, err
-	}
-	crossMsgMap := make(map[string]*orm.CrossMsg)
-	for _, crossMsg := range crossMsgs {
-		crossMsgMap[crossMsg.MsgHash] = crossMsg
-	}
-	for _, result := range results {
-		txInfo := &types.TxHistoryInfo{
-			Hash:        result.TxHash,
-			IsL1:        false,
-			BlockNumber: result.Height,
-			FinalizeTx:  &types.Finalized{},
-			ClaimInfo:   getCrossTxClaimInfo(ctx, result.MsgHash, h.db),
-		}
-		if crossMsg, exist := crossMsgMap[result.MsgHash]; exist {
-			txInfo.Amount = crossMsg.Amount
-			txInfo.To = crossMsg.Target
-			txInfo.BlockTimestamp = crossMsg.Timestamp
-			txInfo.CreatedAt = crossMsg.CreatedAt
-			txInfo.L1Token = crossMsg.Layer1Token
-			txInfo.L2Token = crossMsg.Layer2Token
-		}
-		txHistories = append(txHistories, txInfo)
-	}
-	return txHistories, total, err
-}
-
-// GetTxsByAddress get all txs under given address
-func (h *HistoryLogic) GetTxsByAddress(ctx context.Context, address common.Address, offset int, limit int) ([]*types.TxHistoryInfo, uint64, error) {
-	var txHistories []*types.TxHistoryInfo
-	utilOrm := orm.NewCrossMsg(h.db)
-	total, err := utilOrm.GetTotalCrossMsgCountByAddress(ctx, address.String())
-	if err != nil || total == 0 {
-		return txHistories, 0, err
-	}
-	result, err := utilOrm.GetCrossMsgsByAddressWithOffset(ctx, address.String(), offset, limit)
-
-	if err != nil {
-		return nil, 0, err
-	}
-	for _, msg := range result {
-		txHistory := &types.TxHistoryInfo{
-			Hash:           msg.Layer1Hash + msg.Layer2Hash,
-			Amount:         msg.Amount,
-			To:             msg.Target,
-			L1Token:        msg.Layer1Token,
-			L2Token:        msg.Layer2Token,
-			IsL1:           msg.MsgType == int(orm.Layer1Msg),
-			BlockNumber:    msg.Height,
-			BlockTimestamp: msg.Timestamp,
-			CreatedAt:      msg.CreatedAt,
-			FinalizeTx: &types.Finalized{
-				Hash: "",
-			},
-			ClaimInfo: getCrossTxClaimInfo(ctx, msg.MsgHash, h.db),
-		}
-		updateCrossTxHash(ctx, msg.MsgHash, txHistory, h.db)
-		txHistories = append(txHistories, txHistory)
-	}
-	return txHistories, total, nil
-}
-
-// GetTxsByHashes get tx infos under given tx hashes
-func (h *HistoryLogic) GetTxsByHashes(ctx context.Context, hashes []string) ([]*types.TxHistoryInfo, error) {
-	txHistories := make([]*types.TxHistoryInfo, 0)
-	CrossMsgOrm := orm.NewCrossMsg(h.db)
-	for _, hash := range hashes {
-		l1result, err := CrossMsgOrm.GetL1CrossMsgByHash(ctx, common.HexToHash(hash))
-		if err != nil {
-			return nil, err
-		}
-		if l1result != nil {
-			txHistory := &types.TxHistoryInfo{
-				Hash:           l1result.Layer1Hash,
-				Amount:         l1result.Amount,
-				To:             l1result.Target,
-				IsL1:           true,
-				L1Token:        l1result.Layer1Token,
-				L2Token:        l1result.Layer2Token,
-				BlockNumber:    l1result.Height,
-				BlockTimestamp: l1result.Timestamp,
-				CreatedAt:      l1result.CreatedAt,
-				FinalizeTx: &types.Finalized{
-					Hash: "",
-				},
-			}
-			updateCrossTxHash(ctx, l1result.MsgHash, txHistory, h.db)
-			txHistories = append(txHistories, txHistory)
-			continue
-		}
-		l2result, err := CrossMsgOrm.GetL2CrossMsgByHash(ctx, common.HexToHash(hash))
-		if err != nil {
-			return nil, err
-		}
-		if l2result != nil {
-			txHistory := &types.TxHistoryInfo{
-				Hash:           l2result.Layer2Hash,
-				Amount:         l2result.Amount,
-				To:             l2result.Target,
-				IsL1:           false,
-				L1Token:        l2result.Layer1Token,
-				L2Token:        l2result.Layer2Token,
-				BlockNumber:    l2result.Height,
-				BlockTimestamp: l2result.Timestamp,
-				CreatedAt:      l2result.CreatedAt,
-				FinalizeTx: &types.Finalized{
-					Hash: "",
-				},
-				ClaimInfo: getCrossTxClaimInfo(ctx, l2result.MsgHash, h.db),
-			}
-			updateCrossTxHash(ctx, l2result.MsgHash, txHistory, h.db)
-			txHistories = append(txHistories, txHistory)
-			continue
-		}
-	}
-	return txHistories, nil
-}

bridge-history-api/internal/route/route.go

@@ -1,28 +0,0 @@
-package route
-
-import (
-	"time"
-
-	"github.com/gin-contrib/cors"
-	"github.com/gin-gonic/gin"
-
-	"bridge-history-api/config"
-	"bridge-history-api/internal/controller"
-)
-
-// Route routes the APIs
-func Route(router *gin.Engine, conf *config.Config) {
-	router.Use(cors.New(cors.Config{
-		AllowOrigins:     []string{"*"},
-		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE"},
-		AllowHeaders:     []string{"Origin", "Content-Type", "Authorization"},
-		AllowCredentials: true,
-		MaxAge:           12 * time.Hour,
-	}))
-
-	r := router.Group("api/")
-	r.GET("/txs", controller.HistoryCtrler.GetAllTxsByAddr)
-	r.POST("/txsbyhashes", controller.HistoryCtrler.PostQueryTxsByHash)
-	r.GET("/claimable", controller.HistoryCtrler.GetAllClaimableTxsByAddr)
-	r.GET("/withdraw_root", controller.BatchCtrler.GetWithdrawRootByBatchIndex)
-}

bridge-history-api/internal/types/history_types.go

@@ -1,105 +0,0 @@
-package types
-
-import (
-	"net/http"
-	"time"
-
-	"github.com/gin-gonic/gin"
-)
-
-const (
-	// Success shows OK.
-	Success = 0
-	// ErrParameterInvalidNo is invalid params
-	ErrParameterInvalidNo = 40001
-	// ErrGetClaimablesFailure is getting all claimables txs error
-	ErrGetClaimablesFailure = 40002
-	// ErrGetTxsByHashFailure is getting txs by hash list error
-	ErrGetTxsByHashFailure = 40003
-	// ErrGetTxsByAddrFailure is getting txs by address error
-	ErrGetTxsByAddrFailure = 40004
-	// ErrGetWithdrawRootByBatchIndexFailure is getting withdraw root by batch index error
-	ErrGetWithdrawRootByBatchIndexFailure = 40005
-)
-
-// QueryByAddressRequest the request parameter of address api
-type QueryByAddressRequest struct {
-	Address  string `form:"address" binding:"required"`
-	Page     int    `form:"page" binding:"required"`
-	PageSize int    `form:"page_size" binding:"required"`
-}
-
-// QueryByHashRequest the request parameter of hash api
-type QueryByHashRequest struct {
-	Txs []string `raw:"txs" binding:"required"`
-}
-
-// QueryByBatchIndexRequest the request parameter of batch index api
-type QueryByBatchIndexRequest struct {
-	// BatchIndex can not be 0, because we dont decode the genesis block
-	BatchIndex uint64 `form:"batch_index" binding:"required"`
-}
-
-// ResultData contains return txs and total
-type ResultData struct {
-	Result []*TxHistoryInfo `json:"result"`
-	Total  uint64           `json:"total"`
-}
-
-// Response the response schema
-type Response struct {
-	ErrCode int         `json:"errcode"`
-	ErrMsg  string      `json:"errmsg"`
-	Data    interface{} `json:"data"`
-}
-
-// Finalized the schema of tx finalized infos
-type Finalized struct {
-	Hash           string     `json:"hash"`
-	Amount         string     `json:"amount"`
-	To             string     `json:"to"` // useless
-	IsL1           bool       `json:"isL1"`
-	BlockNumber    uint64     `json:"blockNumber"`
-	BlockTimestamp *time.Time `json:"blockTimestamp"` // uselesss
-}
-
-// UserClaimInfo the schema of tx claim infos
-type UserClaimInfo struct {
-	From       string `json:"from"`
-	To         string `json:"to"`
-	Value      string `json:"value"`
-	Nonce      string `json:"nonce"`
-	BatchHash  string `json:"batch_hash"`
-	Message    string `json:"message"`
-	Proof      string `json:"proof"`
-	BatchIndex string `json:"batch_index"`
-}
-
-// TxHistoryInfo the schema of tx history infos
-type TxHistoryInfo struct {
-	Hash           string         `json:"hash"`
-	Amount         string         `json:"amount"`
-	To             string         `json:"to"` // useless
-	IsL1           bool           `json:"isL1"`
-	L1Token        string         `json:"l1Token"`
-	L2Token        string         `json:"l2Token"`
-	BlockNumber    uint64         `json:"blockNumber"`
-	BlockTimestamp *time.Time     `json:"blockTimestamp"` // useless
-	FinalizeTx     *Finalized     `json:"finalizeTx"`
-	ClaimInfo      *UserClaimInfo `json:"claimInfo"`
-	CreatedAt      *time.Time     `json:"createdTime"`
-}
-
-// RenderJSON renders response with json
-func RenderJSON(ctx *gin.Context, errCode int, err error, data interface{}) {
-	var errMsg string
-	if err != nil {
-		errMsg = err.Error()
-	}
-	renderData := Response{
-		ErrCode: errCode,
-		ErrMsg:  errMsg,
-		Data:    data,
-	}
-	ctx.JSON(http.StatusOK, renderData)
-}

bridge-history-api/model/request.go

@@ -0,0 +1,11 @@
+package model
+
+type QueryByAddressRequest struct {
+	Address string `url:"address"`
+	Offset  int    `url:"offset"`
+	Limit   int    `url:"limit"`
+}
+
+type QueryByHashRequest struct {
+	Txs []string `url:"txs"`
+}

bridge-history-api/model/response.go

@@ -0,0 +1,18 @@
+package model
+
+import "bridge-history-api/service"
+
+type Data struct {
+	Result []*service.TxHistoryInfo `json:"result"`
+	Total  int                      `json:"total"`
+}
+
+type QueryByAddressResponse struct {
+	Message string `json:"message"`
+	Data    *Data  `json:"data"`
+}
+
+type QueryByHashResponse struct {
+	Message string `json:"message"`
+	Data    *Data  `json:"data"`
+}

bridge-history-api/orm/batch.go

@@ -1,104 +0,0 @@
-package orm
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/ethereum/go-ethereum/log"
-	"gorm.io/gorm"
-)
-
-// RollupBatch is the struct for rollup_batch table
-type RollupBatch struct {
-	db *gorm.DB `gorm:"column:-"`
-
-	ID               uint64         `json:"id" gorm:"column:id"`
-	BatchIndex       uint64         `json:"batch_index" gorm:"column:batch_index"`
-	BatchHash        string         `json:"batch_hash" gorm:"column:batch_hash"`
-	CommitHeight     uint64         `json:"commit_height" gorm:"column:commit_height"`
-	StartBlockNumber uint64         `json:"start_block_number" gorm:"column:start_block_number"`
-	EndBlockNumber   uint64         `json:"end_block_number" gorm:"column:end_block_number"`
-	WithdrawRoot     string         `json:"withdraw_root" gorm:"column:withdraw_root;default:NULL"`
-	CreatedAt        *time.Time     `json:"created_at" gorm:"column:created_at"`
-	UpdatedAt        *time.Time     `json:"updated_at" gorm:"column:updated_at"`
-	DeletedAt        gorm.DeletedAt `json:"deleted_at" gorm:"column:deleted_at;default:NULL"`
-}
-
-// NewRollupBatch create an RollupBatch instance
-func NewRollupBatch(db *gorm.DB) *RollupBatch {
-	return &RollupBatch{db: db}
-}
-
-// TableName returns the table name for the Batch model.
-func (*RollupBatch) TableName() string {
-	return "rollup_batch"
-}
-
-// GetLatestRollupBatchProcessedHeight return latest processed height from rollup_batch table
-func (r *RollupBatch) GetLatestRollupBatchProcessedHeight(ctx context.Context) (uint64, error) {
-	var result RollupBatch
-	err := r.db.WithContext(ctx).Unscoped().Select("commit_height").Order("id desc").First(&result).Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return 0, nil
-		}
-		return 0, fmt.Errorf("RollupBatch.GetLatestRollupBatchProcessedHeight error: %w", err)
-	}
-	return result.CommitHeight, nil
-}
-
-// GetLatestRollupBatch return the latest rollup batch in db
-func (r *RollupBatch) GetLatestRollupBatch(ctx context.Context) (*RollupBatch, error) {
-	var result RollupBatch
-	err := r.db.WithContext(ctx).Model(&RollupBatch{}).Where("batch_hash is not NULL").Order("batch_index desc").First(&result).Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		}
-		return nil, fmt.Errorf("RollupBatch.GetLatestRollupBatch error: %w", err)
-	}
-	return &result, nil
-}
-
-// GetRollupBatchByIndex return the rollup batch by index
-func (r *RollupBatch) GetRollupBatchByIndex(ctx context.Context, index uint64) (*RollupBatch, error) {
-	var result RollupBatch
-	err := r.db.WithContext(ctx).Model(&RollupBatch{}).Where("batch_index = ?", index).First(&result).Error
-	if err != nil {
-		return nil, fmt.Errorf("RollupBatch.GetRollupBatchByIndex error: %w", err)
-	}
-	return &result, nil
-}
-
-// InsertRollupBatch batch insert rollup batch into db and return the transaction
-func (r *RollupBatch) InsertRollupBatch(ctx context.Context, batches []*RollupBatch, dbTx ...*gorm.DB) error {
-	if len(batches) == 0 {
-		return nil
-	}
-	db := r.db
-	if len(dbTx) > 0 && dbTx[0] != nil {
-		db = dbTx[0]
-	}
-	err := db.WithContext(ctx).Model(&RollupBatch{}).Create(&batches).Error
-	if err != nil {
-		batchIndexes := make([]uint64, 0, len(batches))
-		heights := make([]uint64, 0, len(batches))
-		for _, batch := range batches {
-			batchIndexes = append(batchIndexes, batch.BatchIndex)
-			heights = append(heights, batch.CommitHeight)
-		}
-		log.Error("failed to insert rollup batch", "batchIndexes", batchIndexes, "heights", heights)
-		return fmt.Errorf("RollupBatch.InsertRollupBatch error: %w", err)
-	}
-	return nil
-}
-
-// UpdateRollupBatchWithdrawRoot updates the withdraw_root column in rollup_batch table
-func (r *RollupBatch) UpdateRollupBatchWithdrawRoot(ctx context.Context, batchIndex uint64, withdrawRoot string) error {
-	err := r.db.WithContext(ctx).Model(&RollupBatch{}).Where("batch_index = ?", batchIndex).Update("withdraw_root", withdrawRoot).Error
-	if err != nil {
-		return fmt.Errorf("RollupBatch.UpdateRuollupBatch error: %w", err)
-	}
-	return nil
-}

bridge-history-api/orm/cross_msg.go

@@ -1,370 +0,0 @@
-package orm
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
-	"gorm.io/gorm"
-)
-
-// AssetType can be ETH/ERC20/ERC1155/ERC721
-type AssetType int
-
-// MsgType can be layer1/layer2 msg
-type MsgType int
-
-func (a AssetType) String() string {
-	switch a {
-	case ETH:
-		return "ETH"
-	case ERC20:
-		return "ERC20"
-	case ERC1155:
-		return "ERC1155"
-	case ERC721:
-		return "ERC721"
-	}
-	return "Unknown Asset Type"
-}
-
-const (
-	// ETH = 0
-	ETH AssetType = iota
-	// ERC20 = 1
-	ERC20
-	// ERC721 = 2
-	ERC721
-	// ERC1155 = 3
-	ERC1155
-)
-
-const (
-	// UnknownMsg = 0
-	UnknownMsg MsgType = iota
-	// Layer1Msg = 1
-	Layer1Msg
-	// Layer2Msg = 2
-	Layer2Msg
-)
-
-// CrossMsg represents a cross message from layer 1 to layer 2
-type CrossMsg struct {
-	db *gorm.DB `gorm:"column:-"`
-
-	ID           uint64         `json:"id" gorm:"column:id"`
-	MsgHash      string         `json:"msg_hash" gorm:"column:msg_hash"`
-	Height       uint64         `json:"height" gorm:"column:height"`
-	Sender       string         `json:"sender" gorm:"column:sender"`
-	Target       string         `json:"target" gorm:"column:target"`
-	Amount       string         `json:"amount" gorm:"column:amount"`
-	Layer1Hash   string         `json:"layer1_hash" gorm:"column:layer1_hash;default:''"`
-	Layer2Hash   string         `json:"layer2_hash" gorm:"column:layer2_hash;default:''"`
-	Layer1Token  string         `json:"layer1_token" gorm:"column:layer1_token;default:''"`
-	Layer2Token  string         `json:"layer2_token" gorm:"column:layer2_token;default:''"`
-	TokenIDs     string         `json:"token_ids" gorm:"column:token_ids;default:''"`
-	TokenAmounts string         `json:"token_amounts" gorm:"column:token_amounts;default:''"`
-	Asset        int            `json:"asset" gorm:"column:asset"`
-	MsgType      int            `json:"msg_type" gorm:"column:msg_type"`
-	Timestamp    *time.Time     `json:"timestamp" gorm:"column:block_timestamp;default;NULL"`
-	CreatedAt    *time.Time     `json:"created_at" gorm:"column:created_at"`
-	UpdatedAt    *time.Time     `json:"updated_at" gorm:"column:updated_at"`
-	DeletedAt    gorm.DeletedAt `json:"deleted_at" gorm:"column:deleted_at;default:NULL"`
-}
-
-// TableName returns the table name for the CrossMsg model.
-func (*CrossMsg) TableName() string {
-	return "cross_message"
-}
-
-// NewCrossMsg returns a new instance of CrossMsg.
-func NewCrossMsg(db *gorm.DB) *CrossMsg {
-	return &CrossMsg{db: db}
-}
-
-// L1 Cross Msgs Operations
-
-// GetL1CrossMsgByHash returns layer1 cross message by given hash
-func (c *CrossMsg) GetL1CrossMsgByHash(ctx context.Context, l1Hash common.Hash) (*CrossMsg, error) {
-	var result CrossMsg
-	err := c.db.WithContext(ctx).Model(&CrossMsg{}).Where("layer1_hash = ? AND msg_type = ?", l1Hash.String(), Layer1Msg).First(&result).Error
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, nil
-		}
-		return nil, fmt.Errorf("CrossMsg.GetL1CrossMsgByHash error: %w", err)
-	}
-	return &result, nil
-}
-
-// GetLatestL1ProcessedHeight returns the latest processed height of layer1 cross messages
-func (c *CrossMsg) GetLatestL1ProcessedHeight(ctx context.Context) (uint64, error) {
-	var result CrossMsg
-	err := c.db.WithContext(ctx).Model(&CrossMsg{}).Where("msg_type = ?", Layer1Msg).
-		Select("height").
-		Order("id DESC").
-		First(&result).
-		Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return 0, nil
-		}
-		return 0, fmt.Errorf("CrossMsg.GetLatestL1ProcessedHeight error: %w", err)
-	}
-	return result.Height, nil
-}
-
-// GetL1EarliestNoBlockTimestampHeight returns the earliest layer1 cross message height which has no block timestamp
-func (c *CrossMsg) GetL1EarliestNoBlockTimestampHeight(ctx context.Context) (uint64, error) {
-	var result CrossMsg
-	err := c.db.WithContext(ctx).Model(&CrossMsg{}).
-		Where("block_timestamp IS NULL AND msg_type = ?", Layer1Msg).
-		Select("height").
-		Order("height ASC").
-		First(&result).
-		Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return 0, nil
-		}
-		return 0, fmt.Errorf("CrossMsg.GetL1EarliestNoBlockTimestampHeight error: %w", err)
-	}
-	return result.Height, nil
-}
-
-// InsertL1CrossMsg batch insert layer1 cross messages into db
-func (c *CrossMsg) InsertL1CrossMsg(ctx context.Context, messages []*CrossMsg, dbTx ...*gorm.DB) error {
-	if len(messages) == 0 {
-		return nil
-	}
-	db := c.db
-	if len(dbTx) > 0 && dbTx[0] != nil {
-		db = dbTx[0]
-	}
-	db.WithContext(ctx)
-	err := db.Model(&CrossMsg{}).Create(&messages).Error
-	if err != nil {
-		l1hashes := make([]string, 0, len(messages))
-		heights := make([]uint64, 0, len(messages))
-		for _, msg := range messages {
-			l1hashes = append(l1hashes, msg.Layer1Hash)
-			heights = append(heights, msg.Height)
-		}
-		log.Error("failed to insert l1 cross messages", "l1hashes", l1hashes, "heights", heights, "err", err)
-		return fmt.Errorf("CrossMsg.InsertL1CrossMsg error: %w", err)
-	}
-	return nil
-}
-
-// UpdateL1CrossMsgHash update l1 cross msg hash in db, no need to check msg_type since layer1_hash wont be empty if its layer1 msg
-func (c *CrossMsg) UpdateL1CrossMsgHash(ctx context.Context, l1Hash, msgHash common.Hash, dbTx ...*gorm.DB) error {
-	db := c.db
-	if len(dbTx) > 0 && dbTx[0] != nil {
-		db = dbTx[0]
-	}
-	db.WithContext(ctx)
-	err := c.db.Model(&CrossMsg{}).Where("layer1_hash = ?", l1Hash.Hex()).Update("msg_hash", msgHash.Hex()).Error
-	if err != nil {
-		return fmt.Errorf("CrossMsg.UpdateL1CrossMsgHash error: %w", err)
-	}
-	return nil
-
-}
-
-// UpdateL1BlockTimestamp update layer1 block timestamp
-func (c *CrossMsg) UpdateL1BlockTimestamp(ctx context.Context, height uint64, timestamp time.Time) error {
-	err := c.db.WithContext(ctx).Model(&CrossMsg{}).
-		Where("height = ? AND msg_type = ?", height, Layer1Msg).
-		Update("block_timestamp", timestamp).Error
-	if err != nil {
-		return fmt.Errorf("CrossMsg.UpdateL1BlockTimestamp error: %w", err)
-	}
-	return err
-}
-
-// DeleteL1CrossMsgAfterHeight soft delete layer1 cross messages after given height
-func (c *CrossMsg) DeleteL1CrossMsgAfterHeight(ctx context.Context, height uint64, dbTx ...*gorm.DB) error {
-	db := c.db
-	if len(dbTx) > 0 && dbTx[0] != nil {
-		db = dbTx[0]
-	}
-	db.WithContext(ctx)
-	err := db.Delete(&CrossMsg{}, "height > ? AND msg_type = ?", height, Layer1Msg).Error
-	if err != nil {
-		return fmt.Errorf("CrossMsg.DeleteL1CrossMsgAfterHeight error: %w", err)
-	}
-	return nil
-}
-
-// L2 Cross Msgs Operations
-
-// GetL2CrossMsgByHash returns layer2 cross message by given hash
-func (c *CrossMsg) GetL2CrossMsgByHash(ctx context.Context, l2Hash common.Hash) (*CrossMsg, error) {
-	var result CrossMsg
-	err := c.db.WithContext(ctx).Model(&CrossMsg{}).Where("layer2_hash = ? AND msg_type = ?", l2Hash.String(), Layer2Msg).First(&result).Error
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, nil
-		}
-		return nil, fmt.Errorf("CrossMsg.GetL2CrossMsgByHash error: %w", err)
-	}
-	return &result, nil
-}
-
-// GetLatestL2ProcessedHeight returns the latest processed height of layer2 cross messages
-func (c *CrossMsg) GetLatestL2ProcessedHeight(ctx context.Context) (uint64, error) {
-	var result CrossMsg
-	err := c.db.WithContext(ctx).Model(&CrossMsg{}).
-		Select("height").
-		Where("msg_type = ?", Layer2Msg).
-		Order("id DESC").
-		First(&result).
-		Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return 0, nil
-		}
-		return 0, fmt.Errorf("CrossMsg.GetLatestL2ProcessedHeight error: %w", err)
-	}
-	return result.Height, nil
-}
-
-// GetL2CrossMsgByMsgHashList returns layer2 cross messages under given msg hashes
-func (c *CrossMsg) GetL2CrossMsgByMsgHashList(ctx context.Context, msgHashList []string) ([]*CrossMsg, error) {
-	var results []*CrossMsg
-	err := c.db.WithContext(ctx).Model(&CrossMsg{}).
-		Where("msg_hash IN (?) AND msg_type = ?", msgHashList, Layer2Msg).
-		Find(&results).
-		Error
-
-	if err != nil {
-		return nil, fmt.Errorf("CrossMsg.GetL2CrossMsgByMsgHashList error: %w", err)
-	}
-	if len(results) == 0 {
-		log.Debug("no CrossMsg under given msg hashes", "msg hash list", msgHashList)
-	}
-	return results, nil
-}
-
-// GetL2EarliestNoBlockTimestampHeight returns the earliest layer2 cross message height which has no block timestamp
-func (c *CrossMsg) GetL2EarliestNoBlockTimestampHeight(ctx context.Context) (uint64, error) {
-	var result CrossMsg
-	err := c.db.WithContext(ctx).Model(&CrossMsg{}).
-		Where("block_timestamp IS NULL AND msg_type = ?", Layer2Msg).
-		Select("height").
-		Order("height ASC").
-		First(&result).
-		Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return 0, nil
-		}
-		return 0, fmt.Errorf("CrossMsg.GetL2EarliestNoBlockTimestampHeight error: %w", err)
-	}
-	return result.Height, nil
-}
-
-// InsertL2CrossMsg batch insert layer2 cross messages
-func (c *CrossMsg) InsertL2CrossMsg(ctx context.Context, messages []*CrossMsg, dbTx ...*gorm.DB) error {
-	if len(messages) == 0 {
-		return nil
-	}
-	db := c.db
-	if len(dbTx) > 0 && dbTx[0] != nil {
-		db = dbTx[0]
-	}
-	db.WithContext(ctx)
-	err := db.Model(&CrossMsg{}).Create(&messages).Error
-	if err != nil {
-		l2hashes := make([]string, 0, len(messages))
-		heights := make([]uint64, 0, len(messages))
-		for _, msg := range messages {
-			l2hashes = append(l2hashes, msg.Layer2Hash)
-			heights = append(heights, msg.Height)
-		}
-		log.Error("failed to insert l2 cross messages", "l2hashes", l2hashes, "heights", heights, "err", err)
-		return fmt.Errorf("CrossMsg.InsertL2CrossMsg error: %w", err)
-	}
-	return nil
-}
-
-// UpdateL2CrossMsgHash update layer2 cross message hash
-func (c *CrossMsg) UpdateL2CrossMsgHash(ctx context.Context, l2Hash, msgHash common.Hash, dbTx ...*gorm.DB) error {
-	db := c.db
-	if len(dbTx) > 0 && dbTx[0] != nil {
-		db = dbTx[0]
-	}
-	db.WithContext(ctx)
-	err := db.Model(&CrossMsg{}).
-		Where("layer2_hash = ?", l2Hash.String()).
-		Update("msg_hash", msgHash.String()).
-		Error
-	if err != nil {
-		return fmt.Errorf("CrossMsg.UpdateL2CrossMsgHash error: %w", err)
-	}
-	return nil
-}
-
-// UpdateL2BlockTimestamp update layer2 cross message block timestamp
-func (c *CrossMsg) UpdateL2BlockTimestamp(ctx context.Context, height uint64, timestamp time.Time) error {
-	err := c.db.WithContext(ctx).Model(&CrossMsg{}).
-		Where("height = ? AND msg_type = ?", height, Layer2Msg).
-		Update("block_timestamp", timestamp).Error
-	if err != nil {
-		return fmt.Errorf("CrossMsg.UpdateL2BlockTimestamp error: %w", err)
-	}
-	return nil
-}
-
-// DeleteL2CrossMsgFromHeight delete layer2 cross messages from given height
-func (c *CrossMsg) DeleteL2CrossMsgFromHeight(ctx context.Context, height uint64, dbTx ...*gorm.DB) error {
-	db := c.db
-	if len(dbTx) > 0 && dbTx[0] != nil {
-		db = dbTx[0]
-	}
-	db.WithContext(ctx)
-	err := db.Model(&CrossMsg{}).Delete("height > ? AND msg_type = ?", height, Layer2Msg).Error
-	if err != nil {
-		return fmt.Errorf("CrossMsg.DeleteL2CrossMsgFromHeight error: %w", err)
-
-	}
-	return nil
-}
-
-// General Operations
-
-// GetTotalCrossMsgCountByAddress get total cross msg count by address
-func (c *CrossMsg) GetTotalCrossMsgCountByAddress(ctx context.Context, sender string) (uint64, error) {
-	var count int64
-	err := c.db.WithContext(ctx).Model(&CrossMsg{}).
-		Where("sender = ?", sender).
-		Count(&count).
-		Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return 0, nil
-		}
-		return 0, fmt.Errorf("CrossMsg.GetTotalCrossMsgCountByAddress error: %w", err)
-
-	}
-	return uint64(count), nil
-}
-
-// GetCrossMsgsByAddressWithOffset get cross msgs by address with offset
-func (c *CrossMsg) GetCrossMsgsByAddressWithOffset(ctx context.Context, sender string, offset int, limit int) ([]CrossMsg, error) {
-	var messages []CrossMsg
-	err := c.db.WithContext(ctx).Model(&CrossMsg{}).
-		Where("sender = ?", sender).
-		Order("block_timestamp DESC NULLS FIRST, id DESC").
-		Limit(limit).
-		Offset(offset).
-		Find(&messages).
-		Error
-	if err != nil {
-		return nil, fmt.Errorf("CrossMsg.GetCrossMsgsByAddressWithOffset error: %w", err)
-	}
-	return messages, nil
-}

bridge-history-api/orm/l2_sent_msg.go

@@ -1,219 +0,0 @@
-package orm
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/ethereum/go-ethereum/log"
-	"gorm.io/gorm"
-)
-
-// L2SentMsg defines the struct for l2_sent_msg table record
-type L2SentMsg struct {
-	db *gorm.DB `gorm:"column:-"`
-
-	ID             uint64         `json:"id" gorm:"column:id"`
-	OriginalSender string         `json:"original_sender" gorm:"column:original_sender;default:''"`
-	TxHash         string         `json:"tx_hash" gorm:"column:tx_hash"`
-	MsgHash        string         `json:"msg_hash" gorm:"column:msg_hash"`
-	Sender         string         `json:"sender" gorm:"column:sender"`
-	Target         string         `json:"target" gorm:"column:target"`
-	Value          string         `json:"value" gorm:"column:value"`
-	Height         uint64         `json:"height" gorm:"column:height"`
-	Nonce          uint64         `json:"nonce" gorm:"column:nonce"`
-	BatchIndex     uint64         `json:"batch_index" gorm:"column:batch_index;default:0"`
-	MsgProof       string         `json:"msg_proof" gorm:"column:msg_proof;default:''"`
-	MsgData        string         `json:"msg_data" gorm:"column:msg_data;default:''"`
-	CreatedAt      *time.Time     `json:"created_at" gorm:"column:created_at"`
-	UpdatedAt      *time.Time     `json:"updated_at" gorm:"column:updated_at"`
-	DeletedAt      gorm.DeletedAt `json:"deleted_at" gorm:"column:deleted_at;default:NULL"`
-}
-
-// NewL2SentMsg create an NewL2SentMsg instance
-func NewL2SentMsg(db *gorm.DB) *L2SentMsg {
-	return &L2SentMsg{db: db}
-}
-
-// TableName returns the table name for the L2SentMsg model.
-func (*L2SentMsg) TableName() string {
-	return "l2_sent_msg"
-}
-
-// GetL2SentMsgByHash get l2 sent msg by hash
-func (l *L2SentMsg) GetL2SentMsgByHash(ctx context.Context, msgHash string) (*L2SentMsg, error) {
-	var result L2SentMsg
-	err := l.db.WithContext(ctx).Model(&L2SentMsg{}).
-		Where("msg_hash = ?", msgHash).
-		First(&result).
-		Error
-	if err != nil {
-		return nil, fmt.Errorf("L2SentMsg.GetL2SentMsgByHash error: %w", err)
-	}
-	return &result, nil
-}
-
-// GetLatestSentMsgHeightOnL2 get latest sent msg height on l2
-func (l *L2SentMsg) GetLatestSentMsgHeightOnL2(ctx context.Context) (uint64, error) {
-	var result L2SentMsg
-	err := l.db.WithContext(ctx).Model(&L2SentMsg{}).
-		Select("height").
-		Order("nonce DESC").
-		First(&result).Error
-
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return 0, nil
-		}
-		return 0, fmt.Errorf("L2SentMsg.GetLatestSentMsgHeightOnL2 error: %w", err)
-
-	}
-	return result.Height, nil
-}
-
-// GetClaimableL2SentMsgByAddressWithOffset get claimable l2 sent msg by address with offset
-func (l *L2SentMsg) GetClaimableL2SentMsgByAddressWithOffset(ctx context.Context, address string, offset int, limit int) ([]*L2SentMsg, error) {
-	var results []*L2SentMsg
-	err := l.db.WithContext(ctx).Raw(`SELECT * FROM l2_sent_msg WHERE id NOT IN (SELECT l2_sent_msg.id FROM l2_sent_msg INNER JOIN relayed_msg ON l2_sent_msg.msg_hash = relayed_msg.msg_hash WHERE l2_sent_msg.deleted_at IS NULL AND relayed_msg.deleted_at IS NULL) AND (original_sender=$1 OR sender = $1) AND msg_proof !='' ORDER BY id DESC LIMIT $2 OFFSET $3;`, address, limit, offset).
-		Scan(&results).Error
-	if err != nil {
-		return nil, fmt.Errorf("L2SentMsg.GetClaimableL2SentMsgByAddressWithOffset error: %w", err)
-	}
-	return results, nil
-}
-
-// GetClaimableL2SentMsgByAddressTotalNum get claimable l2 sent msg by address total num
-func (l *L2SentMsg) GetClaimableL2SentMsgByAddressTotalNum(ctx context.Context, address string) (uint64, error) {
-	var count uint64
-	err := l.db.WithContext(ctx).Raw(`SELECT COUNT(*) FROM l2_sent_msg WHERE id NOT IN (SELECT l2_sent_msg.id FROM l2_sent_msg INNER JOIN relayed_msg ON l2_sent_msg.msg_hash = relayed_msg.msg_hash WHERE l2_sent_msg.deleted_at IS NULL AND relayed_msg.deleted_at IS NULL) AND (original_sender=$1 OR sender = $1) AND msg_proof !='';`, address).
-		Scan(&count).Error
-	if err != nil {
-		return 0, fmt.Errorf("L2SentMsg.GetClaimableL2SentMsgByAddressTotalNum error: %w", err)
-	}
-	return count, nil
-}
-
-// GetLatestL2SentMsgBatchIndex get latest l2 sent msg batch index
-func (l *L2SentMsg) GetLatestL2SentMsgBatchIndex(ctx context.Context) (int64, error) {
-	var result L2SentMsg
-	err := l.db.WithContext(ctx).Model(&L2SentMsg{}).
-		Where("batch_index != 0").
-		Order("batch_index DESC").
-		Select("batch_index").
-		First(&result).
-		Error
-	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
-		return -1, nil
-	}
-	if err != nil {
-		return -1, fmt.Errorf("L2SentMsg.GetLatestL2SentMsgBatchIndex error: %w", err)
-	}
-	// Watch for overflow, tho its not likely to happen
-	return int64(result.BatchIndex), nil
-}
-
-// GetL2SentMsgMsgHashByHeightRange get l2 sent msg msg hash by height range
-func (l *L2SentMsg) GetL2SentMsgMsgHashByHeightRange(ctx context.Context, startHeight, endHeight uint64) ([]*L2SentMsg, error) {
-	var results []*L2SentMsg
-	err := l.db.WithContext(ctx).Model(&L2SentMsg{}).
-		Where("height >= ? AND height <= ?", startHeight, endHeight).
-		Order("nonce ASC").
-		Find(&results).
-		Error
-	if err != nil {
-		return nil, fmt.Errorf("L2SentMsg.GetL2SentMsgMsgHashByHeightRange error: %w", err)
-	}
-	return results, nil
-}
-
-// GetL2SentMessageByNonce get l2 sent message by nonce
-func (l *L2SentMsg) GetL2SentMessageByNonce(ctx context.Context, nonce uint64) (*L2SentMsg, error) {
-	var result L2SentMsg
-	err := l.db.WithContext(ctx).Model(&L2SentMsg{}).
-		Where("nonce = ?", nonce).
-		First(&result).
-		Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		}
-		return nil, fmt.Errorf("L2SentMsg.GetL2SentMessageByNonce error: %w", err)
-
-	}
-	return &result, nil
-}
-
-// GetLatestL2SentMsgLEHeight get latest l2 sent msg less than or equal to end block number
-func (l *L2SentMsg) GetLatestL2SentMsgLEHeight(ctx context.Context, endBlockNumber uint64) (*L2SentMsg, error) {
-	var result L2SentMsg
-	err := l.db.WithContext(ctx).Model(&L2SentMsg{}).
-		Where("height <= ?", endBlockNumber).
-		Order("nonce DESC").
-		First(&result).
-		Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		}
-		return nil, fmt.Errorf("L2SentMsg.GetLatestL2SentMsgLEHeight error: %w", err)
-
-	}
-	return &result, nil
-}
-
-// InsertL2SentMsg batch insert l2 sent msg
-func (l *L2SentMsg) InsertL2SentMsg(ctx context.Context, messages []*L2SentMsg, dbTx ...*gorm.DB) error {
-	if len(messages) == 0 {
-		return nil
-	}
-	db := l.db
-	if len(dbTx) > 0 && dbTx[0] != nil {
-		db = dbTx[0]
-	}
-	db.WithContext(ctx)
-	err := db.Model(&L2SentMsg{}).Create(&messages).Error
-	if err != nil {
-		l2hashes := make([]string, 0, len(messages))
-		heights := make([]uint64, 0, len(messages))
-		for _, msg := range messages {
-			l2hashes = append(l2hashes, msg.TxHash)
-			heights = append(heights, msg.Height)
-		}
-		log.Error("failed to insert l2 sent messages", "l2hashes", l2hashes, "heights", heights, "err", err)
-		return fmt.Errorf("L2SentMsg.InsertL2SentMsg error: %w", err)
-	}
-	return nil
-}
-
-// UpdateL2MessageProof update l2 message proof in db tx
-func (l *L2SentMsg) UpdateL2MessageProof(ctx context.Context, msgHash string, proof string, batchIndex uint64, dbTx ...*gorm.DB) error {
-	db := l.db
-	if len(dbTx) > 0 && dbTx[0] != nil {
-		db = dbTx[0]
-	}
-	db.WithContext(ctx)
-	err := db.Model(&L2SentMsg{}).
-		Where("msg_hash = ?", msgHash).
-		Updates(map[string]interface{}{
-			"msg_proof":   proof,
-			"batch_index": batchIndex,
-		}).Error
-	if err != nil {
-		return fmt.Errorf("L2SentMsg.UpdateL2MessageProof error: %w", err)
-	}
-	return nil
-}
-
-// DeleteL2SentMsgAfterHeight delete l2 sent msg after height
-func (l *L2SentMsg) DeleteL2SentMsgAfterHeight(ctx context.Context, height uint64, dbTx ...*gorm.DB) error {
-	db := l.db
-	if len(dbTx) > 0 && dbTx[0] != nil {
-		db = dbTx[0]
-	}
-	err := db.WithContext(ctx).Model(&L2SentMsg{}).Delete("height > ?", height).Error
-	if err != nil {
-		return fmt.Errorf("L2SentMsg.DeleteL2SentMsgAfterHeight error: %w", err)
-	}
-	return nil
-}

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

@@ -1,57 +0,0 @@
--- +goose Up
--- +goose StatementBegin
-create table cross_message
-(
-    id              BIGSERIAL PRIMARY KEY,
-    msg_hash        VARCHAR NOT NULL,
-    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 '',
-    asset           SMALLINT NOT NULL,
-    msg_type        SMALLINT NOT NULL,
-    token_ids       TEXT NOT NULL DEFAULT '',
-    token_amounts   TEXT NOT NULL DEFAULT '',
-    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
-);
-
-create unique index uk_msg_hash_msg_type
-on cross_message (msg_hash, msg_type) where deleted_at IS NULL;
-
-comment
-on column cross_message.asset is 'ETH, ERC20, ERC721, ERC1155';
-
-comment
-on column cross_message.msg_type is 'unknown, l1msg, l2msg';
-
-CREATE INDEX idx_l1_msg_index ON cross_message (layer1_hash, deleted_at);
-
-CREATE INDEX idx_l2_msg_index ON cross_message (layer2_hash, deleted_at);
-
-CREATE INDEX idx_height_msg_type_index ON cross_message (height, msg_type, deleted_at);
-
-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 cross_message FOR EACH ROW EXECUTE PROCEDURE
-update_timestamp();
-
--- +goose StatementEnd
-
--- +goose Down
--- +goose StatementBegin
-drop table if exists cross_message;
--- +goose StatementEnd

bridge-history-api/orm/migrate/migrations/00003_l2_sent_msg.sql

@@ -1,47 +0,0 @@
--- +goose Up
--- +goose StatementBegin
-create table l2_sent_msg
-(
-    id               BIGSERIAL PRIMARY KEY,
-    original_sender  VARCHAR NOT NULL DEFAULT '',
-    tx_hash          VARCHAR NOT NULL,
-    sender           VARCHAR NOT NULL,
-    target           VARCHAR NOT NULL,
-    value            VARCHAR NOT NULL,
-    msg_hash         VARCHAR NOT NULL,
-    height           BIGINT NOT NULL,
-    nonce            BIGINT NOT NULL,
-    batch_index      BIGINT NOT NULL DEFAULT 0,
-    msg_proof        TEXT NOT NULL DEFAULT '',
-    msg_data         TEXT NOT NULL DEFAULT '',
-    created_at       TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated_at       TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    deleted_at       TIMESTAMP(0) DEFAULT NULL
-);
-
-create unique index uk_msg_hash
-on l2_sent_msg (msg_hash) where deleted_at IS NULL;
-
-create unique index uk_nonce
-on l2_sent_msg (nonce) where deleted_at IS NULL;
-
-CREATE INDEX idx_msg_hash_deleted_at_l2_sent_msg on l2_sent_msg (msg_hash, deleted_at);
-
-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_sent_msg FOR EACH ROW EXECUTE PROCEDURE
-update_timestamp();
-
--- +goose StatementEnd
-
--- +goose Down
--- +goose StatementBegin
-drop table if exists l2_sent_msg;
--- +goose StatementEnd

bridge-history-api/orm/migrate/migrations/00004_rollup_batch.sql

@@ -1,40 +0,0 @@
--- +goose Up
--- +goose StatementBegin
-create table rollup_batch
-(
-    id                  BIGSERIAL PRIMARY KEY,
-    batch_index         BIGINT NOT NULL,
-    commit_height       BIGINT NOT NULL,
-    start_block_number  BIGINT NOT NULL,
-    end_block_number    BIGINT NOT NULL,
-    batch_hash          VARCHAR NOT NULL,
-    withdraw_root       TEXT 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
-);
-
-create unique index uk_batch_index
-on rollup_batch (batch_index) where deleted_at IS NULL;
-
-create unique index uk_batch_hash
-on rollup_batch (batch_hash) where deleted_at IS NULL;
-
-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 rollup_batch FOR EACH ROW EXECUTE PROCEDURE
-update_timestamp();
-
--- +goose StatementEnd
-
--- +goose Down
--- +goose StatementBegin
-drop table if exists rollup_batch;
--- +goose StatementEnd

bridge-history-api/orm/relayed_msg.go

@@ -1,142 +0,0 @@
-package orm
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/ethereum/go-ethereum/log"
-	"gorm.io/gorm"
-)
-
-// RelayedMsg is the struct for relayed_msg table
-type RelayedMsg struct {
-	db *gorm.DB `gorm:"column:-"`
-
-	ID         uint64         `json:"id" gorm:"column:id"`
-	MsgHash    string         `json:"msg_hash" gorm:"column:msg_hash"`
-	Height     uint64         `json:"height" gorm:"column:height"`
-	Layer1Hash string         `json:"layer1_hash" gorm:"column:layer1_hash;default:''"`
-	Layer2Hash string         `json:"layer2_hash" gorm:"column:layer2_hash;default:''"`
-	CreatedAt  *time.Time     `json:"created_at" gorm:"column:created_at"`
-	UpdatedAt  *time.Time     `json:"updated_at" gorm:"column:updated_at"`
-	DeletedAt  gorm.DeletedAt `json:"deleted_at" gorm:"column:deleted_at;default:NULL"`
-}
-
-// NewRelayedMsg create an NewRelayedMsg instance
-func NewRelayedMsg(db *gorm.DB) *RelayedMsg {
-	return &RelayedMsg{db: db}
-}
-
-// TableName returns the table name for the RelayedMsg model.
-func (*RelayedMsg) TableName() string {
-	return "relayed_msg"
-}
-
-// GetRelayedMsgByHash get relayed msg by hash
-func (r *RelayedMsg) GetRelayedMsgByHash(ctx context.Context, msgHash string) (*RelayedMsg, error) {
-	var result RelayedMsg
-	err := r.db.WithContext(ctx).Model(&RelayedMsg{}).
-		Where("msg_hash = ?", msgHash).
-		First(&result).
-		Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return nil, nil
-		}
-		return nil, fmt.Errorf("RelayedMsg.GetRelayedMsgByHash error: %w", err)
-	}
-	return &result, nil
-}
-
-// GetLatestRelayedHeightOnL1 get latest relayed height on l1
-func (r *RelayedMsg) GetLatestRelayedHeightOnL1(ctx context.Context) (uint64, error) {
-	var result RelayedMsg
-	err := r.db.WithContext(ctx).Model(&RelayedMsg{}).
-		Select("height").
-		Where("layer1_hash != ''").
-		Order("height DESC").
-		First(&result).
-		Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return 0, nil
-		}
-		return 0, fmt.Errorf("RelayedMsg.GetLatestRelayedHeightOnL1 error: %w", err)
-	}
-	return result.Height, err
-}
-
-// GetLatestRelayedHeightOnL2 get latest relayed height on l2
-func (r *RelayedMsg) GetLatestRelayedHeightOnL2(ctx context.Context) (uint64, error) {
-	var result RelayedMsg
-	err := r.db.WithContext(ctx).Model(&RelayedMsg{}).
-		Select("height").
-		Where("layer2_hash != ''").
-		Order("height DESC").
-		First(&result).
-		Error
-	if err != nil {
-		if err == gorm.ErrRecordNotFound {
-			return 0, nil
-		}
-		return 0, fmt.Errorf("RelayedMsg.GetLatestRelayedHeightOnL2 error: %w", err)
-	}
-	return result.Height, nil
-}
-
-// InsertRelayedMsg batch insert relayed msg into db and return the transaction
-func (r *RelayedMsg) InsertRelayedMsg(ctx context.Context, messages []*RelayedMsg, dbTx ...*gorm.DB) error {
-	if len(messages) == 0 {
-		return nil
-	}
-	db := r.db
-	if len(dbTx) > 0 && dbTx[0] != nil {
-		db = dbTx[0]
-	}
-	db.WithContext(ctx)
-	err := db.Model(&RelayedMsg{}).Create(&messages).Error
-	if err != nil {
-		l2hashes := make([]string, 0, len(messages))
-		l1hashes := make([]string, 0, len(messages))
-		heights := make([]uint64, 0, len(messages))
-		for _, msg := range messages {
-			l2hashes = append(l2hashes, msg.Layer2Hash)
-			l1hashes = append(l1hashes, msg.Layer1Hash)
-			heights = append(heights, msg.Height)
-		}
-		log.Error("failed to insert l2 sent messages", "l2hashes", l2hashes, "l1hashes", l1hashes, "heights", heights, "err", err)
-		return fmt.Errorf("RelayedMsg.InsertRelayedMsg error: %w", err)
-	}
-	return nil
-}
-
-// DeleteL1RelayedHashAfterHeight delete l1 relayed hash after height
-func (r *RelayedMsg) DeleteL1RelayedHashAfterHeight(ctx context.Context, height uint64, dbTx ...*gorm.DB) error {
-	db := r.db
-	if len(dbTx) > 0 && dbTx[0] != nil {
-		db = dbTx[0]
-	}
-	db.WithContext(ctx)
-	err := db.Model(&RelayedMsg{}).
-		Delete("height > ? AND layer1_hash != ''", height).Error
-	if err != nil {
-		return fmt.Errorf("RelayedMsg.DeleteL1RelayedHashAfterHeight error: %w", err)
-	}
-	return nil
-}
-
-// DeleteL2RelayedHashAfterHeight delete l2 relayed hash after heights
-func (r *RelayedMsg) DeleteL2RelayedHashAfterHeight(ctx context.Context, height uint64, dbTx ...*gorm.DB) error {
-	db := r.db
-	if len(dbTx) > 0 && dbTx[0] != nil {
-		db = dbTx[0]
-	}
-	db.WithContext(ctx)
-	err := db.Model(&RelayedMsg{}).
-		Delete("height > ? AND layer2_hash != ''", height).Error
-	if err != nil {
-		return fmt.Errorf("RelayedMsg.DeleteL2RelayedHashAfterHeight error: %w", err)
-	}
-	return nil
-}

bridge-history-api/service/service.go

@@ -0,0 +1,141 @@
+package service
+
+import (
+	"time"
+
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/log"
+
+	"bridge-history-api/db"
+	"bridge-history-api/db/orm"
+)
+
+type Finalized struct {
+	Hash           string     `json:"hash"`
+	Amount         string     `json:"amount"`
+	To             string     `json:"to"` // useless
+	IsL1           bool       `json:"isL1"`
+	BlockNumber    uint64     `json:"blockNumber"`
+	BlockTimestamp *time.Time `json:"blockTimestamp"` // uselesss
+}
+
+type TxHistoryInfo struct {
+	Hash           string     `json:"hash"`
+	Amount         string     `json:"amount"`
+	To             string     `json:"to"` // useless
+	IsL1           bool       `json:"isL1"`
+	BlockNumber    uint64     `json:"blockNumber"`
+	BlockTimestamp *time.Time `json:"blockTimestamp"` // useless
+	FinalizeTx     *Finalized `json:"finalizeTx"`
+	CreatedAt      *time.Time `json:"createdTime"`
+}
+
+// HistoryService example service.
+type HistoryService interface {
+	GetTxsByAddress(address common.Address, offset int64, limit int64) ([]*TxHistoryInfo, error)
+	GetTxsByHashes(hashes []string) ([]*TxHistoryInfo, error)
+}
+
+// NewHistoryService returns a service backed with a "db"
+func NewHistoryService(db db.OrmFactory) HistoryService {
+	service := &historyBackend{db: db, prefix: "Scroll-Bridge-History-Server"}
+	return service
+}
+
+type historyBackend struct {
+	prefix string
+	db     db.OrmFactory
+}
+
+func updateCrossTxHash(msgHash string, txInfo *TxHistoryInfo, db db.OrmFactory) {
+	relayed, err := db.GetRelayedMsgByHash(msgHash)
+	if err != nil {
+		log.Error("updateCrossTxHash failed", "error", err)
+		return
+	}
+	if relayed == nil {
+		return
+	}
+	if relayed.Layer1Hash != "" {
+		txInfo.FinalizeTx.Hash = relayed.Layer1Hash
+		txInfo.FinalizeTx.BlockNumber = relayed.Height
+		return
+	}
+	if relayed.Layer2Hash != "" {
+		txInfo.FinalizeTx.Hash = relayed.Layer2Hash
+		txInfo.FinalizeTx.BlockNumber = relayed.Height
+		return
+	}
+
+}
+
+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, err
+	}
+	for _, msg := range result {
+		txHistory := &TxHistoryInfo{
+			Hash:        msg.MsgHash,
+			Amount:      msg.Amount,
+			To:          msg.Target,
+			IsL1:        msg.MsgType == int(orm.Layer1Msg),
+			BlockNumber: msg.Height,
+			CreatedAt:   msg.CreatedAt,
+			FinalizeTx: &Finalized{
+				Hash: "",
+			},
+		}
+		updateCrossTxHash(msg.MsgHash, txHistory, h.db)
+		txHistories = append(txHistories, txHistory)
+	}
+	return txHistories, nil
+}
+
+func (h *historyBackend) GetTxsByHashes(hashes []string) ([]*TxHistoryInfo, error) {
+	txHistories := make([]*TxHistoryInfo, 0)
+	for _, hash := range hashes {
+		l1result, err := h.db.GetL1CrossMsgByHash(common.HexToHash(hash))
+		if err != nil {
+			return nil, err
+		}
+		if l1result != nil {
+			txHistory := &TxHistoryInfo{
+				Hash:        l1result.Layer1Hash,
+				Amount:      l1result.Amount,
+				To:          l1result.Target,
+				IsL1:        true,
+				BlockNumber: l1result.Height,
+				CreatedAt:   l1result.CreatedAt,
+				FinalizeTx: &Finalized{
+					Hash: "",
+				},
+			}
+			updateCrossTxHash(l1result.MsgHash, txHistory, h.db)
+			txHistories = append(txHistories, txHistory)
+			continue
+		}
+		l2result, err := h.db.GetL2CrossMsgByHash(common.HexToHash(hash))
+		if err != nil {
+			return nil, err
+		}
+		if l2result != nil {
+			txHistory := &TxHistoryInfo{
+				Hash:        l2result.Layer2Hash,
+				Amount:      l2result.Amount,
+				To:          l2result.Target,
+				IsL1:        false,
+				BlockNumber: l2result.Height,
+				CreatedAt:   l2result.CreatedAt,
+				FinalizeTx: &Finalized{
+					Hash: "",
+				},
+			}
+			updateCrossTxHash(l2result.MsgHash, txHistory, h.db)
+			txHistories = append(txHistories, txHistory)
+			continue
+		}
+	}
+	return txHistories, nil
+}

bridge-history-api/utils/database.go

@@ -1,103 +0,0 @@
-package utils
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/ethereum/go-ethereum/log"
-	"gorm.io/driver/postgres"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-	"gorm.io/gorm/utils"
-
-	"bridge-history-api/config"
-)
-
-type gormLogger struct {
-	gethLogger log.Logger
-}
-
-func (g *gormLogger) LogMode(level logger.LogLevel) logger.Interface {
-	return g
-}
-
-func (g *gormLogger) Info(_ context.Context, msg string, data ...interface{}) {
-	infoMsg := fmt.Sprintf(msg, data...)
-	g.gethLogger.Info("gorm", "info message", infoMsg)
-}
-
-func (g *gormLogger) Warn(_ context.Context, msg string, data ...interface{}) {
-	warnMsg := fmt.Sprintf(msg, data...)
-	g.gethLogger.Warn("gorm", "warn message", warnMsg)
-}
-
-func (g *gormLogger) Error(_ context.Context, msg string, data ...interface{}) {
-	errMsg := fmt.Sprintf(msg, data...)
-	g.gethLogger.Error("gorm", "err message", errMsg)
-}
-
-func (g *gormLogger) Trace(_ context.Context, begin time.Time, fc func() (string, int64), err error) {
-	elapsed := time.Since(begin)
-	sql, rowsAffected := fc()
-	g.gethLogger.Debug("gorm", "line", utils.FileWithLineNum(), "cost", elapsed, "sql", sql, "rowsAffected", rowsAffected, "err", err)
-}
-
-// InitDB init the db handler
-func InitDB(config *config.DBConfig) (*gorm.DB, error) {
-	tmpGormLogger := gormLogger{
-		gethLogger: log.Root(),
-	}
-
-	db, err := gorm.Open(postgres.Open(config.DSN), &gorm.Config{
-		Logger: &tmpGormLogger,
-		NowFunc: func() time.Time {
-			// why set time to UTC.
-			// if now set this, the inserted data time will use local timezone. like 2023-07-18 18:24:00 CST+8
-			// but when inserted, store to postgres is 2023-07-18 18:24:00 UTC+0 the timezone is incorrect.
-			// As mysql dsn user:pass@tcp(127.0.0.1:3306)/dbname?charset=utf8mb4&parseTime=True&loc=Local, we cant set
-			// the timezone by loc=Local. but postgres's dsn don't have loc option to set timezone, so just need set the gorm option like that.
-			t, err := nowUTC()
-			if err != nil {
-				log.Error("Can not get UTC time: ", "err", err)
-			}
-			return t
-		},
-	})
-	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
-}
-
-// nowUTC get the utc time.Now
-func nowUTC() (time.Time, error) {
-	utc, err := time.LoadLocation("")
-	if err != nil {
-		return time.Time{}, err
-	}
-	return time.Now().In(utc), nil
-}

bridge-history-api/utils/parse_event.go

@@ -1,391 +0,0 @@
-package utils
-
-import (
-	"context"
-	"math/big"
-	"strings"
-
-	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/core/types"
-	"github.com/ethereum/go-ethereum/ethclient"
-	"github.com/ethereum/go-ethereum/log"
-
-	backendabi "bridge-history-api/abi"
-	"bridge-history-api/orm"
-)
-
-// CachedParsedTxCalldata store parsed batch infos
-type CachedParsedTxCalldata struct {
-	CallDataIndex uint64
-	BatchIndices  []uint64
-	StartBlocks   []uint64
-	EndBlocks     []uint64
-}
-
-// ParseBackendL1EventLogs parses L1 watched events
-func ParseBackendL1EventLogs(logs []types.Log) ([]*orm.CrossMsg, []*orm.RelayedMsg, error) {
-	// Need use contract abi to parse event Log
-	// Can only be tested after we have our contracts set up
-
-	var l1CrossMsg []*orm.CrossMsg
-	var relayedMsgs []*orm.RelayedMsg
-	var msgHash string
-	for _, vlog := range logs {
-		switch vlog.Topics[0] {
-		case backendabi.L1DepositETHSig:
-			event := backendabi.DepositETH{}
-			err := UnpackLog(backendabi.L1ETHGatewayABI, &event, "DepositETH", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack DepositETH event", "err", err)
-				return l1CrossMsg, relayedMsgs, err
-			}
-			l1CrossMsg = append(l1CrossMsg, &orm.CrossMsg{
-				Height:     vlog.BlockNumber,
-				Sender:     event.From.String(),
-				Target:     event.To.String(),
-				Amount:     event.Amount.String(),
-				Asset:      int(orm.ETH),
-				Layer1Hash: vlog.TxHash.Hex(),
-				MsgType:    int(orm.Layer1Msg),
-				MsgHash:    msgHash,
-			})
-		case backendabi.L1DepositERC20Sig:
-			event := backendabi.ERC20MessageEvent{}
-			err := UnpackLog(backendabi.L1StandardERC20GatewayABI, &event, "DepositERC20", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack DepositERC20 event", "err", err)
-				return l1CrossMsg, relayedMsgs, err
-			}
-			l1CrossMsg = append(l1CrossMsg, &orm.CrossMsg{
-				Height:      vlog.BlockNumber,
-				Sender:      event.From.String(),
-				Target:      event.To.String(),
-				Amount:      event.Amount.String(),
-				Asset:       int(orm.ERC20),
-				Layer1Hash:  vlog.TxHash.Hex(),
-				Layer1Token: event.L1Token.Hex(),
-				Layer2Token: event.L2Token.Hex(),
-				MsgType:     int(orm.Layer1Msg),
-				MsgHash:     msgHash,
-			})
-		case backendabi.L1DepositERC721Sig:
-			event := backendabi.ERC721MessageEvent{}
-			err := UnpackLog(backendabi.L1ERC721GatewayABI, &event, "DepositERC721", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack DepositERC721 event", "err", err)
-				return l1CrossMsg, relayedMsgs, err
-			}
-			l1CrossMsg = append(l1CrossMsg, &orm.CrossMsg{
-				Height:      vlog.BlockNumber,
-				Sender:      event.From.String(),
-				Target:      event.To.String(),
-				Asset:       int(orm.ERC721),
-				Layer1Hash:  vlog.TxHash.Hex(),
-				Layer1Token: event.L1Token.Hex(),
-				Layer2Token: event.L2Token.Hex(),
-				TokenIDs:    event.TokenID.String(),
-				MsgType:     int(orm.Layer1Msg),
-				MsgHash:     msgHash,
-			})
-		case backendabi.L1DepositERC1155Sig:
-			event := backendabi.ERC1155MessageEvent{}
-			err := UnpackLog(backendabi.L1ERC1155GatewayABI, &event, "DepositERC1155", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack DepositERC1155 event", "err", err)
-				return l1CrossMsg, relayedMsgs, err
-			}
-			l1CrossMsg = append(l1CrossMsg, &orm.CrossMsg{
-				Height:      vlog.BlockNumber,
-				Sender:      event.From.String(),
-				Target:      event.To.String(),
-				Asset:       int(orm.ERC1155),
-				Layer1Hash:  vlog.TxHash.Hex(),
-				Layer1Token: event.L1Token.Hex(),
-				Layer2Token: event.L2Token.Hex(),
-				TokenIDs:    event.TokenID.String(),
-				Amount:      event.Amount.String(),
-				MsgType:     int(orm.Layer1Msg),
-				MsgHash:     msgHash,
-			})
-		case backendabi.L1SentMessageEventSignature:
-			event := backendabi.L1SentMessageEvent{}
-			err := UnpackLog(backendabi.L1ScrollMessengerABI, &event, "SentMessage", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack SentMessage event", "err", err)
-				return l1CrossMsg, relayedMsgs, err
-			}
-			// since every deposit event will emit after a sent event, so can use this msg_hash as next withdraw event's msg_hash
-			msgHash = ComputeMessageHash(event.Sender, event.Target, event.Value, event.MessageNonce, event.Message).Hex()
-		case backendabi.L1BatchDepositERC721Sig:
-			event := backendabi.BatchERC721MessageEvent{}
-			err := UnpackLog(backendabi.L1ERC721GatewayABI, &event, "BatchDepositERC721", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack BatchDepositERC721 event", "err", err)
-				return l1CrossMsg, relayedMsgs, err
-			}
-			l1CrossMsg = append(l1CrossMsg, &orm.CrossMsg{
-				Height:      vlog.BlockNumber,
-				Sender:      event.From.String(),
-				Target:      event.To.String(),
-				Asset:       int(orm.ERC721),
-				Layer1Hash:  vlog.TxHash.Hex(),
-				Layer1Token: event.L1Token.Hex(),
-				Layer2Token: event.L2Token.Hex(),
-				TokenIDs:    convertBigIntArrayToString(event.TokenIDs),
-				MsgType:     int(orm.Layer1Msg),
-				MsgHash:     msgHash,
-			})
-		case backendabi.L1BatchDepositERC1155Sig:
-			event := backendabi.BatchERC1155MessageEvent{}
-			err := UnpackLog(backendabi.L1ERC1155GatewayABI, &event, "BatchDepositERC1155", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack BatchDepositERC1155 event", "err", err)
-				return l1CrossMsg, relayedMsgs, err
-			}
-			l1CrossMsg = append(l1CrossMsg, &orm.CrossMsg{
-				Height:       vlog.BlockNumber,
-				Sender:       event.From.String(),
-				Target:       event.To.String(),
-				Asset:        int(orm.ERC1155),
-				Layer1Hash:   vlog.TxHash.Hex(),
-				Layer1Token:  event.L1Token.Hex(),
-				Layer2Token:  event.L2Token.Hex(),
-				TokenIDs:     convertBigIntArrayToString(event.TokenIDs),
-				TokenAmounts: convertBigIntArrayToString(event.TokenAmounts),
-				MsgType:      int(orm.Layer1Msg),
-				MsgHash:      msgHash,
-			})
-		case backendabi.L1RelayedMessageEventSignature:
-			event := backendabi.L1RelayedMessageEvent{}
-			err := UnpackLog(backendabi.L1ScrollMessengerABI, &event, "RelayedMessage", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack RelayedMessage event", "err", err)
-				return l1CrossMsg, relayedMsgs, err
-			}
-			relayedMsgs = append(relayedMsgs, &orm.RelayedMsg{
-				MsgHash:    event.MessageHash.String(),
-				Height:     vlog.BlockNumber,
-				Layer1Hash: vlog.TxHash.Hex(),
-			})
-
-		}
-
-	}
-	return l1CrossMsg, relayedMsgs, nil
-}
-
-// ParseBackendL2EventLogs parses L2 watched events
-func ParseBackendL2EventLogs(logs []types.Log) ([]*orm.CrossMsg, []*orm.RelayedMsg, []*orm.L2SentMsg, error) {
-	// Need use contract abi to parse event Log
-	// Can only be tested after we have our contracts set up
-
-	var l2CrossMsg []*orm.CrossMsg
-	// this is use to confirm finalized l1 msg
-	var relayedMsgs []*orm.RelayedMsg
-	var l2SentMsgs []*orm.L2SentMsg
-	for _, vlog := range logs {
-		switch vlog.Topics[0] {
-		case backendabi.L2WithdrawETHSig:
-			event := backendabi.DepositETH{}
-			err := UnpackLog(backendabi.L2ETHGatewayABI, &event, "WithdrawETH", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack WithdrawETH event", "err", err)
-				return l2CrossMsg, relayedMsgs, l2SentMsgs, err
-			}
-			l2SentMsgs[len(l2SentMsgs)-1].OriginalSender = event.From.Hex()
-			l2CrossMsg = append(l2CrossMsg, &orm.CrossMsg{
-				Height:     vlog.BlockNumber,
-				Sender:     event.From.String(),
-				Target:     event.To.String(),
-				Amount:     event.Amount.String(),
-				Asset:      int(orm.ETH),
-				Layer2Hash: vlog.TxHash.Hex(),
-				MsgType:    int(orm.Layer2Msg),
-				MsgHash:    l2SentMsgs[len(l2SentMsgs)-1].MsgHash,
-			})
-		case backendabi.L2WithdrawERC20Sig:
-			event := backendabi.ERC20MessageEvent{}
-			err := UnpackLog(backendabi.L2StandardERC20GatewayABI, &event, "WithdrawERC20", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack WithdrawERC20 event", "err", err)
-				return l2CrossMsg, relayedMsgs, l2SentMsgs, err
-			}
-			l2SentMsgs[len(l2SentMsgs)-1].OriginalSender = event.From.Hex()
-			l2CrossMsg = append(l2CrossMsg, &orm.CrossMsg{
-				Height:      vlog.BlockNumber,
-				Sender:      event.From.String(),
-				Target:      event.To.String(),
-				Amount:      event.Amount.String(),
-				Asset:       int(orm.ERC20),
-				Layer2Hash:  vlog.TxHash.Hex(),
-				Layer1Token: event.L1Token.Hex(),
-				Layer2Token: event.L2Token.Hex(),
-				MsgType:     int(orm.Layer2Msg),
-				MsgHash:     l2SentMsgs[len(l2SentMsgs)-1].MsgHash,
-			})
-		case backendabi.L2WithdrawERC721Sig:
-			event := backendabi.ERC721MessageEvent{}
-			err := UnpackLog(backendabi.L2ERC721GatewayABI, &event, "WithdrawERC721", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack WithdrawERC721 event", "err", err)
-				return l2CrossMsg, relayedMsgs, l2SentMsgs, err
-			}
-			l2SentMsgs[len(l2SentMsgs)-1].OriginalSender = event.From.Hex()
-			l2CrossMsg = append(l2CrossMsg, &orm.CrossMsg{
-				Height:      vlog.BlockNumber,
-				Sender:      event.From.String(),
-				Target:      event.To.String(),
-				Asset:       int(orm.ERC721),
-				Layer2Hash:  vlog.TxHash.Hex(),
-				Layer1Token: event.L1Token.Hex(),
-				Layer2Token: event.L2Token.Hex(),
-				TokenIDs:    event.TokenID.String(),
-				MsgType:     int(orm.Layer2Msg),
-				MsgHash:     l2SentMsgs[len(l2SentMsgs)-1].MsgHash,
-			})
-		case backendabi.L2WithdrawERC1155Sig:
-			event := backendabi.ERC1155MessageEvent{}
-			err := UnpackLog(backendabi.L2ERC1155GatewayABI, &event, "WithdrawERC1155", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack WithdrawERC1155 event", "err", err)
-				return l2CrossMsg, relayedMsgs, l2SentMsgs, err
-			}
-			l2SentMsgs[len(l2SentMsgs)-1].OriginalSender = event.From.Hex()
-			l2CrossMsg = append(l2CrossMsg, &orm.CrossMsg{
-				Height:      vlog.BlockNumber,
-				Sender:      event.From.String(),
-				Target:      event.To.String(),
-				Asset:       int(orm.ERC1155),
-				Layer2Hash:  vlog.TxHash.Hex(),
-				Layer1Token: event.L1Token.Hex(),
-				Layer2Token: event.L2Token.Hex(),
-				TokenIDs:    event.TokenID.String(),
-				Amount:      event.Amount.String(),
-				MsgType:     int(orm.Layer2Msg),
-				MsgHash:     l2SentMsgs[len(l2SentMsgs)-1].MsgHash,
-			})
-		case backendabi.L2BatchWithdrawERC721Sig:
-			event := backendabi.BatchERC721MessageEvent{}
-			err := UnpackLog(backendabi.L2ERC721GatewayABI, &event, "BatchWithdrawERC721", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack BatchWithdrawERC721 event", "err", err)
-				return l2CrossMsg, relayedMsgs, l2SentMsgs, err
-			}
-			l2SentMsgs[len(l2SentMsgs)-1].OriginalSender = event.From.Hex()
-			l2CrossMsg = append(l2CrossMsg, &orm.CrossMsg{
-				Height:      vlog.BlockNumber,
-				Sender:      event.From.String(),
-				Target:      event.To.String(),
-				Asset:       int(orm.ERC721),
-				Layer1Hash:  vlog.TxHash.Hex(),
-				Layer1Token: event.L1Token.Hex(),
-				Layer2Token: event.L2Token.Hex(),
-				MsgType:     int(orm.Layer2Msg),
-				TokenIDs:    convertBigIntArrayToString(event.TokenIDs),
-				MsgHash:     l2SentMsgs[len(l2SentMsgs)-1].MsgHash,
-			})
-		case backendabi.L2BatchWithdrawERC1155Sig:
-			event := backendabi.BatchERC1155MessageEvent{}
-			err := UnpackLog(backendabi.L2ERC1155GatewayABI, &event, "BatchWithdrawERC1155", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack BatchWithdrawERC1155 event", "err", err)
-				return l2CrossMsg, relayedMsgs, l2SentMsgs, err
-			}
-			l2SentMsgs[len(l2SentMsgs)-1].OriginalSender = event.From.Hex()
-			l2CrossMsg = append(l2CrossMsg, &orm.CrossMsg{
-				Height:       vlog.BlockNumber,
-				Sender:       event.From.String(),
-				Target:       event.To.String(),
-				Asset:        int(orm.ERC1155),
-				Layer1Hash:   vlog.TxHash.Hex(),
-				Layer1Token:  event.L1Token.Hex(),
-				Layer2Token:  event.L2Token.Hex(),
-				MsgType:      int(orm.Layer2Msg),
-				TokenIDs:     convertBigIntArrayToString(event.TokenIDs),
-				TokenAmounts: convertBigIntArrayToString(event.TokenAmounts),
-				MsgHash:      l2SentMsgs[len(l2SentMsgs)-1].MsgHash,
-			})
-		case backendabi.L2SentMessageEventSignature:
-			event := backendabi.L2SentMessageEvent{}
-			err := UnpackLog(backendabi.L2ScrollMessengerABI, &event, "SentMessage", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack SentMessage event", "err", err)
-				return l2CrossMsg, relayedMsgs, l2SentMsgs, err
-			}
-			// since every withdraw event will emit after a sent event, so can use this msg_hash as next withdraw event's msg_hash
-			msgHash := ComputeMessageHash(event.Sender, event.Target, event.Value, event.MessageNonce, event.Message)
-			l2SentMsgs = append(l2SentMsgs,
-				&orm.L2SentMsg{
-					Sender:  event.Sender.Hex(),
-					TxHash:  vlog.TxHash.Hex(),
-					Target:  event.Target.Hex(),
-					Value:   event.Value.String(),
-					MsgHash: msgHash.Hex(),
-					Height:  vlog.BlockNumber,
-					Nonce:   event.MessageNonce.Uint64(),
-					MsgData: hexutil.Encode(event.Message),
-				})
-		case backendabi.L2RelayedMessageEventSignature:
-			event := backendabi.L2RelayedMessageEvent{}
-			err := UnpackLog(backendabi.L2ScrollMessengerABI, &event, "RelayedMessage", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack RelayedMessage event", "err", err)
-				return l2CrossMsg, relayedMsgs, l2SentMsgs, err
-			}
-			relayedMsgs = append(relayedMsgs, &orm.RelayedMsg{
-				MsgHash:    event.MessageHash.String(),
-				Height:     vlog.BlockNumber,
-				Layer2Hash: vlog.TxHash.Hex(),
-			})
-
-		}
-	}
-	return l2CrossMsg, relayedMsgs, l2SentMsgs, nil
-}
-
-// ParseBatchInfoFromScrollChain parses ScrollChain events
-func ParseBatchInfoFromScrollChain(ctx context.Context, client *ethclient.Client, logs []types.Log) ([]*orm.RollupBatch, error) {
-	var rollupBatches []*orm.RollupBatch
-	for _, vlog := range logs {
-		switch vlog.Topics[0] {
-		case backendabi.L1CommitBatchEventSignature:
-			event := backendabi.L1CommitBatchEvent{}
-			err := UnpackLog(backendabi.ScrollChainABI, &event, "CommitBatch", vlog)
-			if err != nil {
-				log.Warn("Failed to unpack CommitBatch event", "err", err)
-				return rollupBatches, err
-			}
-			commitTx, isPending, err := client.TransactionByHash(ctx, vlog.TxHash)
-			if err != nil || isPending {
-				log.Warn("Failed to get commit Batch tx receipt or the tx is still pending", "err", err)
-				return rollupBatches, err
-			}
-			index, startBlock, endBlock, err := GetBatchRangeFromCalldataV2(commitTx.Data())
-			if err != nil {
-				log.Warn("Failed to get batch range from calldata", "hash", commitTx.Hash().Hex(), "height", vlog.BlockNumber)
-				return rollupBatches, err
-			}
-			rollupBatches = append(rollupBatches, &orm.RollupBatch{
-				CommitHeight:     vlog.BlockNumber,
-				BatchIndex:       index,
-				BatchHash:        event.BatchHash.Hex(),
-				StartBlockNumber: startBlock,
-				EndBlockNumber:   endBlock,
-			})
-
-		default:
-			continue
-		}
-	}
-	return rollupBatches, nil
-}
-
-func convertBigIntArrayToString(array []*big.Int) string {
-	stringArray := make([]string, len(array))
-	for i, num := range array {
-		stringArray[i] = num.String()
-	}
-
-	result := strings.Join(stringArray, ", ")
-	return result
-}

bridge-history-api/utils/utils.go

@@ -2,8 +2,6 @@ package utils
 
 import (
 	"context"
-	"encoding/binary"
-	"errors"
 	"fmt"
 	"math/big"
 
@@ -16,12 +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()[:]...)))
-}
-
-// GetSafeBlockNumber get the safe block number, which is the current block number minus the confirmations
 func GetSafeBlockNumber(ctx context.Context, client *ethclient.Client, confirmations uint64) (uint64, error) {
 	number, err := client.BlockNumber(ctx)
 	if err != nil || number <= confirmations {
@@ -62,58 +54,3 @@ func ComputeMessageHash(
 	data, _ := backendabi.L2ScrollMessengerABI.Pack("relayMessage", sender, target, value, messageNonce, message)
 	return common.BytesToHash(crypto.Keccak256(data))
 }
-
-type commitBatchArgs struct {
-	Version                uint8
-	ParentBatchHeader      []byte
-	Chunks                 [][]byte
-	SkippedL1MessageBitmap []byte
-}
-
-// GetBatchRangeFromCalldataV2 find the block range from calldata, both inclusive.
-func GetBatchRangeFromCalldataV2(calldata []byte) (uint64, uint64, uint64, error) {
-	method := backendabi.ScrollChainV2ABI.Methods["commitBatch"]
-	values, err := method.Inputs.Unpack(calldata[4:])
-	if err != nil {
-		// special case: import genesis batch
-		method = backendabi.ScrollChainV2ABI.Methods["importGenesisBatch"]
-		_, err2 := method.Inputs.Unpack(calldata[4:])
-		if err2 == nil {
-			// genesis batch
-			return 0, 0, 0, nil
-		}
-		// none of "commitBatch" and "importGenesisBatch" match, give up
-		return 0, 0, 0, err
-	}
-	args := commitBatchArgs{}
-	err = method.Inputs.Copy(&args, values)
-	if err != nil {
-		return 0, 0, 0, err
-	}
-
-	var startBlock uint64
-	var finishBlock uint64
-
-	// decode batchIndex from ParentBatchHeader
-	if len(args.ParentBatchHeader) < 9 {
-		return 0, 0, 0, errors.New("invalid parent batch header")
-	}
-	batchIndex := binary.BigEndian.Uint64(args.ParentBatchHeader[1:9]) + 1
-
-	// decode blocks from chunk and assume that there's no empty chunk
-	// |   1 byte   | 60 bytes | ... | 60 bytes |
-	// | num blocks |  block 1 | ... |  block n |
-	if len(args.Chunks) == 0 {
-		return 0, 0, 0, errors.New("invalid chunks")
-	}
-	chunk := args.Chunks[0]
-	block := chunk[1:61] // first block in chunk
-	startBlock = binary.BigEndian.Uint64(block[0:8])
-
-	chunk = args.Chunks[len(args.Chunks)-1]
-	lastBlockIndex := int(chunk[0]) - 1
-	block = chunk[1+lastBlockIndex*60 : 1+lastBlockIndex*60+60] // last block in chunk
-	finishBlock = binary.BigEndian.Uint64(block[0:8])
-
-	return batchIndex, startBlock, finishBlock, err
-}

bridge-history-api/utils/utils_test.go

@@ -1,43 +0,0 @@
-package utils_test
-
-import (
-	"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 TestGetBatchRangeFromCalldataV2(t *testing.T) {
-	// single chunk
-	batchIndex, start, finish, err := utils.GetBatchRangeFromCalldataV2(common.Hex2Bytes("1325aca000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000000000000000000000000000000000005900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003d0100000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000100000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000"))
-	assert.NoError(t, err)
-	assert.Equal(t, start, uint64(1))
-	assert.Equal(t, finish, uint64(1))
-	assert.Equal(t, batchIndex, uint64(1))
-
-	// multiple chunk
-	batchIndex, start, finish, err = utils.GetBatchRangeFromCalldataV2(common.Hex2Bytes("1325aca000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000003e0000000000000000000000000000000000000000000000000000000000000007900000000000000000100000000000000010000000000000001038433daac85a0b03cd443ed50bc85e832c883061651ae2182b2984751e0b340119b828c2a2798d2c957228ebeaff7e10bb099ae0d4e224f3eeb779ff61cba610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000004c01000000000000000a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000030000000000010000000001000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001b403000000000000000b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005000300000000000000000b0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a00050000000000000014000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000012c01000000000100000000010000000001000000000100000000010000000001000000000100000000010000000001000000000100000000010000000001000000000100000000010000000001000000000100000000010000000001000000000100000000010000000001000000000100000000010000000001000000000100000000010000000001000000000100000000010000000001000000000100000000010000000001000000000100000000010000000001000000000100000000010000000001000000000100000000010000000001000000000100000000010000000001000000000100000000010000000001000000000100000000010000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa800000000000000000000000000000000000000000000000000000000000000aa"))
-	assert.NoError(t, err)
-	assert.Equal(t, start, uint64(10))
-	assert.Equal(t, finish, uint64(20))
-	assert.Equal(t, batchIndex, uint64(2))
-
-	// genesis batch
-	batchIndex, start, finish, err = utils.GetBatchRangeFromCalldataV2(common.Hex2Bytes("3fdeecb200000000000000000000000000000000000000000000000000000000000000402dcb5308098d24a37fc1487a229fcedb09fa4343ede39cbad365bc925535bb09000000000000000000000000000000000000000000000000000000000000005900000000000000000000000000000000000000000000000000c252bc9780c4d83cf11f14b8cd03c92c4d18ce07710ba836d31d12da216c8330000000000000000000000000000000000000000000000000000000000000000000000000000000"))
-	assert.NoError(t, err)
-	assert.Equal(t, start, uint64(0))
-	assert.Equal(t, finish, uint64(0))
-	assert.Equal(t, batchIndex, uint64(0))
-}

bridge/Makefile

@@ -1,15 +1,17 @@
-.PHONY: mock_abi rollup_bins event_watcher gas_oracle rollup_relayer test lint clean docker
+.PHONY: lint docker clean bridge
 
+IMAGE_NAME=bridge
 IMAGE_VERSION=latest
 REPO_ROOT_DIR=./..
 
 mock_abi:
-	cd .. && go run github.com/scroll-tech/go-ethereum/cmd/abigen --sol ./rollup/mock_bridge/MockBridgeL1.sol --pkg mock_bridge --out ./rollup/mock_bridge/MockBridgeL1.go
-	cd .. && go run github.com/scroll-tech/go-ethereum/cmd/abigen --sol ./rollup/mock_bridge/MockBridgeL2.sol --pkg mock_bridge --out ./rollup/mock_bridge/MockBridgeL2.go
+	go run github.com/scroll-tech/go-ethereum/cmd/abigen --sol mock_bridge/MockBridgeL1.sol --pkg mock_bridge --out mock_bridge/MockBridgeL1.go
+	go run github.com/scroll-tech/go-ethereum/cmd/abigen --sol mock_bridge/MockBridgeL2.sol --pkg mock_bridge --out mock_bridge/MockBridgeL2.go
 
-rollup_bins: ## Builds the Rollup bins.
+bridge_bins: ## Builds the Bridge bins.
 	go build -o $(PWD)/build/bin/event_watcher ./cmd/event_watcher/
 	go build -o $(PWD)/build/bin/gas_oracle ./cmd/gas_oracle/
+	go build -o $(PWD)/build/bin/message_relayer ./cmd/msg_relayer/
 	go build -o $(PWD)/build/bin/rollup_relayer ./cmd/rollup_relayer/
 
 event_watcher: ## Builds the event_watcher bin
@@ -18,6 +20,9 @@ event_watcher: ## Builds the event_watcher bin
 gas_oracle: ## Builds the gas_oracle bin
 	go build -o $(PWD)/build/bin/gas_oracle ./cmd/gas_oracle/
 
+message_relayer: ## Builds the message_relayer bin
+	go build -o $(PWD)/build/bin/message_relayer ./cmd/msg_relayer/
+
 rollup_relayer: ## Builds the rollup_relayer bin
 	go build -o $(PWD)/build/bin/rollup_relayer ./cmd/rollup_relayer/
 
@@ -34,8 +39,10 @@ docker_push:
 	docker docker push scrolltech/gas-oracle:${IMAGE_VERSION}
 	docker docker push scrolltech/event-watcher:${IMAGE_VERSION}
 	docker docker push scrolltech/rollup-relayer:${IMAGE_VERSION}
+	docker docker push scrolltech/msg-relayer:${IMAGE_VERSION}
 
 docker:
 	DOCKER_BUILDKIT=1 docker build -t scrolltech/gas-oracle:${IMAGE_VERSION} ${REPO_ROOT_DIR}/ -f ${REPO_ROOT_DIR}/build/dockerfiles/gas_oracle.Dockerfile
 	DOCKER_BUILDKIT=1 docker build -t scrolltech/event-watcher:${IMAGE_VERSION} ${REPO_ROOT_DIR}/ -f ${REPO_ROOT_DIR}/build/dockerfiles/event_watcher.Dockerfile
 	DOCKER_BUILDKIT=1 docker build -t scrolltech/rollup-relayer:${IMAGE_VERSION} ${REPO_ROOT_DIR}/ -f ${REPO_ROOT_DIR}/build/dockerfiles/rollup_relayer.Dockerfile
+	DOCKER_BUILDKIT=1 docker build -t scrolltech/msg-relayer:${IMAGE_VERSION} ${REPO_ROOT_DIR}/ -f ${REPO_ROOT_DIR}/build/dockerfiles/msg_relayer.Dockerfile

bridge/README.md

@@ -0,0 +1,36 @@
+# Bridge
+
+This repo contains the Scroll bridge.
+
+In addition, launching the bridge will launch a separate instance of l2geth, and sets up a communication channel
+between the two, over JSON-RPC sockets.
+
+Something we should pay attention is that all private keys inside sender instance cannot be duplicated.
+
+## Dependency
+
++ install `abigen`
+
+``` bash
+go install -v github.com/scroll-tech/go-ethereum/cmd/abigen
+```
+
+## Build
+
+```bash
+make clean
+make bridge
+```
+
+## Start
+* use default ports and config.json
+
+```bash
+./build/bin/bridge --http
+```
+
+* use specified ports and config.json
+
+```bash
+./build/bin/bridge --config ./config.json --http --http.addr localhost --http.port 8290
+```

bridge/abi/bridge_abi.go

@@ -0,0 +1,242 @@
+package bridgeabi
+
+import (
+	"math/big"
+
+	"github.com/scroll-tech/go-ethereum/accounts/abi"
+	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
+	"github.com/scroll-tech/go-ethereum/common"
+)
+
+var (
+	// ScrollChainABI holds information about ScrollChain's context and available invokable methods.
+	ScrollChainABI *abi.ABI
+	// L1ScrollMessengerABI holds information about L1ScrollMessenger's context and available invokable methods.
+	L1ScrollMessengerABI *abi.ABI
+	// L1MessageQueueABI holds information about L1MessageQueue contract's context and available invokable methods.
+	L1MessageQueueABI *abi.ABI
+	// L2GasPriceOracleABI holds information about L2GasPriceOracle's context and available invokable methods.
+	L2GasPriceOracleABI *abi.ABI
+
+	// L2ScrollMessengerABI holds information about L2ScrollMessenger's context and available invokable methods.
+	L2ScrollMessengerABI *abi.ABI
+	// L1BlockContainerABI holds information about L1BlockContainer contract's context and available invokable methods.
+	L1BlockContainerABI *abi.ABI
+	// L1GasPriceOracleABI holds information about L1GasPriceOracle's context and available invokable methods.
+	L1GasPriceOracleABI *abi.ABI
+	// L2MessageQueueABI holds information about L2MessageQueue contract's context and available invokable methods.
+	L2MessageQueueABI *abi.ABI
+
+	// L1SentMessageEventSignature = keccak256("SentMessage(address,address,uint256,uint256,uint256,bytes)")
+	L1SentMessageEventSignature common.Hash
+	// L1RelayedMessageEventSignature = keccak256("RelayedMessage(bytes32)")
+	L1RelayedMessageEventSignature common.Hash
+	// L1FailedRelayedMessageEventSignature = keccak256("FailedRelayedMessage(bytes32)")
+	L1FailedRelayedMessageEventSignature common.Hash
+
+	// L1CommitBatchEventSignature = keccak256("CommitBatch(bytes32)")
+	L1CommitBatchEventSignature common.Hash
+	// L1FinalizeBatchEventSignature = keccak256("FinalizeBatch(bytes32)")
+	L1FinalizeBatchEventSignature common.Hash
+
+	// L1QueueTransactionEventSignature = keccak256("QueueTransaction(address,address,uint256,uint256,uint256,bytes)")
+	L1QueueTransactionEventSignature common.Hash
+
+	// L2SentMessageEventSignature = keccak256("SentMessage(address,address,uint256,uint256,uint256,bytes,uint256,uint256)")
+	L2SentMessageEventSignature common.Hash
+	// L2RelayedMessageEventSignature = keccak256("RelayedMessage(bytes32)")
+	L2RelayedMessageEventSignature common.Hash
+	// L2FailedRelayedMessageEventSignature = keccak256("FailedRelayedMessage(bytes32)")
+	L2FailedRelayedMessageEventSignature common.Hash
+
+	// L2ImportBlockEventSignature = keccak256("ImportBlock(bytes32,uint256,uint256,uint256,bytes32)")
+	L2ImportBlockEventSignature common.Hash
+
+	// L2AppendMessageEventSignature = keccak256("AppendMessage(uint256,bytes32)")
+	L2AppendMessageEventSignature common.Hash
+)
+
+func init() {
+	ScrollChainABI, _ = ScrollChainMetaData.GetAbi()
+	L1ScrollMessengerABI, _ = L1ScrollMessengerMetaData.GetAbi()
+	L1MessageQueueABI, _ = L1MessageQueueMetaData.GetAbi()
+	L2GasPriceOracleABI, _ = L2GasPriceOracleMetaData.GetAbi()
+
+	L2ScrollMessengerABI, _ = L2ScrollMessengerMetaData.GetAbi()
+	L1BlockContainerABI, _ = L1BlockContainerMetaData.GetAbi()
+	L2MessageQueueABI, _ = L2MessageQueueMetaData.GetAbi()
+	L1GasPriceOracleABI, _ = L1GasPriceOracleMetaData.GetAbi()
+
+	L1SentMessageEventSignature = L1ScrollMessengerABI.Events["SentMessage"].ID
+	L1RelayedMessageEventSignature = L1ScrollMessengerABI.Events["RelayedMessage"].ID
+	L1FailedRelayedMessageEventSignature = L1ScrollMessengerABI.Events["FailedRelayedMessage"].ID
+
+	L1CommitBatchEventSignature = ScrollChainABI.Events["CommitBatch"].ID
+	L1FinalizeBatchEventSignature = ScrollChainABI.Events["FinalizeBatch"].ID
+
+	L1QueueTransactionEventSignature = L1MessageQueueABI.Events["QueueTransaction"].ID
+
+	L2SentMessageEventSignature = L2ScrollMessengerABI.Events["SentMessage"].ID
+	L2RelayedMessageEventSignature = L2ScrollMessengerABI.Events["RelayedMessage"].ID
+	L2FailedRelayedMessageEventSignature = L2ScrollMessengerABI.Events["FailedRelayedMessage"].ID
+
+	L2ImportBlockEventSignature = L1BlockContainerABI.Events["ImportBlock"].ID
+
+	L2AppendMessageEventSignature = L2MessageQueueABI.Events["AppendMessage"].ID
+}
+
+// Generated manually from abigen and only necessary events and mutable calls are kept.
+
+// ScrollChainMetaData contains all meta data concerning the ScrollChain contract.
+var ScrollChainMetaData = &bind.MetaData{
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"batchHash\",\"type\":\"bytes32\"}],\"name\":\"CommitBatch\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"batchHash\",\"type\":\"bytes32\"}],\"name\":\"FinalizeBatch\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"batchHash\",\"type\":\"bytes32\"}],\"name\":\"RevertBatch\",\"type\":\"event\"},{\"inputs\":[{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"parentHash\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"blockNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"timestamp\",\"type\":\"uint64\"},{\"internalType\":\"uint256\",\"name\":\"baseFee\",\"type\":\"uint256\"},{\"internalType\":\"uint64\",\"name\":\"gasLimit\",\"type\":\"uint64\"},{\"internalType\":\"uint16\",\"name\":\"numTransactions\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"numL1Messages\",\"type\":\"uint16\"}],\"internalType\":\"structIScrollChain.BlockContext[]\",\"name\":\"blocks\",\"type\":\"tuple[]\"},{\"internalType\":\"bytes32\",\"name\":\"prevStateRoot\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"newStateRoot\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"withdrawTrieRoot\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"batchIndex\",\"type\":\"uint64\"},{\"internalType\":\"bytes32\",\"name\":\"parentBatchHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"l2Transactions\",\"type\":\"bytes\"}],\"internalType\":\"structIScrollChain.Batch\",\"name\":\"batch\",\"type\":\"tuple\"}],\"name\":\"commitBatch\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"components\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"parentHash\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"blockNumber\",\"type\":\"uint64\"},{\"internalType\":\"uint64\",\"name\":\"timestamp\",\"type\":\"uint64\"},{\"internalType\":\"uint256\",\"name\":\"baseFee\",\"type\":\"uint256\"},{\"internalType\":\"uint64\",\"name\":\"gasLimit\",\"type\":\"uint64\"},{\"internalType\":\"uint16\",\"name\":\"numTransactions\",\"type\":\"uint16\"},{\"internalType\":\"uint16\",\"name\":\"numL1Messages\",\"type\":\"uint16\"}],\"internalType\":\"structIScrollChain.BlockContext[]\",\"name\":\"blocks\",\"type\":\"tuple[]\"},{\"internalType\":\"bytes32\",\"name\":\"prevStateRoot\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"newStateRoot\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"withdrawTrieRoot\",\"type\":\"bytes32\"},{\"internalType\":\"uint64\",\"name\":\"batchIndex\",\"type\":\"uint64\"},{\"internalType\":\"bytes32\",\"name\":\"parentBatchHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"l2Transactions\",\"type\":\"bytes\"}],\"internalType\":\"structIScrollChain.Batch[]\",\"name\":\"batches\",\"type\":\"tuple[]\"}],\"name\":\"commitBatches\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"batchId\",\"type\":\"bytes32\"},{\"internalType\":\"uint256[]\",\"name\":\"proof\",\"type\":\"uint256[]\"},{\"internalType\":\"uint256[]\",\"name\":\"instances\",\"type\":\"uint256[]\"}],\"name\":\"finalizeBatchWithProof\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"batchHash\",\"type\":\"bytes32\"}],\"name\":\"getL2MessageRoot\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"batchHash\",\"type\":\"bytes32\"}],\"name\":\"isBatchFinalized\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"batchId\",\"type\":\"bytes32\"}],\"name\":\"revertBatch\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
+}
+
+// L1ScrollMessengerMetaData contains all meta data concerning the L1ScrollMessenger contract.
+var L1ScrollMessengerMetaData = &bind.MetaData{
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"messageHash\",\"type\":\"bytes32\"}],\"name\":\"FailedRelayedMessage\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"messageHash\",\"type\":\"bytes32\"}],\"name\":\"RelayedMessage\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"messageNonce\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"}],\"name\":\"SentMessage\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"nonce\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"batchHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"merkleProof\",\"type\":\"bytes\"}],\"internalType\":\"structIL1ScrollMessenger.L2MessageProof\",\"name\":\"proof\",\"type\":\"tuple\"}],\"name\":\"relayMessageWithProof\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"queueIndex\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"},{\"internalType\":\"uint32\",\"name\":\"oldGasLimit\",\"type\":\"uint32\"},{\"internalType\":\"uint32\",\"name\":\"newGasLimit\",\"type\":\"uint32\"}],\"name\":\"replayMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"}],\"name\":\"sendMessage\",\"outputs\":[],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"xDomainMessageSender\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
+}
+
+// L1MessageQueueMetaData contains all meta data concerning the L1MessageQueue contract.
+var L1MessageQueueMetaData = &bind.MetaData{
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"queueIndex\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"QueueTransaction\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"appendCrossDomainMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"appendEnforcedTransaction\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"}],\"name\":\"estimateCrossDomainMessageFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"queueIndex\",\"type\":\"uint256\"}],\"name\":\"getCrossDomainMessage\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"nextCrossDomainMessageIndex\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
+}
+
+// L2GasPriceOracleMetaData contains all meta data concerning the L2GasPriceOracle contract.
+var L2GasPriceOracleMetaData = &bind.MetaData{
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"l2BaseFee\",\"type\":\"uint256\"}],\"name\":\"L2BaseFeeUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"previousOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"_oldWhitelist\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"_newWhitelist\",\"type\":\"address\"}],\"name\":\"UpdateWhitelist\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"_gasLimit\",\"type\":\"uint256\"}],\"name\":\"estimateCrossDomainMessageFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"initialize\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"l2BaseFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"renounceOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_l2BaseFee\",\"type\":\"uint256\"}],\"name\":\"setL2BaseFee\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_newWhitelist\",\"type\":\"address\"}],\"name\":\"updateWhitelist\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"whitelist\",\"outputs\":[{\"internalType\":\"contract IWhitelist\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
+}
+
+// L2ScrollMessengerMetaData contains all meta data concerning the L2ScrollMessenger contract.
+var L2ScrollMessengerMetaData = &bind.MetaData{
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"messageHash\",\"type\":\"bytes32\"}],\"name\":\"FailedRelayedMessage\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"messageHash\",\"type\":\"bytes32\"}],\"name\":\"RelayedMessage\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"messageNonce\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"}],\"name\":\"SentMessage\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"nonce\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"}],\"name\":\"relayMessage\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"nonce\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"},{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"stateRootProof\",\"type\":\"bytes\"}],\"internalType\":\"structIL2ScrollMessenger.L1MessageProof\",\"name\":\"proof\",\"type\":\"tuple\"}],\"name\":\"retryMessageWithProof\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"target\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"internalType\":\"bytes\",\"name\":\"message\",\"type\":\"bytes\"},{\"internalType\":\"uint256\",\"name\":\"gasLimit\",\"type\":\"uint256\"}],\"name\":\"sendMessage\",\"outputs\":[],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"xDomainMessageSender\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
+}
+
+// L1BlockContainerMetaData contains all meta data concerning the L1BlockContainer contract.
+var L1BlockContainerMetaData = &bind.MetaData{
+	ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"blockHeight\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"blockTimestamp\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"baseFee\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"stateRoot\",\"type\":\"bytes32\"}],\"name\":\"ImportBlock\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"}],\"name\":\"getBlockTimestamp\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"timestamp\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"}],\"name\":\"getStateRoot\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"stateRoot\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"blockHash\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"blockHeaderRLP\",\"type\":\"bytes\"},{\"internalType\":\"bool\",\"name\":\"updateGasPriceOracle\",\"type\":\"bool\"}],\"name\":\"importBlockHeader\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"latestBaseFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"latestBlockHash\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"latestBlockNumber\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"latestBlockTimestamp\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]",
+}
+
+// L2MessageQueueMetaData contains all meta data concerning the L2MessageQueue contract.
+var L2MessageQueueMetaData = &bind.MetaData{
+	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_owner\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"index\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"messageHash\",\"type\":\"bytes32\"}],\"name\":\"AppendMessage\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_oldOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_newOwner\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"_messageHash\",\"type\":\"bytes32\"}],\"name\":\"appendMessage\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"name\":\"branches\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"initialize\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"messageRoot\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"messenger\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"nextMessageIndex\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"renounceOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_newOwner\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_messenger\",\"type\":\"address\"}],\"name\":\"updateMessenger\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
+}
+
+// L1GasPriceOracleMetaData contains all meta data concerning the L1GasPriceOracle contract.
+var L1GasPriceOracleMetaData = &bind.MetaData{
+	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_owner\",\"type\":\"address\"}],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"l1BaseFee\",\"type\":\"uint256\"}],\"name\":\"L1BaseFeeUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"overhead\",\"type\":\"uint256\"}],\"name\":\"OverheadUpdated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_oldOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"_newOwner\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"scalar\",\"type\":\"uint256\"}],\"name\":\"ScalarUpdated\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"getL1Fee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes\",\"name\":\"_data\",\"type\":\"bytes\"}],\"name\":\"getL1GasUsed\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"l1BaseFee\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"overhead\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"renounceOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"scalar\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_l1BaseFee\",\"type\":\"uint256\"}],\"name\":\"setL1BaseFee\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_overhead\",\"type\":\"uint256\"}],\"name\":\"setOverhead\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"_scalar\",\"type\":\"uint256\"}],\"name\":\"setScalar\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_newOwner\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
+}
+
+// IL1ScrollMessengerL2MessageProof is an auto generated low-level Go binding around an user-defined struct.
+type IL1ScrollMessengerL2MessageProof struct {
+	BatchHash   common.Hash
+	MerkleProof []byte
+}
+
+// IScrollChainBatch is an auto generated low-level Go binding around an user-defined struct.
+type IScrollChainBatch struct {
+	Blocks           []IScrollChainBlockContext
+	PrevStateRoot    common.Hash
+	NewStateRoot     common.Hash
+	WithdrawTrieRoot common.Hash
+	BatchIndex       uint64
+	ParentBatchHash  common.Hash
+	L2Transactions   []byte
+}
+
+// IScrollChainBlockContext is an auto generated low-level Go binding around an user-defined struct.
+type IScrollChainBlockContext struct {
+	BlockHash       common.Hash
+	ParentHash      common.Hash
+	BlockNumber     uint64
+	Timestamp       uint64
+	BaseFee         *big.Int
+	GasLimit        uint64
+	NumTransactions uint16
+	NumL1Messages   uint16
+}
+
+// L1CommitBatchEvent represents a CommitBatch event raised by the ScrollChain contract.
+type L1CommitBatchEvent struct {
+	BatchHash common.Hash
+}
+
+// L1FinalizeBatchEvent represents a FinalizeBatch event raised by the ScrollChain contract.
+type L1FinalizeBatchEvent struct {
+	BatchHash common.Hash
+}
+
+// L1RevertBatchEvent represents a RevertBatch event raised by the ScrollChain contract.
+type L1RevertBatchEvent struct {
+	BatchHash common.Hash
+}
+
+// L1QueueTransactionEvent represents a QueueTransaction event raised by the L1MessageQueue contract.
+type L1QueueTransactionEvent struct {
+	Sender     common.Address
+	Target     common.Address
+	Value      *big.Int
+	QueueIndex *big.Int
+	GasLimit   *big.Int
+	Data       []byte
+}
+
+// L1SentMessageEvent represents a SentMessage event raised by the L1ScrollMessenger contract.
+type L1SentMessageEvent struct {
+	Sender       common.Address
+	Target       common.Address
+	Value        *big.Int
+	MessageNonce *big.Int
+	GasLimit     *big.Int
+	Message      []byte
+}
+
+// L1FailedRelayedMessageEvent represents a FailedRelayedMessage event raised by the L1ScrollMessenger contract.
+type L1FailedRelayedMessageEvent struct {
+	MessageHash common.Hash
+}
+
+// L1RelayedMessageEvent represents a RelayedMessage event raised by the L1ScrollMessenger contract.
+type L1RelayedMessageEvent struct {
+	MessageHash common.Hash
+}
+
+// L2AppendMessageEvent represents a AppendMessage event raised by the L2MessageQueue contract.
+type L2AppendMessageEvent struct {
+	Index       *big.Int
+	MessageHash common.Hash
+}
+
+// L2ImportBlockEvent represents a ImportBlock event raised by the L1BlockContainer contract.
+type L2ImportBlockEvent struct {
+	BlockHash      common.Hash
+	BlockHeight    *big.Int
+	BlockTimestamp *big.Int
+	BaseFee        *big.Int
+	StateRoot      common.Hash
+}
+
+// L2SentMessageEvent represents a SentMessage event raised by the L2ScrollMessenger contract.
+type L2SentMessageEvent struct {
+	Sender       common.Address
+	Target       common.Address
+	Value        *big.Int
+	MessageNonce *big.Int
+	GasLimit     *big.Int
+	Message      []byte
+}
+
+// L2FailedRelayedMessageEvent represents a FailedRelayedMessage event raised by the L2ScrollMessenger contract.
+type L2FailedRelayedMessageEvent struct {
+	MessageHash common.Hash
+}
+
+// L2RelayedMessageEvent represents a RelayedMessage event raised by the L2ScrollMessenger contract.
+type L2RelayedMessageEvent struct {
+	MessageHash common.Hash
+}
+
+// GetBatchCalldataLength gets the calldata bytelen of IScrollChainBatch.
+func GetBatchCalldataLength(batch *IScrollChainBatch) uint64 {
+	return uint64(5*32 + len(batch.L2Transactions) + len(batch.Blocks)*8*32)
+}

bridge/abi/bridge_abi_test.go

@@ -0,0 +1,133 @@
+package bridgeabi_test
+
+import (
+	"math/big"
+	"testing"
+
+	"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(bridge_abi.L1SentMessageEventSignature, common.HexToHash("104371f3b442861a2a7b82a070afbbaab748bb13757bf47769e170e37809ec1e"))
+	assert.Equal(bridge_abi.L1RelayedMessageEventSignature, common.HexToHash("4641df4a962071e12719d8c8c8e5ac7fc4d97b927346a3d7a335b1f7517e133c"))
+	assert.Equal(bridge_abi.L1FailedRelayedMessageEventSignature, common.HexToHash("99d0e048484baa1b1540b1367cb128acd7ab2946d1ed91ec10e3c85e4bf51b8f"))
+
+	assert.Equal(bridge_abi.L1CommitBatchEventSignature, common.HexToHash("2cdc615c74452778c0fb6184735e014c13aad2b62774fe0b09bd1dcc2cc14a62"))
+	assert.Equal(bridge_abi.L1FinalizeBatchEventSignature, common.HexToHash("6be443154c959a7a1645b4392b6fa97d8e8ab6e8fd853d7085e8867083737d79"))
+
+	assert.Equal(bridge_abi.L1QueueTransactionEventSignature, common.HexToHash("bdcc7517f8fe3db6506dfd910942d0bbecaf3d6a506dadea65b0d988e75b9439"))
+
+	assert.Equal(bridge_abi.L2SentMessageEventSignature, common.HexToHash("104371f3b442861a2a7b82a070afbbaab748bb13757bf47769e170e37809ec1e"))
+	assert.Equal(bridge_abi.L2RelayedMessageEventSignature, common.HexToHash("4641df4a962071e12719d8c8c8e5ac7fc4d97b927346a3d7a335b1f7517e133c"))
+	assert.Equal(bridge_abi.L2FailedRelayedMessageEventSignature, common.HexToHash("99d0e048484baa1b1540b1367cb128acd7ab2946d1ed91ec10e3c85e4bf51b8f"))
+
+	assert.Equal(bridge_abi.L2ImportBlockEventSignature, common.HexToHash("a7823f45e1ee21f9530b77959b57507ad515a14fa9fa24d262ee80e79b2b5745"))
+
+	assert.Equal(bridge_abi.L2AppendMessageEventSignature, common.HexToHash("faa617c2d8ce12c62637dbce76efcc18dae60574aa95709bdcedce7e76071693"))
+}
+
+func TestPackRelayL2MessageWithProof(t *testing.T) {
+	assert := assert.New(t)
+	l1MessengerABI, err := bridge_abi.L1ScrollMessengerMetaData.GetAbi()
+	assert.NoError(err)
+
+	proof := bridge_abi.IL1ScrollMessengerL2MessageProof{
+		BatchHash:   common.Hash{},
+		MerkleProof: make([]byte, 0),
+	}
+	_, err = l1MessengerABI.Pack("relayMessageWithProof", common.Address{}, common.Address{}, big.NewInt(0), big.NewInt(0), make([]byte, 0), proof)
+	assert.NoError(err)
+}
+
+func TestPackCommitBatch(t *testing.T) {
+	assert := assert.New(t)
+
+	scrollChainABI, err := bridge_abi.ScrollChainMetaData.GetAbi()
+	assert.NoError(err)
+
+	header := bridge_abi.IScrollChainBlockContext{
+		BlockHash:       common.Hash{},
+		ParentHash:      common.Hash{},
+		BlockNumber:     0,
+		Timestamp:       0,
+		BaseFee:         big.NewInt(0),
+		GasLimit:        0,
+		NumTransactions: 0,
+		NumL1Messages:   0,
+	}
+
+	batch := bridge_abi.IScrollChainBatch{
+		Blocks:           []bridge_abi.IScrollChainBlockContext{header},
+		PrevStateRoot:    common.Hash{},
+		NewStateRoot:     common.Hash{},
+		WithdrawTrieRoot: common.Hash{},
+		BatchIndex:       0,
+		L2Transactions:   make([]byte, 0),
+	}
+
+	_, err = scrollChainABI.Pack("commitBatch", batch)
+	assert.NoError(err)
+}
+
+func TestPackFinalizeBatchWithProof(t *testing.T) {
+	assert := assert.New(t)
+
+	l1RollupABI, err := bridge_abi.ScrollChainMetaData.GetAbi()
+	assert.NoError(err)
+
+	proof := make([]*big.Int, 10)
+	instance := make([]*big.Int, 10)
+	for i := 0; i < 10; i++ {
+		proof[i] = big.NewInt(0)
+		instance[i] = big.NewInt(0)
+	}
+
+	_, err = l1RollupABI.Pack("finalizeBatchWithProof", common.Hash{}, proof, instance)
+	assert.NoError(err)
+}
+
+func TestPackRelayL1Message(t *testing.T) {
+	assert := assert.New(t)
+
+	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))
+	assert.NoError(err)
+}
+
+func TestPackSetL1BaseFee(t *testing.T) {
+	assert := assert.New(t)
+
+	l1GasOracleABI, err := bridge_abi.L1GasPriceOracleMetaData.GetAbi()
+	assert.NoError(err)
+
+	baseFee := big.NewInt(2333)
+	_, err = l1GasOracleABI.Pack("setL1BaseFee", baseFee)
+	assert.NoError(err)
+}
+
+func TestPackSetL2BaseFee(t *testing.T) {
+	assert := assert.New(t)
+
+	l2GasOracleABI, err := bridge_abi.L2GasPriceOracleMetaData.GetAbi()
+	assert.NoError(err)
+
+	baseFee := big.NewInt(2333)
+	_, err = l2GasOracleABI.Pack("setL2BaseFee", baseFee)
+	assert.NoError(err)
+}
+
+func TestPackImportBlock(t *testing.T) {
+	assert := assert.New(t)
+
+	l1BlockContainerABI := bridge_abi.L1BlockContainerABI
+
+	_, err := l1BlockContainerABI.Pack("importBlockHeader", common.Hash{}, make([]byte, 0), false)
+	assert.NoError(err)
+}

bridge/cmd/event_watcher/app/app.go

@@ -7,41 +7,47 @@ import (
 	"os/signal"
 	"time"
 
-	"github.com/prometheus/client_golang/prometheus"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/urfave/cli/v2"
 
-	"scroll-tech/common/database"
+	"scroll-tech/database"
+
 	"scroll-tech/common/metrics"
-	"scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
-	"scroll-tech/rollup/internal/config"
-	"scroll-tech/rollup/internal/controller/watcher"
+	"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, utils.CommonFlags...)
+	app.Flags = append(app.Flags, cutils.CommonFlags...)
 	app.Commands = []*cli.Command{}
+
 	app.Before = func(ctx *cli.Context) error {
-		return utils.LogSetup(ctx)
+		return cutils.LogSetup(ctx)
 	}
+
 	// Register `event-watcher-test` app for integration-test.
-	utils.RegisterSimulation(app, utils.EventWatcherApp)
+	cutils.RegisterSimulation(app, cutils.EventWatcherApp)
 }
 
 func action(ctx *cli.Context) error {
 	// Load config file.
-	cfgFile := ctx.String(utils.ConfigFileFlag.Name)
+	cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
 	cfg, err := config.NewConfig(cfgFile)
 	if err != nil {
 		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
@@ -49,19 +55,21 @@ func action(ctx *cli.Context) error {
 
 	subCtx, cancel := context.WithCancel(ctx.Context)
 	// Init db connection
-	db, err := database.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 = database.CloseDB(db); err != nil {
+		err = ormFactory.Close()
+		if err != nil {
 			log.Error("can not close ormFactory", "error", err)
 		}
 	}()
 
-	registry := prometheus.DefaultRegisterer
-	metrics.Server(ctx, registry.(*prometheus.Registry))
+	// Start metrics server.
+	metrics.Serve(subCtx, ctx)
 	l1client, err := ethclient.Dial(cfg.L1Config.Endpoint)
 	if err != nil {
 		log.Error("failed to connect l1 geth", "config file", cfgFile, "error", err)
@@ -73,23 +81,18 @@ 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, ormFactory)
+	l2watcher := watcher.NewL2WatcherClient(ctx.Context, l2client, cfg.L2Config.Confirmations, cfg.L2Config.L2MessengerAddress, cfg.L2Config.L2MessageQueueAddress, cfg.L2Config.WithdrawTrieRootSlot, ormFactory)
 
-	l1watcher := watcher.NewL1WatcherClient(ctx.Context, l1client, cfg.L1Config.StartHeight, cfg.L1Config.Confirmations,
-		cfg.L1Config.L1MessageQueueAddress, cfg.L1Config.ScrollChainContractAddress, db, registry)
-
-	l2watcher := watcher.NewL2WatcherClient(ctx.Context, l2client, cfg.L2Config.Confirmations, cfg.L2Config.L2MessengerAddress,
-		cfg.L2Config.L2MessageQueueAddress, cfg.L2Config.WithdrawTrieRootSlot, db, registry)
-
-	go utils.Loop(subCtx, 10*time.Second, func() {
+	go cutils.Loop(subCtx, 10*time.Second, func() {
 		if loopErr := l1watcher.FetchContractEvent(); loopErr != nil {
 			log.Error("Failed to fetch bridge contract", "err", loopErr)
 		}
 	})
 
 	// Start l2 watcher process
-	go utils.Loop(subCtx, 2*time.Second, l2watcher.FetchContractEvent)
+	go cutils.Loop(subCtx, 2*time.Second, l2watcher.FetchContractEvent)
 	// Finish start all l2 functions
-
 	log.Info("Start event-watcher successfully")
 
 	// Catch CTRL-C to ensure a graceful shutdown.

bridge/cmd/event_watcher/main.go

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

bridge/cmd/gas_oracle/app/app.go

@@ -7,64 +7,70 @@ import (
 	"os/signal"
 	"time"
 
-	"github.com/prometheus/client_golang/prometheus"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
-	"github.com/scroll-tech/go-ethereum/rpc"
 	"github.com/urfave/cli/v2"
 
-	"scroll-tech/common/database"
+	"scroll-tech/database"
+
 	"scroll-tech/common/metrics"
-	"scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
-	"scroll-tech/rollup/internal/config"
-	"scroll-tech/rollup/internal/controller/relayer"
-	"scroll-tech/rollup/internal/controller/watcher"
-	butils "scroll-tech/rollup/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"
 	app.Description = "Scroll Gas Oracle."
 	app.Version = version.Version
-	app.Flags = append(app.Flags, utils.CommonFlags...)
+	app.Flags = append(app.Flags, cutils.CommonFlags...)
 	app.Commands = []*cli.Command{}
+
 	app.Before = func(ctx *cli.Context) error {
-		return utils.LogSetup(ctx)
+		return cutils.LogSetup(ctx)
 	}
+
 	// Register `gas-oracle-test` app for integration-test.
-	utils.RegisterSimulation(app, utils.GasOracleApp)
+	cutils.RegisterSimulation(app, cutils.GasOracleApp)
 }
 
 func action(ctx *cli.Context) error {
 	// Load config file.
-	cfgFile := ctx.String(utils.ConfigFileFlag.Name)
+	cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
 	cfg, err := config.NewConfig(cfgFile)
 	if err != nil {
 		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
 	}
 	subCtx, cancel := context.WithCancel(ctx.Context)
 	// Init db connection
-	db, err := database.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 = database.CloseDB(db); err != nil {
+		err = ormFactory.Close()
+		if err != nil {
 			log.Error("can not close ormFactory", "error", err)
 		}
 	}()
-
-	registry := prometheus.DefaultRegisterer
-	metrics.Server(ctx, registry.(*prometheus.Registry))
+	// Start metrics server.
+	metrics.Serve(subCtx, ctx)
 
 	l1client, err := ethclient.Dial(cfg.L1Config.Endpoint)
 	if err != nil {
@@ -79,36 +85,34 @@ func action(ctx *cli.Context) error {
 		return err
 	}
 
-	l1watcher := watcher.NewL1WatcherClient(ctx.Context, l1client, cfg.L1Config.StartHeight, cfg.L1Config.Confirmations, cfg.L1Config.L1MessageQueueAddress, cfg.L1Config.ScrollChainContractAddress, db, registry)
+	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, registry)
+	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, false /* initGenesis */, registry)
+	l2relayer, err := relayer.NewLayer2Relayer(ctx.Context, l2client, ormFactory, cfg.L2Config.RelayerConfig)
 	if err != nil {
 		log.Error("failed to create new l2 relayer", "config file", cfgFile, "error", err)
 		return err
 	}
 	// Start l1 watcher process
-	go utils.LoopWithContext(subCtx, 10*time.Second, func(ctx context.Context) {
-		// Fetch the latest block number to decrease the delay when fetching gas prices
-		// Use latest block number - 1 to prevent frequent reorg
-		number, loopErr := butils.GetLatestConfirmedBlockNumber(ctx, l1client, rpc.LatestBlockNumber)
+	go cutils.LoopWithContext(subCtx, 10*time.Second, func(ctx context.Context) {
+		number, loopErr := utils.GetLatestConfirmedBlockNumber(ctx, l1client, cfg.L1Config.Confirmations)
 		if loopErr != nil {
 			log.Error("failed to get block number", "err", loopErr)
 			return
 		}
 
-		if loopErr = l1watcher.FetchBlockHeader(number - 1); loopErr != nil {
-			log.Error("Failed to fetch L1 block header", "lastest", number-1, "err", loopErr)
+		if loopErr = l1watcher.FetchBlockHeader(number); loopErr != nil {
+			log.Error("Failed to fetch L1 block header", "lastest", number, "err", loopErr)
 		}
 	})
 
 	// Start l1relayer process
-	go utils.Loop(subCtx, 10*time.Second, l1relayer.ProcessGasPriceOracle)
-	go utils.Loop(subCtx, 2*time.Second, l2relayer.ProcessGasPriceOracle)
+	go cutils.Loop(subCtx, 10*time.Second, l1relayer.ProcessGasPriceOracle)
+	go cutils.Loop(subCtx, 2*time.Second, l2relayer.ProcessGasPriceOracle)
 
 	// Finish start all message relayer functions
 	log.Info("Start gas-oracle successfully")

bridge/cmd/gas_oracle/main.go

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

bridge/cmd/mock_app.go

@@ -11,7 +11,7 @@ import (
 	"scroll-tech/common/docker"
 	"scroll-tech/common/utils"
 
-	"scroll-tech/rollup/internal/config"
+	"scroll-tech/bridge/config"
 )
 
 // MockApp mockApp-test client manager.
@@ -22,29 +22,29 @@ type MockApp struct {
 	mockApps map[utils.MockAppName]docker.AppAPI
 
 	originFile string
-	rollupFile string
+	bridgeFile string
 
 	args []string
 }
 
-// NewRollupApp return a new rollupApp manager, name mush be one them.
-func NewRollupApp(base *docker.App, file string) *MockApp {
+// NewBridgeApp return a new bridgeApp manager, name mush be one them.
+func NewBridgeApp(base *docker.App, file string) *MockApp {
 
-	rollupFile := fmt.Sprintf("/tmp/%d_rollup-config.json", base.Timestamp)
-	rollupApp := &MockApp{
+	bridgeFile := fmt.Sprintf("/tmp/%d_bridge-config.json", base.Timestamp)
+	bridgeApp := &MockApp{
 		base:       base,
 		mockApps:   make(map[utils.MockAppName]docker.AppAPI),
 		originFile: file,
-		rollupFile: rollupFile,
-		args:       []string{"--log.debug", "--config", rollupFile},
+		bridgeFile: bridgeFile,
+		args:       []string{"--log.debug", "--config", bridgeFile},
 	}
-	if err := rollupApp.MockConfig(true); err != nil {
+	if err := bridgeApp.MockConfig(true); err != nil {
 		panic(err)
 	}
-	return rollupApp
+	return bridgeApp
 }
 
-// RunApp run rollup-test child process by multi parameters.
+// RunApp run bridge-test child process by multi parameters.
 func (b *MockApp) RunApp(t *testing.T, name utils.MockAppName, args ...string) {
 	if !(name == utils.EventWatcherApp ||
 		name == utils.GasOracleApp ||
@@ -72,16 +72,16 @@ func (b *MockApp) WaitExit() {
 	b.mockApps = make(map[utils.MockAppName]docker.AppAPI)
 }
 
-// Free stop and release rollup mocked apps.
+// Free stop and release bridge mocked apps.
 func (b *MockApp) Free() {
 	b.WaitExit()
-	_ = os.Remove(b.rollupFile)
+	_ = os.Remove(b.bridgeFile)
 }
 
-// MockConfig creates a new rollup config.
+// MockConfig creates a new bridge config.
 func (b *MockApp) MockConfig(store bool) error {
 	base := b.base
-	// Load origin rollup config file.
+	// Load origin bridge config file.
 	cfg, err := config.NewConfig(b.originFile)
 	if err != nil {
 		return err
@@ -97,10 +97,10 @@ func (b *MockApp) MockConfig(store bool) error {
 	if !store {
 		return nil
 	}
-	// Store changed rollup config into a temp file.
+	// Store changed bridge config into a temp file.
 	data, err := json.Marshal(b.Config)
 	if err != nil {
 		return err
 	}
-	return os.WriteFile(b.rollupFile, data, 0600)
+	return os.WriteFile(b.bridgeFile, data, 0600)
 }

bridge/cmd/msg_relayer/app/app.go

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

bridge/cmd/msg_relayer/main.go

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

bridge/cmd/rollup_relayer/app/app.go

@@ -7,64 +7,70 @@ import (
 	"os/signal"
 	"time"
 
-	"github.com/prometheus/client_golang/prometheus"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/urfave/cli/v2"
 
-	"scroll-tech/common/database"
+	"scroll-tech/database"
+
 	"scroll-tech/common/metrics"
-	"scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
-	"scroll-tech/rollup/internal/config"
-	"scroll-tech/rollup/internal/controller/relayer"
-	"scroll-tech/rollup/internal/controller/watcher"
-	butils "scroll-tech/rollup/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, utils.CommonFlags...)
-	app.Flags = append(app.Flags, utils.RollupRelayerFlags...)
+	app.Flags = append(app.Flags, cutils.CommonFlags...)
 	app.Commands = []*cli.Command{}
+
 	app.Before = func(ctx *cli.Context) error {
-		return utils.LogSetup(ctx)
+		return cutils.LogSetup(ctx)
 	}
 	// Register `rollup-relayer-test` app for integration-test.
-	utils.RegisterSimulation(app, utils.RollupRelayerApp)
+	cutils.RegisterSimulation(app, cutils.RollupRelayerApp)
 }
 
 func action(ctx *cli.Context) error {
 	// Load config file.
-	cfgFile := ctx.String(utils.ConfigFileFlag.Name)
+	cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
 	cfg, err := config.NewConfig(cfgFile)
 	if err != nil {
 		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
 	}
 
 	subCtx, cancel := context.WithCancel(ctx.Context)
-	// Init db connection
-	db, err := database.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 = database.CloseDB(db); err != nil {
+		err = ormFactory.Close()
+		if err != nil {
 			log.Error("can not close ormFactory", "error", err)
 		}
 	}()
 
-	registry := prometheus.DefaultRegisterer
-	metrics.Server(ctx, registry.(*prometheus.Registry))
+	// Start metrics server.
+	metrics.Serve(subCtx, ctx)
 
 	// Init l2geth connection
 	l2client, err := ethclient.Dial(cfg.L2Config.Endpoint)
@@ -73,45 +79,37 @@ func action(ctx *cli.Context) error {
 		return err
 	}
 
-	initGenesis := ctx.Bool(utils.ImportGenesisFlag.Name)
-	l2relayer, err := relayer.NewLayer2Relayer(ctx.Context, l2client, db, cfg.L2Config.RelayerConfig, initGenesis, registry)
+	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
 	}
 
-	chunkProposer := watcher.NewChunkProposer(subCtx, cfg.L2Config.ChunkProposerConfig, db, registry)
-	if err != nil {
-		log.Error("failed to create chunkProposer", "config file", cfgFile, "error", err)
-		return err
-	}
-
-	batchProposer := watcher.NewBatchProposer(subCtx, cfg.L2Config.BatchProposerConfig, db, registry)
+	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, registry)
+	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 utils.LoopWithContext(subCtx, 2*time.Second, func(ctx context.Context) {
-		number, loopErr := butils.GetLatestConfirmedBlockNumber(ctx, l2client, cfg.L2Config.Confirmations)
+	go cutils.LoopWithContext(subCtx, 2*time.Second, func(ctx context.Context) {
+		number, loopErr := utils.GetLatestConfirmedBlockNumber(ctx, l2client, cfg.L2Config.Confirmations)
 		if loopErr != nil {
 			log.Error("failed to get block number", "err", loopErr)
 			return
 		}
-		l2watcher.TryFetchRunningMissingBlocks(number)
+		l2watcher.TryFetchRunningMissingBlocks(ctx, number)
 	})
 
-	go utils.Loop(subCtx, 2*time.Second, chunkProposer.TryProposeChunk)
+	// Batch proposer loop
+	go cutils.Loop(subCtx, 2*time.Second, func() {
+		batchProposer.TryProposeBatch()
+		batchProposer.TryCommitBatches()
+	})
 
-	go utils.Loop(subCtx, 10*time.Second, batchProposer.TryProposeBatch)
-
-	go utils.Loop(subCtx, 2*time.Second, l2relayer.ProcessPendingBatches)
-
-	go utils.Loop(subCtx, 15*time.Second, l2relayer.ProcessCommittedBatches)
+	go cutils.Loop(subCtx, 2*time.Second, l2relayer.ProcessCommittedBatches)
 
 	// Finish start all rollup relayer functions.
 	log.Info("Start rollup-relayer successfully")

bridge/cmd/rollup_relayer/main.go

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

bridge/config.json

@@ -2,10 +2,12 @@
   "l1_config": {
     "confirmations": "0x6",
     "endpoint": "DUMMY_ENDPOINT",
+    "l1_messenger_address": "0x0000000000000000000000000000000000000000",
     "l1_message_queue_address": "0x0000000000000000000000000000000000000000",
     "scroll_chain_address": "0x0000000000000000000000000000000000000000",
     "start_height": 0,
     "relayer_config": {
+      "messenger_contract_address": "0x0000000000000000000000000000000000000000",
       "gas_price_oracle_address": "0x0000000000000000000000000000000000000000",
       "sender_config": {
         "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc",
@@ -25,7 +27,12 @@
         "gas_price_diff": 50000
       },
       "finalize_batch_interval_sec": 0,
-      "gas_oracle_sender_private_key": "1313131313131313131313131313131313131313131313131313131313131313"
+      "message_sender_private_keys": [
+        "1212121212121212121212121212121212121212121212121212121212121212"
+      ],
+      "gas_oracle_sender_private_keys": [
+        "1313131313131313131313131313131313131313131313131313131313131313"
+      ]
     }
   },
   "l2_config": {
@@ -35,6 +42,7 @@
     "l2_message_queue_address": "0x0000000000000000000000000000000000000000",
     "relayer_config": {
       "rollup_contract_address": "0x0000000000000000000000000000000000000000",
+      "messenger_contract_address": "0x0000000000000000000000000000000000000000",
       "gas_price_oracle_address": "0x0000000000000000000000000000000000000000",
       "sender_config": {
         "endpoint": "DUMMY_ENDPOINT",
@@ -53,32 +61,29 @@
         "min_gas_price": 0,
         "gas_price_diff": 50000
       },
-      "chain_monitor": {
-        "timeout": 3,
-        "try_times": 5,
-        "base_url": "http://localhost:8750"
-      },
       "finalize_batch_interval_sec": 0,
-      "gas_oracle_sender_private_key": "1313131313131313131313131313131313131313131313131313131313131313",
-      "commit_sender_private_key": "1414141414141414141414141414141414141414141414141414141414141414",
-      "finalize_sender_private_key": "1515151515151515151515151515151515151515151515151515151515151515",
-      "gas_cost_increase_multiplier": 1.2
-    },
-    "chunk_proposer_config": {
-      "max_block_num_per_chunk": 100,
-      "max_tx_num_per_chunk": 100,
-      "max_l1_commit_gas_per_chunk": 11234567,
-      "max_l1_commit_calldata_size_per_chunk": 112345,
-      "chunk_timeout_sec": 300,
-      "max_row_consumption_per_chunk": 1048319,
-      "gas_cost_increase_multiplier": 1.2
+      "message_sender_private_keys": [
+        "1212121212121212121212121212121212121212121212121212121212121212"
+      ],
+      "gas_oracle_sender_private_keys": [
+        "1313131313131313131313131313131313131313131313131313131313131313"
+      ],
+      "rollup_sender_private_keys": [
+        "1414141414141414141414141414141414141414141414141414141414141414"
+      ]
     },
     "batch_proposer_config": {
-      "max_chunk_num_per_batch": 112,
-      "max_l1_commit_gas_per_batch": 11234567,
-      "max_l1_commit_calldata_size_per_batch": 112345,
-      "batch_timeout_sec": 300,
-      "gas_cost_increase_multiplier": 1.2
+      "proof_generation_freq": 1,
+      "batch_gas_threshold": 3000000,
+      "batch_tx_num_threshold": 44,
+      "batch_time_sec": 300,
+      "batch_commit_time_sec": 1200,
+      "batch_blocks_limit": 100,
+      "commit_tx_calldata_size_limit": 200000,
+      "public_input_config": {
+        "max_tx_num": 44,
+        "padding_tx_hash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+      }
     }
   },
   "db_config": {

bridge/config/config.go

@@ -5,19 +5,14 @@ import (
 	"os"
 	"path/filepath"
 
-	"scroll-tech/common/database"
+	"scroll-tech/database"
 )
 
-// Config provides the config of prover-stats-api
+// Config load configuration items.
 type Config struct {
-	DBConfig *database.Config `json:"db_config"`
-	Auth     Auth             `json:"auth"`
-}
-
-// Auth provides the auth of prover-stats-api
-type Auth struct {
-	Secret              string `json:"secret"`
-	TokenExpireDuration int    `json:"token_expire_duration"` // unit: seconds
+	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,13 +12,17 @@ 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)
+		assert.Len(t, cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys, 1)
+		assert.Len(t, cfg.L2Config.RelayerConfig.RollupSenderPrivateKeys, 1)
+
 		data, err := json.Marshal(cfg)
 		assert.NoError(t, err)
 
-		tmpJSON := fmt.Sprintf("/tmp/%d_rollup_config.json", time.Now().Nanosecond())
+		tmpJSON := fmt.Sprintf("/tmp/%d_bridge_config.json", time.Now().Nanosecond())
 		defer func() {
 			if _, err = os.Stat(tmpJSON); err == nil {
 				assert.NoError(t, os.Remove(tmpJSON))

bridge/config/l1_config.go

@@ -13,6 +13,8 @@ type L1Config struct {
 	Endpoint string `json:"endpoint"`
 	// The start height to sync event from layer 1
 	StartHeight uint64 `json:"start_height"`
+	// The L1ScrollMessenger contract address deployed on layer 1 chain.
+	L1MessengerAddress common.Address `json:"l1_messenger_address"`
 	// The L1MessageQueue contract address deployed on layer 1 chain.
 	L1MessageQueueAddress common.Address `json:"l1_message_queue_address"`
 	// The ScrollChain contract address deployed on layer 1 chain.

bridge/config/l2_config.go

@@ -0,0 +1,49 @@
+package config
+
+import (
+	"github.com/scroll-tech/go-ethereum/rpc"
+
+	"github.com/scroll-tech/go-ethereum/common"
+
+	"scroll-tech/common/types"
+)
+
+// L2Config loads l2geth configuration items.
+type L2Config struct {
+	// Confirmations block height confirmations number.
+	Confirmations rpc.BlockNumber `json:"confirmations"`
+	// l2geth node url.
+	Endpoint string `json:"endpoint"`
+	// The messenger contract address deployed on layer 2 chain.
+	L2MessengerAddress common.Address `json:"l2_messenger_address"`
+	// The L2MessageQueue contract address deployed on layer 2 chain.
+	L2MessageQueueAddress common.Address `json:"l2_message_queue_address"`
+	// The WithdrawTrieRootSlot in L2MessageQueue contract.
+	WithdrawTrieRootSlot common.Hash `json:"withdraw_trie_root_slot,omitempty"`
+	// The relayer config
+	RelayerConfig *RelayerConfig `json:"relayer_config"`
+	// The batch_proposer config
+	BatchProposerConfig *BatchProposerConfig `json:"batch_proposer_config"`
+}
+
+// BatchProposerConfig loads l2watcher batch_proposer configuration items.
+type BatchProposerConfig struct {
+	// Proof generation frequency, generating proof every k blocks
+	ProofGenerationFreq uint64 `json:"proof_generation_freq"`
+	// Txnum threshold in a batch
+	BatchTxNumThreshold uint64 `json:"batch_tx_num_threshold"`
+	// Gas threshold in a batch
+	BatchGasThreshold uint64 `json:"batch_gas_threshold"`
+	// Time waited to generate a batch even if gas_threshold not met
+	BatchTimeSec uint64 `json:"batch_time_sec"`
+	// Time waited to commit batches before the calldata met CommitTxCalldataSizeLimit
+	BatchCommitTimeSec uint64 `json:"batch_commit_time_sec"`
+	// Max number of blocks in a batch
+	BatchBlocksLimit uint64 `json:"batch_blocks_limit"`
+	// Commit tx calldata size limit in bytes, target to cap the gas use of commit tx at 2M gas
+	CommitTxCalldataSizeLimit uint64 `json:"commit_tx_calldata_size_limit"`
+	// Commit tx calldata min size limit in bytes
+	CommitTxCalldataMinSize uint64 `json:"commit_tx_calldata_min_size,omitempty"`
+	// The public input hash config
+	PublicInputConfig *types.PublicInputHashConfig `json:"public_input_config"`
+}

bridge/config/relayer_config.go

@@ -34,21 +34,17 @@ type SenderConfig struct {
 	// The interval (in seconds) to check balance and top up sender's accounts
 	CheckBalanceTime uint64 `json:"check_balance_time"`
 	// The sender's pending count limit.
-	PendingLimit int `json:"pending_limit"`
-}
-
-// ChainMonitor this config is used to get batch status from chain_monitor API.
-type ChainMonitor struct {
-	TimeOut  int    `json:"timeout"`
-	TryTimes int    `json:"try_times"`
-	BaseURL  string `json:"base_url"`
+	PendingLimit int `json:"pending_limit,omitempty"`
 }
 
 // RelayerConfig loads relayer configuration items.
 // What we need to pay attention to is that
+// `MessageSenderPrivateKeys` and `RollupSenderPrivateKeys` cannot have common private keys.
 type RelayerConfig struct {
 	// RollupContractAddress store the rollup contract address.
 	RollupContractAddress common.Address `json:"rollup_contract_address,omitempty"`
+	// MessengerContractAddress store the scroll messenger contract address.
+	MessengerContractAddress common.Address `json:"messenger_contract_address"`
 	// GasPriceOracleContractAddress store the scroll messenger contract address.
 	GasPriceOracleContractAddress common.Address `json:"gas_price_oracle_contract_address"`
 	// sender config
@@ -59,14 +55,10 @@ type RelayerConfig struct {
 	FinalizeBatchIntervalSec uint64 `json:"finalize_batch_interval_sec"`
 	// MessageRelayMinGasLimit to avoid OutOfGas error
 	MessageRelayMinGasLimit uint64 `json:"message_relay_min_gas_limit,omitempty"`
-	// ChainMonitor config of monitoring service
-	ChainMonitor *ChainMonitor `json:"chain_monitor,omitempty"`
-	// GasCostIncreaseMultiplier multiplier for min gas limit estimation
-	GasCostIncreaseMultiplier float64 `json:"gas_cost_increase_multiplier,omitempty"`
 	// The private key of the relayer
-	GasOracleSenderPrivateKey *ecdsa.PrivateKey `json:"-"`
-	CommitSenderPrivateKey    *ecdsa.PrivateKey `json:"-"`
-	FinalizeSenderPrivateKey  *ecdsa.PrivateKey `json:"-"`
+	MessageSenderPrivateKeys   []*ecdsa.PrivateKey `json:"-"`
+	GasOracleSenderPrivateKeys []*ecdsa.PrivateKey `json:"-"`
+	RollupSenderPrivateKeys    []*ecdsa.PrivateKey `json:"-"`
 }
 
 // GasOracleConfig The config for updating gas price oracle.
@@ -80,55 +72,46 @@ type GasOracleConfig struct {
 // relayerConfigAlias RelayerConfig alias name
 type relayerConfigAlias RelayerConfig
 
-func convertAndCheck(key string, uniqueAddressesSet map[string]struct{}) (*ecdsa.PrivateKey, error) {
-	if key == "" {
-		return nil, nil
-	}
-
-	privKey, err := crypto.ToECDSA(common.FromHex(key))
-	if err != nil {
-		return nil, err
-	}
-
-	addr := crypto.PubkeyToAddress(privKey.PublicKey).Hex()
-	if _, exists := uniqueAddressesSet[addr]; exists {
-		return nil, fmt.Errorf("detected duplicated address for private key: %s", addr)
-	}
-	uniqueAddressesSet[addr] = struct{}{}
-
-	return privKey, nil
-}
-
 // UnmarshalJSON unmarshal relayer_config struct.
 func (r *RelayerConfig) UnmarshalJSON(input []byte) error {
-	var privateKeysConfig struct {
+	var jsonConfig struct {
 		relayerConfigAlias
-		GasOracleSenderPrivateKey string `json:"gas_oracle_sender_private_key"`
-		CommitSenderPrivateKey    string `json:"commit_sender_private_key"`
-		FinalizeSenderPrivateKey  string `json:"finalize_sender_private_key"`
+		// The private key of the relayer
+		MessageSenderPrivateKeys   []string `json:"message_sender_private_keys"`
+		GasOracleSenderPrivateKeys []string `json:"gas_oracle_sender_private_keys"`
+		RollupSenderPrivateKeys    []string `json:"rollup_sender_private_keys,omitempty"`
 	}
-	var err error
-	if err = json.Unmarshal(input, &privateKeysConfig); err != nil {
-		return fmt.Errorf("failed to unmarshal private keys config: %w", err)
+	if err := json.Unmarshal(input, &jsonConfig); err != nil {
+		return err
 	}
 
-	*r = RelayerConfig(privateKeysConfig.relayerConfigAlias)
+	*r = RelayerConfig(jsonConfig.relayerConfigAlias)
 
-	uniqueAddressesSet := make(map[string]struct{})
-
-	r.GasOracleSenderPrivateKey, err = convertAndCheck(privateKeysConfig.GasOracleSenderPrivateKey, uniqueAddressesSet)
-	if err != nil {
-		return fmt.Errorf("error converting and checking gas oracle sender private key: %w", err)
+	// Get messenger private key list.
+	for _, privStr := range jsonConfig.MessageSenderPrivateKeys {
+		priv, err := crypto.ToECDSA(common.FromHex(privStr))
+		if err != nil {
+			return fmt.Errorf("incorrect private_key_list format, err: %v", err)
+		}
+		r.MessageSenderPrivateKeys = append(r.MessageSenderPrivateKeys, priv)
 	}
 
-	r.CommitSenderPrivateKey, err = convertAndCheck(privateKeysConfig.CommitSenderPrivateKey, uniqueAddressesSet)
-	if err != nil {
-		return fmt.Errorf("error converting and checking commit sender private key: %w", err)
+	// Get gas oracle private key list.
+	for _, privStr := range jsonConfig.GasOracleSenderPrivateKeys {
+		priv, err := crypto.ToECDSA(common.FromHex(privStr))
+		if err != nil {
+			return fmt.Errorf("incorrect private_key_list format, err: %v", err)
+		}
+		r.GasOracleSenderPrivateKeys = append(r.GasOracleSenderPrivateKeys, priv)
 	}
 
-	r.FinalizeSenderPrivateKey, err = convertAndCheck(privateKeysConfig.FinalizeSenderPrivateKey, uniqueAddressesSet)
-	if err != nil {
-		return fmt.Errorf("error converting and checking finalize sender private key: %w", err)
+	// Get rollup private key
+	for _, privStr := range jsonConfig.RollupSenderPrivateKeys {
+		priv, err := crypto.ToECDSA(common.FromHex(privStr))
+		if err != nil {
+			return fmt.Errorf("incorrect roller_private_key format, err: %v", err)
+		}
+		r.RollupSenderPrivateKeys = append(r.RollupSenderPrivateKeys, priv)
 	}
 
 	return nil
@@ -136,18 +119,28 @@ func (r *RelayerConfig) UnmarshalJSON(input []byte) error {
 
 // MarshalJSON marshal RelayerConfig config, transfer private keys.
 func (r *RelayerConfig) MarshalJSON() ([]byte, error) {
-	privateKeysConfig := struct {
+	jsonConfig := struct {
 		relayerConfigAlias
 		// The private key of the relayer
-		GasOracleSenderPrivateKey string `json:"gas_oracle_sender_private_key"`
-		CommitSenderPrivateKey    string `json:"commit_sender_private_key"`
-		FinalizeSenderPrivateKey  string `json:"finalize_sender_private_key"`
-	}{}
+		MessageSenderPrivateKeys   []string `json:"message_sender_private_keys"`
+		GasOracleSenderPrivateKeys []string `json:"gas_oracle_sender_private_keys,omitempty"`
+		RollupSenderPrivateKeys    []string `json:"rollup_sender_private_keys,omitempty"`
+	}{relayerConfigAlias(*r), nil, nil, nil}
 
-	privateKeysConfig.relayerConfigAlias = relayerConfigAlias(*r)
-	privateKeysConfig.GasOracleSenderPrivateKey = common.Bytes2Hex(crypto.FromECDSA(r.GasOracleSenderPrivateKey))
-	privateKeysConfig.CommitSenderPrivateKey = common.Bytes2Hex(crypto.FromECDSA(r.CommitSenderPrivateKey))
-	privateKeysConfig.FinalizeSenderPrivateKey = common.Bytes2Hex(crypto.FromECDSA(r.FinalizeSenderPrivateKey))
+	// Transfer message sender private keys to hex type.
+	for _, priv := range r.MessageSenderPrivateKeys {
+		jsonConfig.MessageSenderPrivateKeys = append(jsonConfig.MessageSenderPrivateKeys, common.Bytes2Hex(crypto.FromECDSA(priv)))
+	}
 
-	return json.Marshal(&privateKeysConfig)
+	// Transfer rollup sender private keys to hex type.
+	for _, priv := range r.GasOracleSenderPrivateKeys {
+		jsonConfig.GasOracleSenderPrivateKeys = append(jsonConfig.GasOracleSenderPrivateKeys, common.Bytes2Hex(crypto.FromECDSA(priv)))
+	}
+
+	// Transfer rollup sender private keys to hex type.
+	for _, priv := range r.RollupSenderPrivateKeys {
+		jsonConfig.RollupSenderPrivateKeys = append(jsonConfig.RollupSenderPrivateKeys, common.Bytes2Hex(crypto.FromECDSA(priv)))
+	}
+
+	return json.Marshal(&jsonConfig)
 }

bridge/go.mod

@@ -0,0 +1,58 @@
+module scroll-tech/bridge
+
+go 1.18
+
+require (
+	github.com/agiledragon/gomonkey/v2 v2.9.0
+	github.com/orcaman/concurrent-map v1.0.0
+	github.com/orcaman/concurrent-map/v2 v2.0.1
+	github.com/scroll-tech/go-ethereum v1.10.14-0.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
+	modernc.org/mathutil v1.4.1
+)
+
+require (
+	github.com/btcsuite/btcd v0.20.1-beta // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/deckarep/golang-set v1.8.0 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/go-stack/stack v1.8.1 // 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/huin/goupnp v1.0.3 // indirect
+	github.com/iden3/go-iden3-crypto v0.0.15 // indirect
+	github.com/jackpal/go-nat-pmp v1.0.2 // 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/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
+	github.com/rivo/uniseg v0.4.4 // indirect
+	github.com/rjeczalik/notify v0.9.1 // indirect
+	github.com/rogpeppe/go-internal v1.10.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/scroll-tech/zktrie v0.5.3 // indirect
+	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
+	github.com/smartystreets/assertions v1.13.1 // indirect
+	github.com/status-im/keycard-go v0.2.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.11 // indirect
+	github.com/tklauser/numcpus v0.6.0 // indirect
+	github.com/tyler-smith/go-bip39 v1.1.0 // indirect
+	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	github.com/yusufpapurcu/wmi v1.2.2 // indirect
+	golang.org/x/crypto v0.9.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
+	golang.org/x/time v0.3.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

@@ -2,8 +2,6 @@ github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/agiledragon/gomonkey/v2 v2.9.0 h1:PDiKKybR596O6FHW+RVSG0Z7uGCBNbmbUXh3uCNQ7Hc=
 github.com/agiledragon/gomonkey/v2 v2.9.0/go.mod h1:ap1AmDzcVOAz1YpeJ3TCzIgstoaWLA6jbbgxfB4w2iY=
-github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/btcsuite/btcd v0.20.1-beta h1:Ik4hyJqN8Jfyv3S4AGBOmyouMsYE3EdYODkMbQjwPGw=
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
@@ -13,15 +11,9 @@ github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVa
 github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
 github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
 github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
-github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
-github.com/bytedance/sonic v1.9.2 h1:GDaNjuWSGu09guE9Oql0MSTNhNCLlWwO8y/xM5BzcbM=
-github.com/bytedance/sonic v1.9.2/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
 github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
 github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
 github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
-github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
-github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
 github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
@@ -34,38 +26,13 @@ github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS3
 github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
-github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI=
-github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
-github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
 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-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
-github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
-github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
-github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
-github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.14.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+jU0zvx4AqHGnv4k=
-github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
-github.com/go-resty/resty/v2 v2.7.0 h1:me+K9p3uhSmXtrBZ4k9jcEAfJmuC8IivWHwaLZwPrFY=
-github.com/go-resty/resty/v2 v2.7.0/go.mod h1:9PWDzw47qPphMRFfhsyk0NnSgvluHcljSMVIq3w7q0I=
 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/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
-github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-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/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+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=
@@ -76,8 +43,7 @@ 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.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o=
-github.com/holiman/uint256 v1.2.3/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=
@@ -87,64 +53,43 @@ github.com/iden3/go-iden3-crypto v0.0.15/go.mod h1:dLpM4vEPJ3nDHzhWFXDjzkn1qHoBe
 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/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 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/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
-github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
-github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
-github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
-github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q=
-github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
 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=
-github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
-github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
+github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
-github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
 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/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/orcaman/concurrent-map v1.0.0 h1:I/2A2XPCb4IuQWcQhBhSwGfiuybl/J0ev9HDbW65HOY=
+github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
 github.com/orcaman/concurrent-map/v2 v2.0.1 h1:jOJ5Pg2w1oeB6PeDurIYf6k9PQ+aTITr/6lP/L/zp6c=
 github.com/orcaman/concurrent-map/v2 v2.0.1/go.mod h1:9Eq3TG2oBe5FirmYWQfYO5iH1q0Jv47PLaNK++uCdOM=
-github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
-github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 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/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
-github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
-github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4=
-github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
-github.com/prometheus/common v0.39.0 h1:oOyhkDq05hPZKItWVBkJ6g6AtGxi+fy7F4JvUV8uhsI=
-github.com/prometheus/common v0.39.0/go.mod h1:6XBZ7lYdLCbkAVhwRsWTZn+IN5AB9F/NXd5w0BbEX0Y=
-github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI=
-github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
 github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA=
+github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
+github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
 github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
@@ -156,10 +101,10 @@ github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncj
 github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230829000527-f883dcdc21fc h1:eK3NOpjgm/b2TQ6rYqWx92Zri0kBuxf6gKjjsVxWKr8=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230829000527-f883dcdc21fc/go.mod h1:DiN3p2inoXOxGffxSswDKqWjQ7bU+Mp0c9v0XQXKmaA=
-github.com/scroll-tech/zktrie v0.6.0 h1:xLrMAO31Yo2BiPg1jtYKzcjpEFnXy8acbB7iIsyshPs=
-github.com/scroll-tech/zktrie v0.6.0/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230508165858-27a3830afa61 h1:4fslVpNOPLeJPYX3tivrVWgqNvChPs7/y9OqWvQSNCw=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230508165858-27a3830afa61/go.mod h1:45PZqlQCqV0dU4o4+SE8LoJLEvXkK5j45ligvbih9QY=
+github.com/scroll-tech/zktrie v0.5.3 h1:jjzQchGU6XPL5s1C5bwwivSadefSRuYASE9OL7UKAdE=
+github.com/scroll-tech/zktrie v0.5.3/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
@@ -173,78 +118,52 @@ 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/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
-github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
 github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
 github.com/tklauser/go-sysconf v0.3.11/go.mod h1:GqXfhXY3kiPa0nAXPDIQIWzJbMCB7AmcWpGR8lSZfqI=
 github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYms=
 github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
-github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
-github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8=
 github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U=
-github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
-github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
-github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
-github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
+github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa h1:5SqCsI/2Qya2bCzK15ozrqo2sZxkh0FHynJZOTVoV6Q=
+github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
-golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc=
-golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 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.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
-golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
+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/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-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
-golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+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-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 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.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+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/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
-golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
 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/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/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/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=
@@ -254,6 +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/gorm v1.25.2 h1:gs1o6Vsa+oVKG/a9ElL3XgyGfghFfkKA2SInQaCyMho=
-gorm.io/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
+modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8=
+modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=

bridge/mock_bridge/MockBridgeL1.sol

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

bridge/mock_bridge/MockBridgeL2.sol

@@ -11,6 +11,24 @@ contract MockBridgeL2 {
   /// @param messageHash The hash of the corresponding message.
   event AppendMessage(uint256 index, bytes32 messageHash);
 
+  /********************************
+   * Events from L1BlockContainer *
+   ********************************/
+
+  /// @notice Emitted when a block is imported.
+  /// @param blockHash The hash of the imported block.
+  /// @param blockHeight The height of the imported block.
+  /// @param blockTimestamp The timestamp of the imported block.
+  /// @param baseFee The base fee of the imported block.
+  /// @param stateRoot The state root of the imported block.
+  event ImportBlock(
+    bytes32 indexed blockHash,
+    uint256 blockHeight,
+    uint256 blockTimestamp,
+    uint256 baseFee,
+    bytes32 stateRoot
+  );
+
   /*********************************
    * Events from L2ScrollMessenger *
    *********************************/

bridge/relayer/l1_relayer.go

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

bridge/relayer/l1_relayer_test.go

@@ -0,0 +1,261 @@
+package relayer
+
+import (
+	"context"
+	"errors"
+	"math/big"
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/smartystreets/goconvey/convey"
+
+	"github.com/stretchr/testify/assert"
+
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
+
+	"scroll-tech/common/types"
+	"scroll-tech/common/utils"
+
+	"scroll-tech/bridge/sender"
+)
+
+var (
+	templateL1Message = []*types.L1Message{
+		{
+			QueueIndex: 1,
+			MsgHash:    "msg_hash1",
+			Height:     1,
+			Sender:     "0x596a746661dbed76a84556111c2872249b070e15",
+			Value:      "0x19ece",
+			GasLimit:   11529940,
+			Target:     "0x2c73620b223808297ea734d946813f0dd78eb8f7",
+			Calldata:   "testdata",
+			Layer1Hash: "hash0",
+		},
+		{
+			QueueIndex: 2,
+			MsgHash:    "msg_hash2",
+			Height:     2,
+			Sender:     "0x596a746661dbed76a84556111c2872249b070e15",
+			Value:      "0x19ece",
+			GasLimit:   11529940,
+			Target:     "0x2c73620b223808297ea734d946813f0dd78eb8f7",
+			Calldata:   "testdata",
+			Layer1Hash: "hash1",
+		},
+	}
+)
+
+// testCreateNewRelayer test create new relayer instance and stop
+func testCreateNewL1Relayer(t *testing.T) {
+	// Create db handler and reset db.
+	db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
+
+	relayer, err := NewLayer1Relayer(context.Background(), db, cfg.L2Config.RelayerConfig)
+	assert.NoError(t, err)
+	assert.NotNil(t, relayer)
+}
+
+func testL1RelayerProcessSaveEvents(t *testing.T) {
+	// Create db handler and reset db.
+	db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
+	l1Cfg := cfg.L1Config
+	relayer, err := NewLayer1Relayer(context.Background(), db, l1Cfg.RelayerConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, db.SaveL1Messages(context.Background(), templateL1Message))
+	relayer.ProcessSavedEvents()
+	msg1, err := db.GetL1MessageByQueueIndex(1)
+	assert.NoError(t, err)
+	assert.Equal(t, msg1.Status, types.MsgSubmitted)
+	msg2, err := db.GetL1MessageByQueueIndex(2)
+	assert.NoError(t, err)
+	assert.Equal(t, msg2.Status, types.MsgSubmitted)
+}
+
+func testL1RelayerMsgConfirm(t *testing.T) {
+	// Set up the database and defer closing it.
+	db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
+
+	// Insert test data.
+	assert.NoError(t, db.SaveL1Messages(context.Background(),
+		[]*types.L1Message{
+			{MsgHash: "msg-1", QueueIndex: 0},
+			{MsgHash: "msg-2", QueueIndex: 1},
+		}))
+
+	// Create and set up the Layer1 Relayer.
+	l1Cfg := cfg.L1Config
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	l1Relayer, err := NewLayer1Relayer(ctx, db, l1Cfg.RelayerConfig)
+	assert.NoError(t, err)
+	assert.NotNil(t, l1Relayer)
+
+	// Simulate message confirmations.
+	l1Relayer.messageSender.SendConfirmation(&sender.Confirmation{
+		ID:           "msg-1",
+		IsSuccessful: true,
+	})
+	l1Relayer.messageSender.SendConfirmation(&sender.Confirmation{
+		ID:           "msg-2",
+		IsSuccessful: false,
+	})
+
+	// Check the database for the updated status using TryTimes.
+	ok := utils.TryTimes(5, func() bool {
+		msg1, err1 := db.GetL1MessageByMsgHash("msg-1")
+		msg2, err2 := db.GetL1MessageByMsgHash("msg-2")
+		return err1 == nil && msg1.Status == types.MsgConfirmed &&
+			err2 == nil && msg2.Status == types.MsgRelayFailed
+	})
+	assert.True(t, ok)
+}
+
+func testL1RelayerGasOracleConfirm(t *testing.T) {
+	// Set up the database and defer closing it.
+	db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
+
+	// Insert test data.
+	assert.NoError(t, db.InsertL1Blocks(context.Background(),
+		[]*types.L1BlockInfo{
+			{Hash: "gas-oracle-1", Number: 0},
+			{Hash: "gas-oracle-2", Number: 1},
+		}))
+
+	// Create and set up the Layer2 Relayer.
+	l1Cfg := cfg.L1Config
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	l1Relayer, err := NewLayer1Relayer(ctx, db, l1Cfg.RelayerConfig)
+	assert.NoError(t, err)
+	assert.NotNil(t, l1Relayer)
+
+	// Simulate message confirmations.
+	l1Relayer.gasOracleSender.SendConfirmation(&sender.Confirmation{
+		ID:           "gas-oracle-1",
+		IsSuccessful: true,
+	})
+	l1Relayer.gasOracleSender.SendConfirmation(&sender.Confirmation{
+		ID:           "gas-oracle-2",
+		IsSuccessful: false,
+	})
+
+	// Check the database for the updated status using TryTimes.
+	ok := utils.TryTimes(5, func() bool {
+		msg1, err1 := db.GetL1BlockInfos(map[string]interface{}{"hash": "gas-oracle-1"})
+		msg2, err2 := db.GetL1BlockInfos(map[string]interface{}{"hash": "gas-oracle-2"})
+		return err1 == nil && len(msg1) == 1 && msg1[0].GasOracleStatus == types.GasOracleImported &&
+			err2 == nil && len(msg2) == 1 && msg2[0].GasOracleStatus == types.GasOracleFailed
+	})
+	assert.True(t, ok)
+}
+
+func testL1RelayerProcessGasPriceOracle(t *testing.T) {
+	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())
+	defer cancel()
+	l1Relayer, err := NewLayer1Relayer(ctx, db, l1Cfg.RelayerConfig)
+	assert.NoError(t, err)
+	assert.NotNil(t, l1Relayer)
+
+	convey.Convey("GetLatestL1BlockHeight failure", t, func() {
+		targetErr := errors.New("GetLatestL1BlockHeight error")
+		patchGuard := gomonkey.ApplyMethodFunc(db, "GetLatestL1BlockHeight", func() (uint64, error) {
+			return 0, targetErr
+		})
+		defer patchGuard.Reset()
+		l1Relayer.ProcessGasPriceOracle()
+	})
+
+	patchGuard := gomonkey.ApplyMethodFunc(db, "GetLatestL1BlockHeight", func() (uint64, error) {
+		return 100, nil
+	})
+	defer patchGuard.Reset()
+
+	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(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},
+			}
+			return tmpInfo, nil
+		})
+		l1Relayer.ProcessGasPriceOracle()
+	})
+
+	patchGuard.ApplyMethodFunc(db, "GetL1BlockInfos", func(fields map[string]interface{}, args ...string) ([]*types.L1BlockInfo, error) {
+		tmpInfo := []*types.L1BlockInfo{
+			{
+				Hash:            "gas-oracle-1",
+				Number:          0,
+				GasOracleStatus: types.GasOraclePending,
+			},
+		}
+		return tmpInfo, nil
+	})
+
+	convey.Convey("setL1BaseFee failure", t, func() {
+		targetErr := errors.New("pack setL1BaseFee error")
+		patchGuard.ApplyMethodFunc(l1Relayer.l1GasOracleABI, "Pack", func(name string, args ...interface{}) ([]byte, error) {
+			return nil, targetErr
+		})
+		l1Relayer.ProcessGasPriceOracle()
+	})
+
+	patchGuard.ApplyMethodFunc(l1Relayer.l1GasOracleABI, "Pack", func(name string, args ...interface{}) ([]byte, error) {
+		return []byte("for test"), nil
+	})
+
+	convey.Convey("send transaction failure", t, func() {
+		targetErr := errors.New("send transaction failure")
+		patchGuard.ApplyMethodFunc(l1Relayer.gasOracleSender, "SendTransaction", func(string, *common.Address, *big.Int, []byte, uint64) (hash common.Hash, err error) {
+			return common.Hash{}, targetErr
+		})
+		l1Relayer.ProcessGasPriceOracle()
+	})
+
+	patchGuard.ApplyMethodFunc(l1Relayer.gasOracleSender, "SendTransaction", func(string, *common.Address, *big.Int, []byte, uint64) (hash common.Hash, err error) {
+		return common.Hash{}, nil
+	})
+
+	convey.Convey("UpdateL1GasOracleStatusAndOracleTxHash failure", t, func() {
+		targetErr := errors.New("UpdateL1GasOracleStatusAndOracleTxHash failure")
+		patchGuard.ApplyMethodFunc(db, "UpdateL1GasOracleStatusAndOracleTxHash", func(context.Context, string, types.GasOracleStatus, string) error {
+			return targetErr
+		})
+		l1Relayer.ProcessGasPriceOracle()
+	})
+
+	patchGuard.ApplyMethodFunc(db, "UpdateL1GasOracleStatusAndOracleTxHash", func(context.Context, string, types.GasOracleStatus, string) error {
+		return nil
+	})
+
+	l1Relayer.ProcessGasPriceOracle()
+}

bridge/relayer/l2_relayer.go

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

bridge/relayer/l2_relayer_test.go

@@ -0,0 +1,552 @@
+package relayer
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"math/big"
+	"os"
+	"strconv"
+	"testing"
+
+	"github.com/agiledragon/gomonkey/v2"
+	"github.com/scroll-tech/go-ethereum/accounts/abi"
+	"github.com/scroll-tech/go-ethereum/common"
+	geth_types "github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/smartystreets/goconvey/convey"
+	"github.com/stretchr/testify/assert"
+
+	"scroll-tech/common/types"
+	"scroll-tech/common/utils"
+
+	"scroll-tech/bridge/sender"
+
+	"scroll-tech/database"
+	"scroll-tech/database/migrate"
+)
+
+var (
+	templateL2Message = []*types.L2Message{
+		{
+			Nonce:      1,
+			Height:     1,
+			Sender:     "0x596a746661dbed76a84556111c2872249b070e15",
+			Value:      "100",
+			Target:     "0x2c73620b223808297ea734d946813f0dd78eb8f7",
+			Calldata:   "testdata",
+			Layer2Hash: "hash0",
+		},
+	}
+)
+
+func testCreateNewRelayer(t *testing.T) {
+	// Create db handler and reset db.
+	db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
+
+	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, cfg.L2Config.RelayerConfig)
+	assert.NoError(t, err)
+	assert.NotNil(t, relayer)
+}
+
+func testL2RelayerProcessSaveEvents(t *testing.T) {
+	// Create db handler and reset db.
+	db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
+
+	l2Cfg := cfg.L2Config
+	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig)
+	assert.NoError(t, err)
+
+	err = db.SaveL2Messages(context.Background(), templateL2Message)
+	assert.NoError(t, err)
+
+	traces := []*types.WrappedBlock{
+		{
+			Header: &geth_types.Header{
+				Number: big.NewInt(int64(templateL2Message[0].Height)),
+			},
+			Transactions:     nil,
+			WithdrawTrieRoot: common.Hash{},
+		},
+		{
+			Header: &geth_types.Header{
+				Number: big.NewInt(int64(templateL2Message[0].Height + 1)),
+			},
+			Transactions:     nil,
+			WithdrawTrieRoot: common.Hash{},
+		},
+	}
+	assert.NoError(t, db.InsertWrappedBlocks(traces))
+
+	parentBatch1 := &types.BlockBatch{
+		Index:     0,
+		Hash:      common.Hash{}.Hex(),
+		StateRoot: common.Hash{}.Hex(),
+	}
+	batchData1 := types.NewBatchData(parentBatch1, []*types.WrappedBlock{wrappedBlock1}, nil)
+	dbTx, err := db.Beginx()
+	assert.NoError(t, err)
+	assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData1))
+	batchHash := batchData1.Hash().Hex()
+	assert.NoError(t, db.SetBatchHashForL2BlocksInDBTx(dbTx, []uint64{1}, batchHash))
+	assert.NoError(t, dbTx.Commit())
+
+	err = db.UpdateRollupStatus(context.Background(), batchHash, types.RollupFinalized)
+	assert.NoError(t, err)
+
+	relayer.ProcessSavedEvents()
+
+	msg, err := db.GetL2MessageByNonce(templateL2Message[0].Nonce)
+	assert.NoError(t, err)
+	assert.Equal(t, types.MsgSubmitted, msg.Status)
+}
+
+func testL2RelayerProcessCommittedBatches(t *testing.T) {
+	// Create db handler and reset db.
+	db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
+
+	l2Cfg := cfg.L2Config
+	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig)
+	assert.NoError(t, err)
+
+	parentBatch1 := &types.BlockBatch{
+		Index:     0,
+		Hash:      common.Hash{}.Hex(),
+		StateRoot: common.Hash{}.Hex(),
+	}
+	batchData1 := types.NewBatchData(parentBatch1, []*types.WrappedBlock{wrappedBlock1}, nil)
+	dbTx, err := db.Beginx()
+	assert.NoError(t, err)
+	assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData1))
+	batchHash := batchData1.Hash().Hex()
+	err = dbTx.Commit()
+	assert.NoError(t, err)
+
+	err = db.UpdateRollupStatus(context.Background(), batchHash, types.RollupCommitted)
+	assert.NoError(t, err)
+
+	tProof := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
+	tInstanceCommitments := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
+	err = db.UpdateProofByHash(context.Background(), batchHash, tProof, tInstanceCommitments, 100)
+	assert.NoError(t, err)
+	err = db.UpdateProvingStatus(batchHash, types.ProvingTaskVerified)
+	assert.NoError(t, err)
+
+	relayer.ProcessCommittedBatches()
+
+	status, err := db.GetRollupStatus(batchHash)
+	assert.NoError(t, err)
+	assert.Equal(t, types.RollupFinalizing, status)
+}
+
+func testL2RelayerSkipBatches(t *testing.T) {
+	// Create db handler and reset db.
+	db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
+
+	l2Cfg := cfg.L2Config
+	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig)
+	assert.NoError(t, err)
+
+	createBatch := func(rollupStatus types.RollupStatus, provingStatus types.ProvingStatus, index uint64) string {
+		dbTx, err := db.Beginx()
+		assert.NoError(t, err)
+		batchData := genBatchData(t, index)
+		assert.NoError(t, db.NewBatchInDBTx(dbTx, batchData))
+		batchHash := batchData.Hash().Hex()
+		err = dbTx.Commit()
+		assert.NoError(t, err)
+
+		err = db.UpdateRollupStatus(context.Background(), batchHash, rollupStatus)
+		assert.NoError(t, err)
+
+		tProof := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
+		tInstanceCommitments := []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}
+		err = db.UpdateProofByHash(context.Background(), batchHash, tProof, tInstanceCommitments, 100)
+		assert.NoError(t, err)
+		err = db.UpdateProvingStatus(batchHash, provingStatus)
+		assert.NoError(t, err)
+
+		return batchHash
+	}
+
+	skipped := []string{
+		createBatch(types.RollupCommitted, types.ProvingTaskSkipped, 1),
+		createBatch(types.RollupCommitted, types.ProvingTaskFailed, 2),
+	}
+
+	notSkipped := []string{
+		createBatch(types.RollupPending, types.ProvingTaskSkipped, 3),
+		createBatch(types.RollupCommitting, types.ProvingTaskSkipped, 4),
+		createBatch(types.RollupFinalizing, types.ProvingTaskSkipped, 5),
+		createBatch(types.RollupFinalized, types.ProvingTaskSkipped, 6),
+		createBatch(types.RollupPending, types.ProvingTaskFailed, 7),
+		createBatch(types.RollupCommitting, types.ProvingTaskFailed, 8),
+		createBatch(types.RollupFinalizing, types.ProvingTaskFailed, 9),
+		createBatch(types.RollupFinalized, types.ProvingTaskFailed, 10),
+		createBatch(types.RollupCommitted, types.ProvingTaskVerified, 11),
+	}
+
+	relayer.ProcessCommittedBatches()
+
+	for _, id := range skipped {
+		status, err := db.GetRollupStatus(id)
+		assert.NoError(t, err)
+		assert.Equal(t, types.RollupFinalizationSkipped, status)
+	}
+
+	for _, id := range notSkipped {
+		status, err := db.GetRollupStatus(id)
+		assert.NoError(t, err)
+		assert.NotEqual(t, types.RollupFinalizationSkipped, status)
+	}
+}
+
+func testL2RelayerMsgConfirm(t *testing.T) {
+	// Set up the database and defer closing it.
+	db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
+
+	// Insert test data.
+	assert.NoError(t, db.SaveL2Messages(context.Background(), []*types.L2Message{
+		{MsgHash: "msg-1", Nonce: 0}, {MsgHash: "msg-2", Nonce: 1},
+	}))
+
+	// Create and set up the Layer2 Relayer.
+	l2Cfg := cfg.L2Config
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	l2Relayer, err := NewLayer2Relayer(ctx, l2Cli, db, l2Cfg.RelayerConfig)
+	assert.NoError(t, err)
+
+	// Simulate message confirmations.
+	l2Relayer.processingMessage.Store("msg-1", "msg-1")
+	l2Relayer.messageSender.SendConfirmation(&sender.Confirmation{
+		ID:           "msg-1",
+		IsSuccessful: true,
+	})
+	l2Relayer.processingMessage.Store("msg-2", "msg-2")
+	l2Relayer.messageSender.SendConfirmation(&sender.Confirmation{
+		ID:           "msg-2",
+		IsSuccessful: false,
+	})
+
+	// Check the database for the updated status using TryTimes.
+	assert.True(t, utils.TryTimes(5, func() bool {
+		msg1, err1 := db.GetL2MessageByMsgHash("msg-1")
+		msg2, err2 := db.GetL2MessageByMsgHash("msg-2")
+		return err1 == nil && msg1.Status == types.MsgConfirmed &&
+			err2 == nil && msg2.Status == types.MsgRelayFailed
+	}))
+}
+
+func testL2RelayerRollupConfirm(t *testing.T) {
+	// Set up the database and defer closing it.
+	db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
+
+	// Insert test data.
+	batches := make([]*types.BatchData, 6)
+	for i := 0; i < 6; i++ {
+		batches[i] = genBatchData(t, uint64(i))
+	}
+
+	dbTx, err := db.Beginx()
+	assert.NoError(t, err)
+	for _, batch := range batches {
+		assert.NoError(t, db.NewBatchInDBTx(dbTx, batch))
+	}
+	assert.NoError(t, dbTx.Commit())
+
+	// Create and set up the Layer2 Relayer.
+	l2Cfg := cfg.L2Config
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	l2Relayer, err := NewLayer2Relayer(ctx, l2Cli, db, l2Cfg.RelayerConfig)
+	assert.NoError(t, err)
+
+	// Simulate message confirmations.
+	processingKeys := []string{"committed-1", "committed-2", "finalized-1", "finalized-2"}
+	isSuccessful := []bool{true, false, true, false}
+
+	for i, key := range processingKeys[:2] {
+		batchHashes := []string{batches[i*2].Hash().Hex(), batches[i*2+1].Hash().Hex()}
+		l2Relayer.processingBatchesCommitment.Store(key, batchHashes)
+		l2Relayer.messageSender.SendConfirmation(&sender.Confirmation{
+			ID:           key,
+			IsSuccessful: isSuccessful[i],
+		})
+	}
+
+	for i, key := range processingKeys[2:] {
+		batchHash := batches[i+4].Hash().Hex()
+		l2Relayer.processingFinalization.Store(key, batchHash)
+		l2Relayer.rollupSender.SendConfirmation(&sender.Confirmation{
+			ID:           key,
+			IsSuccessful: isSuccessful[i+2],
+			TxHash:       common.HexToHash("0x56789abcdef1234"),
+		})
+	}
+
+	// Check the database for the updated status using TryTimes.
+	ok := utils.TryTimes(5, func() bool {
+		expectedStatuses := []types.RollupStatus{
+			types.RollupCommitted,
+			types.RollupCommitted,
+			types.RollupCommitFailed,
+			types.RollupCommitFailed,
+			types.RollupFinalized,
+			types.RollupFinalizeFailed,
+		}
+
+		for i, batch := range batches[:6] {
+			batchInDB, err := db.GetBlockBatches(map[string]interface{}{"hash": batch.Hash().Hex()})
+			if err != nil || len(batchInDB) != 1 || batchInDB[0].RollupStatus != expectedStatuses[i] {
+				return false
+			}
+		}
+		return true
+	})
+	assert.True(t, ok)
+}
+
+func testL2RelayerGasOracleConfirm(t *testing.T) {
+	// Set up the database and defer closing it.
+	db, err := database.NewOrmFactory(cfg.DBConfig)
+	assert.NoError(t, err)
+	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
+	defer db.Close()
+
+	// Insert test data.
+	batches := make([]*types.BatchData, 2)
+	for i := 0; i < 2; i++ {
+		batches[i] = genBatchData(t, uint64(i))
+	}
+
+	dbTx, err := db.Beginx()
+	assert.NoError(t, err)
+	for _, batch := range batches {
+		assert.NoError(t, db.NewBatchInDBTx(dbTx, batch))
+	}
+	assert.NoError(t, dbTx.Commit())
+
+	// Create and set up the Layer2 Relayer.
+	l2Cfg := cfg.L2Config
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	l2Relayer, err := NewLayer2Relayer(ctx, l2Cli, db, l2Cfg.RelayerConfig)
+	assert.NoError(t, err)
+
+	// Simulate message confirmations.
+	isSuccessful := []bool{true, false}
+	for i, batch := range batches {
+		l2Relayer.gasOracleSender.SendConfirmation(&sender.Confirmation{
+			ID:           batch.Hash().Hex(),
+			IsSuccessful: isSuccessful[i],
+		})
+	}
+
+	// Check the database for the updated status using TryTimes.
+	ok := utils.TryTimes(5, func() bool {
+		expectedStatuses := []types.GasOracleStatus{types.GasOracleImported, types.GasOracleFailed}
+		for i, batch := range batches {
+			gasOracle, err := db.GetBlockBatches(map[string]interface{}{"hash": batch.Hash().Hex()})
+			if err != nil || len(gasOracle) != 1 || gasOracle[0].OracleStatus != expectedStatuses[i] {
+				return false
+			}
+		}
+		return true
+	})
+	assert.True(t, ok)
+}
+
+func genBatchData(t *testing.T, index uint64) *types.BatchData {
+	templateBlockTrace, err := os.ReadFile("../../common/testdata/blockTrace_02.json")
+	assert.NoError(t, err)
+	// unmarshal blockTrace
+	wrappedBlock := &types.WrappedBlock{}
+	err = json.Unmarshal(templateBlockTrace, wrappedBlock)
+	assert.NoError(t, err)
+	wrappedBlock.Header.ParentHash = common.HexToHash("0x" + strconv.FormatUint(index+1, 16))
+	parentBatch := &types.BlockBatch{
+		Index: index,
+		Hash:  "0x0000000000000000000000000000000000000000",
+	}
+	return types.NewBatchData(parentBatch, []*types.WrappedBlock{wrappedBlock}, nil)
+}
+
+func testLayer2RelayerProcessGasPriceOracle(t *testing.T) {
+	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)
+
+	convey.Convey("Failed to GetLatestBatch", t, func() {
+		targetErr := errors.New("GetLatestBatch error")
+		patchGuard := gomonkey.ApplyMethodFunc(db, "GetLatestBatch", func() (*types.BlockBatch, error) {
+			return nil, targetErr
+		})
+		defer patchGuard.Reset()
+		relayer.ProcessGasPriceOracle()
+	})
+
+	patchGuard := gomonkey.ApplyMethodFunc(db, "GetLatestBatch", func() (*types.BlockBatch, error) {
+		batch := types.BlockBatch{
+			OracleStatus: types.GasOraclePending,
+			Hash:         "0x0000000000000000000000000000000000000000",
+		}
+		return &batch, nil
+	})
+	defer patchGuard.Reset()
+
+	convey.Convey("Failed to fetch SuggestGasPrice from l2geth", t, func() {
+		targetErr := errors.New("SuggestGasPrice error")
+		patchGuard.ApplyMethodFunc(relayer.l2Client, "SuggestGasPrice", func(ctx context.Context) (*big.Int, error) {
+			return nil, targetErr
+		})
+		relayer.ProcessGasPriceOracle()
+	})
+
+	patchGuard.ApplyMethodFunc(relayer.l2Client, "SuggestGasPrice", func(ctx context.Context) (*big.Int, error) {
+		return big.NewInt(100), nil
+	})
+
+	convey.Convey("Failed to pack setL2BaseFee", t, func() {
+		targetErr := errors.New("setL2BaseFee error")
+		patchGuard.ApplyMethodFunc(relayer.l2GasOracleABI, "Pack", func(name string, args ...interface{}) ([]byte, error) {
+			return nil, targetErr
+		})
+		relayer.ProcessGasPriceOracle()
+	})
+
+	patchGuard.ApplyMethodFunc(relayer.l2GasOracleABI, "Pack", func(name string, args ...interface{}) ([]byte, error) {
+		return nil, nil
+	})
+
+	convey.Convey("Failed to send setL2BaseFee tx to layer2", t, func() {
+		targetErr := errors.New("failed to send setL2BaseFee tx to layer2 error")
+		patchGuard.ApplyMethodFunc(relayer.gasOracleSender, "SendTransaction", func(ID string, target *common.Address, value *big.Int, data []byte, minGasLimit uint64) (hash common.Hash, err error) {
+			return common.Hash{}, targetErr
+		})
+		relayer.ProcessGasPriceOracle()
+	})
+
+	patchGuard.ApplyMethodFunc(relayer.gasOracleSender, "SendTransaction", func(ID string, target *common.Address, value *big.Int, data []byte, minGasLimit uint64) (hash common.Hash, err error) {
+		return common.HexToHash("0x56789abcdef1234"), nil
+	})
+
+	convey.Convey("UpdateGasOracleStatusAndOracleTxHash failed", t, func() {
+		targetErr := errors.New("UpdateL2GasOracleStatusAndOracleTxHash error")
+		patchGuard.ApplyMethodFunc(db, "UpdateL2GasOracleStatusAndOracleTxHash", func(ctx context.Context, hash string, status types.GasOracleStatus, txHash string) error {
+			return targetErr
+		})
+		relayer.ProcessGasPriceOracle()
+	})
+
+	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, 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 []*types.BatchData
+	convey.Convey("SendCommitTx receives empty batch", t, func() {
+		err = relayer.SendCommitTx(batchDataList)
+		assert.NoError(t, err)
+	})
+
+	parentBatch := &types.BlockBatch{
+		Index: 0,
+		Hash:  "0x0000000000000000000000000000000000000000",
+	}
+
+	traces := []*types.WrappedBlock{
+		{
+			Header: &geth_types.Header{
+				Number:     big.NewInt(1000),
+				ParentHash: common.Hash{},
+				Difficulty: big.NewInt(0),
+				BaseFee:    big.NewInt(0),
+			},
+			Transactions:     nil,
+			WithdrawTrieRoot: common.Hash{},
+		},
+	}
+
+	blocks := []*types.WrappedBlock{traces[0]}
+	tmpBatchData := types.NewBatchData(parentBatch, blocks, cfg.L2Config.BatchProposerConfig.PublicInputConfig)
+	batchDataList = append(batchDataList, tmpBatchData)
+
+	var s abi.ABI
+	convey.Convey("Failed to pack commitBatches", t, func() {
+		targetErr := errors.New("commitBatches error")
+		patchGuard := gomonkey.ApplyMethodFunc(s, "Pack", func(name string, args ...interface{}) ([]byte, error) {
+			return nil, targetErr
+		})
+		defer patchGuard.Reset()
+
+		err = relayer.SendCommitTx(batchDataList)
+		assert.EqualError(t, err, targetErr.Error())
+	})
+
+	patchGuard := gomonkey.ApplyMethodFunc(s, "Pack", func(name string, args ...interface{}) ([]byte, error) {
+		return nil, nil
+	})
+	defer patchGuard.Reset()
+
+	convey.Convey("Failed to send commitBatches tx to layer1", t, func() {
+		targetErr := errors.New("SendTransaction failure")
+		patchGuard.ApplyMethodFunc(relayer.rollupSender, "SendTransaction", func(ID string, target *common.Address, value *big.Int, data []byte, minGasLimit uint64) (hash common.Hash, err error) {
+			return common.Hash{}, targetErr
+		})
+		err = relayer.SendCommitTx(batchDataList)
+		assert.EqualError(t, err, targetErr.Error())
+	})
+
+	patchGuard.ApplyMethodFunc(relayer.rollupSender, "SendTransaction", func(ID string, target *common.Address, value *big.Int, data []byte, minGasLimit uint64) (hash common.Hash, err error) {
+		return common.HexToHash("0x56789abcdef1234"), nil
+	})
+
+	convey.Convey("UpdateCommitTxHashAndRollupStatus failed", t, func() {
+		targetErr := errors.New("UpdateCommitTxHashAndRollupStatus failure")
+		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(db, "UpdateCommitTxHashAndRollupStatus", func(ctx context.Context, hash string, commitTxHash string, status types.RollupStatus) error {
+		return nil
+	})
+	err = relayer.SendCommitTx(batchDataList)
+	assert.NoError(t, err)
+}