try1

.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

.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

.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

.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

.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 }}

.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

Makefile

@@ -15,22 +15,18 @@ 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.18 && go mod tidy
+	cd $(PWD)/bridge/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.8 && 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.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
+	cd $(PWD)/common/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.8 && go mod tidy
+	cd $(PWD)/coordinator/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.8 && go mod tidy
+	cd $(PWD)/database/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.8 && go mod tidy
+	cd $(PWD)/prover/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.8 && go mod tidy
 	goimports -local $(PWD)/bridge/ -w .
 	goimports -local $(PWD)/bridge-history-api/ -w .
 	goimports -local $(PWD)/common/ -w .
 	goimports -local $(PWD)/coordinator/ -w .
 	goimports -local $(PWD)/database/ -w .
 	goimports -local $(PWD)/prover/ -w .
-	goimports -local $(PWD)/prover-stats-api/ -w .
-	goimports -local $(PWD)/tests/integration-test/ -w .
 
 dev_docker: ## build docker images for development/testing usages
 	docker build -t scroll_l1geth ./common/docker/l1geth/

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

@@ -57,7 +57,6 @@ func (m *MsgProofUpdater) Start() {
 					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

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

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

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

@@ -8,9 +8,7 @@ import (
 
 var (
 	// HistoryCtrler is controller instance
-	HistoryCtrler *HistoryController
-	// BatchCtrler is controller instance
-	BatchCtrler        *BatchController
+	HistoryCtrler      *HistoryController
 	initControllerOnce sync.Once
 )
 
@@ -18,6 +16,5 @@ var (
 func InitController(db *gorm.DB) {
 	initControllerOnce.Do(func() {
 		HistoryCtrler = NewHistoryController(db)
-		BatchCtrler = NewBatchController(db)
 	})
 }

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

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

bridge-history-api/internal/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,
 	}))
@@ -24,5 +23,4 @@ func Route(router *gin.Engine, conf *config.Config) {
 	r.GET("/txs", controller.HistoryCtrler.GetAllTxsByAddr)
 	r.POST("/txsbyhashes", controller.HistoryCtrler.PostQueryTxsByHash)
 	r.GET("/claimable", controller.HistoryCtrler.GetAllClaimableTxsByAddr)
-	r.GET("/withdraw_root", controller.BatchCtrler.GetWithdrawRootByBatchIndex)
 }

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

@@ -18,8 +18,6 @@ const (
 	ErrGetTxsByHashFailure = 40003
 	// ErrGetTxsByAddrFailure is getting txs by address error
 	ErrGetTxsByAddrFailure = 40004
-	// ErrGetWithdrawRootByBatchIndexFailure is getting withdraw root by batch index error
-	ErrGetWithdrawRootByBatchIndexFailure = 40005
 )
 
 // QueryByAddressRequest the request parameter of address api
@@ -34,12 +32,6 @@ type QueryByHashRequest struct {
 	Txs []string `raw:"txs" binding:"required"`
 }
 
-// QueryByBatchIndexRequest the request parameter of batch index api
-type QueryByBatchIndexRequest struct {
-	// BatchIndex can not be 0, because we dont decode the genesis block
-	BatchIndex uint64 `form:"batch_index" binding:"required"`
-}
-
 // ResultData contains return txs and total
 type ResultData struct {
 	Result []*TxHistoryInfo `json:"result"`

bridge-history-api/orm/batch.go

@@ -19,7 +19,6 @@ type RollupBatch struct {
 	CommitHeight     uint64         `json:"commit_height" gorm:"column:commit_height"`
 	StartBlockNumber uint64         `json:"start_block_number" gorm:"column:start_block_number"`
 	EndBlockNumber   uint64         `json:"end_block_number" gorm:"column:end_block_number"`
-	WithdrawRoot     string         `json:"withdraw_root" gorm:"column:withdraw_root;default:NULL"`
 	CreatedAt        *time.Time     `json:"created_at" gorm:"column:created_at"`
 	UpdatedAt        *time.Time     `json:"updated_at" gorm:"column:updated_at"`
 	DeletedAt        gorm.DeletedAt `json:"deleted_at" gorm:"column:deleted_at;default:NULL"`

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

bridge-history-api/orm/l2_sent_msg.go

@@ -2,7 +2,6 @@ package orm
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"
 
@@ -103,14 +102,11 @@ 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)
 	}
 	// Watch for overflow, tho its not likely to happen
-	return int64(result.BatchIndex), nil
+	return int64(result.Height), nil
 }
 
 // GetL2SentMsgMsgHashByHeightRange get l2 sent msg msg hash by height range

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

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

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

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, 60*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")

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,
@@ -70,7 +79,6 @@
       "max_l1_commit_calldata_size_per_chunk": 112345,
       "min_l1_commit_calldata_size_per_chunk": 11234,
       "chunk_timeout_sec": 300,
-      "max_row_consumption_per_chunk": 1048319,
       "gas_cost_increase_multiplier": 1.2
     },
     "batch_proposer_config": {

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.20230804022247-26eeb40ea3ca
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230802095950-4b2bbf6225e7
 	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
 )
 
@@ -24,7 +26,7 @@ require (
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gopherjs/gopherjs v1.17.2 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
-	github.com/holiman/uint256 v1.2.3 // indirect
+	github.com/holiman/uint256 v1.2.2 // indirect
 	github.com/huin/goupnp v1.0.3 // indirect
 	github.com/iden3/go-iden3-crypto v0.0.15 // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
@@ -51,7 +53,6 @@ require (
 	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	golang.org/x/crypto v0.11.0 // indirect
-	golang.org/x/sync v0.3.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

bridge/go.sum

@@ -43,8 +43,8 @@ github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
 github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
-github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o=
-github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw=
+github.com/holiman/uint256 v1.2.2 h1:TXKcSGc2WaxPD2+bmzAsVthL4+pEN0YwXcL5qED83vk=
+github.com/holiman/uint256 v1.2.2/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ=
 github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y=
@@ -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.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/go-ethereum v1.10.14-0.20230802095950-4b2bbf6225e7 h1:lxZQB04KrkGi6FUcYUcG7CAkU/BHbHd/mFhPZqSYaW4=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230802095950-4b2bbf6225e7/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=

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)
 

bridge/internal/config/l2.go

@@ -34,7 +34,6 @@ type ChunkProposerConfig struct {
 	MaxL1CommitCalldataSizePerChunk uint64  `json:"max_l1_commit_calldata_size_per_chunk"`
 	MinL1CommitCalldataSizePerChunk uint64  `json:"min_l1_commit_calldata_size_per_chunk"`
 	ChunkTimeoutSec                 uint64  `json:"chunk_timeout_sec"`
-	MaxRowConsumptionPerChunk       uint64  `json:"max_row_consumption_per_chunk"`
 	GasCostIncreaseMultiplier       float64 `json:"gas_cost_increase_multiplier"`
 }
 

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

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

bridge/internal/controller/relayer/l2_relayer.go

@@ -10,8 +10,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 +52,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 +79,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 +126,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,
@@ -180,10 +171,9 @@ func (r *Layer2Relayer) initializeGenesis() error {
 
 	chunk := &types.Chunk{
 		Blocks: []*types.WrappedBlock{{
-			Header:         genesis,
-			Transactions:   nil,
-			WithdrawRoot:   common.Hash{},
-			RowConsumption: &gethTypes.RowConsumption{},
+			Header:       genesis,
+			Transactions: nil,
+			WithdrawRoot: common.Hash{},
 		}},
 	}
 
@@ -238,7 +228,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 +243,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)
 			}
@@ -276,8 +266,8 @@ func (r *Layer2Relayer) commitGenesisBatch(batchHash string, batchHeader []byte,
 // ProcessGasPriceOracle imports gas price to layer1
 func (r *Layer2Relayer) ProcessGasPriceOracle() {
 	batch, err := r.batchOrm.GetLatestBatch(r.ctx)
-	if batch == nil || err != nil {
-		log.Error("Failed to GetLatestBatch", "batch", batch, "err", err)
+	if err != nil {
+		log.Error("Failed to GetLatestBatch", "err", err)
 		return
 	}
 
@@ -382,16 +372,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 +422,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 +436,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 +472,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 +487,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 +553,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 {

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,
 		}

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

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

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,39 +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
+	}
+
+	defer s.auths.releaseAccount(auth)
+	defer func() {
+		if err != nil {
+			s.pendingTxs.Remove(ID) // release the ID on failure
+		}
+	}()
 
 	var (
 		feeData *FeeData
 		tx      *types.Transaction
-		err     error
 	)
-	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)
+	// 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
@@ -272,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) {
@@ -438,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)
@@ -480,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:

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

bridge/internal/controller/watcher/batch_proposer_test.go

@@ -28,7 +28,6 @@ func testBatchProposer(t *testing.T) {
 		MaxL1CommitGasPerChunk:          50000000000,
 		MaxL1CommitCalldataSizePerChunk: 1000000,
 		MinL1CommitCalldataSizePerChunk: 0,
-		MaxRowConsumptionPerChunk:       1048319,
 		ChunkTimeoutSec:                 300,
 	}, db)
 	cp.TryProposeChunk()

bridge/internal/controller/watcher/chunk_proposer.go

@@ -2,11 +2,9 @@ package watcher
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"time"
 
-	gethTypes "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/log"
 	"gorm.io/gorm"
 
@@ -16,31 +14,6 @@ import (
 	"scroll-tech/bridge/internal/orm"
 )
 
-// chunkRowConsumption is map(sub-circuit name => sub-circuit row count)
-type chunkRowConsumption map[string]uint64
-
-// add accumulates row consumption per sub-circuit
-func (crc *chunkRowConsumption) add(rowConsumption *gethTypes.RowConsumption) error {
-	if rowConsumption == nil {
-		return errors.New("rowConsumption is <nil>")
-	}
-	for _, subCircuit := range *rowConsumption {
-		(*crc)[subCircuit.Name] += subCircuit.RowNumber
-	}
-	return nil
-}
-
-// max finds the maximum row consumption among all sub-circuits
-func (crc *chunkRowConsumption) max() uint64 {
-	var max uint64
-	for _, value := range *crc {
-		if value > max {
-			max = value
-		}
-	}
-	return max
-}
-
 // ChunkProposer proposes chunks based on available unchunked blocks.
 type ChunkProposer struct {
 	ctx context.Context
@@ -54,7 +27,6 @@ type ChunkProposer struct {
 	maxL1CommitGasPerChunk          uint64
 	maxL1CommitCalldataSizePerChunk uint64
 	minL1CommitCalldataSizePerChunk uint64
-	maxRowConsumptionPerChunk       uint64
 	chunkTimeoutSec                 uint64
 	gasCostIncreaseMultiplier       float64
 }
@@ -71,7 +43,6 @@ func NewChunkProposer(ctx context.Context, cfg *config.ChunkProposerConfig, db *
 		maxL1CommitGasPerChunk:          cfg.MaxL1CommitGasPerChunk,
 		maxL1CommitCalldataSizePerChunk: cfg.MaxL1CommitCalldataSizePerChunk,
 		minL1CommitCalldataSizePerChunk: cfg.MinL1CommitCalldataSizePerChunk,
-		maxRowConsumptionPerChunk:       cfg.MaxRowConsumptionPerChunk,
 		chunkTimeoutSec:                 cfg.ChunkTimeoutSec,
 		gasCostIncreaseMultiplier:       cfg.GasCostIncreaseMultiplier,
 	}
@@ -124,13 +95,8 @@ func (p *ChunkProposer) proposeChunk() (*types.Chunk, error) {
 	totalTxGasUsed := firstBlock.Header.GasUsed
 	totalL2TxNum := firstBlock.L2TxsNum()
 	totalL1CommitCalldataSize := firstBlock.EstimateL1CommitCalldataSize()
-	crc := chunkRowConsumption{}
 	totalL1CommitGas := chunk.EstimateL1CommitGas()
 
-	if err := crc.add(firstBlock.RowConsumption); err != nil {
-		return nil, fmt.Errorf("chunk-proposer failed to update chunk row consumption: %v", err)
-	}
-
 	// Check if the first block breaks hard limits.
 	// If so, it indicates there are bugs in sequencer, manual fix is needed.
 	if totalL2TxNum > p.maxL2TxNumPerChunk {
@@ -169,15 +135,6 @@ func (p *ChunkProposer) proposeChunk() (*types.Chunk, error) {
 			"max gas limit", p.maxTxGasPerChunk,
 		)
 	}
-	if max := crc.max(); max > p.maxRowConsumptionPerChunk {
-		return nil, fmt.Errorf(
-			"the first block exceeds row consumption limit; block number: %v, row consumption: %v, max: %v, limit: %v",
-			firstBlock.Header.Number,
-			crc,
-			max,
-			p.maxRowConsumptionPerChunk,
-		)
-	}
 
 	for _, block := range blocks[1:] {
 		chunk.Blocks = append(chunk.Blocks, block)
@@ -185,16 +142,10 @@ func (p *ChunkProposer) proposeChunk() (*types.Chunk, error) {
 		totalL2TxNum += block.L2TxsNum()
 		totalL1CommitCalldataSize += block.EstimateL1CommitCalldataSize()
 		totalL1CommitGas = chunk.EstimateL1CommitGas()
-
-		if err := crc.add(block.RowConsumption); err != nil {
-			return nil, fmt.Errorf("chunk-proposer failed to update chunk row consumption: %v", err)
-		}
-
 		if totalTxGasUsed > p.maxTxGasPerChunk ||
 			totalL2TxNum > p.maxL2TxNumPerChunk ||
 			totalL1CommitCalldataSize > p.maxL1CommitCalldataSizePerChunk ||
-			p.gasCostIncreaseMultiplier*float64(totalL1CommitGas) > float64(p.maxL1CommitGasPerChunk) ||
-			crc.max() > p.maxRowConsumptionPerChunk {
+			p.gasCostIncreaseMultiplier*float64(totalL1CommitGas) > float64(p.maxL1CommitGasPerChunk) {
 			chunk.Blocks = chunk.Blocks[:len(chunk.Blocks)-1] // remove the last block from chunk
 			break
 		}

bridge/internal/controller/watcher/chunk_proposer_test.go

@@ -28,7 +28,6 @@ func testChunkProposer(t *testing.T) {
 		MaxL1CommitGasPerChunk:          50000000000,
 		MaxL1CommitCalldataSizePerChunk: 1000000,
 		MinL1CommitCalldataSizePerChunk: 0,
-		MaxRowConsumptionPerChunk:       1048319,
 		ChunkTimeoutSec:                 300,
 	}, db)
 	cp.TryProposeChunk()
@@ -45,28 +44,3 @@ func testChunkProposer(t *testing.T) {
 	assert.Len(t, chunks, 1)
 	assert.Equal(t, expectedHash.Hex(), chunks[0].Hash)
 }
-
-func testChunkProposerRowConsumption(t *testing.T) {
-	db := setupDB(t)
-	defer database.CloseDB(db)
-
-	l2BlockOrm := orm.NewL2Block(db)
-	err := l2BlockOrm.InsertL2Blocks(context.Background(), []*types.WrappedBlock{wrappedBlock1, wrappedBlock2})
-	assert.NoError(t, err)
-
-	cp := NewChunkProposer(context.Background(), &config.ChunkProposerConfig{
-		MaxTxGasPerChunk:                1000000000,
-		MaxL2TxNumPerChunk:              10000,
-		MaxL1CommitGasPerChunk:          50000000000,
-		MaxL1CommitCalldataSizePerChunk: 1000000,
-		MinL1CommitCalldataSizePerChunk: 0,
-		MaxRowConsumptionPerChunk:       0, // !
-		ChunkTimeoutSec:                 300,
-	}, db)
-	cp.TryProposeChunk()
-
-	chunkOrm := orm.NewChunk(db)
-	chunks, err := chunkOrm.GetUnbatchedChunks(context.Background())
-	assert.NoError(t, err)
-	assert.Len(t, chunks, 0)
-}

bridge/internal/controller/watcher/l2_watcher.go

@@ -162,12 +162,9 @@ func (w *L2WatcherClient) getAndStoreBlockTraces(ctx context.Context, from, to u
 	var blocks []*types.WrappedBlock
 	for number := from; number <= to; number++ {
 		log.Debug("retrieving block", "height", number)
-		block, err := w.GetBlockByNumberOrHash(ctx, rpc.BlockNumberOrHashWithNumber(rpc.BlockNumber(number)))
-		if err != nil {
-			return fmt.Errorf("failed to GetBlockByNumberOrHash: %v. number: %v", err, number)
-		}
-		if block.RowConsumption == nil {
-			return fmt.Errorf("fetched block does not contain RowConsumption. number: %v", number)
+		block, err2 := w.BlockByNumber(ctx, big.NewInt(int64(number)))
+		if err2 != nil {
+			return fmt.Errorf("failed to GetBlockByNumber: %v. number: %v", err2, number)
 		}
 
 		log.Info("retrieved block", "height", block.Header().Number, "hash", block.Header().Hash().String())
@@ -176,11 +173,11 @@ func (w *L2WatcherClient) getAndStoreBlockTraces(ctx context.Context, from, to u
 		if err3 != nil {
 			return fmt.Errorf("failed to get withdrawRoot: %v. number: %v", err3, number)
 		}
+
 		blocks = append(blocks, &types.WrappedBlock{
-			Header:         block.Header(),
-			Transactions:   txsToTxsData(block.Transactions()),
-			WithdrawRoot:   common.BytesToHash(withdrawRoot),
-			RowConsumption: block.RowConsumption,
+			Header:       block.Header(),
+			Transactions: txsToTxsData(block.Transactions()),
+			WithdrawRoot: common.BytesToHash(withdrawRoot),
 		})
 	}
 

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)

bridge/internal/controller/watcher/watcher_test.go

@@ -112,7 +112,6 @@ func TestFunction(t *testing.T) {
 
 	// Run chunk-proposer test cases.
 	t.Run("TestChunkProposer", testChunkProposer)
-	t.Run("TestChunkProposerRowConsumption", testChunkProposerRowConsumption)
 
 	// Run batch-proposer test cases.
 	t.Run("TestBatchProposer", testBatchProposer)

bridge/internal/orm/l2_block.go

@@ -29,7 +29,6 @@ type L2Block struct {
 	TxNum          uint32 `json:"tx_num" gorm:"tx_num"`
 	GasUsed        uint64 `json:"gas_used" gorm:"gas_used"`
 	BlockTimestamp uint64 `json:"block_timestamp" gorm:"block_timestamp"`
-	RowConsumption string `json:"row_consumption" gorm:"row_consumption"`
 
 	// chunk
 	ChunkHash string `json:"chunk_hash" gorm:"chunk_hash;default:NULL"`
@@ -69,7 +68,7 @@ func (o *L2Block) GetL2BlocksLatestHeight(ctx context.Context) (uint64, error) {
 func (o *L2Block) GetUnchunkedBlocks(ctx context.Context) ([]*types.WrappedBlock, error) {
 	db := o.db.WithContext(ctx)
 	db = db.Model(&L2Block{})
-	db = db.Select("header, transactions, withdraw_root, row_consumption")
+	db = db.Select("header, transactions, withdraw_root")
 	db = db.Where("chunk_hash IS NULL")
 	db = db.Order("number ASC")
 
@@ -92,11 +91,6 @@ func (o *L2Block) GetUnchunkedBlocks(ctx context.Context) ([]*types.WrappedBlock
 		}
 
 		wrappedBlock.WithdrawRoot = common.HexToHash(v.WithdrawRoot)
-
-		if err := json.Unmarshal([]byte(v.RowConsumption), &wrappedBlock.RowConsumption); err != nil {
-			return nil, fmt.Errorf("L2Block.GetUnchunkedBlocks error: %w", err)
-		}
-
 		wrappedBlocks = append(wrappedBlocks, &wrappedBlock)
 	}
 
@@ -140,7 +134,7 @@ func (o *L2Block) GetL2BlocksInRange(ctx context.Context, startBlockNumber uint6
 
 	db := o.db.WithContext(ctx)
 	db = db.Model(&L2Block{})
-	db = db.Select("header, transactions, withdraw_root, row_consumption")
+	db = db.Select("header, transactions, withdraw_root")
 	db = db.Where("number >= ? AND number <= ?", startBlockNumber, endBlockNumber)
 	db = db.Order("number ASC")
 
@@ -168,11 +162,6 @@ func (o *L2Block) GetL2BlocksInRange(ctx context.Context, startBlockNumber uint6
 		}
 
 		wrappedBlock.WithdrawRoot = common.HexToHash(v.WithdrawRoot)
-
-		if err := json.Unmarshal([]byte(v.RowConsumption), &wrappedBlock.RowConsumption); err != nil {
-			return nil, fmt.Errorf("L2Block.GetL2BlocksInRange error: %w, start block: %v, end block: %v", err, startBlockNumber, endBlockNumber)
-		}
-
 		wrappedBlocks = append(wrappedBlocks, &wrappedBlock)
 	}
 
@@ -195,12 +184,6 @@ func (o *L2Block) InsertL2Blocks(ctx context.Context, blocks []*types.WrappedBlo
 			return fmt.Errorf("L2Block.InsertL2Blocks error: %w", err)
 		}
 
-		rc, err := json.Marshal(block.RowConsumption)
-		if err != nil {
-			log.Error("failed to marshal RowConsumption", "hash", block.Header.Hash().String(), "err", err)
-			return fmt.Errorf("L2Block.InsertL2Blocks error: %w", err)
-		}
-
 		l2Block := L2Block{
 			Number:         block.Header.Number.Uint64(),
 			Hash:           block.Header.Hash().String(),
@@ -211,7 +194,6 @@ func (o *L2Block) InsertL2Blocks(ctx context.Context, blocks []*types.WrappedBlo
 			TxNum:          uint32(len(block.Transactions)),
 			GasUsed:        block.Header.GasUsed,
 			BlockTimestamp: block.Header.Time,
-			RowConsumption: string(rc),
 			Header:         string(header),
 		}
 		l2Blocks = append(l2Blocks, l2Block)

bridge/internal/orm/orm_test.go

@@ -218,7 +218,6 @@ func TestBatchOrm(t *testing.T) {
 
 	updatedBatch, err := batchOrm.GetLatestBatch(context.Background())
 	assert.NoError(t, err)
-	assert.NotNil(t, updatedBatch)
 	assert.Equal(t, types.ProvingTaskVerified, types.ProvingStatus(updatedBatch.ProvingStatus))
 	assert.Equal(t, types.RollupFinalized, types.RollupStatus(updatedBatch.RollupStatus))
 	assert.Equal(t, types.GasOracleImported, types.GasOracleStatus(updatedBatch.OracleStatus))
@@ -228,7 +227,6 @@ func TestBatchOrm(t *testing.T) {
 	assert.NoError(t, err)
 	updatedBatch, err = batchOrm.GetLatestBatch(context.Background())
 	assert.NoError(t, err)
-	assert.NotNil(t, updatedBatch)
 	assert.Equal(t, "commitTxHash", updatedBatch.CommitTxHash)
 	assert.Equal(t, types.RollupCommitted, types.RollupStatus(updatedBatch.RollupStatus))
 
@@ -237,7 +235,6 @@ func TestBatchOrm(t *testing.T) {
 
 	updatedBatch, err = batchOrm.GetLatestBatch(context.Background())
 	assert.NoError(t, err)
-	assert.NotNil(t, updatedBatch)
 	assert.Equal(t, "finalizeTxHash", updatedBatch.FinalizeTxHash)
 	assert.Equal(t, types.RollupFinalizeFailed, types.RollupStatus(updatedBatch.RollupStatus))
 }

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);
   }
 
   /**********************

bridge/testdata/blockTrace_02.json

@@ -25,12 +25,6 @@
         "baseFeePerGas": "0x1de9",
         "hash": "0xc7b6c7022c8386cdaf6fcd3d4f8d03dce257ae3664a072fdce511ecefce73ad0"
     },
-    "row_consumption": [
-        {
-            "name": "dummy",
-            "row_number": 1
-        }
-    ],
     "transactions": [
         {
             "type": 0,

bridge/testdata/blockTrace_03.json

@@ -25,12 +25,6 @@
         "baseFeePerGas": "0x1a2c",
         "hash": "0x13ddd94de9c585c50c6885d4ef649292c2624ae7c8fc73781ee8785f2564b44c"
     },
-    "row_consumption": [
-        {
-            "name": "dummy",
-            "row_number": 1
-        }
-    ],
     "transactions": [
         {
             "type": 2,

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

bridge/tests/gas_oracle_test.go

@@ -80,9 +80,8 @@ func testImportL2GasPrice(t *testing.T) {
 					Difficulty: big.NewInt(0),
 					BaseFee:    big.NewInt(0),
 				},
-				Transactions:   nil,
-				WithdrawRoot:   common.Hash{},
-				RowConsumption: &gethTypes.RowConsumption{},
+				Transactions: nil,
+				WithdrawRoot: common.Hash{},
 			},
 		},
 	}
@@ -96,7 +95,6 @@ func testImportL2GasPrice(t *testing.T) {
 	// check db status
 	batch, err := batchOrm.GetLatestBatch(context.Background())
 	assert.NoError(t, err)
-	assert.NotNil(t, batch)
 	assert.Empty(t, batch.OracleTxHash)
 	assert.Equal(t, types.GasOracleStatus(batch.OracleStatus), types.GasOraclePending)
 
@@ -104,7 +102,6 @@ func testImportL2GasPrice(t *testing.T) {
 	l2Relayer.ProcessGasPriceOracle()
 	batch, err = batchOrm.GetLatestBatch(context.Background())
 	assert.NoError(t, err)
-	assert.NotNil(t, batch)
 	assert.NotEmpty(t, batch.OracleTxHash)
 	assert.Equal(t, types.GasOracleStatus(batch.OracleStatus), types.GasOracleImporting)
 }

bridge/tests/rollup_test.go

@@ -45,10 +45,9 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 			BaseFee:    big.NewInt(0),
 		}
 		wrappedBlocks = append(wrappedBlocks, &types.WrappedBlock{
-			Header:         &header,
-			Transactions:   nil,
-			WithdrawRoot:   common.Hash{},
-			RowConsumption: &gethTypes.RowConsumption{},
+			Header:       &header,
+			Transactions: nil,
+			WithdrawRoot: common.Hash{},
 		})
 	}
 
@@ -62,7 +61,6 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 		MaxL1CommitGasPerChunk:          50000000000,
 		MaxL1CommitCalldataSizePerChunk: 1000000,
 		MinL1CommitCalldataSizePerChunk: 0,
-		MaxRowConsumptionPerChunk:       1048319,
 		ChunkTimeoutSec:                 300,
 	}, db)
 	cp.TryProposeChunk()
@@ -86,7 +84,6 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 	batchOrm := orm.NewBatch(db)
 	batch, err := batchOrm.GetLatestBatch(context.Background())
 	assert.NoError(t, err)
-	assert.NotNil(t, batch)
 	batchHash := batch.Hash
 	assert.NotEmpty(t, batch.CommitTxHash)
 	assert.Equal(t, types.RollupCommitting, types.RollupStatus(batch.RollupStatus))
@@ -125,7 +122,6 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 
 	batch, err = batchOrm.GetLatestBatch(context.Background())
 	assert.NoError(t, err)
-	assert.NotNil(t, batch)
 	assert.NotEmpty(t, batch.FinalizeTxHash)
 
 	finalizeTx, _, err := l1Client.TransactionByHash(context.Background(), common.HexToHash(batch.FinalizeTxHash))

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"]

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"]

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(out, "error") || strings.Contains(out, "warning") {
 		fmt.Printf("%s:\n\t%v", c.name, out)
 	}
 	go c.checkFuncs.IterCb(func(_ string, value interface{}) {

common/docker/l2geth/Dockerfile

@@ -1,4 +1,4 @@
-FROM scrolltech/l2geth:scroll-v4.3.18
+FROM scrolltech/l2geth:scroll-v4.3.8
 
 RUN mkdir -p /l2geth/keystore
 

common/docker/l2geth/genesis.json

@@ -12,8 +12,6 @@
     "istanbulBlock": 0,
     "berlinBlock": 0,
     "londonBlock": 0,
-    "archimedesBlock": 0,
-    "shanghaiBlock": 0,
     "clique": {
       "period": 3,
       "epoch": 30000
@@ -21,7 +19,6 @@
     "scroll": {
       "useZktrie": true,
       "maxTxPerBlock": 44,
-      "maxTxPayloadBytesPerBlock": 122880,
       "feeVaultAddress": "0x5300000000000000000000000000000000000005",
       "enableEIP2718": false,
       "enableEIP1559": false

common/docker/l2geth/l2geth_run.sh

@@ -14,5 +14,4 @@ fi
 exec geth --mine --datadir "." --unlock 0 --password "./password" --allow-insecure-unlock --gcmode archive --verbosity 3 \
   --http --http.addr "0.0.0.0" --http.port 8545 --http.api "eth,scroll,net,web3,debug" \
   --ws --ws.addr "0.0.0.0" --ws.port 8546 --ws.api "eth,scroll,net,web3,debug" \
-  --ccc \
   --ipcpath ${IPC_PATH}

common/go.mod

@@ -10,7 +10,7 @@ require (
 	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/scroll-tech/go-ethereum v1.10.14-0.20230804022247-26eeb40ea3ca
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230802095950-4b2bbf6225e7
 	github.com/stretchr/testify v1.8.3
 	github.com/urfave/cli/v2 v2.25.7
 	gorm.io/driver/postgres v1.5.0
@@ -48,7 +48,7 @@ require (
 	github.com/hashicorp/go-bexpr v0.1.10 // indirect
 	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
-	github.com/holiman/uint256 v1.2.3 // indirect
+	github.com/holiman/uint256 v1.2.2 // indirect
 	github.com/huin/goupnp v1.0.3 // indirect
 	github.com/iden3/go-iden3-crypto v0.0.15 // indirect
 	github.com/influxdata/influxdb v1.8.3 // indirect

common/go.sum

@@ -187,8 +187,8 @@ github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuW
 github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
 github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
-github.com/holiman/uint256 v1.2.3 h1:K8UWO1HUJpRMXBxbmaY1Y8IAMZC/RsKB+ArEnnK4l5o=
-github.com/holiman/uint256 v1.2.3/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw=
+github.com/holiman/uint256 v1.2.2 h1:TXKcSGc2WaxPD2+bmzAsVthL4+pEN0YwXcL5qED83vk=
+github.com/holiman/uint256 v1.2.2/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ=
 github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixHM7Y=
@@ -374,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.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/go-ethereum v1.10.14-0.20230802095950-4b2bbf6225e7 h1:lxZQB04KrkGi6FUcYUcG7CAkU/BHbHd/mFhPZqSYaW4=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230802095950-4b2bbf6225e7/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=

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.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
 dependencies = [
  "ark-std",
  "env_logger 0.10.0",
  "eth-types",
  "ethers-core",
  "halo2_proofs",
- "hex",
  "itertools",
  "log",
  "rand",
@@ -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.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
 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.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
 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.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
 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.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
 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.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
 dependencies = [
  "env_logger 0.9.3",
  "gobuild 0.1.0-alpha.2 (git+https://github.com/scroll-tech/gobuild.git)",
@@ -1614,26 +1611,10 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "halo2-gate-generator"
-version = "0.1.0"
-source = "git+https://github.com/scroll-tech/halo2gategen.git#35b137de2f71c37dfbd236842b868013c46739d1"
-dependencies = [
- "halo2_proofs",
- "lazy_static",
- "num-bigint",
- "rand",
- "serde",
- "serde_json",
- "strum",
- "strum_macros",
- "subtle",
-]
-
 [[package]]
 name = "halo2-mpt-circuits"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/mpt-circuit.git?branch=v0.5#1c11b6c9b1245073a76c3ce7100b6798060f7cb8"
+source = "git+https://github.com/scroll-tech/mpt-circuit.git?branch=v0.4#d8f957ffaf2f8f8f7a824d89e4ad4193307644bf"
 dependencies = [
  "ethers-core",
  "halo2_proofs",
@@ -2077,7 +2058,7 @@ dependencies = [
 [[package]]
 name = "keccak256"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
 dependencies = [
  "env_logger 0.9.3",
  "eth-types",
@@ -2264,7 +2245,7 @@ dependencies = [
 [[package]]
 name = "mock"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
 dependencies = [
  "eth-types",
  "ethers-core",
@@ -2279,7 +2260,7 @@ dependencies = [
 [[package]]
 name = "mpt-zktrie"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
 dependencies = [
  "bus-mapping",
  "eth-types",
@@ -2637,14 +2618,11 @@ dependencies = [
 [[package]]
 name = "poseidon-circuit"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=scroll-dev-0723#1652d54bf7ca9d8f286b53fe077d9efefdcf6d5f"
+source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=scroll-dev-0619#50015b7cfbd5fe3263ec683cb291396c1b99cd1f"
 dependencies = [
  "bitvec 1.0.1",
  "halo2_proofs",
  "lazy_static",
- "log",
- "rand",
- "rand_xorshift",
  "thiserror",
 ]
 
@@ -2755,7 +2733,7 @@ dependencies = [
 [[package]]
 name = "prover"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.13#0756ac68ee2f41c51f09a748cd28220290fe49ae"
+source = "git+https://github.com/scroll-tech/scroll-prover?rev=b877e67#b877e675e2d8939d03ff8d1f31e567c4f03e6f8d"
 dependencies = [
  "aggregator",
  "anyhow",
@@ -3156,23 +3134,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "rmd160-circuits"
-version = "0.1.0"
-source = "git+https://github.com/scroll-tech/misc-precompiled-circuit.git?branch=integration#31c41ca4365dcf2b6ed4f2cdcd3dc8d2e8f080df"
-dependencies = [
- "halo2-gate-generator",
- "halo2_proofs",
- "lazy_static",
- "num-bigint",
- "rand",
- "serde",
- "serde_json",
- "strum",
- "strum_macros",
- "subtle",
-]
-
 [[package]]
 name = "ruint"
 version = "1.9.0"
@@ -3624,7 +3585,7 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 [[package]]
 name = "snark-verifier"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#12c306ec57849921e690221b10b8a08189868d4a"
+source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#6eeba7783d337e0964d0d89de3d4ee8a7856fde6"
 dependencies = [
  "bytes",
  "ethereum-types 0.14.1",
@@ -3648,7 +3609,7 @@ dependencies = [
 [[package]]
 name = "snark-verifier-sdk"
 version = "0.0.1"
-source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#12c306ec57849921e690221b10b8a08189868d4a"
+source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#6eeba7783d337e0964d0d89de3d4ee8a7856fde6"
 dependencies = [
  "bincode",
  "env_logger 0.10.0",
@@ -4040,7 +4001,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 [[package]]
 name = "types"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.13#0756ac68ee2f41c51f09a748cd28220290fe49ae"
+source = "git+https://github.com/scroll-tech/scroll-prover?rev=b877e67#b877e675e2d8939d03ff8d1f31e567c4f03e6f8d"
 dependencies = [
  "base64 0.13.1",
  "blake2",
@@ -4085,12 +4046,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 +4446,7 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 [[package]]
 name = "zkevm-circuits"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.13#a8c59b2e6e0a845c78d6b93a80c0a9c0601f59d0"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
 dependencies = [
  "array-init",
  "bus-mapping",
@@ -4520,7 +4475,6 @@ dependencies = [
  "rand_chacha",
  "rand_xorshift",
  "rayon",
- "rmd160-circuits",
  "serde",
  "serde_json",
  "sha3 0.10.8",
@@ -4549,8 +4503,8 @@ dependencies = [
 
 [[package]]
 name = "zktrie"
-version = "0.2.0"
-source = "git+https://github.com/scroll-tech/zktrie.git?branch=v0.6#83318659773604fa565e2ebeb810a6d3746f0af4"
+version = "0.1.2"
+source = "git+https://github.com/scroll-tech/zktrie.git?branch=scroll-dev-0226#1a5562f663a81ff903383db69dc6c9404b63e69d"
 dependencies = [
  "gobuild 0.1.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

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.13" }
-types = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.13" }
+prover = { git = "https://github.com/scroll-tech/scroll-prover", rev = "b877e67" }
+types = { git = "https://github.com/scroll-tech/scroll-prover", rev = "b877e67" }
 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

common/libzkp/impl/src/batch.rs

@@ -3,7 +3,7 @@ use libc::c_char;
 use prover::{
     aggregator::{Prover, Verifier},
     utils::{chunk_trace_to_witness_block, init_env_and_log},
-    BatchProof, ChunkHash, ChunkProof,
+    ChunkHash, ChunkProof, Proof,
 };
 use std::{cell::OnceCell, panic, ptr::null};
 use types::eth::BlockTrace;
@@ -69,9 +69,9 @@ pub unsafe extern "C" fn gen_batch_proof(
 #[no_mangle]
 pub unsafe extern "C" fn verify_batch_proof(proof: *const c_char) -> c_char {
     let proof = c_char_to_vec(proof);
-    let proof = serde_json::from_slice::<BatchProof>(proof.as_slice()).unwrap();
+    let proof = serde_json::from_slice::<Proof>(proof.as_slice()).unwrap();
 
-    let verified = panic::catch_unwind(|| VERIFIER.get().unwrap().verify_agg_evm_proof(proof));
+    let verified = panic::catch_unwind(|| VERIFIER.get().unwrap().verify_agg_evm_proof(&proof));
     verified.unwrap_or(false) as c_char
 }
 

common/testdata/blockTrace_02.json

@@ -25,52 +25,6 @@
         "baseFeePerGas": "0x1de9",
         "hash": "0xc7b6c7022c8386cdaf6fcd3d4f8d03dce257ae3664a072fdce511ecefce73ad0"
     },
-    "row_consumption": [
-        {
-            "name": "evm",
-            "row_number": 1
-        },
-        {
-            "name": "state",
-            "row_number": 2
-        },
-        {
-            "name": "bytecode",
-            "row_number": 3
-        },
-        {
-            "name": "copy",
-            "row_number": 4
-        },
-        {
-            "name": "keccak",
-            "row_number": 5
-        },
-        {
-            "name": "tx",
-            "row_number": 6
-        },
-        {
-            "name": "rlp",
-            "row_number": 7
-        },
-        {
-            "name": "exp",
-            "row_number": 8
-        },
-        {
-            "name": "pi",
-            "row_number": 9
-        },
-        {
-            "name": "poseidon",
-            "row_number": 10
-        },
-        {
-            "name": "mpt",
-            "row_number": 11
-        }
-    ],
     "transactions": [
         {
             "type": 0,

common/testdata/blockTrace_03.json

@@ -25,8 +25,6 @@
         "baseFeePerGas": "0x1a2c",
         "hash": "0x13ddd94de9c585c50c6885d4ef649292c2624ae7c8fc73781ee8785f2564b44c"
     },
-    "row_consumption": [
-    ],
     "transactions": [
         {
             "type": 2,

common/testdata/blockTrace_04.json

@@ -26,8 +26,6 @@
     "baseFeePerGas": null,
     "hash": "0x09f75bc27efe18cd77a82491370442ea5a6066e910b73dc99fe1caff950c357b"
   },
-  "row_consumption": [
-  ],
   "transactions": [
     {
       "type": 126,

common/testdata/blockTrace_05.json

@@ -28,8 +28,6 @@
       "baseFeePerGas": null,
       "hash": "0x003fee335455c0c293dda17ea9365fe0caa94071ed7216baf61f7aeb808e8a28"
   },
-  "row_consumption": [
-  ],
   "transactions": [
       {
           "type": 126,

common/testdata/blockTrace_06.json

@@ -28,8 +28,6 @@
       "baseFeePerGas": null,
       "hash": "0x003fee335455c0c293dda17ea9365fe0caa94071ed7216baf61f7aeb808e8a28"
   },
-  "row_consumption": [
-  ],
   "transactions": [
       {
           "type": 126,

common/testdata/blockTrace_07.json

@@ -28,8 +28,6 @@
       "baseFeePerGas": null,
       "hash": "0x003fee335455c0c293dda17ea9365fe0caa94071ed7216baf61f7aeb808e8a28"
   },
-  "row_consumption": [
-  ],
   "transactions": [
       {
           "type": 126,

common/testdata/blockTrace_delegate.json

@@ -24,8 +24,6 @@
         "baseFeePerGas": "0x1a2c",
         "hash": "0x13ddd94de9c585c50c6885d4ef649292c2624ae7c8fc73781ee8785f2564b44c"
     },
-    "row_consumption": [
-    ],
     "transactions": [
         {
             "type": 2,

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) {

common/types/block.go

@@ -14,9 +14,8 @@ import (
 type WrappedBlock struct {
 	Header *types.Header `json:"header"`
 	// Transactions is only used for recover types.Transactions, the from of types.TransactionData field is missing.
-	Transactions   []*types.TransactionData `json:"transactions"`
-	WithdrawRoot   common.Hash              `json:"withdraw_trie_root,omitempty"`
-	RowConsumption *types.RowConsumption    `json:"row_consumption"`
+	Transactions []*types.TransactionData `json:"transactions"`
+	WithdrawRoot common.Hash              `json:"withdraw_trie_root,omitempty"`
 }
 
 // NumL1Messages returns the number of L1 messages in this block.
@@ -36,17 +35,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 +42,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

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())
 }

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

common/types/errno.go

@@ -1,20 +0,0 @@
-package types
-
-const (
-	// Success shows OK.
-	Success = 0
-
-	// ErrJWTCommonErr jwt common error
-	ErrJWTCommonErr = 50000
-	// ErrJWTTokenExpired jwt token expired
-	ErrJWTTokenExpired = 50001
-
-	// ErrCoordinatorParameterInvalidNo is invalid params
-	ErrCoordinatorParameterInvalidNo = 20001
-	// ErrCoordinatorGetTaskFailure is getting prover task error
-	ErrCoordinatorGetTaskFailure = 20002
-	// ErrCoordinatorHandleZkProofFailure is handle submit proof error
-	ErrCoordinatorHandleZkProofFailure = 20003
-	// ErrCoordinatorEmptyProofData get empty proof data
-	ErrCoordinatorEmptyProofData = 20004
-)

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"
 	}
 }
 
@@ -58,12 +58,15 @@ type AuthMsg struct {
 
 // Identity contains all the fields to be signed by the prover.
 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"`
+	// Prover name
+	Name string `json:"name"`
+	// Prover ProverType
+	ProverType ProofType `json:"prover_type,omitempty"`
+	// Version is common.Version+ZkVersion. Use the following to check the latest ZkVersion version.
+	// curl -sL https://api.github.com/repos/scroll-tech/scroll-prover/commits | jq -r ".[0].sha"
+	Version string `json:"version"`
+	// Random unique token generated by manager
+	Token string `json:"token"`
 }
 
 // GenerateToken generates token
@@ -250,12 +253,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.

common/types/message/message_test.go

@@ -15,9 +15,9 @@ func TestAuthMessageSignAndVerify(t *testing.T) {
 
 	authMsg := &AuthMsg{
 		Identity: &Identity{
-			Challenge:     "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2OTEwMzgxNzUsIm9yaWdfaWF0IjoxNjkxMDM0NTc1fQ.HybBMsEJFhyZqtIa2iVcHUP7CEFttf708jmTMAImAWA",
-			ProverName:    "test",
-			ProverVersion: "v1.0.0",
+			Name:    "testName",
+			Version: "testVersion",
+			Token:   "testToken",
 		},
 	}
 	assert.NoError(t, authMsg.SignWithKey(privkey))
@@ -46,15 +46,15 @@ func TestGenerateToken(t *testing.T) {
 
 func TestIdentityHash(t *testing.T) {
 	identity := &Identity{
-		Challenge:     "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2OTEwMzM0MTksIm9yaWdfaWF0IjoxNjkxMDI5ODE5fQ.EhkLZsj__rNPVC3ZDYBtvdh0nB8mmM_Hl82hObaIWOs",
-		ProverName:    "test",
-		ProverVersion: "v1.0.0",
+		Name:       "testName",
+		ProverType: ProofTypeChunk,
+		Version:    "testVersion",
+		Token:      "testToken",
 	}
-
 	hash, err := identity.Hash()
 	assert.NoError(t, err)
 
-	expectedHash := "83f5e0ad023e9c1de639ab07b9b4cb972ec9dbbd2524794c533a420a5b137721"
+	expectedHash := "c0411a19531fb8c6133b2bae91f361c14e65f2d318aef72b83519e6061cad001"
 	assert.Equal(t, expectedHash, hex.EncodeToString(hash))
 }
 
@@ -73,7 +73,6 @@ func TestProofMessageSignVerifyPublicKey(t *testing.T) {
 				Proof:        []byte("testProof"),
 				Instances:    []byte("testInstance"),
 				Vk:           []byte("testVk"),
-				ChunkInfo:    nil,
 			},
 			Error: "testError",
 		},
@@ -102,13 +101,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 +118,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 +136,6 @@ func TestProofMsgPublicKey(t *testing.T) {
 				Proof:        []byte("testProof"),
 				Instances:    []byte("testInstance"),
 				Vk:           []byte("testVk"),
-				ChunkInfo:    nil,
 			},
 			Error: "testError",
 		},

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.

common/version/version.go

@@ -3,10 +3,9 @@ package version
 import (
 	"fmt"
 	"runtime/debug"
-	"strings"
 )
 
-var tag = "v4.1.36"
+var tag = "v4.0.39"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {
@@ -20,29 +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
 
 // 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)
-
-// 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]
-}

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. |
 
 
 

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. |
 
 
 

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 |
 
 
 

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 |
 
 
 

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

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

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
 

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
 

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
 

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. |
 
 
 

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

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

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,

contracts/integration-test/ZkEvmVerifierV1.spec.ts

@@ -1,77 +0,0 @@
-/* eslint-disable node/no-unpublished-import */
-/* eslint-disable node/no-missing-import */
-import { expect } from "chai";
-import { hexlify } from "ethers/lib/utils";
-import { ethers } from "hardhat";
-import { ZkEvmVerifierV1 } from "../typechain";
-import { SignerWithAddress } from "@nomiclabs/hardhat-ethers/signers";
-import fs from "fs";
-
-describe("ZkEvmVerifierV1", async () => {
-  let deployer: SignerWithAddress;
-
-  let zkEvmVerifier: ZkEvmVerifierV1;
-
-  beforeEach(async () => {
-    [deployer] = await ethers.getSigners();
-
-    const bytecode = hexlify(fs.readFileSync("./src/libraries/verifier/plonk-verifier/plonk_verifier_0.5.1.bin"));
-    const tx = await deployer.sendTransaction({ data: bytecode });
-    const receipt = await tx.wait();
-
-    const ZkEvmVerifierV1 = await ethers.getContractFactory("ZkEvmVerifierV1", deployer);
-    zkEvmVerifier = await ZkEvmVerifierV1.deploy(receipt.contractAddress);
-    await zkEvmVerifier.deployed();
-  });
-
-  it("should succeed", async () => {
-    const proof = hexlify(fs.readFileSync("./integration-test/testdata/plonk_verifier_0.5.1_proof.data"));
-    const instances = fs.readFileSync("./integration-test/testdata/plonk_verifier_0.5.1_pi.data");
-
-    const publicInputHash = new Uint8Array(32);
-    for (let i = 0; i < 32; i++) {
-      publicInputHash[i] = instances[i * 32 + 31];
-    }
-
-    // chunk1: https://github.com/scroll-tech/test-traces/blob/674ad743beab04b57da369fa5958fb6824155bfe/erc20/1_transfer.json
-    // 0000000000000005 blockNumber
-    // 0000000064c3ca7c timestamp
-    // 0000000000000000000000000000000000000000000000000000000000000000 baseFee
-    // 00000000007a1200 gasLimit
-    // 0001 numTransactions
-    // 8da3fedb103b6da8ccc2514094336d1a76df166238f4d8e8558fbe54cce2516a tx hash 0
-    // chunk2: https://github.com/scroll-tech/test-traces/blob/674ad743beab04b57da369fa5958fb6824155bfe/erc20/10_transfer.json
-    // 0000000000000006 blockNumber
-    // 0000000064c3ca7f timestamp
-    // 0000000000000000000000000000000000000000000000000000000000000000 baseFee
-    // 00000000007a1200 gasLimit
-    // 000a numTransactions
-    // 419164c1a7213e4e52f8578463c47a01549f69a7ff220d93221ce02909f5b919 tx hash 0
-    // 6c1b03d1a9b5156e189ad2e7ba73ba71d9a83b24f9830f38dd7a597fe1e67167 tx hash 1
-    // 94f981938d02b2c1d91ff370b3ed759dadc617c7347cd4b8552b275edbffd767 tx hash 2
-    // bfe98147fc808a916bdff90e838e77609fd59634787443f6fc58f9a371790d09 tx hash 3
-    // beb9dd0259e7c4f0a8d5ac3ba6aa3940c3e53947395f64e8ee88c7067c6d210e tx hash 4
-    // 208c6c767356552ad8085fa77a99d9154e0c8cf8777e329cb76bcbc969d21fca tx hash 5
-    // 37c8969833fbc6cbb88a63ccef324d7b42d0607ac0094f14e1f6d4e50f84d87f tx hash 6
-    // 088c5ad45a990694ac783207fe6bda9bf97da40e1f3eb468c73941d51b99932c tx hash 7
-    // c3d8ddbdfc67877a253255b9357aabfd062ce80d39eba67547f964c288660065 tx hash 8
-    // ff26ca52c02b97b1a6677263d5d6dec0321fb7b49be44ae0a66ba5482b1180b4 tx hash 9
-    // => chunk 0 data hash: 9390886a7d22aa43aae87e62a350c904fabc5db4487d9b25bdca446ba7ed15a1
-    // => chunk 1 data hash: a8846bf9bc53f30a391ae452b5fd456cb86a99ab7bd2e1e47898ffbe3509e8eb
-    // => batch data hash: ee64d77c2f2e0b2c4ac952a0f54fdba4a217c42eb26a07b28de9fbc7b009acae
-    // 000000000000cf55 layer2ChainId
-    // 02040e949809e8d2e56d35b4dfb876e08ee7b4608d22f23f52052425857c31ba prevStateRoot
-    // 1532cdb7732da0a4ca3044914c6959b7e2b7ba4e913a9f5f0b55051e467412d9 postStateRoot
-    // 0000000000000000000000000000000000000000000000000000000000000000 withdrawRoot
-    // ee64d77c2f2e0b2c4ac952a0f54fdba4a217c42eb26a07b28de9fbc7b009acae batchDataHash
-    // public input hash: 9ea439164727042e029464a40901e52800095c1ade301b63b4b7453880f5723e
-    expect(hexlify(publicInputHash)).to.eq("0x9ea439164727042e029464a40901e52800095c1ade301b63b4b7453880f5723e");
-
-    // verify ok
-    await zkEvmVerifier.verify(proof, publicInputHash);
-    console.log("Gas Usage:", (await zkEvmVerifier.estimateGas.verify(proof, publicInputHash)).toString());
-
-    // verify failed
-    await expect(zkEvmVerifier.verify(proof, publicInputHash.reverse())).to.reverted;
-  });
-});

contracts/scripts/foundry/DeployL1BridgeContracts.s.sol

@@ -17,12 +17,10 @@ import {L1MessageQueue} from "../../src/L1/rollup/L1MessageQueue.sol";
 import {L1ScrollMessenger} from "../../src/L1/L1ScrollMessenger.sol";
 import {L1StandardERC20Gateway} from "../../src/L1/gateways/L1StandardERC20Gateway.sol";
 import {L1WETHGateway} from "../../src/L1/gateways/L1WETHGateway.sol";
-import {L1DAIGateway} from "../../src/L1/gateways/L1DAIGateway.sol";
 import {L2GasPriceOracle} from "../../src/L1/rollup/L2GasPriceOracle.sol";
 import {MultipleVersionRollupVerifier} from "../../src/L1/rollup/MultipleVersionRollupVerifier.sol";
 import {ScrollChain} from "../../src/L1/rollup/ScrollChain.sol";
 import {Whitelist} from "../../src/L2/predeploys/Whitelist.sol";
-import {ZkEvmVerifierV1} from "../../src/libraries/verifier/ZkEvmVerifierV1.sol";
 
 contract DeployL1BridgeContracts is Script {
     uint256 L1_DEPLOYER_PRIVATE_KEY = vm.envUint("L1_DEPLOYER_PRIVATE_KEY");
@@ -31,16 +29,13 @@ contract DeployL1BridgeContracts is Script {
 
     address L1_WETH_ADDR = vm.envAddress("L1_WETH_ADDR");
     address L2_WETH_ADDR = vm.envAddress("L2_WETH_ADDR");
+    address L1_ZKEVM_VERIFIER_ADDR = vm.envAddress("L1_ZKEVM_VERIFIER_ADDR");
 
-    address L1_PLONK_VERIFIER_ADDR = vm.envAddress("L1_PLONK_VERIFIER_ADDR");
-
-    ZkEvmVerifierV1 zkEvmVerifierV1;
     ProxyAdmin proxyAdmin;
 
     function run() external {
         vm.startBroadcast(L1_DEPLOYER_PRIVATE_KEY);
 
-        deployZkEvmVerifierV1();
         deployMultipleVersionRollupVerifier();
         deployProxyAdmin();
         deployL1Whitelist();
@@ -56,19 +51,12 @@ contract DeployL1BridgeContracts is Script {
         deployL1CustomERC20Gateway();
         deployL1ERC721Gateway();
         deployL1ERC1155Gateway();
-        deployL1DAIGateway();
 
         vm.stopBroadcast();
     }
 
-    function deployZkEvmVerifierV1() internal {
-        zkEvmVerifierV1 = new ZkEvmVerifierV1(L1_PLONK_VERIFIER_ADDR);
-
-        logAddress("L1_ZKEVM_VERIFIER_V1_ADDR", address(zkEvmVerifierV1));
-    }
-
     function deployMultipleVersionRollupVerifier() internal {
-        MultipleVersionRollupVerifier rollupVerifier = new MultipleVersionRollupVerifier(address(zkEvmVerifierV1));
+        MultipleVersionRollupVerifier rollupVerifier = new MultipleVersionRollupVerifier(L1_ZKEVM_VERIFIER_ADDR);
 
         logAddress("L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR", address(rollupVerifier));
     }
@@ -204,18 +192,6 @@ contract DeployL1BridgeContracts is Script {
         logAddress("L1_CUSTOM_ERC20_GATEWAY_PROXY_ADDR", address(proxy));
     }
 
-    function deployL1DAIGateway() internal {
-        L1DAIGateway impl = new L1DAIGateway();
-        TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(
-            address(impl),
-            address(proxyAdmin),
-            new bytes(0)
-        );
-
-        logAddress("L1_DAI_GATEWAY_IMPLEMENTATION_ADDR", address(impl));
-        logAddress("L1_DAI_GATEWAY_PROXY_ADDR", address(proxy));
-    }
-
     function deployL1ERC721Gateway() internal {
         L1ERC721Gateway impl = new L1ERC721Gateway();
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(

contracts/scripts/foundry/DeployL2BridgeContracts.s.sol

@@ -15,7 +15,6 @@ import {L2GatewayRouter} from "../../src/L2/gateways/L2GatewayRouter.sol";
 import {L2ScrollMessenger} from "../../src/L2/L2ScrollMessenger.sol";
 import {L2StandardERC20Gateway} from "../../src/L2/gateways/L2StandardERC20Gateway.sol";
 import {L2WETHGateway} from "../../src/L2/gateways/L2WETHGateway.sol";
-import {L2DAIGateway} from "../../src/L2/gateways/L2DAIGateway.sol";
 import {L1GasPriceOracle} from "../../src/L2/predeploys/L1GasPriceOracle.sol";
 import {L2MessageQueue} from "../../src/L2/predeploys/L2MessageQueue.sol";
 import {L2TxFeeVault} from "../../src/L2/predeploys/L2TxFeeVault.sol";
@@ -60,7 +59,6 @@ contract DeployL2BridgeContracts is Script {
         deployL2CustomERC20Gateway();
         deployL2ERC721Gateway();
         deployL2ERC1155Gateway();
-        deployL2DAIGateway();
 
         vm.stopBroadcast();
     }
@@ -201,18 +199,6 @@ contract DeployL2BridgeContracts is Script {
         logAddress("L2_CUSTOM_ERC20_GATEWAY_PROXY_ADDR", address(proxy));
     }
 
-    function deployL2DAIGateway() internal {
-        L2DAIGateway impl = new L2DAIGateway();
-        TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(
-            address(impl),
-            address(proxyAdmin),
-            new bytes(0)
-        );
-
-        logAddress("L2_DAI_GATEWAY_IMPLEMENTATION_ADDR", address(impl));
-        logAddress("L2_DAI_GATEWAY_PROXY_ADDR", address(proxy));
-    }
-
     function deployL2ERC721Gateway() internal {
         L2ERC721Gateway impl = new L2ERC721Gateway();
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(

contracts/scripts/foundry/InitializeL1BridgeContracts.s.sol

@@ -11,7 +11,6 @@ import {L1GatewayRouter} from "../../src/L1/gateways/L1GatewayRouter.sol";
 import {L1ScrollMessenger} from "../../src/L1/L1ScrollMessenger.sol";
 import {L1StandardERC20Gateway} from "../../src/L1/gateways/L1StandardERC20Gateway.sol";
 import {L1WETHGateway} from "../../src/L1/gateways/L1WETHGateway.sol";
-import {L1DAIGateway} from "../../src/L1/gateways/L1DAIGateway.sol";
 import {ScrollChain} from "../../src/L1/rollup/ScrollChain.sol";
 import {L1MessageQueue} from "../../src/L1/rollup/L1MessageQueue.sol";
 import {L2GasPriceOracle} from "../../src/L1/rollup/L2GasPriceOracle.sol";
@@ -22,15 +21,10 @@ 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");
 
-    address L1_DAI_ADDR = vm.envAddress("L1_DAI_ADDR");
-    address L2_DAI_ADDR = vm.envAddress("L2_DAI_ADDR");
-
     address L1_WHITELIST_ADDR = vm.envAddress("L1_WHITELIST_ADDR");
     address L1_SCROLL_CHAIN_PROXY_ADDR = vm.envAddress("L1_SCROLL_CHAIN_PROXY_ADDR");
     address L1_MESSAGE_QUEUE_PROXY_ADDR = vm.envAddress("L1_MESSAGE_QUEUE_PROXY_ADDR");
@@ -43,7 +37,6 @@ contract InitializeL1BridgeContracts is Script {
     address L1_ETH_GATEWAY_PROXY_ADDR = vm.envAddress("L1_ETH_GATEWAY_PROXY_ADDR");
     address L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR = vm.envAddress("L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR");
     address L1_WETH_GATEWAY_PROXY_ADDR = vm.envAddress("L1_WETH_GATEWAY_PROXY_ADDR");
-    address L1_DAI_GATEWAY_PROXY_ADDR = vm.envAddress("L1_DAI_GATEWAY_PROXY_ADDR");
     address L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR = vm.envAddress("L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR");
     address L1_ENFORCED_TX_GATEWAY_PROXY_ADDR = vm.envAddress("L1_ENFORCED_TX_GATEWAY_PROXY_ADDR");
 
@@ -55,7 +48,6 @@ contract InitializeL1BridgeContracts is Script {
     address L2_ETH_GATEWAY_PROXY_ADDR = vm.envAddress("L2_ETH_GATEWAY_PROXY_ADDR");
     address L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR = vm.envAddress("L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR");
     address L2_WETH_GATEWAY_PROXY_ADDR = vm.envAddress("L2_WETH_GATEWAY_PROXY_ADDR");
-    address L2_DAI_GATEWAY_PROXY_ADDR = vm.envAddress("L2_DAI_GATEWAY_PROXY_ADDR");
     address L2_SCROLL_STANDARD_ERC20_ADDR = vm.envAddress("L2_SCROLL_STANDARD_ERC20_ADDR");
     address L2_SCROLL_STANDARD_ERC20_FACTORY_ADDR = vm.envAddress("L2_SCROLL_STANDARD_ERC20_FACTORY_ADDR");
 
@@ -68,8 +60,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 +78,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
@@ -151,22 +143,12 @@ contract InitializeL1BridgeContracts is Script {
             L1_SCROLL_MESSENGER_PROXY_ADDR
         );
 
-        // initialize L1DAIGateway
-        L1DAIGateway(L1_DAI_GATEWAY_PROXY_ADDR).initialize(
-            L2_DAI_GATEWAY_PROXY_ADDR,
-            L1_GATEWAY_ROUTER_PROXY_ADDR,
-            L1_SCROLL_MESSENGER_PROXY_ADDR
-        );
-        L1DAIGateway(L1_DAI_GATEWAY_PROXY_ADDR).updateTokenMapping(L1_DAI_ADDR, L2_DAI_ADDR);
-
-        // set WETH and DAI gateways in router
+        // set WETH gateway in router
         {
-            address[] memory _tokens = new address[](2);
+            address[] memory _tokens = new address[](1);
             _tokens[0] = L1_WETH_ADDR;
-            _tokens[1] = L1_DAI_ADDR;
-            address[] memory _gateways = new address[](2);
+            address[] memory _gateways = new address[](1);
             _gateways[0] = L1_WETH_GATEWAY_PROXY_ADDR;
-            _gateways[1] = L1_DAI_GATEWAY_PROXY_ADDR;
             L1GatewayRouter(L1_GATEWAY_ROUTER_PROXY_ADDR).setERC20Gateway(_tokens, _gateways);
         }
 

contracts/scripts/foundry/InitializeL2BridgeContracts.s.sol

@@ -11,7 +11,6 @@ import {L2ETHGateway} from "../../src/L2/gateways/L2ETHGateway.sol";
 import {L2GatewayRouter} from "../../src/L2/gateways/L2GatewayRouter.sol";
 import {L2StandardERC20Gateway} from "../../src/L2/gateways/L2StandardERC20Gateway.sol";
 import {L2WETHGateway} from "../../src/L2/gateways/L2WETHGateway.sol";
-import {L2DAIGateway} from "../../src/L2/gateways/L2DAIGateway.sol";
 import {L2MessageQueue} from "../../src/L2/predeploys/L2MessageQueue.sol";
 import {L2TxFeeVault} from "../../src/L2/predeploys/L2TxFeeVault.sol";
 import {L1GasPriceOracle} from "../../src/L2/predeploys/L1GasPriceOracle.sol";
@@ -23,9 +22,6 @@ contract InitializeL2BridgeContracts is Script {
 
     address L2_WETH_ADDR = vm.envAddress("L2_WETH_ADDR");
 
-    address L1_DAI_ADDR = vm.envAddress("L1_DAI_ADDR");
-    address L2_DAI_ADDR = vm.envAddress("L2_DAI_ADDR");
-
     address L1_SCROLL_MESSENGER_PROXY_ADDR = vm.envAddress("L1_SCROLL_MESSENGER_PROXY_ADDR");
     address L1_GATEWAY_ROUTER_PROXY_ADDR = vm.envAddress("L1_GATEWAY_ROUTER_PROXY_ADDR");
     address L1_CUSTOM_ERC20_GATEWAY_PROXY_ADDR = vm.envAddress("L1_CUSTOM_ERC20_GATEWAY_PROXY_ADDR");
@@ -34,7 +30,6 @@ contract InitializeL2BridgeContracts is Script {
     address L1_ETH_GATEWAY_PROXY_ADDR = vm.envAddress("L1_ETH_GATEWAY_PROXY_ADDR");
     address L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR = vm.envAddress("L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR");
     address L1_WETH_GATEWAY_PROXY_ADDR = vm.envAddress("L1_WETH_GATEWAY_PROXY_ADDR");
-    address L1_DAI_GATEWAY_PROXY_ADDR = vm.envAddress("L1_DAI_GATEWAY_PROXY_ADDR");
 
     address L2_TX_FEE_VAULT_ADDR = vm.envAddress("L2_TX_FEE_VAULT_ADDR");
     address L1_GAS_PRICE_ORACLE_ADDR = vm.envAddress("L1_GAS_PRICE_ORACLE_ADDR");
@@ -49,7 +44,6 @@ contract InitializeL2BridgeContracts is Script {
     address L2_ETH_GATEWAY_PROXY_ADDR = vm.envAddress("L2_ETH_GATEWAY_PROXY_ADDR");
     address L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR = vm.envAddress("L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR");
     address L2_WETH_GATEWAY_PROXY_ADDR = vm.envAddress("L2_WETH_GATEWAY_PROXY_ADDR");
-    address L2_DAI_GATEWAY_PROXY_ADDR = vm.envAddress("L2_DAI_GATEWAY_PROXY_ADDR");
     address L2_SCROLL_STANDARD_ERC20_FACTORY_ADDR = vm.envAddress("L2_SCROLL_STANDARD_ERC20_FACTORY_ADDR");
 
     function run() external {
@@ -65,7 +59,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(
@@ -114,22 +111,12 @@ contract InitializeL2BridgeContracts is Script {
             L2_SCROLL_MESSENGER_PROXY_ADDR
         );
 
-        // initialize L2DAIGateway
-        L2DAIGateway(L2_DAI_GATEWAY_PROXY_ADDR).initialize(
-            L1_DAI_GATEWAY_PROXY_ADDR,
-            L2_GATEWAY_ROUTER_PROXY_ADDR,
-            L2_SCROLL_MESSENGER_PROXY_ADDR
-        );
-        L2DAIGateway(L2_DAI_GATEWAY_PROXY_ADDR).updateTokenMapping(L2_DAI_ADDR, L1_DAI_ADDR);
-
-        // set WETH and DAI gateways in router
+        // set WETH gateway in router
         {
-            address[] memory _tokens = new address[](2);
+            address[] memory _tokens = new address[](1);
             _tokens[0] = L2_WETH_ADDR;
-            _tokens[1] = L2_DAI_ADDR;
-            address[] memory _gateways = new address[](2);
+            address[] memory _gateways = new address[](1);
             _gateways[0] = L2_WETH_GATEWAY_PROXY_ADDR;
-            _gateways[1] = L2_DAI_GATEWAY_PROXY_ADDR;
             L2GatewayRouter(L2_GATEWAY_ROUTER_PROXY_ADDR).setERC20Gateway(_tokens, _gateways);
         }
 

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 *

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);
     }
 
     /**********************

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 *