refactor: make failed batch proof log more explicit (#738)

Co-authored-by: georgehao <haohongfan@gmail.com>

Makefile

@@ -15,18 +15,22 @@ 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.8 && go mod tidy
+	cd $(PWD)/bridge/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.18 && go mod tidy
 	cd $(PWD)/bridge-history-api/ && go get -u github.com/ethereum/go-ethereum@latest && go mod tidy
-	cd $(PWD)/common/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.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
+	cd $(PWD)/common/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.18 && go mod tidy
+	cd $(PWD)/coordinator/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.18 && go mod tidy
+	cd $(PWD)/database/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.18 && go mod tidy
+	cd $(PWD)/prover/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.18 && go mod tidy
+	cd $(PWD)/prover-stats-api/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.18 && go mod tidy
+	cd $(PWD)/tests/integration-test/ && go get -u github.com/scroll-tech/go-ethereum@scroll-v4.3.18 && go mod tidy
 	goimports -local $(PWD)/bridge/ -w .
 	goimports -local $(PWD)/bridge-history-api/ -w .
 	goimports -local $(PWD)/common/ -w .
 	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,6 +57,7 @@ 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

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

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

@@ -0,0 +1,35 @@
+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,6 +15,7 @@ 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,
 	}))
@@ -23,4 +24,5 @@ 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,6 +18,8 @@ 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
@@ -32,6 +34,12 @@ 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,6 +19,7 @@ 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(), Layer1Msg).First(&result).Error
+	err := c.db.WithContext(ctx).Model(&CrossMsg{}).Where("layer2_hash = ? AND msg_type = ?", l2Hash.String(), Layer2Msg).First(&result).Error
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, nil

bridge-history-api/orm/l2_sent_msg.go

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

bridge-history-api/utils/utils.go

@@ -1,7 +1,6 @@
 package utils
 
 import (
-	"bytes"
 	"context"
 	"encoding/binary"
 	"errors"
@@ -76,6 +75,14 @@ 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{}
@@ -110,48 +117,3 @@ 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,7 +1,6 @@
 package utils_test
 
 import (
-	"os"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -34,31 +33,11 @@ func TestGetBatchRangeFromCalldataV2(t *testing.T) {
 	assert.Equal(t, start, uint64(10))
 	assert.Equal(t, finish, uint64(20))
 	assert.Equal(t, batchIndex, uint64(2))
-}
 
-func TestGetBatchRangeFromCalldataV1(t *testing.T) {
-	calldata, err := os.ReadFile("../testdata/commit-batches-0x3095e91db7ba4a6fbf4654d607db322e58ff5579c502219c8024acaea74cf311.txt")
+	// genesis batch
+	batchIndex, start, finish, err = utils.GetBatchRangeFromCalldataV2(common.Hex2Bytes("3fdeecb200000000000000000000000000000000000000000000000000000000000000402dcb5308098d24a37fc1487a229fcedb09fa4343ede39cbad365bc925535bb09000000000000000000000000000000000000000000000000000000000000005900000000000000000000000000000000000000000000000000c252bc9780c4d83cf11f14b8cd03c92c4d18ce07710ba836d31d12da216c8330000000000000000000000000000000000000000000000000000000000000000000000000000000"))
 	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))
+	assert.Equal(t, start, uint64(0))
+	assert.Equal(t, finish, uint64(0))
+	assert.Equal(t, batchIndex, uint64(0))
 }

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("2cdc615c74452778c0fb6184735e014c13aad2b62774fe0b09bd1dcc2cc14a62"))
-	assert.Equal(L1FinalizeBatchEventSignature, common.HexToHash("9d3058a3cb9739a2527f22dd9a4138065844037d3004254952e2458d808cc364"))
+	assert.Equal(L1CommitBatchEventSignature, common.HexToHash("2c32d4ae151744d0bf0b9464a3e897a1d17ed2f1af71f7c9a75f12ce0d28238f"))
+	assert.Equal(L1FinalizeBatchEventSignature, common.HexToHash("26ba82f907317eedc97d0cbef23de76a43dd6edb563bdb6e9407645b950a7a2d"))
 
 	assert.Equal(L1QueueTransactionEventSignature, common.HexToHash("69cfcb8e6d4192b8aba9902243912587f37e550d75c1fa801491fce26717f37e"))
 

bridge/conf/config.json

@@ -79,6 +79,7 @@
       "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

@@ -6,7 +6,7 @@ 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.20230802095950-4b2bbf6225e7
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230804022247-26eeb40ea3ca
 	github.com/smartystreets/goconvey v1.8.0
 	github.com/stretchr/testify v1.8.3
 	github.com/urfave/cli/v2 v2.25.7
@@ -26,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.2 // indirect
+	github.com/holiman/uint256 v1.2.3 // 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

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.2 h1:TXKcSGc2WaxPD2+bmzAsVthL4+pEN0YwXcL5qED83vk=
-github.com/holiman/uint256 v1.2.2/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw=
+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/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=
@@ -104,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.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/go-ethereum v1.10.14-0.20230804022247-26eeb40ea3ca h1:aQKsL9FiCPB6Eo3nuyxmw6aZpAhmFvJsRb7XGtXnOUc=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230804022247-26eeb40ea3ca/go.mod h1:DiN3p2inoXOxGffxSswDKqWjQ7bU+Mp0c9v0XQXKmaA=
 github.com/scroll-tech/zktrie v0.6.0 h1:xLrMAO31Yo2BiPg1jtYKzcjpEFnXy8acbB7iIsyshPs=
 github.com/scroll-tech/zktrie v0.6.0/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=

bridge/internal/config/l2.go

@@ -34,6 +34,7 @@ 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/controller/relayer/l2_relayer.go

@@ -10,6 +10,7 @@ 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/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
 	gethMetrics "github.com/scroll-tech/go-ethereum/metrics"
@@ -171,9 +172,10 @@ func (r *Layer2Relayer) initializeGenesis() error {
 
 	chunk := &types.Chunk{
 		Blocks: []*types.WrappedBlock{{
-			Header:       genesis,
-			Transactions: nil,
-			WithdrawRoot: common.Hash{},
+			Header:         genesis,
+			Transactions:   nil,
+			WithdrawRoot:   common.Hash{},
+			RowConsumption: &gethTypes.RowConsumption{},
 		}},
 	}
 
@@ -266,8 +268,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 err != nil {
-		log.Error("Failed to GetLatestBatch", "err", err)
+	if batch == nil || err != nil {
+		log.Error("Failed to GetLatestBatch", "batch", batch, "err", err)
 		return
 	}
 
@@ -494,6 +496,25 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 		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)
 	}

bridge/internal/controller/watcher/batch_proposer_test.go

@@ -28,6 +28,7 @@ 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,9 +2,11 @@ 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"
 
@@ -14,6 +16,31 @@ 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
@@ -27,6 +54,7 @@ type ChunkProposer struct {
 	maxL1CommitGasPerChunk          uint64
 	maxL1CommitCalldataSizePerChunk uint64
 	minL1CommitCalldataSizePerChunk uint64
+	maxRowConsumptionPerChunk       uint64
 	chunkTimeoutSec                 uint64
 	gasCostIncreaseMultiplier       float64
 }
@@ -43,6 +71,7 @@ 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,
 	}
@@ -95,8 +124,13 @@ 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 {
@@ -135,6 +169,15 @@ 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)
@@ -142,10 +185,16 @@ 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) {
+			p.gasCostIncreaseMultiplier*float64(totalL1CommitGas) > float64(p.maxL1CommitGasPerChunk) ||
+			crc.max() > p.maxRowConsumptionPerChunk {
 			chunk.Blocks = chunk.Blocks[:len(chunk.Blocks)-1] // remove the last block from chunk
 			break
 		}

bridge/internal/controller/watcher/chunk_proposer_test.go

@@ -28,6 +28,7 @@ func testChunkProposer(t *testing.T) {
 		MaxL1CommitGasPerChunk:          50000000000,
 		MaxL1CommitCalldataSizePerChunk: 1000000,
 		MinL1CommitCalldataSizePerChunk: 0,
+		MaxRowConsumptionPerChunk:       1048319,
 		ChunkTimeoutSec:                 300,
 	}, db)
 	cp.TryProposeChunk()
@@ -44,3 +45,28 @@ 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,9 +162,12 @@ 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, err2 := w.BlockByNumber(ctx, big.NewInt(int64(number)))
-		if err2 != nil {
-			return fmt.Errorf("failed to GetBlockByNumber: %v. number: %v", err2, 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)
 		}
 
 		log.Info("retrieved block", "height", block.Header().Number, "hash", block.Header().Hash().String())
@@ -173,11 +176,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),
+			Header:         block.Header(),
+			Transactions:   txsToTxsData(block.Transactions()),
+			WithdrawRoot:   common.BytesToHash(withdrawRoot),
+			RowConsumption: block.RowConsumption,
 		})
 	}
 

bridge/internal/controller/watcher/watcher_test.go

@@ -112,6 +112,7 @@ 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,6 +29,7 @@ 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"`
@@ -68,7 +69,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")
+	db = db.Select("header, transactions, withdraw_root, row_consumption")
 	db = db.Where("chunk_hash IS NULL")
 	db = db.Order("number ASC")
 
@@ -91,6 +92,11 @@ 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)
 	}
 
@@ -134,7 +140,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")
+	db = db.Select("header, transactions, withdraw_root, row_consumption")
 	db = db.Where("number >= ? AND number <= ?", startBlockNumber, endBlockNumber)
 	db = db.Order("number ASC")
 
@@ -162,6 +168,11 @@ 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)
 	}
 
@@ -184,6 +195,12 @@ 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(),
@@ -194,6 +211,7 @@ 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,6 +218,7 @@ 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))
@@ -227,6 +228,7 @@ 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))
 
@@ -235,6 +237,7 @@ 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(bytes32 indexed batchHash);
+  event CommitBatch(uint256 indexed batchIndex, 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(bytes32 indexed batchHash, bytes32 stateRoot, bytes32 withdrawRoot);
+  event FinalizeBatch(uint256 indexed batchIndex, 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,6 +138,17 @@ 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)
@@ -169,18 +180,29 @@ contract MockBridgeL1 {
     }
     bytes32 _batchHash = BatchHeaderV0Codec.computeBatchHash(batchPtr, 89);
     committedBatches[0] = _batchHash;
-    emit CommitBatch(_batchHash);
+    emit CommitBatch(parentBatchIndex + 1, _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(_batchHash, postStateRoot, withdrawRoot);
+    emit FinalizeBatch(batchIndex, _batchHash, postStateRoot, withdrawRoot);
   }
 
   /**********************

bridge/testdata/blockTrace_02.json

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

bridge/testdata/blockTrace_03.json

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

bridge/tests/gas_oracle_test.go

@@ -80,8 +80,9 @@ func testImportL2GasPrice(t *testing.T) {
 					Difficulty: big.NewInt(0),
 					BaseFee:    big.NewInt(0),
 				},
-				Transactions: nil,
-				WithdrawRoot: common.Hash{},
+				Transactions:   nil,
+				WithdrawRoot:   common.Hash{},
+				RowConsumption: &gethTypes.RowConsumption{},
 			},
 		},
 	}
@@ -95,6 +96,7 @@ 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)
 
@@ -102,6 +104,7 @@ 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,9 +45,10 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 			BaseFee:    big.NewInt(0),
 		}
 		wrappedBlocks = append(wrappedBlocks, &types.WrappedBlock{
-			Header:       &header,
-			Transactions: nil,
-			WithdrawRoot: common.Hash{},
+			Header:         &header,
+			Transactions:   nil,
+			WithdrawRoot:   common.Hash{},
+			RowConsumption: &gethTypes.RowConsumption{},
 		})
 	}
 
@@ -61,6 +62,7 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 		MaxL1CommitGasPerChunk:          50000000000,
 		MaxL1CommitCalldataSizePerChunk: 1000000,
 		MinL1CommitCalldataSizePerChunk: 0,
+		MaxRowConsumptionPerChunk:       1048319,
 		ChunkTimeoutSec:                 300,
 	}, db)
 	cp.TryProposeChunk()
@@ -84,6 +86,7 @@ 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))
@@ -122,6 +125,7 @@ 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))

common/cmd/cmd.go

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

common/docker/l2geth/Dockerfile

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

common/docker/l2geth/genesis.json

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

common/docker/l2geth/l2geth_run.sh

@@ -14,4 +14,5 @@ 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.20230802095950-4b2bbf6225e7
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230804022247-26eeb40ea3ca
 	github.com/stretchr/testify v1.8.3
 	github.com/urfave/cli/v2 v2.25.7
 	gorm.io/driver/postgres v1.5.0
@@ -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.2 // indirect
+	github.com/holiman/uint256 v1.2.3 // 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.2 h1:TXKcSGc2WaxPD2+bmzAsVthL4+pEN0YwXcL5qED83vk=
-github.com/holiman/uint256 v1.2.2/go.mod h1:SC8Ryt4n+UBbPbIBKaG9zbbDlp4jOru9xFZmPzLUTxw=
+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/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.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/go-ethereum v1.10.14-0.20230804022247-26eeb40ea3ca h1:aQKsL9FiCPB6Eo3nuyxmw6aZpAhmFvJsRb7XGtXnOUc=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230804022247-26eeb40ea3ca/go.mod h1:DiN3p2inoXOxGffxSswDKqWjQ7bU+Mp0c9v0XQXKmaA=
 github.com/scroll-tech/zktrie v0.6.0 h1:xLrMAO31Yo2BiPg1jtYKzcjpEFnXy8acbB7iIsyshPs=
 github.com/scroll-tech/zktrie v0.6.0/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
 github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=

common/libzkp/impl/Cargo.lock

@@ -32,7 +32,7 @@ dependencies = [
 [[package]]
 name = "aggregator"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
  "ark-std",
  "env_logger 0.10.0",
@@ -432,7 +432,7 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 [[package]]
 name = "bus-mapping"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
  "eth-types",
  "ethers-core",
@@ -1045,7 +1045,7 @@ dependencies = [
 [[package]]
 name = "eth-types"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
  "ethers-core",
  "ethers-signers",
@@ -1223,7 +1223,7 @@ dependencies = [
 [[package]]
 name = "external-tracer"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
  "eth-types",
  "geth-utils",
@@ -1436,7 +1436,7 @@ dependencies = [
 [[package]]
 name = "gadgets"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
  "digest 0.7.6",
  "eth-types",
@@ -1476,7 +1476,7 @@ dependencies = [
 [[package]]
 name = "geth-utils"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
  "env_logger 0.9.3",
  "gobuild 0.1.0-alpha.2 (git+https://github.com/scroll-tech/gobuild.git)",
@@ -1611,10 +1611,26 @@ 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.4#d8f957ffaf2f8f8f7a824d89e4ad4193307644bf"
+source = "git+https://github.com/scroll-tech/mpt-circuit.git?branch=v0.5#1c11b6c9b1245073a76c3ce7100b6798060f7cb8"
 dependencies = [
  "ethers-core",
  "halo2_proofs",
@@ -2058,7 +2074,7 @@ dependencies = [
 [[package]]
 name = "keccak256"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
  "env_logger 0.9.3",
  "eth-types",
@@ -2245,7 +2261,7 @@ dependencies = [
 [[package]]
 name = "mock"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
  "eth-types",
  "ethers-core",
@@ -2260,7 +2276,7 @@ dependencies = [
 [[package]]
 name = "mpt-zktrie"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
  "bus-mapping",
  "eth-types",
@@ -2618,11 +2634,14 @@ dependencies = [
 [[package]]
 name = "poseidon-circuit"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=scroll-dev-0619#50015b7cfbd5fe3263ec683cb291396c1b99cd1f"
+source = "git+https://github.com/scroll-tech/poseidon-circuit.git?branch=scroll-dev-0723#1652d54bf7ca9d8f286b53fe077d9efefdcf6d5f"
 dependencies = [
  "bitvec 1.0.1",
  "halo2_proofs",
  "lazy_static",
+ "log",
+ "rand",
+ "rand_xorshift",
  "thiserror",
 ]
 
@@ -2733,7 +2752,7 @@ dependencies = [
 [[package]]
 name = "prover"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/scroll-prover?rev=b877e67#b877e675e2d8939d03ff8d1f31e567c4f03e6f8d"
+source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.3#337089ac40bac756d88b9ae30a3be1f82538b216"
 dependencies = [
  "aggregator",
  "anyhow",
@@ -3134,6 +3153,23 @@ 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"
@@ -3585,7 +3621,7 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 [[package]]
 name = "snark-verifier"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#6eeba7783d337e0964d0d89de3d4ee8a7856fde6"
+source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#12c306ec57849921e690221b10b8a08189868d4a"
 dependencies = [
  "bytes",
  "ethereum-types 0.14.1",
@@ -3609,7 +3645,7 @@ dependencies = [
 [[package]]
 name = "snark-verifier-sdk"
 version = "0.0.1"
-source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#6eeba7783d337e0964d0d89de3d4ee8a7856fde6"
+source = "git+https://github.com/scroll-tech/snark-verifier?branch=develop#12c306ec57849921e690221b10b8a08189868d4a"
 dependencies = [
  "bincode",
  "env_logger 0.10.0",
@@ -4001,7 +4037,7 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 [[package]]
 name = "types"
 version = "0.4.0"
-source = "git+https://github.com/scroll-tech/scroll-prover?rev=b877e67#b877e675e2d8939d03ff8d1f31e567c4f03e6f8d"
+source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.5.3#337089ac40bac756d88b9ae30a3be1f82538b216"
 dependencies = [
  "base64 0.13.1",
  "blake2",
@@ -4446,7 +4482,7 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 [[package]]
 name = "zkevm-circuits"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?branch=develop#7bca679c45debd8a033f29888af1293a2dbf4feb"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.5.3#2c8c749b3e4a61e89028289f4ff93157c5671d7b"
 dependencies = [
  "array-init",
  "bus-mapping",
@@ -4475,6 +4511,7 @@ dependencies = [
  "rand_chacha",
  "rand_xorshift",
  "rayon",
+ "rmd160-circuits",
  "serde",
  "serde_json",
  "sha3 0.10.8",
@@ -4503,8 +4540,8 @@ dependencies = [
 
 [[package]]
 name = "zktrie"
-version = "0.1.2"
-source = "git+https://github.com/scroll-tech/zktrie.git?branch=scroll-dev-0226#1a5562f663a81ff903383db69dc6c9404b63e69d"
+version = "0.2.0"
+source = "git+https://github.com/scroll-tech/zktrie.git?branch=v0.6#83318659773604fa565e2ebeb810a6d3746f0af4"
 dependencies = [
  "gobuild 0.1.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

common/libzkp/impl/Cargo.toml

@@ -18,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", rev = "b877e67" }
-types = { git = "https://github.com/scroll-tech/scroll-prover", rev = "b877e67" }
+prover = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.3" }
+types = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.5.3" }
 halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "develop" }
 
 log = "0.4"
@@ -33,8 +33,6 @@ 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},
-    ChunkHash, ChunkProof, Proof,
+    BatchProof, ChunkHash, ChunkProof,
 };
 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::<Proof>(proof.as_slice()).unwrap();
+    let proof = serde_json::from_slice::<BatchProof>(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,6 +25,52 @@
         "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,6 +25,8 @@
         "baseFeePerGas": "0x1a2c",
         "hash": "0x13ddd94de9c585c50c6885d4ef649292c2624ae7c8fc73781ee8785f2564b44c"
     },
+    "row_consumption": [
+    ],
     "transactions": [
         {
             "type": 2,

common/testdata/blockTrace_04.json

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

common/testdata/blockTrace_05.json

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

common/testdata/blockTrace_06.json

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

common/testdata/blockTrace_07.json

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

common/testdata/blockTrace_delegate.json

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

common/types/block.go

@@ -14,8 +14,9 @@ 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"`
+	Transactions   []*types.TransactionData `json:"transactions"`
+	WithdrawRoot   common.Hash              `json:"withdraw_trie_root,omitempty"`
+	RowConsumption *types.RowConsumption    `json:"row_consumption"`
 }
 
 // NumL1Messages returns the number of L1 messages in this block.

common/types/errno.go

@@ -0,0 +1,20 @@
+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 "illegal proof type"
+		return fmt.Sprintf("illegal proof type: %d", r)
 	}
 }
 
@@ -58,15 +58,12 @@ type AuthMsg struct {
 
 // Identity contains all the fields to be signed by the prover.
 type Identity struct {
-	// 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"`
+	// 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"`
 }
 
 // GenerateToken generates token

common/types/message/message_test.go

@@ -15,9 +15,9 @@ func TestAuthMessageSignAndVerify(t *testing.T) {
 
 	authMsg := &AuthMsg{
 		Identity: &Identity{
-			Name:    "testName",
-			Version: "testVersion",
-			Token:   "testToken",
+			Challenge:     "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2OTEwMzgxNzUsIm9yaWdfaWF0IjoxNjkxMDM0NTc1fQ.HybBMsEJFhyZqtIa2iVcHUP7CEFttf708jmTMAImAWA",
+			ProverName:    "test",
+			ProverVersion: "v1.0.0",
 		},
 	}
 	assert.NoError(t, authMsg.SignWithKey(privkey))
@@ -46,15 +46,15 @@ func TestGenerateToken(t *testing.T) {
 
 func TestIdentityHash(t *testing.T) {
 	identity := &Identity{
-		Name:       "testName",
-		ProverType: ProofTypeChunk,
-		Version:    "testVersion",
-		Token:      "testToken",
+		Challenge:     "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE2OTEwMzM0MTksIm9yaWdfaWF0IjoxNjkxMDI5ODE5fQ.EhkLZsj__rNPVC3ZDYBtvdh0nB8mmM_Hl82hObaIWOs",
+		ProverName:    "test",
+		ProverVersion: "v1.0.0",
 	}
+
 	hash, err := identity.Hash()
 	assert.NoError(t, err)
 
-	expectedHash := "c0411a19531fb8c6133b2bae91f361c14e65f2d318aef72b83519e6061cad001"
+	expectedHash := "83f5e0ad023e9c1de639ab07b9b4cb972ec9dbbd2524794c533a420a5b137721"
 	assert.Equal(t, expectedHash, hex.EncodeToString(hash))
 }
 
@@ -118,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", illegalProof.String())
+	assert.Equal(t, "illegal proof type: 3", illegalProof.String())
 }
 
 func TestProofMsgPublicKey(t *testing.T) {

common/version/version.go

@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "v4.0.39"
+var tag = "v4.1.13"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

contracts/docs/apis/L1ERC1155Gateway.md

@@ -533,7 +533,7 @@ Emitted when some ERC1155 token is refunded.
 ### UpdateTokenMapping
 
 ```solidity
-event UpdateTokenMapping(address _l1Token, address _l2Token)
+event UpdateTokenMapping(address indexed l1Token, address indexed oldL2Token, address indexed newL2Token)
 ```
 
 Emitted when token mapping for ERC1155 token is updated.
@@ -544,8 +544,9 @@ Emitted when token mapping for ERC1155 token is updated.
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token  | address | The address of ERC1155 token on layer 1. |
-| _l2Token  | address | The address of corresponding ERC1155 token on layer 2. |
+| 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. |
 
 
 

contracts/docs/apis/L1ERC721Gateway.md

@@ -472,7 +472,7 @@ Emitted when some ERC721 token is refunded.
 ### UpdateTokenMapping
 
 ```solidity
-event UpdateTokenMapping(address _l1Token, address _l2Token)
+event UpdateTokenMapping(address indexed l1Token, address indexed oldL2Token, address indexed newL2Token)
 ```
 
 Emitted when token mapping for ERC721 token is updated.
@@ -483,8 +483,9 @@ Emitted when token mapping for ERC721 token is updated.
 
 | Name | Type | Description |
 |---|---|---|
-| _l1Token  | address | The address of ERC721 token on layer 1. |
-| _l2Token  | address | The address of corresponding ERC721 token on layer 2. |
+| 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. |
 
 
 

contracts/docs/apis/L1GatewayRouter.md

@@ -350,7 +350,7 @@ Request ERC20 token transfer from users to gateways.
 ### setDefaultERC20Gateway
 
 ```solidity
-function setDefaultERC20Gateway(address _defaultERC20Gateway) external nonpayable
+function setDefaultERC20Gateway(address _newDefaultERC20Gateway) 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 |
 |---|---|---|
-| _defaultERC20Gateway | address | The address to update. |
+| _newDefaultERC20Gateway | address | undefined |
 
 ### setERC20Gateway
 
@@ -383,7 +383,7 @@ Update the mapping from token address to gateway address.
 ### setETHGateway
 
 ```solidity
-function setETHGateway(address _ethGateway) external nonpayable
+function setETHGateway(address _newEthGateway) external nonpayable
 ```
 
 Update the address of ETH gateway contract.
@@ -394,7 +394,7 @@ Update the address of ETH gateway contract.
 
 | Name | Type | Description |
 |---|---|---|
-| _ethGateway | address | The address to update. |
+| _newEthGateway | address | undefined |
 
 ### transferOwnership
 
@@ -567,7 +567,7 @@ Emitted when some ETH is refunded.
 ### SetDefaultERC20Gateway
 
 ```solidity
-event SetDefaultERC20Gateway(address indexed defaultERC20Gateway)
+event SetDefaultERC20Gateway(address indexed oldDefaultERC20Gateway, address indexed newDefaultERC20Gateway)
 ```
 
 Emitted when the address of default ERC20 Gateway is updated.
@@ -578,12 +578,13 @@ Emitted when the address of default ERC20 Gateway is updated.
 
 | Name | Type | Description |
 |---|---|---|
-| defaultERC20Gateway `indexed` | address | undefined |
+| oldDefaultERC20Gateway `indexed` | address | undefined |
+| newDefaultERC20Gateway `indexed` | address | undefined |
 
 ### SetERC20Gateway
 
 ```solidity
-event SetERC20Gateway(address indexed token, address indexed gateway)
+event SetERC20Gateway(address indexed token, address indexed oldGateway, address indexed newGateway)
 ```
 
 Emitted when the `gateway` for `token` is updated.
@@ -595,12 +596,13 @@ Emitted when the `gateway` for `token` is updated.
 | Name | Type | Description |
 |---|---|---|
 | token `indexed` | address | undefined |
-| gateway `indexed` | address | undefined |
+| oldGateway `indexed` | address | undefined |
+| newGateway `indexed` | address | undefined |
 
 ### SetETHGateway
 
 ```solidity
-event SetETHGateway(address indexed ethGateway)
+event SetETHGateway(address indexed oldETHGateway, address indexed newEthGateway)
 ```
 
 Emitted when the address of ETH Gateway is updated.
@@ -611,7 +613,8 @@ Emitted when the address of ETH Gateway is updated.
 
 | Name | Type | Description |
 |---|---|---|
-| ethGateway `indexed` | address | undefined |
+| oldETHGateway `indexed` | address | undefined |
+| newEthGateway `indexed` | address | undefined |
 
 
 

contracts/docs/apis/L1ScrollMessenger.md

@@ -423,7 +423,7 @@ Update fee vault contract.
 ### updateMaxReplayTimes
 
 ```solidity
-function updateMaxReplayTimes(uint256 _maxReplayTimes) external nonpayable
+function updateMaxReplayTimes(uint256 _newMaxReplayTimes) external nonpayable
 ```
 
 Update max replay times.
@@ -434,7 +434,7 @@ Update max replay times.
 
 | Name | Type | Description |
 |---|---|---|
-| _maxReplayTimes | uint256 | The new max replay times. |
+| _newMaxReplayTimes | uint256 | The new max replay times. |
 
 ### xDomainMessageSender
 
@@ -595,7 +595,7 @@ Emitted when owner updates fee vault contract.
 ### UpdateMaxReplayTimes
 
 ```solidity
-event UpdateMaxReplayTimes(uint256 maxReplayTimes)
+event UpdateMaxReplayTimes(uint256 oldMaxReplayTimes, uint256 newMaxReplayTimes)
 ```
 
 Emitted when the maximum number of times each message can be replayed is updated.
@@ -606,7 +606,8 @@ Emitted when the maximum number of times each message can be replayed is updated
 
 | Name | Type | Description |
 |---|---|---|
-| maxReplayTimes  | uint256 | undefined |
+| oldMaxReplayTimes  | uint256 | undefined |
+| newMaxReplayTimes  | uint256 | undefined |
 
 
 

contracts/docs/apis/L1StandardERC20Gateway.md

@@ -214,6 +214,34 @@ 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
@@ -231,6 +259,22 @@ 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
@@ -293,6 +337,23 @@ 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,6 +212,34 @@ 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
@@ -229,6 +257,22 @@ 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
@@ -291,6 +335,23 @@ 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 _l2Token, address _l1Token)
+event UpdateTokenMapping(address indexed l2Token, address indexed oldL1Token, address indexed newL1Token)
 ```
 
 Emitted when token mapping for ERC1155 token is updated.
@@ -469,8 +469,9 @@ Emitted when token mapping for ERC1155 token is updated.
 
 | Name | Type | Description |
 |---|---|---|
-| _l2Token  | address | The address of corresponding ERC1155 token on layer 2. |
-| _l1Token  | address | The address of ERC1155 token on layer 1. |
+| 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. |
 
 ### WithdrawERC1155
 

contracts/docs/apis/L2ERC721Gateway.md

@@ -400,7 +400,7 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 ### UpdateTokenMapping
 
 ```solidity
-event UpdateTokenMapping(address _l2Token, address _l1Token)
+event UpdateTokenMapping(address indexed l2Token, address indexed oldL1Token, address indexed newL1Token)
 ```
 
 Emitted when token mapping for ERC721 token is updated.
@@ -411,8 +411,9 @@ Emitted when token mapping for ERC721 token is updated.
 
 | Name | Type | Description |
 |---|---|---|
-| _l2Token  | address | The address of corresponding ERC721 token on layer 2. |
-| _l1Token  | address | The address of ERC721 token on layer 1. |
+| 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. |
 
 ### WithdrawERC721
 

contracts/docs/apis/L2GatewayRouter.md

@@ -220,7 +220,7 @@ function renounceOwnership() external nonpayable
 ### setDefaultERC20Gateway
 
 ```solidity
-function setDefaultERC20Gateway(address _defaultERC20Gateway) external nonpayable
+function setDefaultERC20Gateway(address _newDefaultERC20Gateway) 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 |
 |---|---|---|
-| _defaultERC20Gateway | address | The address to update. |
+| _newDefaultERC20Gateway | address | The address to update. |
 
 ### setERC20Gateway
 
@@ -253,7 +253,7 @@ Update the mapping from token address to gateway address.
 ### setETHGateway
 
 ```solidity
-function setETHGateway(address _ethGateway) external nonpayable
+function setETHGateway(address _newEthGateway) external nonpayable
 ```
 
 Update the address of ETH gateway contract.
@@ -264,7 +264,7 @@ Update the address of ETH gateway contract.
 
 | Name | Type | Description |
 |---|---|---|
-| _ethGateway | address | The address to update. |
+| _newEthGateway | address | The address to update. |
 
 ### transferOwnership
 
@@ -473,7 +473,7 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 ### SetDefaultERC20Gateway
 
 ```solidity
-event SetDefaultERC20Gateway(address indexed defaultERC20Gateway)
+event SetDefaultERC20Gateway(address indexed oldDefaultERC20Gateway, address indexed newDefaultERC20Gateway)
 ```
 
 Emitted when the address of default ERC20 Gateway is updated.
@@ -484,12 +484,13 @@ Emitted when the address of default ERC20 Gateway is updated.
 
 | Name | Type | Description |
 |---|---|---|
-| defaultERC20Gateway `indexed` | address | undefined |
+| oldDefaultERC20Gateway `indexed` | address | undefined |
+| newDefaultERC20Gateway `indexed` | address | undefined |
 
 ### SetERC20Gateway
 
 ```solidity
-event SetERC20Gateway(address indexed token, address indexed gateway)
+event SetERC20Gateway(address indexed token, address indexed oldGateway, address indexed newGateway)
 ```
 
 Emitted when the `gateway` for `token` is updated.
@@ -501,12 +502,13 @@ Emitted when the `gateway` for `token` is updated.
 | Name | Type | Description |
 |---|---|---|
 | token `indexed` | address | undefined |
-| gateway `indexed` | address | undefined |
+| oldGateway `indexed` | address | undefined |
+| newGateway `indexed` | address | undefined |
 
 ### SetETHGateway
 
 ```solidity
-event SetETHGateway(address indexed ethGateway)
+event SetETHGateway(address indexed oldETHGateway, address indexed newEthGateway)
 ```
 
 Emitted when the address of ETH Gateway is updated.
@@ -517,7 +519,8 @@ Emitted when the address of ETH Gateway is updated.
 
 | Name | Type | Description |
 |---|---|---|
-| ethGateway `indexed` | address | undefined |
+| oldETHGateway `indexed` | address | undefined |
+| newEthGateway `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, address _feeVault) external nonpayable
+function initialize(address _counterpart) external nonpayable
 ```
 
 
@@ -59,7 +59,6 @@ function initialize(address _counterpart, address _feeVault) external nonpayable
 | Name | Type | Description |
 |---|---|---|
 | _counterpart | address | undefined |
-| _feeVault | address | undefined |
 
 ### isL1MessageExecuted
 
@@ -316,7 +315,7 @@ Update fee vault contract.
 ### updateMaxFailedExecutionTimes
 
 ```solidity
-function updateMaxFailedExecutionTimes(uint256 _maxFailedExecutionTimes) external nonpayable
+function updateMaxFailedExecutionTimes(uint256 _newMaxFailedExecutionTimes) external nonpayable
 ```
 
 Update max failed execution times.
@@ -327,7 +326,7 @@ Update max failed execution times.
 
 | Name | Type | Description |
 |---|---|---|
-| _maxFailedExecutionTimes | uint256 | The new max failed execution times. |
+| _newMaxFailedExecutionTimes | uint256 | The new max failed execution times. |
 
 ### xDomainMessageSender
 
@@ -488,7 +487,7 @@ Emitted when owner updates fee vault contract.
 ### UpdateMaxFailedExecutionTimes
 
 ```solidity
-event UpdateMaxFailedExecutionTimes(uint256 maxFailedExecutionTimes)
+event UpdateMaxFailedExecutionTimes(uint256 oldMaxFailedExecutionTimes, uint256 newMaxFailedExecutionTimes)
 ```
 
 Emitted when the maximum number of times each message can fail in L2 is updated.
@@ -499,7 +498,8 @@ Emitted when the maximum number of times each message can fail in L2 is updated.
 
 | Name | Type | Description |
 |---|---|---|
-| maxFailedExecutionTimes  | uint256 | The new maximum number of times each message can fail in L2. |
+| oldMaxFailedExecutionTimes  | uint256 | undefined |
+| newMaxFailedExecutionTimes  | uint256 | undefined |
 
 
 

contracts/docs/apis/L2StandardERC20Gateway.md

@@ -128,6 +128,34 @@ 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
@@ -162,6 +190,22 @@ 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
@@ -260,6 +304,23 @@ 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,6 +161,34 @@ 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
@@ -178,6 +206,22 @@ 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
@@ -276,6 +320,23 @@ 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,7 +1,6 @@
 /* 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";
 
@@ -28,7 +27,7 @@ describe("ScrollChain", async () => {
     await chain.deployed();
 
     await chain.initialize(queue.address, constants.AddressZero, 44);
-    await chain.updateSequencer(deployer.address, true);
+    await chain.addSequencer(deployer.address);
     await queue.initialize(
       constants.AddressZero,
       chain.address,

contracts/integration-test/ZkEvmVerifierV1.spec.ts

@@ -0,0 +1,77 @@
+/* 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,10 +17,12 @@ 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");
@@ -29,13 +31,16 @@ 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();
@@ -51,12 +56,19 @@ 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(L1_ZKEVM_VERIFIER_ADDR);
+        MultipleVersionRollupVerifier rollupVerifier = new MultipleVersionRollupVerifier(address(zkEvmVerifierV1));
 
         logAddress("L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR", address(rollupVerifier));
     }
@@ -192,6 +204,18 @@ 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,6 +15,7 @@ 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";
@@ -59,6 +60,7 @@ contract DeployL2BridgeContracts is Script {
         deployL2CustomERC20Gateway();
         deployL2ERC721Gateway();
         deployL2ERC1155Gateway();
+        deployL2DAIGateway();
 
         vm.stopBroadcast();
     }
@@ -199,6 +201,18 @@ 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,6 +11,7 @@ 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";
@@ -25,6 +26,9 @@ contract InitializeL1BridgeContracts is Script {
     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");
@@ -37,6 +41,7 @@ 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");
 
@@ -48,6 +53,7 @@ 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");
 
@@ -60,8 +66,8 @@ contract InitializeL1BridgeContracts is Script {
             L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR,
             MAX_L2_TX_IN_CHUNK
         );
-        ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).updateSequencer(L1_ROLLUP_OPERATOR_ADDR, true);
-        ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).updateProver(L1_ROLLUP_OPERATOR_ADDR, true);
+        ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).addSequencer(L1_ROLLUP_OPERATOR_ADDR);
+        ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).addProver(L1_ROLLUP_OPERATOR_ADDR);
 
         // initialize L2GasPriceOracle
         L2GasPriceOracle(L2_GAS_PRICE_ORACLE_PROXY_ADDR).initialize(
@@ -143,12 +149,22 @@ contract InitializeL1BridgeContracts is Script {
             L1_SCROLL_MESSENGER_PROXY_ADDR
         );
 
-        // set WETH gateway in router
+        // 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
         {
-            address[] memory _tokens = new address[](1);
+            address[] memory _tokens = new address[](2);
             _tokens[0] = L1_WETH_ADDR;
-            address[] memory _gateways = new address[](1);
+            _tokens[1] = L1_DAI_ADDR;
+            address[] memory _gateways = new address[](2);
             _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,6 +11,7 @@ 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";
@@ -22,6 +23,9 @@ 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");
@@ -30,6 +34,7 @@ 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");
@@ -44,6 +49,7 @@ 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 {
@@ -59,10 +65,7 @@ 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,
-            L2_TX_FEE_VAULT_ADDR
-        );
+        L2ScrollMessenger(payable(L2_SCROLL_MESSENGER_PROXY_ADDR)).initialize(L1_SCROLL_MESSENGER_PROXY_ADDR);
 
         // initialize L2GatewayRouter
         L2GatewayRouter(L2_GATEWAY_ROUTER_PROXY_ADDR).initialize(
@@ -111,12 +114,22 @@ contract InitializeL2BridgeContracts is Script {
             L2_SCROLL_MESSENGER_PROXY_ADDR
         );
 
-        // set WETH gateway in router
+        // 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
         {
-            address[] memory _tokens = new address[](1);
+            address[] memory _tokens = new address[](2);
             _tokens[0] = L2_WETH_ADDR;
-            address[] memory _gateways = new address[](1);
+            _tokens[1] = L2_DAI_ADDR;
+            address[] memory _gateways = new address[](2);
             _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,8 +10,9 @@ interface IL1ScrollMessenger is IScrollMessenger {
      **********/
 
     /// @notice Emitted when the maximum number of times each message can be replayed is updated.
-    /// @param maxReplayTimes The new maximum number of times each message can be replayed.
-    event UpdateMaxReplayTimes(uint256 maxReplayTimes);
+    /// @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);
 
     /***********
      * Structs *

contracts/src/L1/L1ScrollMessenger.sol

@@ -2,15 +2,12 @@
 
 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";
@@ -28,7 +25,7 @@ import {IMessageDropCallback} from "../libraries/callbacks/IMessageDropCallback.
 ///
 /// @dev All deposited Ether (including `WETH` deposited throng `L1WETHGateway`) will locked in
 /// this contract.
-contract L1ScrollMessenger is PausableUpgradeable, ScrollMessengerBase, IL1ScrollMessenger {
+contract L1ScrollMessenger is ScrollMessengerBase, IL1ScrollMessenger {
     /***********
      * Structs *
      ***********/
@@ -97,8 +94,7 @@ contract L1ScrollMessenger is PausableUpgradeable, ScrollMessengerBase, IL1Scrol
         address _rollup,
         address _messageQueue
     ) public initializer {
-        PausableUpgradeable.__Pausable_init();
-        ScrollMessengerBase._initialize(_counterpart, _feeVault);
+        ScrollMessengerBase.__ScrollMessengerBase_init(_counterpart, _feeVault);
 
         rollup = _rollup;
         messageQueue = _messageQueue;
@@ -295,24 +291,14 @@ contract L1ScrollMessenger is PausableUpgradeable, ScrollMessengerBase, IL1Scrol
      * 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 _maxReplayTimes The new max replay times.
-    function updateMaxReplayTimes(uint256 _maxReplayTimes) external onlyOwner {
-        maxReplayTimes = _maxReplayTimes;
+    /// @param _newMaxReplayTimes The new max replay times.
+    function updateMaxReplayTimes(uint256 _newMaxReplayTimes) external onlyOwner {
+        uint256 _oldMaxReplayTimes = maxReplayTimes;
+        maxReplayTimes = _newMaxReplayTimes;
 
-        emit UpdateMaxReplayTimes(_maxReplayTimes);
+        emit UpdateMaxReplayTimes(_oldMaxReplayTimes, _newMaxReplayTimes);
     }
 
     /**********************

contracts/src/L1/gateways/IL1GatewayRouter.sol

@@ -11,17 +11,20 @@ interface IL1GatewayRouter is IL1ETHGateway, IL1ERC20Gateway {
      **********/
 
     /// @notice Emitted when the address of ETH Gateway is updated.
-    /// @param ethGateway The address of new ETH Gateway.
-    event SetETHGateway(address indexed ethGateway);
+    /// @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);
 
     /// @notice Emitted when the address of default ERC20 Gateway is updated.
-    /// @param defaultERC20Gateway The address of new default ERC20 Gateway.
-    event SetDefaultERC20Gateway(address indexed defaultERC20Gateway);
+    /// @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);
 
     /// @notice Emitted when the `gateway` for `token` is updated.
     /// @param token The address of token updated.
-    /// @param gateway The corresponding address of gateway updated.
-    event SetERC20Gateway(address indexed token, address indexed gateway);
+    /// @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);
 
     /*************************
      * Public View Functions *

contracts/src/L1/gateways/L1CustomERC20Gateway.sol

@@ -2,7 +2,6 @@
 
 pragma solidity =0.8.16;
 
-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
 
@@ -18,7 +17,7 @@ import {L1ERC20Gateway} from "./L1ERC20Gateway.sol";
 /// finalize withdraw the tokens from layer 2.
 /// @dev The deposited tokens are held in this gateway. On finalizing withdraw, the corresponding
 /// tokens will be transfer to the recipient directly.
-contract L1CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L1ERC20Gateway {
+contract L1CustomERC20Gateway is L1ERC20Gateway {
     using SafeERC20Upgradeable for IERC20Upgradeable;
 
     /**********
@@ -26,9 +25,10 @@ contract L1CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L1ERC20G
      **********/
 
     /// @notice Emitted when token mapping for ERC20 token is updated.
-    /// @param _l1Token The address of ERC20 token on layer 1.
-    /// @param _l2Token The address of corresponding ERC20 token on layer 2.
-    event UpdateTokenMapping(address _l1Token, address _l2Token);
+    /// @param l1Token The address of ERC20 token in layer 1.
+    /// @param oldL2Token The address of the old corresponding ERC20 token in layer 2.
+    /// @param newL2Token The address of the new corresponding ERC20 token in layer 2.
+    event UpdateTokenMapping(address indexed l1Token, address indexed oldL2Token, address indexed newL2Token);
 
     /*************
      * Variables *
@@ -56,7 +56,6 @@ contract L1CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L1ERC20G
     ) external initializer {
         require(_router != address(0), "zero router address");
 
-        OwnableUpgradeable.__Ownable_init();
         ScrollGatewayBase._initialize(_counterpart, _router, _messenger);
     }
 
@@ -79,9 +78,10 @@ contract L1CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L1ERC20G
     function updateTokenMapping(address _l1Token, address _l2Token) external onlyOwner {
         require(_l2Token != address(0), "token address cannot be 0");
 
+        address _oldL2Token = tokenMapping[_l1Token];
         tokenMapping[_l1Token] = _l2Token;
 
-        emit UpdateTokenMapping(_l1Token, _l2Token);
+        emit UpdateTokenMapping(_l1Token, _oldL2Token, _l2Token);
     }
 
     /**********************

contracts/src/L1/gateways/L1DAIGateway.sol

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity =0.8.16;
+
+import {L1CustomERC20Gateway} from "./L1CustomERC20Gateway.sol";
+
+// solhint-disable no-empty-blocks
+
+contract L1DAIGateway is L1CustomERC20Gateway {
+
+}

contracts/src/L1/gateways/L1ERC1155Gateway.sol

@@ -2,7 +2,6 @@
 
 pragma solidity =0.8.16;
 
-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import {IERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/IERC1155Upgradeable.sol";
 import {ERC1155HolderUpgradeable, ERC1155ReceiverUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/utils/ERC1155HolderUpgradeable.sol";
 
@@ -20,21 +19,16 @@ import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 /// NFT will be transfer to the recipient directly.
 ///
 /// This will be changed if we have more specific scenarios.
-contract L1ERC1155Gateway is
-    OwnableUpgradeable,
-    ERC1155HolderUpgradeable,
-    ScrollGatewayBase,
-    IL1ERC1155Gateway,
-    IMessageDropCallback
-{
+contract L1ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL1ERC1155Gateway, IMessageDropCallback {
     /**********
      * Events *
      **********/
 
     /// @notice Emitted when token mapping for ERC1155 token is updated.
-    /// @param _l1Token The address of ERC1155 token on layer 1.
-    /// @param _l2Token The address of corresponding ERC1155 token on layer 2.
-    event UpdateTokenMapping(address _l1Token, address _l2Token);
+    /// @param l1Token The address of ERC1155 token in layer 1.
+    /// @param oldL2Token The address of the old corresponding ERC1155 token in layer 2.
+    /// @param newL2Token The address of the new corresponding ERC1155 token in layer 2.
+    event UpdateTokenMapping(address indexed l1Token, address indexed oldL2Token, address indexed newL2Token);
 
     /*************
      * Variables *
@@ -55,7 +49,6 @@ contract L1ERC1155Gateway is
     /// @param _counterpart The address of L2ERC1155Gateway in L2.
     /// @param _messenger The address of L1ScrollMessenger.
     function initialize(address _counterpart, address _messenger) external initializer {
-        OwnableUpgradeable.__Ownable_init();
         ERC1155HolderUpgradeable.__ERC1155Holder_init();
         ERC1155ReceiverUpgradeable.__ERC1155Receiver_init();
 
@@ -177,9 +170,10 @@ contract L1ERC1155Gateway is
     function updateTokenMapping(address _l1Token, address _l2Token) external onlyOwner {
         require(_l2Token != address(0), "token address cannot be 0");
 
+        address _oldL2Token = tokenMapping[_l1Token];
         tokenMapping[_l1Token] = _l2Token;
 
-        emit UpdateTokenMapping(_l1Token, _l2Token);
+        emit UpdateTokenMapping(_l1Token, _oldL2Token, _l2Token);
     }
 
     /**********************

contracts/src/L1/gateways/L1ERC20Gateway.sol

@@ -2,14 +2,12 @@
 
 pragma solidity ^0.8.16;
 
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
+import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
 
 import {IL1ERC20Gateway} from "./IL1ERC20Gateway.sol";
 import {IL1GatewayRouter} from "./IL1GatewayRouter.sol";
 
-import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
-
 import {IL2ERC20Gateway} from "../../L2/gateways/IL2ERC20Gateway.sol";
 import {IScrollMessenger} from "../../libraries/IScrollMessenger.sol";
 import {ScrollConstants} from "../../libraries/constants/ScrollConstants.sol";
@@ -19,7 +17,7 @@ import {IMessageDropCallback} from "../../libraries/callbacks/IMessageDropCallba
 // solhint-disable no-empty-blocks
 
 abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, ScrollGatewayBase {
-    using SafeERC20 for IERC20;
+    using SafeERC20Upgradeable for IERC20Upgradeable;
 
     /*************
      * Variables *
@@ -75,7 +73,7 @@ abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, Scrol
 
         // @note can possible trigger reentrant call to this contract or messenger,
         // but it seems not a big problem.
-        IERC20(_l1Token).safeTransfer(_to, _amount);
+        IERC20Upgradeable(_l1Token).safeTransfer(_to, _amount);
 
         _doCallback(_to, _data);
 
@@ -96,7 +94,7 @@ abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, Scrol
         // do dome check for each custom gateway
         _beforeDropMessage(_token, _receiver, _amount);
 
-        IERC20(_token).safeTransfer(_receiver, _amount);
+        IERC20Upgradeable(_token).safeTransfer(_receiver, _amount);
 
         emit RefundERC20(_token, _receiver, _amount);
     }
@@ -154,9 +152,9 @@ abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, Scrol
             _amount = IL1GatewayRouter(msg.sender).requestERC20(_from, _token, _amount);
         } else {
             // common practice to handle fee on transfer token.
-            uint256 _before = IERC20(_token).balanceOf(address(this));
-            IERC20(_token).safeTransferFrom(_from, address(this), _amount);
-            uint256 _after = IERC20(_token).balanceOf(address(this));
+            uint256 _before = IERC20Upgradeable(_token).balanceOf(address(this));
+            IERC20Upgradeable(_token).safeTransferFrom(_from, address(this), _amount);
+            uint256 _after = IERC20Upgradeable(_token).balanceOf(address(this));
             // no unchecked here, since some weird token may return arbitrary balance.
             _amount = _after - _before;
         }

contracts/src/L1/gateways/L1ERC721Gateway.sol

@@ -2,7 +2,6 @@
 
 pragma solidity =0.8.16;
 
-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import {IERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721Upgradeable.sol";
 import {ERC721HolderUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/utils/ERC721HolderUpgradeable.sol";
 
@@ -20,21 +19,16 @@ import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 /// NFT will be transfer to the recipient directly.
 ///
 /// This will be changed if we have more specific scenarios.
-contract L1ERC721Gateway is
-    OwnableUpgradeable,
-    ERC721HolderUpgradeable,
-    ScrollGatewayBase,
-    IL1ERC721Gateway,
-    IMessageDropCallback
-{
+contract L1ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL1ERC721Gateway, IMessageDropCallback {
     /**********
      * Events *
      **********/
 
     /// @notice Emitted when token mapping for ERC721 token is updated.
-    /// @param _l1Token The address of ERC721 token on layer 1.
-    /// @param _l2Token The address of corresponding ERC721 token on layer 2.
-    event UpdateTokenMapping(address _l1Token, address _l2Token);
+    /// @param l1Token The address of ERC721 token in layer 1.
+    /// @param oldL2Token The address of the old corresponding ERC721 token in layer 2.
+    /// @param newL2Token The address of the new corresponding ERC721 token in layer 2.
+    event UpdateTokenMapping(address indexed l1Token, address indexed oldL2Token, address indexed newL2Token);
 
     /*************
      * Variables *
@@ -55,7 +49,6 @@ contract L1ERC721Gateway is
     /// @param _counterpart The address of L2ERC721Gateway in L2.
     /// @param _messenger The address of L1ScrollMessenger.
     function initialize(address _counterpart, address _messenger) external initializer {
-        OwnableUpgradeable.__Ownable_init();
         ERC721HolderUpgradeable.__ERC721Holder_init();
 
         ScrollGatewayBase._initialize(_counterpart, address(0), _messenger);
@@ -173,9 +166,10 @@ contract L1ERC721Gateway is
     function updateTokenMapping(address _l1Token, address _l2Token) external onlyOwner {
         require(_l2Token != address(0), "token address cannot be 0");
 
+        address _oldL2Token = tokenMapping[_l1Token];
         tokenMapping[_l1Token] = _l2Token;
 
-        emit UpdateTokenMapping(_l1Token, _l2Token);
+        emit UpdateTokenMapping(_l1Token, _oldL2Token, _l2Token);
     }
 
     /**********************

contracts/src/L1/gateways/L1ETHGateway.sol

@@ -2,8 +2,6 @@
 
 pragma solidity =0.8.16;
 
-import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-
 import {IL2ETHGateway} from "../../L2/gateways/IL2ETHGateway.sol";
 import {IL1ScrollMessenger} from "../IL1ScrollMessenger.sol";
 import {IL1ETHGateway} from "./IL1ETHGateway.sol";
@@ -18,7 +16,7 @@ import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 /// finalize withdraw ETH from layer 2.
 /// @dev The deposited ETH tokens are held in this gateway. On finalizing withdraw, the corresponding
 /// ETH will be transfer to the recipient directly.
-contract L1ETHGateway is Initializable, ScrollGatewayBase, IL1ETHGateway, IMessageDropCallback {
+contract L1ETHGateway is ScrollGatewayBase, IL1ETHGateway, IMessageDropCallback {
     /***************
      * Constructor *
      ***************/

contracts/src/L1/gateways/L1GatewayRouter.sol

@@ -6,8 +6,6 @@ import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Own
 import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
 
-import {IScrollGateway} from "../../libraries/gateway/IScrollGateway.sol";
-import {IL1ScrollMessenger} from "../IL1ScrollMessenger.sol";
 import {IL1ETHGateway} from "./IL1ETHGateway.sol";
 import {IL1ERC20Gateway} from "./IL1ERC20Gateway.sol";
 import {IL1GatewayRouter} from "./IL1GatewayRouter.sol";
@@ -68,13 +66,13 @@ contract L1GatewayRouter is OwnableUpgradeable, IL1GatewayRouter {
         // it can be zero during initialization
         if (_defaultERC20Gateway != address(0)) {
             defaultERC20Gateway = _defaultERC20Gateway;
-            emit SetDefaultERC20Gateway(_defaultERC20Gateway);
+            emit SetDefaultERC20Gateway(address(0), _defaultERC20Gateway);
         }
 
         // it can be zero during initialization
         if (_ethGateway != address(0)) {
             ethGateway = _ethGateway;
-            emit SetETHGateway(_ethGateway);
+            emit SetETHGateway(address(0), _ethGateway);
         }
     }
 
@@ -225,17 +223,19 @@ contract L1GatewayRouter is OwnableUpgradeable, IL1GatewayRouter {
      ************************/
 
     /// @inheritdoc IL1GatewayRouter
-    function setETHGateway(address _ethGateway) external onlyOwner {
-        ethGateway = _ethGateway;
+    function setETHGateway(address _newEthGateway) external onlyOwner {
+        address _oldETHGateway = ethGateway;
+        ethGateway = _newEthGateway;
 
-        emit SetETHGateway(_ethGateway);
+        emit SetETHGateway(_oldETHGateway, _newEthGateway);
     }
 
     /// @inheritdoc IL1GatewayRouter
-    function setDefaultERC20Gateway(address _defaultERC20Gateway) external onlyOwner {
-        defaultERC20Gateway = _defaultERC20Gateway;
+    function setDefaultERC20Gateway(address _newDefaultERC20Gateway) external onlyOwner {
+        address _oldDefaultERC20Gateway = defaultERC20Gateway;
+        defaultERC20Gateway = _newDefaultERC20Gateway;
 
-        emit SetDefaultERC20Gateway(_defaultERC20Gateway);
+        emit SetDefaultERC20Gateway(_oldDefaultERC20Gateway, _newDefaultERC20Gateway);
     }
 
     /// @inheritdoc IL1GatewayRouter
@@ -243,9 +243,10 @@ contract L1GatewayRouter is OwnableUpgradeable, IL1GatewayRouter {
         require(_tokens.length == _gateways.length, "length mismatch");
 
         for (uint256 i = 0; i < _tokens.length; i++) {
+            address _oldGateway = ERC20Gateway[_tokens[i]];
             ERC20Gateway[_tokens[i]] = _gateways[i];
 
-            emit SetERC20Gateway(_tokens[i], _gateways[i]);
+            emit SetERC20Gateway(_tokens[i], _oldGateway, _gateways[i]);
         }
     }
 }

contracts/src/L1/gateways/L1StandardERC20Gateway.sol

@@ -2,12 +2,9 @@
 
 pragma solidity =0.8.16;
 
-import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import {Clones} from "@openzeppelin/contracts/proxy/Clones.sol";
+import {ClonesUpgradeable} from "@openzeppelin/contracts-upgradeable/proxy/ClonesUpgradeable.sol";
+import {IERC20MetadataUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20MetadataUpgradeable.sol";
 
-import {IERC20Metadata} from "../../interfaces/IERC20Metadata.sol";
 import {IL2ERC20Gateway} from "../../L2/gateways/IL2ERC20Gateway.sol";
 import {IL1ScrollMessenger} from "../IL1ScrollMessenger.sol";
 import {IL1ERC20Gateway} from "./IL1ERC20Gateway.sol";
@@ -21,9 +18,7 @@ import {L1ERC20Gateway} from "./L1ERC20Gateway.sol";
 /// @dev The deposited ERC20 tokens are held in this gateway. On finalizing withdraw, the corresponding
 /// token will be transfer to the recipient directly. Any ERC20 that requires non-standard functionality
 /// should use a separate gateway.
-contract L1StandardERC20Gateway is Initializable, ScrollGatewayBase, L1ERC20Gateway {
-    using SafeERC20 for IERC20;
-
+contract L1StandardERC20Gateway is L1ERC20Gateway {
     /*************
      * Variables *
      *************/
@@ -81,7 +76,7 @@ contract L1StandardERC20Gateway is Initializable, ScrollGatewayBase, L1ERC20Gate
         // we can calculate the l2 address directly.
         bytes32 _salt = keccak256(abi.encodePacked(counterpart, keccak256(abi.encodePacked(_l1Token))));
 
-        return Clones.predictDeterministicAddress(l2TokenImplementation, _salt, l2TokenFactory);
+        return ClonesUpgradeable.predictDeterministicAddress(l2TokenImplementation, _salt, l2TokenFactory);
     }
 
     /**********************
@@ -143,9 +138,9 @@ contract L1StandardERC20Gateway is Initializable, ScrollGatewayBase, L1ERC20Gate
             _l2Token = getL2ERC20Address(_token);
 
             // passing symbol/name/decimal in order to deploy in L2.
-            string memory _symbol = IERC20Metadata(_token).symbol();
-            string memory _name = IERC20Metadata(_token).name();
-            uint8 _decimals = IERC20Metadata(_token).decimals();
+            string memory _symbol = IERC20MetadataUpgradeable(_token).symbol();
+            string memory _name = IERC20MetadataUpgradeable(_token).name();
+            uint8 _decimals = IERC20MetadataUpgradeable(_token).decimals();
             _l2Data = abi.encode(true, abi.encode(_data, abi.encode(_symbol, _name, _decimals)));
         } else {
             _l2Data = abi.encode(false, _data);

contracts/src/L1/gateways/L1WETHGateway.sol

@@ -2,10 +2,6 @@
 
 pragma solidity =0.8.16;
 
-import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-
 import {IWETH} from "../../interfaces/IWETH.sol";
 import {IL2ERC20Gateway} from "../../L2/gateways/IL2ERC20Gateway.sol";
 import {IL1ScrollMessenger} from "../IL1ScrollMessenger.sol";
@@ -21,9 +17,7 @@ import {L1ERC20Gateway} from "./L1ERC20Gateway.sol";
 /// as Ether and then the Ether will be sent to the `L1ScrollMessenger` contract.
 /// On finalizing withdraw, the Ether will be transfered from `L1ScrollMessenger`, then
 /// wrapped as WETH and finally transfer to recipient.
-contract L1WETHGateway is Initializable, ScrollGatewayBase, L1ERC20Gateway {
-    using SafeERC20 for IERC20;
-
+contract L1WETHGateway is L1ERC20Gateway {
     /*************
      * Constants *
      *************/

contracts/src/L1/rollup/L1MessageQueue.sol

@@ -24,12 +24,12 @@ contract L1MessageQueue is OwnableUpgradeable, IL1MessageQueue {
     /// @notice Emitted when owner updates gas oracle contract.
     /// @param _oldGasOracle The address of old gas oracle contract.
     /// @param _newGasOracle The address of new gas oracle contract.
-    event UpdateGasOracle(address _oldGasOracle, address _newGasOracle);
+    event UpdateGasOracle(address indexed _oldGasOracle, address indexed _newGasOracle);
 
     /// @notice Emitted when owner updates EnforcedTxGateway contract.
     /// @param _oldGateway The address of old EnforcedTxGateway contract.
     /// @param _newGateway The address of new EnforcedTxGateway contract.
-    event UpdateEnforcedTxGateway(address _oldGateway, address _newGateway);
+    event UpdateEnforcedTxGateway(address indexed _oldGateway, address indexed _newGateway);
 
     /// @notice Emitted when owner updates max gas limit.
     /// @param _oldMaxGasLimit The old max gas limit.

contracts/src/L1/rollup/L2GasPriceOracle.sol

@@ -19,8 +19,9 @@ contract L2GasPriceOracle is OwnableUpgradeable, IL2GasPriceOracle {
     event UpdateWhitelist(address _oldWhitelist, address _newWhitelist);
 
     /// @notice Emitted when current l2 base fee is updated.
-    /// @param l2BaseFee The current l2 base fee updated.
-    event L2BaseFeeUpdated(uint256 l2BaseFee);
+    /// @param oldL2BaseFee The original l2 base fee before update.
+    /// @param newL2BaseFee The current l2 base fee updated.
+    event L2BaseFeeUpdated(uint256 oldL2BaseFee, uint256 newL2BaseFee);
 
     /// @notice Emitted when intrinsic params are updated.
     /// @param txGas The intrinsic gas for transaction.
@@ -130,13 +131,14 @@ contract L2GasPriceOracle is OwnableUpgradeable, IL2GasPriceOracle {
     }
 
     /// @notice Allows the owner to modify the l2 base fee.
-    /// @param _l2BaseFee The new l2 base fee.
-    function setL2BaseFee(uint256 _l2BaseFee) external {
+    /// @param _newL2BaseFee The new l2 base fee.
+    function setL2BaseFee(uint256 _newL2BaseFee) external {
         require(whitelist.isSenderAllowed(msg.sender), "Not whitelisted sender");
 
-        l2BaseFee = _l2BaseFee;
+        uint256 _oldL2BaseFee = l2BaseFee;
+        l2BaseFee = _newL2BaseFee;
 
-        emit L2BaseFeeUpdated(_l2BaseFee);
+        emit L2BaseFeeUpdated(_oldL2BaseFee, _newL2BaseFee);
     }
 
     /************************

contracts/src/L1/rollup/ScrollChain.sol

@@ -3,6 +3,7 @@
 pragma solidity =0.8.16;
 
 import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
 
 import {IL1MessageQueue} from "./IL1MessageQueue.sol";
 import {IScrollChain} from "./IScrollChain.sol";
@@ -15,7 +16,7 @@ import {IRollupVerifier} from "../../libraries/verifier/IRollupVerifier.sol";
 
 /// @title ScrollChain
 /// @notice This contract maintains data for the Scroll rollup.
-contract ScrollChain is OwnableUpgradeable, IScrollChain {
+contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
     /**********
      * Events *
      **********/
@@ -33,7 +34,7 @@ contract ScrollChain is OwnableUpgradeable, IScrollChain {
     /// @notice Emitted when the address of rollup verifier is updated.
     /// @param oldVerifier The address of old rollup verifier.
     /// @param newVerifier The address of new rollup verifier.
-    event UpdateVerifier(address oldVerifier, address newVerifier);
+    event UpdateVerifier(address indexed oldVerifier, address indexed newVerifier);
 
     /// @notice Emitted when the value of `maxNumL2TxInChunk` is updated.
     /// @param oldMaxNumL2TxInChunk The old value of `maxNumL2TxInChunk`.
@@ -165,7 +166,7 @@ contract ScrollChain is OwnableUpgradeable, IScrollChain {
         bytes calldata _parentBatchHeader,
         bytes[] memory _chunks,
         bytes calldata _skippedL1MessageBitmap
-    ) external override OnlySequencer {
+    ) external override OnlySequencer whenNotPaused {
         require(_version == 0, "invalid version");
 
         // check whether the batch is empty
@@ -291,7 +292,7 @@ contract ScrollChain is OwnableUpgradeable, IScrollChain {
         bytes32 _postStateRoot,
         bytes32 _withdrawRoot,
         bytes calldata _aggrProof
-    ) external override OnlyProver {
+    ) external override OnlyProver whenNotPaused {
         require(_prevStateRoot != bytes32(0), "previous state root is zero");
         require(_postStateRoot != bytes32(0), "new state root is zero");
 
@@ -355,24 +356,36 @@ contract ScrollChain is OwnableUpgradeable, IScrollChain {
      * Restricted Functions *
      ************************/
 
-    /// @notice Update the status of sequencer.
-    /// @dev This function can only called by contract owner.
-    /// @param _account The address of account to update.
-    /// @param _status The status of the account to update.
-    function updateSequencer(address _account, bool _status) external onlyOwner {
-        isSequencer[_account] = _status;
+    /// @notice Add an account to the sequencer list.
+    /// @param _account The address of account to add.
+    function addSequencer(address _account) external onlyOwner {
+        isSequencer[_account] = true;
 
-        emit UpdateSequencer(_account, _status);
+        emit UpdateSequencer(_account, true);
     }
 
-    /// @notice Update the status of prover.
-    /// @dev This function can only called by contract owner.
-    /// @param _account The address of account to update.
-    /// @param _status The status of the account to update.
-    function updateProver(address _account, bool _status) external onlyOwner {
-        isProver[_account] = _status;
+    /// @notice Remove an account from the sequencer list.
+    /// @param _account The address of account to remove.
+    function removeSequencer(address _account) external onlyOwner {
+        isSequencer[_account] = false;
 
-        emit UpdateProver(_account, _status);
+        emit UpdateSequencer(_account, false);
+    }
+
+    /// @notice Add an account to the prover list.
+    /// @param _account The address of account to add.
+    function addProver(address _account) external onlyOwner {
+        isProver[_account] = true;
+
+        emit UpdateProver(_account, true);
+    }
+
+    /// @notice Add an account from the prover list.
+    /// @param _account The address of account to remove.
+    function removeProver(address _account) external onlyOwner {
+        isProver[_account] = false;
+
+        emit UpdateProver(_account, false);
     }
 
     /// @notice Update the address verifier contract.
@@ -393,6 +406,16 @@ contract ScrollChain is OwnableUpgradeable, IScrollChain {
         emit UpdateMaxNumL2TxInChunk(_oldMaxNumL2TxInChunk, _maxNumL2TxInChunk);
     }
 
+    /// @notice Pause the contract
+    /// @param _status The pause status to update.
+    function setPause(bool _status) external onlyOwner {
+        if (_status) {
+            _pause();
+        } else {
+            _unpause();
+        }
+    }
+
     /**********************
      * Internal Functions *
      **********************/

contracts/src/L2/IL2ScrollMessenger.sol

@@ -5,6 +5,15 @@ pragma solidity ^0.8.16;
 import {IScrollMessenger} from "../libraries/IScrollMessenger.sol";
 
 interface IL2ScrollMessenger is IScrollMessenger {
+    /**********
+     * Events *
+     **********/
+
+    /// @notice Emitted when the maximum number of times each message can fail in L2 is updated.
+    /// @param oldMaxFailedExecutionTimes The old maximum number of times each message can fail in L2.
+    /// @param newMaxFailedExecutionTimes The new maximum number of times each message can fail in L2.
+    event UpdateMaxFailedExecutionTimes(uint256 oldMaxFailedExecutionTimes, uint256 newMaxFailedExecutionTimes);
+
     /*****************************
      * Public Mutating Functions *
      *****************************/

contracts/src/L2/L2ScrollMessenger.sol

@@ -2,12 +2,8 @@
 
 pragma solidity =0.8.16;
 
-import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/PausableUpgradeable.sol";
-
 import {IL2ScrollMessenger} from "./IL2ScrollMessenger.sol";
 import {L2MessageQueue} from "./predeploys/L2MessageQueue.sol";
-import {IL1BlockContainer} from "./predeploys/IL1BlockContainer.sol";
-import {IL1GasPriceOracle} from "./predeploys/IL1GasPriceOracle.sol";
 
 import {PatriciaMerkleTrieVerifier} from "../libraries/verifier/PatriciaMerkleTrieVerifier.sol";
 import {ScrollConstants} from "../libraries/constants/ScrollConstants.sol";
@@ -26,15 +22,7 @@ import {ScrollMessengerBase} from "../libraries/ScrollMessengerBase.sol";
 ///
 /// @dev It should be a predeployed contract on layer 2 and should hold infinite amount
 /// of Ether (Specifically, `uint256(-1)`), which can be initialized in Genesis Block.
-contract L2ScrollMessenger is ScrollMessengerBase, PausableUpgradeable, IL2ScrollMessenger {
-    /**********
-     * Events *
-     **********/
-
-    /// @notice Emitted when the maximum number of times each message can fail in L2 is updated.
-    /// @param maxFailedExecutionTimes The new maximum number of times each message can fail in L2.
-    event UpdateMaxFailedExecutionTimes(uint256 maxFailedExecutionTimes);
-
+contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
     /*************
      * Constants *
      *************/
@@ -68,9 +56,8 @@ contract L2ScrollMessenger is ScrollMessengerBase, PausableUpgradeable, IL2Scrol
         messageQueue = _messageQueue;
     }
 
-    function initialize(address _counterpart, address _feeVault) external initializer {
-        PausableUpgradeable.__Pausable_init();
-        ScrollMessengerBase._initialize(_counterpart, _feeVault);
+    function initialize(address _counterpart) external initializer {
+        ScrollMessengerBase.__ScrollMessengerBase_init(_counterpart, address(0));
 
         maxFailedExecutionTimes = 3;
     }
@@ -122,26 +109,16 @@ contract L2ScrollMessenger is ScrollMessengerBase, PausableUpgradeable, IL2Scrol
      * Restricted Functions *
      ************************/
 
-    /// @notice Pause the contract
-    /// @dev This function can only called by contract owner.
-    /// @param _status The pause status to update.
-    function setPause(bool _status) external onlyOwner {
-        if (_status) {
-            _pause();
-        } else {
-            _unpause();
-        }
-    }
-
     /// @notice Update max failed execution times.
     /// @dev This function can only called by contract owner.
-    /// @param _maxFailedExecutionTimes The new max failed execution times.
-    function updateMaxFailedExecutionTimes(uint256 _maxFailedExecutionTimes) external onlyOwner {
-        require(_maxFailedExecutionTimes > 0, "maxFailedExecutionTimes cannot be zero");
+    /// @param _newMaxFailedExecutionTimes The new max failed execution times.
+    function updateMaxFailedExecutionTimes(uint256 _newMaxFailedExecutionTimes) external onlyOwner {
+        require(_newMaxFailedExecutionTimes > 0, "maxFailedExecutionTimes cannot be zero");
 
-        maxFailedExecutionTimes = _maxFailedExecutionTimes;
+        uint256 _oldMaxFailedExecutionTimes = maxFailedExecutionTimes;
+        maxFailedExecutionTimes = _newMaxFailedExecutionTimes;
 
-        emit UpdateMaxFailedExecutionTimes(_maxFailedExecutionTimes);
+        emit UpdateMaxFailedExecutionTimes(_oldMaxFailedExecutionTimes, _newMaxFailedExecutionTimes);
     }
 
     /**********************

contracts/src/L2/gateways/IL2GatewayRouter.sol

@@ -11,15 +11,18 @@ interface IL2GatewayRouter is IL2ETHGateway, IL2ERC20Gateway {
      **********/
 
     /// @notice Emitted when the address of ETH Gateway is updated.
-    /// @param ethGateway The address of new ETH Gateway.
-    event SetETHGateway(address indexed ethGateway);
+    /// @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);
 
     /// @notice Emitted when the address of default ERC20 Gateway is updated.
-    /// @param defaultERC20Gateway The address of new default ERC20 Gateway.
-    event SetDefaultERC20Gateway(address indexed defaultERC20Gateway);
+    /// @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);
 
     /// @notice Emitted when the `gateway` for `token` is updated.
     /// @param token The address of token updated.
-    /// @param gateway The corresponding address of gateway updated.
-    event SetERC20Gateway(address indexed token, address indexed gateway);
+    /// @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);
 }

contracts/src/L2/gateways/L2CustomERC20Gateway.sol

@@ -2,29 +2,27 @@
 
 pragma solidity =0.8.16;
 
-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
-import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
-
 import {IL2ERC20Gateway, L2ERC20Gateway} from "./L2ERC20Gateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IL1ERC20Gateway} from "../../L1/gateways/IL1ERC20Gateway.sol";
-import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
-import {IScrollERC20} from "../../libraries/token/IScrollERC20.sol";
+import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {IScrollERC20Upgradeable} from "../../libraries/token/IScrollERC20Upgradeable.sol";
 
 /// @title L2ERC20Gateway
 /// @notice The `L2ERC20Gateway` is used to withdraw custom ERC20 compatible tokens on layer 2 and
 /// finalize deposit the tokens from layer 1.
 /// @dev The withdrawn tokens tokens will be burned directly. On finalizing deposit, the corresponding
 /// tokens will be minted and transfered to the recipient.
-contract L2CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L2ERC20Gateway {
+contract L2CustomERC20Gateway is L2ERC20Gateway {
     /**********
      * Events *
      **********/
 
     /// @notice Emitted when token mapping for ERC20 token is updated.
-    /// @param _l2Token The address of corresponding ERC20 token on layer 2.
-    /// @param _l1Token The address of ERC20 token on layer 1.
-    event UpdateTokenMapping(address _l2Token, address _l1Token);
+    /// @param l2Token The address of corresponding ERC20 token in layer 2.
+    /// @param oldL1Token The address of the old corresponding ERC20 token in layer 1.
+    /// @param newL1Token The address of the new corresponding ERC20 token in layer 1.
+    event UpdateTokenMapping(address indexed l2Token, address indexed oldL1Token, address indexed newL1Token);
 
     /*************
      * Variables *
@@ -47,7 +45,6 @@ contract L2CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L2ERC20G
         address _messenger
     ) external initializer {
         require(_router != address(0), "zero router address");
-        OwnableUpgradeable.__Ownable_init();
 
         ScrollGatewayBase._initialize(_counterpart, _router, _messenger);
     }
@@ -83,7 +80,7 @@ contract L2CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L2ERC20G
         require(_l1Token != address(0), "token address cannot be 0");
         require(_l1Token == tokenMapping[_l2Token], "l1 token mismatch");
 
-        IScrollERC20(_l2Token).mint(_to, _amount);
+        IScrollERC20Upgradeable(_l2Token).mint(_to, _amount);
 
         _doCallback(_to, _data);
 
@@ -100,9 +97,10 @@ contract L2CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L2ERC20G
     function updateTokenMapping(address _l2Token, address _l1Token) external onlyOwner {
         require(_l1Token != address(0), "token address cannot be 0");
 
+        address _oldL1Token = tokenMapping[_l2Token];
         tokenMapping[_l2Token] = _l1Token;
 
-        emit UpdateTokenMapping(_l2Token, _l1Token);
+        emit UpdateTokenMapping(_l2Token, _oldL1Token, _l1Token);
     }
 
     /**********************
@@ -129,7 +127,7 @@ contract L2CustomERC20Gateway is OwnableUpgradeable, ScrollGatewayBase, L2ERC20G
         }
 
         // 2. Burn token.
-        IScrollERC20(_token).burn(_from, _amount);
+        IScrollERC20Upgradeable(_token).burn(_from, _amount);
 
         // 3. Generate message passed to L1StandardERC20Gateway.
         bytes memory _message = abi.encodeCall(

contracts/src/L2/gateways/L2DAIGateway.sol

@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity =0.8.16;
+
+import {L2CustomERC20Gateway} from "./L2CustomERC20Gateway.sol";
+
+// solhint-disable no-empty-blocks
+
+contract L2DAIGateway is L2CustomERC20Gateway {
+
+}

contracts/src/L2/gateways/L2ERC1155Gateway.sol

@@ -2,14 +2,12 @@
 
 pragma solidity =0.8.16;
 
-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
-import {IERC1155Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/IERC1155Upgradeable.sol";
 import {ERC1155HolderUpgradeable, ERC1155ReceiverUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC1155/utils/ERC1155HolderUpgradeable.sol";
 
 import {IL2ERC1155Gateway} from "./IL2ERC1155Gateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IL1ERC1155Gateway} from "../../L1/gateways/IL1ERC1155Gateway.sol";
-import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 import {IScrollERC1155} from "../../libraries/token/IScrollERC1155.sol";
 
 /// @title L2ERC1155Gateway
@@ -19,15 +17,16 @@ import {IScrollERC1155} from "../../libraries/token/IScrollERC1155.sol";
 /// NFT will be minted and transfered to the recipient.
 ///
 /// This will be changed if we have more specific scenarios.
-contract L2ERC1155Gateway is OwnableUpgradeable, ERC1155HolderUpgradeable, ScrollGatewayBase, IL2ERC1155Gateway {
+contract L2ERC1155Gateway is ERC1155HolderUpgradeable, ScrollGatewayBase, IL2ERC1155Gateway {
     /**********
      * Events *
      **********/
 
     /// @notice Emitted when token mapping for ERC1155 token is updated.
-    /// @param _l2Token The address of corresponding ERC1155 token on layer 2.
-    /// @param _l1Token The address of ERC1155 token on layer 1.
-    event UpdateTokenMapping(address _l2Token, address _l1Token);
+    /// @param l2Token The address of corresponding ERC1155 token in layer 2.
+    /// @param oldL1Token The address of the old corresponding ERC1155 token in layer 1.
+    /// @param newL1Token The address of the new corresponding ERC1155 token in layer 1.
+    event UpdateTokenMapping(address indexed l2Token, address indexed oldL1Token, address indexed newL1Token);
 
     /*************
      * Variables *
@@ -45,7 +44,6 @@ contract L2ERC1155Gateway is OwnableUpgradeable, ERC1155HolderUpgradeable, Scrol
     }
 
     function initialize(address _counterpart, address _messenger) external initializer {
-        OwnableUpgradeable.__Ownable_init();
         ERC1155HolderUpgradeable.__ERC1155Holder_init();
         ERC1155ReceiverUpgradeable.__ERC1155Receiver_init();
 
@@ -142,9 +140,10 @@ contract L2ERC1155Gateway is OwnableUpgradeable, ERC1155HolderUpgradeable, Scrol
     function updateTokenMapping(address _l2Token, address _l1Token) external onlyOwner {
         require(_l1Token != address(0), "token address cannot be 0");
 
+        address _oldL1Token = tokenMapping[_l2Token];
         tokenMapping[_l2Token] = _l1Token;
 
-        emit UpdateTokenMapping(_l2Token, _l1Token);
+        emit UpdateTokenMapping(_l2Token, _oldL1Token, _l1Token);
     }
 
     /**********************

contracts/src/L2/gateways/L2ERC20Gateway.sol

@@ -4,9 +4,11 @@ pragma solidity ^0.8.16;
 
 import {IL2ERC20Gateway} from "./IL2ERC20Gateway.sol";
 
+import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
+
 // solhint-disable no-empty-blocks
 
-abstract contract L2ERC20Gateway is IL2ERC20Gateway {
+abstract contract L2ERC20Gateway is ScrollGatewayBase, IL2ERC20Gateway {
     /*************
      * Variables *
      *************/

contracts/src/L2/gateways/L2ERC721Gateway.sol

@@ -2,14 +2,12 @@
 
 pragma solidity =0.8.16;
 
-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
-import {IERC721Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/IERC721Upgradeable.sol";
 import {ERC721HolderUpgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC721/utils/ERC721HolderUpgradeable.sol";
 
 import {IL2ERC721Gateway} from "./IL2ERC721Gateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IL1ERC721Gateway} from "../../L1/gateways/IL1ERC721Gateway.sol";
-import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 import {IScrollERC721} from "../../libraries/token/IScrollERC721.sol";
 
 /// @title L2ERC721Gateway
@@ -19,15 +17,16 @@ import {IScrollERC721} from "../../libraries/token/IScrollERC721.sol";
 /// NFT will be minted and transfered to the recipient.
 ///
 /// This will be changed if we have more specific scenarios.
-contract L2ERC721Gateway is OwnableUpgradeable, ERC721HolderUpgradeable, ScrollGatewayBase, IL2ERC721Gateway {
+contract L2ERC721Gateway is ERC721HolderUpgradeable, ScrollGatewayBase, IL2ERC721Gateway {
     /**********
      * Events *
      **********/
 
     /// @notice Emitted when token mapping for ERC721 token is updated.
-    /// @param _l2Token The address of corresponding ERC721 token on layer 2.
-    /// @param _l1Token The address of ERC721 token on layer 1.
-    event UpdateTokenMapping(address _l2Token, address _l1Token);
+    /// @param l2Token The address of corresponding ERC721 token in layer 2.
+    /// @param oldL1Token The address of the old corresponding ERC721 token in layer 1.
+    /// @param newL1Token The address of the new corresponding ERC721 token in layer 1.
+    event UpdateTokenMapping(address indexed l2Token, address indexed oldL1Token, address indexed newL1Token);
 
     /*************
      * Variables *
@@ -45,7 +44,6 @@ contract L2ERC721Gateway is OwnableUpgradeable, ERC721HolderUpgradeable, ScrollG
     }
 
     function initialize(address _counterpart, address _messenger) external initializer {
-        OwnableUpgradeable.__Ownable_init();
         ERC721HolderUpgradeable.__ERC721Holder_init();
 
         ScrollGatewayBase._initialize(_counterpart, address(0), _messenger);
@@ -137,9 +135,10 @@ contract L2ERC721Gateway is OwnableUpgradeable, ERC721HolderUpgradeable, ScrollG
     function updateTokenMapping(address _l2Token, address _l1Token) external onlyOwner {
         require(_l1Token != address(0), "token address cannot be 0");
 
+        address _oldL1Token = tokenMapping[_l2Token];
         tokenMapping[_l2Token] = _l1Token;
 
-        emit UpdateTokenMapping(_l2Token, _l1Token);
+        emit UpdateTokenMapping(_l2Token, _oldL1Token, _l1Token);
     }
 
     /**********************

contracts/src/L2/gateways/L2ETHGateway.sol

@@ -2,8 +2,6 @@
 
 pragma solidity =0.8.16;
 
-import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-
 import {IL1ETHGateway} from "../../L1/gateways/IL1ETHGateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IL2ETHGateway} from "./IL2ETHGateway.sol";
@@ -15,7 +13,7 @@ import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 /// finalize deposit ETH from layer 1.
 /// @dev The ETH are not held in the gateway. The ETH will be sent to the `L2ScrollMessenger` contract.
 /// On finalizing deposit, the Ether will be transfered from `L2ScrollMessenger`, then transfer to recipient.
-contract L2ETHGateway is Initializable, ScrollGatewayBase, IL2ETHGateway {
+contract L2ETHGateway is ScrollGatewayBase, IL2ETHGateway {
     /***************
      * Constructor *
      ***************/

contracts/src/L2/gateways/L2GatewayRouter.sol

@@ -7,9 +7,6 @@ import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/Own
 import {IL2GatewayRouter} from "./IL2GatewayRouter.sol";
 import {IL2ETHGateway} from "./IL2ETHGateway.sol";
 import {IL2ERC20Gateway} from "./IL2ERC20Gateway.sol";
-import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
-import {IL1ETHGateway} from "../../L1/gateways/IL1ETHGateway.sol";
-import {IScrollGateway} from "../../libraries/gateway/IScrollGateway.sol";
 
 /// @title L2GatewayRouter
 /// @notice The `L2GatewayRouter` is the main entry for withdrawing Ether and ERC20 tokens.
@@ -45,13 +42,13 @@ contract L2GatewayRouter is OwnableUpgradeable, IL2GatewayRouter {
         // it can be zero during initialization
         if (_defaultERC20Gateway != address(0)) {
             defaultERC20Gateway = _defaultERC20Gateway;
-            emit SetDefaultERC20Gateway(_defaultERC20Gateway);
+            emit SetDefaultERC20Gateway(address(0), _defaultERC20Gateway);
         }
 
         // it can be zero during initialization
         if (_ethGateway != address(0)) {
             ethGateway = _ethGateway;
-            emit SetETHGateway(_ethGateway);
+            emit SetETHGateway(address(0), _ethGateway);
         }
     }
 
@@ -182,20 +179,22 @@ contract L2GatewayRouter is OwnableUpgradeable, IL2GatewayRouter {
 
     /// @notice Update the address of ETH gateway contract.
     /// @dev This function should only be called by contract owner.
-    /// @param _ethGateway The address to update.
-    function setETHGateway(address _ethGateway) external onlyOwner {
-        ethGateway = _ethGateway;
+    /// @param _newEthGateway The address to update.
+    function setETHGateway(address _newEthGateway) external onlyOwner {
+        address _oldEthGateway = ethGateway;
+        ethGateway = _newEthGateway;
 
-        emit SetETHGateway(_ethGateway);
+        emit SetETHGateway(_oldEthGateway, _newEthGateway);
     }
 
     /// @notice Update the address of default ERC20 gateway contract.
     /// @dev This function should only be called by contract owner.
-    /// @param _defaultERC20Gateway The address to update.
-    function setDefaultERC20Gateway(address _defaultERC20Gateway) external onlyOwner {
-        defaultERC20Gateway = _defaultERC20Gateway;
+    /// @param _newDefaultERC20Gateway The address to update.
+    function setDefaultERC20Gateway(address _newDefaultERC20Gateway) external onlyOwner {
+        address _oldDefaultERC20Gateway = defaultERC20Gateway;
+        defaultERC20Gateway = _newDefaultERC20Gateway;
 
-        emit SetDefaultERC20Gateway(_defaultERC20Gateway);
+        emit SetDefaultERC20Gateway(_oldDefaultERC20Gateway, _newDefaultERC20Gateway);
     }
 
     /// @notice Update the mapping from token address to gateway address.
@@ -206,9 +205,10 @@ contract L2GatewayRouter is OwnableUpgradeable, IL2GatewayRouter {
         require(_tokens.length == _gateways.length, "length mismatch");
 
         for (uint256 i = 0; i < _tokens.length; i++) {
+            address _oldGateway = ERC20Gateway[_tokens[i]];
             ERC20Gateway[_tokens[i]] = _gateways[i];
 
-            emit SetERC20Gateway(_tokens[i], _gateways[i]);
+            emit SetERC20Gateway(_tokens[i], _oldGateway, _gateways[i]);
         }
     }
 }

contracts/src/L2/gateways/L2StandardERC20Gateway.sol

@@ -2,18 +2,15 @@
 
 pragma solidity =0.8.16;
 
-import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
-import {Address} from "@openzeppelin/contracts/utils/Address.sol";
+import {AddressUpgradeable} from "@openzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol";
 
 import {IL2ERC20Gateway, L2ERC20Gateway} from "./L2ERC20Gateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IL1ERC20Gateway} from "../../L1/gateways/IL1ERC20Gateway.sol";
-import {IScrollERC20} from "../../libraries/token/IScrollERC20.sol";
+import {IScrollERC20Upgradeable} from "../../libraries/token/IScrollERC20Upgradeable.sol";
 import {ScrollStandardERC20} from "../../libraries/token/ScrollStandardERC20.sol";
 import {IScrollStandardERC20Factory} from "../../libraries/token/IScrollStandardERC20Factory.sol";
-import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 
 /// @title L2StandardERC20Gateway
 /// @notice The `L2StandardERC20Gateway` is used to withdraw standard ERC20 tokens on layer 2 and
@@ -21,9 +18,8 @@ import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollG
 /// @dev The withdrawn ERC20 tokens will be burned directly. On finalizing deposit, the corresponding
 /// token will be minted and transfered to the recipient. Any ERC20 that requires non-standard functionality
 /// should use a separate gateway.
-contract L2StandardERC20Gateway is Initializable, ScrollGatewayBase, L2ERC20Gateway {
-    using SafeERC20 for IERC20;
-    using Address for address;
+contract L2StandardERC20Gateway is L2ERC20Gateway {
+    using AddressUpgradeable for address;
 
     /*************
      * Variables *
@@ -114,7 +110,7 @@ contract L2StandardERC20Gateway is Initializable, ScrollGatewayBase, L2ERC20Gate
             _deployL2Token(_deployData, _l1Token);
         }
 
-        IScrollERC20(_l2Token).mint(_to, _amount);
+        IScrollERC20Upgradeable(_l2Token).mint(_to, _amount);
 
         _doCallback(_to, _callData);
 
@@ -145,7 +141,7 @@ contract L2StandardERC20Gateway is Initializable, ScrollGatewayBase, L2ERC20Gate
         require(_l1Token != address(0), "no corresponding l1 token");
 
         // 2. Burn token.
-        IScrollERC20(_token).burn(_from, _amount);
+        IScrollERC20Upgradeable(_token).burn(_from, _amount);
 
         // 3. Generate message passed to L1StandardERC20Gateway.
         bytes memory _message = abi.encodeCall(

contracts/src/L2/gateways/L2WETHGateway.sol

@@ -2,15 +2,14 @@
 
 pragma solidity =0.8.16;
 
-import {Initializable} from "@openzeppelin/contracts/proxy/utils/Initializable.sol";
-import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
+import {SafeERC20Upgradeable} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
 
 import {IL2ERC20Gateway, L2ERC20Gateway} from "./L2ERC20Gateway.sol";
 import {IL2ScrollMessenger} from "../IL2ScrollMessenger.sol";
 import {IWETH} from "../../interfaces/IWETH.sol";
 import {IL1ERC20Gateway} from "../../L1/gateways/IL1ERC20Gateway.sol";
-import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollGatewayBase.sol";
+import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 
 /// @title L2WETHGateway
 /// @notice The `L2WETHGateway` contract is used to withdraw `WETH` token on layer 2 and
@@ -19,8 +18,8 @@ import {ScrollGatewayBase, IScrollGateway} from "../../libraries/gateway/ScrollG
 /// then the Ether will be sent to the `L2ScrollMessenger` contract.
 /// On finalizing deposit, the Ether will be transfered from `L2ScrollMessenger`, then
 /// wrapped as WETH and finally transfer to recipient.
-contract L2WETHGateway is Initializable, ScrollGatewayBase, L2ERC20Gateway {
-    using SafeERC20 for IERC20;
+contract L2WETHGateway is L2ERC20Gateway {
+    using SafeERC20Upgradeable for IERC20Upgradeable;
 
     /*************
      * Constants *
@@ -89,7 +88,7 @@ contract L2WETHGateway is Initializable, ScrollGatewayBase, L2ERC20Gateway {
         require(_amount == msg.value, "msg.value mismatch");
 
         IWETH(_l2Token).deposit{value: _amount}();
-        IERC20(_l2Token).safeTransfer(_to, _amount);
+        IERC20Upgradeable(_l2Token).safeTransfer(_to, _amount);
 
         _doCallback(_to, _data);
 
@@ -118,7 +117,7 @@ contract L2WETHGateway is Initializable, ScrollGatewayBase, L2ERC20Gateway {
         }
 
         // 2. Transfer token into this contract.
-        IERC20(_token).safeTransferFrom(_from, address(this), _amount);
+        IERC20Upgradeable(_token).safeTransferFrom(_from, address(this), _amount);
         IWETH(_token).withdraw(_amount);
 
         // 3. Generate message passed to L2StandardERC20Gateway.