Merge branch 'develop' into pull-model-prover-client

go mod tidy and bump version
address comments
2026-01-12 07:28:08 -05:00 · 2023-08-05 10:21:22 +08:00 · 2023-08-05 03:41:04 +08:00 · 2023-08-05 03:32:29 +08:00 · 2023-08-04 22:31:56 +08:00 · 2023-08-04 20:56:52 +08:00
168 changed files with 1662 additions and 12274 deletions
--- a/.github/workflows/bridge.yml
+++ b/.github/workflows/bridge.yml
@@ -43,8 +43,6 @@ jobs:
        version: '0.8.16'
    - name: Install Geth Tools
      uses: gacts/install-geth-tools@v1
-      with:
-        version: 1.10.19
    - name: Lint
      working-directory: 'bridge'
      run: |
@@ -94,8 +92,6 @@ jobs:
        version: '0.8.16'
    - name: Install Geth Tools
      uses: gacts/install-geth-tools@v1
-      with:
-        version: 1.10.19
    - name: Build prerequisites
      run: |
        make dev_docker
--- a/.github/workflows/common.yml
+++ b/.github/workflows/common.yml
@@ -88,8 +88,6 @@ jobs:
        version: '0.8.16'
    - name: Install Geth Tools
      uses: gacts/install-geth-tools@v1
-      with:
-        version: 1.10.19
    - name: Build prerequisites
      run: |
        make dev_docker
--- a/.github/workflows/coordinator.yml
+++ b/.github/workflows/coordinator.yml
@@ -104,8 +104,6 @@ jobs:
        version: '0.8.16'
    - name: Install Geth Tools
      uses: gacts/install-geth-tools@v1
-      with:
-        version: 1.10.19
    - name: Build prerequisites
      run: |
        make dev_docker
--- a/.github/workflows/database.yml
+++ b/.github/workflows/database.yml
@@ -81,8 +81,6 @@ jobs:
        version: '0.8.16'
    - name: Install Geth Tools
      uses: gacts/install-geth-tools@v1
-      with:
-        version: 1.10.19
    - name: Build prerequisites
      run: |
        make dev_docker
--- a/.github/workflows/docker.yaml
+++ b/.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,6 @@ jobs:
        tags: scrolltech/gas-oracle:${{github.ref_name}}
        # cache-from: type=gha,scope=${{ github.workflow }}
        # cache-to: type=gha,scope=${{ github.workflow }}
-  msg_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
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
    - name: Build and push msg_relayer docker
      uses: docker/build-push-action@v2
      with:
@@ -69,18 +45,6 @@ jobs:
        tags: scrolltech/msg-relayer:${{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
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_TOKEN }}
    - name: Build and push rollup_relayer docker
      uses: docker/build-push-action@v2
      with:
@@ -90,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:
@@ -111,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:
@@ -132,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:
@@ -153,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 }}
--- a/.github/workflows/integration.yaml
+++ b/.github/workflows/integration.yaml
@@ -33,8 +33,6 @@ jobs:
        version: '0.8.16'
    - name: Install Geth Tools
      uses: gacts/install-geth-tools@v1
-      with:
-        version: 1.10.19
    - name: Build prerequisites
      run: |
        make dev_docker
--- a/14
+++ b/14
@@ -15,14 +15,14 @@ lint: ## The code's format and security checks.

 update: ## update dependencies
 	go work sync
-	cd $(PWD)/bridge/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.34 && go mod tidy
+	cd $(PWD)/bridge/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.18 && 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@scroll-v4.3.34 && go mod tidy
-	cd $(PWD)/coordinator/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.34 && go mod tidy
-	cd $(PWD)/database/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.34 && go mod tidy
-	cd $(PWD)/prover/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.34 && go mod tidy
-	cd $(PWD)/prover-stats-api/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.34 && go mod tidy
-	cd $(PWD)/tests/integration-test/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.34 && go mod tidy
+	cd $(PWD)/common/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.18 && go mod tidy
+	cd $(PWD)/coordinator/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.18 && go mod tidy
+	cd $(PWD)/database/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.18 && go mod tidy
+	cd $(PWD)/prover/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.18 && go mod tidy
+	cd $(PWD)/prover-stats-api/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.18 && go mod tidy
+	cd $(PWD)/tests/integration-test/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.18 && go mod tidy
 	goimports -local $(PWD)/bridge/ -w .
 	goimports -local $(PWD)/bridge-history-api/ -w .
 	goimports -local $(PWD)/common/ -w .
--- a/bridge-history-api/abi/backend_abi.go
+++ b/bridge-history-api/abi/backend_abi.go
--- a/bridge-history-api/crossmsg/messageproof/msg_proof_updater.go
+++ b/bridge-history-api/crossmsg/messageproof/msg_proof_updater.go
@@ -53,11 +53,11 @@ func (m *MsgProofUpdater) Start() {
 					continue
 				}
 				latestBatchIndexWithProof, err := m.l2SentMsgOrm.GetLatestL2SentMsgBatchIndex(m.ctx)
+				log.Info("latest batc with proof", "batch_index", latestBatchIndexWithProof)
 				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
--- a/bridge-history-api/go.mod
+++ b/bridge-history-api/go.mod
@@ -3,7 +3,7 @@ module bridge-history-api
 go 1.19

 require (
-	github.com/ethereum/go-ethereum v1.12.2
+	github.com/ethereum/go-ethereum v1.12.0
 	github.com/gin-contrib/cors v1.4.0
 	github.com/gin-gonic/gin v1.9.1
 	github.com/mattn/go-colorable v0.1.13
@@ -33,13 +33,13 @@ require (
 	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/crate-crypto/go-kzg-4844 v0.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set/v2 v2.1.0 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
 	github.com/deepmap/oapi-codegen v1.8.2 // indirect
 	github.com/docker/docker v23.0.6+incompatible // indirect
-	github.com/ethereum/c-kzg-4844 v0.3.1 // indirect
+	github.com/ethereum/c-kzg-4844 v0.2.0 // indirect
 	github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
@@ -61,7 +61,6 @@ require (
 	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/huin/goupnp v1.0.3 // indirect
@@ -104,7 +103,7 @@ require (
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/status-im/keycard-go v0.2.0 // indirect
-	github.com/supranational/blst v0.3.11 // indirect
+	github.com/supranational/blst v0.3.11-0.20230406105308-e9dfc5ee724b // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
 	github.com/tklauser/go-sysconf v0.3.11 // indirect
 	github.com/tklauser/numcpus v0.6.0 // indirect
@@ -114,12 +113,12 @@ require (
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // 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/crypto v0.11.0 // indirect
+	golang.org/x/exp v0.0.0-20230206171751-46f607a40771 // indirect
 	golang.org/x/net v0.12.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/sys v0.10.0 // indirect
+	golang.org/x/text v0.11.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
--- a/bridge-history-api/go.sum
+++ b/bridge-history-api/go.sum
@@ -66,8 +66,8 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
 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/crate-crypto/go-kzg-4844 v0.2.0 h1:UVuHOE+5tIWrim4zf/Xaa43+MIsDCPyW76QhUpiMGj4=
+github.com/crate-crypto/go-kzg-4844 v0.2.0/go.mod h1:SBP7ikXEgDnUPONgm33HtuDZEDtWa3L4QtN1ocJSEQ4=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
 github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -94,10 +94,10 @@ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.m
 github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
-github.com/ethereum/c-kzg-4844 v0.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/c-kzg-4844 v0.2.0 h1:+cUvymlnoDDQgMInp25Bo3OmLajmmY8mLJ/tLjqd77Q=
+github.com/ethereum/c-kzg-4844 v0.2.0/go.mod h1:WI2Nd82DMZAAZI1wV2neKGost9EKjvbpQR9OqE5Qqa8=
+github.com/ethereum/go-ethereum v1.12.0 h1:bdnhLPtqETd4m3mS8BGMNvBTf36bO5bx/hxE2zljOa0=
+github.com/ethereum/go-ethereum v1.12.0/go.mod h1:/oo2X/dZLJjf2mJ6YT9wcWxa4nNJDBKDBU6sFIpx1Gs=
 github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8=
 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=
@@ -212,8 +212,6 @@ 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=
@@ -433,8 +431,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 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/supranational/blst v0.3.11-0.20230406105308-e9dfc5ee724b h1:u49mjRnygnB34h8OKbnNJFVUtWSKIKb1KukdV8bILUM=
+github.com/supranational/blst v0.3.11-0.20230406105308-e9dfc5ee724b/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
 github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=
@@ -493,11 +491,11 @@ golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm
 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.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
+golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
 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=
@@ -587,8 +585,8 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc
 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.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
+golang.org/x/sys v0.10.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=
@@ -600,8 +598,8 @@ 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.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
+golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 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=
--- a/bridge-history-api/internal/route/route.go
+++ b/bridge-history-api/internal/route/route.go
@@ -15,7 +15,6 @@ 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,
 	}))
--- a/bridge-history-api/orm/cross_msg.go
+++ b/bridge-history-api/orm/cross_msg.go
@@ -204,7 +204,7 @@ func (c *CrossMsg) DeleteL1CrossMsgAfterHeight(ctx context.Context, height uint6
 // 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
+	err := c.db.WithContext(ctx).Model(&CrossMsg{}).Where("layer2_hash = ? AND msg_type = ?", l2Hash.String(), Layer1Msg).First(&result).Error
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, nil
--- a/bridge-history-api/orm/l2_sent_msg.go
+++ b/bridge-history-api/orm/l2_sent_msg.go
@@ -2,7 +2,6 @@ package orm

 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"

@@ -103,9 +102,6 @@ func (l *L2SentMsg) GetLatestL2SentMsgBatchIndex(ctx context.Context) (int64, er
 		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)
 	}
--- a/bridge-history-api/utils/utils.go
+++ b/bridge-history-api/utils/utils.go
@@ -1,6 +1,7 @@
 package utils

 import (
+	"bytes"
 	"context"
 	"encoding/binary"
 	"errors"
@@ -75,14 +76,6 @@ 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{}
@@ -117,3 +110,48 @@ func GetBatchRangeFromCalldataV2(calldata []byte) (uint64, uint64, uint64, error

 	return batchIndex, startBlock, finishBlock, err
 }
+
+// GetBatchRangeFromCalldataV1 find the block range from calldata, both inclusive.
+func GetBatchRangeFromCalldataV1(calldata []byte) ([]uint64, []uint64, []uint64, error) {
+	var batchIndices []uint64
+	var startBlocks []uint64
+	var finishBlocks []uint64
+	if bytes.Equal(calldata[0:4], common.Hex2Bytes("cb905499")) {
+		// commitBatches
+		method := backendabi.ScrollChainABI.Methods["commitBatches"]
+		values, err := method.Inputs.Unpack(calldata[4:])
+		if err != nil {
+			return batchIndices, startBlocks, finishBlocks, err
+		}
+		args := make([]backendabi.IScrollChainBatch, len(values))
+		err = method.Inputs.Copy(&args, values)
+		if err != nil {
+			return batchIndices, startBlocks, finishBlocks, err
+		}
+
+		for i := 0; i < len(args); i++ {
+			batchIndices = append(batchIndices, args[i].BatchIndex)
+			startBlocks = append(startBlocks, args[i].Blocks[0].BlockNumber)
+			finishBlocks = append(finishBlocks, args[i].Blocks[len(args[i].Blocks)-1].BlockNumber)
+		}
+	} else if bytes.Equal(calldata[0:4], common.Hex2Bytes("8c73235d")) {
+		// commitBatch
+		method := backendabi.ScrollChainABI.Methods["commitBatch"]
+		values, err := method.Inputs.Unpack(calldata[4:])
+		if err != nil {
+			return batchIndices, startBlocks, finishBlocks, err
+		}
+
+		args := backendabi.IScrollChainBatch{}
+		err = method.Inputs.Copy(&args, values)
+		if err != nil {
+			return batchIndices, startBlocks, finishBlocks, err
+		}
+		batchIndices = append(batchIndices, args.BatchIndex)
+		startBlocks = append(startBlocks, args.Blocks[0].BlockNumber)
+		finishBlocks = append(finishBlocks, args.Blocks[len(args.Blocks)-1].BlockNumber)
+	} else {
+		return batchIndices, startBlocks, finishBlocks, errors.New("invalid selector")
+	}
+	return batchIndices, startBlocks, finishBlocks, nil
+}
--- a/bridge-history-api/utils/utils_test.go
+++ b/bridge-history-api/utils/utils_test.go
@@ -1,6 +1,7 @@
 package utils_test

 import (
+	"os"
 	"testing"

 	"github.com/ethereum/go-ethereum/common"
@@ -33,11 +34,31 @@ func TestGetBatchRangeFromCalldataV2(t *testing.T) {
 	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))
+}
+
+func TestGetBatchRangeFromCalldataV1(t *testing.T) {
+	calldata, err := os.ReadFile("../testdata/commit-batches-0x3095e91db7ba4a6fbf4654d607db322e58ff5579c502219c8024acaea74cf311.txt")
+	assert.NoError(t, err)
+
+	// multiple batches
+	batchIndices, startBlocks, finishBlocks, err := utils.GetBatchRangeFromCalldataV1(common.Hex2Bytes(string(calldata[:])))
+	assert.NoError(t, err)
+	assert.Equal(t, len(batchIndices), 5)
+	assert.Equal(t, len(startBlocks), 5)
+	assert.Equal(t, len(finishBlocks), 5)
+	assert.Equal(t, batchIndices[0], uint64(1))
+	assert.Equal(t, batchIndices[1], uint64(2))
+	assert.Equal(t, batchIndices[2], uint64(3))
+	assert.Equal(t, batchIndices[3], uint64(4))
+	assert.Equal(t, batchIndices[4], uint64(5))
+	assert.Equal(t, startBlocks[0], uint64(1))
+	assert.Equal(t, startBlocks[1], uint64(6))
+	assert.Equal(t, startBlocks[2], uint64(7))
+	assert.Equal(t, startBlocks[3], uint64(19))
+	assert.Equal(t, startBlocks[4], uint64(20))
+	assert.Equal(t, finishBlocks[0], uint64(5))
+	assert.Equal(t, finishBlocks[1], uint64(6))
+	assert.Equal(t, finishBlocks[2], uint64(18))
+	assert.Equal(t, finishBlocks[3], uint64(19))
+	assert.Equal(t, finishBlocks[4], uint64(20))
 }
--- a/bridge/abi/bridge_abi.go
+++ b/bridge/abi/bridge_abi.go
--- a/bridge/abi/bridge_abi_test.go
+++ b/bridge/abi/bridge_abi_test.go
@@ -15,8 +15,8 @@ func TestEventSignature(t *testing.T) {
 	assert.Equal(L1RelayedMessageEventSignature, common.HexToHash("4641df4a962071e12719d8c8c8e5ac7fc4d97b927346a3d7a335b1f7517e133c"))
 	assert.Equal(L1FailedRelayedMessageEventSignature, common.HexToHash("99d0e048484baa1b1540b1367cb128acd7ab2946d1ed91ec10e3c85e4bf51b8f"))

-	assert.Equal(L1CommitBatchEventSignature, common.HexToHash("2c32d4ae151744d0bf0b9464a3e897a1d17ed2f1af71f7c9a75f12ce0d28238f"))
-	assert.Equal(L1FinalizeBatchEventSignature, common.HexToHash("26ba82f907317eedc97d0cbef23de76a43dd6edb563bdb6e9407645b950a7a2d"))
+	assert.Equal(L1CommitBatchEventSignature, common.HexToHash("2cdc615c74452778c0fb6184735e014c13aad2b62774fe0b09bd1dcc2cc14a62"))
+	assert.Equal(L1FinalizeBatchEventSignature, common.HexToHash("9d3058a3cb9739a2527f22dd9a4138065844037d3004254952e2458d808cc364"))

 	assert.Equal(L1QueueTransactionEventSignature, common.HexToHash("69cfcb8e6d4192b8aba9902243912587f37e550d75c1fa801491fce26717f37e"))

--- a/bridge/cmd/rollup_relayer/app/app.go
+++ b/bridge/cmd/rollup_relayer/app/app.go
@@ -110,7 +110,7 @@ func action(ctx *cli.Context) error {

 	go utils.Loop(subCtx, 2*time.Second, l2relayer.ProcessPendingBatches)

-	go utils.Loop(subCtx, 10*time.Second, l2relayer.ProcessCommittedBatches)
+	go utils.Loop(subCtx, 2*time.Second, l2relayer.ProcessCommittedBatches)

 	// Finish start all rollup relayer functions.
 	log.Info("Start rollup-relayer successfully")
--- a/bridge/conf/config.json
+++ b/bridge/conf/config.json
@@ -27,8 +27,12 @@
        "gas_price_diff": 50000
      },
      "finalize_batch_interval_sec": 0,
-      "message_sender_private_key": "1212121212121212121212121212121212121212121212121212121212121212",
-      "gas_oracle_sender_private_key": "1313131313131313131313131313131313131313131313131313131313131313"
+      "message_sender_private_keys": [
+        "1212121212121212121212121212121212121212121212121212121212121212"
+      ],
+      "gas_oracle_sender_private_keys": [
+        "1313131313131313131313131313131313131313131313131313131313131313"
+      ]
    }
  },
  "l2_config": {
@@ -58,10 +62,15 @@
        "gas_price_diff": 50000
      },
      "finalize_batch_interval_sec": 0,
-      "message_sender_private_key": "1212121212121212121212121212121212121212121212121212121212121212",
-      "gas_oracle_sender_private_key": "1313131313131313131313131313131313131313131313131313131313131313",
-      "commit_sender_private_key": "1414141414141414141414141414141414141414141414141414141414141414",
-      "finalize_sender_private_key": "1515151515151515151515151515151515151515151515151515151515151515"
+      "message_sender_private_keys": [
+        "1212121212121212121212121212121212121212121212121212121212121212"
+      ],
+      "gas_oracle_sender_private_keys": [
+        "1313131313131313131313131313131313131313131313131313131313131313"
+      ],
+      "rollup_sender_private_keys": [
+        "1414141414141414141414141414141414141414141414141414141414141414"
+      ]
    },
    "chunk_proposer_config": {
      "max_tx_gas_per_chunk": 1123456,
--- a/bridge/go.mod
+++ b/bridge/go.mod
@@ -4,11 +4,13 @@ go 1.19

 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.20230812030736-25fe3ba69a28
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230804022247-26eeb40ea3ca
 	github.com/smartystreets/goconvey v1.8.0
 	github.com/stretchr/testify v1.8.3
 	github.com/urfave/cli/v2 v2.25.7
+	golang.org/x/sync v0.3.0
 	gorm.io/gorm v1.25.2
 )

@@ -50,9 +52,8 @@ require (
 	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.12.0 // indirect
-	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/crypto v0.11.0 // indirect
+	golang.org/x/sys v0.10.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
--- a/bridge/go.sum
+++ b/bridge/go.sum
@@ -84,6 +84,8 @@ github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N
 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/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
@@ -102,8 +104,8 @@ 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.20230812030736-25fe3ba69a28 h1:CECBTWhZ5NGAn8lGFB4ooRAYxZns8PXoX8kTR/14c04=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230812030736-25fe3ba69a28/go.mod h1:DiN3p2inoXOxGffxSswDKqWjQ7bU+Mp0c9v0XQXKmaA=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230804022247-26eeb40ea3ca h1:aQKsL9FiCPB6Eo3nuyxmw6aZpAhmFvJsRb7XGtXnOUc=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230804022247-26eeb40ea3ca/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/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
@@ -134,8 +136,8 @@ github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQ
 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.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
+golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
 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=
@@ -150,10 +152,10 @@ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7w
 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.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.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
+golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
+golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
 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-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
--- a/bridge/internal/config/config_test.go
+++ b/bridge/internal/config/config_test.go
@@ -15,6 +15,10 @@ func TestConfig(t *testing.T) {
 		cfg, err := NewConfig("../../conf/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)

--- a/bridge/internal/config/relayer.go
+++ b/bridge/internal/config/relayer.go
@@ -34,11 +34,12 @@ 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"`
+	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"`
@@ -55,10 +56,9 @@ type RelayerConfig struct {
 	// MessageRelayMinGasLimit to avoid OutOfGas error
 	MessageRelayMinGasLimit uint64 `json:"message_relay_min_gas_limit,omitempty"`
 	// The private key of the relayer
-	MessageSenderPrivateKey   *ecdsa.PrivateKey `json:"-"`
-	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.
@@ -72,61 +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
-		MessageSenderPrivateKey   string `json:"message_sender_private_key"`
-		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.MessageSenderPrivateKey, err = convertAndCheck(privateKeysConfig.MessageSenderPrivateKey, uniqueAddressesSet)
-	if err != nil {
-		return fmt.Errorf("error converting and checking message 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.GasOracleSenderPrivateKey, err = convertAndCheck(privateKeysConfig.GasOracleSenderPrivateKey, uniqueAddressesSet)
-	if err != nil {
-		return fmt.Errorf("error converting and checking gas oracle 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.CommitSenderPrivateKey, err = convertAndCheck(privateKeysConfig.CommitSenderPrivateKey, uniqueAddressesSet)
-	if err != nil {
-		return fmt.Errorf("error converting and checking commit sender private key: %w", err)
-	}
-
-	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 prover_private_key format, err: %v", err)
+		}
+		r.RollupSenderPrivateKeys = append(r.RollupSenderPrivateKeys, priv)
 	}

 	return nil
@@ -134,20 +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
-		MessageSenderPrivateKey   string `json:"message_sender_private_key"`
-		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.MessageSenderPrivateKey = common.Bytes2Hex(crypto.FromECDSA(r.MessageSenderPrivateKey))
-	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)
 }
--- a/bridge/internal/controller/relayer/l1_relayer.go
+++ b/bridge/internal/controller/relayer/l1_relayer.go
@@ -3,7 +3,6 @@ package relayer
 import (
 	"context"
 	"errors"
-	"fmt"
 	"math/big"

 	// not sure if this will make problems when relay with l1geth
@@ -58,16 +57,19 @@ type Layer1Relayer struct {

 // NewLayer1Relayer will return a new instance of Layer1RelayerClient
 func NewLayer1Relayer(ctx context.Context, db *gorm.DB, cfg *config.RelayerConfig) (*Layer1Relayer, error) {
-	messageSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.MessageSenderPrivateKey)
+	messageSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.MessageSenderPrivateKeys)
 	if err != nil {
-		addr := crypto.PubkeyToAddress(cfg.MessageSenderPrivateKey.PublicKey)
-		return nil, fmt.Errorf("new message sender failed for address %s, err: %v", addr.Hex(), err)
+		addr := crypto.PubkeyToAddress(cfg.MessageSenderPrivateKeys[0].PublicKey)
+		log.Error("new MessageSender failed", "main address", addr.String(), "err", err)
+		return nil, err
 	}

-	gasOracleSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.GasOracleSenderPrivateKey)
+	// @todo make sure only one sender is available
+	gasOracleSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.GasOracleSenderPrivateKeys)
 	if err != nil {
-		addr := crypto.PubkeyToAddress(cfg.GasOracleSenderPrivateKey.PublicKey)
-		return nil, fmt.Errorf("new gas oracle sender failed for address %s, err: %v", addr.Hex(), err)
+		addr := crypto.PubkeyToAddress(cfg.GasOracleSenderPrivateKeys[0].PublicKey)
+		log.Error("new GasOracleSender failed", "main address", addr.String(), "err", err)
+		return nil, err
 	}

 	var minGasPrice uint64
--- a/bridge/internal/controller/relayer/l2_relayer.go
+++ b/bridge/internal/controller/relayer/l2_relayer.go
@@ -11,7 +11,6 @@ import (
 	"github.com/scroll-tech/go-ethereum/accounts/abi"
 	"github.com/scroll-tech/go-ethereum/common"
 	gethTypes "github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/scroll-tech/go-ethereum/crypto"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
 	gethMetrics "github.com/scroll-tech/go-ethereum/metrics"
@@ -54,9 +53,8 @@ type Layer2Relayer struct {
 	messageSender  *sender.Sender
 	l1MessengerABI *abi.ABI

-	commitSender   *sender.Sender
-	finalizeSender *sender.Sender
-	l1RollupABI    *abi.ABI
+	rollupSender *sender.Sender
+	l1RollupABI  *abi.ABI

 	gasOracleSender *sender.Sender
 	l2GasOracleABI  *abi.ABI
@@ -82,28 +80,23 @@ type Layer2Relayer struct {

 // NewLayer2Relayer will return a new instance of Layer2RelayerClient
 func NewLayer2Relayer(ctx context.Context, l2Client *ethclient.Client, db *gorm.DB, cfg *config.RelayerConfig, initGenesis bool) (*Layer2Relayer, error) {
-	messageSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.MessageSenderPrivateKey)
+	// @todo use different sender for relayer, block commit and proof finalize
+	messageSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.MessageSenderPrivateKeys)
 	if err != nil {
-		addr := crypto.PubkeyToAddress(cfg.MessageSenderPrivateKey.PublicKey)
-		return nil, fmt.Errorf("new message sender failed for address %s, err: %w", addr.Hex(), err)
+		log.Error("Failed to create messenger sender", "err", err)
+		return nil, err
 	}

-	commitSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.CommitSenderPrivateKey)
+	rollupSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.RollupSenderPrivateKeys)
 	if err != nil {
-		addr := crypto.PubkeyToAddress(cfg.CommitSenderPrivateKey.PublicKey)
-		return nil, fmt.Errorf("new commit sender failed for address %s, err: %w", addr.Hex(), err)
+		log.Error("Failed to create rollup sender", "err", err)
+		return nil, err
 	}

-	finalizeSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.FinalizeSenderPrivateKey)
+	gasOracleSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.GasOracleSenderPrivateKeys)
 	if err != nil {
-		addr := crypto.PubkeyToAddress(cfg.FinalizeSenderPrivateKey.PublicKey)
-		return nil, fmt.Errorf("new finalize sender failed for address %s, err: %w", addr.Hex(), err)
-	}
-
-	gasOracleSender, err := sender.NewSender(ctx, cfg.SenderConfig, cfg.GasOracleSenderPrivateKey)
-	if err != nil {
-		addr := crypto.PubkeyToAddress(cfg.GasOracleSenderPrivateKey.PublicKey)
-		return nil, fmt.Errorf("new gas oracle sender failed for address %s, err: %w", addr.Hex(), err)
+		log.Error("Failed to create gas oracle sender", "err", err)
+		return nil, err
 	}

 	var minGasPrice uint64
@@ -134,9 +127,8 @@ func NewLayer2Relayer(ctx context.Context, l2Client *ethclient.Client, db *gorm.
 		messageSender:  messageSender,
 		l1MessengerABI: bridgeAbi.L1ScrollMessengerABI,

-		commitSender:   commitSender,
-		finalizeSender: finalizeSender,
-		l1RollupABI:    bridgeAbi.ScrollChainABI,
+		rollupSender: rollupSender,
+		l1RollupABI:  bridgeAbi.ScrollChainABI,

 		gasOracleSender: gasOracleSender,
 		l2GasOracleABI:  bridgeAbi.L2GasPriceOracleABI,
@@ -238,7 +230,7 @@ func (r *Layer2Relayer) commitGenesisBatch(batchHash string, batchHeader []byte,
 	}

 	// submit genesis batch to L1 rollup contract
-	txHash, err := r.commitSender.SendTransaction(batchHash, &r.cfg.RollupContractAddress, big.NewInt(0), calldata, 0)
+	txHash, err := r.rollupSender.SendTransaction(batchHash, &r.cfg.RollupContractAddress, big.NewInt(0), calldata, 0)
 	if err != nil {
 		return fmt.Errorf("failed to send import genesis batch tx to L1, error: %v", err)
 	}
@@ -253,14 +245,14 @@ func (r *Layer2Relayer) commitGenesisBatch(batchHash string, batchHeader []byte,
 		select {
 		// print progress
 		case <-ticker.C:
-			log.Info("Waiting for confirmation")
+			log.Info("Waiting for confirmation", "pending count", r.rollupSender.PendingCount())

 		// timeout
 		case <-time.After(5 * time.Minute):
 			return fmt.Errorf("import genesis timeout after 5 minutes, original txHash: %v", txHash.String())

 		// handle confirmation
-		case confirmation := <-r.commitSender.ConfirmChan():
+		case confirmation := <-r.rollupSender.ConfirmChan():
 			if confirmation.ID != batchHash {
 				return fmt.Errorf("unexpected import genesis confirmation id, expected: %v, got: %v", batchHash, confirmation.ID)
 			}
@@ -382,16 +374,11 @@ func (r *Layer2Relayer) ProcessPendingBatches() {

 		// send transaction
 		txID := batch.Hash + "-commit"
-		txHash, err := r.commitSender.SendTransaction(txID, &r.cfg.RollupContractAddress, big.NewInt(0), calldata, 0)
+		txHash, err := r.rollupSender.SendTransaction(txID, &r.cfg.RollupContractAddress, big.NewInt(0), calldata, 0)
 		if err != nil {
-			log.Error(
-				"Failed to send commitBatch tx to layer1",
-				"index", batch.Index,
-				"hash", batch.Hash,
-				"RollupContractAddress", r.cfg.RollupContractAddress,
-				"calldata", common.Bytes2Hex(calldata),
-				"err", err,
-			)
+			if !errors.Is(err, sender.ErrNoAvailableAccount) && !errors.Is(err, sender.ErrFullPending) {
+				log.Error("Failed to send commitBatch tx to layer1 ", "err", err)
+			}
 			return
 		}

@@ -437,6 +424,7 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 		return
 	case types.ProvingTaskVerified:
 		log.Info("Start to roll up zk proof", "hash", hash)
+		success := false

 		var parentBatchStateRoot string
 		if batch.Index > 0 {
@@ -450,14 +438,24 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 			parentBatchStateRoot = parentBatch.StateRoot
 		}

+		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 RollupFinalizeFailed", "hash", hash)
+				if err = r.batchOrm.UpdateRollupStatus(r.ctx, hash, types.RollupFinalizeFailed); err != nil {
+					log.Warn("UpdateRollupStatus failed", "hash", hash, "err", err)
+				}
+			}
+		}()
+
 		aggProof, err := r.batchOrm.GetVerifiedProofByHash(r.ctx, hash)
 		if err != nil {
-			log.Error("get verified proof by hash failed", "hash", hash, "err", err)
+			log.Warn("get verified proof by hash failed", "hash", hash, "err", err)
 			return
 		}

 		if err = aggProof.SanityCheck(); err != nil {
-			log.Error("agg_proof sanity check fails", "hash", hash, "error", err)
+			log.Warn("agg_proof sanity check fails", "hash", hash, "error", err)
 			return
 		}

@@ -476,22 +474,12 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {

 		txID := hash + "-finalize"
 		// add suffix `-finalize` to avoid duplication with commit tx in unit tests
-		txHash, err := r.finalizeSender.SendTransaction(txID, &r.cfg.RollupContractAddress, big.NewInt(0), data, 0)
+		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) {
-				// This can happen normally if we try to finalize 2 or more
-				// batches around the same time. The 2nd tx might fail since
-				// the client does not see the 1st tx's updates at this point.
-				// TODO: add more fine-grained error handling
-				log.Error(
-					"finalizeBatchWithProof in layer1 failed",
-					"index", batch.Index,
-					"hash", batch.Hash,
-					"RollupContractAddress", r.cfg.RollupContractAddress,
-					"calldata", common.Bytes2Hex(data),
-					"err", err,
-				)
+				log.Error("finalizeBatchWithProof in layer1 failed",
+					"index", batch.Index, "hash", batch.Hash, "err", err)
 			}
 			return
 		}
@@ -501,31 +489,13 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 		// record and sync with db, @todo handle db error
 		err = r.batchOrm.UpdateFinalizeTxHashAndRollupStatus(r.ctx, hash, finalizeTxHash.String(), types.RollupFinalizing)
 		if err != nil {
-			log.Error("UpdateFinalizeTxHashAndRollupStatus failed",
+			log.Warn("UpdateFinalizeTxHashAndRollupStatus failed",
 				"index", batch.Index, "batch hash", batch.Hash,
 				"tx hash", finalizeTxHash.String(), "err", err)
 		}
+		success = true
 		r.processingFinalization.Store(txID, hash)

-	case types.ProvingTaskFailed:
-		// We were unable to prove this batch. There are two possibilities:
-		// (a) Prover bug. In this case, we should fix and redeploy the prover.
-		//     In the meantime, we continue to commit batches to L1 as well as
-		//     proposing and proving chunks and batches.
-		// (b) Unprovable batch, e.g. proof overflow. In this case we need to
-		//     stop the ledger, fix the limit, revert all the violating blocks,
-		//     chunks and batches and all subsequent ones, and resume, i.e. this
-		//     case requires manual resolution.
-		log.Error(
-			"batch proving failed",
-			"Index", batch.Index,
-			"Hash", batch.Hash,
-			"ProverAssignedAt", batch.ProverAssignedAt,
-			"ProvedAt", batch.ProvedAt,
-			"ProofTimeSec", batch.ProofTimeSec,
-		)
-		return
-
 	default:
 		log.Error("encounter unreachable case in ProcessCommittedBatches", "proving status", status)
 	}
@@ -585,9 +555,7 @@ func (r *Layer2Relayer) handleConfirmLoop(ctx context.Context) {
 			return
 		case confirmation := <-r.messageSender.ConfirmChan():
 			r.handleConfirmation(confirmation)
-		case confirmation := <-r.commitSender.ConfirmChan():
-			r.handleConfirmation(confirmation)
-		case confirmation := <-r.finalizeSender.ConfirmChan():
+		case confirmation := <-r.rollupSender.ConfirmChan():
 			r.handleConfirmation(confirmation)
 		case cfm := <-r.gasOracleSender.ConfirmChan():
 			if !cfm.IsSuccessful {
--- a/bridge/internal/controller/relayer/l2_relayer_test.go
+++ b/bridge/internal/controller/relayer/l2_relayer_test.go
@@ -90,9 +90,10 @@ func testL2RelayerProcessCommittedBatches(t *testing.T) {
 	statuses, err := batchOrm.GetRollupStatusByHashList(context.Background(), []string{batch.Hash})
 	assert.NoError(t, err)
 	assert.Equal(t, 1, len(statuses))
-	// no valid proof, rollup status remains the same
-	assert.Equal(t, types.RollupCommitted, statuses[0])
+	assert.Equal(t, types.RollupFinalizeFailed, statuses[0])

+	err = batchOrm.UpdateRollupStatus(context.Background(), batch.Hash, types.RollupCommitted)
+	assert.NoError(t, err)
 	proof := &message.BatchProof{
 		Proof: []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31},
 	}
@@ -106,7 +107,7 @@ func testL2RelayerProcessCommittedBatches(t *testing.T) {
 	assert.Equal(t, types.RollupFinalizing, statuses[0])
 }

-func testL2RelayerCommitConfirm(t *testing.T) {
+func testL2RelayerRollupConfirm(t *testing.T) {
 	db := setupL2RelayerDB(t)
 	defer database.CloseDB(db)

@@ -118,8 +119,8 @@ func testL2RelayerCommitConfirm(t *testing.T) {
 	assert.NoError(t, err)

 	// Simulate message confirmations.
-	processingKeys := []string{"committed-1", "committed-2"}
-	isSuccessful := []bool{true, false}
+	processingKeys := []string{"committed-1", "committed-2", "finalized-1", "finalized-2"}
+	isSuccessful := []bool{true, false, true, false}

 	batchOrm := orm.NewBatch(db)
 	batchHashes := make([]string, len(processingKeys))
@@ -129,68 +130,29 @@ func testL2RelayerCommitConfirm(t *testing.T) {
 		batchHashes[i] = batch.Hash
 	}

-	for i, key := range processingKeys {
+	for i, key := range processingKeys[:2] {
 		l2Relayer.processingCommitment.Store(key, batchHashes[i])
-		l2Relayer.commitSender.SendConfirmation(&sender.Confirmation{
+		l2Relayer.rollupSender.SendConfirmation(&sender.Confirmation{
 			ID:           key,
 			IsSuccessful: isSuccessful[i],
 			TxHash:       common.HexToHash("0x123456789abcdef"),
 		})
 	}

+	for i, key := range processingKeys[2:] {
+		l2Relayer.processingFinalization.Store(key, batchHashes[i+2])
+		l2Relayer.rollupSender.SendConfirmation(&sender.Confirmation{
+			ID:           key,
+			IsSuccessful: isSuccessful[i+2],
+			TxHash:       common.HexToHash("0x123456789abcdef"),
+		})
+	}
+
 	// Check the database for the updated status using TryTimes.
 	ok := utils.TryTimes(5, func() bool {
 		expectedStatuses := []types.RollupStatus{
 			types.RollupCommitted,
 			types.RollupCommitFailed,
-		}
-
-		for i, batchHash := range batchHashes {
-			batchInDB, err := batchOrm.GetBatches(context.Background(), map[string]interface{}{"hash": batchHash}, nil, 0)
-			if err != nil || len(batchInDB) != 1 || types.RollupStatus(batchInDB[0].RollupStatus) != expectedStatuses[i] {
-				return false
-			}
-		}
-		return true
-	})
-	assert.True(t, ok)
-}
-
-func testL2RelayerFinalizeConfirm(t *testing.T) {
-	db := setupL2RelayerDB(t)
-	defer database.CloseDB(db)
-
-	// 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, false)
-	assert.NoError(t, err)
-
-	// Simulate message confirmations.
-	processingKeys := []string{"finalized-1", "finalized-2"}
-	isSuccessful := []bool{true, false}
-
-	batchOrm := orm.NewBatch(db)
-	batchHashes := make([]string, len(processingKeys))
-	for i := range batchHashes {
-		batch, err := batchOrm.InsertBatch(context.Background(), 0, 1, chunkHash1.Hex(), chunkHash2.Hex(), []*types.Chunk{chunk1, chunk2})
-		assert.NoError(t, err)
-		batchHashes[i] = batch.Hash
-	}
-
-	for i, key := range processingKeys {
-		l2Relayer.processingFinalization.Store(key, batchHashes[i])
-		l2Relayer.finalizeSender.SendConfirmation(&sender.Confirmation{
-			ID:           key,
-			IsSuccessful: isSuccessful[i],
-			TxHash:       common.HexToHash("0x123456789abcdef"),
-		})
-	}
-
-	// Check the database for the updated status using TryTimes.
-	ok := utils.TryTimes(5, func() bool {
-		expectedStatuses := []types.RollupStatus{
 			types.RollupFinalized,
 			types.RollupFinalizeFailed,
 		}
--- a/bridge/internal/controller/relayer/relayer_test.go
+++ b/bridge/internal/controller/relayer/relayer_test.go
@@ -97,8 +97,7 @@ func TestFunctions(t *testing.T) {
 	t.Run("TestCreateNewRelayer", testCreateNewRelayer)
 	t.Run("TestL2RelayerProcessPendingBatches", testL2RelayerProcessPendingBatches)
 	t.Run("TestL2RelayerProcessCommittedBatches", testL2RelayerProcessCommittedBatches)
-	t.Run("TestL2RelayerCommitConfirm", testL2RelayerCommitConfirm)
-	t.Run("TestL2RelayerFinalizeConfirm", testL2RelayerFinalizeConfirm)
+	t.Run("TestL2RelayerRollupConfirm", testL2RelayerRollupConfirm)
 	t.Run("TestL2RelayerGasOracleConfirm", testL2RelayerGasOracleConfirm)
 	t.Run("TestLayer2RelayerProcessGasPriceOracle", testLayer2RelayerProcessGasPriceOracle)
 }
--- a/bridge/internal/controller/sender/account_pool.go
+++ b/bridge/internal/controller/sender/account_pool.go
@@ -0,0 +1,165 @@
+package sender
+
+import (
+	"context"
+	"crypto/ecdsa"
+	"fmt"
+	"math/big"
+
+	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
+	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/log"
+)
+
+type accountPool struct {
+	client *ethclient.Client
+
+	minBalance *big.Int
+	accounts   map[common.Address]*bind.TransactOpts
+	accsCh     chan *bind.TransactOpts
+}
+
+// newAccounts creates an accountPool instance.
+func newAccountPool(ctx context.Context, minBalance *big.Int, client *ethclient.Client, privs []*ecdsa.PrivateKey) (*accountPool, error) {
+	accs := &accountPool{
+		client:     client,
+		minBalance: minBalance,
+		accounts:   make(map[common.Address]*bind.TransactOpts, len(privs)),
+		accsCh:     make(chan *bind.TransactOpts, len(privs)+2),
+	}
+
+	// get chainID from client
+	chainID, err := client.ChainID(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, privStr := range privs {
+		auth, err := bind.NewKeyedTransactorWithChainID(privStr, chainID)
+		if err != nil {
+			log.Error("failed to create account", "chainID", chainID.String(), "err", err)
+			return nil, err
+		}
+
+		// Set pending nonce
+		nonce, err := client.PendingNonceAt(ctx, auth.From)
+		if err != nil {
+			return nil, err
+		}
+		auth.Nonce = big.NewInt(int64(nonce))
+		accs.accounts[auth.From] = auth
+		accs.accsCh <- auth
+	}
+
+	return accs, accs.checkAndSetBalances(ctx)
+}
+
+// getAccount get auth from channel.
+func (a *accountPool) getAccount() *bind.TransactOpts {
+	select {
+	case auth := <-a.accsCh:
+		return auth
+	default:
+		return nil
+	}
+}
+
+// releaseAccount set used auth into channel.
+func (a *accountPool) releaseAccount(auth *bind.TransactOpts) {
+	a.accsCh <- auth
+}
+
+// reSetNonce reset nonce if send signed tx failed.
+func (a *accountPool) resetNonce(ctx context.Context, auth *bind.TransactOpts) {
+	nonce, err := a.client.PendingNonceAt(ctx, auth.From)
+	if err != nil {
+		log.Warn("failed to reset nonce", "address", auth.From.String(), "err", err)
+		return
+	}
+	auth.Nonce = big.NewInt(int64(nonce))
+}
+
+// checkAndSetBalance check balance and set min balance.
+func (a *accountPool) checkAndSetBalances(ctx context.Context) error {
+	var (
+		root      *bind.TransactOpts
+		maxBls    = big.NewInt(0)
+		lostAuths []*bind.TransactOpts
+	)
+
+	for addr, auth := range a.accounts {
+		bls, err := a.client.BalanceAt(ctx, addr, nil)
+		if err != nil || bls.Cmp(a.minBalance) < 0 {
+			if err != nil {
+				log.Warn("failed to get balance", "address", addr.String(), "err", err)
+				return err
+			}
+			lostAuths = append(lostAuths, auth)
+			continue
+		} else if bls.Cmp(maxBls) > 0 { // Find the biggest balance account.
+			root, maxBls = auth, bls
+		}
+	}
+	if root == nil {
+		return fmt.Errorf("no account has enough balance")
+	}
+	if len(lostAuths) == 0 {
+		return nil
+	}
+
+	var (
+		tx  *types.Transaction
+		err error
+	)
+	for _, auth := range lostAuths {
+		tx, err = a.createSignedTx(root, &auth.From, a.minBalance)
+		if err != nil {
+			return err
+		}
+		err = a.client.SendTransaction(ctx, tx)
+		if err != nil {
+			log.Error("Failed to send balance to account", "err", err)
+			return err
+		}
+		log.Debug("send balance to account", "account", auth.From.String(), "balance", a.minBalance.String())
+	}
+	// wait util mined
+	if _, err = bind.WaitMined(ctx, a.client, tx); err != nil {
+		return err
+	}
+
+	// Reset root's nonce.
+	a.resetNonce(ctx, root)
+
+	return nil
+}
+
+func (a *accountPool) createSignedTx(from *bind.TransactOpts, to *common.Address, value *big.Int) (*types.Transaction, error) {
+	gasPrice, err := a.client.SuggestGasPrice(context.Background())
+	if err != nil {
+		return nil, err
+	}
+	gasPrice.Mul(gasPrice, big.NewInt(2))
+
+	// Get pending nonce
+	nonce, err := a.client.PendingNonceAt(context.Background(), from.From)
+	if err != nil {
+		return nil, err
+	}
+
+	tx := types.NewTx(&types.LegacyTx{
+		Nonce:    nonce,
+		To:       to,
+		Value:    value,
+		Gas:      500000,
+		GasPrice: gasPrice,
+	})
+	signedTx, err := from.Signer(from.From, tx)
+	if err != nil {
+		return nil, err
+	}
+
+	return signedTx, nil
+}
--- a/bridge/internal/controller/sender/sender.go
+++ b/bridge/internal/controller/sender/sender.go
@@ -39,6 +39,10 @@ var (
 	ErrFullPending = errors.New("sender's pending pool is full")
 )

+var (
+	defaultPendingLimit = 10
+)
+
 // Confirmation struct used to indicate transaction confirmation details
 type Confirmation struct {
 	ID           string
@@ -71,8 +75,8 @@ type Sender struct {
 	chainID *big.Int          // The chain id of the endpoint
 	ctx     context.Context

-	auth       *bind.TransactOpts
-	minBalance *big.Int
+	// account fields.
+	auths *accountPool

 	blockNumber   uint64                                            // Current block number on chain.
 	baseFeePerGas uint64                                            // Current base fee per gas on chain
@@ -84,34 +88,27 @@ type Sender struct {

 // NewSender returns a new instance of transaction sender
 // txConfirmationCh is used to notify confirmed transaction
-func NewSender(ctx context.Context, config *config.SenderConfig, priv *ecdsa.PrivateKey) (*Sender, error) {
+func NewSender(ctx context.Context, config *config.SenderConfig, privs []*ecdsa.PrivateKey) (*Sender, error) {
 	client, err := ethclient.Dial(config.Endpoint)
 	if err != nil {
-		return nil, fmt.Errorf("failed to dial eth client, err: %w", err)
+		return nil, err
 	}

 	// get chainID from client
 	chainID, err := client.ChainID(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("failed to get chain ID, err: %w", err)
+		return nil, err
 	}

-	auth, err := bind.NewKeyedTransactorWithChainID(priv, chainID)
+	auths, err := newAccountPool(ctx, config.MinBalance, client, privs)
 	if err != nil {
-		return nil, fmt.Errorf("failed to create transactor with chain ID %v, err: %w", chainID, err)
+		return nil, fmt.Errorf("failed to create account pool, err: %v", err)
 	}

-	// Set pending nonce
-	nonce, err := client.PendingNonceAt(ctx, auth.From)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get pending nonce for address %s, err: %w", auth.From.Hex(), err)
-	}
-	auth.Nonce = big.NewInt(int64(nonce))
-
 	// get header by number
 	header, err := client.HeaderByNumber(ctx, nil)
 	if err != nil {
-		return nil, fmt.Errorf("failed to get header by number, err: %w", err)
+		return nil, err
 	}

 	var baseFeePerGas uint64
@@ -119,17 +116,21 @@ func NewSender(ctx context.Context, config *config.SenderConfig, priv *ecdsa.Pri
 		if header.BaseFee != nil {
 			baseFeePerGas = header.BaseFee.Uint64()
 		} else {
-			return nil, errors.New("dynamic fee tx type not supported: header.BaseFee is nil")
+			return nil, errors.New("DynamicFeeTxType not supported, header.BaseFee nil")
 		}
 	}

+	// initialize pending limit with a default value
+	if config.PendingLimit == 0 {
+		config.PendingLimit = defaultPendingLimit
+	}
+
 	sender := &Sender{
 		ctx:           ctx,
 		config:        config,
 		client:        client,
 		chainID:       chainID,
-		auth:          auth,
-		minBalance:    config.MinBalance,
+		auths:         auths,
 		confirmCh:     make(chan *Confirmation, 128),
 		blockNumber:   header.Number.Uint64(),
 		baseFeePerGas: baseFeePerGas,
@@ -174,6 +175,11 @@ func (s *Sender) SendConfirmation(cfm *Confirmation) {
 	s.confirmCh <- cfm
 }

+// NumberOfAccounts return the count of accounts.
+func (s *Sender) NumberOfAccounts() int {
+	return len(s.auths.accounts)
+}
+
 func (s *Sender) getFeeData(auth *bind.TransactOpts, target *common.Address, value *big.Int, data []byte, minGasLimit uint64) (*FeeData, error) {
 	if s.config.TxType == DynamicFeeTxType {
 		return s.estimateDynamicGas(auth, target, value, data, minGasLimit)
@@ -182,46 +188,53 @@ func (s *Sender) getFeeData(auth *bind.TransactOpts, target *common.Address, val
 }

 // SendTransaction send a signed L2tL1 transaction.
-func (s *Sender) SendTransaction(ID string, target *common.Address, value *big.Int, data []byte, minGasLimit uint64) (common.Hash, error) {
+func (s *Sender) SendTransaction(ID string, target *common.Address, value *big.Int, data []byte, minGasLimit uint64) (hash common.Hash, err error) {
 	if s.IsFull() {
 		return common.Hash{}, ErrFullPending
 	}
+	// We occupy the ID, in case some other threads call with the same ID in the same time
 	if ok := s.pendingTxs.SetIfAbsent(ID, nil); !ok {
-		return common.Hash{}, fmt.Errorf("repeat transaction ID: %s", ID)
+		return common.Hash{}, fmt.Errorf("has the repeat tx ID, ID: %s", ID)
+	}
+	// get
+	auth := s.auths.getAccount()
+	if auth == nil {
+		s.pendingTxs.Remove(ID) // release the ID on failure
+		return common.Hash{}, ErrNoAvailableAccount
 	}

-	var (
-		feeData *FeeData
-		tx      *types.Transaction
-		err     error
-	)
-
+	defer s.auths.releaseAccount(auth)
 	defer func() {
 		if err != nil {
 			s.pendingTxs.Remove(ID) // release the ID on failure
 		}
 	}()

-	if feeData, err = s.getFeeData(s.auth, target, value, data, minGasLimit); err != nil {
-		return common.Hash{}, fmt.Errorf("failed to get fee data, err: %w", err)
+	var (
+		feeData *FeeData
+		tx      *types.Transaction
+	)
+	// estimate gas fee
+	if feeData, err = s.getFeeData(auth, target, value, data, minGasLimit); err != nil {
+		return
 	}
-	if tx, err = s.createAndSendTx(s.auth, feeData, target, value, data, nil); err != nil {
-		return common.Hash{}, fmt.Errorf("failed to create and send transaction, err: %w", err)
+	if tx, err = s.createAndSendTx(auth, feeData, target, value, data, nil); err == nil {
+		// add pending transaction to queue
+		pending := &PendingTransaction{
+			tx:       tx,
+			id:       ID,
+			signer:   auth,
+			submitAt: atomic.LoadUint64(&s.blockNumber),
+			feeData:  feeData,
+		}
+		s.pendingTxs.Set(ID, pending)
+		return tx.Hash(), nil
 	}

-	// add pending transaction
-	pending := &PendingTransaction{
-		tx:       tx,
-		id:       ID,
-		signer:   s.auth,
-		submitAt: atomic.LoadUint64(&s.blockNumber),
-		feeData:  feeData,
-	}
-	s.pendingTxs.Set(ID, pending)
-	return tx.Hash(), nil
+	return
 }

-func (s *Sender) createAndSendTx(auth *bind.TransactOpts, feeData *FeeData, target *common.Address, value *big.Int, data []byte, overrideNonce *uint64) (*types.Transaction, error) {
+func (s *Sender) createAndSendTx(auth *bind.TransactOpts, feeData *FeeData, target *common.Address, value *big.Int, data []byte, overrideNonce *uint64) (tx *types.Transaction, err error) {
 	var (
 		nonce  = auth.Nonce.Uint64()
 		txData types.TxData
@@ -279,36 +292,26 @@ func (s *Sender) createAndSendTx(auth *bind.TransactOpts, feeData *FeeData, targ
 	}

 	// sign and send
-	tx, err := auth.Signer(auth.From, types.NewTx(txData))
+	tx, err = auth.Signer(auth.From, types.NewTx(txData))
 	if err != nil {
 		log.Error("failed to sign tx", "err", err)
-		return nil, err
+		return
 	}
 	if err = s.client.SendTransaction(s.ctx, tx); err != nil {
 		log.Error("failed to send tx", "tx hash", tx.Hash().String(), "err", err)
 		// Check if contain nonce, and reset nonce
 		// only reset nonce when it is not from resubmit
 		if strings.Contains(err.Error(), "nonce") && overrideNonce == nil {
-			s.resetNonce(context.Background())
+			s.auths.resetNonce(context.Background(), auth)
 		}
-		return nil, err
+		return
 	}

 	// update nonce when it is not from resubmit
 	if overrideNonce == nil {
 		auth.Nonce = big.NewInt(int64(nonce + 1))
 	}
-	return tx, nil
-}
-
-// reSetNonce reset nonce if send signed tx failed.
-func (s *Sender) resetNonce(ctx context.Context) {
-	nonce, err := s.client.PendingNonceAt(ctx, s.auth.From)
-	if err != nil {
-		log.Warn("failed to reset nonce", "address", s.auth.From.String(), "err", err)
-		return
-	}
-	s.auth.Nonce = big.NewInt(int64(nonce))
+	return
 }

 func (s *Sender) resubmitTransaction(feeData *FeeData, auth *bind.TransactOpts, tx *types.Transaction) (*types.Transaction, error) {
@@ -445,22 +448,6 @@ func (s *Sender) checkPendingTransaction(header *types.Header, confirmed uint64)
 	}
 }

-// checkBalance checks balance and print error log if balance is under a threshold.
-func (s *Sender) checkBalance(ctx context.Context) error {
-	bls, err := s.client.BalanceAt(ctx, s.auth.From, nil)
-	if err != nil {
-		log.Warn("failed to get balance", "address", s.auth.From.String(), "err", err)
-		return err
-	}
-
-	if bls.Cmp(s.minBalance) < 0 {
-		return fmt.Errorf("insufficient account balance - actual balance: %s, minimum required balance: %s",
-			bls.String(), s.minBalance.String())
-	}
-
-	return nil
-}
-
 // Loop is the main event loop
 func (s *Sender) loop(ctx context.Context) {
 	checkTick := time.NewTicker(time.Duration(s.config.CheckPendingTime) * time.Second)
@@ -487,9 +474,7 @@ func (s *Sender) loop(ctx context.Context) {
 			s.checkPendingTransaction(header, confirmed)
 		case <-checkBalanceTicker.C:
 			// Check and set balance.
-			if err := s.checkBalance(ctx); err != nil {
-				log.Error("check balance, err: %w", err)
-			}
+			_ = s.auths.checkAndSetBalances(ctx)
 		case <-ctx.Done():
 			return
 		case <-s.stopCh:
--- a/bridge/internal/controller/sender/sender_test.go
+++ b/bridge/internal/controller/sender/sender_test.go
@@ -7,8 +7,10 @@ import (
 	"math/big"
 	"strconv"
 	"testing"
+	"time"

 	"github.com/agiledragon/gomonkey/v2"
+	cmap "github.com/orcaman/concurrent-map"
 	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/core/types"
@@ -16,6 +18,7 @@ import (
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/rpc"
 	"github.com/stretchr/testify/assert"
+	"golang.org/x/sync/errgroup"

 	"scroll-tech/common/docker"

@@ -25,10 +28,10 @@ import (
 const TXBatch = 50

 var (
-	privateKey *ecdsa.PrivateKey
-	cfg        *config.Config
-	base       *docker.App
-	txTypes    = []string{"LegacyTx", "AccessListTx", "DynamicFeeTx"}
+	privateKeys []*ecdsa.PrivateKey
+	cfg         *config.Config
+	base        *docker.App
+	txTypes     = []string{"LegacyTx", "AccessListTx", "DynamicFeeTx"}
 )

 func TestMain(m *testing.M) {
@@ -47,7 +50,7 @@ func setupEnv(t *testing.T) {
 	priv, err := crypto.HexToECDSA("1212121212121212121212121212121212121212121212121212121212121212")
 	assert.NoError(t, err)
 	// Load default private key.
-	privateKey = priv
+	privateKeys = []*ecdsa.PrivateKey{priv}

 	cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = base.L1gethImg.Endpoint()
 	cfg.L1Config.RelayerConfig.SenderConfig.CheckBalanceTime = 1
@@ -59,10 +62,15 @@ func TestSender(t *testing.T) {

 	t.Run("test new sender", testNewSender)
 	t.Run("test pending limit", testPendLimit)
+
 	t.Run("test min gas limit", testMinGasLimit)
 	t.Run("test resubmit transaction", testResubmitTransaction)
 	t.Run("test resubmit transaction with rising base fee", testResubmitTransactionWithRisingBaseFee)
 	t.Run("test check pending transaction", testCheckPendingTransaction)
+
+	t.Run("test 1 account sender", func(t *testing.T) { testBatchSender(t, 1) })
+	t.Run("test 3 account sender", func(t *testing.T) { testBatchSender(t, 3) })
+	t.Run("test 8 account sender", func(t *testing.T) { testBatchSender(t, 8) })
 }

 func testNewSender(t *testing.T) {
@@ -70,7 +78,7 @@ func testNewSender(t *testing.T) {
 		// exit by Stop()
 		cfgCopy1 := *cfg.L1Config.RelayerConfig.SenderConfig
 		cfgCopy1.TxType = txType
-		newSender1, err := NewSender(context.Background(), &cfgCopy1, privateKey)
+		newSender1, err := NewSender(context.Background(), &cfgCopy1, privateKeys)
 		assert.NoError(t, err)
 		newSender1.Stop()

@@ -78,7 +86,7 @@ func testNewSender(t *testing.T) {
 		cfgCopy2 := *cfg.L1Config.RelayerConfig.SenderConfig
 		cfgCopy2.TxType = txType
 		subCtx, cancel := context.WithCancel(context.Background())
-		_, err = NewSender(subCtx, &cfgCopy2, privateKey)
+		_, err = NewSender(subCtx, &cfgCopy2, privateKeys)
 		assert.NoError(t, err)
 		cancel()
 	}
@@ -90,7 +98,7 @@ func testPendLimit(t *testing.T) {
 		cfgCopy.TxType = txType
 		cfgCopy.Confirmations = rpc.LatestBlockNumber
 		cfgCopy.PendingLimit = 2
-		newSender, err := NewSender(context.Background(), &cfgCopy, privateKey)
+		newSender, err := NewSender(context.Background(), &cfgCopy, privateKeys)
 		assert.NoError(t, err)

 		for i := 0; i < 2*newSender.PendingLimit(); i++ {
@@ -107,7 +115,7 @@ func testMinGasLimit(t *testing.T) {
 		cfgCopy := *cfg.L1Config.RelayerConfig.SenderConfig
 		cfgCopy.TxType = txType
 		cfgCopy.Confirmations = rpc.LatestBlockNumber
-		newSender, err := NewSender(context.Background(), &cfgCopy, privateKey)
+		newSender, err := NewSender(context.Background(), &cfgCopy, privateKeys)
 		assert.NoError(t, err)

 		client, err := ethclient.Dial(cfgCopy.Endpoint)
@@ -135,12 +143,13 @@ func testResubmitTransaction(t *testing.T) {
 	for _, txType := range txTypes {
 		cfgCopy := *cfg.L1Config.RelayerConfig.SenderConfig
 		cfgCopy.TxType = txType
-		s, err := NewSender(context.Background(), &cfgCopy, privateKey)
+		s, err := NewSender(context.Background(), &cfgCopy, privateKeys)
 		assert.NoError(t, err)
-		tx := types.NewTransaction(s.auth.Nonce.Uint64(), common.Address{}, big.NewInt(0), 0, big.NewInt(0), nil)
-		feeData, err := s.getFeeData(s.auth, &common.Address{}, big.NewInt(0), nil, 0)
+		auth := s.auths.getAccount()
+		tx := types.NewTransaction(auth.Nonce.Uint64(), common.Address{}, big.NewInt(0), 0, big.NewInt(0), nil)
+		feeData, err := s.getFeeData(auth, &common.Address{}, big.NewInt(0), nil, 0)
 		assert.NoError(t, err)
-		_, err = s.resubmitTransaction(feeData, s.auth, tx)
+		_, err = s.resubmitTransaction(feeData, auth, tx)
 		assert.NoError(t, err)
 		s.Stop()
 	}
@@ -151,16 +160,17 @@ func testResubmitTransactionWithRisingBaseFee(t *testing.T) {

 	cfgCopy := *cfg.L1Config.RelayerConfig.SenderConfig
 	cfgCopy.TxType = txType
-	s, err := NewSender(context.Background(), &cfgCopy, privateKey)
+	s, err := NewSender(context.Background(), &cfgCopy, privateKeys)
 	assert.NoError(t, err)
-	tx := types.NewTransaction(s.auth.Nonce.Uint64(), common.Address{}, big.NewInt(0), 0, big.NewInt(0), nil)
+	auth := s.auths.getAccount()
+	tx := types.NewTransaction(auth.Nonce.Uint64(), common.Address{}, big.NewInt(0), 0, big.NewInt(0), nil)
 	s.baseFeePerGas = 1000
-	feeData, err := s.getFeeData(s.auth, &common.Address{}, big.NewInt(0), nil, 0)
+	feeData, err := s.getFeeData(auth, &common.Address{}, big.NewInt(0), nil, 0)
 	assert.NoError(t, err)
 	// bump the basefee by 10x
 	s.baseFeePerGas *= 10
 	// resubmit and check that the gas fee has been adjusted accordingly
-	newTx, err := s.resubmitTransaction(feeData, s.auth, tx)
+	newTx, err := s.resubmitTransaction(feeData, auth, tx)
 	assert.NoError(t, err)

 	escalateMultipleNum := new(big.Int).SetUint64(s.config.EscalateMultipleNum)
@@ -186,13 +196,14 @@ func testCheckPendingTransaction(t *testing.T) {
 	for _, txType := range txTypes {
 		cfgCopy := *cfg.L1Config.RelayerConfig.SenderConfig
 		cfgCopy.TxType = txType
-		s, err := NewSender(context.Background(), &cfgCopy, privateKey)
+		s, err := NewSender(context.Background(), &cfgCopy, privateKeys)
 		assert.NoError(t, err)

 		header := &types.Header{Number: big.NewInt(100), BaseFee: big.NewInt(100)}
 		confirmed := uint64(100)
 		receipt := &types.Receipt{Status: types.ReceiptStatusSuccessful, BlockNumber: big.NewInt(90)}
-		tx := types.NewTransaction(s.auth.Nonce.Uint64(), common.Address{}, big.NewInt(0), 0, big.NewInt(0), nil)
+		auth := s.auths.getAccount()
+		tx := types.NewTransaction(auth.Nonce.Uint64(), common.Address{}, big.NewInt(0), 0, big.NewInt(0), nil)

 		testCases := []struct {
 			name          string
@@ -269,3 +280,66 @@ func testCheckPendingTransaction(t *testing.T) {
 		s.Stop()
 	}
 }
+
+func testBatchSender(t *testing.T, batchSize int) {
+	for _, txType := range txTypes {
+		for len(privateKeys) < batchSize {
+			priv, err := crypto.GenerateKey()
+			assert.NoError(t, err)
+			privateKeys = append(privateKeys, priv)
+		}
+
+		cfgCopy := *cfg.L1Config.RelayerConfig.SenderConfig
+		cfgCopy.Confirmations = rpc.LatestBlockNumber
+		cfgCopy.PendingLimit = batchSize * TXBatch
+		cfgCopy.TxType = txType
+		newSender, err := NewSender(context.Background(), &cfgCopy, privateKeys)
+		assert.NoError(t, err)
+
+		// send transactions
+		var (
+			eg        errgroup.Group
+			idCache   = cmap.New()
+			confirmCh = newSender.ConfirmChan()
+		)
+		for idx := 0; idx < newSender.NumberOfAccounts(); idx++ {
+			index := idx
+			eg.Go(func() error {
+				for i := 0; i < TXBatch; i++ {
+					toAddr := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
+					id := strconv.Itoa(i + index*1000)
+					_, err := newSender.SendTransaction(id, &toAddr, big.NewInt(1), nil, 0)
+					if errors.Is(err, ErrNoAvailableAccount) || errors.Is(err, ErrFullPending) {
+						<-time.After(time.Second)
+						continue
+					}
+					assert.NoError(t, err)
+					idCache.Set(id, struct{}{})
+				}
+				return nil
+			})
+		}
+		assert.NoError(t, eg.Wait())
+		t.Logf("successful send batch txs, batch size: %d, total count: %d", newSender.NumberOfAccounts(), TXBatch*newSender.NumberOfAccounts())
+
+		// avoid 10 mins cause testcase panic
+		after := time.After(80 * time.Second)
+		isDone := false
+		for !isDone {
+			select {
+			case cmsg := <-confirmCh:
+				assert.Equal(t, true, cmsg.IsSuccessful)
+				_, exist := idCache.Pop(cmsg.ID)
+				assert.Equal(t, true, exist)
+				// Receive all confirmed txs.
+				if idCache.Count() == 0 {
+					isDone = true
+				}
+			case <-after:
+				t.Error("newSender test failed because of timeout")
+				isDone = true
+			}
+		}
+		newSender.Stop()
+	}
+}
--- a/bridge/internal/controller/watcher/l2_watcher_test.go
+++ b/bridge/internal/controller/watcher/l2_watcher_test.go
@@ -50,7 +50,7 @@ func testCreateNewWatcherAndStop(t *testing.T) {

 	l1cfg := cfg.L1Config
 	l1cfg.RelayerConfig.SenderConfig.Confirmations = rpc.LatestBlockNumber
-	newSender, err := sender.NewSender(context.Background(), l1cfg.RelayerConfig.SenderConfig, l1cfg.RelayerConfig.MessageSenderPrivateKey)
+	newSender, err := sender.NewSender(context.Background(), l1cfg.RelayerConfig.SenderConfig, l1cfg.RelayerConfig.MessageSenderPrivateKeys)
 	assert.NoError(t, err)

 	// Create several transactions and commit to block
@@ -71,7 +71,7 @@ func testFetchRunningMissingBlocks(t *testing.T) {
 	_, db := setupL2Watcher(t)
 	defer database.CloseDB(db)

-	auth := prepareAuth(t, l2Cli, cfg.L2Config.RelayerConfig.MessageSenderPrivateKey)
+	auth := prepareAuth(t, l2Cli, cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys[0])

 	// deploy mock bridge
 	_, tx, _, err := mock_bridge.DeployMockBridgeL2(auth, l2Cli)
--- a/bridge/mock_bridge/MockBridgeL1.sol
+++ b/bridge/mock_bridge/MockBridgeL1.sol
@@ -56,13 +56,13 @@ contract MockBridgeL1 {

  /// @notice Emitted when a new batch is committed.
  /// @param batchHash The hash of the batch.
-  event CommitBatch(uint256 indexed batchIndex, bytes32 indexed batchHash);
+  event CommitBatch(bytes32 indexed batchHash);

  /// @notice Emitted when a batch is finalized.
  /// @param batchHash The hash of the batch
  /// @param stateRoot The state root on layer 2 after this batch.
  /// @param withdrawRoot The merkle root on layer2 after this batch.
-  event FinalizeBatch(uint256 indexed batchIndex, bytes32 indexed batchHash, bytes32 stateRoot, bytes32 withdrawRoot);
+  event FinalizeBatch(bytes32 indexed batchHash, bytes32 stateRoot, bytes32 withdrawRoot);

  /***********
   * Structs *
@@ -130,7 +130,7 @@ contract MockBridgeL1 {

  function commitBatch(
    uint8 /*version*/,
-    bytes calldata _parentBatchHeader,
+    bytes calldata /*parentBatchHeader*/,
    bytes[] memory chunks,
    bytes calldata /*skippedL1MessageBitmap*/
  ) external {
@@ -138,17 +138,6 @@ contract MockBridgeL1 {
    uint256 _chunksLength = chunks.length;
    require(_chunksLength > 0, "batch is empty");

-    // decode batch index
-    uint256 headerLength = _parentBatchHeader.length;
-    uint256 parentBatchPtr;
-    uint256 parentBatchIndex;
-    assembly {
-      parentBatchPtr := mload(0x40)
-      calldatacopy(parentBatchPtr, _parentBatchHeader.offset, headerLength)
-      mstore(0x40, add(parentBatchPtr, headerLength))
-      parentBatchIndex := shr(192, mload(add(parentBatchPtr, 1)))
-    }
-
    uint256 dataPtr;
    assembly {
      dataPtr := mload(0x40)
@@ -180,29 +169,18 @@ contract MockBridgeL1 {
    }
    bytes32 _batchHash = BatchHeaderV0Codec.computeBatchHash(batchPtr, 89);
    committedBatches[0] = _batchHash;
-    emit CommitBatch(parentBatchIndex + 1, _batchHash);
+    emit CommitBatch(_batchHash);
  }

  function finalizeBatchWithProof(
-    bytes calldata batchHeader,
+    bytes calldata /*batchHeader*/,
    bytes32 /*prevStateRoot*/,
    bytes32 postStateRoot,
    bytes32 withdrawRoot,
    bytes calldata /*aggrProof*/
  ) external {
-    // decode batch index
-    uint256 headerLength = batchHeader.length;
-    uint256 batchPtr;
-    uint256 batchIndex;
-    assembly {
-      batchPtr := mload(0x40)
-      calldatacopy(batchPtr, batchHeader.offset, headerLength)
-      mstore(0x40, add(batchPtr, headerLength))
-      batchIndex := shr(192, mload(add(batchPtr, 1)))
-    }
-
    bytes32 _batchHash = committedBatches[0];
-    emit FinalizeBatch(batchIndex, _batchHash, postStateRoot, withdrawRoot);
+    emit FinalizeBatch(_batchHash, postStateRoot, withdrawRoot);
  }

  /**********************
--- a/bridge/tests/bridge_test.go
+++ b/bridge/tests/bridge_test.go
@@ -83,10 +83,10 @@ func setupEnv(t *testing.T) {
 	l2Cfg.Confirmations = 0
 	l2Cfg.RelayerConfig.SenderConfig.Confirmations = 0

-	l1Auth, err = bind.NewKeyedTransactorWithChainID(bridgeApp.Config.L2Config.RelayerConfig.MessageSenderPrivateKey, base.L1gethImg.ChainID())
+	l1Auth, err = bind.NewKeyedTransactorWithChainID(bridgeApp.Config.L2Config.RelayerConfig.MessageSenderPrivateKeys[0], base.L1gethImg.ChainID())
 	assert.NoError(t, err)

-	l2Auth, err = bind.NewKeyedTransactorWithChainID(bridgeApp.Config.L1Config.RelayerConfig.MessageSenderPrivateKey, base.L2gethImg.ChainID())
+	l2Auth, err = bind.NewKeyedTransactorWithChainID(bridgeApp.Config.L1Config.RelayerConfig.MessageSenderPrivateKeys[0], base.L2gethImg.ChainID())
 	assert.NoError(t, err)
 }

--- a/build/dockerfiles/coordinator.Dockerfile
+++ b/build/dockerfiles/coordinator.Dockerfile
@@ -37,7 +37,7 @@ COPY . .
 RUN cp -r ./common/libzkp/interface ./coordinator/internal/logic/verifier/lib
 COPY --from=zkp-builder /app/target/release/libzkp.so ./coordinator/internal/logic/verifier/lib/
 COPY --from=zkp-builder /app/target/release/libzktrie.so ./coordinator/internal/logic/verifier/lib/
-RUN cd ./coordinator && make coordinator_skip_libzkp && mv ./build/bin/coordinator /bin/coordinator && mv internal/logic/verifier/lib /bin/
+RUN cd ./coordinator && go build -v -p 4 -o /bin/coordinator ./cmd && mv internal/logic/verifier/lib /bin/

 # Pull coordinator into a second stage deploy alpine container
 FROM ubuntu:20.04
@@ -46,6 +46,6 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/src/coordinator/internal/logic/verifier/li
 RUN mkdir -p /src/coordinator/internal/logic/verifier/lib
 COPY --from=builder /bin/lib /src/coordinator/internal/logic/verifier/lib
 COPY --from=builder /bin/coordinator /bin/
-RUN /bin/coordinator --version
+

 ENTRYPOINT ["/bin/coordinator"]
--- a/build/dockerfiles/prover-stats-api.Dockerfile
+++ b/build/dockerfiles/prover-stats-api.Dockerfile
@@ -1,31 +0,0 @@
-# Download Go dependencies
-FROM scrolltech/go-alpine-builder:1.19 as base
-
-WORKDIR /src
-COPY go.work* ./
-COPY ./bridge/go.* ./bridge/
-COPY ./common/go.* ./common/
-COPY ./coordinator/go.* ./coordinator/
-COPY ./database/go.* ./database/
-COPY ./prover-stats-api/go.* ./prover-stats-api/
-COPY ./prover/go.* ./prover/
-COPY ./tests/integration-test/go.* ./tests/integration-test/
-COPY ./bridge-history-api/go.* ./bridge-history-api/
-# Support mainland environment.
-#ENV GOPROXY="https://goproxy.cn,direct"
-RUN go mod download -x
-
-
-# Build prover-stats-api
-FROM base as builder
-
-RUN --mount=target=. \
-    --mount=type=cache,target=/root/.cache/go-build \
-    cd /src/prover-stats-api/cmd/ && go build -v -p 4 -o /bin/prover-stats-api
-
-# Pull prover-stats-api into a second stage deploy alpine container \
-FROM alpine:latest
-
-COPY --from=builder /bin/prover-stats-api /bin/
-
-ENTRYPOINT ["prover-stats-api"]
--- a/common/cmd/cmd.go
+++ b/common/cmd/cmd.go
@@ -83,9 +83,7 @@ func (c *Cmd) Write(data []byte) (int, error) {
 	out := string(data)
 	if verbose || c.openLog {
 		fmt.Printf("%s:\n\t%v", c.name, out)
-	} else if strings.Contains(strings.ToLower(out), "error") ||
-		strings.Contains(strings.ToLower(out), "warning") ||
-		strings.Contains(strings.ToLower(out), "info") {
+	} else if strings.Contains(strings.ToLower(out), "error") || strings.Contains(strings.ToLower(out), "warning") || strings.Contains(strings.ToLower(out), "info") {
 		fmt.Printf("%s:\n\t%v", c.name, out)
 	}
 	go c.checkFuncs.IterCb(func(_ string, value interface{}) {
--- a/common/docker/l1geth/genesis.json
+++ b/common/docker/l1geth/genesis.json
--- a/common/docker/l2geth/Dockerfile
+++ b/common/docker/l2geth/Dockerfile
@@ -1,4 +1,4 @@
-FROM scrolltech/l2geth:scroll-v4.3.34
+FROM scrolltech/l2geth:scroll-v4.3.18

 RUN mkdir -p /l2geth/keystore

--- a/common/go.mod
+++ b/common/go.mod
@@ -3,18 +3,14 @@ module scroll-tech/common
 go 1.19

 require (
-	github.com/bits-and-blooms/bitset v1.7.0
 	github.com/docker/docker v23.0.6+incompatible
-	github.com/gin-contrib/pprof v1.4.0
-	github.com/gin-gonic/gin v1.9.1
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/lib/pq v1.10.9
 	github.com/mattn/go-colorable v0.1.13
 	github.com/mattn/go-isatty v0.0.19
 	github.com/modern-go/reflect2 v1.0.2
 	github.com/orcaman/concurrent-map v1.0.0
-	github.com/prometheus/client_golang v1.14.0
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20230812030736-25fe3ba69a28
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230804022247-26eeb40ea3ca
 	github.com/stretchr/testify v1.8.3
 	github.com/urfave/cli/v2 v2.25.7
 	gorm.io/driver/postgres v1.5.0
@@ -25,11 +21,8 @@ require (
 	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
-	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/btcsuite/btcd v0.20.1-beta // 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/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
@@ -40,20 +33,15 @@ require (
 	github.com/edsrzf/mmap-go v1.0.0 // indirect
 	github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 // 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/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-kit/kit v0.9.0 // indirect
+	github.com/go-logfmt/logfmt v0.5.1 // 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.1 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
-	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/graph-gophers/graphql-go v1.3.0 // indirect
@@ -72,17 +60,13 @@ require (
 	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/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/julienschmidt/httprouter v1.3.0 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
-	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
 	github.com/mattn/go-sqlite3 v1.14.16 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/pointerstructure v1.2.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/onsi/ginkgo v1.16.5 // indirect
@@ -90,13 +74,9 @@ require (
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0-rc3 // 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
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.39.0 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
 	github.com/prometheus/tsdb v0.7.1 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/rjeczalik/notify v0.9.1 // indirect
@@ -109,21 +89,17 @@ require (
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // 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/xrash/smetrics v0.0.0-20201216005158-039620a65673 // 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/crypto v0.11.0 // indirect
 	golang.org/x/mod v0.12.0 // indirect
 	golang.org/x/net v0.12.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/sys v0.10.0 // indirect
+	golang.org/x/text v0.11.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
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/urfave/cli.v1 v1.20.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
--- a/common/go.sum
+++ b/common/go.sum
@@ -38,10 +38,6 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo
 github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/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/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/btcsuite/btcd v0.20.1-beta h1:Ik4hyJqN8Jfyv3S4AGBOmyouMsYE3EdYODkMbQjwPGw=
@@ -53,9 +49,6 @@ 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/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
@@ -63,9 +56,6 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf
 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/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -107,20 +97,11 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY=
 github.com/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/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI=
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
 github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
 github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gin-contrib/pprof v1.4.0 h1:XxiBSf5jWZ5i16lNOPbMTVdgHBdhfGRD5PZ1LWazzvg=
-github.com/gin-contrib/pprof v1.4.0/go.mod h1:RrehPJasUVBPK6yTUwOl8/NP6i0vbUgmxtis+Z5KE90=
-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.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/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE=
 github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24=
 github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs=
@@ -132,21 +113,11 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
+github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/go-ole/go-ole v1.2.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.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
@@ -155,9 +126,6 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
 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/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/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
@@ -174,16 +142,12 @@ github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFU
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.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.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@@ -199,7 +163,7 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
 github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -266,14 +230,13 @@ github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
 github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jsternberg/zap-logfmt v1.0.0/go.mod h1:uvPs/4X51zdkcm5jXl5SYoN+4RK21K8mysFmDaM/h+o=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
 github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
@@ -282,9 +245,6 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
 github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
 github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/klauspost/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/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg=
 github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -301,9 +261,6 @@ github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
 github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
 github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
-github.com/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.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
@@ -321,7 +278,6 @@ github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/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=
@@ -335,8 +291,6 @@ github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwp
 github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/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.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=
@@ -344,8 +298,6 @@ github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjU
 github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4=
 github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
 github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
-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.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
@@ -382,9 +334,6 @@ github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFSt
 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/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE=
-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.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc=
 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=
@@ -400,22 +349,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_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.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/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.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
-github.com/prometheus/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.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-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/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc=
@@ -426,7 +367,6 @@ github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeC
 github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.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.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
@@ -434,8 +374,8 @@ github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
 github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/russross/blackfriday/v2 v2.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.20230812030736-25fe3ba69a28 h1:CECBTWhZ5NGAn8lGFB4ooRAYxZns8PXoX8kTR/14c04=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230812030736-25fe3ba69a28/go.mod h1:DiN3p2inoXOxGffxSswDKqWjQ7bU+Mp0c9v0XQXKmaA=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230804022247-26eeb40ea3ca h1:aQKsL9FiCPB6Eo3nuyxmw6aZpAhmFvJsRb7XGtXnOUc=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230804022247-26eeb40ea3ca/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/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=
@@ -461,12 +401,10 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 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/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=
@@ -476,14 +414,8 @@ github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+Kd
 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.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
-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/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
@@ -504,9 +436,6 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-golang.org/x/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-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -516,11 +445,10 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 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-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.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
+golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -632,8 +560,6 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -641,8 +567,8 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc
 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.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
+golang.org/x/sys v0.10.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=
@@ -652,11 +578,10 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3
 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.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
+golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -743,11 +668,6 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-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=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -768,7 +688,6 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.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=
--- a/common/libzkp/impl/Cargo.lock
+++ b/common/libzkp/impl/Cargo.lock
@@ -32,14 +32,13 @@ dependencies = [
 [[package]]
 name = "aggregator"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 dependencies = [
 "ark-std",
 "env_logger 0.10.0",
 "eth-types",
 "ethers-core",
 "halo2_proofs",
- "hex",
 "itertools",
 "log",
 "rand",
@@ -380,7 +379,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b"
 dependencies = [
 "borsh-derive",
- "hashbrown 0.13.2",
+ "hashbrown 0.12.3",
 ]

 [[package]]
@@ -433,7 +432,7 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 [[package]]
 name = "bus-mapping"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 dependencies = [
 "eth-types",
 "ethers-core",
@@ -631,12 +630,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"

 [[package]]
 name = "convert_case"
-version = "0.6.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
-dependencies = [
- "unicode-segmentation",
-]
+checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8"

 [[package]]
 name = "core-foundation-sys"
@@ -1049,7 +1045,7 @@ dependencies = [
 [[package]]
 name = "eth-types"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 dependencies = [
 "ethers-core",
 "ethers-signers",
@@ -1142,12 +1138,13 @@ dependencies = [
 [[package]]
 name = "ethers-core"
 version = "0.17.0"
-source = "git+https://github.com/scroll-tech/ethers-rs.git?branch=v0.17.0#739ec9a0df8daf536937739c87e85612bd73212f"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ebdd63c828f58aa067f40f9adcbea5e114fb1f90144b3a1e2858e0c9b1ff4e8"
 dependencies = [
 "arrayvec",
 "bytes",
 "chrono",
- "convert_case 0.6.0",
+ "convert_case 0.5.0",
 "elliptic-curve",
 "ethabi",
 "fastrlp",
@@ -1226,7 +1223,7 @@ dependencies = [
 [[package]]
 name = "external-tracer"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 dependencies = [
 "eth-types",
 "geth-utils",
@@ -1439,7 +1436,7 @@ dependencies = [
 [[package]]
 name = "gadgets"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 dependencies = [
 "digest 0.7.6",
 "eth-types",
@@ -1479,7 +1476,7 @@ dependencies = [
 [[package]]
 name = "geth-utils"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 dependencies = [
 "env_logger 0.9.3",
 "gobuild 0.1.0-alpha.2 (git+https://github.com/scroll-tech/gobuild.git)",
@@ -1633,7 +1630,7 @@ dependencies = [
 [[package]]
 name = "halo2-mpt-circuits"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/mpt-circuit.git?branch=v0.5#2163a9c436ed85363c954ecf7e6e1044a1b991dc"
+source = "git+https://github.com/scroll-tech/mpt-circuit.git?branch=v0.5#1c11b6c9b1245073a76c3ce7100b6798060f7cb8"
 dependencies = [
 "ethers-core",
 "halo2_proofs",
@@ -1655,7 +1652,7 @@ dependencies = [
 [[package]]
 name = "halo2_proofs"
 version = "0.2.0"
-source = "git+https://github.com/scroll-tech/halo2.git?branch=develop#01f0b5260445a9190299af7b06b766c1e925fdaf"
+source = "git+https://github.com/scroll-tech/halo2.git?branch=develop#4d8a405a97ce445c88fc8ec40f9a2dd0a661c697"
 dependencies = [
 "ark-std",
 "blake2b_simd",
@@ -2077,7 +2074,7 @@ dependencies = [
 [[package]]
 name = "keccak256"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 dependencies = [
 "env_logger 0.9.3",
 "eth-types",
@@ -2264,7 +2261,7 @@ dependencies = [
 [[package]]
 name = "mock"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 dependencies = [
 "eth-types",
 "ethers-core",
@@ -2279,7 +2276,7 @@ dependencies = [
 [[package]]
 name = "mpt-zktrie"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 dependencies = [
 "bus-mapping",
 "eth-types",
@@ -2755,7 +2752,7 @@ dependencies = [
 [[package]]
 name = "prover"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.16#bd901762c4744936586f4a30e27a4b65cea3bb71"
+source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.1#15aac6e1484a42f723098fbc9d8783f374e7e90a"
 dependencies = [
 "aggregator",
 "anyhow",
@@ -3624,7 +3621,7 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 [[package]]
 name = "snark-verifier"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#100127726ac210226ac1096767e0efc5230775e3"
+source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#f8bdcbee60348e5c996c04f19ff30522e6b276b0"
 dependencies = [
 "bytes",
 "ethereum-types 0.14.1",
@@ -3648,7 +3645,7 @@ dependencies = [
 [[package]]
 name = "snark-verifier-sdk"
 version = "0.0.1"
-source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#100127726ac210226ac1096767e0efc5230775e3"
+source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#f8bdcbee60348e5c996c04f19ff30522e6b276b0"
 dependencies = [
 "bincode",
 "env_logger 0.10.0",
@@ -4040,7 +4037,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 [[package]]
 name = "types"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.16#bd901762c4744936586f4a30e27a4b65cea3bb71"
+source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.1#15aac6e1484a42f723098fbc9d8783f374e7e90a"
 dependencies = [
 "base64 0.13.1",
 "blake2",
@@ -4085,12 +4082,6 @@ dependencies = [
 "tinyvec",
 ]

-[[package]]
-name = "unicode-segmentation"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.4"
@@ -4491,7 +4482,7 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 [[package]]
 name = "zkevm-circuits"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.16#f1341e5bf2dc59ea10c19012257c7e386cfc195f"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#2855c13b5d3e6ec4056f823f56a33bf25d0080bb"
 dependencies = [
 "array-init",
 "bus-mapping",
--- a/common/libzkp/impl/Cargo.lock.new
+++ b/common/libzkp/impl/Cargo.lock.new
--- a/common/libzkp/impl/Cargo.lock.old
+++ b/common/libzkp/impl/Cargo.lock.old
--- a/common/libzkp/impl/Cargo.toml
+++ b/common/libzkp/impl/Cargo.toml
@@ -7,8 +7,6 @@ edition = "2021"
 [lib]
 crate-type = ["cdylib"]

-[patch.crates-io]
-ethers-core = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v0.17.0" }
 [patch."https://github.com/privacy-scaling-explorations/halo2.git"]
 halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "develop" }
 [patch."https://github.com/privacy-scaling-explorations/poseidon.git"]
@@ -20,8 +18,8 @@ maingate = { git = "https://github.com/scroll-tech/halo2wrong", branch = "halo2-
 halo2curves = { git = "https://github.com/scroll-tech/halo2curves.git", branch = "0.3.1-derive-serde" }

 [dependencies]
-prover = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.16" }
-types = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.16" }
+prover = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.1" }
+types = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.1" }
 halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "develop" }

 log = "0.4"
@@ -35,6 +33,8 @@ once_cell = "1.8.0"

 [profile.test]
 opt-level = 3
+# debug-assertions = true

 [profile.release]
 opt-level = 3
+# debug-assertions = true
--- a/common/metrics/ginmetrics/bloom.go
+++ b/common/metrics/ginmetrics/bloom.go
@@ -1,57 +0,0 @@
-package ginmetrics
-
-import (
-	"github.com/bits-and-blooms/bitset"
-)
-
-const defaultSize = 2 << 24
-
-var seeds = []uint{7, 11, 13, 31, 37, 61}
-
-// BloomFilter a simple bloom filter
-type BloomFilter struct {
-	Set   *bitset.BitSet
-	Funcs [6]simpleHash
-}
-
-// NewBloomFilter new a BloomFilter
-func NewBloomFilter() *BloomFilter {
-	bf := new(BloomFilter)
-	for i := 0; i < len(bf.Funcs); i++ {
-		bf.Funcs[i] = simpleHash{defaultSize, seeds[i]}
-	}
-	bf.Set = bitset.New(defaultSize)
-	return bf
-}
-
-// Add a value to BloomFilter
-func (bf *BloomFilter) Add(value string) {
-	for _, f := range bf.Funcs {
-		bf.Set.Set(f.hash(value))
-	}
-}
-
-// Contains check the value is in bloom filter
-func (bf *BloomFilter) Contains(value string) bool {
-	if value == "" {
-		return false
-	}
-	ret := true
-	for _, f := range bf.Funcs {
-		ret = ret && bf.Set.Test(f.hash(value))
-	}
-	return ret
-}
-
-type simpleHash struct {
-	Cap  uint
-	Seed uint
-}
-
-func (s *simpleHash) hash(value string) uint {
-	var result uint = 0
-	for i := 0; i < len(value); i++ {
-		result = result*s.Seed + uint(value[i])
-	}
-	return (s.Cap - 1) & result
-}
--- a/common/metrics/ginmetrics/metric.go
+++ b/common/metrics/ginmetrics/metric.go
@@ -1,89 +0,0 @@
-package ginmetrics
-
-import (
-	"fmt"
-
-	"github.com/prometheus/client_golang/prometheus"
-)
-
-// Metric defines a metric object. Users can use it to save
-// metric data. Every metric should be globally unique by name.
-type Metric struct {
-	Type        MetricType
-	Name        string
-	Description string
-	Labels      []string
-	Buckets     []float64
-	Objectives  map[float64]float64
-
-	vec prometheus.Collector
-}
-
-// SetGaugeValue set data for Gauge type Metric.
-func (m *Metric) SetGaugeValue(labelValues []string, value float64) error {
-	if m.Type == None {
-		return fmt.Errorf("metric %s not existed", m.Name)
-	}
-
-	if m.Type != Gauge {
-		return fmt.Errorf("metric %s not Gauge type", m.Name)
-	}
-	m.vec.(*prometheus.GaugeVec).WithLabelValues(labelValues...).Set(value)
-	return nil
-}
-
-// Inc increases value for Counter/Gauge type metric, increments
-// the counter by 1
-func (m *Metric) Inc(labelValues []string) error {
-	if m.Type == None {
-		return fmt.Errorf("metric %s not existed", m.Name)
-	}
-
-	if m.Type != Gauge && m.Type != Counter {
-		return fmt.Errorf("metric %s not Gauge or Counter type", m.Name)
-	}
-	switch m.Type {
-	case Counter:
-		m.vec.(*prometheus.CounterVec).WithLabelValues(labelValues...).Inc()
-	case Gauge:
-		m.vec.(*prometheus.GaugeVec).WithLabelValues(labelValues...).Inc()
-	}
-	return nil
-}
-
-// Add adds the given value to the Metric object. Only
-// for Counter/Gauge type metric.
-func (m *Metric) Add(labelValues []string, value float64) error {
-	if m.Type == None {
-		return fmt.Errorf("metric %s not existed", m.Name)
-	}
-
-	if m.Type != Gauge && m.Type != Counter {
-		return fmt.Errorf("metric %s not Gauge or Counter type", m.Name)
-	}
-	switch m.Type {
-	case Counter:
-		m.vec.(*prometheus.CounterVec).WithLabelValues(labelValues...).Add(value)
-	case Gauge:
-		m.vec.(*prometheus.GaugeVec).WithLabelValues(labelValues...).Add(value)
-	}
-	return nil
-}
-
-// Observe is used by Histogram and Summary type metric to
-// add observations.
-func (m *Metric) Observe(labelValues []string, value float64) error {
-	if m.Type == 0 {
-		return fmt.Errorf("metric %s not existed", m.Name)
-	}
-	if m.Type != Histogram && m.Type != Summary {
-		return fmt.Errorf("metric %s not Histogram or Summary type", m.Name)
-	}
-	switch m.Type {
-	case Histogram:
-		m.vec.(*prometheus.HistogramVec).WithLabelValues(labelValues...).Observe(value)
-	case Summary:
-		m.vec.(*prometheus.SummaryVec).WithLabelValues(labelValues...).Observe(value)
-	}
-	return nil
-}
--- a/common/metrics/ginmetrics/middleware.go
+++ b/common/metrics/ginmetrics/middleware.go
@@ -1,155 +0,0 @@
-package ginmetrics
-
-import (
-	"fmt"
-	"strconv"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-)
-
-var (
-	metricRequestTotal    = "request_total"
-	metricRequestUVTotal  = "request_uv_total"
-	metricURIRequestTotal = "uri_request_total"
-	metricRequestBody     = "request_body_total"
-	metricResponseBody    = "response_body_total"
-	metricRequestDuration = "request_duration"
-	metricSlowRequest     = "slow_request_total"
-
-	bloomFilter *BloomFilter
-)
-
-// Use set gin metrics middleware
-func (m *Monitor) Use(r gin.IRoutes) {
-	m.initGinMetrics()
-
-	r.Use(m.monitorInterceptor)
-	r.GET(m.metricPath, func(ctx *gin.Context) {
-		promhttp.Handler().ServeHTTP(ctx.Writer, ctx.Request)
-	})
-}
-
-// UseWithoutExposingEndpoint is used to add monitor interceptor to gin router
-// It can be called multiple times to intercept from multiple gin.IRoutes
-// http path is not set, to do that use Expose function
-func (m *Monitor) UseWithoutExposingEndpoint(r gin.IRoutes) {
-	m.initGinMetrics()
-	r.Use(m.monitorInterceptor)
-}
-
-// Expose adds metric path to a given router.
-// The router can be different with the one passed to UseWithoutExposingEndpoint.
-// This allows to expose metrics on different port.
-func (m *Monitor) Expose(r gin.IRoutes) {
-	r.GET(m.metricPath, func(ctx *gin.Context) {
-		promhttp.Handler().ServeHTTP(ctx.Writer, ctx.Request)
-	})
-}
-
-// initGinMetrics used to init gin metrics
-func (m *Monitor) initGinMetrics() {
-	bloomFilter = NewBloomFilter()
-
-	_ = monitor.AddMetric(&Metric{
-		Type:        Counter,
-		Name:        metricRequestTotal,
-		Description: "all the server received request num.",
-		Labels:      nil,
-	})
-	_ = monitor.AddMetric(&Metric{
-		Type:        Counter,
-		Name:        metricRequestUVTotal,
-		Description: "all the server received ip num.",
-		Labels:      nil,
-	})
-	_ = monitor.AddMetric(&Metric{
-		Type:        Counter,
-		Name:        metricURIRequestTotal,
-		Description: "all the server received request num with every uri.",
-		Labels:      []string{"uri", "method", "code"},
-	})
-	_ = monitor.AddMetric(&Metric{
-		Type:        Counter,
-		Name:        metricRequestBody,
-		Description: "the server received request body size, unit byte",
-		Labels:      nil,
-	})
-	_ = monitor.AddMetric(&Metric{
-		Type:        Counter,
-		Name:        metricResponseBody,
-		Description: "the server send response body size, unit byte",
-		Labels:      nil,
-	})
-	_ = monitor.AddMetric(&Metric{
-		Type:        Histogram,
-		Name:        metricRequestDuration,
-		Description: "the time server took to handle the request.",
-		Labels:      []string{"uri"},
-		Buckets:     m.reqDuration,
-	})
-	_ = monitor.AddMetric(&Metric{
-		Type:        Counter,
-		Name:        metricSlowRequest,
-		Description: fmt.Sprintf("the server handled slow requests counter, t=%d.", m.slowTime),
-		Labels:      []string{"uri", "method", "code"},
-	})
-}
-
-// monitorInterceptor as gin monitor middleware.
-func (m *Monitor) monitorInterceptor(ctx *gin.Context) {
-	if ctx.Request.URL.Path == m.metricPath {
-		ctx.Next()
-		return
-	}
-	startTime := time.Now()
-
-	// execute normal process.
-	ctx.Next()
-
-	// after request
-	m.ginMetricHandle(ctx, startTime)
-}
-
-func (m *Monitor) ginMetricHandle(ctx *gin.Context, start time.Time) {
-	r := ctx.Request
-	w := ctx.Writer
-
-	//set request total
-	_ = m.GetMetric(metricRequestTotal).Inc(nil)
-
-	// set uv
-	if clientIP := ctx.ClientIP(); !bloomFilter.Contains(clientIP) {
-		bloomFilter.Add(clientIP)
-		_ = m.GetMetric(metricRequestUVTotal).Inc(nil)
-	}
-
-	errCode := strconv.Itoa(ctx.GetInt("errcode"))
-	if len(errCode) == 0 {
-		errCode = strconv.Itoa(w.Status())
-	}
-
-	// set uri request total
-	_ = m.GetMetric(metricURIRequestTotal).Inc([]string{ctx.FullPath(), r.Method, errCode})
-
-	// set request body size
-	// since r.ContentLength can be negative (in some occasions) guard the operation
-	if r.ContentLength >= 0 {
-		_ = m.GetMetric(metricRequestBody).Add(nil, float64(r.ContentLength))
-	}
-
-	// set slow request
-	latency := time.Since(start)
-	if int32(latency.Seconds()) > m.slowTime {
-		_ = m.GetMetric(metricSlowRequest).Inc([]string{ctx.FullPath(), r.Method, strconv.Itoa(w.Status())})
-	}
-
-	// set request duration
-	_ = m.GetMetric(metricRequestDuration).Observe([]string{ctx.FullPath()}, latency.Seconds())
-
-	// set response size
-	if w.Size() > 0 {
-		_ = m.GetMetric(metricResponseBody).Add(nil, float64(w.Size()))
-	}
-}
--- a/common/metrics/ginmetrics/types.go
+++ b/common/metrics/ginmetrics/types.go
@@ -1,158 +0,0 @@
-package ginmetrics
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promauto"
-)
-
-// MetricType define metric type
-type MetricType int
-
-const (
-	// None unknown metric type
-	None MetricType = iota
-	// Counter MetricType
-	Counter
-	// Gauge MetricType
-	Gauge
-	// Histogram MetricType
-	Histogram
-	// Summary MetricType
-	Summary
-
-	defaultMetricPath = "/debug/metrics"
-	defaultSlowTime   = int32(5)
-)
-
-var (
-	defaultDuration = []float64{0.1, 0.3, 1.2, 5, 10}
-	monitor         *Monitor
-
-	promTypeHandler = map[MetricType]func(metric *Metric, reg prometheus.Registerer){
-		Counter:   counterHandler,
-		Gauge:     gaugeHandler,
-		Histogram: histogramHandler,
-		Summary:   summaryHandler,
-	}
-)
-
-// Monitor is an object that uses to set gin server monitor.
-type Monitor struct {
-	slowTime    int32
-	metricPath  string
-	reqDuration []float64
-	metrics     map[string]*Metric
-	register    prometheus.Registerer
-}
-
-// GetMonitor used to get global Monitor object,
-// this function returns a singleton object.
-func GetMonitor(reg prometheus.Registerer) *Monitor {
-	if monitor == nil {
-		monitor = &Monitor{
-			metricPath:  defaultMetricPath,
-			slowTime:    defaultSlowTime,
-			reqDuration: defaultDuration,
-			metrics:     make(map[string]*Metric),
-			register:    reg,
-		}
-	}
-	return monitor
-}
-
-// GetMetric used to get metric object by metric_name.
-func (m *Monitor) GetMetric(name string) *Metric {
-	if metric, ok := m.metrics[name]; ok {
-		return metric
-	}
-	return &Metric{}
-}
-
-// SetMetricPath set metricPath property. metricPath is used for Prometheus
-// to get gin server monitoring data.
-func (m *Monitor) SetMetricPath(path string) {
-	m.metricPath = path
-}
-
-// SetSlowTime set slowTime property. slowTime is used to determine whether
-// the request is slow. For "gin_slow_request_total" metric.
-func (m *Monitor) SetSlowTime(slowTime int32) {
-	m.slowTime = slowTime
-}
-
-// SetDuration set reqDuration property. reqDuration is used to ginRequestDuration
-// metric buckets.
-func (m *Monitor) SetDuration(duration []float64) {
-	m.reqDuration = duration
-}
-
-// SetMetricPrefix set the metric prefix
-func (m *Monitor) SetMetricPrefix(prefix string) {
-	metricRequestTotal = prefix + metricRequestTotal
-	metricRequestUVTotal = prefix + metricRequestUVTotal
-	metricURIRequestTotal = prefix + metricURIRequestTotal
-	metricRequestBody = prefix + metricRequestBody
-	metricResponseBody = prefix + metricResponseBody
-	metricRequestDuration = prefix + metricRequestDuration
-	metricSlowRequest = prefix + metricSlowRequest
-}
-
-// SetMetricSuffix set the metric suffix
-func (m *Monitor) SetMetricSuffix(suffix string) {
-	metricRequestTotal += suffix
-	metricRequestUVTotal += suffix
-	metricURIRequestTotal += suffix
-	metricRequestBody += suffix
-	metricResponseBody += suffix
-	metricRequestDuration += suffix
-	metricSlowRequest += suffix
-}
-
-// AddMetric add custom monitor metric.
-func (m *Monitor) AddMetric(metric *Metric) error {
-	if _, ok := m.metrics[metric.Name]; ok {
-		return fmt.Errorf("metric %s is existed", metric.Name)
-	}
-
-	if metric.Name == "" {
-		return errors.New("metric name cannot be empty")
-	}
-
-	if f, ok := promTypeHandler[metric.Type]; ok {
-		f(metric, m.register)
-		m.metrics[metric.Name] = metric
-	}
-
-	return nil
-}
-
-func counterHandler(metric *Metric, register prometheus.Registerer) {
-	metric.vec = promauto.With(register).NewCounterVec(
-		prometheus.CounterOpts{Name: metric.Name, Help: metric.Description},
-		metric.Labels,
-	)
-}
-
-func gaugeHandler(metric *Metric, register prometheus.Registerer) {
-	metric.vec = promauto.With(register).NewGaugeVec(
-		prometheus.GaugeOpts{Name: metric.Name, Help: metric.Description},
-		metric.Labels,
-	)
-}
-
-func histogramHandler(metric *Metric, register prometheus.Registerer) {
-	metric.vec = promauto.With(register).NewHistogramVec(
-		prometheus.HistogramOpts{Name: metric.Name, Help: metric.Description, Buckets: metric.Buckets},
-		metric.Labels,
-	)
-}
-
-func summaryHandler(metric *Metric, register prometheus.Registerer) {
-	promauto.With(register).NewSummaryVec(
-		prometheus.SummaryOpts{Name: metric.Name, Help: metric.Description, Objectives: metric.Objectives},
-		metric.Labels,
-	)
-}
--- a/common/metrics/middleware.go
+++ b/common/metrics/middleware.go
@@ -1,18 +0,0 @@
-package metrics
-
-import (
-	"github.com/gin-gonic/gin"
-	"github.com/prometheus/client_golang/prometheus"
-
-	"scroll-tech/common/metrics/ginmetrics"
-)
-
-// Use register the gin metric
-func Use(router *gin.Engine, metricsPrefix string, reg prometheus.Registerer) {
-	m := ginmetrics.GetMonitor(reg)
-	m.SetMetricPath("/metrics")
-	m.SetMetricPrefix(metricsPrefix + "_")
-	m.SetSlowTime(1)
-	m.SetDuration([]float64{0.025, .05, .1, .5, 1, 5, 10})
-	m.UseWithoutExposingEndpoint(router)
-}
--- a/common/metrics/server.go
+++ b/common/metrics/server.go
@@ -1,49 +0,0 @@
-package metrics
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-	"time"
-
-	// enable the pprof
-	_ "net/http/pprof"
-
-	"github.com/gin-contrib/pprof"
-	"github.com/gin-gonic/gin"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"github.com/scroll-tech/go-ethereum/log"
-	"github.com/urfave/cli/v2"
-
-	"scroll-tech/common/utils"
-)
-
-// Server starts the metrics server on the given address, will be closed when the given
-// context is canceled.
-func Server(c *cli.Context, reg *prometheus.Registry) {
-	if !c.Bool(utils.MetricsEnabled.Name) {
-		return
-	}
-
-	r := gin.New()
-	r.Use(gin.Recovery())
-	pprof.Register(r)
-	r.GET("/metrics", func(context *gin.Context) {
-		promhttp.Handler().ServeHTTP(context.Writer, context.Request)
-	})
-
-	address := fmt.Sprintf(":%s", c.String(utils.MetricsPort.Name))
-	server := &http.Server{
-		Addr:              address,
-		Handler:           r,
-		ReadHeaderTimeout: time.Minute,
-	}
-	log.Info("Starting metrics server", "address", address)
-
-	go func() {
-		if runServerErr := server.ListenAndServe(); runServerErr != nil && !errors.Is(runServerErr, http.ErrServerClosed) {
-			log.Crit("run metrics http server failure", "error", runServerErr)
-		}
-	}()
-}
--- a/common/types/batch_header_test.go
+++ b/common/types/batch_header_test.go
@@ -169,7 +169,7 @@ func TestBatchHeaderEncode(t *testing.T) {
 	assert.NotNil(t, batchHeader)
 	bytes = batchHeader.Encode()
 	assert.Equal(t, 121, len(bytes))
-	assert.Equal(t, "010000000000000001000000000000000b000000000000000b34f419ce7e882295bdb5aec6cce56ffa788a5fed4744d7fbd77e4acbf409f1ca4136709aabc8a23aa17fbcc833da2f7857d3c2884feec9aae73429c135f9498500000000000000000000000000000000000000000000000000000000000003ff", common.Bytes2Hex(bytes))
+	assert.Equal(t, "010000000000000001000000000000000b000000000000000b457a9e90e8e51ba2de2f66c6b589540b88cf594dac7fa7d04b99cdcfecf24e384136709aabc8a23aa17fbcc833da2f7857d3c2884feec9aae73429c135f9498500000000000000000000000000000000000000000000000000000000000003ff", common.Bytes2Hex(bytes))
 }

 func TestBatchHeaderHash(t *testing.T) {
@@ -230,7 +230,7 @@ func TestBatchHeaderHash(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NotNil(t, batchHeader)
 	hash = batchHeader.Hash()
-	assert.Equal(t, "1c3007880f0eafe74572ede7d164ff1ee5376e9ac9bff6f7fb837b2630cddc9a", common.Bytes2Hex(hash.Bytes()))
+	assert.Equal(t, "0ec9547c6645d5f0c1254e121f49e93f54525cfda5bfb2236440fb3470f48902", common.Bytes2Hex(hash.Bytes()))
 }

 func TestBatchHeaderDecode(t *testing.T) {
--- a/common/types/block.go
+++ b/common/types/block.go
@@ -36,17 +36,6 @@ func (w *WrappedBlock) NumL1Messages(totalL1MessagePoppedBefore uint64) uint64 {
 	return *lastQueueIndex - totalL1MessagePoppedBefore + 1
 }

-// NumL2Transactions returns the number of L2 transactions in this block.
-func (w *WrappedBlock) NumL2Transactions() uint64 {
-	var count uint64
-	for _, txData := range w.Transactions {
-		if txData.Type != types.L1MessageTxType {
-			count++
-		}
-	}
-	return count
-}
-
 // Encode encodes the WrappedBlock into RollupV2 BlockContext Encoding.
 func (w *WrappedBlock) Encode(totalL1MessagePoppedBefore uint64) ([]byte, error) {
 	bytes := make([]byte, 60)
@@ -54,25 +43,20 @@ func (w *WrappedBlock) Encode(totalL1MessagePoppedBefore uint64) ([]byte, error)
 	if !w.Header.Number.IsUint64() {
 		return nil, errors.New("block number is not uint64")
 	}
+	if len(w.Transactions) > math.MaxUint16 {
+		return nil, errors.New("number of transactions exceeds max uint16")
+	}

-	// note: numL1Messages includes skipped messages
 	numL1Messages := w.NumL1Messages(totalL1MessagePoppedBefore)
 	if numL1Messages > math.MaxUint16 {
 		return nil, errors.New("number of L1 messages exceeds max uint16")
 	}

-	// note: numTransactions includes skipped messages
-	numL2Transactions := w.NumL2Transactions()
-	numTransactions := numL1Messages + numL2Transactions
-	if numTransactions > math.MaxUint16 {
-		return nil, errors.New("number of transactions exceeds max uint16")
-	}
-
 	binary.BigEndian.PutUint64(bytes[0:], w.Header.Number.Uint64())
 	binary.BigEndian.PutUint64(bytes[8:], w.Header.Time)
 	// TODO: [16:47] Currently, baseFee is 0, because we disable EIP-1559.
 	binary.BigEndian.PutUint64(bytes[48:], w.Header.GasLimit)
-	binary.BigEndian.PutUint16(bytes[56:], uint16(numTransactions))
+	binary.BigEndian.PutUint16(bytes[56:], uint16(len(w.Transactions)))
 	binary.BigEndian.PutUint16(bytes[58:], uint16(numL1Messages))

 	return bytes, nil
--- a/common/types/chunk_test.go
+++ b/common/types/chunk_test.go
@@ -65,10 +65,9 @@ func TestChunkEncode(t *testing.T) {
 	hexString = hex.EncodeToString(bytes)
 	assert.NoError(t, err)
 	assert.Equal(t, 97, len(bytes))
-	assert.Equal(t, "01000000000000000d00000000646b6e13000000000000000000000000000000000000000000000000000000000000000000000000007a1200000c000b00000020df0b80825dc0941a258d17bf244c4df02d40343a7626a9d321e1058080808080", hexString)
+	assert.Equal(t, "01000000000000000d00000000646b6e13000000000000000000000000000000000000000000000000000000000000000000000000007a12000002000b00000020df0b80825dc0941a258d17bf244c4df02d40343a7626a9d321e1058080808080", hexString)

 	// Test case 5: when the chunk contains two blocks each with 1 L1MsgTx
-	// TODO: revise this test, we cannot reuse the same L1MsgTx twice
 	chunk = &Chunk{
 		Blocks: []*WrappedBlock{
 			wrappedBlock2,
@@ -79,7 +78,7 @@ func TestChunkEncode(t *testing.T) {
 	hexString = hex.EncodeToString(bytes)
 	assert.NoError(t, err)
 	assert.Equal(t, 193, len(bytes))
-	assert.Equal(t, "02000000000000000d00000000646b6e13000000000000000000000000000000000000000000000000000000000000000000000000007a1200000c000b000000000000000d00000000646b6e13000000000000000000000000000000000000000000000000000000000000000000000000007a12000001000000000020df0b80825dc0941a258d17bf244c4df02d40343a7626a9d321e105808080808000000020df0b80825dc0941a258d17bf244c4df02d40343a7626a9d321e1058080808080", hexString)
+	assert.Equal(t, "02000000000000000d00000000646b6e13000000000000000000000000000000000000000000000000000000000000000000000000007a12000002000b000000000000000d00000000646b6e13000000000000000000000000000000000000000000000000000000000000000000000000007a12000002000000000020df0b80825dc0941a258d17bf244c4df02d40343a7626a9d321e105808080808000000020df0b80825dc0941a258d17bf244c4df02d40343a7626a9d321e1058080808080", hexString)
 }

 func TestChunkHash(t *testing.T) {
@@ -134,5 +133,5 @@ func TestChunkHash(t *testing.T) {
 	}
 	hash, err = chunk.Hash(0)
 	assert.NoError(t, err)
-	assert.Equal(t, "0x2eb7dd63bf8fc29a0f8c10d16c2ae6f9da446907c79d50f5c164d30dc8526b60", hash.Hex())
+	assert.Equal(t, "0x42967825696a129e7a83f082097aca982747480956dcaa448c9296e795c9a91a", hash.Hex())
 }
--- a/common/types/db.go
+++ b/common/types/db.go
@@ -126,7 +126,7 @@ const (
 	ProvingTaskUnassigned
 	// ProvingTaskAssigned : proving_task is assigned to be proved
 	ProvingTaskAssigned
-	// ProvingTaskProved DEPRECATED: proof has been returned by prover
+	// ProvingTaskProved : proof has been returned by prover
 	ProvingTaskProved
 	// ProvingTaskVerified : proof is valid
 	ProvingTaskVerified
--- a/common/types/message/message.go
+++ b/common/types/message/message.go
@@ -33,7 +33,7 @@ func (r ProofType) String() string {
 	case ProofTypeBatch:
 		return "proof type batch"
 	default:
-		return fmt.Sprintf("illegal proof type: %d", r)
+		return "illegal proof type"
 	}
 }

@@ -60,8 +60,6 @@ type AuthMsg struct {
 type Identity struct {
 	// ProverName the prover name
 	ProverName string `json:"prover_name"`
-	// ProverVersion the prover version
-	ProverVersion string `json:"prover_version"`
 	// Challenge unique challenge generated by manager
 	Challenge string `json:"challenge"`
 }
@@ -250,12 +248,11 @@ type ChunkInfo struct {

 // ChunkProof includes the proof info that are required for chunk verification and rollup.
 type ChunkProof struct {
-	StorageTrace []byte     `json:"storage_trace"`
-	Protocol     []byte     `json:"protocol"`
-	Proof        []byte     `json:"proof"`
-	Instances    []byte     `json:"instances"`
-	Vk           []byte     `json:"vk"`
-	ChunkInfo    *ChunkInfo `json:"chunk_info,omitempty"` // cross-reference between cooridinator computation and prover compution
+	StorageTrace []byte `json:"storage_trace"`
+	Protocol     []byte `json:"protocol"`
+	Proof        []byte `json:"proof"`
+	Instances    []byte `json:"instances"`
+	Vk           []byte `json:"vk"`
 }

 // BatchProof includes the proof info that are required for batch verification and rollup.
--- a/common/types/message/message_test.go
+++ b/common/types/message/message_test.go
@@ -15,9 +15,8 @@ func TestAuthMessageSignAndVerify(t *testing.T) {

 	authMsg := &AuthMsg{
 		Identity: &Identity{
-			Challenge:     "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2OTEwMzgxNzUsIm9yaWdfaWF0IjoxNjkxMDM0NTc1fQ.HybBMsEJFhyZqtIa2iVcHUP7CEFttf708jmTMAImAWA",
-			ProverName:    "test",
-			ProverVersion: "v1.0.0",
+			Challenge:  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2OTEwMzgxNzUsIm9yaWdfaWF0IjoxNjkxMDM0NTc1fQ.HybBMsEJFhyZqtIa2iVcHUP7CEFttf708jmTMAImAWA",
+			ProverName: "test",
 		},
 	}
 	assert.NoError(t, authMsg.SignWithKey(privkey))
@@ -46,15 +45,14 @@ func TestGenerateToken(t *testing.T) {

 func TestIdentityHash(t *testing.T) {
 	identity := &Identity{
-		Challenge:     "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2OTEwMzM0MTksIm9yaWdfaWF0IjoxNjkxMDI5ODE5fQ.EhkLZsj__rNPVC3ZDYBtvdh0nB8mmM_Hl82hObaIWOs",
-		ProverName:    "test",
-		ProverVersion: "v1.0.0",
+		Challenge:  "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2OTEwMzM0MTksIm9yaWdfaWF0IjoxNjkxMDI5ODE5fQ.EhkLZsj__rNPVC3ZDYBtvdh0nB8mmM_Hl82hObaIWOs",
+		ProverName: "test",
 	}

 	hash, err := identity.Hash()
 	assert.NoError(t, err)

-	expectedHash := "83f5e0ad023e9c1de639ab07b9b4cb972ec9dbbd2524794c533a420a5b137721"
+	expectedHash := "7373bb57ab7c01307d86fec55e088e00c526d82d9d1303fa4a189ff6ea95fbe2"
 	assert.Equal(t, expectedHash, hex.EncodeToString(hash))
 }

@@ -73,7 +71,6 @@ func TestProofMessageSignVerifyPublicKey(t *testing.T) {
 				Proof:        []byte("testProof"),
 				Instances:    []byte("testInstance"),
 				Vk:           []byte("testVk"),
-				ChunkInfo:    nil,
 			},
 			Error: "testError",
 		},
@@ -102,13 +99,12 @@ func TestProofDetailHash(t *testing.T) {
 			Proof:        []byte("testProof"),
 			Instances:    []byte("testInstance"),
 			Vk:           []byte("testVk"),
-			ChunkInfo:    nil,
 		},
 		Error: "testError",
 	}
 	hash, err := proofDetail.Hash()
 	assert.NoError(t, err)
-	expectedHash := "72a00232c1fcb100b1b67e6d12cd449e5d2d890e3a66e50f4c23499d4990766f"
+	expectedHash := "4165f5ab3399001002a5b8e4062914249a2deb72f6133d647b586f53e236802d"
 	assert.Equal(t, expectedHash, hex.EncodeToString(hash))
 }

@@ -120,7 +116,7 @@ func TestProveTypeString(t *testing.T) {
 	assert.Equal(t, "proof type batch", proofTypeBatch.String())

 	illegalProof := ProofType(3)
-	assert.Equal(t, "illegal proof type: 3", illegalProof.String())
+	assert.Equal(t, "illegal proof type", illegalProof.String())
 }

 func TestProofMsgPublicKey(t *testing.T) {
@@ -138,7 +134,6 @@ func TestProofMsgPublicKey(t *testing.T) {
 				Proof:        []byte("testProof"),
 				Instances:    []byte("testInstance"),
 				Vk:           []byte("testVk"),
-				ChunkInfo:    nil,
 			},
 			Error: "testError",
 		},
--- a/common/utils/simulation.go
+++ b/common/utils/simulation.go
@@ -20,17 +20,12 @@ var (
 	MessageRelayerApp MockAppName = "message-relayer-test"
 	// RollupRelayerApp the name of mock rollup-relayer app.
 	RollupRelayerApp MockAppName = "rollup-relayer-test"
-
-	// DBCliApp the name of mock database app.
-	DBCliApp MockAppName = "db_cli-test"
-
 	// CoordinatorApp the name of mock coordinator app.
 	CoordinatorApp MockAppName = "coordinator-test"
-
-	// ChunkProverApp the name of mock chunk prover app.
-	ChunkProverApp MockAppName = "chunkProver-test"
-	// BatchProverApp the name of mock batch prover app.
-	BatchProverApp MockAppName = "batchProver-test"
+	// DBCliApp the name of mock database app.
+	DBCliApp MockAppName = "db_cli-test"
+	// ProverApp the name of mock prover app.
+	ProverApp MockAppName = "prover-test"
 )

 // RegisterSimulation register initializer function for integration-test.
--- a/common/version/version.go
+++ b/common/version/version.go
@@ -3,10 +3,9 @@ package version
 import (
 	"fmt"
 	"runtime/debug"
-	"strings"
 )

-var tag = "v4.1.46"
+var tag = "v4.1.0"

 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {
@@ -20,36 +19,11 @@ var commit = func() string {
 			}
 		}
 	}
-	// Set default value for integration test.
-	return "000000"
+	return ""
 }()

-// ZkVersion is commit-id of common/libzkp/impl/cargo.lock/scroll-prover and halo2, contacted by a "-"
-// The default `000000-000000` is set for integration test, and will be overwritten by coordinator's & prover's actual compilations (see their Makefiles).
-var ZkVersion = "000000-000000"
+// ZkVersion is commit-id of common/libzkp/impl/cargo.lock/scroll-prover
+var ZkVersion string

-// OldZkVersion is the last version of ZkVersion.
-var OldZkVersion = "000000-000000"
-
-var (
-	// Version denote the version of scroll protocol, including the l2geth, relayer, coordinator, prover, contracts and etc.
-	Version = fmt.Sprintf("%s-%s-%s", tag, commit, ZkVersion)
-	// OldVersion is the last version of Version.
-	OldVersion = fmt.Sprintf("%s-%s-%s", tag, commit, OldZkVersion)
-)
-
-// CheckScrollProverVersion check the "scroll-prover" version, if it's different from the local one, return false
-func CheckScrollProverVersion(proverVersion string) bool {
-	// note the the version is in fact in the format of "tag-commit-scroll_prover-halo2",
-	// so split-by-'-' length should be 4
-	remote := strings.Split(proverVersion, "-")
-	if len(remote) != 4 {
-		return false
-	}
-	local := strings.Split(Version, "-")
-	if len(local) != 4 {
-		return false
-	}
-	// compare the `scroll_prover` version
-	return remote[2] == local[2]
-}
+// Version denote the version of scroll protocol, including the l2geth, relayer, coordinator, prover, contracts and etc.
+var Version = fmt.Sprintf("%s-%s-%s", tag, commit, ZkVersion)
--- a/contracts/docs/apis/L1ERC1155Gateway.md
+++ b/contracts/docs/apis/L1ERC1155Gateway.md
@@ -533,7 +533,7 @@ Emitted when some ERC1155 token is refunded.
 ### UpdateTokenMapping

 ```solidity
-event UpdateTokenMapping(address indexed l1Token, address indexed oldL2Token, address indexed newL2Token)
+event UpdateTokenMapping(address _l1Token, address _l2Token)
 ```

 Emitted when token mapping for ERC1155 token is updated.
@@ -544,9 +544,8 @@ Emitted when token mapping for ERC1155 token is updated.

 | Name | Type | Description |
 |---|---|---|
-| l1Token `indexed` | address | The address of ERC1155 token in layer 1. |
-| oldL2Token `indexed` | address | The address of the old corresponding ERC1155 token in layer 2. |
-| newL2Token `indexed` | address | The address of the new corresponding ERC1155 token in layer 2. |
+| _l1Token  | address | The address of ERC1155 token on layer 1. |
+| _l2Token  | address | The address of corresponding ERC1155 token on layer 2. |



--- a/contracts/docs/apis/L1ERC721Gateway.md
+++ b/contracts/docs/apis/L1ERC721Gateway.md
@@ -472,7 +472,7 @@ Emitted when some ERC721 token is refunded.
 ### UpdateTokenMapping

 ```solidity
-event UpdateTokenMapping(address indexed l1Token, address indexed oldL2Token, address indexed newL2Token)
+event UpdateTokenMapping(address _l1Token, address _l2Token)
 ```

 Emitted when token mapping for ERC721 token is updated.
@@ -483,9 +483,8 @@ Emitted when token mapping for ERC721 token is updated.

 | Name | Type | Description |
 |---|---|---|
-| l1Token `indexed` | address | The address of ERC721 token in layer 1. |
-| oldL2Token `indexed` | address | The address of the old corresponding ERC721 token in layer 2. |
-| newL2Token `indexed` | address | The address of the new corresponding ERC721 token in layer 2. |
+| _l1Token  | address | The address of ERC721 token on layer 1. |
+| _l2Token  | address | The address of corresponding ERC721 token on layer 2. |



--- a/contracts/docs/apis/L1GatewayRouter.md
+++ b/contracts/docs/apis/L1GatewayRouter.md
@@ -350,7 +350,7 @@ Request ERC20 token transfer from users to gateways.
 ### setDefaultERC20Gateway

 ```solidity
-function setDefaultERC20Gateway(address _newDefaultERC20Gateway) external nonpayable
+function setDefaultERC20Gateway(address _defaultERC20Gateway) external nonpayable
 ```

 Update the address of default ERC20 gateway contract.
@@ -361,7 +361,7 @@ Update the address of default ERC20 gateway contract.

 | Name | Type | Description |
 |---|---|---|
-| _newDefaultERC20Gateway | address | undefined |
+| _defaultERC20Gateway | address | The address to update. |

 ### setERC20Gateway

@@ -383,7 +383,7 @@ Update the mapping from token address to gateway address.
 ### setETHGateway

 ```solidity
-function setETHGateway(address _newEthGateway) external nonpayable
+function setETHGateway(address _ethGateway) external nonpayable
 ```

 Update the address of ETH gateway contract.
@@ -394,7 +394,7 @@ Update the address of ETH gateway contract.

 | Name | Type | Description |
 |---|---|---|
-| _newEthGateway | address | undefined |
+| _ethGateway | address | The address to update. |

 ### transferOwnership

@@ -567,7 +567,7 @@ Emitted when some ETH is refunded.
 ### SetDefaultERC20Gateway

 ```solidity
-event SetDefaultERC20Gateway(address indexed oldDefaultERC20Gateway, address indexed newDefaultERC20Gateway)
+event SetDefaultERC20Gateway(address indexed defaultERC20Gateway)
 ```

 Emitted when the address of default ERC20 Gateway is updated.
@@ -578,13 +578,12 @@ Emitted when the address of default ERC20 Gateway is updated.

 | Name | Type | Description |
 |---|---|---|
-| oldDefaultERC20Gateway `indexed` | address | undefined |
-| newDefaultERC20Gateway `indexed` | address | undefined |
+| defaultERC20Gateway `indexed` | address | undefined |

 ### SetERC20Gateway

 ```solidity
-event SetERC20Gateway(address indexed token, address indexed oldGateway, address indexed newGateway)
+event SetERC20Gateway(address indexed token, address indexed gateway)
 ```

 Emitted when the `gateway` for `token` is updated.
@@ -596,13 +595,12 @@ Emitted when the `gateway` for `token` is updated.
 | Name | Type | Description |
 |---|---|---|
 | token `indexed` | address | undefined |
-| oldGateway `indexed` | address | undefined |
-| newGateway `indexed` | address | undefined |
+| gateway `indexed` | address | undefined |

 ### SetETHGateway

 ```solidity
-event SetETHGateway(address indexed oldETHGateway, address indexed newEthGateway)
+event SetETHGateway(address indexed ethGateway)
 ```

 Emitted when the address of ETH Gateway is updated.
@@ -613,8 +611,7 @@ Emitted when the address of ETH Gateway is updated.

 | Name | Type | Description |
 |---|---|---|
-| oldETHGateway `indexed` | address | undefined |
-| newEthGateway `indexed` | address | undefined |
+| ethGateway `indexed` | address | undefined |



--- a/contracts/docs/apis/L1ScrollMessenger.md
+++ b/contracts/docs/apis/L1ScrollMessenger.md
@@ -423,7 +423,7 @@ Update fee vault contract.
 ### updateMaxReplayTimes

 ```solidity
-function updateMaxReplayTimes(uint256 _newMaxReplayTimes) external nonpayable
+function updateMaxReplayTimes(uint256 _maxReplayTimes) external nonpayable
 ```

 Update max replay times.
@@ -434,7 +434,7 @@ Update max replay times.

 | Name | Type | Description |
 |---|---|---|
-| _newMaxReplayTimes | uint256 | The new max replay times. |
+| _maxReplayTimes | uint256 | The new max replay times. |

 ### xDomainMessageSender

@@ -595,7 +595,7 @@ Emitted when owner updates fee vault contract.
 ### UpdateMaxReplayTimes

 ```solidity
-event UpdateMaxReplayTimes(uint256 oldMaxReplayTimes, uint256 newMaxReplayTimes)
+event UpdateMaxReplayTimes(uint256 maxReplayTimes)
 ```

 Emitted when the maximum number of times each message can be replayed is updated.
@@ -606,8 +606,7 @@ Emitted when the maximum number of times each message can be replayed is updated

 | Name | Type | Description |
 |---|---|---|
-| oldMaxReplayTimes  | uint256 | undefined |
-| newMaxReplayTimes  | uint256 | undefined |
+| maxReplayTimes  | uint256 | undefined |



--- a/contracts/docs/apis/L1StandardERC20Gateway.md
+++ b/contracts/docs/apis/L1StandardERC20Gateway.md
@@ -214,34 +214,6 @@ function onDropMessage(bytes _message) external payable
 |---|---|---|
 | _message | bytes | undefined |

-### owner
-
-```solidity
-function owner() external view returns (address)
-```
-
-
-
-*Returns the address of the current owner.*
-
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### renounceOwnership
-
-```solidity
-function renounceOwnership() external nonpayable
-```
-
-
-
-*Leaves the contract without owner. It will not be possible to call `onlyOwner` functions. Can only be called by the current owner. NOTE: Renouncing ownership will leave the contract without an owner, thereby disabling any functionality that is only available to the owner.*
-
-
 ### router

 ```solidity
@@ -259,22 +231,6 @@ The address of L1GatewayRouter/L2GatewayRouter contract.
 |---|---|---|
 | _0 | address | undefined |

-### transferOwnership
-
-```solidity
-function transferOwnership(address newOwner) external nonpayable
-```
-
-
-
-*Transfers ownership of the contract to a new account (`newOwner`). Can only be called by the current owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| newOwner | address | undefined |
-


 ## Events
@@ -337,23 +293,6 @@ event Initialized(uint8 version)
 |---|---|---|
 | version  | uint8 | undefined |

-### OwnershipTransferred
-
-```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner)
-```
-
-
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| previousOwner `indexed` | address | undefined |
-| newOwner `indexed` | address | undefined |
-
 ### RefundERC20

 ```solidity
--- a/contracts/docs/apis/L1WETHGateway.md
+++ b/contracts/docs/apis/L1WETHGateway.md
@@ -212,34 +212,6 @@ function onDropMessage(bytes _message) external payable
 |---|---|---|
 | _message | bytes | undefined |

-### owner
-
-```solidity
-function owner() external view returns (address)
-```
-
-
-
-*Returns the address of the current owner.*
-
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### renounceOwnership
-
-```solidity
-function renounceOwnership() external nonpayable
-```
-
-
-
-*Leaves the contract without owner. It will not be possible to call `onlyOwner` functions. Can only be called by the current owner. NOTE: Renouncing ownership will leave the contract without an owner, thereby disabling any functionality that is only available to the owner.*
-
-
 ### router

 ```solidity
@@ -257,22 +229,6 @@ The address of L1GatewayRouter/L2GatewayRouter contract.
 |---|---|---|
 | _0 | address | undefined |

-### transferOwnership
-
-```solidity
-function transferOwnership(address newOwner) external nonpayable
-```
-
-
-
-*Transfers ownership of the contract to a new account (`newOwner`). Can only be called by the current owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| newOwner | address | undefined |
-


 ## Events
@@ -335,23 +291,6 @@ event Initialized(uint8 version)
 |---|---|---|
 | version  | uint8 | undefined |

-### OwnershipTransferred
-
-```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner)
-```
-
-
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| previousOwner `indexed` | address | undefined |
-| newOwner `indexed` | address | undefined |
-
 ### RefundERC20

 ```solidity
--- a/contracts/docs/apis/L2ERC1155Gateway.md
+++ b/contracts/docs/apis/L2ERC1155Gateway.md
@@ -458,7 +458,7 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 ### UpdateTokenMapping

 ```solidity
-event UpdateTokenMapping(address indexed l2Token, address indexed oldL1Token, address indexed newL1Token)
+event UpdateTokenMapping(address _l2Token, address _l1Token)
 ```

 Emitted when token mapping for ERC1155 token is updated.
@@ -469,9 +469,8 @@ Emitted when token mapping for ERC1155 token is updated.

 | Name | Type | Description |
 |---|---|---|
-| l2Token `indexed` | address | The address of corresponding ERC1155 token in layer 2. |
-| oldL1Token `indexed` | address | The address of the old corresponding ERC1155 token in layer 1. |
-| newL1Token `indexed` | address | The address of the new corresponding ERC1155 token in layer 1. |
+| _l2Token  | address | The address of corresponding ERC1155 token on layer 2. |
+| _l1Token  | address | The address of ERC1155 token on layer 1. |

 ### WithdrawERC1155

--- a/contracts/docs/apis/L2ERC721Gateway.md
+++ b/contracts/docs/apis/L2ERC721Gateway.md
@@ -400,7 +400,7 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 ### UpdateTokenMapping

 ```solidity
-event UpdateTokenMapping(address indexed l2Token, address indexed oldL1Token, address indexed newL1Token)
+event UpdateTokenMapping(address _l2Token, address _l1Token)
 ```

 Emitted when token mapping for ERC721 token is updated.
@@ -411,9 +411,8 @@ Emitted when token mapping for ERC721 token is updated.

 | Name | Type | Description |
 |---|---|---|
-| l2Token `indexed` | address | The address of corresponding ERC721 token in layer 2. |
-| oldL1Token `indexed` | address | The address of the old corresponding ERC721 token in layer 1. |
-| newL1Token `indexed` | address | The address of the new corresponding ERC721 token in layer 1. |
+| _l2Token  | address | The address of corresponding ERC721 token on layer 2. |
+| _l1Token  | address | The address of ERC721 token on layer 1. |

 ### WithdrawERC721

--- a/contracts/docs/apis/L2GatewayRouter.md
+++ b/contracts/docs/apis/L2GatewayRouter.md
@@ -220,7 +220,7 @@ function renounceOwnership() external nonpayable
 ### setDefaultERC20Gateway

 ```solidity
-function setDefaultERC20Gateway(address _newDefaultERC20Gateway) external nonpayable
+function setDefaultERC20Gateway(address _defaultERC20Gateway) external nonpayable
 ```

 Update the address of default ERC20 gateway contract.
@@ -231,7 +231,7 @@ Update the address of default ERC20 gateway contract.

 | Name | Type | Description |
 |---|---|---|
-| _newDefaultERC20Gateway | address | The address to update. |
+| _defaultERC20Gateway | address | The address to update. |

 ### setERC20Gateway

@@ -253,7 +253,7 @@ Update the mapping from token address to gateway address.
 ### setETHGateway

 ```solidity
-function setETHGateway(address _newEthGateway) external nonpayable
+function setETHGateway(address _ethGateway) external nonpayable
 ```

 Update the address of ETH gateway contract.
@@ -264,7 +264,7 @@ Update the address of ETH gateway contract.

 | Name | Type | Description |
 |---|---|---|
-| _newEthGateway | address | The address to update. |
+| _ethGateway | address | The address to update. |

 ### transferOwnership

@@ -473,7 +473,7 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 ### SetDefaultERC20Gateway

 ```solidity
-event SetDefaultERC20Gateway(address indexed oldDefaultERC20Gateway, address indexed newDefaultERC20Gateway)
+event SetDefaultERC20Gateway(address indexed defaultERC20Gateway)
 ```

 Emitted when the address of default ERC20 Gateway is updated.
@@ -484,13 +484,12 @@ Emitted when the address of default ERC20 Gateway is updated.

 | Name | Type | Description |
 |---|---|---|
-| oldDefaultERC20Gateway `indexed` | address | undefined |
-| newDefaultERC20Gateway `indexed` | address | undefined |
+| defaultERC20Gateway `indexed` | address | undefined |

 ### SetERC20Gateway

 ```solidity
-event SetERC20Gateway(address indexed token, address indexed oldGateway, address indexed newGateway)
+event SetERC20Gateway(address indexed token, address indexed gateway)
 ```

 Emitted when the `gateway` for `token` is updated.
@@ -502,13 +501,12 @@ Emitted when the `gateway` for `token` is updated.
 | Name | Type | Description |
 |---|---|---|
 | token `indexed` | address | undefined |
-| oldGateway `indexed` | address | undefined |
-| newGateway `indexed` | address | undefined |
+| gateway `indexed` | address | undefined |

 ### SetETHGateway

 ```solidity
-event SetETHGateway(address indexed oldETHGateway, address indexed newEthGateway)
+event SetETHGateway(address indexed ethGateway)
 ```

 Emitted when the address of ETH Gateway is updated.
@@ -519,8 +517,7 @@ Emitted when the address of ETH Gateway is updated.

 | Name | Type | Description |
 |---|---|---|
-| oldETHGateway `indexed` | address | undefined |
-| newEthGateway `indexed` | address | undefined |
+| ethGateway `indexed` | address | undefined |

 ### WithdrawERC20

--- a/contracts/docs/apis/L2ScrollMessenger.md
+++ b/contracts/docs/apis/L2ScrollMessenger.md
@@ -47,7 +47,7 @@ The address of fee vault, collecting cross domain messaging fee.
 ### initialize

 ```solidity
-function initialize(address _counterpart) external nonpayable
+function initialize(address _counterpart, address _feeVault) external nonpayable
 ```


@@ -59,6 +59,7 @@ function initialize(address _counterpart) external nonpayable
 | Name | Type | Description |
 |---|---|---|
 | _counterpart | address | undefined |
+| _feeVault | address | undefined |

 ### isL1MessageExecuted

@@ -315,7 +316,7 @@ Update fee vault contract.
 ### updateMaxFailedExecutionTimes

 ```solidity
-function updateMaxFailedExecutionTimes(uint256 _newMaxFailedExecutionTimes) external nonpayable
+function updateMaxFailedExecutionTimes(uint256 _maxFailedExecutionTimes) external nonpayable
 ```

 Update max failed execution times.
@@ -326,7 +327,7 @@ Update max failed execution times.

 | Name | Type | Description |
 |---|---|---|
-| _newMaxFailedExecutionTimes | uint256 | The new max failed execution times. |
+| _maxFailedExecutionTimes | uint256 | The new max failed execution times. |

 ### xDomainMessageSender

@@ -487,7 +488,7 @@ Emitted when owner updates fee vault contract.
 ### UpdateMaxFailedExecutionTimes

 ```solidity
-event UpdateMaxFailedExecutionTimes(uint256 oldMaxFailedExecutionTimes, uint256 newMaxFailedExecutionTimes)
+event UpdateMaxFailedExecutionTimes(uint256 maxFailedExecutionTimes)
 ```

 Emitted when the maximum number of times each message can fail in L2 is updated.
@@ -498,8 +499,7 @@ Emitted when the maximum number of times each message can fail in L2 is updated.

 | Name | Type | Description |
 |---|---|---|
-| oldMaxFailedExecutionTimes  | uint256 | undefined |
-| newMaxFailedExecutionTimes  | uint256 | undefined |
+| maxFailedExecutionTimes  | uint256 | The new maximum number of times each message can fail in L2. |



--- a/contracts/docs/apis/L2StandardERC20Gateway.md
+++ b/contracts/docs/apis/L2StandardERC20Gateway.md
@@ -128,34 +128,6 @@ The address of corresponding L1ScrollMessenger/L2ScrollMessenger contract.
 |---|---|---|
 | _0 | address | undefined |

-### owner
-
-```solidity
-function owner() external view returns (address)
-```
-
-
-
-*Returns the address of the current owner.*
-
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### renounceOwnership
-
-```solidity
-function renounceOwnership() external nonpayable
-```
-
-
-
-*Leaves the contract without owner. It will not be possible to call `onlyOwner` functions. Can only be called by the current owner. NOTE: Renouncing ownership will leave the contract without an owner, thereby disabling any functionality that is only available to the owner.*
-
-
 ### router

 ```solidity
@@ -190,22 +162,6 @@ The address of ScrollStandardERC20Factory.
 |---|---|---|
 | _0 | address | undefined |

-### transferOwnership
-
-```solidity
-function transferOwnership(address newOwner) external nonpayable
-```
-
-
-
-*Transfers ownership of the contract to a new account (`newOwner`). Can only be called by the current owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| newOwner | address | undefined |
-
 ### withdrawERC20

 ```solidity
@@ -304,23 +260,6 @@ event Initialized(uint8 version)
 |---|---|---|
 | version  | uint8 | undefined |

-### OwnershipTransferred
-
-```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner)
-```
-
-
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| previousOwner `indexed` | address | undefined |
-| newOwner `indexed` | address | undefined |
-
 ### WithdrawERC20

 ```solidity
--- a/contracts/docs/apis/L2WETHGateway.md
+++ b/contracts/docs/apis/L2WETHGateway.md
@@ -161,34 +161,6 @@ The address of corresponding L1ScrollMessenger/L2ScrollMessenger contract.
 |---|---|---|
 | _0 | address | undefined |

-### owner
-
-```solidity
-function owner() external view returns (address)
-```
-
-
-
-*Returns the address of the current owner.*
-
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### renounceOwnership
-
-```solidity
-function renounceOwnership() external nonpayable
-```
-
-
-
-*Leaves the contract without owner. It will not be possible to call `onlyOwner` functions. Can only be called by the current owner. NOTE: Renouncing ownership will leave the contract without an owner, thereby disabling any functionality that is only available to the owner.*
-
-
 ### router

 ```solidity
@@ -206,22 +178,6 @@ The address of L1GatewayRouter/L2GatewayRouter contract.
 |---|---|---|
 | _0 | address | undefined |

-### transferOwnership
-
-```solidity
-function transferOwnership(address newOwner) external nonpayable
-```
-
-
-
-*Transfers ownership of the contract to a new account (`newOwner`). Can only be called by the current owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| newOwner | address | undefined |
-
 ### withdrawERC20

 ```solidity
@@ -320,23 +276,6 @@ event Initialized(uint8 version)
 |---|---|---|
 | version  | uint8 | undefined |

-### OwnershipTransferred
-
-```solidity
-event OwnershipTransferred(address indexed previousOwner, address indexed newOwner)
-```
-
-
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| previousOwner `indexed` | address | undefined |
-| newOwner `indexed` | address | undefined |
-
 ### WithdrawERC20

 ```solidity
--- a/contracts/integration-test/ScrollChain.spec.ts
+++ b/contracts/integration-test/ScrollChain.spec.ts
@@ -1,6 +1,7 @@
 /* eslint-disable node/no-unpublished-import */
 /* eslint-disable node/no-missing-import */
 import { constants } from "ethers";
+import { concat } from "ethers/lib/utils";
 import { ethers } from "hardhat";
 import { ScrollChain, L1MessageQueue } from "../typechain";

@@ -27,7 +28,7 @@ describe("ScrollChain", async () => {
    await chain.deployed();

    await chain.initialize(queue.address, constants.AddressZero, 44);
-    await chain.addSequencer(deployer.address);
+    await chain.updateSequencer(deployer.address, true);
    await queue.initialize(
      constants.AddressZero,
      chain.address,
--- a/contracts/scripts/foundry/InitializeL1BridgeContracts.s.sol
+++ b/contracts/scripts/foundry/InitializeL1BridgeContracts.s.sol
@@ -22,9 +22,7 @@ contract InitializeL1BridgeContracts is Script {

    uint256 CHAIN_ID_L2 = vm.envUint("CHAIN_ID_L2");
    uint256 MAX_L2_TX_IN_CHUNK = vm.envUint("MAX_L2_TX_IN_CHUNK");
-    uint256 MAX_L1_MESSAGE_GAS_LIMIT = vm.envUint("MAX_L1_MESSAGE_GAS_LIMIT");
-    address L1_COMMIT_SENDER_ADDRESS = vm.envAddress("L1_COMMIT_SENDER_ADDRESS");
-    address L1_FINALIZE_SENDER_ADDRESS = vm.envAddress("L1_FINALIZE_SENDER_ADDRESS");
+    address L1_ROLLUP_OPERATOR_ADDR = vm.envAddress("L1_ROLLUP_OPERATOR_ADDR");
    address L1_FEE_VAULT_ADDR = vm.envAddress("L1_FEE_VAULT_ADDR");
    address L1_WETH_ADDR = vm.envAddress("L1_WETH_ADDR");

@@ -68,8 +66,8 @@ contract InitializeL1BridgeContracts is Script {
            L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR,
            MAX_L2_TX_IN_CHUNK
        );
-        ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).addSequencer(L1_COMMIT_SENDER_ADDRESS);
-        ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).addProver(L1_FINALIZE_SENDER_ADDRESS);
+        ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).updateSequencer(L1_ROLLUP_OPERATOR_ADDR, true);
+        ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).updateProver(L1_ROLLUP_OPERATOR_ADDR, true);

        // initialize L2GasPriceOracle
        L2GasPriceOracle(L2_GAS_PRICE_ORACLE_PROXY_ADDR).initialize(
@@ -86,7 +84,7 @@ contract InitializeL1BridgeContracts is Script {
            L1_SCROLL_CHAIN_PROXY_ADDR,
            L1_ENFORCED_TX_GATEWAY_PROXY_ADDR,
            L2_GAS_PRICE_ORACLE_PROXY_ADDR,
-            MAX_L1_MESSAGE_GAS_LIMIT
+            10000000
        );

        // initialize L1ScrollMessenger
--- a/contracts/scripts/foundry/InitializeL2BridgeContracts.s.sol
+++ b/contracts/scripts/foundry/InitializeL2BridgeContracts.s.sol
@@ -65,7 +65,10 @@ contract InitializeL2BridgeContracts is Script {
        L1GasPriceOracle(L1_GAS_PRICE_ORACLE_ADDR).updateWhitelist(L2_WHITELIST_ADDR);

        // initialize L2ScrollMessenger
-        L2ScrollMessenger(payable(L2_SCROLL_MESSENGER_PROXY_ADDR)).initialize(L1_SCROLL_MESSENGER_PROXY_ADDR);
+        L2ScrollMessenger(payable(L2_SCROLL_MESSENGER_PROXY_ADDR)).initialize(
+            L1_SCROLL_MESSENGER_PROXY_ADDR,
+            L2_TX_FEE_VAULT_ADDR
+        );

        // initialize L2GatewayRouter
        L2GatewayRouter(L2_GATEWAY_ROUTER_PROXY_ADDR).initialize(
--- a/contracts/src/L1/IL1ScrollMessenger.sol
+++ b/contracts/src/L1/IL1ScrollMessenger.sol
@@ -10,9 +10,8 @@ interface IL1ScrollMessenger is IScrollMessenger {
     **********/

    /// @notice Emitted when the maximum number of times each message can be replayed is updated.
-    /// @param oldMaxReplayTimes The old maximum number of times each message can be replayed.
-    /// @param newMaxReplayTimes The new maximum number of times each message can be replayed.
-    event UpdateMaxReplayTimes(uint256 oldMaxReplayTimes, uint256 newMaxReplayTimes);
+    /// @param maxReplayTimes The new maximum number of times each message can be replayed.
+    event UpdateMaxReplayTimes(uint256 maxReplayTimes);

    /***********
     * Structs *
--- a/contracts/src/L1/L1ScrollMessenger.sol
+++ b/contracts/src/L1/L1ScrollMessenger.sol
@@ -2,12 +2,15 @@

 pragma solidity =0.8.16;

+import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
+
 import {IScrollChain} from "./rollup/IScrollChain.sol";
 import {IL1MessageQueue} from "./rollup/IL1MessageQueue.sol";
 import {IL1ScrollMessenger} from "./IL1ScrollMessenger.sol";
 import {ScrollConstants} from "../libraries/constants/ScrollConstants.sol";
 import {IScrollMessenger} from "../libraries/IScrollMessenger.sol";
 import {ScrollMessengerBase} from "../libraries/ScrollMessengerBase.sol";
+import {AddressAliasHelper} from "../libraries/common/AddressAliasHelper.sol";
 import {WithdrawTrieVerifier} from "../libraries/verifier/WithdrawTrieVerifier.sol";

 import {IMessageDropCallback} from "../libraries/callbacks/IMessageDropCallback.sol";
@@ -25,7 +28,7 @@ import {IMessageDropCallback} from "../libraries/callbacks/IMessageDropCallback.
 ///
 /// @dev All deposited Ether (including `WETH` deposited throng `L1WETHGateway`) will locked in
 /// this contract.
-contract L1ScrollMessenger is ScrollMessengerBase, IL1ScrollMessenger {
+contract L1ScrollMessenger is PausableUpgradeable, ScrollMessengerBase, IL1ScrollMessenger {
    /***********
     * Structs *
     ***********/
@@ -94,7 +97,8 @@ contract L1ScrollMessenger is ScrollMessengerBase, IL1ScrollMessenger {
        address _rollup,
        address _messageQueue
    ) public initializer {
-        ScrollMessengerBase.__ScrollMessengerBase_init(_counterpart, _feeVault);
+        PausableUpgradeable.__Pausable_init();
+        ScrollMessengerBase._initialize(_counterpart, _feeVault);

        rollup = _rollup;
        messageQueue = _messageQueue;
@@ -291,14 +295,24 @@ contract L1ScrollMessenger is ScrollMessengerBase, IL1ScrollMessenger {
     * Restricted Functions *
     ************************/

+    /// @notice Pause the contract
+    /// @dev This function can only called by contract owner.
+    /// @param _status The pause status to update.
+    function setPause(bool _status) external onlyOwner {
+        if (_status) {
+            _pause();
+        } else {
+            _unpause();
+        }
+    }
+
    /// @notice Update max replay times.
    /// @dev This function can only called by contract owner.
-    /// @param _newMaxReplayTimes The new max replay times.
-    function updateMaxReplayTimes(uint256 _newMaxReplayTimes) external onlyOwner {
-        uint256 _oldMaxReplayTimes = maxReplayTimes;
-        maxReplayTimes = _newMaxReplayTimes;
+    /// @param _maxReplayTimes The new max replay times.
+    function updateMaxReplayTimes(uint256 _maxReplayTimes) external onlyOwner {
+        maxReplayTimes = _maxReplayTimes;

-        emit UpdateMaxReplayTimes(_oldMaxReplayTimes, _newMaxReplayTimes);
+        emit UpdateMaxReplayTimes(_maxReplayTimes);
    }

    /**********************
--- a/contracts/src/L1/gateways/IL1GatewayRouter.sol
+++ b/contracts/src/L1/gateways/IL1GatewayRouter.sol
@@ -11,20 +11,17 @@ interface IL1GatewayRouter is IL1ETHGateway, IL1ERC20Gateway {
     **********/

    /// @notice Emitted when the address of ETH Gateway is updated.
-    /// @param oldETHGateway The address of the old ETH Gateway.
-    /// @param newEthGateway The address of the new ETH Gateway.
-    event SetETHGateway(address indexed oldETHGateway, address indexed newEthGateway);
+    /// @param ethGateway The address of new ETH Gateway.
+    event SetETHGateway(address indexed ethGateway);

    /// @notice Emitted when the address of default ERC20 Gateway is updated.
-    /// @param oldDefaultERC20Gateway The address of the old default ERC20 Gateway.
-    /// @param newDefaultERC20Gateway The address of the new default ERC20 Gateway.
-    event SetDefaultERC20Gateway(address indexed oldDefaultERC20Gateway, address indexed newDefaultERC20Gateway);
+    /// @param defaultERC20Gateway The address of new default ERC20 Gateway.
+    event SetDefaultERC20Gateway(address indexed defaultERC20Gateway);

    /// @notice Emitted when the `gateway` for `token` is updated.
    /// @param token The address of token updated.
-    /// @param oldGateway The corresponding address of the old gateway.
-    /// @param newGateway The corresponding address of the new gateway.
-    event SetERC20Gateway(address indexed token, address indexed oldGateway, address indexed newGateway);
+    /// @param gateway The corresponding address of gateway updated.
+    event SetERC20Gateway(address indexed token, address indexed gateway);

    /*************************
     * Public View Functions *
--- a/contracts/src/L1/gateways/L1CustomERC20Gateway.sol
+++ b/contracts/src/L1/gateways/L1CustomERC20Gateway.sol
@@ -2,6 +2,7 @@

 pragma solidity =0.8.16;

+import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";

@@ -17,7 +18,7 @@ import {L1ERC20Gateway} from "./L1ERC20Gateway.sol";
 /// finalize withdraw the tokens from layer 2.
 /// @dev The deposited tokens are held in this gateway. On finalizing withdraw, the corresponding
 /// tokens will be transfer to the recipient directly.
-contract L1CustomERC20Gateway is L1ERC20Gateway {
+contract L1CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L1ERC20Gateway {
    using SafeERC20Upgradeable for IERC20Upgradeable;

    /**********
@@ -25,10 +26,9 @@ contract L1CustomERC20Gateway is L1ERC20Gateway {
     **********/

    /// @notice Emitted when token mapping for ERC20 token is updated.
-    /// @param l1Token The address of ERC20 token in layer 1.
-    /// @param oldL2Token The address of the old corresponding ERC20 token in layer 2.
-    /// @param newL2Token The address of the new corresponding ERC20 token in layer 2.
-    event UpdateTokenMapping(address indexed l1Token, address indexed oldL2Token, address indexed newL2Token);
+    /// @param _l1Token The address of ERC20 token on layer 1.
+    /// @param _l2Token The address of corresponding ERC20 token on layer 2.
+    event UpdateTokenMapping(address _l1Token, address _l2Token);

    /*************
     * Variables *
@@ -56,6 +56,7 @@ contract L1CustomERC20Gateway is L1ERC20Gateway {
    ) external initializer {
        require(_router != address(0), "zero router address");

+        OwnableUpgradeable.__Ownable_init();
        ScrollGatewayBase._initialize(_counterpart, _router, _messenger);
    }

@@ -78,10 +79,9 @@ contract L1CustomERC20Gateway is L1ERC20Gateway {
    function updateTokenMapping(address _l1Token, address _l2Token) external onlyOwner {
        require(_l2Token != address(0), "token address cannot be 0");

-        address _oldL2Token = tokenMapping[_l1Token];
        tokenMapping[_l1Token] = _l2Token;

-        emit UpdateTokenMapping(_l1Token, _oldL2Token, _l2Token);
+        emit UpdateTokenMapping(_l1Token, _l2Token);
    }

    /**********************
--- a/contracts/src/L1/gateways/L1ERC1155Gateway.sol
+++ b/contracts/src/L1/gateways/L1ERC1155Gateway.sol
@@ -2,6 +2,7 @@

 pragma solidity =0.8.16;

+import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import {IERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/IERC1155Upgradeable.sol";
 import {ERC1155HolderUpgradeable, ERC1155ReceiverUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/utils/ERC1155HolderUpgradeable.sol";

@@ -19,16 +20,21 @@ import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 /// NFT will be transfer to the recipient directly.
 ///
 /// This will be changed if we have more specific scenarios.
-contract L1ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL1ERC1155Gateway, IMessageDropCallback {
+contract L1ERC1155Gateway is
+    OwnableUpgradeable,
+    ERC1155HolderUpgradeable,
+    ScrollGatewayBase,
+    IL1ERC1155Gateway,
+    IMessageDropCallback
+{
    /**********
     * Events *
     **********/

    /// @notice Emitted when token mapping for ERC1155 token is updated.
-    /// @param l1Token The address of ERC1155 token in layer 1.
-    /// @param oldL2Token The address of the old corresponding ERC1155 token in layer 2.
-    /// @param newL2Token The address of the new corresponding ERC1155 token in layer 2.
-    event UpdateTokenMapping(address indexed l1Token, address indexed oldL2Token, address indexed newL2Token);
+    /// @param _l1Token The address of ERC1155 token on layer 1.
+    /// @param _l2Token The address of corresponding ERC1155 token on layer 2.
+    event UpdateTokenMapping(address _l1Token, address _l2Token);

    /*************
     * Variables *
@@ -49,6 +55,7 @@ contract L1ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL1ERC
    /// @param _counterpart The address of L2ERC1155Gateway in L2.
    /// @param _messenger The address of L1ScrollMessenger.
    function initialize(address _counterpart, address _messenger) external initializer {
+        OwnableUpgradeable.__Ownable_init();
        ERC1155HolderUpgradeable.__ERC1155Holder_init();
        ERC1155ReceiverUpgradeable.__ERC1155Receiver_init();

@@ -170,10 +177,9 @@ contract L1ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL1ERC
    function updateTokenMapping(address _l1Token, address _l2Token) external onlyOwner {
        require(_l2Token != address(0), "token address cannot be 0");

-        address _oldL2Token = tokenMapping[_l1Token];
        tokenMapping[_l1Token] = _l2Token;

-        emit UpdateTokenMapping(_l1Token, _oldL2Token, _l2Token);
+        emit UpdateTokenMapping(_l1Token, _l2Token);
    }

    /**********************
--- a/contracts/src/L1/gateways/L1ERC20Gateway.sol
+++ b/contracts/src/L1/gateways/L1ERC20Gateway.sol
@@ -2,12 +2,14 @@

 pragma solidity ^0.8.16;

-import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
-import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

 import {IL1ERC20Gateway} from "./IL1ERC20Gateway.sol";
 import {IL1GatewayRouter} from "./IL1GatewayRouter.sol";

+import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
+
 import {IL2ERC20Gateway} from "../../L2/gateways/IL2ERC20Gateway.sol";
 import {IScrollMessenger} from "../../libraries/IScrollMessenger.sol";
 import {ScrollConstants} from "../../libraries/constants/ScrollConstants.sol";
@@ -17,7 +19,7 @@ import {IMessageDropCallback} from "../../libraries/callbacks/IMessageDropCallba
 // solhint-disable no-empty-blocks

 abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, ScrollGatewayBase {
-    using SafeERC20Upgradeable for IERC20Upgradeable;
+    using SafeERC20 for IERC20;

    /*************
     * Variables *
@@ -73,7 +75,7 @@ abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, Scrol

        // @note can possible trigger reentrant call to this contract or messenger,
        // but it seems not a big problem.
-        IERC20Upgradeable(_l1Token).safeTransfer(_to, _amount);
+        IERC20(_l1Token).safeTransfer(_to, _amount);

        _doCallback(_to, _data);

@@ -94,7 +96,7 @@ abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, Scrol
        // do dome check for each custom gateway
        _beforeDropMessage(_token, _receiver, _amount);

-        IERC20Upgradeable(_token).safeTransfer(_receiver, _amount);
+        IERC20(_token).safeTransfer(_receiver, _amount);

        emit RefundERC20(_token, _receiver, _amount);
    }
@@ -152,9 +154,9 @@ abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, Scrol
            _amount = IL1GatewayRouter(msg.sender).requestERC20(_from, _token, _amount);
        } else {
            // common practice to handle fee on transfer token.
-            uint256 _before = IERC20Upgradeable(_token).balanceOf(address(this));
-            IERC20Upgradeable(_token).safeTransferFrom(_from, address(this), _amount);
-            uint256 _after = IERC20Upgradeable(_token).balanceOf(address(this));
+            uint256 _before = IERC20(_token).balanceOf(address(this));
+            IERC20(_token).safeTransferFrom(_from, address(this), _amount);
+            uint256 _after = IERC20(_token).balanceOf(address(this));
            // no unchecked here, since some weird token may return arbitrary balance.
            _amount = _after - _before;
        }
--- a/contracts/src/L1/gateways/L1ERC721Gateway.sol
+++ b/contracts/src/L1/gateways/L1ERC721Gateway.sol
@@ -2,6 +2,7 @@

 pragma solidity =0.8.16;

+import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import {IERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721Upgradeable.sol";
 import {ERC721HolderUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/utils/ERC721HolderUpgradeable.sol";

@@ -19,16 +20,21 @@ import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 /// NFT will be transfer to the recipient directly.
 ///
 /// This will be changed if we have more specific scenarios.
-contract L1ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL1ERC721Gateway, IMessageDropCallback {
+contract L1ERC721Gateway is
+    OwnableUpgradeable,
+    ERC721HolderUpgradeable,
+    ScrollGatewayBase,
+    IL1ERC721Gateway,
+    IMessageDropCallback
+{
    /**********
     * Events *
     **********/

    /// @notice Emitted when token mapping for ERC721 token is updated.
-    /// @param l1Token The address of ERC721 token in layer 1.
-    /// @param oldL2Token The address of the old corresponding ERC721 token in layer 2.
-    /// @param newL2Token The address of the new corresponding ERC721 token in layer 2.
-    event UpdateTokenMapping(address indexed l1Token, address indexed oldL2Token, address indexed newL2Token);
+    /// @param _l1Token The address of ERC721 token on layer 1.
+    /// @param _l2Token The address of corresponding ERC721 token on layer 2.
+    event UpdateTokenMapping(address _l1Token, address _l2Token);

    /*************
     * Variables *
@@ -49,6 +55,7 @@ contract L1ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL1ERC72
    /// @param _counterpart The address of L2ERC721Gateway in L2.
    /// @param _messenger The address of L1ScrollMessenger.
    function initialize(address _counterpart, address _messenger) external initializer {
+        OwnableUpgradeable.__Ownable_init();
        ERC721HolderUpgradeable.__ERC721Holder_init();

        ScrollGatewayBase._initialize(_counterpart, address(0), _messenger);
@@ -166,10 +173,9 @@ contract L1ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL1ERC72
    function updateTokenMapping(address _l1Token, address _l2Token) external onlyOwner {
        require(_l2Token != address(0), "token address cannot be 0");

-        address _oldL2Token = tokenMapping[_l1Token];
        tokenMapping[_l1Token] = _l2Token;

-        emit UpdateTokenMapping(_l1Token, _oldL2Token, _l2Token);
+        emit UpdateTokenMapping(_l1Token, _l2Token);
    }

    /**********************
--- a/contracts/src/L1/gateways/L1ETHGateway.sol
+++ b/contracts/src/L1/gateways/L1ETHGateway.sol
@@ -2,6 +2,8 @@

 pragma solidity =0.8.16;

+import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
+
 import {IL2ETHGateway} from "../../L2/gateways/IL2ETHGateway.sol";
 import {IL1ScrollMessenger} from "../IL1ScrollMessenger.sol";
 import {IL1ETHGateway} from "./IL1ETHGateway.sol";
@@ -16,7 +18,7 @@ import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 /// finalize withdraw ETH from layer 2.
 /// @dev The deposited ETH tokens are held in this gateway. On finalizing withdraw, the corresponding
 /// ETH will be transfer to the recipient directly.
-contract L1ETHGateway is ScrollGatewayBase, IL1ETHGateway, IMessageDropCallback {
+contract L1ETHGateway is Initializable, ScrollGatewayBase, IL1ETHGateway, IMessageDropCallback {
    /***************
     * Constructor *
     ***************/
--- a/contracts/src/L1/gateways/L1GatewayRouter.sol
+++ b/contracts/src/L1/gateways/L1GatewayRouter.sol
@@ -6,6 +6,8 @@ import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Own
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";

+import {IScrollGateway} from "../../libraries/gateway/IScrollGateway.sol";
+import {IL1ScrollMessenger} from "../IL1ScrollMessenger.sol";
 import {IL1ETHGateway} from "./IL1ETHGateway.sol";
 import {IL1ERC20Gateway} from "./IL1ERC20Gateway.sol";
 import {IL1GatewayRouter} from "./IL1GatewayRouter.sol";
@@ -66,13 +68,13 @@ contract L1GatewayRouter is OwnableUpgradeable, IL1GatewayRouter {
        // it can be zero during initialization
        if (_defaultERC20Gateway != address(0)) {
            defaultERC20Gateway = _defaultERC20Gateway;
-            emit SetDefaultERC20Gateway(address(0), _defaultERC20Gateway);
+            emit SetDefaultERC20Gateway(_defaultERC20Gateway);
        }

        // it can be zero during initialization
        if (_ethGateway != address(0)) {
            ethGateway = _ethGateway;
-            emit SetETHGateway(address(0), _ethGateway);
+            emit SetETHGateway(_ethGateway);
        }
    }

@@ -223,19 +225,17 @@ contract L1GatewayRouter is OwnableUpgradeable, IL1GatewayRouter {
     ************************/

    /// @inheritdoc IL1GatewayRouter
-    function setETHGateway(address _newEthGateway) external onlyOwner {
-        address _oldETHGateway = ethGateway;
-        ethGateway = _newEthGateway;
+    function setETHGateway(address _ethGateway) external onlyOwner {
+        ethGateway = _ethGateway;

-        emit SetETHGateway(_oldETHGateway, _newEthGateway);
+        emit SetETHGateway(_ethGateway);
    }

    /// @inheritdoc IL1GatewayRouter
-    function setDefaultERC20Gateway(address _newDefaultERC20Gateway) external onlyOwner {
-        address _oldDefaultERC20Gateway = defaultERC20Gateway;
-        defaultERC20Gateway = _newDefaultERC20Gateway;
+    function setDefaultERC20Gateway(address _defaultERC20Gateway) external onlyOwner {
+        defaultERC20Gateway = _defaultERC20Gateway;

-        emit SetDefaultERC20Gateway(_oldDefaultERC20Gateway, _newDefaultERC20Gateway);
+        emit SetDefaultERC20Gateway(_defaultERC20Gateway);
    }

    /// @inheritdoc IL1GatewayRouter
@@ -243,10 +243,9 @@ contract L1GatewayRouter is OwnableUpgradeable, IL1GatewayRouter {
        require(_tokens.length == _gateways.length, "length mismatch");

        for (uint256 i = 0; i < _tokens.length; i++) {
-            address _oldGateway = ERC20Gateway[_tokens[i]];
            ERC20Gateway[_tokens[i]] = _gateways[i];

-            emit SetERC20Gateway(_tokens[i], _oldGateway, _gateways[i]);
+            emit SetERC20Gateway(_tokens[i], _gateways[i]);
        }
    }
 }
--- a/contracts/src/L1/gateways/L1StandardERC20Gateway.sol
+++ b/contracts/src/L1/gateways/L1StandardERC20Gateway.sol
@@ -2,9 +2,12 @@

 pragma solidity =0.8.16;

-import {ClonesUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/ClonesUpgradeable.sol";
-import {IERC20MetadataUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
+import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";

+import {IERC20Metadata} from "../../interfaces/IERC20Metadata.sol";
 import {IL2ERC20Gateway} from "../../L2/gateways/IL2ERC20Gateway.sol";
 import {IL1ScrollMessenger} from "../IL1ScrollMessenger.sol";
 import {IL1ERC20Gateway} from "./IL1ERC20Gateway.sol";
@@ -18,7 +21,9 @@ import {L1ERC20Gateway} from "./L1ERC20Gateway.sol";
 /// @dev The deposited ERC20 tokens are held in this gateway. On finalizing withdraw, the corresponding
 /// token will be transfer to the recipient directly. Any ERC20 that requires non-standard functionality
 /// should use a separate gateway.
-contract L1StandardERC20Gateway is L1ERC20Gateway {
+contract L1StandardERC20Gateway is Initializable, ScrollGatewayBase, L1ERC20Gateway {
+    using SafeERC20 for IERC20;
+
    /*************
     * Variables *
     *************/
@@ -76,7 +81,7 @@ contract L1StandardERC20Gateway is L1ERC20Gateway {
        // we can calculate the l2 address directly.
        bytes32 _salt = keccak256(abi.encodePacked(counterpart, keccak256(abi.encodePacked(_l1Token))));

-        return ClonesUpgradeable.predictDeterministicAddress(l2TokenImplementation, _salt, l2TokenFactory);
+        return Clones.predictDeterministicAddress(l2TokenImplementation, _salt, l2TokenFactory);
    }

    /**********************
@@ -138,9 +143,9 @@ contract L1StandardERC20Gateway is L1ERC20Gateway {
            _l2Token = getL2ERC20Address(_token);

            // passing symbol/name/decimal in order to deploy in L2.
-            string memory _symbol = IERC20MetadataUpgradeable(_token).symbol();
-            string memory _name = IERC20MetadataUpgradeable(_token).name();
-            uint8 _decimals = IERC20MetadataUpgradeable(_token).decimals();
+            string memory _symbol = IERC20Metadata(_token).symbol();
+            string memory _name = IERC20Metadata(_token).name();
+            uint8 _decimals = IERC20Metadata(_token).decimals();
            _l2Data = abi.encode(true, abi.encode(_data, abi.encode(_symbol, _name, _decimals)));
        } else {
            _l2Data = abi.encode(false, _data);
--- a/contracts/src/L1/gateways/L1WETHGateway.sol
+++ b/contracts/src/L1/gateways/L1WETHGateway.sol
@@ -2,6 +2,10 @@

 pragma solidity =0.8.16;

+import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+
 import {IWETH} from "../../interfaces/IWETH.sol";
 import {IL2ERC20Gateway} from "../../L2/gateways/IL2ERC20Gateway.sol";
 import {IL1ScrollMessenger} from "../IL1ScrollMessenger.sol";
@@ -17,7 +21,9 @@ import {L1ERC20Gateway} from "./L1ERC20Gateway.sol";
 /// as Ether and then the Ether will be sent to the `L1ScrollMessenger` contract.
 /// On finalizing withdraw, the Ether will be transfered from `L1ScrollMessenger`, then
 /// wrapped as WETH and finally transfer to recipient.
-contract L1WETHGateway is L1ERC20Gateway {
+contract L1WETHGateway is Initializable, ScrollGatewayBase, L1ERC20Gateway {
+    using SafeERC20 for IERC20;
+
    /*************
     * Constants *
     *************/
--- a/contracts/src/L1/rollup/L1MessageQueue.sol
+++ b/contracts/src/L1/rollup/L1MessageQueue.sol
@@ -24,12 +24,12 @@ contract L1MessageQueue is OwnableUpgradeable, IL1MessageQueue {
    /// @notice Emitted when owner updates gas oracle contract.
    /// @param _oldGasOracle The address of old gas oracle contract.
    /// @param _newGasOracle The address of new gas oracle contract.
-    event UpdateGasOracle(address indexed _oldGasOracle, address indexed _newGasOracle);
+    event UpdateGasOracle(address _oldGasOracle, address _newGasOracle);

    /// @notice Emitted when owner updates EnforcedTxGateway contract.
    /// @param _oldGateway The address of old EnforcedTxGateway contract.
    /// @param _newGateway The address of new EnforcedTxGateway contract.
-    event UpdateEnforcedTxGateway(address indexed _oldGateway, address indexed _newGateway);
+    event UpdateEnforcedTxGateway(address _oldGateway, address _newGateway);

    /// @notice Emitted when owner updates max gas limit.
    /// @param _oldMaxGasLimit The old max gas limit.
--- a/contracts/src/L1/rollup/L2GasPriceOracle.sol
+++ b/contracts/src/L1/rollup/L2GasPriceOracle.sol
@@ -19,9 +19,8 @@ contract L2GasPriceOracle is OwnableUpgradeable, IL2GasPriceOracle {
    event UpdateWhitelist(address _oldWhitelist, address _newWhitelist);

    /// @notice Emitted when current l2 base fee is updated.
-    /// @param oldL2BaseFee The original l2 base fee before update.
-    /// @param newL2BaseFee The current l2 base fee updated.
-    event L2BaseFeeUpdated(uint256 oldL2BaseFee, uint256 newL2BaseFee);
+    /// @param l2BaseFee The current l2 base fee updated.
+    event L2BaseFeeUpdated(uint256 l2BaseFee);

    /// @notice Emitted when intrinsic params are updated.
    /// @param txGas The intrinsic gas for transaction.
@@ -131,14 +130,13 @@ contract L2GasPriceOracle is OwnableUpgradeable, IL2GasPriceOracle {
    }

    /// @notice Allows the owner to modify the l2 base fee.
-    /// @param _newL2BaseFee The new l2 base fee.
-    function setL2BaseFee(uint256 _newL2BaseFee) external {
+    /// @param _l2BaseFee The new l2 base fee.
+    function setL2BaseFee(uint256 _l2BaseFee) external {
        require(whitelist.isSenderAllowed(msg.sender), "Not whitelisted sender");

-        uint256 _oldL2BaseFee = l2BaseFee;
-        l2BaseFee = _newL2BaseFee;
+        l2BaseFee = _l2BaseFee;

-        emit L2BaseFeeUpdated(_oldL2BaseFee, _newL2BaseFee);
+        emit L2BaseFeeUpdated(_l2BaseFee);
    }

    /************************
--- a/contracts/src/L1/rollup/ScrollChain.sol
+++ b/contracts/src/L1/rollup/ScrollChain.sol
@@ -3,7 +3,6 @@
 pragma solidity =0.8.16;

 import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
-import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";

 import {IL1MessageQueue} from "./IL1MessageQueue.sol";
 import {IScrollChain} from "./IScrollChain.sol";
@@ -16,7 +15,7 @@ import {IRollupVerifier} from "../../libraries/verifier/IRollupVerifier.sol";

 /// @title ScrollChain
 /// @notice This contract maintains data for the Scroll rollup.
-contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
+contract ScrollChain is OwnableUpgradeable, IScrollChain {
    /**********
     * Events *
     **********/
@@ -34,7 +33,7 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
    /// @notice Emitted when the address of rollup verifier is updated.
    /// @param oldVerifier The address of old rollup verifier.
    /// @param newVerifier The address of new rollup verifier.
-    event UpdateVerifier(address indexed oldVerifier, address indexed newVerifier);
+    event UpdateVerifier(address oldVerifier, address newVerifier);

    /// @notice Emitted when the value of `maxNumL2TxInChunk` is updated.
    /// @param oldMaxNumL2TxInChunk The old value of `maxNumL2TxInChunk`.
@@ -166,7 +165,7 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
        bytes calldata _parentBatchHeader,
        bytes[] memory _chunks,
        bytes calldata _skippedL1MessageBitmap
-    ) external override OnlySequencer whenNotPaused {
+    ) external override OnlySequencer {
        require(_version == 0, "invalid version");

        // check whether the batch is empty
@@ -292,7 +291,7 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
        bytes32 _postStateRoot,
        bytes32 _withdrawRoot,
        bytes calldata _aggrProof
-    ) external override OnlyProver whenNotPaused {
+    ) external override OnlyProver {
        require(_prevStateRoot != bytes32(0), "previous state root is zero");
        require(_postStateRoot != bytes32(0), "new state root is zero");

@@ -356,36 +355,24 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
     * Restricted Functions *
     ************************/

-    /// @notice Add an account to the sequencer list.
-    /// @param _account The address of account to add.
-    function addSequencer(address _account) external onlyOwner {
-        isSequencer[_account] = true;
+    /// @notice Update the status of sequencer.
+    /// @dev This function can only called by contract owner.
+    /// @param _account The address of account to update.
+    /// @param _status The status of the account to update.
+    function updateSequencer(address _account, bool _status) external onlyOwner {
+        isSequencer[_account] = _status;

-        emit UpdateSequencer(_account, true);
+        emit UpdateSequencer(_account, _status);
    }

-    /// @notice Remove an account from the sequencer list.
-    /// @param _account The address of account to remove.
-    function removeSequencer(address _account) external onlyOwner {
-        isSequencer[_account] = false;
+    /// @notice Update the status of prover.
+    /// @dev This function can only called by contract owner.
+    /// @param _account The address of account to update.
+    /// @param _status The status of the account to update.
+    function updateProver(address _account, bool _status) external onlyOwner {
+        isProver[_account] = _status;

-        emit UpdateSequencer(_account, false);
-    }
-
-    /// @notice Add an account to the prover list.
-    /// @param _account The address of account to add.
-    function addProver(address _account) external onlyOwner {
-        isProver[_account] = true;
-
-        emit UpdateProver(_account, true);
-    }
-
-    /// @notice Add an account from the prover list.
-    /// @param _account The address of account to remove.
-    function removeProver(address _account) external onlyOwner {
-        isProver[_account] = false;
-
-        emit UpdateProver(_account, false);
+        emit UpdateProver(_account, _status);
    }

    /// @notice Update the address verifier contract.
@@ -406,16 +393,6 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
        emit UpdateMaxNumL2TxInChunk(_oldMaxNumL2TxInChunk, _maxNumL2TxInChunk);
    }

-    /// @notice Pause the contract
-    /// @param _status The pause status to update.
-    function setPause(bool _status) external onlyOwner {
-        if (_status) {
-            _pause();
-        } else {
-            _unpause();
-        }
-    }
-
    /**********************
     * Internal Functions *
     **********************/
@@ -492,7 +469,6 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {

            // concatenate l2 transaction hashes
            uint256 _numTransactionsInBlock = ChunkCodec.numTransactions(blockPtr);
-            require(_numTransactionsInBlock >= _numL1MessagesInBlock, "num txs less than num L1 msgs");
            for (uint256 j = _numL1MessagesInBlock; j < _numTransactionsInBlock; j++) {
                bytes32 txHash;
                (txHash, l2TxPtr) = ChunkCodec.loadL2TxHash(l2TxPtr);
@@ -571,10 +547,6 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
                _totalL1MessagesPoppedInBatch += 1;
                _totalL1MessagesPoppedOverall += 1;
            }
-
-            // check last L1 message is not skipped, _totalL1MessagesPoppedInBatch must > 0
-            uint256 rem = (_totalL1MessagesPoppedInBatch - 1) & 0xff;
-            require(((_bitmap >> rem) & 1) == 0, "cannot skip last L1 message");
        }

        return _ptr;
--- a/contracts/src/L2/IL2ScrollMessenger.sol
+++ b/contracts/src/L2/IL2ScrollMessenger.sol
@@ -5,15 +5,6 @@ pragma solidity ^0.8.16;
 import {IScrollMessenger} from "../libraries/IScrollMessenger.sol";

 interface IL2ScrollMessenger is IScrollMessenger {
-    /**********
-     * Events *
-     **********/
-
-    /// @notice Emitted when the maximum number of times each message can fail in L2 is updated.
-    /// @param oldMaxFailedExecutionTimes The old maximum number of times each message can fail in L2.
-    /// @param newMaxFailedExecutionTimes The new maximum number of times each message can fail in L2.
-    event UpdateMaxFailedExecutionTimes(uint256 oldMaxFailedExecutionTimes, uint256 newMaxFailedExecutionTimes);
-
    /*****************************
     * Public Mutating Functions *
     *****************************/
--- a/contracts/src/L2/L2ScrollMessenger.sol
+++ b/contracts/src/L2/L2ScrollMessenger.sol
@@ -2,8 +2,12 @@

 pragma solidity =0.8.16;

+import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
+
 import {IL2ScrollMessenger} from "./IL2ScrollMessenger.sol";
 import {L2MessageQueue} from "./predeploys/L2MessageQueue.sol";
+import {IL1BlockContainer} from "./predeploys/IL1BlockContainer.sol";
+import {IL1GasPriceOracle} from "./predeploys/IL1GasPriceOracle.sol";

 import {PatriciaMerkleTrieVerifier} from "../libraries/verifier/PatriciaMerkleTrieVerifier.sol";
 import {ScrollConstants} from "../libraries/constants/ScrollConstants.sol";
@@ -22,7 +26,15 @@ import {ScrollMessengerBase} from "../libraries/ScrollMessengerBase.sol";
 ///
 /// @dev It should be a predeployed contract on layer 2 and should hold infinite amount
 /// of Ether (Specifically, `uint256(-1)`), which can be initialized in Genesis Block.
-contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
+contract L2ScrollMessenger is ScrollMessengerBase, PausableUpgradeable, IL2ScrollMessenger {
+    /**********
+     * Events *
+     **********/
+
+    /// @notice Emitted when the maximum number of times each message can fail in L2 is updated.
+    /// @param maxFailedExecutionTimes The new maximum number of times each message can fail in L2.
+    event UpdateMaxFailedExecutionTimes(uint256 maxFailedExecutionTimes);
+
    /*************
     * Constants *
     *************/
@@ -56,8 +68,9 @@ contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
        messageQueue = _messageQueue;
    }

-    function initialize(address _counterpart) external initializer {
-        ScrollMessengerBase.__ScrollMessengerBase_init(_counterpart, address(0));
+    function initialize(address _counterpart, address _feeVault) external initializer {
+        PausableUpgradeable.__Pausable_init();
+        ScrollMessengerBase._initialize(_counterpart, _feeVault);

        maxFailedExecutionTimes = 3;
    }
@@ -109,16 +122,26 @@ contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
     * Restricted Functions *
     ************************/

+    /// @notice Pause the contract
+    /// @dev This function can only called by contract owner.
+    /// @param _status The pause status to update.
+    function setPause(bool _status) external onlyOwner {
+        if (_status) {
+            _pause();
+        } else {
+            _unpause();
+        }
+    }
+
    /// @notice Update max failed execution times.
    /// @dev This function can only called by contract owner.
-    /// @param _newMaxFailedExecutionTimes The new max failed execution times.
-    function updateMaxFailedExecutionTimes(uint256 _newMaxFailedExecutionTimes) external onlyOwner {
-        require(_newMaxFailedExecutionTimes > 0, "maxFailedExecutionTimes cannot be zero");
+    /// @param _maxFailedExecutionTimes The new max failed execution times.
+    function updateMaxFailedExecutionTimes(uint256 _maxFailedExecutionTimes) external onlyOwner {
+        require(_maxFailedExecutionTimes > 0, "maxFailedExecutionTimes cannot be zero");

-        uint256 _oldMaxFailedExecutionTimes = maxFailedExecutionTimes;
-        maxFailedExecutionTimes = _newMaxFailedExecutionTimes;
+        maxFailedExecutionTimes = _maxFailedExecutionTimes;

-        emit UpdateMaxFailedExecutionTimes(_oldMaxFailedExecutionTimes, _newMaxFailedExecutionTimes);
+        emit UpdateMaxFailedExecutionTimes(_maxFailedExecutionTimes);
    }

    /**********************
--- a/contracts/src/L2/gateways/IL2GatewayRouter.sol
+++ b/contracts/src/L2/gateways/IL2GatewayRouter.sol
@@ -11,18 +11,15 @@ interface IL2GatewayRouter is IL2ETHGateway, IL2ERC20Gateway {
     **********/

    /// @notice Emitted when the address of ETH Gateway is updated.
-    /// @param oldETHGateway The address of the old ETH Gateway.
-    /// @param newEthGateway The address of the new ETH Gateway.
-    event SetETHGateway(address indexed oldETHGateway, address indexed newEthGateway);
+    /// @param ethGateway The address of new ETH Gateway.
+    event SetETHGateway(address indexed ethGateway);

    /// @notice Emitted when the address of default ERC20 Gateway is updated.
-    /// @param oldDefaultERC20Gateway The address of the old default ERC20 Gateway.
-    /// @param newDefaultERC20Gateway The address of the new default ERC20 Gateway.
-    event SetDefaultERC20Gateway(address indexed oldDefaultERC20Gateway, address indexed newDefaultERC20Gateway);
+    /// @param defaultERC20Gateway The address of new default ERC20 Gateway.
+    event SetDefaultERC20Gateway(address indexed defaultERC20Gateway);

    /// @notice Emitted when the `gateway` for `token` is updated.
    /// @param token The address of token updated.
-    /// @param oldGateway The corresponding address of the old gateway.
-    /// @param newGateway The corresponding address of the new gateway.
-    event SetERC20Gateway(address indexed token, address indexed oldGateway, address indexed newGateway);
+    /// @param gateway The corresponding address of gateway updated.
+    event SetERC20Gateway(address indexed token, address indexed gateway);
 }
--- a/contracts/src/L2/gateways/L2CustomERC20Gateway.sol
+++ b/contracts/src/L2/gateways/L2CustomERC20Gateway.sol
@@ -2,27 +2,29 @@

 pragma solidity =0.8.16;

+import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
+
 import {IL2ERC20Gateway, L2ERC20Gateway} from "./L2ERC20Gateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IL1ERC20Gateway} from "../../L1/gateways/IL1ERC20Gateway.sol";
-import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
-import {IScrollERC20Upgradeable} from "../../libraries/token/IScrollERC20Upgradeable.sol";
+import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {IScrollERC20} from "../../libraries/token/IScrollERC20.sol";

 /// @title L2ERC20Gateway
 /// @notice The `L2ERC20Gateway` is used to withdraw custom ERC20 compatible tokens on layer 2 and
 /// finalize deposit the tokens from layer 1.
 /// @dev The withdrawn tokens tokens will be burned directly. On finalizing deposit, the corresponding
 /// tokens will be minted and transfered to the recipient.
-contract L2CustomERC20Gateway is L2ERC20Gateway {
+contract L2CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L2ERC20Gateway {
    /**********
     * Events *
     **********/

    /// @notice Emitted when token mapping for ERC20 token is updated.
-    /// @param l2Token The address of corresponding ERC20 token in layer 2.
-    /// @param oldL1Token The address of the old corresponding ERC20 token in layer 1.
-    /// @param newL1Token The address of the new corresponding ERC20 token in layer 1.
-    event UpdateTokenMapping(address indexed l2Token, address indexed oldL1Token, address indexed newL1Token);
+    /// @param _l2Token The address of corresponding ERC20 token on layer 2.
+    /// @param _l1Token The address of ERC20 token on layer 1.
+    event UpdateTokenMapping(address _l2Token, address _l1Token);

    /*************
     * Variables *
@@ -45,6 +47,7 @@ contract L2CustomERC20Gateway is L2ERC20Gateway {
        address _messenger
    ) external initializer {
        require(_router != address(0), "zero router address");
+        OwnableUpgradeable.__Ownable_init();

        ScrollGatewayBase._initialize(_counterpart, _router, _messenger);
    }
@@ -80,7 +83,7 @@ contract L2CustomERC20Gateway is L2ERC20Gateway {
        require(_l1Token != address(0), "token address cannot be 0");
        require(_l1Token == tokenMapping[_l2Token], "l1 token mismatch");

-        IScrollERC20Upgradeable(_l2Token).mint(_to, _amount);
+        IScrollERC20(_l2Token).mint(_to, _amount);

        _doCallback(_to, _data);

@@ -97,10 +100,9 @@ contract L2CustomERC20Gateway is L2ERC20Gateway {
    function updateTokenMapping(address _l2Token, address _l1Token) external onlyOwner {
        require(_l1Token != address(0), "token address cannot be 0");

-        address _oldL1Token = tokenMapping[_l2Token];
        tokenMapping[_l2Token] = _l1Token;

-        emit UpdateTokenMapping(_l2Token, _oldL1Token, _l1Token);
+        emit UpdateTokenMapping(_l2Token, _l1Token);
    }

    /**********************
@@ -127,7 +129,7 @@ contract L2CustomERC20Gateway is L2ERC20Gateway {
        }

        // 2. Burn token.
-        IScrollERC20Upgradeable(_token).burn(_from, _amount);
+        IScrollERC20(_token).burn(_from, _amount);

        // 3. Generate message passed to L1StandardERC20Gateway.
        bytes memory _message = abi.encodeCall(
--- a/contracts/src/L2/gateways/L2ERC1155Gateway.sol
+++ b/contracts/src/L2/gateways/L2ERC1155Gateway.sol
@@ -2,12 +2,14 @@

 pragma solidity =0.8.16;

+import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import {IERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/IERC1155Upgradeable.sol";
 import {ERC1155HolderUpgradeable, ERC1155ReceiverUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/utils/ERC1155HolderUpgradeable.sol";

 import {IL2ERC1155Gateway} from "./IL2ERC1155Gateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IL1ERC1155Gateway} from "../../L1/gateways/IL1ERC1155Gateway.sol";
-import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
 import {IScrollERC1155} from "../../libraries/token/IScrollERC1155.sol";

 /// @title L2ERC1155Gateway
@@ -17,16 +19,15 @@ import {IScrollERC1155} from "../../libraries/token/IScrollERC1155.sol";
 /// NFT will be minted and transfered to the recipient.
 ///
 /// This will be changed if we have more specific scenarios.
-contract L2ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL2ERC1155Gateway {
+contract L2ERC1155Gateway is OwnableUpgradeable, ERC1155HolderUpgradeable, ScrollGatewayBase, IL2ERC1155Gateway {
    /**********
     * Events *
     **********/

    /// @notice Emitted when token mapping for ERC1155 token is updated.
-    /// @param l2Token The address of corresponding ERC1155 token in layer 2.
-    /// @param oldL1Token The address of the old corresponding ERC1155 token in layer 1.
-    /// @param newL1Token The address of the new corresponding ERC1155 token in layer 1.
-    event UpdateTokenMapping(address indexed l2Token, address indexed oldL1Token, address indexed newL1Token);
+    /// @param _l2Token The address of corresponding ERC1155 token on layer 2.
+    /// @param _l1Token The address of ERC1155 token on layer 1.
+    event UpdateTokenMapping(address _l2Token, address _l1Token);

    /*************
     * Variables *
@@ -44,6 +45,7 @@ contract L2ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL2ERC
    }

    function initialize(address _counterpart, address _messenger) external initializer {
+        OwnableUpgradeable.__Ownable_init();
        ERC1155HolderUpgradeable.__ERC1155Holder_init();
        ERC1155ReceiverUpgradeable.__ERC1155Receiver_init();

@@ -140,10 +142,9 @@ contract L2ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL2ERC
    function updateTokenMapping(address _l2Token, address _l1Token) external onlyOwner {
        require(_l1Token != address(0), "token address cannot be 0");

-        address _oldL1Token = tokenMapping[_l2Token];
        tokenMapping[_l2Token] = _l1Token;

-        emit UpdateTokenMapping(_l2Token, _oldL1Token, _l1Token);
+        emit UpdateTokenMapping(_l2Token, _l1Token);
    }

    /**********************
--- a/contracts/src/L2/gateways/L2ERC20Gateway.sol
+++ b/contracts/src/L2/gateways/L2ERC20Gateway.sol
@@ -4,11 +4,9 @@ pragma solidity ^0.8.16;

 import {IL2ERC20Gateway} from "./IL2ERC20Gateway.sol";

-import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
-
 // solhint-disable no-empty-blocks

-abstract contract L2ERC20Gateway is ScrollGatewayBase, IL2ERC20Gateway {
+abstract contract L2ERC20Gateway is IL2ERC20Gateway {
    /*************
     * Variables *
     *************/
--- a/contracts/src/L2/gateways/L2ERC721Gateway.sol
+++ b/contracts/src/L2/gateways/L2ERC721Gateway.sol
@@ -2,12 +2,14 @@

 pragma solidity =0.8.16;

+import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import {IERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721Upgradeable.sol";
 import {ERC721HolderUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/utils/ERC721HolderUpgradeable.sol";

 import {IL2ERC721Gateway} from "./IL2ERC721Gateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IL1ERC721Gateway} from "../../L1/gateways/IL1ERC721Gateway.sol";
-import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
 import {IScrollERC721} from "../../libraries/token/IScrollERC721.sol";

 /// @title L2ERC721Gateway
@@ -17,16 +19,15 @@ import {IScrollERC721} from "../../libraries/token/IScrollERC721.sol";
 /// NFT will be minted and transfered to the recipient.
 ///
 /// This will be changed if we have more specific scenarios.
-contract L2ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL2ERC721Gateway {
+contract L2ERC721Gateway is OwnableUpgradeable, ERC721HolderUpgradeable, ScrollGatewayBase, IL2ERC721Gateway {
    /**********
     * Events *
     **********/

    /// @notice Emitted when token mapping for ERC721 token is updated.
-    /// @param l2Token The address of corresponding ERC721 token in layer 2.
-    /// @param oldL1Token The address of the old corresponding ERC721 token in layer 1.
-    /// @param newL1Token The address of the new corresponding ERC721 token in layer 1.
-    event UpdateTokenMapping(address indexed l2Token, address indexed oldL1Token, address indexed newL1Token);
+    /// @param _l2Token The address of corresponding ERC721 token on layer 2.
+    /// @param _l1Token The address of ERC721 token on layer 1.
+    event UpdateTokenMapping(address _l2Token, address _l1Token);

    /*************
     * Variables *
@@ -44,6 +45,7 @@ contract L2ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL2ERC72
    }

    function initialize(address _counterpart, address _messenger) external initializer {
+        OwnableUpgradeable.__Ownable_init();
        ERC721HolderUpgradeable.__ERC721Holder_init();

        ScrollGatewayBase._initialize(_counterpart, address(0), _messenger);
@@ -135,10 +137,9 @@ contract L2ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL2ERC72
    function updateTokenMapping(address _l2Token, address _l1Token) external onlyOwner {
        require(_l1Token != address(0), "token address cannot be 0");

-        address _oldL1Token = tokenMapping[_l2Token];
        tokenMapping[_l2Token] = _l1Token;

-        emit UpdateTokenMapping(_l2Token, _oldL1Token, _l1Token);
+        emit UpdateTokenMapping(_l2Token, _l1Token);
    }

    /**********************
--- a/contracts/src/L2/gateways/L2ETHGateway.sol
+++ b/contracts/src/L2/gateways/L2ETHGateway.sol
@@ -2,6 +2,8 @@

 pragma solidity =0.8.16;

+import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
+
 import {IL1ETHGateway} from "../../L1/gateways/IL1ETHGateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IL2ETHGateway} from "./IL2ETHGateway.sol";
@@ -13,7 +15,7 @@ import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 /// finalize deposit ETH from layer 1.
 /// @dev The ETH are not held in the gateway. The ETH will be sent to the `L2ScrollMessenger` contract.
 /// On finalizing deposit, the Ether will be transfered from `L2ScrollMessenger`, then transfer to recipient.
-contract L2ETHGateway is ScrollGatewayBase, IL2ETHGateway {
+contract L2ETHGateway is Initializable, ScrollGatewayBase, IL2ETHGateway {
    /***************
     * Constructor *
     ***************/
--- a/contracts/src/L2/gateways/L2GatewayRouter.sol
+++ b/contracts/src/L2/gateways/L2GatewayRouter.sol
@@ -7,6 +7,9 @@ import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Own
 import {IL2GatewayRouter} from "./IL2GatewayRouter.sol";
 import {IL2ETHGateway} from "./IL2ETHGateway.sol";
 import {IL2ERC20Gateway} from "./IL2ERC20Gateway.sol";
+import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
+import {IL1ETHGateway} from "../../L1/gateways/IL1ETHGateway.sol";
+import {IScrollGateway} from "../../libraries/gateway/IScrollGateway.sol";

 /// @title L2GatewayRouter
 /// @notice The `L2GatewayRouter` is the main entry for withdrawing Ether and ERC20 tokens.
@@ -42,13 +45,13 @@ contract L2GatewayRouter is OwnableUpgradeable, IL2GatewayRouter {
        // it can be zero during initialization
        if (_defaultERC20Gateway != address(0)) {
            defaultERC20Gateway = _defaultERC20Gateway;
-            emit SetDefaultERC20Gateway(address(0), _defaultERC20Gateway);
+            emit SetDefaultERC20Gateway(_defaultERC20Gateway);
        }

        // it can be zero during initialization
        if (_ethGateway != address(0)) {
            ethGateway = _ethGateway;
-            emit SetETHGateway(address(0), _ethGateway);
+            emit SetETHGateway(_ethGateway);
        }
    }

@@ -179,22 +182,20 @@ contract L2GatewayRouter is OwnableUpgradeable, IL2GatewayRouter {

    /// @notice Update the address of ETH gateway contract.
    /// @dev This function should only be called by contract owner.
-    /// @param _newEthGateway The address to update.
-    function setETHGateway(address _newEthGateway) external onlyOwner {
-        address _oldEthGateway = ethGateway;
-        ethGateway = _newEthGateway;
+    /// @param _ethGateway The address to update.
+    function setETHGateway(address _ethGateway) external onlyOwner {
+        ethGateway = _ethGateway;

-        emit SetETHGateway(_oldEthGateway, _newEthGateway);
+        emit SetETHGateway(_ethGateway);
    }

    /// @notice Update the address of default ERC20 gateway contract.
    /// @dev This function should only be called by contract owner.
-    /// @param _newDefaultERC20Gateway The address to update.
-    function setDefaultERC20Gateway(address _newDefaultERC20Gateway) external onlyOwner {
-        address _oldDefaultERC20Gateway = defaultERC20Gateway;
-        defaultERC20Gateway = _newDefaultERC20Gateway;
+    /// @param _defaultERC20Gateway The address to update.
+    function setDefaultERC20Gateway(address _defaultERC20Gateway) external onlyOwner {
+        defaultERC20Gateway = _defaultERC20Gateway;

-        emit SetDefaultERC20Gateway(_oldDefaultERC20Gateway, _newDefaultERC20Gateway);
+        emit SetDefaultERC20Gateway(_defaultERC20Gateway);
    }

    /// @notice Update the mapping from token address to gateway address.
@@ -205,10 +206,9 @@ contract L2GatewayRouter is OwnableUpgradeable, IL2GatewayRouter {
        require(_tokens.length == _gateways.length, "length mismatch");

        for (uint256 i = 0; i < _tokens.length; i++) {
-            address _oldGateway = ERC20Gateway[_tokens[i]];
            ERC20Gateway[_tokens[i]] = _gateways[i];

-            emit SetERC20Gateway(_tokens[i], _oldGateway, _gateways[i]);
+            emit SetERC20Gateway(_tokens[i], _gateways[i]);
        }
    }
 }
--- a/contracts/src/L2/gateways/L2StandardERC20Gateway.sol
+++ b/contracts/src/L2/gateways/L2StandardERC20Gateway.sol
@@ -2,15 +2,18 @@

 pragma solidity =0.8.16;

-import {AddressUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol";
+import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {Address} from "@openzeppelin/contracts/utils/Address.sol";

 import {IL2ERC20Gateway, L2ERC20Gateway} from "./L2ERC20Gateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IL1ERC20Gateway} from "../../L1/gateways/IL1ERC20Gateway.sol";
-import {IScrollERC20Upgradeable} from "../../libraries/token/IScrollERC20Upgradeable.sol";
+import {IScrollERC20} from "../../libraries/token/IScrollERC20.sol";
 import {ScrollStandardERC20} from "../../libraries/token/ScrollStandardERC20.sol";
 import {IScrollStandardERC20Factory} from "../../libraries/token/IScrollStandardERC20Factory.sol";
-import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";

 /// @title L2StandardERC20Gateway
 /// @notice The `L2StandardERC20Gateway` is used to withdraw standard ERC20 tokens on layer 2 and
@@ -18,8 +21,9 @@ import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 /// @dev The withdrawn ERC20 tokens will be burned directly. On finalizing deposit, the corresponding
 /// token will be minted and transfered to the recipient. Any ERC20 that requires non-standard functionality
 /// should use a separate gateway.
-contract L2StandardERC20Gateway is L2ERC20Gateway {
-    using AddressUpgradeable for address;
+contract L2StandardERC20Gateway is Initializable, ScrollGatewayBase, L2ERC20Gateway {
+    using SafeERC20 for IERC20;
+    using Address for address;

    /*************
     * Variables *
@@ -110,7 +114,7 @@ contract L2StandardERC20Gateway is L2ERC20Gateway {
            _deployL2Token(_deployData, _l1Token);
        }

-        IScrollERC20Upgradeable(_l2Token).mint(_to, _amount);
+        IScrollERC20(_l2Token).mint(_to, _amount);

        _doCallback(_to, _callData);

@@ -141,7 +145,7 @@ contract L2StandardERC20Gateway is L2ERC20Gateway {
        require(_l1Token != address(0), "no corresponding l1 token");

        // 2. Burn token.
-        IScrollERC20Upgradeable(_token).burn(_from, _amount);
+        IScrollERC20(_token).burn(_from, _amount);

        // 3. Generate message passed to L1StandardERC20Gateway.
        bytes memory _message = abi.encodeCall(
--- a/contracts/src/L2/gateways/L2WETHGateway.sol
+++ b/contracts/src/L2/gateways/L2WETHGateway.sol
@@ -2,14 +2,15 @@

 pragma solidity =0.8.16;

-import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
-import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
+import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";

 import {IL2ERC20Gateway, L2ERC20Gateway} from "./L2ERC20Gateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IWETH} from "../../interfaces/IWETH.sol";
 import {IL1ERC20Gateway} from "../../L1/gateways/IL1ERC20Gateway.sol";
-import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";

 /// @title L2WETHGateway
 /// @notice The `L2WETHGateway` contract is used to withdraw `WETH` token on layer 2 and
@@ -18,8 +19,8 @@ import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 /// then the Ether will be sent to the `L2ScrollMessenger` contract.
 /// On finalizing deposit, the Ether will be transfered from `L2ScrollMessenger`, then
 /// wrapped as WETH and finally transfer to recipient.
-contract L2WETHGateway is L2ERC20Gateway {
-    using SafeERC20Upgradeable for IERC20Upgradeable;
+contract L2WETHGateway is Initializable, ScrollGatewayBase, L2ERC20Gateway {
+    using SafeERC20 for IERC20;

    /*************
     * Constants *
@@ -88,7 +89,7 @@ contract L2WETHGateway is L2ERC20Gateway {
        require(_amount == msg.value, "msg.value mismatch");

        IWETH(_l2Token).deposit{value: _amount}();
-        IERC20Upgradeable(_l2Token).safeTransfer(_to, _amount);
+        IERC20(_l2Token).safeTransfer(_to, _amount);

        _doCallback(_to, _data);

@@ -117,7 +118,7 @@ contract L2WETHGateway is L2ERC20Gateway {
        }

        // 2. Transfer token into this contract.
-        IERC20Upgradeable(_token).safeTransferFrom(_from, address(this), _amount);
+        IERC20(_token).safeTransferFrom(_from, address(this), _amount);
        IWETH(_token).withdraw(_amount);

        // 3. Generate message passed to L2StandardERC20Gateway.
--- a/contracts/src/L2/gateways/usdc/L2USDCGateway.sol
+++ b/contracts/src/L2/gateways/usdc/L2USDCGateway.sol
@@ -2,6 +2,7 @@

 pragma solidity =0.8.16;

+import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";

@@ -16,7 +17,7 @@ import {L2ERC20Gateway} from "../L2ERC20Gateway.sol";
 /// @title L2USDCGateway
 /// @notice The `L2USDCGateway` contract is used to withdraw `USDC` token on layer 2 and
 /// finalize deposit `USDC` from layer 1.
-contract L2USDCGateway is L2ERC20Gateway {
+contract L2USDCGateway is OwnableUpgradeable, ScrollGatewayBase, L2ERC20Gateway {
    using SafeERC20Upgradeable for IERC20Upgradeable;

    /*************
@@ -55,6 +56,8 @@ contract L2USDCGateway is L2ERC20Gateway {
    ) external initializer {
        require(_router != address(0), "zero router address");
        ScrollGatewayBase._initialize(_counterpart, _router, _messenger);
+
+        OwnableUpgradeable.__Ownable_init();
    }

    /*************************
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
HAOYUatHZ	32ff705845	Merge branch 'develop' into pull-model-prover-client	2023-08-05 10:21:22 +08:00
colinlyguo	b42a17580b	go mod tidy and bump version	2023-08-05 03:41:04 +08:00
colinlyguo	47bf98eb30	address comments	2023-08-05 03:32:29 +08:00
colinlyguo	e3a49fc041	happy path integration test	2023-08-04 22:31:56 +08:00
colinlyguo	72355067b8	fix get task and proof	2023-08-04 20:56:52 +08:00
georgehao	fcf34edbfb	feat(coordinator): add prover rest api (#716 ) Co-authored-by: colinlyguo <colinlyguo@scroll.io>	2023-08-04 20:48:17 +08:00
georgehao	d11de12637	Merge branch 'develop' of github.com:scroll-tech/scroll into pull-model-prover-client	2023-08-04 17:01:31 +08:00
colin	3be3f9926a	Merge branch 'develop' into pull-model-prover-client	2023-08-04 15:22:39 +08:00
colin	ba51b5794d	Merge branch 'develop' into pull-model-prover-client	2023-08-04 14:37:08 +08:00
colinlyguo	f22efbff22	tweak integration-test	2023-08-03 20:02:26 +08:00
colin	8f92ca9010	Merge branch 'develop' into pull-model-prover-client	2023-08-03 19:33:16 +08:00
colinlyguo	2c69352948	fix	2023-08-03 19:17:22 +08:00
colinlyguo	0652852c16	address comments	2023-08-03 19:01:46 +08:00
colinlyguo	bbb4ca6d76	revert flag change	2023-08-03 17:56:26 +08:00
colinlyguo	1b542830af	add mock_proof_submission config	2023-08-03 17:38:25 +08:00
colinlyguo	975e61afe4	tweak	2023-08-03 17:12:45 +08:00
colinlyguo	7bf538f287	refactor error code	2023-08-03 17:08:26 +08:00
colinlyguo	58fc8a3add	remove signature	2023-08-03 16:30:27 +08:00
colinlyguo	bf9dabd9b7	tweak login request	2023-08-03 15:54:50 +08:00
colinlyguo	beea5754cb	add retry mechanism for JWT expiration	2023-08-03 15:46:14 +08:00
colin	d0c82f78ad	Merge branch 'develop' into pull-model-prover-client	2023-08-03 15:03:02 +08:00
colinlyguo	3913a7397c	run goimport	2023-08-03 15:01:51 +08:00
colinlyguo	c63e25a9bf	add login auth	2023-08-03 14:57:24 +08:00
colinlyguo	8960849677	address comments	2023-08-03 13:39:31 +08:00
colinlyguo	24d8658ddb	address comments	2023-08-03 13:11:12 +08:00
colinlyguo	f88f883b6a	simplify http body result marshal	2023-08-03 11:46:57 +08:00
colinlyguo	c8fd76dd02	trigger ci	2023-08-02 16:48:04 +08:00
colin	b82bbedaca	Merge branch 'develop' into pull-model-prover-client	2023-08-02 16:36:14 +08:00
colinlyguo	1ea0dcd0ae	bump version	2023-08-02 16:35:42 +08:00
colinlyguo	e87bdbabe2	tweak code	2023-08-02 16:32:41 +08:00
colinlyguo	4db1565ba3	comment out prover start process test (coordinator not support login yet)	2023-08-02 03:13:36 +08:00
colinlyguo	2425374362	fix	2023-08-02 03:05:06 +08:00
colinlyguo	89b2e3133a	scrollfmt	2023-08-02 02:44:42 +08:00
colinlyguo	5b7a2bb40c	bump version	2023-08-02 02:36:18 +08:00
colinlyguo	0466e2d201	add retry configs	2023-08-02 02:32:05 +08:00
colinlyguo	f86cbb2bcb	fix	2023-08-02 02:14:30 +08:00
colin	712c2c5ad3	Merge branch 'develop' into pull-model-prover-client	2023-08-02 01:54:47 +08:00
colinlyguo	a8a5db9a18	fix	2023-08-01 22:27:45 +08:00
colinlyguo	61d8b48b73	a commit	2023-08-01 21:05:13 +08:00