feat: update

.github/workflows/bridge.yml

@@ -43,6 +43,8 @@ jobs:
         version: '0.8.16'
     - name: Install Geth Tools
       uses: gacts/install-geth-tools@v1
+      with:
+        version: 1.10.19
     - name: Lint
       working-directory: 'bridge'
       run: |
@@ -92,6 +94,8 @@ jobs:
         version: '0.8.16'
     - name: Install Geth Tools
       uses: gacts/install-geth-tools@v1
+      with:
+        version: 1.10.19
     - name: Build prerequisites
       run: |
         make dev_docker

.github/workflows/bump_version.yml

@@ -15,8 +15,6 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-        with:
-          ref: ${{ github.head_ref }}
       - name: check diff
         id: check_diff
         run: |
@@ -51,11 +49,7 @@ jobs:
       - name: bump version in common/version/version.go
         if: steps.check_diff.outputs.result == 'bump'
         run: node .github/scripts/bump_version_dot_go.mjs
-
-        # Commits made by this Action do not trigger new Workflow runs
       - uses: stefanzweifel/git-auto-commit-action@3ea6ae190baf489ba007f7c92608f33ce20ef04a
         if: steps.check_diff.outputs.result == 'bump'
         with:
-          skip_fetch: true # already did fetch in check diff
-          file_pattern: "common/version/version.go"
           commit_message: "chore: auto version bump [bot]"

.github/workflows/common.yml

@@ -88,6 +88,8 @@ jobs:
         version: '0.8.16'
     - name: Install Geth Tools
       uses: gacts/install-geth-tools@v1
+      with:
+        version: 1.10.19
     - name: Build prerequisites
       run: |
         make dev_docker

.github/workflows/coordinator.yml

@@ -104,6 +104,8 @@ jobs:
         version: '0.8.16'
     - name: Install Geth Tools
       uses: gacts/install-geth-tools@v1
+      with:
+        version: 1.10.19
     - name: Build prerequisites
       run: |
         make dev_docker

.github/workflows/database.yml

@@ -81,6 +81,8 @@ jobs:
         version: '0.8.16'
     - name: Install Geth Tools
       uses: gacts/install-geth-tools@v1
+      with:
+        version: 1.10.19
     - name: Build prerequisites
       run: |
         make dev_docker

.github/workflows/integration.yaml

@@ -33,6 +33,8 @@ jobs:
         version: '0.8.16'
     - name: Install Geth Tools
       uses: gacts/install-geth-tools@v1
+      with:
+        version: 1.10.19
     - name: Build prerequisites
       run: |
         make dev_docker

bridge/cmd/rollup_relayer/app/app.go

@@ -107,7 +107,7 @@ func action(ctx *cli.Context) error {
 
 	go utils.Loop(subCtx, 2*time.Second, chunkProposer.TryProposeChunk)
 
-	go utils.Loop(subCtx, 10*time.Second, batchProposer.TryProposeBatch)
+	go utils.Loop(subCtx, 2*time.Second, batchProposer.TryProposeBatch)
 
 	go utils.Loop(subCtx, 2*time.Second, l2relayer.ProcessPendingBatches)
 

bridge/conf/config.json

@@ -64,9 +64,11 @@
       "finalize_sender_private_key": "1515151515151515151515151515151515151515151515151515151515151515"
     },
     "chunk_proposer_config": {
-      "max_tx_num_per_chunk": 1123,
+      "max_tx_gas_per_chunk": 1123456,
+      "max_l2_tx_num_per_chunk": 1123,
       "max_l1_commit_gas_per_chunk": 11234567,
       "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
@@ -75,6 +77,7 @@
       "max_chunk_num_per_batch": 112,
       "max_l1_commit_gas_per_batch": 11234567,
       "max_l1_commit_calldata_size_per_batch": 112345,
+      "min_chunk_num_per_batch": 11,
       "batch_timeout_sec": 300,
       "gas_cost_increase_multiplier": 1.2
     }

bridge/internal/config/config.go

@@ -2,7 +2,6 @@ package config
 
 import (
 	"encoding/json"
-	"fmt"
 	"os"
 	"path/filepath"
 
@@ -16,13 +15,6 @@ type Config struct {
 	DBConfig *database.Config `json:"db_config"`
 }
 
-func (c *Config) validate() error {
-	if maxChunkPerBatch := c.L2Config.BatchProposerConfig.MaxChunkNumPerBatch; maxChunkPerBatch <= 0 {
-		return fmt.Errorf("Invalid max_chunk_num_per_batch configuration: %v", maxChunkPerBatch)
-	}
-	return nil
-}
-
 // NewConfig returns a new instance of Config.
 func NewConfig(file string) (*Config, error) {
 	buf, err := os.ReadFile(filepath.Clean(file))
@@ -36,8 +28,5 @@ func NewConfig(file string) (*Config, error) {
 		return nil, err
 	}
 
-	if err := cfg.validate(); err != nil {
-		return nil, err
-	}
 	return cfg, nil
 }

bridge/internal/config/l2.go

@@ -28,9 +28,11 @@ type L2Config struct {
 
 // ChunkProposerConfig loads chunk_proposer configuration items.
 type ChunkProposerConfig struct {
-	MaxTxNumPerChunk                uint64  `json:"max_tx_num_per_chunk"`
+	MaxTxGasPerChunk                uint64  `json:"max_tx_gas_per_chunk"`
+	MaxL2TxNumPerChunk              uint64  `json:"max_l2_tx_num_per_chunk"`
 	MaxL1CommitGasPerChunk          uint64  `json:"max_l1_commit_gas_per_chunk"`
 	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"`
@@ -41,6 +43,7 @@ type BatchProposerConfig struct {
 	MaxChunkNumPerBatch             uint64  `json:"max_chunk_num_per_batch"`
 	MaxL1CommitGasPerBatch          uint64  `json:"max_l1_commit_gas_per_batch"`
 	MaxL1CommitCalldataSizePerBatch uint32  `json:"max_l1_commit_calldata_size_per_batch"`
+	MinChunkNumPerBatch             uint64  `json:"min_chunk_num_per_batch"`
 	BatchTimeoutSec                 uint64  `json:"batch_timeout_sec"`
 	GasCostIncreaseMultiplier       float64 `json:"gas_cost_increase_multiplier"`
 }

bridge/internal/controller/relayer/l1_relayer.go

@@ -226,7 +226,7 @@ func (r *Layer1Relayer) handleConfirmLoop(ctx context.Context) {
 				log.Info("transaction confirmed in layer2", "confirmation", cfm)
 			}
 		case cfm := <-r.gasOracleSender.ConfirmChan():
-			r.metrics.bridgeL1GasOraclerConfirmedTotal.Inc()
+			r.metrics.bridgeL1MsgsRelayedConfirmedTotal.Inc()
 			if !cfm.IsSuccessful {
 				// @discuss: maybe make it pending again?
 				err := r.l1BlockOrm.UpdateL1GasOracleStatusAndOracleTxHash(r.ctx, cfm.ID, types.GasOracleFailed, cfm.TxHash.String())

bridge/internal/controller/relayer/l2_relayer.go

@@ -192,14 +192,8 @@ func (r *Layer2Relayer) initializeGenesis() error {
 			return fmt.Errorf("failed to update genesis chunk proving status: %v", err)
 		}
 
-		batchMeta := &types.BatchMeta{
-			StartChunkIndex: 0,
-			StartChunkHash:  dbChunk.Hash,
-			EndChunkIndex:   0,
-			EndChunkHash:    dbChunk.Hash,
-		}
 		var batch *orm.Batch
-		batch, err = r.batchOrm.InsertBatch(r.ctx, []*types.Chunk{chunk}, batchMeta, dbTX)
+		batch, err = r.batchOrm.InsertBatch(r.ctx, 0, 0, dbChunk.Hash, dbChunk.Hash, []*types.Chunk{chunk}, dbTX)
 		if err != nil {
 			return fmt.Errorf("failed to insert batch: %v", err)
 		}
@@ -436,6 +430,10 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 	case types.ProvingTaskUnassigned, types.ProvingTaskAssigned:
 		// The proof for this block is not ready yet.
 		return
+	case types.ProvingTaskProved:
+		// It's an intermediate state. The prover manager received the proof but has not verified
+		// the proof yet. We don't roll up the proof until it's verified.
+		return
 	case types.ProvingTaskVerified:
 		log.Info("Start to roll up zk proof", "hash", hash)
 		r.metrics.bridgeL2RelayerProcessCommittedBatchesFinalizedTotal.Inc()

bridge/internal/controller/relayer/l2_relayer_test.go

@@ -56,14 +56,8 @@ func testL2RelayerProcessPendingBatches(t *testing.T) {
 	assert.NoError(t, err)
 	dbChunk2, err := chunkOrm.InsertChunk(context.Background(), chunk2)
 	assert.NoError(t, err)
-	batchMeta := &types.BatchMeta{
-		StartChunkIndex: 0,
-		StartChunkHash:  dbChunk1.Hash,
-		EndChunkIndex:   1,
-		EndChunkHash:    dbChunk2.Hash,
-	}
 	batchOrm := orm.NewBatch(db)
-	batch, err := batchOrm.InsertBatch(context.Background(), []*types.Chunk{chunk1, chunk2}, batchMeta)
+	batch, err := batchOrm.InsertBatch(context.Background(), 0, 1, dbChunk1.Hash, dbChunk2.Hash, []*types.Chunk{chunk1, chunk2})
 	assert.NoError(t, err)
 
 	relayer.ProcessPendingBatches()
@@ -81,14 +75,8 @@ func testL2RelayerProcessCommittedBatches(t *testing.T) {
 	l2Cfg := cfg.L2Config
 	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig, false, nil)
 	assert.NoError(t, err)
-	batchMeta := &types.BatchMeta{
-		StartChunkIndex: 0,
-		StartChunkHash:  chunkHash1.Hex(),
-		EndChunkIndex:   1,
-		EndChunkHash:    chunkHash2.Hex(),
-	}
 	batchOrm := orm.NewBatch(db)
-	batch, err := batchOrm.InsertBatch(context.Background(), []*types.Chunk{chunk1, chunk2}, batchMeta)
+	batch, err := batchOrm.InsertBatch(context.Background(), 0, 1, chunkHash1.Hex(), chunkHash2.Hex(), []*types.Chunk{chunk1, chunk2})
 	assert.NoError(t, err)
 
 	err = batchOrm.UpdateRollupStatus(context.Background(), batch.Hash, types.RollupCommitted)
@@ -136,13 +124,7 @@ func testL2RelayerCommitConfirm(t *testing.T) {
 	batchOrm := orm.NewBatch(db)
 	batchHashes := make([]string, len(processingKeys))
 	for i := range batchHashes {
-		batchMeta := &types.BatchMeta{
-			StartChunkIndex: 0,
-			StartChunkHash:  chunkHash1.Hex(),
-			EndChunkIndex:   1,
-			EndChunkHash:    chunkHash2.Hex(),
-		}
-		batch, err := batchOrm.InsertBatch(context.Background(), []*types.Chunk{chunk1, chunk2}, batchMeta)
+		batch, err := batchOrm.InsertBatch(context.Background(), 0, 1, chunkHash1.Hex(), chunkHash2.Hex(), []*types.Chunk{chunk1, chunk2})
 		assert.NoError(t, err)
 		batchHashes[i] = batch.Hash
 	}
@@ -192,13 +174,7 @@ func testL2RelayerFinalizeConfirm(t *testing.T) {
 	batchOrm := orm.NewBatch(db)
 	batchHashes := make([]string, len(processingKeys))
 	for i := range batchHashes {
-		batchMeta := &types.BatchMeta{
-			StartChunkIndex: 0,
-			StartChunkHash:  chunkHash1.Hex(),
-			EndChunkIndex:   1,
-			EndChunkHash:    chunkHash2.Hex(),
-		}
-		batch, err := batchOrm.InsertBatch(context.Background(), []*types.Chunk{chunk1, chunk2}, batchMeta)
+		batch, err := batchOrm.InsertBatch(context.Background(), 0, 1, chunkHash1.Hex(), chunkHash2.Hex(), []*types.Chunk{chunk1, chunk2})
 		assert.NoError(t, err)
 		batchHashes[i] = batch.Hash
 	}
@@ -234,23 +210,11 @@ func testL2RelayerGasOracleConfirm(t *testing.T) {
 	db := setupL2RelayerDB(t)
 	defer database.CloseDB(db)
 
-	batchMeta1 := &types.BatchMeta{
-		StartChunkIndex: 0,
-		StartChunkHash:  chunkHash1.Hex(),
-		EndChunkIndex:   0,
-		EndChunkHash:    chunkHash1.Hex(),
-	}
 	batchOrm := orm.NewBatch(db)
-	batch1, err := batchOrm.InsertBatch(context.Background(), []*types.Chunk{chunk1}, batchMeta1)
+	batch1, err := batchOrm.InsertBatch(context.Background(), 0, 0, chunkHash1.Hex(), chunkHash1.Hex(), []*types.Chunk{chunk1})
 	assert.NoError(t, err)
 
-	batchMeta2 := &types.BatchMeta{
-		StartChunkIndex: 1,
-		StartChunkHash:  chunkHash2.Hex(),
-		EndChunkIndex:   1,
-		EndChunkHash:    chunkHash2.Hex(),
-	}
-	batch2, err := batchOrm.InsertBatch(context.Background(), []*types.Chunk{chunk2}, batchMeta2)
+	batch2, err := batchOrm.InsertBatch(context.Background(), 1, 1, chunkHash2.Hex(), chunkHash2.Hex(), []*types.Chunk{chunk2})
 	assert.NoError(t, err)
 
 	// Create and set up the Layer2 Relayer.

bridge/internal/controller/sender/sender.go

@@ -346,15 +346,8 @@ func (s *Sender) resubmitTransaction(feeData *FeeData, auth *bind.TransactOpts,
 	escalateMultipleDen := new(big.Int).SetUint64(s.config.EscalateMultipleDen)
 	maxGasPrice := new(big.Int).SetUint64(s.config.MaxGasPrice)
 
-	txInfo := map[string]interface{}{
-		"tx_hash": tx.Hash().String(),
-		"tx_type": s.config.TxType,
-		"from":    auth.From.String(),
-	}
-
 	switch s.config.TxType {
 	case LegacyTxType, AccessListTxType: // `LegacyTxType`is for ganache mock node
-		originalGasPrice := feeData.gasPrice
 		gasPrice := escalateMultipleNum.Mul(escalateMultipleNum, big.NewInt(feeData.gasPrice.Int64()))
 		gasPrice = gasPrice.Div(gasPrice, escalateMultipleDen)
 		if gasPrice.Cmp(feeData.gasPrice) < 0 {
@@ -364,13 +357,7 @@ func (s *Sender) resubmitTransaction(feeData *FeeData, auth *bind.TransactOpts,
 			gasPrice = maxGasPrice
 		}
 		feeData.gasPrice = gasPrice
-
-		txInfo["original_gas_price"] = originalGasPrice
-		txInfo["adjusted_gas_price"] = gasPrice
 	default:
-		originalGasTipCap := big.NewInt(feeData.gasTipCap.Int64())
-		originalGasFeeCap := big.NewInt(feeData.gasFeeCap.Int64())
-
 		gasTipCap := big.NewInt(feeData.gasTipCap.Int64())
 		gasTipCap = gasTipCap.Mul(gasTipCap, escalateMultipleNum)
 		gasTipCap = gasTipCap.Div(gasTipCap, escalateMultipleDen)
@@ -402,15 +389,8 @@ func (s *Sender) resubmitTransaction(feeData *FeeData, auth *bind.TransactOpts,
 		}
 		feeData.gasFeeCap = gasFeeCap
 		feeData.gasTipCap = gasTipCap
-
-		txInfo["original_gas_tip_cap"] = originalGasTipCap
-		txInfo["adjusted_gas_tip_cap"] = gasTipCap
-		txInfo["original_gas_fee_cap"] = originalGasFeeCap
-		txInfo["adjusted_gas_fee_cap"] = gasFeeCap
 	}
 
-	log.Debug("Transaction gas adjustment details", txInfo)
-
 	nonce := tx.Nonce()
 	s.metrics.resubmitTransactionTotal.WithLabelValues(s.service, s.name).Inc()
 	return s.createAndSendTx(auth, feeData, tx.To(), tx.Value(), tx.Data(), &nonce)
@@ -449,12 +429,6 @@ func (s *Sender) checkPendingTransaction(header *types.Header, confirmed uint64)
 				}
 			}
 		} else if s.config.EscalateBlocks+pending.submitAt < number {
-			log.Debug("resubmit transaction",
-				"tx hash", pending.tx.Hash().String(),
-				"submit block number", pending.submitAt,
-				"current block number", number,
-				"escalateBlocks", s.config.EscalateBlocks)
-
 			var tx *types.Transaction
 			tx, err := s.resubmitTransaction(pending.feeData, pending.signer, pending.tx)
 			if err != nil {
@@ -511,8 +485,8 @@ func (s *Sender) checkBalance(ctx context.Context) error {
 	}
 
 	if bls.Cmp(s.minBalance) < 0 {
-		return fmt.Errorf("insufficient account balance - actual balance: %s, minimum required balance: %s, address: %s",
-			bls.String(), s.minBalance.String(), s.auth.From.String())
+		return fmt.Errorf("insufficient account balance - actual balance: %s, minimum required balance: %s",
+			bls.String(), s.minBalance.String())
 	}
 
 	return nil

bridge/internal/controller/watcher/batch_proposer.go

@@ -28,6 +28,7 @@ type BatchProposer struct {
 	maxChunkNumPerBatch             uint64
 	maxL1CommitGasPerBatch          uint64
 	maxL1CommitCalldataSizePerBatch uint32
+	minChunkNumPerBatch             uint64
 	batchTimeoutSec                 uint64
 	gasCostIncreaseMultiplier       float64
 
@@ -38,18 +39,12 @@ type BatchProposer struct {
 	totalL1CommitGas                   prometheus.Gauge
 	totalL1CommitCalldataSize          prometheus.Gauge
 	batchChunksNum                     prometheus.Gauge
-	batchFirstBlockTimeoutReached      prometheus.Counter
-	batchChunksProposeNotEnoughTotal   prometheus.Counter
+	batchFirstChunkTimeoutReached      prometheus.Counter
+	batchChunksSuperposeNotEnoughTotal prometheus.Counter
 }
 
 // NewBatchProposer creates a new BatchProposer instance.
 func NewBatchProposer(ctx context.Context, cfg *config.BatchProposerConfig, db *gorm.DB, reg prometheus.Registerer) *BatchProposer {
-	log.Debug("new batch proposer",
-		"maxChunkNumPerBatch", cfg.MaxChunkNumPerBatch,
-		"maxL1CommitGasPerBatch", cfg.MaxL1CommitGasPerBatch,
-		"maxL1CommitCalldataSizePerBatch", cfg.MaxL1CommitCalldataSizePerBatch,
-		"batchTimeoutSec", cfg.BatchTimeoutSec)
-
 	return &BatchProposer{
 		ctx:                             ctx,
 		db:                              db,
@@ -59,6 +54,7 @@ func NewBatchProposer(ctx context.Context, cfg *config.BatchProposerConfig, db *
 		maxChunkNumPerBatch:             cfg.MaxChunkNumPerBatch,
 		maxL1CommitGasPerBatch:          cfg.MaxL1CommitGasPerBatch,
 		maxL1CommitCalldataSizePerBatch: cfg.MaxL1CommitCalldataSizePerBatch,
+		minChunkNumPerBatch:             cfg.MinChunkNumPerBatch,
 		batchTimeoutSec:                 cfg.BatchTimeoutSec,
 		gasCostIncreaseMultiplier:       cfg.GasCostIncreaseMultiplier,
 
@@ -90,13 +86,13 @@ func NewBatchProposer(ctx context.Context, cfg *config.BatchProposerConfig, db *
 			Name: "bridge_propose_batch_chunks_number",
 			Help: "The number of chunks in the batch",
 		}),
-		batchFirstBlockTimeoutReached: promauto.With(reg).NewCounter(prometheus.CounterOpts{
-			Name: "bridge_propose_batch_first_block_timeout_reached_total",
-			Help: "Total times of batch's first block timeout reached",
+		batchFirstChunkTimeoutReached: promauto.With(reg).NewCounter(prometheus.CounterOpts{
+			Name: "bridge_propose_batch_first_chunk_timeout_reached_total",
+			Help: "Total times of batch's first chunk timeout reached",
 		}),
-		batchChunksProposeNotEnoughTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
-			Name: "bridge_propose_batch_chunks_propose_not_enough_total",
-			Help: "Total number of batch chunk propose not enough",
+		batchChunksSuperposeNotEnoughTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
+			Name: "bridge_propose_batch_chunks_superpose_not_enough_total",
+			Help: "Total number of batch chunk superpose not enough",
 		}),
 	}
 }
@@ -104,19 +100,19 @@ func NewBatchProposer(ctx context.Context, cfg *config.BatchProposerConfig, db *
 // TryProposeBatch tries to propose a new batches.
 func (p *BatchProposer) TryProposeBatch() {
 	p.batchProposerCircleTotal.Inc()
-	dbChunks, batchMeta, err := p.proposeBatchChunks()
+	dbChunks, err := p.proposeBatchChunks()
 	if err != nil {
 		p.proposeBatchFailureTotal.Inc()
 		log.Error("proposeBatchChunks failed", "err", err)
 		return
 	}
-	if err := p.updateBatchInfoInDB(dbChunks, batchMeta); err != nil {
+	if err := p.updateBatchInfoInDB(dbChunks); err != nil {
 		p.proposeBatchUpdateInfoFailureTotal.Inc()
 		log.Error("update batch info in db failed", "err", err)
 	}
 }
 
-func (p *BatchProposer) updateBatchInfoInDB(dbChunks []*orm.Chunk, batchMeta *types.BatchMeta) error {
+func (p *BatchProposer) updateBatchInfoInDB(dbChunks []*orm.Chunk) error {
 	p.proposeBatchUpdateInfoTotal.Inc()
 	numChunks := len(dbChunks)
 	if numChunks <= 0 {
@@ -127,18 +123,17 @@ func (p *BatchProposer) updateBatchInfoInDB(dbChunks []*orm.Chunk, batchMeta *ty
 		return err
 	}
 
-	batchMeta.StartChunkIndex = dbChunks[0].Index
-	batchMeta.StartChunkHash = dbChunks[0].Hash
-	batchMeta.EndChunkIndex = dbChunks[numChunks-1].Index
-	batchMeta.EndChunkHash = dbChunks[numChunks-1].Hash
+	startChunkIndex := dbChunks[0].Index
+	startChunkHash := dbChunks[0].Hash
+	endChunkIndex := dbChunks[numChunks-1].Index
+	endChunkHash := dbChunks[numChunks-1].Hash
 	err = p.db.Transaction(func(dbTX *gorm.DB) error {
-		batch, dbErr := p.batchOrm.InsertBatch(p.ctx, chunks, batchMeta, dbTX)
+		batch, dbErr := p.batchOrm.InsertBatch(p.ctx, startChunkIndex, endChunkIndex, startChunkHash, endChunkHash, chunks, dbTX)
 		if dbErr != nil {
-			log.Warn("BatchProposer.updateBatchInfoInDB insert batch failure",
-				"start chunk index", batchMeta.StartChunkIndex, "end chunk index", batchMeta.EndChunkIndex, "error", dbErr)
+			log.Warn("BatchProposer.updateBatchInfoInDB insert batch failure", "error", "start chunk index", startChunkIndex, "end chunk index", endChunkIndex, dbErr)
 			return dbErr
 		}
-		dbErr = p.chunkOrm.UpdateBatchHashInRange(p.ctx, batchMeta.StartChunkIndex, batchMeta.EndChunkIndex, batch.Hash, dbTX)
+		dbErr = p.chunkOrm.UpdateBatchHashInRange(p.ctx, startChunkIndex, endChunkIndex, batch.Hash, dbTX)
 		if dbErr != nil {
 			log.Warn("BatchProposer.UpdateBatchHashInRange update the chunk's batch hash failure", "hash", batch.Hash, "error", dbErr)
 			return dbErr
@@ -148,106 +143,97 @@ func (p *BatchProposer) updateBatchInfoInDB(dbChunks []*orm.Chunk, batchMeta *ty
 	return err
 }
 
-func (p *BatchProposer) proposeBatchChunks() ([]*orm.Chunk, *types.BatchMeta, error) {
-	unbatchedChunkIndex, err := p.batchOrm.GetFirstUnbatchedChunkIndex(p.ctx)
+func (p *BatchProposer) proposeBatchChunks() ([]*orm.Chunk, error) {
+	dbChunks, err := p.chunkOrm.GetUnbatchedChunks(p.ctx)
 	if err != nil {
-		return nil, nil, err
-	}
-
-	dbChunks, err := p.chunkOrm.GetChunksGEIndex(p.ctx, unbatchedChunkIndex, int(p.maxChunkNumPerBatch)+1)
-	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
 	if len(dbChunks) == 0 {
-		return nil, nil, nil
+		return nil, nil
 	}
 
-	var totalL1CommitCalldataSize uint32
-	var totalL1CommitGas uint64
-	var totalChunks uint64
-	var totalL1MessagePopped uint64
-	var batchMeta types.BatchMeta
+	firstChunk := dbChunks[0]
+	totalL1CommitCalldataSize := firstChunk.TotalL1CommitCalldataSize
+	totalL1CommitGas := firstChunk.TotalL1CommitGas
+	totalChunks := uint64(1)
+	totalL1MessagePopped := firstChunk.TotalL1MessagesPoppedBefore + uint64(firstChunk.TotalL1MessagesPoppedInChunk)
 
 	parentBatch, err := p.batchOrm.GetLatestBatch(p.ctx)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
+	}
+
+	getKeccakGas := func(size uint64) uint64 {
+		return 30 + 6*((size+31)/32) // 30 + 6 * ceil(size / 32)
 	}
 
 	// Add extra gas costs
-	totalL1CommitGas += 4 * 2100                     // 4 one-time cold sload for commitBatch
-	totalL1CommitGas += 20000                        // 1 time sstore
-	totalL1CommitGas += types.CalldataNonZeroByteGas // version in calldata
+	totalL1CommitGas += 4 * 2100                                       // 4 one-time cold sload for commitBatch
+	totalL1CommitGas += 20000                                          // 1 time sstore
+	totalL1CommitGas += 16                                             // version in calldata
+	totalL1CommitGas += 16 * (32 * (totalL1MessagePopped + 255) / 256) // _skippedL1MessageBitmap in calldata
 
 	// adjusting gas:
 	// add 1 time cold sload (2100 gas) for L1MessageQueue
 	// add 1 time cold address access (2600 gas) for L1MessageQueue
 	// minus 1 time warm sload (100 gas) & 1 time warm address access (100 gas)
 	totalL1CommitGas += (2100 + 2600 - 100 - 100)
+	totalL1CommitGas += getKeccakGas(32 * totalChunks) // batch data hash
 	if parentBatch != nil {
-		totalL1CommitGas += types.GetKeccak256Gas(uint64(len(parentBatch.BatchHeader)))         // parent batch header hash
-		totalL1CommitGas += types.CalldataNonZeroByteGas * uint64(len(parentBatch.BatchHeader)) // parent batch header in calldata
+		totalL1CommitGas += getKeccakGas(uint64(len(parentBatch.BatchHeader))) // parent batch header hash
+		totalL1CommitGas += 16 * uint64(len(parentBatch.BatchHeader))          // parent batch header in calldata
+	}
+	// batch header size: 89 + 32 * ceil(l1MessagePopped / 256)
+	totalL1CommitGas += getKeccakGas(89 + 32*(totalL1MessagePopped+255)/256)
+
+	p.totalL1CommitGas.Set(float64(totalL1CommitGas))
+	// Check if the first chunk breaks hard limits.
+	// If so, it indicates there are bugs in chunk-proposer, manual fix is needed.
+	if p.gasCostIncreaseMultiplier*float64(totalL1CommitGas) > float64(p.maxL1CommitGasPerBatch) {
+		return nil, fmt.Errorf(
+			"the first chunk exceeds l1 commit gas limit; start block number: %v, end block number: %v, commit gas: %v, max commit gas limit: %v",
+			firstChunk.StartBlockNumber,
+			firstChunk.EndBlockNumber,
+			totalL1CommitGas,
+			p.maxL1CommitGasPerBatch,
+		)
 	}
 
-	for i, chunk := range dbChunks {
-		// metric values
-		batchMeta.TotalL1CommitGas = totalL1CommitGas
-		batchMeta.TotalL1CommitCalldataSize = totalL1CommitCalldataSize
+	p.totalL1CommitCalldataSize.Set(float64(totalL1CommitCalldataSize))
+	if totalL1CommitCalldataSize > p.maxL1CommitCalldataSizePerBatch {
+		return nil, fmt.Errorf(
+			"the first chunk exceeds l1 commit calldata size limit; start block number: %v, end block number %v, calldata size: %v, max calldata size limit: %v",
+			firstChunk.StartBlockNumber,
+			firstChunk.EndBlockNumber,
+			totalL1CommitCalldataSize,
+			p.maxL1CommitCalldataSizePerBatch,
+		)
+	}
 
+	for i, chunk := range dbChunks[1:] {
 		totalL1CommitCalldataSize += chunk.TotalL1CommitCalldataSize
 		totalL1CommitGas += chunk.TotalL1CommitGas
 		// adjust batch data hash gas cost
-		totalL1CommitGas -= types.GetKeccak256Gas(32 * totalChunks)
+		totalL1CommitGas -= getKeccakGas(32 * totalChunks)
 		totalChunks++
-		totalL1CommitGas += types.GetKeccak256Gas(32 * totalChunks)
-		// adjust batch header hash gas cost, batch header size: 89 + 32 * ceil(l1MessagePopped / 256)
-		totalL1CommitGas -= types.GetKeccak256Gas(89 + 32*(totalL1MessagePopped+255)/256)
-		totalL1CommitGas -= types.CalldataNonZeroByteGas * (32 * (totalL1MessagePopped + 255) / 256)
+		totalL1CommitGas += getKeccakGas(32 * totalChunks)
+		// adjust batch header hash gas cost
+		totalL1CommitGas -= getKeccakGas(89 + 32*(totalL1MessagePopped+255)/256)
+		totalL1CommitGas -= 16 * (32 * (totalL1MessagePopped + 255) / 256)
 		totalL1MessagePopped += uint64(chunk.TotalL1MessagesPoppedInChunk)
-		totalL1CommitGas += types.CalldataNonZeroByteGas * (32 * (totalL1MessagePopped + 255) / 256)
-		totalL1CommitGas += types.GetKeccak256Gas(89 + 32*(totalL1MessagePopped+255)/256)
-		totalOverEstimateL1CommitGas := uint64(p.gasCostIncreaseMultiplier * float64(totalL1CommitGas))
+		totalL1CommitGas += 16 * (32 * (totalL1MessagePopped + 255) / 256)
+		totalL1CommitGas += getKeccakGas(89 + 32*(totalL1MessagePopped+255)/256)
 		if totalChunks > p.maxChunkNumPerBatch ||
 			totalL1CommitCalldataSize > p.maxL1CommitCalldataSizePerBatch ||
-			totalOverEstimateL1CommitGas > p.maxL1CommitGasPerBatch {
-			// Check if the first chunk breaks hard limits.
-			// If so, it indicates there are bugs in chunk-proposer, manual fix is needed.
-			if i == 0 {
-				if totalOverEstimateL1CommitGas > p.maxL1CommitGasPerBatch {
-					return nil, nil, fmt.Errorf(
-						"the first chunk exceeds l1 commit gas limit; start block number: %v, end block number: %v, commit gas: %v, max commit gas limit: %v",
-						dbChunks[0].StartBlockNumber,
-						dbChunks[0].EndBlockNumber,
-						totalL1CommitGas,
-						p.maxL1CommitGasPerBatch,
-					)
-				}
-				if totalL1CommitCalldataSize > p.maxL1CommitCalldataSizePerBatch {
-					return nil, nil, fmt.Errorf(
-						"the first chunk exceeds l1 commit calldata size limit; start block number: %v, end block number %v, calldata size: %v, max calldata size limit: %v",
-						dbChunks[0].StartBlockNumber,
-						dbChunks[0].EndBlockNumber,
-						totalL1CommitCalldataSize,
-						p.maxL1CommitCalldataSizePerBatch,
-					)
-				}
-			}
-
-			log.Debug("breaking limit condition in batching",
-				"currentTotalChunks", totalChunks,
-				"maxChunkNumPerBatch", p.maxChunkNumPerBatch,
-				"currentL1CommitCalldataSize", totalL1CommitCalldataSize,
-				"maxL1CommitCalldataSizePerBatch", p.maxL1CommitCalldataSizePerBatch,
-				"currentOverEstimateL1CommitGas", totalOverEstimateL1CommitGas,
-				"maxL1CommitGasPerBatch", p.maxL1CommitGasPerBatch)
-
-			p.totalL1CommitGas.Set(float64(batchMeta.TotalL1CommitGas))
-			p.totalL1CommitCalldataSize.Set(float64(batchMeta.TotalL1CommitCalldataSize))
-			p.batchChunksNum.Set(float64(i))
-			return dbChunks[:i], &batchMeta, nil
+			p.gasCostIncreaseMultiplier*float64(totalL1CommitGas) > float64(p.maxL1CommitGasPerBatch) {
+			return dbChunks[:i+1], nil
 		}
 	}
 
+	p.batchChunksNum.Set(float64(len(dbChunks)))
+
+	var hasChunkTimeout bool
 	currentTimeSec := uint64(time.Now().Unix())
 	if dbChunks[0].StartBlockTime+p.batchTimeoutSec < currentTimeSec {
 		log.Warn("first block timeout",
@@ -255,18 +241,18 @@ func (p *BatchProposer) proposeBatchChunks() ([]*orm.Chunk, *types.BatchMeta, er
 			"first block timestamp", dbChunks[0].StartBlockTime,
 			"chunk outdated time threshold", currentTimeSec,
 		)
-		batchMeta.TotalL1CommitGas = totalL1CommitGas
-		batchMeta.TotalL1CommitCalldataSize = totalL1CommitCalldataSize
-		p.batchFirstBlockTimeoutReached.Inc()
-		p.totalL1CommitGas.Set(float64(batchMeta.TotalL1CommitGas))
-		p.totalL1CommitCalldataSize.Set(float64(batchMeta.TotalL1CommitCalldataSize))
-		p.batchChunksNum.Set(float64(len(dbChunks)))
-		return dbChunks, &batchMeta, nil
+		hasChunkTimeout = true
+		p.batchFirstChunkTimeoutReached.Inc()
 	}
 
-	log.Debug("pending chunks do not reach one of the constraints or contain a timeout block")
-	p.batchChunksProposeNotEnoughTotal.Inc()
-	return nil, nil, nil
+	if !hasChunkTimeout && uint64(len(dbChunks)) < p.minChunkNumPerBatch {
+		log.Warn("The chunk number of the batch is less than the minimum limit",
+			"chunk num", len(dbChunks), "minChunkNumPerBatch", p.minChunkNumPerBatch,
+		)
+		p.batchChunksSuperposeNotEnoughTotal.Inc()
+		return nil, nil
+	}
+	return dbChunks, nil
 }
 
 func (p *BatchProposer) dbChunksToBridgeChunks(dbChunks []*orm.Chunk) ([]*types.Chunk, error) {

bridge/internal/controller/watcher/batch_proposer_test.go

@@ -23,9 +23,11 @@ func testBatchProposer(t *testing.T) {
 	assert.NoError(t, err)
 
 	cp := NewChunkProposer(context.Background(), &config.ChunkProposerConfig{
-		MaxTxNumPerChunk:                10000,
+		MaxTxGasPerChunk:                1000000000,
+		MaxL2TxNumPerChunk:              10000,
 		MaxL1CommitGasPerChunk:          50000000000,
 		MaxL1CommitCalldataSizePerChunk: 1000000,
+		MinL1CommitCalldataSizePerChunk: 0,
 		MaxRowConsumptionPerChunk:       1048319,
 		ChunkTimeoutSec:                 300,
 	}, db, nil)
@@ -35,10 +37,16 @@ func testBatchProposer(t *testing.T) {
 		MaxChunkNumPerBatch:             10,
 		MaxL1CommitGasPerBatch:          50000000000,
 		MaxL1CommitCalldataSizePerBatch: 1000000,
+		MinChunkNumPerBatch:             1,
 		BatchTimeoutSec:                 300,
 	}, db, nil)
 	bp.TryProposeBatch()
 
+	chunkOrm := orm.NewChunk(db)
+	chunks, err := chunkOrm.GetUnbatchedChunks(context.Background())
+	assert.NoError(t, err)
+	assert.Empty(t, chunks)
+
 	batchOrm := orm.NewBatch(db)
 	// get all batches.
 	batches, err := batchOrm.GetBatches(context.Background(), map[string]interface{}{}, []string{}, 0)
@@ -49,7 +57,6 @@ func testBatchProposer(t *testing.T) {
 	assert.Equal(t, types.RollupPending, types.RollupStatus(batches[0].RollupStatus))
 	assert.Equal(t, types.ProvingTaskUnassigned, types.ProvingStatus(batches[0].ProvingStatus))
 
-	chunkOrm := orm.NewChunk(db)
 	dbChunks, err := chunkOrm.GetChunksInRange(context.Background(), 0, 0)
 	assert.NoError(t, err)
 	assert.Len(t, batches, 1)

bridge/internal/controller/watcher/chunk_proposer.go

@@ -18,10 +18,6 @@ import (
 	"scroll-tech/bridge/internal/orm"
 )
 
-// maxNumBlockPerChunk is the maximum number of blocks we allow per chunk.
-// Normally we will pack much fewer blocks because of other limits.
-const maxNumBlockPerChunk int = 100
-
 // chunkRowConsumption is map(sub-circuit name => sub-circuit row count)
 type chunkRowConsumption map[string]uint64
 
@@ -55,9 +51,11 @@ type ChunkProposer struct {
 	chunkOrm   *orm.Chunk
 	l2BlockOrm *orm.L2Block
 
-	maxTxNumPerChunk                uint64
+	maxTxGasPerChunk                uint64
+	maxL2TxNumPerChunk              uint64
 	maxL1CommitGasPerChunk          uint64
 	maxL1CommitCalldataSizePerChunk uint64
+	minL1CommitCalldataSizePerChunk uint64
 	maxRowConsumptionPerChunk       uint64
 	chunkTimeoutSec                 uint64
 	gasCostIncreaseMultiplier       float64
@@ -66,33 +64,28 @@ type ChunkProposer struct {
 	proposeChunkFailureTotal           prometheus.Counter
 	proposeChunkUpdateInfoTotal        prometheus.Counter
 	proposeChunkUpdateInfoFailureTotal prometheus.Counter
-	chunkTxNum                         prometheus.Gauge
+	chunkL2TxNum                       prometheus.Gauge
 	chunkEstimateL1CommitGas           prometheus.Gauge
 	totalL1CommitCalldataSize          prometheus.Gauge
 	totalTxGasUsed                     prometheus.Gauge
 	maxTxConsumption                   prometheus.Gauge
 	chunkBlocksNum                     prometheus.Gauge
-	chunkFirstBlockTimeoutReached      prometheus.Counter
-	chunkBlocksProposeNotEnoughTotal   prometheus.Counter
+	chunkBlockTimeoutReached           prometheus.Counter
+	chunkBlocksSuperposeNotEnoughTotal prometheus.Counter
 }
 
 // NewChunkProposer creates a new ChunkProposer instance.
 func NewChunkProposer(ctx context.Context, cfg *config.ChunkProposerConfig, db *gorm.DB, reg prometheus.Registerer) *ChunkProposer {
-	log.Debug("new chunk proposer",
-		"maxTxNumPerChunk", cfg.MaxTxNumPerChunk,
-		"maxL1CommitGasPerChunk", cfg.MaxL1CommitGasPerChunk,
-		"maxL1CommitCalldataSizePerChunk", cfg.MaxL1CommitCalldataSizePerChunk,
-		"maxRowConsumptionPerChunk", cfg.MaxRowConsumptionPerChunk,
-		"chunkTimeoutSec", cfg.ChunkTimeoutSec)
-
 	return &ChunkProposer{
 		ctx:                             ctx,
 		db:                              db,
 		chunkOrm:                        orm.NewChunk(db),
 		l2BlockOrm:                      orm.NewL2Block(db),
-		maxTxNumPerChunk:                cfg.MaxTxNumPerChunk,
+		maxTxGasPerChunk:                cfg.MaxTxGasPerChunk,
+		maxL2TxNumPerChunk:              cfg.MaxL2TxNumPerChunk,
 		maxL1CommitGasPerChunk:          cfg.MaxL1CommitGasPerChunk,
 		maxL1CommitCalldataSizePerChunk: cfg.MaxL1CommitCalldataSizePerChunk,
+		minL1CommitCalldataSizePerChunk: cfg.MinL1CommitCalldataSizePerChunk,
 		maxRowConsumptionPerChunk:       cfg.MaxRowConsumptionPerChunk,
 		chunkTimeoutSec:                 cfg.ChunkTimeoutSec,
 		gasCostIncreaseMultiplier:       cfg.GasCostIncreaseMultiplier,
@@ -113,9 +106,9 @@ func NewChunkProposer(ctx context.Context, cfg *config.ChunkProposerConfig, db *
 			Name: "bridge_propose_chunk_update_info_failure_total",
 			Help: "Total number of propose chunk update info failure total.",
 		}),
-		chunkTxNum: promauto.With(reg).NewGauge(prometheus.GaugeOpts{
-			Name: "bridge_propose_chunk_tx_num",
-			Help: "The chunk tx num",
+		chunkL2TxNum: promauto.With(reg).NewGauge(prometheus.GaugeOpts{
+			Name: "bridge_propose_chunk_l2_tx_num",
+			Help: "The chunk l2 tx num",
 		}),
 		chunkEstimateL1CommitGas: promauto.With(reg).NewGauge(prometheus.GaugeOpts{
 			Name: "bridge_propose_chunk_estimate_l1_commit_gas",
@@ -137,13 +130,13 @@ func NewChunkProposer(ctx context.Context, cfg *config.ChunkProposerConfig, db *
 			Name: "bridge_propose_chunk_chunk_block_number",
 			Help: "The number of blocks in the chunk",
 		}),
-		chunkFirstBlockTimeoutReached: promauto.With(reg).NewCounter(prometheus.CounterOpts{
+		chunkBlockTimeoutReached: promauto.With(reg).NewCounter(prometheus.CounterOpts{
 			Name: "bridge_propose_chunk_first_block_timeout_reached_total",
 			Help: "Total times of chunk's first block timeout reached",
 		}),
-		chunkBlocksProposeNotEnoughTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
-			Name: "bridge_propose_chunk_blocks_propose_not_enough_total",
-			Help: "Total number of chunk block propose not enough",
+		chunkBlocksSuperposeNotEnoughTotal: promauto.With(reg).NewCounter(prometheus.CounterOpts{
+			Name: "bridge_propose_chunk_blocks_superpose_not_enough_total",
+			Help: "Total number of chunk block superpose not enough",
 		}),
 	}
 }
@@ -186,12 +179,7 @@ func (p *ChunkProposer) updateChunkInfoInDB(chunk *types.Chunk) error {
 }
 
 func (p *ChunkProposer) proposeChunk() (*types.Chunk, error) {
-	unchunkedBlockHeight, err := p.chunkOrm.GetUnchunkedBlockHeight(p.ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	blocks, err := p.l2BlockOrm.GetL2WrappedBlocksGEHeight(p.ctx, unchunkedBlockHeight, maxNumBlockPerChunk)
+	blocks, err := p.l2BlockOrm.GetUnchunkedBlocks(p.ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -200,98 +188,97 @@ func (p *ChunkProposer) proposeChunk() (*types.Chunk, error) {
 		return nil, nil
 	}
 
-	var chunk types.Chunk
-	var totalTxGasUsed uint64
-	var totalTxNum uint64
-	var totalL1CommitCalldataSize uint64
-	var totalL1CommitGas uint64
+	chunk := &types.Chunk{Blocks: blocks[:1]}
+	firstBlock := chunk.Blocks[0]
+	totalTxGasUsed := firstBlock.Header.GasUsed
+	totalL2TxNum := firstBlock.L2TxsNum()
+	totalL1CommitCalldataSize := firstBlock.EstimateL1CommitCalldataSize()
 	crc := chunkRowConsumption{}
+	totalL1CommitGas := chunk.EstimateL1CommitGas()
 
-	for i, block := range blocks {
-		// metric values
-		lastTotalTxNum := totalTxNum
-		lastTotalL1CommitGas := totalL1CommitGas
-		lastCrcMax := crc.max()
-		lastTotalL1CommitCalldataSize := totalL1CommitCalldataSize
-		lastTotalTxGasUsed := totalTxGasUsed
+	if err := crc.add(firstBlock.RowConsumption); err != nil {
+		return nil, fmt.Errorf("chunk-proposer failed to update chunk row consumption: %v", err)
+	}
 
+	p.chunkL2TxNum.Set(float64(totalL2TxNum))
+	// 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 {
+		return nil, fmt.Errorf(
+			"the first block exceeds l2 tx number limit; block number: %v, number of transactions: %v, max transaction number limit: %v",
+			firstBlock.Header.Number,
+			totalL2TxNum,
+			p.maxL2TxNumPerChunk,
+		)
+	}
+
+	p.chunkEstimateL1CommitGas.Set(float64(totalL1CommitGas))
+	if p.gasCostIncreaseMultiplier*float64(totalL1CommitGas) > float64(p.maxL1CommitGasPerChunk) {
+		return nil, fmt.Errorf(
+			"the first block exceeds l1 commit gas limit; block number: %v, commit gas: %v, max commit gas limit: %v",
+			firstBlock.Header.Number,
+			totalL1CommitGas,
+			p.maxL1CommitGasPerChunk,
+		)
+	}
+
+	p.totalL1CommitCalldataSize.Set(float64(totalL1CommitCalldataSize))
+	if totalL1CommitCalldataSize > p.maxL1CommitCalldataSizePerChunk {
+		return nil, fmt.Errorf(
+			"the first block exceeds l1 commit calldata size limit; block number: %v, calldata size: %v, max calldata size limit: %v",
+			firstBlock.Header.Number,
+			totalL1CommitCalldataSize,
+			p.maxL1CommitCalldataSizePerChunk,
+		)
+	}
+
+	p.totalTxGasUsed.Set(float64(totalTxGasUsed))
+	// Check if the first block breaks any soft limits.
+	if totalTxGasUsed > p.maxTxGasPerChunk {
+		log.Warn(
+			"The first block in chunk exceeds l2 tx gas limit",
+			"block number", firstBlock.Header.Number,
+			"gas used", totalTxGasUsed,
+			"max gas limit", p.maxTxGasPerChunk,
+		)
+	}
+
+	max := crc.max()
+	p.maxTxConsumption.Set(float64(max))
+	if 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)
 		totalTxGasUsed += block.Header.GasUsed
-		totalTxNum += uint64(len(block.Transactions))
+		totalL2TxNum += block.L2TxsNum()
 		totalL1CommitCalldataSize += block.EstimateL1CommitCalldataSize()
 		totalL1CommitGas = chunk.EstimateL1CommitGas()
-		totalOverEstimateL1CommitGas := uint64(p.gasCostIncreaseMultiplier * float64(totalL1CommitGas))
+
 		if err := crc.add(block.RowConsumption); err != nil {
 			return nil, fmt.Errorf("chunk-proposer failed to update chunk row consumption: %v", err)
 		}
-		crcMax := crc.max()
 
-		if totalTxNum > p.maxTxNumPerChunk ||
+		if totalTxGasUsed > p.maxTxGasPerChunk ||
+			totalL2TxNum > p.maxL2TxNumPerChunk ||
 			totalL1CommitCalldataSize > p.maxL1CommitCalldataSizePerChunk ||
-			totalOverEstimateL1CommitGas > p.maxL1CommitGasPerChunk ||
-			crcMax > p.maxRowConsumptionPerChunk {
-			// Check if the first block breaks hard limits.
-			// If so, it indicates there are bugs in sequencer, manual fix is needed.
-			if i == 0 {
-				if totalTxNum > p.maxTxNumPerChunk {
-					return nil, fmt.Errorf(
-						"the first block exceeds l2 tx number limit; block number: %v, number of transactions: %v, max transaction number limit: %v",
-						block.Header.Number,
-						totalTxNum,
-						p.maxTxNumPerChunk,
-					)
-				}
-
-				if totalOverEstimateL1CommitGas > p.maxL1CommitGasPerChunk {
-					return nil, fmt.Errorf(
-						"the first block exceeds l1 commit gas limit; block number: %v, commit gas: %v, max commit gas limit: %v",
-						block.Header.Number,
-						totalL1CommitGas,
-						p.maxL1CommitGasPerChunk,
-					)
-				}
-
-				if totalL1CommitCalldataSize > p.maxL1CommitCalldataSizePerChunk {
-					return nil, fmt.Errorf(
-						"the first block exceeds l1 commit calldata size limit; block number: %v, calldata size: %v, max calldata size limit: %v",
-						block.Header.Number,
-						totalL1CommitCalldataSize,
-						p.maxL1CommitCalldataSizePerChunk,
-					)
-				}
-
-				if crcMax > p.maxRowConsumptionPerChunk {
-					return nil, fmt.Errorf(
-						"the first block exceeds row consumption limit; block number: %v, row consumption: %v, max: %v, limit: %v",
-						block.Header.Number,
-						crc,
-						crcMax,
-						p.maxRowConsumptionPerChunk,
-					)
-				}
-			}
-
-			log.Debug("breaking limit condition in chunking",
-				"totalTxNum", totalTxNum,
-				"maxTxNumPerChunk", p.maxTxNumPerChunk,
-				"currentL1CommitCalldataSize", totalL1CommitCalldataSize,
-				"maxL1CommitCalldataSizePerChunk", p.maxL1CommitCalldataSizePerChunk,
-				"currentOverEstimateL1CommitGas", totalOverEstimateL1CommitGas,
-				"maxL1CommitGasPerChunk", p.maxL1CommitGasPerChunk,
-				"chunkRowConsumptionMax", crcMax,
-				"chunkRowConsumption", crc,
-				"p.maxRowConsumptionPerChunk", p.maxRowConsumptionPerChunk)
-
-			p.chunkTxNum.Set(float64(lastTotalTxNum))
-			p.chunkEstimateL1CommitGas.Set(float64(lastTotalL1CommitGas))
-			p.totalL1CommitCalldataSize.Set(float64(lastTotalL1CommitCalldataSize))
-			p.maxTxConsumption.Set(float64(lastCrcMax))
-			p.totalTxGasUsed.Set(float64(lastTotalTxGasUsed))
-			p.chunkBlocksNum.Set(float64(len(chunk.Blocks)))
-			return &chunk, nil
+			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
 		}
-		chunk.Blocks = append(chunk.Blocks, block)
 	}
 
+	p.chunkBlocksNum.Set(float64(len(chunk.Blocks)))
+
+	var hasBlockTimeout bool
 	currentTimeSec := uint64(time.Now().Unix())
 	if blocks[0].Header.Time+p.chunkTimeoutSec < currentTimeSec {
 		log.Warn("first block timeout",
@@ -299,17 +286,17 @@ func (p *ChunkProposer) proposeChunk() (*types.Chunk, error) {
 			"block timestamp", blocks[0].Header.Time,
 			"block outdated time threshold", currentTimeSec,
 		)
-		p.chunkFirstBlockTimeoutReached.Inc()
-		p.chunkTxNum.Set(float64(totalTxNum))
-		p.chunkEstimateL1CommitGas.Set(float64(totalL1CommitGas))
-		p.totalL1CommitCalldataSize.Set(float64(totalL1CommitCalldataSize))
-		p.maxTxConsumption.Set(float64(crc.max()))
-		p.totalTxGasUsed.Set(float64(totalTxGasUsed))
-		p.chunkBlocksNum.Set(float64(len(chunk.Blocks)))
-		return &chunk, nil
+		p.chunkBlockTimeoutReached.Inc()
+		hasBlockTimeout = true
 	}
 
-	log.Debug("pending blocks do not reach one of the constraints or contain a timeout block")
-	p.chunkBlocksProposeNotEnoughTotal.Inc()
-	return nil, nil
+	if !hasBlockTimeout && totalL1CommitCalldataSize < p.minL1CommitCalldataSizePerChunk {
+		log.Warn("The calldata size of the chunk is less than the minimum limit",
+			"totalL1CommitCalldataSize", totalL1CommitCalldataSize,
+			"minL1CommitCalldataSizePerChunk", p.minL1CommitCalldataSizePerChunk,
+		)
+		p.chunkBlocksSuperposeNotEnoughTotal.Inc()
+		return nil, nil
+	}
+	return chunk, nil
 }

bridge/internal/controller/watcher/chunk_proposer_test.go

@@ -23,9 +23,11 @@ func testChunkProposer(t *testing.T) {
 	assert.NoError(t, err)
 
 	cp := NewChunkProposer(context.Background(), &config.ChunkProposerConfig{
-		MaxTxNumPerChunk:                10000,
+		MaxTxGasPerChunk:                1000000000,
+		MaxL2TxNumPerChunk:              10000,
 		MaxL1CommitGasPerChunk:          50000000000,
 		MaxL1CommitCalldataSizePerChunk: 1000000,
+		MinL1CommitCalldataSizePerChunk: 0,
 		MaxRowConsumptionPerChunk:       1048319,
 		ChunkTimeoutSec:                 300,
 	}, db, nil)
@@ -38,7 +40,7 @@ func testChunkProposer(t *testing.T) {
 	assert.NoError(t, err)
 
 	chunkOrm := orm.NewChunk(db)
-	chunks, err := chunkOrm.GetChunksGEIndex(context.Background(), 0, 0)
+	chunks, err := chunkOrm.GetUnbatchedChunks(context.Background())
 	assert.NoError(t, err)
 	assert.Len(t, chunks, 1)
 	assert.Equal(t, expectedHash.Hex(), chunks[0].Hash)
@@ -53,16 +55,18 @@ func testChunkProposerRowConsumption(t *testing.T) {
 	assert.NoError(t, err)
 
 	cp := NewChunkProposer(context.Background(), &config.ChunkProposerConfig{
-		MaxTxNumPerChunk:                10000,
+		MaxTxGasPerChunk:                1000000000,
+		MaxL2TxNumPerChunk:              10000,
 		MaxL1CommitGasPerChunk:          50000000000,
 		MaxL1CommitCalldataSizePerChunk: 1000000,
+		MinL1CommitCalldataSizePerChunk: 0,
 		MaxRowConsumptionPerChunk:       0, // !
 		ChunkTimeoutSec:                 300,
 	}, db, nil)
 	cp.TryProposeChunk()
 
 	chunkOrm := orm.NewChunk(db)
-	chunks, err := chunkOrm.GetChunksGEIndex(context.Background(), 0, 0)
+	chunks, err := chunkOrm.GetUnbatchedChunks(context.Background())
 	assert.NoError(t, err)
 	assert.Len(t, chunks, 0)
 }

bridge/internal/orm/batch.go

@@ -53,11 +53,9 @@ type Batch struct {
 	OracleTxHash string `json:"oracle_tx_hash" gorm:"column:oracle_tx_hash;default:NULL"`
 
 	// metadata
-	TotalL1CommitGas          uint64         `json:"total_l1_commit_gas" gorm:"column:total_l1_commit_gas;default:0"`
-	TotalL1CommitCalldataSize uint32         `json:"total_l1_commit_calldata_size" gorm:"column:total_l1_commit_calldata_size;default:0"`
-	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"`
+	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"`
 }
 
 // NewBatch creates a new Batch database instance.
@@ -144,21 +142,6 @@ func (o *Batch) GetLatestBatch(ctx context.Context) (*Batch, error) {
 	return &latestBatch, nil
 }
 
-// GetFirstUnbatchedChunkIndex retrieves the first unbatched chunk index.
-func (o *Batch) GetFirstUnbatchedChunkIndex(ctx context.Context) (uint64, error) {
-	// Get the latest batch
-	latestBatch, err := o.GetLatestBatch(ctx)
-	if err != nil {
-		return 0, fmt.Errorf("Chunk.GetChunkedBlockHeight error: %w", err)
-	}
-	// if parentBatch==nil then err==gorm.ErrRecordNotFound,
-	// which means there is not batched chunk yet, thus returns 0
-	if latestBatch == nil {
-		return 0, nil
-	}
-	return latestBatch.EndChunkIndex + 1, nil
-}
-
 // GetRollupStatusByHashList retrieves the rollup statuses for a list of batch hashes.
 func (o *Batch) GetRollupStatusByHashList(ctx context.Context, hashes []string) ([]types.RollupStatus, error) {
 	if len(hashes) == 0 {
@@ -226,7 +209,7 @@ func (o *Batch) GetBatchByIndex(ctx context.Context, index uint64) (*Batch, erro
 }
 
 // InsertBatch inserts a new batch into the database.
-func (o *Batch) InsertBatch(ctx context.Context, chunks []*types.Chunk, batchMeta *types.BatchMeta, dbTX ...*gorm.DB) (*Batch, error) {
+func (o *Batch) InsertBatch(ctx context.Context, startChunkIndex, endChunkIndex uint64, startChunkHash, endChunkHash string, chunks []*types.Chunk, dbTX ...*gorm.DB) (*Batch, error) {
 	if len(chunks) == 0 {
 		return nil, errors.New("invalid args")
 	}
@@ -272,22 +255,20 @@ func (o *Batch) InsertBatch(ctx context.Context, chunks []*types.Chunk, batchMet
 	lastChunkBlockNum := len(chunks[numChunks-1].Blocks)
 
 	newBatch := Batch{
-		Index:                     batchIndex,
-		Hash:                      batchHeader.Hash().Hex(),
-		StartChunkHash:            batchMeta.StartChunkHash,
-		StartChunkIndex:           batchMeta.StartChunkIndex,
-		EndChunkHash:              batchMeta.EndChunkHash,
-		EndChunkIndex:             batchMeta.EndChunkIndex,
-		StateRoot:                 chunks[numChunks-1].Blocks[lastChunkBlockNum-1].Header.Root.Hex(),
-		WithdrawRoot:              chunks[numChunks-1].Blocks[lastChunkBlockNum-1].WithdrawRoot.Hex(),
-		ParentBatchHash:           parentBatchHash.Hex(),
-		BatchHeader:               batchHeader.Encode(),
-		ChunkProofsStatus:         int16(types.ChunkProofsStatusPending),
-		ProvingStatus:             int16(types.ProvingTaskUnassigned),
-		RollupStatus:              int16(types.RollupPending),
-		OracleStatus:              int16(types.GasOraclePending),
-		TotalL1CommitGas:          batchMeta.TotalL1CommitGas,
-		TotalL1CommitCalldataSize: batchMeta.TotalL1CommitCalldataSize,
+		Index:             batchIndex,
+		Hash:              batchHeader.Hash().Hex(),
+		StartChunkHash:    startChunkHash,
+		StartChunkIndex:   startChunkIndex,
+		EndChunkHash:      endChunkHash,
+		EndChunkIndex:     endChunkIndex,
+		StateRoot:         chunks[numChunks-1].Blocks[lastChunkBlockNum-1].Header.Root.Hex(),
+		WithdrawRoot:      chunks[numChunks-1].Blocks[lastChunkBlockNum-1].WithdrawRoot.Hex(),
+		ParentBatchHash:   parentBatchHash.Hex(),
+		BatchHeader:       batchHeader.Encode(),
+		ChunkProofsStatus: int16(types.ChunkProofsStatusPending),
+		ProvingStatus:     int16(types.ProvingTaskUnassigned),
+		RollupStatus:      int16(types.RollupPending),
+		OracleStatus:      int16(types.GasOraclePending),
 	}
 
 	db := o.db
@@ -330,7 +311,7 @@ func (o *Batch) UpdateProvingStatus(ctx context.Context, hash string, status typ
 		updateFields["prover_assigned_at"] = time.Now()
 	case types.ProvingTaskUnassigned:
 		updateFields["prover_assigned_at"] = nil
-	case types.ProvingTaskVerified:
+	case types.ProvingTaskProved, types.ProvingTaskVerified:
 		updateFields["proved_at"] = time.Now()
 	}
 

bridge/internal/orm/chunk.go

@@ -87,6 +87,20 @@ func (o *Chunk) GetChunksInRange(ctx context.Context, startIndex uint64, endInde
 	return chunks, nil
 }
 
+// GetUnbatchedChunks retrieves unbatched chunks from the database.
+func (o *Chunk) GetUnbatchedChunks(ctx context.Context) ([]*Chunk, error) {
+	db := o.db.WithContext(ctx)
+	db = db.Model(&Chunk{})
+	db = db.Where("batch_hash IS NULL")
+	db = db.Order("index asc")
+
+	var chunks []*Chunk
+	if err := db.Find(&chunks).Error; err != nil {
+		return nil, fmt.Errorf("Chunk.GetUnbatchedChunks error: %w", err)
+	}
+	return chunks, nil
+}
+
 // GetLatestChunk retrieves the latest chunk from the database.
 func (o *Chunk) GetLatestChunk(ctx context.Context) (*Chunk, error) {
 	db := o.db.WithContext(ctx)
@@ -100,40 +114,6 @@ func (o *Chunk) GetLatestChunk(ctx context.Context) (*Chunk, error) {
 	return &latestChunk, nil
 }
 
-// GetUnchunkedBlockHeight retrieves the first unchunked block number.
-func (o *Chunk) GetUnchunkedBlockHeight(ctx context.Context) (uint64, error) {
-	// Get the latest chunk
-	latestChunk, err := o.GetLatestChunk(ctx)
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			// if there is no chunk, return block number 1,
-			// because no need to chunk genesis block number
-			return 1, nil
-		}
-		return 0, fmt.Errorf("Chunk.GetChunkedBlockHeight error: %w", err)
-	}
-	return latestChunk.EndBlockNumber + 1, nil
-}
-
-// GetChunksGEIndex retrieves chunks that have a chunk index greater than the or equal to the given index.
-// The returned chunks are sorted in ascending order by their index.
-func (o *Chunk) GetChunksGEIndex(ctx context.Context, index uint64, limit int) ([]*Chunk, error) {
-	db := o.db.WithContext(ctx)
-	db = db.Model(&Chunk{})
-	db = db.Where("index >= ?", index)
-	db = db.Order("index ASC")
-
-	if limit > 0 {
-		db = db.Limit(limit)
-	}
-
-	var chunks []*Chunk
-	if err := db.Find(&chunks).Error; err != nil {
-		return nil, fmt.Errorf("Chunk.GetChunksGEIndex error: %w", err)
-	}
-	return chunks, nil
-}
-
 // InsertChunk inserts a new chunk into the database.
 func (o *Chunk) InsertChunk(ctx context.Context, chunk *types.Chunk, dbTX ...*gorm.DB) (*Chunk, error) {
 	if chunk == nil || len(chunk.Blocks) == 0 {
@@ -171,7 +151,7 @@ func (o *Chunk) InsertChunk(ctx context.Context, chunk *types.Chunk, dbTX ...*go
 	var totalL1CommitCalldataSize uint64
 	for _, block := range chunk.Blocks {
 		totalL2TxGas += block.Header.GasUsed
-		totalL2TxNum += block.NumL2Transactions()
+		totalL2TxNum += block.L2TxsNum()
 		totalL1CommitCalldataSize += block.EstimateL1CommitCalldataSize()
 	}
 
@@ -221,7 +201,7 @@ func (o *Chunk) UpdateProvingStatus(ctx context.Context, hash string, status typ
 		updateFields["prover_assigned_at"] = time.Now()
 	case types.ProvingTaskUnassigned:
 		updateFields["prover_assigned_at"] = nil
-	case types.ProvingTaskVerified:
+	case types.ProvingTaskProved, types.ProvingTaskVerified:
 		updateFields["proved_at"] = time.Now()
 	}
 

bridge/internal/orm/l2_block.go

@@ -64,23 +64,18 @@ func (o *L2Block) GetL2BlocksLatestHeight(ctx context.Context) (uint64, error) {
 	return maxNumber, nil
 }
 
-// GetL2WrappedBlocksGEHeight retrieves L2 blocks that have a block number greater than or equal to the given height.
-// The blocks are converted into WrappedBlock format for output.
+// GetUnchunkedBlocks get the l2 blocks that have not been put into a chunk.
 // The returned blocks are sorted in ascending order by their block number.
-func (o *L2Block) GetL2WrappedBlocksGEHeight(ctx context.Context, height uint64, limit int) ([]*types.WrappedBlock, error) {
+func (o *L2Block) GetUnchunkedBlocks(ctx context.Context) ([]*types.WrappedBlock, error) {
 	db := o.db.WithContext(ctx)
 	db = db.Model(&L2Block{})
 	db = db.Select("header, transactions, withdraw_root, row_consumption")
-	db = db.Where("number >= ?", height)
+	db = db.Where("chunk_hash IS NULL")
 	db = db.Order("number ASC")
 
-	if limit > 0 {
-		db = db.Limit(limit)
-	}
-
 	var l2Blocks []L2Block
 	if err := db.Find(&l2Blocks).Error; err != nil {
-		return nil, fmt.Errorf("L2Block.GetL2WrappedBlocksGEHeight error: %w", err)
+		return nil, fmt.Errorf("L2Block.GetUnchunkedBlocks error: %w", err)
 	}
 
 	var wrappedBlocks []*types.WrappedBlock
@@ -88,18 +83,18 @@ func (o *L2Block) GetL2WrappedBlocksGEHeight(ctx context.Context, height uint64,
 		var wrappedBlock types.WrappedBlock
 
 		if err := json.Unmarshal([]byte(v.Transactions), &wrappedBlock.Transactions); err != nil {
-			return nil, fmt.Errorf("L2Block.GetL2WrappedBlocksGEHeight error: %w", err)
+			return nil, fmt.Errorf("L2Block.GetUnchunkedBlocks error: %w", err)
 		}
 
 		wrappedBlock.Header = &gethTypes.Header{}
 		if err := json.Unmarshal([]byte(v.Header), wrappedBlock.Header); err != nil {
-			return nil, fmt.Errorf("L2Block.GetL2WrappedBlocksGEHeight error: %w", err)
+			return nil, fmt.Errorf("L2Block.GetUnchunkedBlocks error: %w", err)
 		}
 
 		wrappedBlock.WithdrawRoot = common.HexToHash(v.WithdrawRoot)
 
 		if err := json.Unmarshal([]byte(v.RowConsumption), &wrappedBlock.RowConsumption); err != nil {
-			return nil, fmt.Errorf("L2Block.GetL2WrappedBlocksGEHeight error: %w", err)
+			return nil, fmt.Errorf("L2Block.GetUnchunkedBlocks error: %w", err)
 		}
 
 		wrappedBlocks = append(wrappedBlocks, &wrappedBlock)

bridge/internal/orm/orm_test.go

@@ -101,26 +101,25 @@ func TestL2BlockOrm(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, uint64(3), height)
 
-	blocks, err := l2BlockOrm.GetL2Blocks(context.Background(), map[string]interface{}{}, []string{}, 0)
+	blocks, err := l2BlockOrm.GetUnchunkedBlocks(context.Background())
 	assert.NoError(t, err)
 	assert.Len(t, blocks, 2)
-	assert.Equal(t, "", blocks[0].ChunkHash)
-	assert.Equal(t, "", blocks[1].ChunkHash)
+	assert.Equal(t, wrappedBlock1, blocks[0])
+	assert.Equal(t, wrappedBlock2, blocks[1])
 
-	wrappedBlocks, err := l2BlockOrm.GetL2BlocksInRange(context.Background(), 2, 3)
+	blocks, err = l2BlockOrm.GetL2BlocksInRange(context.Background(), 2, 3)
 	assert.NoError(t, err)
 	assert.Len(t, blocks, 2)
-	assert.Equal(t, wrappedBlock1, wrappedBlocks[0])
-	assert.Equal(t, wrappedBlock2, wrappedBlocks[1])
+	assert.Equal(t, wrappedBlock1, blocks[0])
+	assert.Equal(t, wrappedBlock2, blocks[1])
 
 	err = l2BlockOrm.UpdateChunkHashInRange(context.Background(), 2, 2, "test hash")
 	assert.NoError(t, err)
 
-	blocks, err = l2BlockOrm.GetL2Blocks(context.Background(), map[string]interface{}{}, []string{}, 0)
+	blocks, err = l2BlockOrm.GetUnchunkedBlocks(context.Background())
 	assert.NoError(t, err)
-	assert.Len(t, blocks, 2)
-	assert.Equal(t, "test hash", blocks[0].ChunkHash)
-	assert.Equal(t, "", blocks[1].ChunkHash)
+	assert.Len(t, blocks, 1)
+	assert.Equal(t, wrappedBlock2, blocks[0])
 }
 
 func TestChunkOrm(t *testing.T) {
@@ -136,13 +135,11 @@ func TestChunkOrm(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, dbChunk2.Hash, chunkHash2.Hex())
 
-	chunks, err := chunkOrm.GetChunksGEIndex(context.Background(), 0, 0)
+	chunks, err := chunkOrm.GetUnbatchedChunks(context.Background())
 	assert.NoError(t, err)
 	assert.Len(t, chunks, 2)
 	assert.Equal(t, chunkHash1.Hex(), chunks[0].Hash)
 	assert.Equal(t, chunkHash2.Hex(), chunks[1].Hash)
-	assert.Equal(t, "", chunks[0].BatchHash)
-	assert.Equal(t, "", chunks[1].BatchHash)
 
 	err = chunkOrm.UpdateProvingStatus(context.Background(), chunkHash1.Hex(), types.ProvingTaskVerified)
 	assert.NoError(t, err)
@@ -159,13 +156,9 @@ func TestChunkOrm(t *testing.T) {
 
 	err = chunkOrm.UpdateBatchHashInRange(context.Background(), 0, 0, "test hash")
 	assert.NoError(t, err)
-	chunks, err = chunkOrm.GetChunksGEIndex(context.Background(), 0, 0)
+	chunks, err = chunkOrm.GetUnbatchedChunks(context.Background())
 	assert.NoError(t, err)
-	assert.Len(t, chunks, 2)
-	assert.Equal(t, chunkHash1.Hex(), chunks[0].Hash)
-	assert.Equal(t, chunkHash2.Hex(), chunks[1].Hash)
-	assert.Equal(t, "test hash", chunks[0].BatchHash)
-	assert.Equal(t, "", chunks[1].BatchHash)
+	assert.Len(t, chunks, 1)
 }
 
 func TestBatchOrm(t *testing.T) {
@@ -173,13 +166,7 @@ func TestBatchOrm(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NoError(t, migrate.ResetDB(sqlDB))
 
-	batchMeta1 := &types.BatchMeta{
-		StartChunkIndex: 0,
-		StartChunkHash:  chunkHash1.Hex(),
-		EndChunkIndex:   0,
-		EndChunkHash:    chunkHash1.Hex(),
-	}
-	batch1, err := batchOrm.InsertBatch(context.Background(), []*types.Chunk{chunk1}, batchMeta1)
+	batch1, err := batchOrm.InsertBatch(context.Background(), 0, 0, chunkHash1.Hex(), chunkHash1.Hex(), []*types.Chunk{chunk1})
 	assert.NoError(t, err)
 	hash1 := batch1.Hash
 
@@ -190,13 +177,7 @@ func TestBatchOrm(t *testing.T) {
 	batchHash1 := batchHeader1.Hash().Hex()
 	assert.Equal(t, hash1, batchHash1)
 
-	batchMeta2 := &types.BatchMeta{
-		StartChunkIndex: 1,
-		StartChunkHash:  chunkHash2.Hex(),
-		EndChunkIndex:   1,
-		EndChunkHash:    chunkHash2.Hex(),
-	}
-	batch2, err := batchOrm.InsertBatch(context.Background(), []*types.Chunk{chunk2}, batchMeta2)
+	batch2, err := batchOrm.InsertBatch(context.Background(), 1, 1, chunkHash2.Hex(), chunkHash2.Hex(), []*types.Chunk{chunk2})
 	assert.NoError(t, err)
 	hash2 := batch2.Hash
 

bridge/tests/gas_oracle_test.go

@@ -90,14 +90,8 @@ func testImportL2GasPrice(t *testing.T) {
 	chunkHash, err := chunk.Hash(0)
 	assert.NoError(t, err)
 
-	batchMeta := &types.BatchMeta{
-		StartChunkIndex: 0,
-		StartChunkHash:  chunkHash.Hex(),
-		EndChunkIndex:   0,
-		EndChunkHash:    chunkHash.Hex(),
-	}
 	batchOrm := orm.NewBatch(db)
-	_, err = batchOrm.InsertBatch(context.Background(), []*types.Chunk{chunk}, batchMeta)
+	_, err = batchOrm.InsertBatch(context.Background(), 0, 0, chunkHash.Hex(), chunkHash.Hex(), []*types.Chunk{chunk})
 	assert.NoError(t, err)
 
 	// check db status

bridge/tests/rollup_test.go

@@ -58,20 +58,18 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 	assert.NoError(t, err)
 
 	cp := watcher.NewChunkProposer(context.Background(), &config.ChunkProposerConfig{
-		MaxTxNumPerChunk:                10000,
+		MaxTxGasPerChunk:                1000000000,
+		MaxL2TxNumPerChunk:              10000,
 		MaxL1CommitGasPerChunk:          50000000000,
 		MaxL1CommitCalldataSizePerChunk: 1000000,
+		MinL1CommitCalldataSizePerChunk: 0,
 		MaxRowConsumptionPerChunk:       1048319,
 		ChunkTimeoutSec:                 300,
 	}, db, nil)
 	cp.TryProposeChunk()
 
-	batchOrm := orm.NewBatch(db)
-	unbatchedChunkIndex, err := batchOrm.GetFirstUnbatchedChunkIndex(context.Background())
-	assert.NoError(t, err)
-
 	chunkOrm := orm.NewChunk(db)
-	chunks, err := chunkOrm.GetChunksGEIndex(context.Background(), unbatchedChunkIndex, 0)
+	chunks, err := chunkOrm.GetUnbatchedChunks(context.Background())
 	assert.NoError(t, err)
 	assert.Len(t, chunks, 1)
 
@@ -79,12 +77,14 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 		MaxChunkNumPerBatch:             10,
 		MaxL1CommitGasPerBatch:          50000000000,
 		MaxL1CommitCalldataSizePerBatch: 1000000,
+		MinChunkNumPerBatch:             1,
 		BatchTimeoutSec:                 300,
 	}, db, nil)
 	bp.TryProposeBatch()
 
 	l2Relayer.ProcessPendingBatches()
 
+	batchOrm := orm.NewBatch(db)
 	batch, err := batchOrm.GetLatestBatch(context.Background())
 	assert.NoError(t, err)
 	assert.NotNil(t, batch)

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?tag=v0.7.5#aa9a9aff698a5b253d1f3c29ea3d3006364777bf"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.2#750169c0e7282c267c8216c800ed7c1b7e021b16"
 dependencies = [
  "ark-std",
  "env_logger 0.10.0",
@@ -433,7 +433,7 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
 [[package]]
 name = "bus-mapping"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.7.5#aa9a9aff698a5b253d1f3c29ea3d3006364777bf"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.2#750169c0e7282c267c8216c800ed7c1b7e021b16"
 dependencies = [
  "eth-types",
  "ethers-core",
@@ -1049,7 +1049,7 @@ dependencies = [
 [[package]]
 name = "eth-types"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.7.5#aa9a9aff698a5b253d1f3c29ea3d3006364777bf"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.2#750169c0e7282c267c8216c800ed7c1b7e021b16"
 dependencies = [
  "ethers-core",
  "ethers-signers",
@@ -1226,7 +1226,7 @@ dependencies = [
 [[package]]
 name = "external-tracer"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.7.5#aa9a9aff698a5b253d1f3c29ea3d3006364777bf"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.2#750169c0e7282c267c8216c800ed7c1b7e021b16"
 dependencies = [
  "eth-types",
  "geth-utils",
@@ -1439,7 +1439,7 @@ dependencies = [
 [[package]]
 name = "gadgets"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.7.5#aa9a9aff698a5b253d1f3c29ea3d3006364777bf"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.2#750169c0e7282c267c8216c800ed7c1b7e021b16"
 dependencies = [
  "digest 0.7.6",
  "eth-types",
@@ -1479,7 +1479,7 @@ dependencies = [
 [[package]]
 name = "geth-utils"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.7.5#aa9a9aff698a5b253d1f3c29ea3d3006364777bf"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.2#750169c0e7282c267c8216c800ed7c1b7e021b16"
 dependencies = [
  "env_logger 0.9.3",
  "gobuild 0.1.0-alpha.2 (git+https://github.com/scroll-tech/gobuild.git)",
@@ -1595,6 +1595,21 @@ dependencies = [
  "rustc-hash",
 ]
 
+[[package]]
+name = "halo2-base"
+version = "0.2.2"
+source = "git+https://github.com/scroll-tech/halo2-lib?branch=develop#2c225864227e74b207d9f4b9e08c4d5f1afc69a1"
+dependencies = [
+ "ff",
+ "halo2_proofs",
+ "itertools",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "rand_chacha",
+ "rustc-hash",
+]
+
 [[package]]
 name = "halo2-ecc"
 version = "0.2.2"
@@ -1602,7 +1617,26 @@ source = "git+https://github.com/scroll-tech/halo2-lib?tag=v0.1.0#2c225864227e74
 dependencies = [
  "ff",
  "group",
- "halo2-base",
+ "halo2-base 0.2.2 (git+https://github.com/scroll-tech/halo2-lib?tag=v0.1.0)",
+ "itertools",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "rand",
+ "rand_chacha",
+ "rand_core",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "halo2-ecc"
+version = "0.2.2"
+source = "git+https://github.com/scroll-tech/halo2-lib?branch=develop#2c225864227e74b207d9f4b9e08c4d5f1afc69a1"
+dependencies = [
+ "ff",
+ "group",
+ "halo2-base 0.2.2 (git+https://github.com/scroll-tech/halo2-lib?branch=develop)",
  "itertools",
  "num-bigint",
  "num-integer",
@@ -1633,7 +1667,7 @@ dependencies = [
 [[package]]
 name = "halo2-mpt-circuits"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/mpt-circuit.git?tag=v0.5.1#2163a9c436ed85363c954ecf7e6e1044a1b991dc"
+source = "git+https://github.com/scroll-tech/mpt-circuit.git?branch=v0.5#2163a9c436ed85363c954ecf7e6e1044a1b991dc"
 dependencies = [
  "ethers-core",
  "halo2_proofs",
@@ -1655,7 +1689,7 @@ dependencies = [
 [[package]]
 name = "halo2_proofs"
 version = "0.2.0"
-source = "git+https://github.com/scroll-tech/halo2.git?branch=develop#19de67c07a9b9b567580466763f93ebfbc3bb799"
+source = "git+https://github.com/scroll-tech/halo2.git?branch=develop#b612b1e2a9fa2ccd150a6cb99e67592c8d62cd99"
 dependencies = [
  "ark-std",
  "blake2b_simd",
@@ -2077,7 +2111,7 @@ dependencies = [
 [[package]]
 name = "keccak256"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.7.5#aa9a9aff698a5b253d1f3c29ea3d3006364777bf"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.2#750169c0e7282c267c8216c800ed7c1b7e021b16"
 dependencies = [
  "env_logger 0.9.3",
  "eth-types",
@@ -2264,7 +2298,7 @@ dependencies = [
 [[package]]
 name = "mock"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.7.5#aa9a9aff698a5b253d1f3c29ea3d3006364777bf"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.2#750169c0e7282c267c8216c800ed7c1b7e021b16"
 dependencies = [
  "eth-types",
  "ethers-core",
@@ -2279,7 +2313,7 @@ dependencies = [
 [[package]]
 name = "mpt-zktrie"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.7.5#aa9a9aff698a5b253d1f3c29ea3d3006364777bf"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.2#750169c0e7282c267c8216c800ed7c1b7e021b16"
 dependencies = [
  "bus-mapping",
  "eth-types",
@@ -2754,8 +2788,8 @@ dependencies = [
 
 [[package]]
 name = "prover"
-version = "0.7.5"
-source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.7.5#9699d40940aed2f14d8e1958167d714bca2c9984"
+version = "0.4.0"
+source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.6.2#8c439b1dd62c429223221484fb8a5470242d1cbc"
 dependencies = [
  "aggregator",
  "anyhow",
@@ -3624,12 +3658,12 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
 [[package]]
 name = "snark-verifier"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/snark-verifier?tag=v0.1.2#4466059ce9a6dfaf26455e4ffb61d72af775cf52"
+source = "git+https://github.com/scroll-tech//snark-verifier?tag=v0.1.1#11a09d4a37c31c659b29e2dac0ceb544a776ad7b"
 dependencies = [
  "bytes",
  "ethereum-types 0.14.1",
- "halo2-base",
- "halo2-ecc",
+ "halo2-base 0.2.2 (git+https://github.com/scroll-tech/halo2-lib?tag=v0.1.0)",
+ "halo2-ecc 0.2.2 (git+https://github.com/scroll-tech/halo2-lib?tag=v0.1.0)",
  "hex",
  "itertools",
  "lazy_static",
@@ -3648,12 +3682,12 @@ dependencies = [
 [[package]]
 name = "snark-verifier-sdk"
 version = "0.0.1"
-source = "git+https://github.com/scroll-tech/snark-verifier?tag=v0.1.2#4466059ce9a6dfaf26455e4ffb61d72af775cf52"
+source = "git+https://github.com/scroll-tech//snark-verifier?tag=v0.1.1#11a09d4a37c31c659b29e2dac0ceb544a776ad7b"
 dependencies = [
  "bincode",
  "env_logger 0.10.0",
  "ethereum-types 0.14.1",
- "halo2-base",
+ "halo2-base 0.2.2 (git+https://github.com/scroll-tech/halo2-lib?tag=v0.1.0)",
  "hex",
  "itertools",
  "lazy_static",
@@ -4039,8 +4073,8 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
 
 [[package]]
 name = "types"
-version = "0.7.5"
-source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.7.5#9699d40940aed2f14d8e1958167d714bca2c9984"
+version = "0.4.0"
+source = "git+https://github.com/scroll-tech/scroll-prover?tag=v0.6.2#8c439b1dd62c429223221484fb8a5470242d1cbc"
 dependencies = [
  "base64 0.13.1",
  "blake2",
@@ -4491,7 +4525,7 @@ checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
 [[package]]
 name = "zkevm-circuits"
 version = "0.1.0"
-source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.7.5#aa9a9aff698a5b253d1f3c29ea3d3006364777bf"
+source = "git+https://github.com/scroll-tech/zkevm-circuits.git?tag=v0.6.2#750169c0e7282c267c8216c800ed7c1b7e021b16"
 dependencies = [
  "array-init",
  "bus-mapping",
@@ -4501,8 +4535,8 @@ dependencies = [
  "ethers-core",
  "ethers-signers",
  "gadgets",
- "halo2-base",
- "halo2-ecc",
+ "halo2-base 0.2.2 (git+https://github.com/scroll-tech/halo2-lib?branch=develop)",
+ "halo2-ecc 0.2.2 (git+https://github.com/scroll-tech/halo2-lib?branch=develop)",
  "halo2_proofs",
  "hex",
  "itertools",
@@ -4536,7 +4570,6 @@ dependencies = [
 name = "zkp"
 version = "0.1.0"
 dependencies = [
- "base64 0.13.1",
  "env_logger 0.9.3",
  "halo2_proofs",
  "libc",

common/libzkp/impl/Cargo.toml

@@ -19,19 +19,23 @@ maingate = { git = "https://github.com/scroll-tech/halo2wrong", branch = "halo2-
 [patch."https://github.com/privacy-scaling-explorations/halo2curves.git"]
 halo2curves = { git = "https://github.com/scroll-tech/halo2curves.git", branch = "0.3.1-derive-serde" }
 
+[patch."https://github.com/scroll-tech/snark-verifier"]
+snark-verifier = { git = "https://github.com/scroll-tech//snark-verifier", tag = "v0.1.1" }
+snark-verifier-sdk = { git = "https://github.com/scroll-tech//snark-verifier", tag = "v0.1.1" }
+
 [dependencies]
-prover = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.7.5" }
-types = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.7.5" }
+prover = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.6.2" }
+types = { git = "https://github.com/scroll-tech/scroll-prover", tag = "v0.6.2" }
 halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "develop" }
 
-base64 = "0.13.0"
-env_logger = "0.9.0"
-libc = "0.2"
 log = "0.4"
-once_cell = "1.8.0"
+env_logger = "0.9.0"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0.66"
+libc = "0.2"
+once_cell = "1.8.0"
+
 
 [profile.test]
 opt-level = 3

common/libzkp/impl/src/batch.rs

@@ -1,14 +1,11 @@
-use crate::{
-    types::{CheckChunkProofsResponse, ProofResult},
-    utils::{c_char_to_str, c_char_to_vec, string_to_c_char, vec_to_c_char, OUTPUT_DIR},
-};
+use crate::utils::{c_char_to_str, c_char_to_vec, vec_to_c_char, OUTPUT_DIR};
 use libc::c_char;
 use prover::{
     aggregator::{Prover, Verifier},
     utils::{chunk_trace_to_witness_block, init_env_and_log},
     BatchProof, ChunkHash, ChunkProof,
 };
-use std::{cell::OnceCell, env, panic, ptr::null};
+use std::{cell::OnceCell, panic, ptr::null};
 use types::eth::BlockTrace;
 
 static mut PROVER: OnceCell<Prover> = OnceCell::new();
@@ -16,15 +13,11 @@ static mut VERIFIER: OnceCell<Verifier> = OnceCell::new();
 
 /// # Safety
 #[no_mangle]
-pub unsafe extern "C" fn init_batch_prover(params_dir: *const c_char, assets_dir: *const c_char) {
+pub unsafe extern "C" fn init_batch_prover(params_dir: *const c_char) {
     init_env_and_log("ffi_batch_prove");
 
     let params_dir = c_char_to_str(params_dir);
-    let assets_dir = c_char_to_str(assets_dir);
-
-    // TODO: add a settings in scroll-prover.
-    env::set_var("SCROLL_PROVER_ASSETS_DIR", assets_dir);
-    let prover = Prover::from_dirs(params_dir, assets_dir);
+    let prover = Prover::from_params_dir(params_dir);
 
     PROVER.set(prover).unwrap();
 }
@@ -37,104 +30,39 @@ pub unsafe extern "C" fn init_batch_verifier(params_dir: *const c_char, assets_d
     let params_dir = c_char_to_str(params_dir);
     let assets_dir = c_char_to_str(assets_dir);
 
-    // TODO: add a settings in scroll-prover.
-    env::set_var("SCROLL_PROVER_ASSETS_DIR", assets_dir);
     let verifier = Verifier::from_dirs(params_dir, assets_dir);
 
     VERIFIER.set(verifier).unwrap();
 }
 
-/// # Safety
-#[no_mangle]
-pub unsafe extern "C" fn get_batch_vk() -> *const c_char {
-    let vk_result = panic::catch_unwind(|| PROVER.get_mut().unwrap().get_vk());
-
-    vk_result
-        .ok()
-        .flatten()
-        .map_or(null(), |vk| string_to_c_char(base64::encode(vk)))
-}
-
-/// # Safety
-#[no_mangle]
-pub unsafe extern "C" fn check_chunk_proofs(chunk_proofs: *const c_char) -> *const c_char {
-    let check_result: Result<bool, String> = panic::catch_unwind(|| {
-        let chunk_proofs = c_char_to_vec(chunk_proofs);
-        let chunk_proofs = serde_json::from_slice::<Vec<ChunkProof>>(&chunk_proofs)
-            .map_err(|e| format!("failed to deserialize chunk proofs: {e:?}"))?;
-
-        if chunk_proofs.is_empty() {
-            return Err("provided chunk proofs are empty.".to_string());
-        }
-
-        let prover_ref = PROVER.get().expect("failed to get reference to PROVER.");
-
-        let valid = prover_ref.check_chunk_proofs(&chunk_proofs);
-        Ok(valid)
-    })
-    .unwrap_or_else(|e| Err(format!("unwind error: {e:?}")));
-
-    let r = match check_result {
-        Ok(valid) => CheckChunkProofsResponse {
-            ok: valid,
-            error: None,
-        },
-        Err(err) => CheckChunkProofsResponse {
-            ok: false,
-            error: Some(err),
-        },
-    };
-
-    serde_json::to_vec(&r).map_or(null(), vec_to_c_char)
-}
-
 /// # Safety
 #[no_mangle]
 pub unsafe extern "C" fn gen_batch_proof(
     chunk_hashes: *const c_char,
     chunk_proofs: *const c_char,
 ) -> *const c_char {
-    let proof_result: Result<Vec<u8>, String> = panic::catch_unwind(|| {
-        let chunk_hashes = c_char_to_vec(chunk_hashes);
-        let chunk_proofs = c_char_to_vec(chunk_proofs);
+    let chunk_hashes = c_char_to_vec(chunk_hashes);
+    let chunk_proofs = c_char_to_vec(chunk_proofs);
 
-        let chunk_hashes = serde_json::from_slice::<Vec<ChunkHash>>(&chunk_hashes)
-            .map_err(|e| format!("failed to deserialize chunk hashes: {e:?}"))?;
-        let chunk_proofs = serde_json::from_slice::<Vec<ChunkProof>>(&chunk_proofs)
-            .map_err(|e| format!("failed to deserialize chunk proofs: {e:?}"))?;
+    let chunk_hashes = serde_json::from_slice::<Vec<ChunkHash>>(&chunk_hashes).unwrap();
+    let chunk_proofs = serde_json::from_slice::<Vec<ChunkProof>>(&chunk_proofs).unwrap();
+    assert_eq!(chunk_hashes.len(), chunk_proofs.len());
 
-        if chunk_hashes.len() != chunk_proofs.len() {
-            return Err(format!("chunk hashes and chunk proofs lengths mismatch: chunk_hashes.len() = {}, chunk_proofs.len() = {}",
-                chunk_hashes.len(), chunk_proofs.len()));
-        }
-
-        let chunk_hashes_proofs = chunk_hashes
-            .into_iter()
-            .zip(chunk_proofs.into_iter())
-            .collect();
+    let chunk_hashes_proofs = chunk_hashes
+        .into_iter()
+        .zip(chunk_proofs.into_iter())
+        .collect();
 
+    let proof_result = panic::catch_unwind(|| {
         let proof = PROVER
             .get_mut()
-            .expect("failed to get mutable reference to PROVER.")
+            .unwrap()
             .gen_agg_evm_proof(chunk_hashes_proofs, None, OUTPUT_DIR.as_deref())
-            .map_err(|e| format!("failed to generate proof: {e:?}"))?;
+            .unwrap();
 
-        serde_json::to_vec(&proof).map_err(|e| format!("failed to serialize the proof: {e:?}"))
-    })
-    .unwrap_or_else(|e| Err(format!("unwind error: {e:?}")));
-
-    let r = match proof_result {
-        Ok(proof_bytes) => ProofResult {
-            message: Some(proof_bytes),
-            error: None,
-        },
-        Err(err) => ProofResult {
-            message: None,
-            error: Some(err),
-        },
-    };
-
-    serde_json::to_vec(&r).map_or(null(), vec_to_c_char)
+        serde_json::to_vec(&proof).unwrap()
+    });
+    proof_result.map_or(null(), vec_to_c_char)
 }
 
 /// # Safety

common/libzkp/impl/src/chunk.rs

@@ -1,14 +1,11 @@
-use crate::{
-    types::ProofResult,
-    utils::{c_char_to_str, c_char_to_vec, string_to_c_char, vec_to_c_char, OUTPUT_DIR},
-};
+use crate::utils::{c_char_to_str, c_char_to_vec, vec_to_c_char, OUTPUT_DIR};
 use libc::c_char;
 use prover::{
     utils::init_env_and_log,
     zkevm::{Prover, Verifier},
     ChunkProof,
 };
-use std::{cell::OnceCell, env, panic, ptr::null};
+use std::{cell::OnceCell, panic, ptr::null};
 use types::eth::BlockTrace;
 
 static mut PROVER: OnceCell<Prover> = OnceCell::new();
@@ -16,14 +13,10 @@ static mut VERIFIER: OnceCell<Verifier> = OnceCell::new();
 
 /// # Safety
 #[no_mangle]
-pub unsafe extern "C" fn init_chunk_prover(params_dir: *const c_char, assets_dir: *const c_char) {
+pub unsafe extern "C" fn init_chunk_prover(params_dir: *const c_char) {
     init_env_and_log("ffi_chunk_prove");
 
     let params_dir = c_char_to_str(params_dir);
-    let assets_dir = c_char_to_str(assets_dir);
-
-    // TODO: add a settings in scroll-prover.
-    env::set_var("SCROLL_PROVER_ASSETS_DIR", assets_dir);
     let prover = Prover::from_params_dir(params_dir);
 
     PROVER.set(prover).unwrap();
@@ -37,54 +30,28 @@ pub unsafe extern "C" fn init_chunk_verifier(params_dir: *const c_char, assets_d
     let params_dir = c_char_to_str(params_dir);
     let assets_dir = c_char_to_str(assets_dir);
 
-    // TODO: add a settings in scroll-prover.
-    env::set_var("SCROLL_PROVER_ASSETS_DIR", assets_dir);
     let verifier = Verifier::from_dirs(params_dir, assets_dir);
 
     VERIFIER.set(verifier).unwrap();
 }
 
-/// # Safety
-#[no_mangle]
-pub unsafe extern "C" fn get_chunk_vk() -> *const c_char {
-    let vk_result = panic::catch_unwind(|| PROVER.get_mut().unwrap().get_vk());
-
-    vk_result
-        .ok()
-        .flatten()
-        .map_or(null(), |vk| string_to_c_char(base64::encode(vk)))
-}
-
 /// # Safety
 #[no_mangle]
 pub unsafe extern "C" fn gen_chunk_proof(block_traces: *const c_char) -> *const c_char {
-    let proof_result: Result<Vec<u8>, String> = panic::catch_unwind(|| {
-        let block_traces = c_char_to_vec(block_traces);
-        let block_traces = serde_json::from_slice::<Vec<BlockTrace>>(&block_traces)
-            .map_err(|e| format!("failed to deserialize block traces: {e:?}"))?;
+    let block_traces = c_char_to_vec(block_traces);
+    let block_traces = serde_json::from_slice::<Vec<BlockTrace>>(&block_traces).unwrap();
 
+    let proof_result = panic::catch_unwind(|| {
         let proof = PROVER
             .get_mut()
-            .expect("failed to get mutable reference to PROVER.")
+            .unwrap()
             .gen_chunk_proof(block_traces, None, OUTPUT_DIR.as_deref())
-            .map_err(|e| format!("failed to generate proof: {e:?}"))?;
+            .unwrap();
 
-        serde_json::to_vec(&proof).map_err(|e| format!("failed to serialize the proof: {e:?}"))
-    })
-    .unwrap_or_else(|e| Err(format!("unwind error: {e:?}")));
+        serde_json::to_vec(&proof).unwrap()
+    });
 
-    let r = match proof_result {
-        Ok(proof_bytes) => ProofResult {
-            message: Some(proof_bytes),
-            error: None,
-        },
-        Err(err) => ProofResult {
-            message: None,
-            error: Some(err),
-        },
-    };
-
-    serde_json::to_vec(&r).map_or(null(), vec_to_c_char)
+    proof_result.map_or(null(), vec_to_c_char)
 }
 
 /// # Safety

common/libzkp/impl/src/lib.rs

@@ -2,5 +2,4 @@
 
 mod batch;
 mod chunk;
-mod types;
 mod utils;

common/libzkp/impl/src/types.rs

@@ -1,22 +0,0 @@
-use serde::{Deserialize, Serialize};
-
-// Represents the result of a chunk proof checking operation.
-// `ok` indicates whether the proof checking was successful.
-// `error` provides additional details in case the check failed.
-#[derive(Debug, Clone, Deserialize, Serialize)]
-pub struct CheckChunkProofsResponse {
-    pub ok: bool,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-}
-
-// Encapsulates the result from generating a proof.
-// `message` holds the generated proof in byte slice format.
-// `error` provides additional details in case the proof generation failed.
-#[derive(Debug, Clone, Deserialize, Serialize)]
-pub struct ProofResult {
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub message: Option<Vec<u8>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub error: Option<String>,
-}

common/libzkp/impl/src/utils.rs

@@ -19,10 +19,6 @@ pub(crate) fn c_char_to_vec(c: *const c_char) -> Vec<u8> {
     cstr.to_bytes().to_vec()
 }
 
-pub(crate) fn string_to_c_char(string: String) -> *const c_char {
-    CString::new(string).unwrap().into_raw()
-}
-
 pub(crate) fn vec_to_c_char(bytes: Vec<u8>) -> *const c_char {
     CString::new(bytes).unwrap().into_raw()
 }

common/libzkp/interface/libzkp.h

@@ -1,13 +1,10 @@
-void init_batch_prover(char* params_dir, char* assets_dir);
+void init_batch_prover(char* params_dir);
 void init_batch_verifier(char* params_dir, char* assets_dir);
-char* get_batch_vk();
-char* check_chunk_proofs(char* chunk_proofs);
 char* gen_batch_proof(char* chunk_hashes, char* chunk_proofs);
 char verify_batch_proof(char* proof);
 
-void init_chunk_prover(char* params_dir, char* assets_dir);
+void init_chunk_prover(char* params_dir);
 void init_chunk_verifier(char* params_dir, char* assets_dir);
-char* get_chunk_vk();
 char* gen_chunk_proof(char* block_traces);
 char verify_chunk_proof(char* proof);
 

common/types/batch_header.go

@@ -10,16 +10,6 @@ import (
 	"github.com/scroll-tech/go-ethereum/crypto"
 )
 
-// BatchMeta contains metadata of a batch.
-type BatchMeta struct {
-	StartChunkIndex           uint64
-	StartChunkHash            string
-	EndChunkIndex             uint64
-	EndChunkHash              string
-	TotalL1CommitGas          uint64
-	TotalL1CommitCalldataSize uint32
-}
-
 // BatchHeader contains batch header info to be committed.
 type BatchHeader struct {
 	// Encoded in BatchHeaderV0Codec

common/types/block.go

@@ -3,31 +3,20 @@ package types
 import (
 	"encoding/binary"
 	"errors"
-	"fmt"
 	"math"
 
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/common/hexutil"
 	"github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/scroll-tech/go-ethereum/log"
 )
 
-// CalldataNonZeroByteGas is the gas consumption per non zero byte in calldata.
-const CalldataNonZeroByteGas = 16
-
-// GetKeccak256Gas calculates keccak256 hash gas.
-func GetKeccak256Gas(size uint64) uint64 {
-	return 30 + 6*((size+31)/32) // 30 + 6 * ceil(size / 32)
-}
-
 // WrappedBlock contains the block's Header, Transactions and WithdrawTrieRoot hash.
 type WrappedBlock struct {
 	Header *types.Header `json:"header"`
 	// Transactions is only used for recover types.Transactions, the from of types.TransactionData field is missing.
-	Transactions         []*types.TransactionData `json:"transactions"`
-	WithdrawRoot         common.Hash              `json:"withdraw_trie_root,omitempty"`
-	RowConsumption       *types.RowConsumption    `json:"row_consumption"`
-	txPayloadLengthCache map[string]uint64
+	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.
@@ -98,15 +87,17 @@ func (w *WrappedBlock) EstimateL1CommitCalldataSize() uint64 {
 		if txData.Type == types.L1MessageTxType {
 			continue
 		}
-		size += 4 // 4 bytes payload length
-		size += w.getTxPayloadLength(txData)
+		size += uint64(len(txData.Data))
 	}
-	size += 60 //  60 bytes BlockContext
 	return size
 }
 
 // EstimateL1CommitGas calculates the total L1 commit gas for this block approximately.
 func (w *WrappedBlock) EstimateL1CommitGas() uint64 {
+	getKeccakGas := func(size uint64) uint64 {
+		return 30 + 6*((size+31)/32) // 30 + 6 * ceil(size / 32)
+	}
+
 	var total uint64
 	var numL1Messages uint64
 	for _, txData := range w.Transactions {
@@ -115,15 +106,25 @@ func (w *WrappedBlock) EstimateL1CommitGas() uint64 {
 			continue
 		}
 
-		txPayloadLength := w.getTxPayloadLength(txData)
-		total += CalldataNonZeroByteGas * txPayloadLength // an over-estimate: treat each byte as non-zero
-		total += CalldataNonZeroByteGas * 4               // 4 bytes payload length
-		total += GetKeccak256Gas(txPayloadLength)         // l2 tx hash
+		data, _ := hexutil.Decode(txData.Data)
+		tx := types.NewTx(&types.LegacyTx{
+			Nonce:    txData.Nonce,
+			To:       txData.To,
+			Value:    txData.Value.ToInt(),
+			Gas:      txData.Gas,
+			GasPrice: txData.GasPrice.ToInt(),
+			Data:     data,
+			V:        txData.V.ToInt(),
+			R:        txData.R.ToInt(),
+			S:        txData.S.ToInt(),
+		})
+		rlpTxData, _ := tx.MarshalBinary()
+		txPayloadLength := uint64(len(rlpTxData))
+		total += 16 * txPayloadLength          // an over-estimate: treat each byte as non-zero
+		total += 16 * 4                        // size of a uint32 field
+		total += getKeccakGas(txPayloadLength) // l2 tx hash
 	}
 
-	// 60 bytes BlockContext calldata
-	total += CalldataNonZeroByteGas * 60
-
 	// sload
 	total += 2100 * numL1Messages // numL1Messages times cold sload in L1MessageQueue
 
@@ -134,47 +135,13 @@ func (w *WrappedBlock) EstimateL1CommitGas() uint64 {
 	return total
 }
 
-func (w *WrappedBlock) getTxPayloadLength(txData *types.TransactionData) uint64 {
-	if w.txPayloadLengthCache == nil {
-		w.txPayloadLengthCache = make(map[string]uint64)
+// L2TxsNum calculates the number of l2 txs.
+func (w *WrappedBlock) L2TxsNum() uint64 {
+	var count uint64
+	for _, txData := range w.Transactions {
+		if txData.Type != types.L1MessageTxType {
+			count++
+		}
 	}
-
-	if length, exists := w.txPayloadLengthCache[txData.TxHash]; exists {
-		return length
-	}
-
-	rlpTxData, err := convertTxDataToRLPEncoding(txData)
-	if err != nil {
-		log.Crit("convertTxDataToRLPEncoding failed, which should not happen", "hash", txData.TxHash, "err", err)
-		return 0
-	}
-	txPayloadLength := uint64(len(rlpTxData))
-	w.txPayloadLengthCache[txData.TxHash] = txPayloadLength
-	return txPayloadLength
-}
-
-func convertTxDataToRLPEncoding(txData *types.TransactionData) ([]byte, error) {
-	data, err := hexutil.Decode(txData.Data)
-	if err != nil {
-		return nil, fmt.Errorf("failed to decode txData.Data: %s, err: %w", txData.Data, err)
-	}
-
-	tx := types.NewTx(&types.LegacyTx{
-		Nonce:    txData.Nonce,
-		To:       txData.To,
-		Value:    txData.Value.ToInt(),
-		Gas:      txData.Gas,
-		GasPrice: txData.GasPrice.ToInt(),
-		Data:     data,
-		V:        txData.V.ToInt(),
-		R:        txData.R.ToInt(),
-		S:        txData.S.ToInt(),
-	})
-
-	rlpTxData, err := tx.MarshalBinary()
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal binary of the tx: %+v, err: %w", tx, err)
-	}
-
-	return rlpTxData, nil
+	return count
 }

common/types/chunk.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/common/hexutil"
 	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/crypto"
 )
@@ -64,7 +65,23 @@ func (c *Chunk) Encode(totalL1MessagePoppedBefore uint64) ([]byte, error) {
 			if txData.Type == types.L1MessageTxType {
 				continue
 			}
-			rlpTxData, err := convertTxDataToRLPEncoding(txData)
+			data, err := hexutil.Decode(txData.Data)
+			if err != nil {
+				return nil, err
+			}
+			// right now we only support legacy tx
+			tx := types.NewTx(&types.LegacyTx{
+				Nonce:    txData.Nonce,
+				To:       txData.To,
+				Value:    txData.Value.ToInt(),
+				Gas:      txData.Gas,
+				GasPrice: txData.GasPrice.ToInt(),
+				Data:     data,
+				V:        txData.V.ToInt(),
+				R:        txData.R.ToInt(),
+				S:        txData.S.ToInt(),
+			})
+			rlpTxData, err := tx.MarshalBinary()
 			if err != nil {
 				return nil, err
 			}
@@ -129,10 +146,14 @@ func (c *Chunk) EstimateL1CommitGas() uint64 {
 	}
 
 	numBlocks := uint64(len(c.Blocks))
-	totalL1CommitGas += 100 * numBlocks                         // numBlocks times warm sload
-	totalL1CommitGas += CalldataNonZeroByteGas                  // numBlocks field of chunk encoding in calldata
-	totalL1CommitGas += CalldataNonZeroByteGas * numBlocks * 60 // numBlocks of BlockContext in chunk
+	totalL1CommitGas += 100 * numBlocks     // numBlocks times warm sload
+	totalL1CommitGas += 16                  // numBlocks field of chunk encoding in calldata
+	totalL1CommitGas += 16 * 60 * numBlocks // BlockContext in chunk
 
-	totalL1CommitGas += GetKeccak256Gas(58*numBlocks + 32*totalTxNum) // chunk hash
+	getKeccakGas := func(size uint64) uint64 {
+		return 30 + 6*((size+31)/32) // 30 + 6 * ceil(size / 32)
+	}
+
+	totalL1CommitGas += getKeccakGas(58*numBlocks + 32*totalTxNum) // chunk hash
 	return totalL1CommitGas
 }

common/types/chunk_test.go

@@ -38,15 +38,11 @@ func TestChunkEncode(t *testing.T) {
 	wrappedBlock := &WrappedBlock{}
 	assert.NoError(t, json.Unmarshal(templateBlockTrace, wrappedBlock))
 	assert.Equal(t, uint64(0), wrappedBlock.NumL1Messages(0))
-	assert.Equal(t, uint64(298), wrappedBlock.EstimateL1CommitCalldataSize())
-	assert.Equal(t, uint64(2), wrappedBlock.NumL2Transactions())
 	chunk = &Chunk{
 		Blocks: []*WrappedBlock{
 			wrappedBlock,
 		},
 	}
-	assert.Equal(t, uint64(0), chunk.NumL1Messages(0))
-	assert.Equal(t, uint64(6006), chunk.EstimateL1CommitGas())
 	bytes, err = chunk.Encode(0)
 	hexString := hex.EncodeToString(bytes)
 	assert.NoError(t, err)
@@ -60,15 +56,11 @@ func TestChunkEncode(t *testing.T) {
 	wrappedBlock2 := &WrappedBlock{}
 	assert.NoError(t, json.Unmarshal(templateBlockTrace2, wrappedBlock2))
 	assert.Equal(t, uint64(11), wrappedBlock2.NumL1Messages(0)) // 0..=9 skipped, 10 included
-	assert.Equal(t, uint64(96), wrappedBlock2.EstimateL1CommitCalldataSize())
-	assert.Equal(t, uint64(1), wrappedBlock2.NumL2Transactions())
 	chunk = &Chunk{
 		Blocks: []*WrappedBlock{
 			wrappedBlock2,
 		},
 	}
-	assert.Equal(t, uint64(11), chunk.NumL1Messages(0))
-	assert.Equal(t, uint64(5002), chunk.EstimateL1CommitGas())
 	bytes, err = chunk.Encode(0)
 	hexString = hex.EncodeToString(bytes)
 	assert.NoError(t, err)
@@ -83,8 +75,6 @@ func TestChunkEncode(t *testing.T) {
 			wrappedBlock2,
 		},
 	}
-	assert.Equal(t, uint64(11), chunk.NumL1Messages(0))
-	assert.Equal(t, uint64(9958), chunk.EstimateL1CommitGas())
 	bytes, err = chunk.Encode(0)
 	hexString = hex.EncodeToString(bytes)
 	assert.NoError(t, err)
@@ -146,81 +136,3 @@ func TestChunkHash(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, "0x2eb7dd63bf8fc29a0f8c10d16c2ae6f9da446907c79d50f5c164d30dc8526b60", hash.Hex())
 }
-
-func TestErrorPaths(t *testing.T) {
-	// test 1: Header.Number is not a uint64
-	templateBlockTrace, err := os.ReadFile("../testdata/blockTrace_02.json")
-	assert.NoError(t, err)
-
-	wrappedBlock := &WrappedBlock{}
-
-	assert.NoError(t, json.Unmarshal(templateBlockTrace, wrappedBlock))
-	wrappedBlock.Header.Number = wrappedBlock.Header.Number.Lsh(wrappedBlock.Header.Number, 64)
-	bytes, err := wrappedBlock.Encode(0)
-	assert.Nil(t, bytes)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "block number is not uint64")
-
-	assert.NoError(t, json.Unmarshal(templateBlockTrace, wrappedBlock))
-	for i := 0; i < 65537; i++ {
-		wrappedBlock.Transactions = append(wrappedBlock.Transactions, wrappedBlock.Transactions[0])
-	}
-
-	bytes, err = wrappedBlock.Encode(0)
-	assert.Nil(t, bytes)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "number of transactions exceeds max uint16")
-
-	chunk := &Chunk{
-		Blocks: []*WrappedBlock{
-			wrappedBlock,
-		},
-	}
-
-	bytes, err = chunk.Encode(0)
-	assert.Nil(t, bytes)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "number of transactions exceeds max uint16")
-
-	wrappedBlock.Transactions = wrappedBlock.Transactions[:1]
-	wrappedBlock.Transactions[0].Data = "not-a-hex"
-	bytes, err = chunk.Encode(0)
-	assert.Nil(t, bytes)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "hex string without 0x prefix")
-
-	assert.NoError(t, json.Unmarshal(templateBlockTrace, wrappedBlock))
-	wrappedBlock.Transactions[0].TxHash = "not-a-hex"
-	_, err = chunk.Hash(0)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "invalid byte")
-
-	templateBlockTrace2, err := os.ReadFile("../testdata/blockTrace_04.json")
-	assert.NoError(t, err)
-
-	wrappedBlock2 := &WrappedBlock{}
-	assert.NoError(t, json.Unmarshal(templateBlockTrace2, wrappedBlock2))
-	for i := 0; i < 65535; i++ {
-		tx := &wrappedBlock2.Transactions[i]
-		txCopy := *tx
-		txCopy.Nonce = uint64(i + 1)
-		wrappedBlock2.Transactions = append(wrappedBlock2.Transactions, txCopy)
-	}
-
-	bytes, err = wrappedBlock2.Encode(0)
-	assert.Nil(t, bytes)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "number of L1 messages exceeds max uint16")
-
-	chunk = &Chunk{
-		Blocks: []*WrappedBlock{
-			wrappedBlock2,
-		},
-	}
-
-	bytes, err = chunk.Encode(0)
-	assert.Nil(t, bytes)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "number of L1 messages exceeds max uint16")
-
-}

common/types/db.go

@@ -126,8 +126,8 @@ const (
 	ProvingTaskUnassigned
 	// ProvingTaskAssigned : proving_task is assigned to be proved
 	ProvingTaskAssigned
-	// ProvingTaskProvedDEPRECATED DEPRECATED: proof has been returned by prover
-	ProvingTaskProvedDEPRECATED
+	// ProvingTaskProved DEPRECATED: proof has been returned by prover
+	ProvingTaskProved
 	// ProvingTaskVerified : proof is valid
 	ProvingTaskVerified
 	// ProvingTaskFailed : fail to generate proof
@@ -140,7 +140,7 @@ func (ps ProvingStatus) String() string {
 		return "unassigned"
 	case ProvingTaskAssigned:
 		return "assigned"
-	case ProvingTaskProvedDEPRECATED:
+	case ProvingTaskProved:
 		return "proved"
 	case ProvingTaskVerified:
 		return "verified"

common/types/db_test.go

@@ -58,8 +58,8 @@ func TestProvingStatus(t *testing.T) {
 			"assigned",
 		},
 		{
-			"ProvingTaskProvedDEPRECATED",
-			ProvingTaskProvedDEPRECATED,
+			"ProvingTaskProved",
+			ProvingTaskProved,
 			"proved",
 		},
 		{

common/types/message/message.go

@@ -211,7 +211,6 @@ func (a *ProofMsg) PublicKey() (string, error) {
 
 // TaskMsg is a wrapper type around db ProveTask type.
 type TaskMsg struct {
-	UUID            string           `json:"uuid"`
 	ID              string           `json:"id"`
 	Type            ProofType        `json:"type,omitempty"`
 	BatchTaskDetail *BatchTaskDetail `json:"batch_task_detail,omitempty"`

common/version/version.go

@@ -3,11 +3,10 @@ package version
 import (
 	"fmt"
 	"runtime/debug"
-	"strconv"
 	"strings"
 )
 
-var tag = "v4.2.8"
+var tag = "v4.1.72"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {
@@ -47,36 +46,3 @@ func CheckScrollProverVersion(proverVersion string) bool {
 	// compare the `scroll_prover` version
 	return remote[2] == local[2]
 }
-
-// CheckScrollProverVersionTag check the "scroll-prover" version's tag, if it's too old, return false
-func CheckScrollProverVersionTag(proverVersion string) bool {
-	// note the the version is in fact in the format of "tag-commit-scroll_prover-halo2",
-	// so split-by-'-' length should be 4
-	remote := strings.Split(proverVersion, "-")
-	if len(remote) != 4 {
-		return false
-	}
-	remoteTagNums := strings.Split(strings.TrimPrefix(remote[0], "v"), ".")
-	if len(remoteTagNums) != 3 {
-		return false
-	}
-	remoteTagMajor, err := strconv.Atoi(remoteTagNums[0])
-	if err != nil {
-		return false
-	}
-	remoteTagMinor, err := strconv.Atoi(remoteTagNums[1])
-	if err != nil {
-		return false
-	}
-	remoteTagPatch, err := strconv.Atoi(remoteTagNums[2])
-	if err != nil {
-		return false
-	}
-	if remoteTagMajor < 4 {
-		return false
-	}
-	if remoteTagMinor == 1 && remoteTagPatch < 98 {
-		return false
-	}
-	return true
-}

contracts/docs/apis/L1ERC1155Gateway.md

@@ -260,23 +260,6 @@ function owner() external view returns (address)
 *Returns the address of the current owner.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of token rate limiter contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -371,22 +354,6 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 ### updateTokenMapping
 
 ```solidity
@@ -563,23 +530,6 @@ Emitted when some ERC1155 token is refunded.
 | tokenId  | uint256 | undefined |
 | amount  | uint256 | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 ### UpdateTokenMapping
 
 ```solidity

contracts/docs/apis/L1ERC721Gateway.md

@@ -227,23 +227,6 @@ function owner() external view returns (address)
 *Returns the address of the current owner.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of token rate limiter contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -316,22 +299,6 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 ### updateTokenMapping
 
 ```solidity
@@ -502,23 +469,6 @@ Emitted when some ERC721 token is refunded.
 | recipient `indexed` | address | undefined |
 | tokenId  | uint256 | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 ### UpdateTokenMapping
 
 ```solidity

contracts/docs/apis/L1ScrollMessenger.md

@@ -239,23 +239,6 @@ Mapping from queue index to previous replay queue index.
 |---|---|---|
 | _0 | uint256 | undefined |
 
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of ETH rate limiter contract.
-
-
-
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
 ### relayMessageWithProof
 
 ```solidity
@@ -453,22 +436,6 @@ Update max replay times.
 |---|---|---|
 | _newMaxReplayTimes | uint256 | The new max replay times. |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 ### xDomainMessageSender
 
 ```solidity
@@ -642,22 +609,5 @@ Emitted when the maximum number of times each message can be replayed is updated
 | oldMaxReplayTimes  | uint256 | undefined |
 | newMaxReplayTimes  | uint256 | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 
 

contracts/docs/apis/L1StandardERC20Gateway.md

@@ -225,23 +225,6 @@ function owner() external view returns (address)
 *Returns the address of the current owner.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of token rate limiter contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -292,22 +275,6 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 
 
 ## Events
@@ -405,22 +372,5 @@ Emitted when some ERC20 token is refunded.
 | recipient `indexed` | address | undefined |
 | amount  | uint256 | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 
 

contracts/docs/apis/L1WETHGateway.md

@@ -223,23 +223,6 @@ function owner() external view returns (address)
 *Returns the address of the current owner.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of token rate limiter contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -290,22 +273,6 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 
 
 ## Events
@@ -403,22 +370,5 @@ Emitted when some ERC20 token is refunded.
 | recipient `indexed` | address | undefined |
 | amount  | uint256 | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 
 

contracts/docs/apis/L2ERC1155Gateway.md

@@ -205,23 +205,6 @@ function owner() external view returns (address)
 *Returns the address of the current owner.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of token rate limiter contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -316,22 +299,6 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 ### updateTokenMapping
 
 ```solidity
@@ -488,23 +455,6 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 | previousOwner `indexed` | address | undefined |
 | newOwner `indexed` | address | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 ### UpdateTokenMapping
 
 ```solidity

contracts/docs/apis/L2ERC721Gateway.md

@@ -174,23 +174,6 @@ function owner() external view returns (address)
 *Returns the address of the current owner.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of token rate limiter contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -263,22 +246,6 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 ### updateTokenMapping
 
 ```solidity
@@ -430,23 +397,6 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 | previousOwner `indexed` | address | undefined |
 | newOwner `indexed` | address | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 ### UpdateTokenMapping
 
 ```solidity

contracts/docs/apis/L2ScrollMessenger.md

@@ -194,23 +194,6 @@ function paused() external view returns (bool)
 |---|---|---|
 | _0 | bool | undefined |
 
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of ETH rate limiter contract.
-
-
-
-
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
 ### relayMessage
 
 ```solidity
@@ -345,22 +328,6 @@ Update max failed execution times.
 |---|---|---|
 | _newMaxFailedExecutionTimes | uint256 | The new max failed execution times. |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 ### xDomainMessageSender
 
 ```solidity
@@ -534,22 +501,5 @@ Emitted when the maximum number of times each message can fail in L2 is updated.
 | oldMaxFailedExecutionTimes  | uint256 | undefined |
 | newMaxFailedExecutionTimes  | uint256 | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 
 

contracts/docs/apis/L2StandardERC20Gateway.md

@@ -139,23 +139,6 @@ function owner() external view returns (address)
 *Returns the address of the current owner.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of token rate limiter contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -223,22 +206,6 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 ### withdrawERC20
 
 ```solidity
@@ -354,23 +321,6 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 | previousOwner `indexed` | address | undefined |
 | newOwner `indexed` | address | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 ### WithdrawERC20
 
 ```solidity

contracts/docs/apis/L2WETHGateway.md

@@ -172,23 +172,6 @@ function owner() external view returns (address)
 *Returns the address of the current owner.*
 
 
-#### Returns
-
-| Name | Type | Description |
-|---|---|---|
-| _0 | address | undefined |
-
-### rateLimiter
-
-```solidity
-function rateLimiter() external view returns (address)
-```
-
-The address of token rate limiter contract.
-
-
-
-
 #### Returns
 
 | Name | Type | Description |
@@ -239,22 +222,6 @@ function transferOwnership(address newOwner) external nonpayable
 |---|---|---|
 | newOwner | address | undefined |
 
-### updateRateLimiter
-
-```solidity
-function updateRateLimiter(address _newRateLimiter) external nonpayable
-```
-
-Update rate limiter contract.
-
-*This function can only called by contract owner.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _newRateLimiter | address | The address of new rate limiter contract. |
-
 ### withdrawERC20
 
 ```solidity
@@ -370,23 +337,6 @@ event OwnershipTransferred(address indexed previousOwner, address indexed newOwn
 | previousOwner `indexed` | address | undefined |
 | newOwner `indexed` | address | undefined |
 
-### UpdateRateLimiter
-
-```solidity
-event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter)
-```
-
-Emitted when owner updates rate limiter contract.
-
-
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| _oldRateLimiter `indexed` | address | undefined |
-| _newRateLimiter `indexed` | address | undefined |
-
 ### WithdrawERC20
 
 ```solidity

contracts/scripts/foundry/InitializeL1BridgeContracts.s.sol

@@ -12,7 +12,6 @@ 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 {MultipleVersionRollupVerifier} from "../../src/L1/rollup/MultipleVersionRollupVerifier.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";
@@ -72,9 +71,6 @@ contract InitializeL1BridgeContracts is Script {
         ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).addSequencer(L1_COMMIT_SENDER_ADDRESS);
         ScrollChain(L1_SCROLL_CHAIN_PROXY_ADDR).addProver(L1_FINALIZE_SENDER_ADDRESS);
 
-        // initialize MultipleVersionRollupVerifier
-        MultipleVersionRollupVerifier(L1_MULTIPLE_VERSION_ROLLUP_VERIFIER_ADDR).initialize(L1_SCROLL_CHAIN_PROXY_ADDR);
-
         // initialize L2GasPriceOracle
         L2GasPriceOracle(L2_GAS_PRICE_ORACLE_PROXY_ADDR).initialize(
             21000, // _txGas

contracts/scripts/initialize_l1_erc20_gateway.ts

@@ -25,18 +25,18 @@ async function main() {
   const L2StandardERC20Impl = process.env.L2_SCROLL_STANDARD_ERC20_ADDR!;
   const L2StandardERC20FactoryAddress = process.env.L2_SCROLL_STANDARD_ERC20_FACTORY_ADDR!;
 
-  if ((await L1StandardERC20Gateway.counterpart()) === constants.AddressZero) {
-    const tx = await L1StandardERC20Gateway.initialize(
-      L2StandardERC20GatewayAddress,
-      L1GatewayRouterAddress,
-      L1ScrollMessengerAddress,
-      L2StandardERC20Impl,
-      L2StandardERC20FactoryAddress
-    );
-    console.log("initialize L1StandardERC20Gateway, hash:", tx.hash);
-    const receipt = await tx.wait();
-    console.log(`✅ Done, gas used: ${receipt.gasUsed}`);
-  }
+  // if ((await L1StandardERC20Gateway.counterpart()) === constants.AddressZero) {
+  const tx = await L1StandardERC20Gateway.initialize(
+    L2StandardERC20GatewayAddress,
+    L1GatewayRouterAddress,
+    L1ScrollMessengerAddress,
+    L2StandardERC20Impl,
+    L2StandardERC20FactoryAddress
+  );
+  console.log("initialize L1StandardERC20Gateway, hash:", tx.hash);
+  const receipt = await tx.wait();
+  console.log(`✅ Done, gas used: ${receipt.gasUsed}`);
+  // }
 }
 
 // We recommend this pattern to be able to use async/await everywhere

contracts/scripts/initialize_l1_gateway_router.ts

@@ -23,16 +23,16 @@ async function main() {
   const L1ScrollMessengerAddress = addressFile.get("L1ScrollMessenger.proxy");
   const L2GatewayRouterAddress = process.env.L2_GATEWAY_ROUTER_PROXY_ADDR!;
 
-  if ((await L1GatewayRouter.counterpart()) === constants.AddressZero) {
-    const tx = await L1GatewayRouter.initialize(
-      L1StandardERC20GatewayAddress,
-      L2GatewayRouterAddress,
-      L1ScrollMessengerAddress
-    );
-    console.log("initialize L1StandardERC20Gateway, hash:", tx.hash);
-    const receipt = await tx.wait();
-    console.log(`✅ Done, gas used: ${receipt.gasUsed}`);
-  }
+  // if ((await L1GatewayRouter.counterpart()) === constants.AddressZero) {
+  const tx = await L1GatewayRouter.initialize(
+    L1StandardERC20GatewayAddress,
+    L2GatewayRouterAddress,
+    L1ScrollMessengerAddress
+  );
+  console.log("initialize L1StandardERC20Gateway, hash:", tx.hash);
+  const receipt = await tx.wait();
+  console.log(`✅ Done, gas used: ${receipt.gasUsed}`);
+  // }
 }
 
 // We recommend this pattern to be able to use async/await everywhere

contracts/scripts/initialize_l1_messenger.ts

@@ -21,12 +21,12 @@ async function main() {
 
   const ZKRollupAddress = addressFile.get("ZKRollup.proxy");
 
-  if ((await L1ScrollMessenger.rollup()) === constants.AddressZero) {
-    const tx = await L1ScrollMessenger.initialize(ZKRollupAddress);
-    console.log("initialize L1StandardERC20Gateway, hash:", tx.hash);
-    const receipt = await tx.wait();
-    console.log(`✅ Done, gas used: ${receipt.gasUsed}`);
-  }
+  // if ((await L1ScrollMessenger.rollup()) === constants.AddressZero) {
+  const tx = await L1ScrollMessenger.initialize(ZKRollupAddress);
+  console.log("initialize L1StandardERC20Gateway, hash:", tx.hash);
+  const receipt = await tx.wait();
+  console.log(`✅ Done, gas used: ${receipt.gasUsed}`);
+  // }
 }
 
 // We recommend this pattern to be able to use async/await everywhere

contracts/scripts/initialize_l2_erc20_gateway.ts

@@ -24,17 +24,17 @@ async function main() {
   const L2StandardERC20FactoryAddress = addressFile.get("ScrollStandardERC20Factory");
   const L1StandardERC20GatewayAddress = process.env.L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR!;
 
-  if ((await L2StandardERC20Gateway.counterpart()) === constants.AddressZero) {
-    const tx = await L2StandardERC20Gateway.initialize(
-      L1StandardERC20GatewayAddress,
-      L2GatewayRouterAddress,
-      L2ScrollMessengerAddress,
-      L2StandardERC20FactoryAddress
-    );
-    console.log("initialize L2StandardERC20Gateway, hash:", tx.hash);
-    const receipt = await tx.wait();
-    console.log(`✅ Done, gas used: ${receipt.gasUsed}`);
-  }
+  // if ((await L2StandardERC20Gateway.counterpart()) === constants.AddressZero) {
+  const tx = await L2StandardERC20Gateway.initialize(
+    L1StandardERC20GatewayAddress,
+    L2GatewayRouterAddress,
+    L2ScrollMessengerAddress,
+    L2StandardERC20FactoryAddress
+  );
+  console.log("initialize L2StandardERC20Gateway, hash:", tx.hash);
+  const receipt = await tx.wait();
+  console.log(`✅ Done, gas used: ${receipt.gasUsed}`);
+  // }
 }
 
 // We recommend this pattern to be able to use async/await everywhere

contracts/scripts/initialize_l2_gateway_router.ts

@@ -23,16 +23,16 @@ async function main() {
   const L2ScrollMessengerAddress = addressFile.get("L2ScrollMessenger");
   const L1GatewayRouterAddress = process.env.L1_GATEWAY_ROUTER_PROXY_ADDR!;
 
-  if ((await L2GatewayRouter.counterpart()) === constants.AddressZero) {
-    const tx = await L2GatewayRouter.initialize(
-      L2StandardERC20GatewayAddress,
-      L1GatewayRouterAddress,
-      L2ScrollMessengerAddress
-    );
-    console.log("initialize L1StandardERC20Gateway, hash:", tx.hash);
-    const receipt = await tx.wait();
-    console.log(`✅ Done, gas used: ${receipt.gasUsed}`);
-  }
+  // if ((await L2GatewayRouter.counterpart()) === constants.AddressZero) {
+  const tx = await L2GatewayRouter.initialize(
+    L2StandardERC20GatewayAddress,
+    L1GatewayRouterAddress,
+    L2ScrollMessengerAddress
+  );
+  console.log("initialize L1StandardERC20Gateway, hash:", tx.hash);
+  const receipt = await tx.wait();
+  console.log(`✅ Done, gas used: ${receipt.gasUsed}`);
+  // }
 }
 
 // We recommend this pattern to be able to use async/await everywhere

contracts/src/L1/L1ScrollMessenger.sol

@@ -98,9 +98,6 @@ contract L1ScrollMessenger is ScrollMessengerBase, IL1ScrollMessenger {
 
         rollup = _rollup;
         messageQueue = _messageQueue;
-
-        maxReplayTimes = 3;
-        emit UpdateMaxReplayTimes(0, 3);
     }
 
     /*****************************
@@ -152,7 +149,7 @@ contract L1ScrollMessenger is ScrollMessengerBase, IL1ScrollMessenger {
 
         // @note check more `_to` address to avoid attack in the future when we add more gateways.
         require(_to != messageQueue, "Forbid to call message queue");
-        _validateTargetAddress(_to);
+        require(_to != address(this), "Forbid to call self");
 
         // @note This usually will never happen, just in case.
         require(_from != xDomainMessageSender, "Invalid message sender");
@@ -315,8 +312,6 @@ contract L1ScrollMessenger is ScrollMessengerBase, IL1ScrollMessenger {
         uint256 _gasLimit,
         address _refundAddress
     ) internal nonReentrant {
-        _addUsedAmount(_value);
-
         address _messageQueue = messageQueue; // gas saving
         address _counterpart = counterpart; // gas saving
 

contracts/src/L1/gateways/L1ERC20Gateway.sol

@@ -14,6 +14,8 @@ import {ScrollConstants} from "../../libraries/constants/ScrollConstants.sol";
 import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 import {IMessageDropCallback} from "../../libraries/callbacks/IMessageDropCallback.sol";
 
+// solhint-disable no-empty-blocks
+
 abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, ScrollGatewayBase {
     using SafeERC20Upgradeable for IERC20Upgradeable;
 
@@ -66,7 +68,7 @@ abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, Scrol
         address _to,
         uint256 _amount,
         bytes calldata _data
-    ) external payable virtual override onlyCallByCounterpart nonReentrant {
+    ) external payable override onlyCallByCounterpart nonReentrant {
         _beforeFinalizeWithdrawERC20(_l1Token, _l2Token, _from, _to, _amount, _data);
 
         // @note can possible trigger reentrant call to this contract or messenger,
@@ -159,9 +161,6 @@ abstract contract L1ERC20Gateway is IL1ERC20Gateway, IMessageDropCallback, Scrol
         // ignore weird fee on transfer token
         require(_amount > 0, "deposit zero amount");
 
-        // rate limit
-        _addUsedAmount(_token, _amount);
-
         return (_from, _amount, _data);
     }
 

contracts/src/L1/gateways/L1ETHGateway.sol

@@ -52,7 +52,7 @@ contract L1ETHGateway is ScrollGatewayBase, IL1ETHGateway, IMessageDropCallback
         address _to,
         uint256 _amount,
         uint256 _gasLimit
-    ) external payable override {
+    ) public payable override {
         _deposit(_to, _amount, new bytes(0), _gasLimit);
     }
 
@@ -124,8 +124,6 @@ contract L1ETHGateway is ScrollGatewayBase, IL1ETHGateway, IMessageDropCallback
             (_from, _data) = abi.decode(_data, (address, bytes));
         }
 
-        // @note no rate limit here, since ETH is limited in messenger
-
         // 2. Generate message passed to L1ScrollMessenger.
         bytes memory _message = abi.encodeCall(IL2ETHGateway.finalizeDepositETH, (_from, _to, _amount, _data));
 

contracts/src/L1/gateways/usdc/L1USDCGateway.sol

@@ -2,176 +2,10 @@
 
 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 {L1CustomERC20Gateway} from "../L1CustomERC20Gateway.sol";
 
-import {IFiatToken} from "../../../interfaces/IFiatToken.sol";
-import {IUSDCBurnableSourceBridge} from "../../../interfaces/IUSDCBurnableSourceBridge.sol";
-import {IL2ERC20Gateway} from "../../../L2/gateways/IL2ERC20Gateway.sol";
-import {IL1ScrollMessenger} from "../../IL1ScrollMessenger.sol";
-import {IL1ERC20Gateway} from "../IL1ERC20Gateway.sol";
+// solhint-disable no-empty-blocks
 
-import {ScrollGatewayBase} from "../../../libraries/gateway/ScrollGatewayBase.sol";
-import {L1ERC20Gateway} from "../L1ERC20Gateway.sol";
+contract L1USDCGateway is L1CustomERC20Gateway {
 
-/// @title L1USDCGateway
-/// @notice The `L1USDCGateway` contract is used to deposit `USDC` token in layer 1 and
-/// finalize withdraw `USDC` from layer 2, before USDC become native in layer 2.
-contract L1USDCGateway is L1ERC20Gateway, IUSDCBurnableSourceBridge {
-    /*************
-     * Constants *
-     *************/
-
-    /// @notice The address of L1 USDC address.
-    // solhint-disable-next-line var-name-mixedcase
-    address public immutable l1USDC;
-
-    /// @notice The address of L2 USDC address.
-    address public immutable l2USDC;
-
-    /*************
-     * Variables *
-     *************/
-
-    /// @notice The address of caller from Circle.
-    address public circleCaller;
-
-    /// @notice The flag indicates whether USDC deposit is paused.
-    bool public depositPaused;
-
-    /// @notice The flag indicates whether USDC withdrawal is paused.
-    /// @dev This is not necessary to be set `true` since we will set `L2USDCGateway.withdrawPaused` first.
-    ///      This is kept just in case and will be set after all pending messages are relayed.
-    bool public withdrawPaused;
-
-    /// @notice The total amount of bridged USDC in this contract.
-    /// @dev Only deposited USDC will count. Accidentally transferred USDC will be ignored.
-    uint256 public totalBridgedUSDC;
-
-    /***************
-     * Constructor *
-     ***************/
-
-    constructor(address _l1USDC, address _l2USDC) {
-        _disableInitializers();
-
-        l1USDC = _l1USDC;
-        l2USDC = _l2USDC;
-    }
-
-    /// @notice Initialize the storage of L1WETHGateway.
-    /// @param _counterpart The address of L2ETHGateway in L2.
-    /// @param _router The address of L1GatewayRouter.
-    /// @param _messenger The address of L1ScrollMessenger.
-    function initialize(
-        address _counterpart,
-        address _router,
-        address _messenger
-    ) external initializer {
-        require(_router != address(0), "zero router address");
-        ScrollGatewayBase._initialize(_counterpart, _router, _messenger);
-    }
-
-    /*************************
-     * Public View Functions *
-     *************************/
-
-    /// @inheritdoc IL1ERC20Gateway
-    function getL2ERC20Address(address) public view override returns (address) {
-        return l2USDC;
-    }
-
-    /*******************************
-     * Public Restricted Functions *
-     *******************************/
-
-    /// @inheritdoc IUSDCBurnableSourceBridge
-    function burnAllLockedUSDC() external override {
-        require(msg.sender == circleCaller, "only circle caller");
-
-        // @note Only bridged USDC will be burned. We may refund the rest if possible.
-        uint256 _balance = totalBridgedUSDC;
-        totalBridgedUSDC = 0;
-
-        IFiatToken(l1USDC).burn(_balance);
-    }
-
-    /// @notice Update the Circle EOA address.
-    /// @param _caller The address to update.
-    function updateCircleCaller(address _caller) external onlyOwner {
-        circleCaller = _caller;
-    }
-
-    /// @notice Change the deposit pause status of this contract.
-    /// @param _paused The new status, `true` means paused and `false` means not paused.
-    function pauseDeposit(bool _paused) external onlyOwner {
-        depositPaused = _paused;
-    }
-
-    /// @notice Change the withdraw pause status of this contract.
-    /// @param _paused The new status, `true` means paused and `false` means not paused.
-    function pauseWithdraw(bool _paused) external onlyOwner {
-        withdrawPaused = _paused;
-    }
-
-    /**********************
-     * Internal Functions *
-     **********************/
-
-    /// @inheritdoc L1ERC20Gateway
-    function _beforeFinalizeWithdrawERC20(
-        address _l1Token,
-        address _l2Token,
-        address,
-        address,
-        uint256 _amount,
-        bytes calldata
-    ) internal virtual override {
-        require(msg.value == 0, "nonzero msg.value");
-        require(_l1Token == l1USDC, "l1 token not USDC");
-        require(_l2Token == l2USDC, "l2 token not USDC");
-        require(!withdrawPaused, "withdraw paused");
-
-        totalBridgedUSDC -= _amount;
-    }
-
-    /// @inheritdoc L1ERC20Gateway
-    function _beforeDropMessage(
-        address,
-        address,
-        uint256 _amount
-    ) internal virtual override {
-        require(msg.value == 0, "nonzero msg.value");
-        totalBridgedUSDC -= _amount;
-    }
-
-    /// @inheritdoc L1ERC20Gateway
-    function _deposit(
-        address _token,
-        address _to,
-        uint256 _amount,
-        bytes memory _data,
-        uint256 _gasLimit
-    ) internal virtual override nonReentrant {
-        require(_amount > 0, "deposit zero amount");
-        require(_token == l1USDC, "only USDC is allowed");
-        require(!depositPaused, "deposit paused");
-
-        // 1. Transfer token into this contract.
-        address _from;
-        (_from, _amount, _data) = _transferERC20In(_token, _amount, _data);
-        require(_data.length == 0, "call is not allowed");
-        totalBridgedUSDC += _amount;
-
-        // 2. Generate message passed to L2USDCGateway.
-        bytes memory _message = abi.encodeCall(
-            IL2ERC20Gateway.finalizeDepositERC20,
-            (_token, l2USDC, _from, _to, _amount, _data)
-        );
-
-        // 3. Send message to L1ScrollMessenger.
-        IL1ScrollMessenger(messenger).sendMessage{value: msg.value}(counterpart, 0, _message, _gasLimit, _from);
-
-        emit DepositERC20(_token, l2USDC, _from, _to, _amount, _data);
-    }
 }

contracts/src/L1/gateways/usdc/draft-L1USDCGatewayCCTP.sol

@@ -1,180 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity =0.8.16;
-
-import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
-
-import {ITokenMessenger} from "../../../interfaces/ITokenMessenger.sol";
-import {IL2ERC20Gateway} from "../../../L2/gateways/IL2ERC20Gateway.sol";
-import {IL1ScrollMessenger} from "../../IL1ScrollMessenger.sol";
-import {IL1ERC20Gateway} from "../IL1ERC20Gateway.sol";
-
-import {CCTPGatewayBase} from "../../../libraries/gateway/CCTPGatewayBase.sol";
-import {ScrollGatewayBase} from "../../../libraries/gateway/ScrollGatewayBase.sol";
-import {L1ERC20Gateway} from "../L1ERC20Gateway.sol";
-
-/// @title L1USDCGatewayCCTP
-/// @notice The `L1USDCGateway` contract is used to deposit `USDC` token in layer 1 and
-/// finalize withdraw `USDC` from layer 2, after USDC become native in layer 2.
-contract L1USDCGatewayCCTP is CCTPGatewayBase, L1ERC20Gateway {
-    /***************
-     * Constructor *
-     ***************/
-
-    constructor(
-        address _l1USDC,
-        address _l2USDC,
-        uint32 _destinationDomain
-    ) CCTPGatewayBase(_l1USDC, _l2USDC, _destinationDomain) {
-        _disableInitializers();
-    }
-
-    /// @notice Initialize the storage of L1USDCGatewayCCTP.
-    /// @param _counterpart The address of L2USDCGatewayCCTP in L2.
-    /// @param _router The address of L1GatewayRouter.
-    /// @param _messenger The address of L1ScrollMessenger.
-    /// @param _cctpMessenger The address of TokenMessenger in local domain.
-    /// @param _cctpTransmitter The address of MessageTransmitter in local domain.
-    function initialize(
-        address _counterpart,
-        address _router,
-        address _messenger,
-        address _cctpMessenger,
-        address _cctpTransmitter
-    ) external initializer {
-        require(_router != address(0), "zero router address");
-        ScrollGatewayBase._initialize(_counterpart, _router, _messenger);
-        CCTPGatewayBase._initialize(_cctpMessenger, _cctpTransmitter);
-    }
-
-    /*************************
-     * Public View Functions *
-     *************************/
-
-    /// @inheritdoc IL1ERC20Gateway
-    function getL2ERC20Address(address) public view override returns (address) {
-        return l2USDC;
-    }
-
-    /*****************************
-     * Public Mutating Functions *
-     *****************************/
-
-    /// @notice Relay cross chain message and claim USDC that has been cross chained.
-    /// @dev The `_scrollMessage` is actually encoded calldata for `L1ScrollMessenger.relayMessageWithProof`.
-    ///
-    /// @dev This helper function is aimed to claim USDC in single transaction.
-    ///      Normally, an user should call `L1ScrollMessenger.relayMessageWithProof` first,
-    ///      then `L1USDCGatewayCCTP.claimUSDC`.
-    ///
-    /// @param _nonce The nonce of the message from CCTP.
-    /// @param _cctpMessage The message passed to MessageTransmitter contract in CCTP.
-    /// @param _cctpSignature The message passed to MessageTransmitter contract in CCTP.
-    /// @param _scrollMessage The message passed to L1ScrollMessenger contract.
-    function relayAndClaimUSDC(
-        uint256 _nonce,
-        bytes calldata _cctpMessage,
-        bytes calldata _cctpSignature,
-        bytes calldata _scrollMessage
-    ) external {
-        require(status[_nonce] == CCTPMessageStatus.None, "message relayed");
-        // call messenger to set `status[_nonce]` to `CCTPMessageStatus.Pending`.
-        (bool _success, ) = messenger.call(_scrollMessage);
-        require(_success, "call messenger failed");
-
-        claimUSDC(_nonce, _cctpMessage, _cctpSignature);
-    }
-
-    /// @inheritdoc IL1ERC20Gateway
-    /// @dev The function will not mint the USDC, users need to call `claimUSDC` after this function is done.
-    function finalizeWithdrawERC20(
-        address _l1Token,
-        address _l2Token,
-        address _from,
-        address _to,
-        uint256 _amount,
-        bytes memory _data
-    ) external payable override onlyCallByCounterpart {
-        require(msg.value == 0, "nonzero msg.value");
-        require(_l1Token == l1USDC, "l1 token not USDC");
-        require(_l2Token == l2USDC, "l2 token not USDC");
-
-        uint256 _nonce;
-        (_nonce, _data) = abi.decode(_data, (uint256, bytes));
-        require(status[_nonce] == CCTPMessageStatus.None, "message relayed");
-        status[_nonce] = CCTPMessageStatus.Pending;
-
-        emit FinalizeWithdrawERC20(_l1Token, _l2Token, _from, _to, _amount, _data);
-    }
-
-    /*******************************
-     * Public Restricted Functions *
-     *******************************/
-
-    /// @notice Update the CCTP contract addresses.
-    /// @param _messenger The address of TokenMessenger in local domain.
-    /// @param _transmitter The address of MessageTransmitter in local domain.
-    function updateCCTPContracts(address _messenger, address _transmitter) external onlyOwner {
-        cctpMessenger = _messenger;
-        cctpTransmitter = _transmitter;
-    }
-
-    /**********************
-     * Internal Functions *
-     **********************/
-
-    /// @inheritdoc L1ERC20Gateway
-    function _beforeFinalizeWithdrawERC20(
-        address,
-        address,
-        address,
-        address,
-        uint256,
-        bytes calldata
-    ) internal virtual override {}
-
-    /// @inheritdoc L1ERC20Gateway
-    function _beforeDropMessage(
-        address,
-        address,
-        uint256
-    ) internal virtual override {
-        require(msg.value == 0, "nonzero msg.value");
-    }
-
-    /// @inheritdoc L1ERC20Gateway
-    function _deposit(
-        address _token,
-        address _to,
-        uint256 _amount,
-        bytes memory _data,
-        uint256 _gasLimit
-    ) internal virtual override nonReentrant {
-        require(_amount > 0, "deposit zero amount");
-        require(_token == l1USDC, "only USDC is allowed");
-
-        // 1. Extract real sender if this call is from L1GatewayRouter.
-        address _from;
-        (_from, _amount, _data) = _transferERC20In(_token, _amount, _data);
-
-        // 2. Burn token through CCTP TokenMessenger
-        uint256 _nonce = ITokenMessenger(cctpMessenger).depositForBurnWithCaller(
-            _amount,
-            destinationDomain,
-            bytes32(uint256(uint160(_to))),
-            address(this),
-            bytes32(uint256(uint160(counterpart)))
-        );
-
-        // 3. Generate message passed to L2USDCGatewayCCTP.
-        bytes memory _message = abi.encodeCall(
-            IL2ERC20Gateway.finalizeDepositERC20,
-            (_token, l2USDC, _from, _to, _amount, abi.encode(_nonce, _data))
-        );
-
-        // 4. Send message to L1ScrollMessenger.
-        IL1ScrollMessenger(messenger).sendMessage{value: msg.value}(counterpart, 0, _message, _gasLimit);
-
-        emit DepositERC20(_token, l2USDC, _from, _to, _amount, _data);
-    }
-}

contracts/src/L1/rollup/IScrollChain.sol

@@ -28,9 +28,6 @@ interface IScrollChain {
      * Public View Functions *
      *************************/
 
-    /// @notice The latest finalized batch index.
-    function lastFinalizedBatchIndex() external view returns (uint256);
-
     /// @notice Return the batch hash of a committed batch.
     /// @param batchIndex The index of the batch.
     function committedBatches(uint256 batchIndex) external view returns (bytes32);

contracts/src/L1/rollup/MultipleVersionRollupVerifier.sol

@@ -4,7 +4,6 @@ pragma solidity =0.8.16;
 
 import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
 
-import {IScrollChain} from "./IScrollChain.sol";
 import {IRollupVerifier} from "../../libraries/verifier/IRollupVerifier.sol";
 import {IZkEvmVerifier} from "../../libraries/verifier/IZkEvmVerifier.sol";
 
@@ -39,9 +38,6 @@ contract MultipleVersionRollupVerifier is IRollupVerifier, Ownable {
     /// @notice The lastest used zkevm verifier.
     Verifier public latestVerifier;
 
-    /// @notice The address of ScrollChain contract.
-    address public scrollChain;
-
     /***************
      * Constructor *
      ***************/
@@ -52,12 +48,6 @@ contract MultipleVersionRollupVerifier is IRollupVerifier, Ownable {
         latestVerifier.verifier = _verifier;
     }
 
-    function initialize(address _scrollChain) external onlyOwner {
-        require(scrollChain == address(0), "initialized");
-
-        scrollChain = _scrollChain;
-    }
-
     /*************************
      * Public View Functions *
      *************************/
@@ -111,8 +101,6 @@ contract MultipleVersionRollupVerifier is IRollupVerifier, Ownable {
     /// @param _startBatchIndex The start batch index when the verifier will be used.
     /// @param _verifier The address of new verifier.
     function updateVerifier(uint64 _startBatchIndex, address _verifier) external onlyOwner {
-        require(_startBatchIndex > IScrollChain(scrollChain).lastFinalizedBatchIndex(), "start batch index finalized");
-
         Verifier memory _latestVerifier = latestVerifier;
         require(_startBatchIndex >= _latestVerifier.startBatchIndex, "start batch index too small");
         require(_verifier != address(0), "zero verifier address");

contracts/src/L1/rollup/ScrollChain.sol

@@ -67,8 +67,8 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
     /// @notice Whether an account is a prover.
     mapping(address => bool) public isProver;
 
-    /// @inheritdoc IScrollChain
-    uint256 public override lastFinalizedBatchIndex;
+    /// @notice The latest finalized batch index.
+    uint256 public lastFinalizedBatchIndex;
 
     /// @inheritdoc IScrollChain
     mapping(uint256 => bytes32) public override committedBatches;
@@ -272,10 +272,9 @@ contract ScrollChain is OwnableUpgradeable, PausableUpgradeable, IScrollChain {
         require(_batchIndex > lastFinalizedBatchIndex, "can only revert unfinalized batch");
 
         while (_count > 0) {
-            committedBatches[_batchIndex] = bytes32(0);
-
             emit RevertBatch(_batchIndex, _batchHash);
 
+            committedBatches[_batchIndex] = bytes32(0);
             unchecked {
                 _batchIndex += 1;
                 _count -= 1;

contracts/src/L2/L2ScrollMessenger.sol

@@ -40,6 +40,12 @@ contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
     /// @notice Mapping from L1 message hash to a boolean value indicating if the message has been successfully executed.
     mapping(bytes32 => bool) public isL1MessageExecuted;
 
+    /// @notice Mapping from L1 message hash to the number of failure times.
+    mapping(bytes32 => uint256) public l1MessageFailedTimes;
+
+    /// @notice The maximum number of times each L1 message can fail on L2.
+    uint256 public maxFailedExecutionTimes;
+
     /***************
      * Constructor *
      ***************/
@@ -52,6 +58,8 @@ contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
 
     function initialize(address _counterpart) external initializer {
         ScrollMessengerBase.__ScrollMessengerBase_init(_counterpart, address(0));
+
+        maxFailedExecutionTimes = 3;
     }
 
     /*****************************
@@ -97,6 +105,22 @@ contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
         _executeMessage(_from, _to, _value, _message, _xDomainCalldataHash);
     }
 
+    /************************
+     * Restricted Functions *
+     ************************/
+
+    /// @notice Update max failed execution times.
+    /// @dev This function can only called by contract owner.
+    /// @param _newMaxFailedExecutionTimes The new max failed execution times.
+    function updateMaxFailedExecutionTimes(uint256 _newMaxFailedExecutionTimes) external onlyOwner {
+        require(_newMaxFailedExecutionTimes > 0, "maxFailedExecutionTimes cannot be zero");
+
+        uint256 _oldMaxFailedExecutionTimes = maxFailedExecutionTimes;
+        maxFailedExecutionTimes = _newMaxFailedExecutionTimes;
+
+        emit UpdateMaxFailedExecutionTimes(_oldMaxFailedExecutionTimes, _newMaxFailedExecutionTimes);
+    }
+
     /**********************
      * Internal Functions *
      **********************/
@@ -113,7 +137,6 @@ contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
         uint256 _gasLimit
     ) internal nonReentrant {
         require(msg.value == _value, "msg.value mismatch");
-        _addUsedAmount(_value);
 
         uint256 _nonce = L2MessageQueue(messageQueue).nextMessageIndex();
         bytes32 _xDomainCalldataHash = keccak256(_encodeXDomainCalldata(msg.sender, _to, _value, _nonce, _message));
@@ -142,7 +165,7 @@ contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
     ) internal {
         // @note check more `_to` address to avoid attack in the future when we add more gateways.
         require(_to != messageQueue, "Forbid to call message queue");
-        _validateTargetAddress(_to);
+        require(_to != address(this), "Forbid to call self");
 
         // @note This usually will never happen, just in case.
         require(_from != xDomainMessageSender, "Invalid message sender");
@@ -157,6 +180,11 @@ contract L2ScrollMessenger is ScrollMessengerBase, IL2ScrollMessenger {
             isL1MessageExecuted[_xDomainCalldataHash] = true;
             emit RelayedMessage(_xDomainCalldataHash);
         } else {
+            unchecked {
+                uint256 _failedTimes = l1MessageFailedTimes[_xDomainCalldataHash] + 1;
+                require(_failedTimes <= maxFailedExecutionTimes, "Exceed maximum failure times");
+                l1MessageFailedTimes[_xDomainCalldataHash] = _failedTimes;
+            }
             emit FailedRelayedMessage(_xDomainCalldataHash);
         }
     }

contracts/src/L2/gateways/L2CustomERC20Gateway.sol

@@ -126,9 +126,6 @@ contract L2CustomERC20Gateway is L2ERC20Gateway {
             (_from, _data) = abi.decode(_data, (address, bytes));
         }
 
-        // rate limit
-        _addUsedAmount(_token, _amount);
-
         // 2. Burn token.
         IScrollERC20Upgradeable(_token).burn(_from, _amount);
 

contracts/src/L2/gateways/L2ERC20Gateway.sol

@@ -6,6 +6,8 @@ import {IL2ERC20Gateway} from "./IL2ERC20Gateway.sol";
 
 import {ScrollGatewayBase} from "../../libraries/gateway/ScrollGatewayBase.sol";
 
+// solhint-disable no-empty-blocks
+
 abstract contract L2ERC20Gateway is ScrollGatewayBase, IL2ERC20Gateway {
     /*************
      * Variables *

contracts/src/L2/gateways/L2ETHGateway.sol

@@ -98,8 +98,6 @@ contract L2ETHGateway is ScrollGatewayBase, IL2ETHGateway {
             (_from, _data) = abi.decode(_data, (address, bytes));
         }
 
-        // @note no rate limit here, since ETH is limited in messenger
-
         bytes memory _message = abi.encodeCall(IL1ETHGateway.finalizeWithdrawETH, (_from, _to, _amount, _data));
         IL2ScrollMessenger(messenger).sendMessage{value: msg.value}(counterpart, _amount, _message, _gasLimit);
 

contracts/src/L2/gateways/L2StandardERC20Gateway.sol

@@ -140,9 +140,6 @@ contract L2StandardERC20Gateway is L2ERC20Gateway {
         address _l1Token = tokenMapping[_token];
         require(_l1Token != address(0), "no corresponding l1 token");
 
-        // rate limit
-        _addUsedAmount(_token, _amount);
-
         // 2. Burn token.
         IScrollERC20Upgradeable(_token).burn(_from, _amount);
 

contracts/src/L2/gateways/L2WETHGateway.sol

@@ -116,9 +116,6 @@ contract L2WETHGateway is L2ERC20Gateway {
             (_from, _data) = abi.decode(_data, (address, bytes));
         }
 
-        // rate limit
-        _addUsedAmount(_token, _amount);
-
         // 2. Transfer token into this contract.
         IERC20Upgradeable(_token).safeTransferFrom(_from, address(this), _amount);
         IWETH(_token).withdraw(_amount);

contracts/src/L2/gateways/usdc/L2USDCGateway.sol

@@ -2,12 +2,10 @@
 
 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";
 
 import {IFiatToken} from "../../../interfaces/IFiatToken.sol";
-import {IUSDCDestinationBridge} from "../../../interfaces/IUSDCDestinationBridge.sol";
 import {IL1ERC20Gateway} from "../../../L1/gateways/IL1ERC20Gateway.sol";
 import {IL2ScrollMessenger} from "../../IL2ScrollMessenger.sol";
 import {IL2ERC20Gateway} from "../IL2ERC20Gateway.sol";
@@ -18,7 +16,7 @@ import {L2ERC20Gateway} from "../L2ERC20Gateway.sol";
 /// @title L2USDCGateway
 /// @notice The `L2USDCGateway` contract is used to withdraw `USDC` token on layer 2 and
 /// finalize deposit `USDC` from layer 1.
-contract L2USDCGateway is L2ERC20Gateway, IUSDCDestinationBridge {
+contract L2USDCGateway is L2ERC20Gateway {
     using SafeERC20Upgradeable for IERC20Upgradeable;
 
     /*************
@@ -35,15 +33,8 @@ contract L2USDCGateway is L2ERC20Gateway, IUSDCDestinationBridge {
      * Variables *
      *************/
 
-    /// @notice The address of caller from Circle.
-    address public circleCaller;
-
-    /// @notice The flag indicates whether USDC deposit is paused.
-    /// @dev This is not necessary to be set `true` since we will set `L1USDCGateway.depositPaused` first.
-    ///      This is kept just in case and will be set after all pending messages are relayed.
     bool public depositPaused;
 
-    /// @notice The flag indicates whether USDC withdrawal is paused.
     bool public withdrawPaused;
 
     /***************
@@ -100,8 +91,7 @@ contract L2USDCGateway is L2ERC20Gateway, IUSDCDestinationBridge {
 
         require(IFiatToken(_l2Token).mint(_to, _amount), "mint USDC failed");
 
-        // disable call for USDC
-        // _doCallback(_to, _data);
+        _doCallback(_to, _data);
 
         emit FinalizeDepositERC20(_l1Token, _l2Token, _from, _to, _amount, _data);
     }
@@ -110,19 +100,6 @@ contract L2USDCGateway is L2ERC20Gateway, IUSDCDestinationBridge {
      * Public Restricted Functions *
      *******************************/
 
-    /// @inheritdoc IUSDCDestinationBridge
-    function transferUSDCRoles(address _owner) external {
-        require(msg.sender == circleCaller, "only circle caller");
-
-        OwnableUpgradeable(l2USDC).transferOwnership(_owner);
-    }
-
-    /// @notice Update the Circle EOA address.
-    /// @param _caller The address to update.
-    function updateCircleCaller(address _caller) external onlyOwner {
-        circleCaller = _caller;
-    }
-
     /// @notice Change the deposit pause status of this contract.
     /// @param _paused The new status, `true` means paused and `false` means not paused.
     function pauseDeposit(bool _paused) external onlyOwner {
@@ -151,16 +128,15 @@ contract L2USDCGateway is L2ERC20Gateway, IUSDCDestinationBridge {
         require(_token == l2USDC, "only USDC is allowed");
         require(!withdrawPaused, "withdraw paused");
 
-        // 1. Extract real sender if this call is from L2GatewayRouter.
+        // 1. Extract real sender if this call is from L1GatewayRouter.
         address _from = msg.sender;
         if (router == msg.sender) {
             (_from, _data) = abi.decode(_data, (address, bytes));
         }
-        require(_data.length == 0, "call is not allowed");
 
         // 2. Transfer token into this contract.
         IERC20Upgradeable(_token).safeTransferFrom(_from, address(this), _amount);
-        IFiatToken(_token).burn(_amount);
+        require(IFiatToken(_token).burn(_amount), "burn USDC failed");
 
         // 3. Generate message passed to L1USDCGateway.
         address _l1USDC = l1USDC;

contracts/src/L2/gateways/usdc/draft-L2USDCGatewayCCTP.sol

@@ -1,156 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-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";
-
-import {ITokenMessenger} from "../../../interfaces/ITokenMessenger.sol";
-import {IL1ERC20Gateway} from "../../../L1/gateways/IL1ERC20Gateway.sol";
-import {IL2ScrollMessenger} from "../../IL2ScrollMessenger.sol";
-import {IL2ERC20Gateway} from "../IL2ERC20Gateway.sol";
-
-import {CCTPGatewayBase} from "../../../libraries/gateway/CCTPGatewayBase.sol";
-import {ScrollGatewayBase} from "../../../libraries/gateway/ScrollGatewayBase.sol";
-import {L2ERC20Gateway} from "../L2ERC20Gateway.sol";
-
-/// @title L2USDCGatewayCCTP
-/// @notice The `L2USDCGatewayCCTP` contract is used to withdraw `USDC` token in layer 2 and
-/// finalize deposit `USDC` from layer 1.
-contract L2USDCGatewayCCTP is CCTPGatewayBase, L2ERC20Gateway {
-    using SafeERC20Upgradeable for IERC20Upgradeable;
-
-    /***************
-     * Constructor *
-     ***************/
-
-    constructor(
-        address _l1USDC,
-        address _l2USDC,
-        uint32 _destinationDomain
-    ) CCTPGatewayBase(_l1USDC, _l2USDC, _destinationDomain) {
-        _disableInitializers();
-    }
-
-    /// @notice Initialize the storage of L2USDCGatewayCCTP.
-    /// @param _counterpart The address of L1USDCGatewayCCTP in L1.
-    /// @param _router The address of L2GatewayRouter.
-    /// @param _messenger The address of L2ScrollMessenger.
-    /// @param _cctpMessenger The address of TokenMessenger in local domain.
-    /// @param _cctpTransmitter The address of MessageTransmitter in local domain.
-    function initialize(
-        address _counterpart,
-        address _router,
-        address _messenger,
-        address _cctpMessenger,
-        address _cctpTransmitter
-    ) external initializer {
-        require(_router != address(0), "zero router address");
-        ScrollGatewayBase._initialize(_counterpart, _router, _messenger);
-        CCTPGatewayBase._initialize(_cctpMessenger, _cctpTransmitter);
-    }
-
-    /*************************
-     * Public View Functions *
-     *************************/
-
-    /// @inheritdoc IL2ERC20Gateway
-    function getL1ERC20Address(address) external view override returns (address) {
-        return l1USDC;
-    }
-
-    /// @inheritdoc IL2ERC20Gateway
-    function getL2ERC20Address(address) public view override returns (address) {
-        return l2USDC;
-    }
-
-    /*****************************
-     * Public Mutating Functions *
-     *****************************/
-
-    /// @inheritdoc IL2ERC20Gateway
-    /// @dev The function will not mint the USDC, users need to call `claimUSDC` after this function is done.
-    function finalizeDepositERC20(
-        address _l1Token,
-        address _l2Token,
-        address _from,
-        address _to,
-        uint256 _amount,
-        bytes memory _data
-    ) external payable override onlyCallByCounterpart {
-        require(msg.value == 0, "nonzero msg.value");
-        require(_l1Token == l1USDC, "l1 token not USDC");
-        require(_l2Token == l2USDC, "l2 token not USDC");
-
-        uint256 _nonce;
-        (_nonce, _data) = abi.decode(_data, (uint256, bytes));
-        require(status[_nonce] == CCTPMessageStatus.None, "message relayed");
-        status[_nonce] = CCTPMessageStatus.Pending;
-
-        emit FinalizeDepositERC20(_l1Token, _l2Token, _from, _to, _amount, _data);
-    }
-
-    /*******************************
-     * Public Restricted Functions *
-     *******************************/
-
-    /// @notice Update the CCTP contract addresses.
-    /// @param _messenger The address of TokenMessenger in local domain.
-    /// @param _transmitter The address of MessageTransmitter in local domain.
-    function updateCCTPContracts(address _messenger, address _transmitter) external onlyOwner {
-        cctpMessenger = _messenger;
-        cctpTransmitter = _transmitter;
-    }
-
-    /**********************
-     * Internal Functions *
-     **********************/
-
-    /// @inheritdoc L2ERC20Gateway
-    function _withdraw(
-        address _token,
-        address _to,
-        uint256 _amount,
-        bytes memory _data,
-        uint256 _gasLimit
-    ) internal virtual override {
-        require(_amount > 0, "withdraw zero amount");
-        require(_token == l2USDC, "only USDC is allowed");
-
-        // 1. Extract real sender if this call is from L1GatewayRouter.
-        address _from = msg.sender;
-        if (router == msg.sender) {
-            (_from, _data) = abi.decode(_data, (address, bytes));
-        }
-
-        // 2. Transfer token into this contract.
-        IERC20Upgradeable(_token).safeTransferFrom(_from, address(this), _amount);
-
-        // 3. Burn token through CCTP TokenMessenger
-        uint256 _nonce = ITokenMessenger(cctpMessenger).depositForBurnWithCaller(
-            _amount,
-            destinationDomain,
-            bytes32(uint256(uint160(_to))),
-            address(this),
-            bytes32(uint256(uint160(counterpart)))
-        );
-
-        // 4. Generate message passed to L1USDCGateway.
-        address _l1USDC = l1USDC;
-        bytes memory _message = abi.encodeWithSelector(
-            IL1ERC20Gateway.finalizeWithdrawERC20.selector,
-            _l1USDC,
-            _token,
-            _from,
-            _to,
-            _amount,
-            abi.encode(_nonce, _data)
-        );
-
-        // 4. Send message to L1ScrollMessenger.
-        IL2ScrollMessenger(messenger).sendMessage{value: msg.value}(counterpart, 0, _message, _gasLimit);
-
-        emit WithdrawERC20(_l1USDC, _token, _from, _to, _amount, _data);
-    }
-}

contracts/src/README.md

@@ -1,6 +1,6 @@
 A library for interacting with Scroll contracts.
 
-This library includes contracts and interfaces needed to interact with the Scroll Smart Contracts deployed on both Layer 1 and Layer 2. This includes deposting and withdrawing ETH, ERC20 tokens and NFTs or sending arbitrary messages.
+This library includes contracts and interfaces needed to interact with the Scroll Smart Contracts deployed on both Layer 1 and Layer 2. This includes deposting and withdrawing ETH, ERC20 tokens and NFTs or sending arbitrary messages. 
 
 # Overview
 
@@ -21,11 +21,10 @@ pragma solidity 0.8.20;
 import "@scroll-tech/contracts/L1/gateways/IL1ETHGateway.sol";
 
 contract MyContract {
-  function bridgeETH(address scrollBridge, uint256 gasLimit) public payable {
-    IL1ETHGateway(scrollBridge).depositETH(msg.sender, msg.value, gasLimit);
-  }
+    function bridgeETH(address scrollBridge, uint gasLimit) public payable {
+      IL1ETHGateway(scrollBridge).depositETH(msg.sender, msg.value, gasLimit);
+    }
 }
-
 ```
 
 Visit the Bridge Documentation for API reference, architecture overview and guides with code examples.

contracts/src/gas-swap/GasSwap.sol

@@ -6,6 +6,7 @@ import {ERC2771Context} from "@openzeppelin/contracts/metatx/ERC2771Context.sol"
 import {ReentrancyGuard} from "@openzeppelin/contracts/security/ReentrancyGuard.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {SafeERC20} from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import {IERC20Permit} from "@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol";
 
 import {OwnableBase} from "../libraries/common/OwnableBase.sol";
@@ -14,7 +15,6 @@ import {OwnableBase} from "../libraries/common/OwnableBase.sol";
 
 contract GasSwap is ERC2771Context, ReentrancyGuard, OwnableBase {
     using SafeERC20 for IERC20;
-    using SafeERC20 for IERC20Permit;
 
     /**********
      * Events *
@@ -94,7 +94,7 @@ contract GasSwap is ERC2771Context, ReentrancyGuard, OwnableBase {
         address _sender = _msgSender();
 
         // do permit
-        IERC20Permit(_permit.token).safePermit(
+        IERC20Permit(_permit.token).permit(
             _sender,
             address(this),
             _permit.value,

contracts/src/interfaces/IFiatToken.sol

@@ -18,5 +18,5 @@ interface IFiatToken {
      * amount is less than or equal to the minter's account balance
      * @param _amount uint256 the amount of tokens to be burned
      */
-    function burn(uint256 _amount) external;
+    function burn(uint256 _amount) external returns (bool);
 }

contracts/src/interfaces/IMessageTransmitter.sol

@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.16;
-
-interface IMessageTransmitter {
-    function usedNonces(bytes32 _sourceAndNonce) external view returns (uint256);
-
-    /**
-     * @notice Receives an incoming message, validating the header and passing
-     * the body to application-specific handler.
-     * @param message The message raw bytes
-     * @param signature The message signature
-     * @return success bool, true if successful
-     */
-    function receiveMessage(bytes calldata message, bytes calldata signature) external returns (bool success);
-}

contracts/src/interfaces/ITokenMessenger.sol

@@ -1,63 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.16;
-
-interface ITokenMessenger {
-    /**
-     * @notice Deposits and burns tokens from sender to be minted on destination domain. The mint
-     * on the destination domain must be called by `destinationCaller`.
-     * WARNING: if the `destinationCaller` does not represent a valid address as bytes32, then it will not be possible
-     * to broadcast the message on the destination domain. This is an advanced feature, and the standard
-     * depositForBurn() should be preferred for use cases where a specific destination caller is not required.
-     * Emits a `DepositForBurn` event.
-     * @dev reverts if:
-     * - given destinationCaller is zero address
-     * - given burnToken is not supported
-     * - given destinationDomain has no TokenMessenger registered
-     * - transferFrom() reverts. For example, if sender's burnToken balance or approved allowance
-     * to this contract is less than `amount`.
-     * - burn() reverts. For example, if `amount` is 0.
-     * - MessageTransmitter returns false or reverts.
-     * @param amount amount of tokens to burn
-     * @param destinationDomain destination domain
-     * @param mintRecipient address of mint recipient on destination domain
-     * @param burnToken address of contract to burn deposited tokens, on local domain
-     * @param destinationCaller caller on the destination domain, as bytes32
-     * @return nonce unique nonce reserved by message
-     */
-    function depositForBurnWithCaller(
-        uint256 amount,
-        uint32 destinationDomain,
-        bytes32 mintRecipient,
-        address burnToken,
-        bytes32 destinationCaller
-    ) external returns (uint64 nonce);
-
-    /**
-     * @notice Replace a BurnMessage to change the mint recipient and/or
-     * destination caller. Allows the sender of a previous BurnMessage
-     * (created by depositForBurn or depositForBurnWithCaller)
-     * to send a new BurnMessage to replace the original.
-     * The new BurnMessage will reuse the amount and burn token of the original,
-     * without requiring a new deposit.
-     * @dev The new message will reuse the original message's nonce. For a
-     * given nonce, all replacement message(s) and the original message are
-     * valid to broadcast on the destination domain, until the first message
-     * at the nonce confirms, at which point all others are invalidated.
-     * Note: The msg.sender of the replaced message must be the same as the
-     * msg.sender of the original message.
-     * @param originalMessage original message bytes (to replace)
-     * @param originalAttestation original attestation bytes
-     * @param newDestinationCaller the new destination caller, which may be the
-     * same as the original destination caller, a new destination caller, or an empty
-     * destination caller (bytes32(0), indicating that any destination caller is valid.)
-     * @param newMintRecipient the new mint recipient, which may be the same as the
-     * original mint recipient, or different.
-     */
-    function replaceDepositForBurn(
-        bytes calldata originalMessage,
-        bytes calldata originalAttestation,
-        bytes32 newDestinationCaller,
-        bytes32 newMintRecipient
-    ) external;
-}

contracts/src/interfaces/IUSDCBurnableSourceBridge.sol

@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.16;
-
-// Implement this on the source chain (Ethereum).
-interface IUSDCBurnableSourceBridge {
-    /**
-     * @notice Called by Circle, this executes a burn on the source
-     * chain.
-     */
-    function burnAllLockedUSDC() external;
-}

contracts/src/interfaces/IUSDCDestinationBridge.sol

@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.16;
-
-// Implement this on the destination chain (Scroll).
-interface IUSDCDestinationBridge {
-    /**
-     * @notice Called by Circle, this transfers FiatToken roles to the designated owner.
-     */
-    function transferUSDCRoles(address owner) external;
-}

contracts/src/libraries/ScrollMessengerBase.sol

@@ -7,7 +7,6 @@ import {PausableUpgradeable} from "@openzeppelin/contracts-upgradeable/security/
 import {ReentrancyGuardUpgradeable} from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
 
 import {ScrollConstants} from "./constants/ScrollConstants.sol";
-import {IETHRateLimiter} from "../rate-limiter/IETHRateLimiter.sol";
 import {IScrollMessenger} from "./IScrollMessenger.sol";
 
 // solhint-disable var-name-mixedcase
@@ -27,11 +26,6 @@ abstract contract ScrollMessengerBase is
     /// @param _newFeeVault The address of new fee vault contract.
     event UpdateFeeVault(address _oldFeeVault, address _newFeeVault);
 
-    /// @notice Emitted when owner updates rate limiter contract.
-    /// @param _oldRateLimiter The address of old rate limiter contract.
-    /// @param _newRateLimiter The address of new rate limiter contract.
-    event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter);
-
     /*************
      * Variables *
      *************/
@@ -45,11 +39,8 @@ abstract contract ScrollMessengerBase is
     /// @notice The address of fee vault, collecting cross domain messaging fee.
     address public feeVault;
 
-    /// @notice The address of ETH rate limiter contract.
-    address public rateLimiter;
-
     /// @dev The storage slots for future usage.
-    uint256[46] private __gap;
+    uint256[47] private __gap;
 
     /**********************
      * Function Modifiers *
@@ -98,16 +89,6 @@ abstract contract ScrollMessengerBase is
         emit UpdateFeeVault(_oldFeeVault, _newFeeVault);
     }
 
-    /// @notice Update rate limiter contract.
-    /// @dev This function can only called by contract owner.
-    /// @param _newRateLimiter The address of new rate limiter contract.
-    function updateRateLimiter(address _newRateLimiter) external onlyOwner {
-        address _oldRateLimiter = rateLimiter;
-
-        rateLimiter = _newRateLimiter;
-        emit UpdateRateLimiter(_oldRateLimiter, _newRateLimiter);
-    }
-
     /// @notice Pause the contract
     /// @dev This function can only called by contract owner.
     /// @param _status The pause status to update.
@@ -147,27 +128,4 @@ abstract contract ScrollMessengerBase is
                 _message
             );
     }
-
-    /// @dev Internal function to increase ETH usage for the given `_sender`.
-    /// @param _amount The amount of ETH used.
-    function _addUsedAmount(uint256 _amount) internal {
-        if (_amount == 0) return;
-
-        address _rateLimiter = rateLimiter;
-        if (_rateLimiter != address(0)) {
-            IETHRateLimiter(_rateLimiter).addUsedAmount(_amount);
-        }
-    }
-
-    /// @dev Internal function to check whether the `_target` address is allowed to avoid attack.
-    /// @param _target The address of target address to check.
-    function _validateTargetAddress(address _target) internal view {
-        // @note check more `_target` address to avoid attack in the future when we add more external contracts.
-
-        address _rateLimiter = rateLimiter;
-        if (_rateLimiter != address(0)) {
-            require(_target != _rateLimiter, "Forbid to call rate limiter");
-        }
-        require(_target != address(this), "Forbid to call self");
-    }
 }

contracts/src/libraries/gateway/CCTPGatewayBase.sol

@@ -1,95 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.0;
-
-import {IMessageTransmitter} from "../../interfaces/IMessageTransmitter.sol";
-
-import {ScrollGatewayBase} from "./ScrollGatewayBase.sol";
-
-abstract contract CCTPGatewayBase is ScrollGatewayBase {
-    /*********
-     * Enums *
-     *********/
-
-    enum CCTPMessageStatus {
-        None,
-        Pending,
-        Relayed
-    }
-
-    /*************
-     * Constants *
-     *************/
-
-    /// @notice The address of L1 USDC address.
-    address public immutable l1USDC;
-
-    /// @notice The address of L2 USDC address.
-    address public immutable l2USDC;
-
-    /// @notice The destination domain for layer2.
-    uint32 public immutable destinationDomain;
-
-    /*************
-     * Variables *
-     *************/
-
-    /// @notice The address of TokenMessenger in local domain.
-    address public cctpMessenger;
-
-    /// @notice The address of MessageTransmitter in local domain.
-    address public cctpTransmitter;
-
-    /// @notice Mapping from destination domain CCTP nonce to status.
-    mapping(uint256 => CCTPMessageStatus) public status;
-
-    /***************
-     * Constructor *
-     ***************/
-
-    constructor(
-        address _l1USDC,
-        address _l2USDC,
-        uint32 _destinationDomain
-    ) {
-        l1USDC = _l1USDC;
-        l2USDC = _l2USDC;
-        destinationDomain = _destinationDomain;
-    }
-
-    function _initialize(address _cctpMessenger, address _cctpTransmitter) internal {
-        cctpMessenger = _cctpMessenger;
-        cctpTransmitter = _cctpTransmitter;
-    }
-
-    /*****************************
-     * Public Mutating Functions *
-     *****************************/
-
-    /// @notice Claim USDC that has been cross chained.
-    /// @param _nonce The nonce of the message from CCTP.
-    /// @param _cctpMessage The message passed to MessageTransmitter contract in CCTP.
-    /// @param _cctpSignature The message passed to MessageTransmitter contract in CCTP.
-    function claimUSDC(
-        uint256 _nonce,
-        bytes calldata _cctpMessage,
-        bytes calldata _cctpSignature
-    ) public {
-        // Check `_nonce` match with `_cctpMessage`.
-        // According to the encoding of `_cctpMessage`, the nonce is in bytes 12 to 16.
-        // See here: https://github.com/circlefin/evm-cctp-contracts/blob/master/src/messages/Message.sol#L29
-        uint256 _expectedMessageNonce;
-        assembly {
-            _expectedMessageNonce := and(shr(96, calldataload(_cctpMessage.offset)), 0xffffffffffffffff)
-        }
-        require(_expectedMessageNonce == _nonce, "nonce mismatch");
-
-        require(status[_nonce] == CCTPMessageStatus.Pending, "message not relayed");
-
-        // call transmitter to mint USDC
-        bool _success = IMessageTransmitter(cctpTransmitter).receiveMessage(_cctpMessage, _cctpSignature);
-        require(_success, "call transmitter failed");
-
-        status[_nonce] = CCTPMessageStatus.Relayed;
-    }
-}

contracts/src/libraries/gateway/ScrollGatewayBase.sol

@@ -9,18 +9,8 @@ import {IScrollGateway} from "./IScrollGateway.sol";
 import {IScrollMessenger} from "../IScrollMessenger.sol";
 import {IScrollGatewayCallback} from "../callbacks/IScrollGatewayCallback.sol";
 import {ScrollConstants} from "../constants/ScrollConstants.sol";
-import {ITokenRateLimiter} from "../../rate-limiter/ITokenRateLimiter.sol";
 
 abstract contract ScrollGatewayBase is ReentrancyGuardUpgradeable, OwnableUpgradeable, IScrollGateway {
-    /**********
-     * Events *
-     **********/
-
-    /// @notice Emitted when owner updates rate limiter contract.
-    /// @param _oldRateLimiter The address of old rate limiter contract.
-    /// @param _newRateLimiter The address of new rate limiter contract.
-    event UpdateRateLimiter(address indexed _oldRateLimiter, address indexed _newRateLimiter);
-
     /*************
      * Variables *
      *************/
@@ -34,11 +24,8 @@ abstract contract ScrollGatewayBase is ReentrancyGuardUpgradeable, OwnableUpgrad
     /// @inheritdoc IScrollGateway
     address public override messenger;
 
-    /// @notice The address of token rate limiter contract.
-    address public rateLimiter;
-
     /// @dev The storage slots for future usage.
-    uint256[46] private __gap;
+    uint256[47] private __gap;
 
     /**********************
      * Function Modifiers *
@@ -85,20 +72,6 @@ abstract contract ScrollGatewayBase is ReentrancyGuardUpgradeable, OwnableUpgrad
         }
     }
 
-    /************************
-     * Restricted Functions *
-     ************************/
-
-    /// @notice Update rate limiter contract.
-    /// @dev This function can only called by contract owner.
-    /// @param _newRateLimiter The address of new rate limiter contract.
-    function updateRateLimiter(address _newRateLimiter) external onlyOwner {
-        address _oldRateLimiter = rateLimiter;
-
-        rateLimiter = _newRateLimiter;
-        emit UpdateRateLimiter(_oldRateLimiter, _newRateLimiter);
-    }
-
     /**********************
      * Internal Functions *
      **********************/
@@ -111,16 +84,4 @@ abstract contract ScrollGatewayBase is ReentrancyGuardUpgradeable, OwnableUpgrad
             IScrollGatewayCallback(_to).onScrollGatewayCallback(_data);
         }
     }
-
-    /// @dev Internal function to increase token usage for the given `_sender`.
-    /// @param _token The address of token.
-    /// @param _amount The amount of token used.
-    function _addUsedAmount(address _token, uint256 _amount) internal {
-        if (_amount == 0) return;
-
-        address _rateLimiter = rateLimiter;
-        if (_rateLimiter != address(0)) {
-            ITokenRateLimiter(_rateLimiter).addUsedAmount(_token, _amount);
-        }
-    }
 }

contracts/src/rate-limiter/ETHRateLimiter.sol

@@ -1,116 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity =0.8.16;
-
-import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
-import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";
-
-import {IETHRateLimiter} from "./IETHRateLimiter.sol";
-
-// solhint-disable func-name-mixedcase
-// solhint-disable not-rely-on-time
-
-contract ETHRateLimiter is Ownable, IETHRateLimiter {
-    /***********
-     * Structs *
-     ***********/
-
-    struct TokenAmount {
-        // The timestamp when the amount is updated.
-        uint48 lastUpdateTs;
-        // The ETH limit in wei.
-        uint104 limit;
-        // The amount of ETH in current period.
-        uint104 amount;
-    }
-
-    /*************
-     * Constants *
-     *************/
-
-    /// @notice The period length in seconds.
-    /// @dev The time frame for the `k`-th period is `[periodDuration * k, periodDuration * (k + 1))`.
-    uint256 public immutable periodDuration;
-
-    /// @notice The address of ETH spender.
-    address public immutable spender;
-
-    /*************
-     * Variables *
-     *************/
-
-    /// @notice The token amount used in current period.
-    TokenAmount public currentPeriod;
-
-    /***************
-     * Constructor *
-     ***************/
-
-    constructor(
-        uint256 _periodDuration,
-        address _spender,
-        uint104 _totalLimit
-    ) {
-        if (_periodDuration == 0) {
-            revert PeriodIsZero();
-        }
-
-        if (_totalLimit == 0) {
-            revert TotalLimitIsZero();
-        }
-
-        periodDuration = _periodDuration;
-        spender = _spender;
-
-        currentPeriod.limit = _totalLimit;
-    }
-
-    /*****************************
-     * Public Mutating Functions *
-     *****************************/
-
-    /// @inheritdoc IETHRateLimiter
-    function addUsedAmount(uint256 _amount) external override {
-        if (msg.sender != spender) {
-            revert CallerNotSpender();
-        }
-        if (_amount == 0) return;
-
-        uint256 _currentPeriodStart = (block.timestamp / periodDuration) * periodDuration;
-
-        // check total limit
-        uint256 _currentTotalAmount;
-        TokenAmount memory _currentPeriod = currentPeriod;
-
-        if (_currentPeriod.lastUpdateTs < _currentPeriodStart) {
-            _currentTotalAmount = _amount;
-        } else {
-            _currentTotalAmount = _currentPeriod.amount + _amount;
-        }
-        if (_currentTotalAmount > _currentPeriod.limit) {
-            revert ExceedTotalLimit();
-        }
-
-        _currentPeriod.lastUpdateTs = uint48(block.timestamp);
-        _currentPeriod.amount = SafeCast.toUint104(_currentTotalAmount);
-
-        currentPeriod = _currentPeriod;
-    }
-
-    /************************
-     * Restricted Functions *
-     ************************/
-
-    /// @notice Update the total token amount limit.
-    /// @param _newTotalLimit The new total limit.
-    function updateTotalLimit(uint104 _newTotalLimit) external onlyOwner {
-        if (_newTotalLimit == 0) {
-            revert TotalLimitIsZero();
-        }
-
-        uint256 _oldTotalLimit = currentPeriod.limit;
-        currentPeriod.limit = _newTotalLimit;
-
-        emit UpdateTotalLimit(_oldTotalLimit, _newTotalLimit);
-    }
-}

contracts/src/rate-limiter/IETHRateLimiter.sol

@@ -1,38 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.16;
-
-interface IETHRateLimiter {
-    /**********
-     * Events *
-     **********/
-
-    /// @notice Emitted when the total limit is updated.
-    /// @param oldTotalLimit The previous value of total limit before updating.
-    /// @param newTotalLimit The current value of total limit after updating.
-    event UpdateTotalLimit(uint256 oldTotalLimit, uint256 newTotalLimit);
-
-    /**********
-     * Errors *
-     **********/
-
-    /// @dev Thrown when the `periodDuration` is initialized to zero.
-    error PeriodIsZero();
-
-    /// @dev Thrown when the `totalAmount` is initialized to zero.
-    error TotalLimitIsZero();
-
-    /// @dev Thrown when an amount breaches the total limit in the period.
-    error ExceedTotalLimit();
-
-    /// @dev Thrown when the call is not spender.
-    error CallerNotSpender();
-
-    /*****************************
-     * Public Mutating Functions *
-     *****************************/
-
-    /// @notice Request some ETH usage for `sender`.
-    /// @param _amount The amount of ETH to use.
-    function addUsedAmount(uint256 _amount) external;
-}

contracts/src/rate-limiter/ITokenRateLimiter.sol

@@ -1,38 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.16;
-
-interface ITokenRateLimiter {
-    /**********
-     * Events *
-     **********/
-
-    /// @notice Emitted when the total limit is updated.
-    /// @param oldTotalLimit The previous value of total limit before updating.
-    /// @param newTotalLimit The current value of total limit after updating.
-    event UpdateTotalLimit(address indexed token, uint256 oldTotalLimit, uint256 newTotalLimit);
-
-    /**********
-     * Errors *
-     **********/
-
-    /// @dev Thrown when the `periodDuration` is initialized to zero.
-    error PeriodIsZero();
-
-    /// @dev Thrown when the `totalAmount` is initialized to zero.
-    /// @param token The address of the token.
-    error TotalLimitIsZero(address token);
-
-    /// @dev Thrown when an amount breaches the total limit in the period.
-    /// @param token The address of the token.
-    error ExceedTotalLimit(address token);
-
-    /*****************************
-     * Public Mutating Functions *
-     *****************************/
-
-    /// @notice Request some token usage for `sender`.
-    /// @param token The address of the token.
-    /// @param amount The amount of token to use.
-    function addUsedAmount(address token, uint256 amount) external;
-}

contracts/src/rate-limiter/TokenRateLimiter.sol

@@ -1,106 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity =0.8.16;
-
-import {AccessControlEnumerable} from "@openzeppelin/contracts/access/AccessControlEnumerable.sol";
-import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";
-
-import {ITokenRateLimiter} from "./ITokenRateLimiter.sol";
-
-// solhint-disable func-name-mixedcase
-// solhint-disable not-rely-on-time
-
-contract TokenRateLimiter is AccessControlEnumerable, ITokenRateLimiter {
-    /***********
-     * Structs *
-     ***********/
-
-    struct TokenAmount {
-        // The timestamp when the amount is updated.
-        uint48 lastUpdateTs;
-        // The token limit.
-        uint104 limit;
-        // The amount of token in current period.
-        uint104 amount;
-    }
-
-    /*************
-     * Constants *
-     *************/
-
-    /// @notice The role for token spender.
-    bytes32 public constant TOKEN_SPENDER_ROLE = keccak256("TOKEN_SPENDER_ROLE");
-
-    /// @notice The period length in seconds.
-    /// @dev The time frame for the `k`-th period is `[periodDuration * k, periodDuration * (k + 1))`.
-    uint256 public immutable periodDuration;
-
-    /*************
-     * Variables *
-     *************/
-
-    /// @notice Mapping from token address to the total amounts used in current period and total token amount limit.
-    mapping(address => TokenAmount) public currentPeriod;
-
-    /// @dev The storage slots for future usage.
-    uint256[49] private __gap;
-
-    /***************
-     * Constructor *
-     ***************/
-
-    constructor(uint256 _periodDuration) {
-        if (_periodDuration == 0) {
-            revert PeriodIsZero();
-        }
-
-        _setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
-
-        periodDuration = _periodDuration;
-    }
-
-    /*****************************
-     * Public Mutating Functions *
-     *****************************/
-
-    /// @inheritdoc ITokenRateLimiter
-    function addUsedAmount(address _token, uint256 _amount) external override onlyRole(TOKEN_SPENDER_ROLE) {
-        if (_amount == 0) return;
-
-        uint256 _currentPeriodStart = (block.timestamp / periodDuration) * periodDuration;
-
-        // check total limit, `0` means no limit at all.
-        uint256 _currentTotalAmount;
-        TokenAmount memory _currentPeriod = currentPeriod[_token];
-        if (_currentPeriod.lastUpdateTs < _currentPeriodStart) {
-            _currentTotalAmount = _amount;
-        } else {
-            _currentTotalAmount = _currentPeriod.amount + _amount;
-        }
-        if (_currentPeriod.limit != 0 && _currentTotalAmount > _currentPeriod.limit) {
-            revert ExceedTotalLimit(_token);
-        }
-
-        _currentPeriod.lastUpdateTs = uint48(block.timestamp);
-        _currentPeriod.amount = SafeCast.toUint104(_currentTotalAmount);
-
-        currentPeriod[_token] = _currentPeriod;
-    }
-
-    /************************
-     * Restricted Functions *
-     ************************/
-
-    /// @notice Update the total token amount limit.
-    /// @param _newTotalLimit The new total limit.
-    function updateTotalLimit(address _token, uint104 _newTotalLimit) external onlyRole(DEFAULT_ADMIN_ROLE) {
-        if (_newTotalLimit == 0) {
-            revert TotalLimitIsZero(_token);
-        }
-
-        uint256 _oldTotalLimit = currentPeriod[_token].limit;
-        currentPeriod[_token].limit = _newTotalLimit;
-
-        emit UpdateTotalLimit(_token, _oldTotalLimit, _newTotalLimit);
-    }
-}

contracts/src/test/ETHRateLimiter.t.sol

@@ -1,75 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity =0.8.16;
-
-import {DSTestPlus} from "solmate/test/utils/DSTestPlus.sol";
-
-import {ETHRateLimiter} from "../rate-limiter/ETHRateLimiter.sol";
-import {IETHRateLimiter} from "../rate-limiter/IETHRateLimiter.sol";
-
-contract ETHRateLimiterTest is DSTestPlus {
-    event UpdateTotalLimit(uint256 oldTotalLimit, uint256 newTotalLimit);
-
-    ETHRateLimiter private limiter;
-
-    function setUp() public {
-        hevm.warp(86400);
-        limiter = new ETHRateLimiter(86400, address(this), 100 ether);
-    }
-
-    function testUpdateTotalLimit(uint104 _newTotalLimit) external {
-        hevm.assume(_newTotalLimit > 0);
-
-        // not owner, revert
-        hevm.startPrank(address(1));
-        hevm.expectRevert("Ownable: caller is not the owner");
-        limiter.updateTotalLimit(_newTotalLimit);
-        hevm.stopPrank();
-
-        // zero revert
-        hevm.expectRevert(IETHRateLimiter.TotalLimitIsZero.selector);
-        limiter.updateTotalLimit(0);
-
-        // success
-        hevm.expectEmit(false, false, false, true);
-        emit UpdateTotalLimit(100 ether, _newTotalLimit);
-        limiter.updateTotalLimit(_newTotalLimit);
-        (, uint104 _totalLimit, ) = limiter.currentPeriod();
-        assertEq(_totalLimit, _newTotalLimit);
-    }
-
-    function testAddUsedAmount() external {
-        // non-spender, revert
-        hevm.startPrank(address(1));
-        hevm.expectRevert(IETHRateLimiter.CallerNotSpender.selector);
-        limiter.addUsedAmount(0);
-        hevm.stopPrank();
-
-        // exceed total limit on first call
-        hevm.expectRevert(IETHRateLimiter.ExceedTotalLimit.selector);
-        limiter.addUsedAmount(100 ether + 1);
-        _checkTotalCurrentPeriodAmountAmount(0);
-
-        // exceed total limit on second call
-        limiter.addUsedAmount(50 ether);
-        _checkTotalCurrentPeriodAmountAmount(50 ether);
-        hevm.expectRevert(IETHRateLimiter.ExceedTotalLimit.selector);
-        limiter.addUsedAmount(50 ether + 1);
-        _checkTotalCurrentPeriodAmountAmount(50 ether);
-
-        // one period passed
-        hevm.warp(86400 * 2);
-        limiter.addUsedAmount(1 ether);
-        _checkTotalCurrentPeriodAmountAmount(1 ether);
-
-        // exceed
-        hevm.expectRevert(IETHRateLimiter.ExceedTotalLimit.selector);
-        limiter.addUsedAmount(99 ether + 1);
-        _checkTotalCurrentPeriodAmountAmount(1 ether);
-    }
-
-    function _checkTotalCurrentPeriodAmountAmount(uint256 expected) internal {
-        (, , uint256 totalAmount) = limiter.currentPeriod();
-        assertEq(totalAmount, expected);
-    }
-}

contracts/src/test/L1ScrollMessengerTest.t.sol

@@ -42,26 +42,6 @@ contract L1ScrollMessengerTest is L1GatewayTestBase {
         l1Messenger.relayMessageWithProof(address(this), address(messageQueue), 0, 0, new bytes(0), proof);
     }
 
-    function testForbidCallRateLimiterFromL2() external {
-        l1Messenger.updateRateLimiter(address(1));
-        bytes32 _xDomainCalldataHash = keccak256(
-            abi.encodeWithSignature(
-                "relayMessage(address,address,uint256,uint256,bytes)",
-                address(this),
-                address(1),
-                0,
-                0,
-                new bytes(0)
-            )
-        );
-        prepareL2MessageRoot(_xDomainCalldataHash);
-        IL1ScrollMessenger.L2MessageProof memory proof;
-        proof.batchIndex = rollup.lastFinalizedBatchIndex();
-
-        hevm.expectRevert("Forbid to call rate limiter");
-        l1Messenger.relayMessageWithProof(address(this), address(1), 0, 0, new bytes(0), proof);
-    }
-
     function testForbidCallSelfFromL2() external {
         bytes32 _xDomainCalldataHash = keccak256(
             abi.encodeWithSignature(
@@ -106,8 +86,6 @@ contract L1ScrollMessengerTest is L1GatewayTestBase {
 
         exceedValue = bound(exceedValue, 1, address(this).balance / 2);
 
-        l1Messenger.updateMaxReplayTimes(0);
-
         // append a message
         l1Messenger.sendMessage{value: 100}(address(0), 100, new bytes(0), 0, refundAddress);
 
@@ -181,9 +159,9 @@ contract L1ScrollMessengerTest is L1GatewayTestBase {
         hevm.stopPrank();
 
         hevm.expectEmit(false, false, false, true);
-        emit UpdateMaxReplayTimes(3, _maxReplayTimes);
+        emit UpdateMaxReplayTimes(0, _maxReplayTimes);
 
-        assertEq(l1Messenger.maxReplayTimes(), 3);
+        assertEq(l1Messenger.maxReplayTimes(), 0);
         l1Messenger.updateMaxReplayTimes(_maxReplayTimes);
         assertEq(l1Messenger.maxReplayTimes(), _maxReplayTimes);
     }

contracts/src/test/L1USDCGateway.t.sol

@@ -1,528 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity ^0.8.0;
-
-import {MockERC20} from "solmate/test/utils/mocks/MockERC20.sol";
-
-import {ERC1967Proxy} from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
-
-import {L1GatewayRouter} from "../L1/gateways/L1GatewayRouter.sol";
-import {IL1ERC20Gateway, L1USDCGateway} from "../L1/gateways/usdc/L1USDCGateway.sol";
-import {IL1ScrollMessenger} from "../L1/IL1ScrollMessenger.sol";
-import {IL2ERC20Gateway, L2USDCGateway} from "../L2/gateways/usdc/L2USDCGateway.sol";
-import {AddressAliasHelper} from "../libraries/common/AddressAliasHelper.sol";
-
-import {L1GatewayTestBase} from "./L1GatewayTestBase.t.sol";
-import {MockScrollMessenger} from "./mocks/MockScrollMessenger.sol";
-import {MockGatewayRecipient} from "./mocks/MockGatewayRecipient.sol";
-
-contract L1USDCGatewayTest is L1GatewayTestBase {
-    // from L1USDCGateway
-    event FinalizeWithdrawERC20(
-        address indexed _l1Token,
-        address indexed _l2Token,
-        address indexed _from,
-        address _to,
-        uint256 _amount,
-        bytes _data
-    );
-    event DepositERC20(
-        address indexed _l1Token,
-        address indexed _l2Token,
-        address indexed _from,
-        address _to,
-        uint256 _amount,
-        bytes _data
-    );
-
-    MockERC20 private l1USDC;
-    MockERC20 private l2USDC;
-
-    L1USDCGateway private gateway;
-    L1GatewayRouter private router;
-
-    L2USDCGateway private counterpartGateway;
-
-    function setUp() public {
-        setUpBase();
-
-        // Deploy tokens
-        l1USDC = new MockERC20("USDC", "USDC", 6);
-        l2USDC = new MockERC20("USDC", "USDC", 6);
-
-        // Deploy L1 contracts
-        gateway = _deployGateway();
-        router = L1GatewayRouter(address(new ERC1967Proxy(address(new L1GatewayRouter()), new bytes(0))));
-
-        // Deploy L2 contracts
-        counterpartGateway = new L2USDCGateway(address(l1USDC), address(l2USDC));
-
-        // Initialize L1 contracts
-        gateway.initialize(address(counterpartGateway), address(router), address(l1Messenger));
-        router.initialize(address(0), address(gateway));
-
-        // Prepare token balances
-        l1USDC.mint(address(this), type(uint128).max);
-        l1USDC.approve(address(gateway), type(uint256).max);
-        l1USDC.approve(address(router), type(uint256).max);
-    }
-
-    function testInitialized() public {
-        assertEq(address(counterpartGateway), gateway.counterpart());
-        assertEq(address(router), gateway.router());
-        assertEq(address(l1Messenger), gateway.messenger());
-        assertEq(address(l1USDC), gateway.l1USDC());
-        assertEq(address(l2USDC), gateway.l2USDC());
-        assertEq(address(l2USDC), gateway.getL2ERC20Address(address(l1USDC)));
-        assertEq(0, gateway.totalBridgedUSDC());
-
-        hevm.expectRevert("Initializable: contract is already initialized");
-        gateway.initialize(address(counterpartGateway), address(router), address(l1Messenger));
-    }
-
-    function testDepositPaused() public {
-        // non-owner call pause, should revert
-        hevm.startPrank(address(1));
-        hevm.expectRevert("Ownable: caller is not the owner");
-        gateway.pauseDeposit(false);
-        hevm.expectRevert("Ownable: caller is not the owner");
-        gateway.pauseDeposit(true);
-        hevm.stopPrank();
-
-        // pause deposit
-        gateway.pauseDeposit(true);
-
-        // deposit paused, should revert
-        hevm.expectRevert("deposit paused");
-        gateway.depositERC20(address(l1USDC), 1, 0);
-        hevm.expectRevert("deposit paused");
-        gateway.depositERC20(address(l1USDC), address(this), 1, 0);
-        hevm.expectRevert("deposit paused");
-        gateway.depositERC20AndCall(address(l1USDC), address(this), 1, new bytes(0), 0);
-    }
-
-    function testPauseWithdraw() public {
-        // non-owner call pause, should revert
-        hevm.startPrank(address(1));
-        hevm.expectRevert("Ownable: caller is not the owner");
-        gateway.pauseWithdraw(false);
-        hevm.expectRevert("Ownable: caller is not the owner");
-        gateway.pauseWithdraw(true);
-        hevm.stopPrank();
-    }
-
-    function testDepositERC20(
-        uint256 amount,
-        uint256 gasLimit,
-        uint256 feePerGas
-    ) public {
-        _depositERC20(false, amount, gasLimit, feePerGas);
-    }
-
-    function testDepositERC20WithRecipient(
-        uint256 amount,
-        address recipient,
-        uint256 gasLimit,
-        uint256 feePerGas
-    ) public {
-        _depositERC20WithRecipient(false, amount, recipient, gasLimit, feePerGas);
-    }
-
-    function testRouterDepositERC20(
-        uint256 amount,
-        uint256 gasLimit,
-        uint256 feePerGas
-    ) public {
-        _depositERC20(true, amount, gasLimit, feePerGas);
-    }
-
-    function testRouterDepositERC20WithRecipient(
-        uint256 amount,
-        address recipient,
-        uint256 gasLimit,
-        uint256 feePerGas
-    ) public {
-        _depositERC20WithRecipient(true, amount, recipient, gasLimit, feePerGas);
-    }
-
-    function testFinalizeWithdrawERC20FailedMocking(
-        address sender,
-        address recipient,
-        uint256 amount,
-        bytes memory dataToCall
-    ) public {
-        amount = bound(amount, 1, 100000);
-
-        // revert when caller is not messenger
-        hevm.expectRevert("only messenger can call");
-        gateway.finalizeWithdrawERC20(address(l1USDC), address(l2USDC), sender, recipient, amount, dataToCall);
-
-        MockScrollMessenger mockMessenger = new MockScrollMessenger();
-        gateway = _deployGateway();
-        gateway.initialize(address(counterpartGateway), address(router), address(mockMessenger));
-
-        // only call by conterpart
-        hevm.expectRevert("only call by counterpart");
-        mockMessenger.callTarget(
-            address(gateway),
-            abi.encodeWithSelector(
-                gateway.finalizeWithdrawERC20.selector,
-                address(l1USDC),
-                address(l2USDC),
-                sender,
-                recipient,
-                amount,
-                dataToCall
-            )
-        );
-
-        mockMessenger.setXDomainMessageSender(address(counterpartGateway));
-
-        // nonzero msg.value
-        hevm.expectRevert("nonzero msg.value");
-        mockMessenger.callTarget{value: 1}(
-            address(gateway),
-            abi.encodeWithSelector(
-                gateway.finalizeWithdrawERC20.selector,
-                address(l1USDC),
-                address(l2USDC),
-                sender,
-                recipient,
-                amount,
-                dataToCall
-            )
-        );
-
-        // l1 token not USDC
-        hevm.expectRevert("l1 token not USDC");
-        mockMessenger.callTarget(
-            address(gateway),
-            abi.encodeWithSelector(
-                gateway.finalizeWithdrawERC20.selector,
-                address(l2USDC),
-                address(l2USDC),
-                sender,
-                recipient,
-                amount,
-                dataToCall
-            )
-        );
-
-        // l2 token not USDC
-        hevm.expectRevert("l2 token not USDC");
-        mockMessenger.callTarget(
-            address(gateway),
-            abi.encodeWithSelector(
-                gateway.finalizeWithdrawERC20.selector,
-                address(l1USDC),
-                address(l1USDC),
-                sender,
-                recipient,
-                amount,
-                dataToCall
-            )
-        );
-
-        // withdraw paused
-        gateway.pauseWithdraw(true);
-        hevm.expectRevert("withdraw paused");
-        mockMessenger.callTarget(
-            address(gateway),
-            abi.encodeWithSelector(
-                gateway.finalizeWithdrawERC20.selector,
-                address(l1USDC),
-                address(l2USDC),
-                sender,
-                recipient,
-                amount,
-                dataToCall
-            )
-        );
-    }
-
-    function testFinalizeWithdrawERC20Failed(
-        address sender,
-        address recipient,
-        uint256 amount,
-        bytes memory dataToCall
-    ) public {
-        // blacklist some addresses
-        hevm.assume(recipient != address(0));
-        hevm.assume(recipient != address(gateway));
-
-        amount = bound(amount, 1, l1USDC.balanceOf(address(this)));
-
-        // deposit some USDC to L1ScrollMessenger
-        gateway.depositERC20(address(l1USDC), amount, 0);
-
-        // do finalize withdraw usdc
-        bytes memory message = abi.encodeWithSelector(
-            IL1ERC20Gateway.finalizeWithdrawERC20.selector,
-            address(l1USDC),
-            address(l2USDC),
-            sender,
-            recipient,
-            amount,
-            dataToCall
-        );
-        bytes memory xDomainCalldata = abi.encodeWithSignature(
-            "relayMessage(address,address,uint256,uint256,bytes)",
-            address(uint160(address(counterpartGateway)) + 1),
-            address(gateway),
-            0,
-            0,
-            message
-        );
-
-        prepareL2MessageRoot(keccak256(xDomainCalldata));
-
-        IL1ScrollMessenger.L2MessageProof memory proof;
-        proof.batchIndex = rollup.lastFinalizedBatchIndex();
-
-        // conterpart is not L2USDCGateway
-        // emit FailedRelayedMessage from L1ScrollMessenger
-        hevm.expectEmit(true, false, false, true);
-        emit FailedRelayedMessage(keccak256(xDomainCalldata));
-
-        uint256 gatewayBalance = l1USDC.balanceOf(address(gateway));
-        uint256 recipientBalance = l1USDC.balanceOf(recipient);
-        assertBoolEq(false, l1Messenger.isL2MessageExecuted(keccak256(xDomainCalldata)));
-        l1Messenger.relayMessageWithProof(
-            address(uint160(address(counterpartGateway)) + 1),
-            address(gateway),
-            0,
-            0,
-            message,
-            proof
-        );
-        assertEq(gatewayBalance, l1USDC.balanceOf(address(gateway)));
-        assertEq(recipientBalance, l1USDC.balanceOf(recipient));
-        assertBoolEq(false, l1Messenger.isL2MessageExecuted(keccak256(xDomainCalldata)));
-    }
-
-    function testFinalizeWithdrawERC20(
-        address sender,
-        uint256 amount,
-        bytes memory dataToCall
-    ) public {
-        MockGatewayRecipient recipient = new MockGatewayRecipient();
-
-        amount = bound(amount, 1, l1USDC.balanceOf(address(this)));
-
-        // deposit some USDC to gateway
-        gateway.depositERC20(address(l1USDC), amount, 0);
-
-        // do finalize withdraw usdc
-        bytes memory message = abi.encodeWithSelector(
-            IL1ERC20Gateway.finalizeWithdrawERC20.selector,
-            address(l1USDC),
-            address(l2USDC),
-            sender,
-            address(recipient),
-            amount,
-            dataToCall
-        );
-        bytes memory xDomainCalldata = abi.encodeWithSignature(
-            "relayMessage(address,address,uint256,uint256,bytes)",
-            address(counterpartGateway),
-            address(gateway),
-            0,
-            0,
-            message
-        );
-
-        prepareL2MessageRoot(keccak256(xDomainCalldata));
-
-        IL1ScrollMessenger.L2MessageProof memory proof;
-        proof.batchIndex = rollup.lastFinalizedBatchIndex();
-
-        // emit FinalizeWithdrawERC20 from L1USDCGateway
-        {
-            hevm.expectEmit(true, true, true, true);
-            emit FinalizeWithdrawERC20(
-                address(l1USDC),
-                address(l2USDC),
-                sender,
-                address(recipient),
-                amount,
-                dataToCall
-            );
-        }
-
-        // emit RelayedMessage from L1ScrollMessenger
-        {
-            hevm.expectEmit(true, false, false, true);
-            emit RelayedMessage(keccak256(xDomainCalldata));
-        }
-
-        uint256 gatewayBalance = l1USDC.balanceOf(address(gateway));
-        uint256 totalBridgedUSDCBefore = gateway.totalBridgedUSDC();
-        uint256 recipientBalance = l1USDC.balanceOf(address(recipient));
-        assertBoolEq(false, l1Messenger.isL2MessageExecuted(keccak256(xDomainCalldata)));
-        l1Messenger.relayMessageWithProof(address(counterpartGateway), address(gateway), 0, 0, message, proof);
-        assertEq(gatewayBalance - amount, l1USDC.balanceOf(address(gateway)));
-        assertEq(totalBridgedUSDCBefore - amount, gateway.totalBridgedUSDC());
-        assertEq(recipientBalance + amount, l1USDC.balanceOf(address(recipient)));
-        assertBoolEq(true, l1Messenger.isL2MessageExecuted(keccak256(xDomainCalldata)));
-    }
-
-    function _depositERC20(
-        bool useRouter,
-        uint256 amount,
-        uint256 gasLimit,
-        uint256 feePerGas
-    ) private {
-        amount = bound(amount, 0, l1USDC.balanceOf(address(this)));
-        gasLimit = bound(gasLimit, 0, 1000000);
-        feePerGas = bound(feePerGas, 0, 1000);
-
-        gasOracle.setL2BaseFee(feePerGas);
-
-        uint256 feeToPay = feePerGas * gasLimit;
-        bytes memory message = abi.encodeWithSelector(
-            IL2ERC20Gateway.finalizeDepositERC20.selector,
-            address(l1USDC),
-            address(l2USDC),
-            address(this),
-            address(this),
-            amount,
-            new bytes(0)
-        );
-        bytes memory xDomainCalldata = abi.encodeWithSignature(
-            "relayMessage(address,address,uint256,uint256,bytes)",
-            address(gateway),
-            address(counterpartGateway),
-            0,
-            0,
-            message
-        );
-
-        if (amount == 0) {
-            hevm.expectRevert("deposit zero amount");
-            if (useRouter) {
-                router.depositERC20{value: feeToPay + extraValue}(address(l1USDC), amount, gasLimit);
-            } else {
-                gateway.depositERC20{value: feeToPay + extraValue}(address(l1USDC), amount, gasLimit);
-            }
-        } else {
-            // token is not l1USDC
-            hevm.expectRevert("only USDC is allowed");
-            gateway.depositERC20(address(l2USDC), amount, gasLimit);
-
-            // emit QueueTransaction from L1MessageQueue
-            {
-                hevm.expectEmit(true, true, false, true);
-                address sender = AddressAliasHelper.applyL1ToL2Alias(address(l1Messenger));
-                emit QueueTransaction(sender, address(l2Messenger), 0, 0, gasLimit, xDomainCalldata);
-            }
-
-            // emit SentMessage from L1ScrollMessenger
-            {
-                hevm.expectEmit(true, true, false, true);
-                emit SentMessage(address(gateway), address(counterpartGateway), 0, 0, gasLimit, message);
-            }
-
-            // emit DepositERC20 from L1USDCGateway
-            hevm.expectEmit(true, true, true, true);
-            emit DepositERC20(address(l1USDC), address(l2USDC), address(this), address(this), amount, new bytes(0));
-
-            uint256 gatewayBalance = l1USDC.balanceOf(address(gateway));
-            uint256 totalBridgedUSDCBefore = gateway.totalBridgedUSDC();
-            uint256 feeVaultBalance = address(feeVault).balance;
-            assertBoolEq(false, l1Messenger.isL1MessageSent(keccak256(xDomainCalldata)));
-            if (useRouter) {
-                router.depositERC20{value: feeToPay + extraValue}(address(l1USDC), amount, gasLimit);
-            } else {
-                gateway.depositERC20{value: feeToPay + extraValue}(address(l1USDC), amount, gasLimit);
-            }
-            assertEq(amount + gatewayBalance, l1USDC.balanceOf(address(gateway)));
-            assertEq(amount + totalBridgedUSDCBefore, gateway.totalBridgedUSDC());
-            assertEq(feeToPay + feeVaultBalance, address(feeVault).balance);
-            assertBoolEq(true, l1Messenger.isL1MessageSent(keccak256(xDomainCalldata)));
-        }
-    }
-
-    function _depositERC20WithRecipient(
-        bool useRouter,
-        uint256 amount,
-        address recipient,
-        uint256 gasLimit,
-        uint256 feePerGas
-    ) private {
-        amount = bound(amount, 0, l1USDC.balanceOf(address(this)));
-        gasLimit = bound(gasLimit, 0, 1000000);
-        feePerGas = bound(feePerGas, 0, 1000);
-
-        gasOracle.setL2BaseFee(feePerGas);
-
-        uint256 feeToPay = feePerGas * gasLimit;
-        bytes memory message = abi.encodeWithSelector(
-            IL2ERC20Gateway.finalizeDepositERC20.selector,
-            address(l1USDC),
-            address(l2USDC),
-            address(this),
-            recipient,
-            amount,
-            new bytes(0)
-        );
-        bytes memory xDomainCalldata = abi.encodeWithSignature(
-            "relayMessage(address,address,uint256,uint256,bytes)",
-            address(gateway),
-            address(counterpartGateway),
-            0,
-            0,
-            message
-        );
-
-        if (amount == 0) {
-            hevm.expectRevert("deposit zero amount");
-            if (useRouter) {
-                router.depositERC20{value: feeToPay + extraValue}(address(l1USDC), recipient, amount, gasLimit);
-            } else {
-                gateway.depositERC20{value: feeToPay + extraValue}(address(l1USDC), recipient, amount, gasLimit);
-            }
-        } else {
-            // token is not l1USDC
-            hevm.expectRevert("only USDC is allowed");
-            gateway.depositERC20(address(l2USDC), recipient, amount, gasLimit);
-
-            // emit QueueTransaction from L1MessageQueue
-            {
-                hevm.expectEmit(true, true, false, true);
-                address sender = AddressAliasHelper.applyL1ToL2Alias(address(l1Messenger));
-                emit QueueTransaction(sender, address(l2Messenger), 0, 0, gasLimit, xDomainCalldata);
-            }
-
-            // emit SentMessage from L1ScrollMessenger
-            {
-                hevm.expectEmit(true, true, false, true);
-                emit SentMessage(address(gateway), address(counterpartGateway), 0, 0, gasLimit, message);
-            }
-
-            // emit DepositERC20 from L1USDCGateway
-            hevm.expectEmit(true, true, true, true);
-            emit DepositERC20(address(l1USDC), address(l2USDC), address(this), recipient, amount, new bytes(0));
-
-            uint256 gatewayBalance = l1USDC.balanceOf(address(gateway));
-            uint256 totalBridgedUSDCBefore = gateway.totalBridgedUSDC();
-            uint256 feeVaultBalance = address(feeVault).balance;
-            assertBoolEq(false, l1Messenger.isL1MessageSent(keccak256(xDomainCalldata)));
-            if (useRouter) {
-                router.depositERC20{value: feeToPay + extraValue}(address(l1USDC), recipient, amount, gasLimit);
-            } else {
-                gateway.depositERC20{value: feeToPay + extraValue}(address(l1USDC), recipient, amount, gasLimit);
-            }
-            assertEq(amount + gatewayBalance, l1USDC.balanceOf(address(gateway)));
-            assertEq(amount + totalBridgedUSDCBefore, gateway.totalBridgedUSDC());
-            assertEq(feeToPay + feeVaultBalance, address(feeVault).balance);
-            assertBoolEq(true, l1Messenger.isL1MessageSent(keccak256(xDomainCalldata)));
-        }
-    }
-
-    function _deployGateway() internal returns (L1USDCGateway) {
-        return
-            L1USDCGateway(
-                payable(new ERC1967Proxy(address(new L1USDCGateway(address(l1USDC), address(l2USDC))), new bytes(0)))
-            );
-    }
-}

contracts/src/test/L2ScrollMessenger.t.sol

@@ -51,15 +51,10 @@ contract L2ScrollMessengerTest is DSTestPlus {
     }
 
     function testForbidCallFromL1() external {
-        l2Messenger.updateRateLimiter(address(1));
-
         hevm.startPrank(AddressAliasHelper.applyL1ToL2Alias(address(l1Messenger)));
         hevm.expectRevert("Forbid to call message queue");
         l2Messenger.relayMessage(address(this), address(l2MessageQueue), 0, 0, new bytes(0));
 
-        hevm.expectRevert("Forbid to call rate limiter");
-        l2Messenger.relayMessage(address(this), address(1), 0, 0, new bytes(0));
-
         hevm.expectRevert("Forbid to call self");
         l2Messenger.relayMessage(address(this), address(l2Messenger), 0, 0, new bytes(0));
         hevm.stopPrank();

contracts/src/test/L2USDCGateway.t.sol

@@ -56,7 +56,7 @@ contract L2USDCGatewayTest is L2GatewayTestBase {
         router = L2GatewayRouter(address(new ERC1967Proxy(address(new L2GatewayRouter()), new bytes(0))));
 
         // Deploy L1 contracts
-        counterpartGateway = new L1USDCGateway(address(l1USDC), address(l2USDC));
+        counterpartGateway = new L1USDCGateway();
 
         // Initialize L2 contracts
         gateway.initialize(address(counterpartGateway), address(router), address(l2Messenger));
@@ -128,6 +128,16 @@ contract L2USDCGatewayTest is L2GatewayTestBase {
         _withdrawERC20WithRecipient(false, amount, recipient, gasLimit, feePerGas);
     }
 
+    function testWithdrawERC20WithRecipientAndCalldata(
+        uint256 amount,
+        address recipient,
+        bytes memory dataToCall,
+        uint256 gasLimit,
+        uint256 feePerGas
+    ) public {
+        _withdrawERC20WithRecipientAndCalldata(false, amount, recipient, dataToCall, gasLimit, feePerGas);
+    }
+
     function testRouterWithdrawERC20(
         uint256 amount,
         uint256 gasLimit,
@@ -145,6 +155,16 @@ contract L2USDCGatewayTest is L2GatewayTestBase {
         _withdrawERC20WithRecipient(true, amount, recipient, gasLimit, feePerGas);
     }
 
+    function testRouterWithdrawERC20WithRecipientAndCalldata(
+        uint256 amount,
+        address recipient,
+        bytes memory dataToCall,
+        uint256 gasLimit,
+        uint256 feePerGas
+    ) public {
+        _withdrawERC20WithRecipientAndCalldata(true, amount, recipient, dataToCall, gasLimit, feePerGas);
+    }
+
     function testFinalizeDepositERC20FailedMocking(
         address sender,
         address recipient,
@@ -336,6 +356,7 @@ contract L2USDCGatewayTest is L2GatewayTestBase {
     ) private {
         amount = bound(amount, 0, l2USDC.balanceOf(address(this)));
         gasLimit = bound(gasLimit, 21000, 1000000);
+        feePerGas = bound(feePerGas, 0, 1000);
         feePerGas = 0;
 
         setL1BaseFee(feePerGas);
@@ -412,6 +433,7 @@ contract L2USDCGatewayTest is L2GatewayTestBase {
     ) private {
         amount = bound(amount, 0, l2USDC.balanceOf(address(this)));
         gasLimit = bound(gasLimit, 21000, 1000000);
+        feePerGas = bound(feePerGas, 0, 1000);
         feePerGas = 0;
 
         setL1BaseFee(feePerGas);
@@ -479,6 +501,85 @@ contract L2USDCGatewayTest is L2GatewayTestBase {
         }
     }
 
+    function _withdrawERC20WithRecipientAndCalldata(
+        bool useRouter,
+        uint256 amount,
+        address recipient,
+        bytes memory dataToCall,
+        uint256 gasLimit,
+        uint256 feePerGas
+    ) private {
+        amount = bound(amount, 0, l2USDC.balanceOf(address(this)));
+        gasLimit = bound(gasLimit, 21000, 1000000);
+        feePerGas = bound(feePerGas, 0, 1000);
+        // we don't charge fee now.
+        feePerGas = 0;
+
+        setL1BaseFee(feePerGas);
+
+        uint256 feeToPay = feePerGas * gasLimit;
+        bytes memory message = abi.encodeWithSelector(
+            IL1ERC20Gateway.finalizeWithdrawERC20.selector,
+            address(l1USDC),
+            address(l2USDC),
+            address(this),
+            recipient,
+            amount,
+            dataToCall
+        );
+        bytes memory xDomainCalldata = abi.encodeWithSignature(
+            "relayMessage(address,address,uint256,uint256,bytes)",
+            address(gateway),
+            address(counterpartGateway),
+            0,
+            0,
+            message
+        );
+
+        if (amount == 0) {
+            hevm.expectRevert("withdraw zero amount");
+            if (useRouter) {
+                router.withdrawERC20AndCall{value: feeToPay}(address(l2USDC), recipient, amount, dataToCall, gasLimit);
+            } else {
+                gateway.withdrawERC20AndCall{value: feeToPay}(address(l2USDC), recipient, amount, dataToCall, gasLimit);
+            }
+        } else {
+            // token is not l1USDC
+            hevm.expectRevert("only USDC is allowed");
+            gateway.withdrawERC20AndCall(address(l1USDC), recipient, amount, dataToCall, gasLimit);
+
+            // emit AppendMessage from L2MessageQueue
+            {
+                hevm.expectEmit(false, false, false, true);
+                emit AppendMessage(0, keccak256(xDomainCalldata));
+            }
+
+            // emit SentMessage from L2ScrollMessenger
+            {
+                hevm.expectEmit(true, true, false, true);
+                emit SentMessage(address(gateway), address(counterpartGateway), 0, 0, gasLimit, message);
+            }
+
+            // emit WithdrawERC20 from L2USDCGateway
+            hevm.expectEmit(true, true, true, true);
+            emit WithdrawERC20(address(l1USDC), address(l2USDC), address(this), recipient, amount, dataToCall);
+
+            uint256 senderBalance = l2USDC.balanceOf(address(this));
+            uint256 gatewayBalance = l2USDC.balanceOf(address(gateway));
+            uint256 feeVaultBalance = address(feeVault).balance;
+            assertBoolEq(false, l2Messenger.isL2MessageSent(keccak256(xDomainCalldata)));
+            if (useRouter) {
+                router.withdrawERC20AndCall{value: feeToPay}(address(l2USDC), recipient, amount, dataToCall, gasLimit);
+            } else {
+                gateway.withdrawERC20AndCall{value: feeToPay}(address(l2USDC), recipient, amount, dataToCall, gasLimit);
+            }
+            assertEq(senderBalance - amount, l2USDC.balanceOf(address(this)));
+            assertEq(gatewayBalance, l2USDC.balanceOf(address(gateway)));
+            assertEq(feeToPay + feeVaultBalance, address(feeVault).balance);
+            assertBoolEq(true, l2Messenger.isL2MessageSent(keccak256(xDomainCalldata)));
+        }
+    }
+
     function _deployGateway() internal returns (L2USDCGateway) {
         return
             L2USDCGateway(

contracts/src/test/L2WETHGateway.t.sol

@@ -410,7 +410,7 @@ contract L2WETHGatewayTest is L2GatewayTestBase {
         uint256 gasLimit,
         uint256 feePerGas
     ) private {
-        amount = bound(amount, 0, l2weth.balanceOf(address(this)));
+        amount = bound(amount, 0, l1weth.balanceOf(address(this)));
         gasLimit = bound(gasLimit, 21000, 1000000);
         feePerGas = 0;
 
@@ -485,7 +485,7 @@ contract L2WETHGatewayTest is L2GatewayTestBase {
         uint256 gasLimit,
         uint256 feePerGas
     ) private {
-        amount = bound(amount, 0, l2weth.balanceOf(address(this)));
+        amount = bound(amount, 0, l1weth.balanceOf(address(this)));
         gasLimit = bound(gasLimit, 21000, 1000000);
         feePerGas = 0;
 

contracts/src/test/MultipleVersionRollupVerifier.t.sol

@@ -7,7 +7,6 @@ import {DSTestPlus} from "solmate/test/utils/DSTestPlus.sol";
 import {L1MessageQueue} from "../L1/rollup/L1MessageQueue.sol";
 import {MultipleVersionRollupVerifier} from "../L1/rollup/MultipleVersionRollupVerifier.sol";
 
-import {MockScrollChain} from "./mocks/MockScrollChain.sol";
 import {MockZkEvmVerifier} from "./mocks/MockZkEvmVerifier.sol";
 
 contract MultipleVersionRollupVerifierTest is DSTestPlus {
@@ -18,54 +17,27 @@ contract MultipleVersionRollupVerifierTest is DSTestPlus {
     MockZkEvmVerifier private v0;
     MockZkEvmVerifier private v1;
     MockZkEvmVerifier private v2;
-    MockScrollChain private chain;
 
     function setUp() external {
         v0 = new MockZkEvmVerifier();
         v1 = new MockZkEvmVerifier();
         v2 = new MockZkEvmVerifier();
-        chain = new MockScrollChain();
 
         verifier = new MultipleVersionRollupVerifier(address(v0));
     }
 
-    function testInitialize(address _chain) external {
-        hevm.assume(_chain != address(0));
-
-        // set by non-owner, should revert
-        hevm.startPrank(address(1));
-        hevm.expectRevert("Ownable: caller is not the owner");
-        verifier.initialize(_chain);
-        hevm.stopPrank();
-
-        // succeed
-        assertEq(verifier.scrollChain(), address(0));
-        verifier.initialize(_chain);
-        assertEq(verifier.scrollChain(), _chain);
-
-        // initialized, revert
-        hevm.expectRevert("initialized");
-        verifier.initialize(_chain);
-    }
-
     function testUpdateVerifier(address _newVerifier) external {
         hevm.assume(_newVerifier != address(0));
 
-        verifier.initialize(address(chain));
-
         // set by non-owner, should revert
         hevm.startPrank(address(1));
         hevm.expectRevert("Ownable: caller is not the owner");
         verifier.updateVerifier(0, address(0));
         hevm.stopPrank();
 
-        // start batch index finalized, revert
-        hevm.expectRevert("start batch index finalized");
-        verifier.updateVerifier(0, address(1));
-
         // zero verifier address, revert
         hevm.expectRevert("zero verifier address");
-        verifier.updateVerifier(1, address(0));
+        verifier.updateVerifier(0, address(0));
 
         // change to random operator
         assertEq(verifier.legacyVerifiersLength(), 0);
@@ -93,8 +65,6 @@ contract MultipleVersionRollupVerifierTest is DSTestPlus {
     }
 
     function testGetVerifier() external {
-        verifier.initialize(address(chain));
-
         verifier.updateVerifier(100, address(v1));
         verifier.updateVerifier(300, address(v2));
 
@@ -110,8 +80,6 @@ contract MultipleVersionRollupVerifierTest is DSTestPlus {
     }
 
     function testVerifyAggregateProof() external {
-        verifier.initialize(address(chain));
-
         verifier.updateVerifier(100, address(v1));
         verifier.updateVerifier(300, address(v2));
 

contracts/src/test/TokenRateLimiter.t.sol

@@ -1,82 +0,0 @@
-// SPDX-License-Identifier: MIT
-
-pragma solidity =0.8.16;
-
-import {DSTestPlus} from "solmate/test/utils/DSTestPlus.sol";
-
-import {TokenRateLimiter} from "../rate-limiter/TokenRateLimiter.sol";
-import {ITokenRateLimiter} from "../rate-limiter/ITokenRateLimiter.sol";
-
-contract TokenRateLimiterTest is DSTestPlus {
-    event UpdateTotalLimit(address indexed token, uint256 oldTotalLimit, uint256 newTotalLimit);
-
-    TokenRateLimiter private limiter;
-
-    function setUp() public {
-        hevm.warp(86400);
-        limiter = new TokenRateLimiter(86400);
-    }
-
-    function testUpdateTotalLimit(address _token, uint104 _newTotalLimit) external {
-        hevm.assume(_newTotalLimit > 0);
-
-        // not admin, revert
-        hevm.startPrank(address(1));
-        hevm.expectRevert(
-            "AccessControl: account 0x0000000000000000000000000000000000000001 is missing role 0x0000000000000000000000000000000000000000000000000000000000000000"
-        );
-        limiter.updateTotalLimit(_token, _newTotalLimit);
-        hevm.stopPrank();
-
-        // zero revert
-        hevm.expectRevert(abi.encodeWithSelector(ITokenRateLimiter.TotalLimitIsZero.selector, _token));
-        limiter.updateTotalLimit(_token, 0);
-
-        // success
-        hevm.expectEmit(true, false, false, true);
-        emit UpdateTotalLimit(_token, 0 ether, _newTotalLimit);
-        limiter.updateTotalLimit(_token, _newTotalLimit);
-        (, uint104 _totalLimit, ) = limiter.currentPeriod(_token);
-        assertEq(_totalLimit, _newTotalLimit);
-    }
-
-    function testAddUsedAmount(address _token) external {
-        // non-spender, revert
-        hevm.startPrank(address(1));
-        hevm.expectRevert(
-            "AccessControl: account 0x0000000000000000000000000000000000000001 is missing role 0x267f05081a073059ae452e6ac77ec189636e43e41051d4c3ec760734b3d173cb"
-        );
-        limiter.addUsedAmount(_token, 0);
-        hevm.stopPrank();
-
-        limiter.grantRole(bytes32(0x267f05081a073059ae452e6ac77ec189636e43e41051d4c3ec760734b3d173cb), address(this));
-        limiter.updateTotalLimit(_token, 100 ether);
-
-        // exceed total limit on first call
-        hevm.expectRevert(abi.encodeWithSelector(ITokenRateLimiter.ExceedTotalLimit.selector, _token));
-        limiter.addUsedAmount(_token, 100 ether + 1);
-        _checkTotalCurrentPeriodAmountAmount(_token, 0);
-
-        // exceed total limit on second call
-        limiter.addUsedAmount(_token, 50 ether);
-        _checkTotalCurrentPeriodAmountAmount(_token, 50 ether);
-        hevm.expectRevert(abi.encodeWithSelector(ITokenRateLimiter.ExceedTotalLimit.selector, _token));
-        limiter.addUsedAmount(_token, 50 ether + 1);
-        _checkTotalCurrentPeriodAmountAmount(_token, 50 ether);
-
-        // one period passed
-        hevm.warp(86400 * 2);
-        limiter.addUsedAmount(_token, 1 ether);
-        _checkTotalCurrentPeriodAmountAmount(_token, 1 ether);
-
-        // exceed
-        hevm.expectRevert(abi.encodeWithSelector(ITokenRateLimiter.ExceedTotalLimit.selector, _token));
-        limiter.addUsedAmount(_token, 99 ether + 1);
-        _checkTotalCurrentPeriodAmountAmount(_token, 1 ether);
-    }
-
-    function _checkTotalCurrentPeriodAmountAmount(address token, uint256 expected) internal {
-        (, , uint256 totalAmount) = limiter.currentPeriod(token);
-        assertEq(totalAmount, expected);
-    }
-}

contracts/src/test/mocks/MockScrollChain.sol

@@ -7,7 +7,18 @@ import {ScrollChain} from "../../L1/rollup/ScrollChain.sol";
 contract MockScrollChain is ScrollChain {
     constructor() ScrollChain(0) {}
 
-    function setLastFinalizedBatchIndex(uint256 _lastFinalizedBatchIndex) external {
-        lastFinalizedBatchIndex = _lastFinalizedBatchIndex;
+    /*
+    function computePublicInputHash(uint64 accTotalL1Messages, Batch memory batch)
+        external
+        view
+        returns (
+            bytes32,
+            uint64,
+            uint64,
+            uint64
+        )
+    {
+        return _computePublicInputHash(accTotalL1Messages, batch);
     }
+    */
 }

coordinator/go.mod

@@ -47,10 +47,7 @@ require (
 	google.golang.org/protobuf v1.31.0 // indirect
 )
 
-require (
-	github.com/google/uuid v1.3.0
-	github.com/prometheus/client_golang v1.14.0
-)
+require github.com/prometheus/client_golang v1.14.0
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect

coordinator/go.sum

@@ -73,8 +73,6 @@ github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb/go.mod h1:/XxbfmMg
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/iden3/go-iden3-crypto v0.0.15 h1:4MJYlrot1l31Fzlo2sF56u7EVFeHHJkxGXXZCtESgK4=

coordinator/internal/controller/api/controller.go

@@ -7,7 +7,6 @@ import (
 	"gorm.io/gorm"
 
 	"scroll-tech/coordinator/internal/config"
-	"scroll-tech/coordinator/internal/logic/verifier"
 )
 
 var (
@@ -26,14 +25,9 @@ var (
 // InitController inits Controller with database
 func InitController(cfg *config.Config, db *gorm.DB, reg prometheus.Registerer) {
 	initControllerOnce.Do(func() {
-		vf, err := verifier.NewVerifier(cfg.ProverManager.Verifier)
-		if err != nil {
-			panic("proof receiver new verifier failure")
-		}
-
 		Auth = NewAuthController(db)
 		HealthCheck = NewHealthCheckController()
-		GetTask = NewGetTaskController(cfg, db, vf, reg)
-		SubmitProof = NewSubmitProofController(cfg, db, vf, reg)
+		GetTask = NewGetTaskController(cfg, db, reg)
+		SubmitProof = NewSubmitProofController(cfg, db, reg)
 	})
 }

coordinator/internal/controller/api/get_task.go

@@ -13,7 +13,6 @@ import (
 
 	"scroll-tech/coordinator/internal/config"
 	"scroll-tech/coordinator/internal/logic/provertask"
-	"scroll-tech/coordinator/internal/logic/verifier"
 	coordinatorType "scroll-tech/coordinator/internal/types"
 )
 
@@ -23,9 +22,9 @@ type GetTaskController struct {
 }
 
 // NewGetTaskController create a get prover task controller
-func NewGetTaskController(cfg *config.Config, db *gorm.DB, vf *verifier.Verifier, reg prometheus.Registerer) *GetTaskController {
-	chunkProverTask := provertask.NewChunkProverTask(cfg, db, vf.ChunkVK, reg)
-	batchProverTask := provertask.NewBatchProverTask(cfg, db, vf.BatchVK, reg)
+func NewGetTaskController(cfg *config.Config, db *gorm.DB, reg prometheus.Registerer) *GetTaskController {
+	chunkProverTask := provertask.NewChunkProverTask(cfg, db, reg)
+	batchProverTask := provertask.NewBatchProverTask(cfg, db, reg)
 
 	ptc := &GetTaskController{
 		proverTasks: make(map[message.ProofType]provertask.ProverTask),
@@ -41,7 +40,7 @@ func NewGetTaskController(cfg *config.Config, db *gorm.DB, vf *verifier.Verifier
 func (ptc *GetTaskController) GetTasks(ctx *gin.Context) {
 	var getTaskParameter coordinatorType.GetTaskParameter
 	if err := ctx.ShouldBind(&getTaskParameter); err != nil {
-		nerr := fmt.Errorf("prover task parameter invalid, err:%w", err)
+		nerr := fmt.Errorf("prover tasks parameter invalid, err:%w", err)
 		coordinatorType.RenderJSON(ctx, types.ErrCoordinatorParameterInvalidNo, nerr, nil)
 		return
 	}
@@ -49,7 +48,7 @@ func (ptc *GetTaskController) GetTasks(ctx *gin.Context) {
 	proofType := ptc.proofType(&getTaskParameter)
 	proverTask, isExist := ptc.proverTasks[proofType]
 	if !isExist {
-		nerr := fmt.Errorf("parameter wrong proof type:%v", proofType)
+		nerr := fmt.Errorf("parameter wrong proof type")
 		coordinatorType.RenderJSON(ctx, types.ErrCoordinatorParameterInvalidNo, nerr, nil)
 		return
 	}

coordinator/internal/controller/api/submit_proof.go

@@ -13,8 +13,7 @@ import (
 
 	"scroll-tech/coordinator/internal/config"
 	"scroll-tech/coordinator/internal/logic/submitproof"
-	"scroll-tech/coordinator/internal/logic/verifier"
-	coordinatorType "scroll-tech/coordinator/internal/types"
+	coodinatorType "scroll-tech/coordinator/internal/types"
 )
 
 // SubmitProofController the submit proof api controller
@@ -23,18 +22,18 @@ type SubmitProofController struct {
 }
 
 // NewSubmitProofController create the submit proof api controller instance
-func NewSubmitProofController(cfg *config.Config, db *gorm.DB, vf *verifier.Verifier, reg prometheus.Registerer) *SubmitProofController {
+func NewSubmitProofController(cfg *config.Config, db *gorm.DB, reg prometheus.Registerer) *SubmitProofController {
 	return &SubmitProofController{
-		submitProofReceiverLogic: submitproof.NewSubmitProofReceiverLogic(cfg.ProverManager, db, vf, reg),
+		submitProofReceiverLogic: submitproof.NewSubmitProofReceiverLogic(cfg.ProverManager, db, reg),
 	}
 }
 
 // SubmitProof prover submit the proof to coordinator
 func (spc *SubmitProofController) SubmitProof(ctx *gin.Context) {
-	var spp coordinatorType.SubmitProofParameter
+	var spp coodinatorType.SubmitProofParameter
 	if err := ctx.ShouldBind(&spp); err != nil {
 		nerr := fmt.Errorf("parameter invalid, err:%w", err)
-		coordinatorType.RenderJSON(ctx, types.ErrCoordinatorParameterInvalidNo, nerr, nil)
+		coodinatorType.RenderJSON(ctx, types.ErrCoordinatorParameterInvalidNo, nerr, nil)
 		return
 	}
 
@@ -52,7 +51,7 @@ func (spc *SubmitProofController) SubmitProof(ctx *gin.Context) {
 			var tmpChunkProof message.ChunkProof
 			if err := json.Unmarshal([]byte(spp.Proof), &tmpChunkProof); err != nil {
 				nerr := fmt.Errorf("unmarshal parameter chunk proof invalid, err:%w", err)
-				coordinatorType.RenderJSON(ctx, types.ErrCoordinatorParameterInvalidNo, nerr, nil)
+				coodinatorType.RenderJSON(ctx, types.ErrCoordinatorParameterInvalidNo, nerr, nil)
 				return
 			}
 			proofMsg.ChunkProof = &tmpChunkProof
@@ -60,7 +59,7 @@ func (spc *SubmitProofController) SubmitProof(ctx *gin.Context) {
 			var tmpBatchProof message.BatchProof
 			if err := json.Unmarshal([]byte(spp.Proof), &tmpBatchProof); err != nil {
 				nerr := fmt.Errorf("unmarshal parameter batch proof invalid, err:%w", err)
-				coordinatorType.RenderJSON(ctx, types.ErrCoordinatorParameterInvalidNo, nerr, nil)
+				coodinatorType.RenderJSON(ctx, types.ErrCoordinatorParameterInvalidNo, nerr, nil)
 				return
 			}
 			proofMsg.BatchProof = &tmpBatchProof
@@ -69,8 +68,8 @@ func (spc *SubmitProofController) SubmitProof(ctx *gin.Context) {
 
 	if err := spc.submitProofReceiverLogic.HandleZkProof(ctx, &proofMsg, spp); err != nil {
 		nerr := fmt.Errorf("handle zk proof failure, err:%w", err)
-		coordinatorType.RenderJSON(ctx, types.ErrCoordinatorHandleZkProofFailure, nerr, nil)
+		coodinatorType.RenderJSON(ctx, types.ErrCoordinatorHandleZkProofFailure, nerr, nil)
 		return
 	}
-	coordinatorType.RenderJSON(ctx, types.Success, nil, nil)
+	coodinatorType.RenderJSON(ctx, types.Success, nil, nil)
 }