improve logs

This reverts commit 42190feb6c.

.gitignore

@@ -3,7 +3,6 @@ assets/params*
 assets/seed
 coverage.txt
 build/bin
-*.integration.txt
 
 # misc
 sftp-config.json

bridge/cmd/app/app.go

@@ -1,7 +1,6 @@
 package app
 
 import (
-	"context"
 	"fmt"
 	"os"
 	"os/signal"
@@ -11,7 +10,6 @@ import (
 
 	"scroll-tech/database"
 
-	"scroll-tech/common/metrics"
 	"scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
@@ -51,10 +49,7 @@ func action(ctx *cli.Context) error {
 		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
 	}
 
-	// Start metrics server.
-	metrics.Serve(context.Background(), ctx)
-
-	// Init db connection.
+	// init db connection
 	var ormFactory database.OrmFactory
 	if ormFactory, err = database.NewOrmFactory(cfg.DBConfig); err != nil {
 		log.Crit("failed to init db connection", "err", err)

bridge/config.json

@@ -1,6 +1,6 @@
 {
   "l1_config": {
-    "confirmations": "number=6",
+    "confirmations": 6,
     "endpoint": "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
     "l1_messenger_address": "0x0000000000000000000000000000000000000000",
     "rollup_contract_address": "0x0000000000000000000000000000000000000000",
@@ -11,11 +11,11 @@
         "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc",
         "check_pending_time": 3,
         "escalate_blocks": 100,
-        "confirmations": "number=1",
+        "confirmations": 1,
         "escalate_multiple_num": 11,
         "escalate_multiple_den": 10,
         "max_gas_price": 10000000000,
-        "tx_type": "LegacyTx",
+        "tx_type": "AccessListTx",
         "min_balance": 100000000000000000000
       },
       "message_sender_private_keys": [
@@ -24,7 +24,7 @@
     }
   },
   "l2_config": {
-    "confirmations": "number=1",
+    "confirmations": 1,
     "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc",
     "l2_messenger_address": "0x0000000000000000000000000000000000000000",
     "relayer_config": {
@@ -34,11 +34,11 @@
         "endpoint": "https://goerli.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161",
         "check_pending_time": 10,
         "escalate_blocks": 100,
-        "confirmations": "number=6",
+        "confirmations": 6,
         "escalate_multiple_num": 11,
         "escalate_multiple_den": 10,
         "max_gas_price": 10000000000,
-        "tx_type": "LegacyTx",
+        "tx_type": "DynamicFeeTx",
         "min_balance": 100000000000000000000
       },
       "message_sender_private_keys": [

bridge/config/l1_config.go

@@ -1,15 +1,11 @@
 package config
 
-import (
-	"scroll-tech/bridge/utils"
-
-	"github.com/scroll-tech/go-ethereum/common"
-)
+import "github.com/scroll-tech/go-ethereum/common"
 
 // L1Config loads l1eth configuration items.
 type L1Config struct {
 	// Confirmations block height confirmations number.
-	Confirmations utils.ConfirmationParams `json:"confirmations"`
+	Confirmations uint64 `json:"confirmations"`
 	// l1 eth node url.
 	Endpoint string `json:"endpoint"`
 	// The start height to sync event from layer 1

bridge/config/l2_config.go

@@ -3,15 +3,13 @@ package config
 import (
 	"encoding/json"
 
-	"scroll-tech/bridge/utils"
-
 	"github.com/scroll-tech/go-ethereum/common"
 )
 
 // L2Config loads l2geth configuration items.
 type L2Config struct {
 	// Confirmations block height confirmations number.
-	Confirmations utils.ConfirmationParams `json:"confirmations"`
+	Confirmations uint64 `json:"confirmations"`
 	// l2geth node url.
 	Endpoint string `json:"endpoint"`
 	// The messenger contract address deployed on layer 2 chain.

bridge/config/relayer_config.go

@@ -6,8 +6,6 @@ import (
 	"fmt"
 	"math/big"
 
-	"scroll-tech/bridge/utils"
-
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/crypto"
 )
@@ -21,7 +19,7 @@ type SenderConfig struct {
 	// The number of blocks to wait to escalate increase gas price of the transaction.
 	EscalateBlocks uint64 `json:"escalate_blocks"`
 	// The gap number between a block be confirmed and the latest block.
-	Confirmations utils.ConfirmationParams `json:"confirmations"`
+	Confirmations uint64 `json:"confirmations"`
 	// The numerator of gas price escalate multiple.
 	EscalateMultipleNum uint64 `json:"escalate_multiple_num"`
 	// The denominator of gas price escalate multiple.

bridge/go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/iden3/go-iden3-crypto v0.0.13
 	github.com/orcaman/concurrent-map v1.0.0
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20230127005331-08ba436d8bb3
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230112091133-2891916a0f81
 	github.com/stretchr/testify v1.8.0
 	github.com/urfave/cli/v2 v2.10.2
 	golang.org/x/sync v0.1.0
@@ -32,7 +32,7 @@ require (
 	github.com/rjeczalik/notify v0.9.1 // indirect
 	github.com/rogpeppe/go-internal v1.8.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/scroll-tech/zktrie v0.4.1 // indirect
+	github.com/scroll-tech/zktrie v0.3.1 // indirect
 	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
 	github.com/tklauser/numcpus v0.4.0 // indirect

bridge/go.sum

@@ -350,11 +350,11 @@ github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230127005331-08ba436d8bb3 h1:kYPsjs9hr579hMFuHXrOy0zveCLHD/kC+PGv9wnadvM=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230127005331-08ba436d8bb3/go.mod h1:jurIpDQ0hqtp9//xxeWzr8X9KMP/+TYn+vz3K1wZrv0=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230112091133-2891916a0f81 h1:Gm18RZ9WTR2Dupumr60E2m1Noe+l9/lITt6iRyxxZoc=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230112091133-2891916a0f81/go.mod h1:jurIpDQ0hqtp9//xxeWzr8X9KMP/+TYn+vz3K1wZrv0=
 github.com/scroll-tech/zktrie v0.3.0/go.mod h1:CuJFlG1/soTJJBAySxCZgTF7oPvd5qF6utHOEciC43Q=
-github.com/scroll-tech/zktrie v0.4.1 h1:+enbK4g6/Pj76Do6Pz+ncaqJuYczua+yhP3Phs0pD3E=
-github.com/scroll-tech/zktrie v0.4.1/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
+github.com/scroll-tech/zktrie v0.3.1 h1:HlR+fMBdjXX1/7cUMqpUgGEhGy/3vN1JpwQ0ovg/Ys8=
+github.com/scroll-tech/zktrie v0.3.1/go.mod h1:CuJFlG1/soTJJBAySxCZgTF7oPvd5qF6utHOEciC43Q=
 github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=
 github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=

bridge/l1/backend.go

@@ -26,7 +26,7 @@ func New(ctx context.Context, cfg *config.L1Config, orm database.OrmFactory) (*B
 		return nil, err
 	}
 
-	relayer, err := NewLayer1Relayer(ctx, orm, cfg.RelayerConfig)
+	relayer, err := NewLayer1Relayer(ctx, client, int64(cfg.Confirmations), orm, cfg.RelayerConfig)
 	if err != nil {
 		return nil, err
 	}

bridge/l1/relayer.go

@@ -11,6 +11,7 @@ import (
 	"github.com/scroll-tech/go-ethereum/accounts/abi"
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/crypto"
+	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
 
 	"scroll-tech/database/orm"
@@ -28,6 +29,7 @@ import (
 // @todo It's better to be triggered by watcher.
 type Layer1Relayer struct {
 	ctx    context.Context
+	client *ethclient.Client
 	sender *sender.Sender
 
 	db  orm.L1MessageOrm
@@ -41,7 +43,7 @@ type Layer1Relayer struct {
 }
 
 // NewLayer1Relayer will return a new instance of Layer1RelayerClient
-func NewLayer1Relayer(ctx context.Context, db orm.L1MessageOrm, cfg *config.RelayerConfig) (*Layer1Relayer, error) {
+func NewLayer1Relayer(ctx context.Context, ethClient *ethclient.Client, l1ConfirmNum int64, db orm.L1MessageOrm, cfg *config.RelayerConfig) (*Layer1Relayer, error) {
 	l2MessengerABI, err := bridge_abi.L2MessengerMetaData.GetAbi()
 	if err != nil {
 		log.Warn("new L2MessengerABI failed", "err", err)
@@ -57,6 +59,7 @@ func NewLayer1Relayer(ctx context.Context, db orm.L1MessageOrm, cfg *config.Rela
 
 	return &Layer1Relayer{
 		ctx:            ctx,
+		client:         ethClient,
 		sender:         sender,
 		db:             db,
 		l2MessengerABI: l2MessengerABI,
@@ -110,7 +113,7 @@ func (r *Layer1Relayer) processSavedEvent(msg *orm.L1Message) error {
 		return err
 	}
 
-	hash, err := r.sender.SendTransaction(msg.MsgHash, &r.cfg.MessengerContractAddress, big.NewInt(0), data)
+	hash, err := r.sender.SendTransaction(msg.MsgHash, &r.cfg.MessengerContractAddress, big.NewInt(0), data, 0)
 	if err != nil && err.Error() == "execution reverted: Message expired" {
 		return r.db.UpdateLayer1Status(r.ctx, msg.MsgHash, orm.MsgExpired)
 	}
@@ -131,6 +134,8 @@ func (r *Layer1Relayer) processSavedEvent(msg *orm.L1Message) error {
 
 // Start the relayer process
 func (r *Layer1Relayer) Start() {
+	log.Info("Starting l1/relayer")
+
 	go func() {
 		// trigger by timer
 		ticker := time.NewTicker(3 * time.Second)

bridge/l1/relayer_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"testing"
 
+	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/stretchr/testify/assert"
 
 	"scroll-tech/database/migrate"
@@ -19,7 +20,10 @@ func testCreateNewL1Relayer(t *testing.T) {
 	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
 	defer db.Close()
 
-	relayer, err := NewLayer1Relayer(context.Background(), db, cfg.L2Config.RelayerConfig)
+	client, err := ethclient.Dial(l1gethImg.Endpoint())
+	assert.NoError(t, err)
+
+	relayer, err := NewLayer1Relayer(context.Background(), client, 1, db, cfg.L2Config.RelayerConfig)
 	assert.NoError(t, err)
 	defer relayer.Stop()
 

bridge/l1/watcher.go

@@ -11,7 +11,6 @@ import (
 	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
-	"github.com/scroll-tech/go-ethereum/metrics"
 
 	"scroll-tech/database"
 	"scroll-tech/database/orm"
@@ -20,10 +19,6 @@ import (
 	"scroll-tech/bridge/utils"
 )
 
-var (
-	bridgeL1MsgSyncHeightGauge = metrics.NewRegisteredGauge("bridge/l1/msg/sync/height", nil)
-)
-
 type relayedMessage struct {
 	msgHash      common.Hash
 	txHash       common.Hash
@@ -43,7 +38,7 @@ type Watcher struct {
 	db     database.OrmFactory
 
 	// The number of new blocks to wait for a block to be confirmed
-	confirmations    utils.ConfirmationParams
+	confirmations    uint64
 	messengerAddress common.Address
 	messengerABI     *abi.ABI
 
@@ -58,7 +53,7 @@ type Watcher struct {
 
 // NewWatcher returns a new instance of Watcher. The instance will be not fully prepared,
 // and still needs to be finalized and ran by calling `watcher.Start`.
-func NewWatcher(ctx context.Context, client *ethclient.Client, startHeight uint64, confirmations utils.ConfirmationParams, messengerAddress common.Address, rollupAddress common.Address, db database.OrmFactory) *Watcher {
+func NewWatcher(ctx context.Context, client *ethclient.Client, startHeight uint64, confirmations uint64, messengerAddress common.Address, rollupAddress common.Address, db database.OrmFactory) *Watcher {
 	savedHeight, err := db.GetLayer1LatestWatchedHeight()
 	if err != nil {
 		log.Warn("Failed to fetch height from db", "err", err)
@@ -86,6 +81,8 @@ func NewWatcher(ctx context.Context, client *ethclient.Client, startHeight uint6
 
 // Start the Watcher module.
 func (w *Watcher) Start() {
+	log.Info("Starting l1/watcher")
+
 	go func() {
 		ticker := time.NewTicker(10 * time.Second)
 		defer ticker.Stop()
@@ -96,13 +93,12 @@ func (w *Watcher) Start() {
 				return
 
 			default:
-				number, err := utils.GetLatestConfirmedBlockNumber(w.ctx, w.client, w.confirmations)
+				blockNumber, err := w.client.BlockNumber(w.ctx)
 				if err != nil {
-					log.Error("failed to get block number", "err", err)
+					log.Error("Failed to get block number", "err", err)
 					continue
 				}
-
-				if err := w.FetchContractEvent(number); err != nil {
+				if err := w.FetchContractEvent(blockNumber); err != nil {
 					log.Error("Failed to fetch bridge contract", "err", err)
 				}
 			}
@@ -124,7 +120,7 @@ func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 	}()
 
 	fromBlock := int64(w.processedMsgHeight) + 1
-	toBlock := int64(blockHeight)
+	toBlock := int64(blockHeight) - int64(w.confirmations)
 
 	for from := fromBlock; from <= toBlock; from += contractEventsBlocksFetchLimit {
 		to := from + contractEventsBlocksFetchLimit - 1
@@ -157,7 +153,6 @@ func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 		}
 		if len(logs) == 0 {
 			w.processedMsgHeight = uint64(to)
-			bridgeL1MsgSyncHeightGauge.Update(to)
 			continue
 		}
 		log.Info("Received new L1 events", "fromBlock", from, "toBlock", to, "cnt", len(logs))
@@ -222,7 +217,6 @@ func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 		}
 
 		w.processedMsgHeight = uint64(to)
-		bridgeL1MsgSyncHeightGauge.Update(to)
 	}
 
 	return nil

bridge/l2/relayer.go

@@ -96,7 +96,8 @@ func NewLayer2Relayer(ctx context.Context, db database.OrmFactory, cfg *config.R
 const processMsgLimit = 100
 
 // ProcessSavedEvents relays saved un-processed cross-domain transactions to desired blockchain
-func (r *Layer2Relayer) ProcessSavedEvents() {
+func (r *Layer2Relayer) ProcessSavedEvents(wg *sync.WaitGroup) {
+	defer wg.Done()
 	batch, err := r.db.GetLatestFinalizedBatch()
 	if err != nil {
 		log.Error("GetLatestFinalizedBatch failed", "err", err)
@@ -165,7 +166,7 @@ func (r *Layer2Relayer) processSavedEvent(msg *orm.L2Message, index uint64) erro
 		return err
 	}
 
-	hash, err := r.messageSender.SendTransaction(msg.MsgHash, &r.cfg.MessengerContractAddress, big.NewInt(0), data)
+	hash, err := r.messageSender.SendTransaction(msg.MsgHash, &r.cfg.MessengerContractAddress, big.NewInt(0), data, 0)
 	if err != nil && err.Error() == "execution reverted: Message expired" {
 		return r.db.UpdateLayer2Status(r.ctx, msg.MsgHash, orm.MsgExpired)
 	}
@@ -192,7 +193,8 @@ func (r *Layer2Relayer) processSavedEvent(msg *orm.L2Message, index uint64) erro
 }
 
 // ProcessPendingBatches submit batch data to layer 1 rollup contract
-func (r *Layer2Relayer) ProcessPendingBatches() {
+func (r *Layer2Relayer) ProcessPendingBatches(wg *sync.WaitGroup) {
+	defer wg.Done()
 	// batches are sorted by batch index in increasing order
 	batchesInDB, err := r.db.GetPendingBatches(1)
 	if err != nil {
@@ -267,7 +269,26 @@ func (r *Layer2Relayer) ProcessPendingBatches() {
 
 	txID := id + "-commit"
 	// add suffix `-commit` to avoid duplication with finalize tx in unit tests
-	hash, err := r.rollupSender.SendTransaction(txID, &r.cfg.RollupContractAddress, big.NewInt(0), data)
+	hash, err := r.rollupSender.SendTransaction(txID, &r.cfg.RollupContractAddress, big.NewInt(0), data, 0)
+
+	if err != nil && err.Error() == "execution reverted: Parent batch hasn't been committed" {
+
+		// check parent is committing
+		batches, err = r.db.GetBlockBatches(map[string]interface{}{"end_block_hash": batch.ParentHash})
+		if err != nil || len(batches) == 0 {
+			log.Error("Failed to get parent batch from db", "batch_id", id, "parent_hash", batch.ParentHash, "err", err)
+			return
+		}
+		parentBatch := batches[0]
+
+		if parentBatch.RollupStatus >= orm.RollupCommitting {
+			// retry with manual gas estimation
+			gasLimit := estimateCommitBatchGas(len(data), len(layer2Batch.Blocks))
+			hash, err = r.rollupSender.SendTransaction(txID, &r.cfg.RollupContractAddress, big.NewInt(0), data, gasLimit)
+			log.Info("commitBatch tx resent with manual gas estimation ", "id", id, "index", batch.Index, "gasLimit", gasLimit, "hash", hash.String(), "err", err)
+		}
+	}
+
 	if err != nil {
 		if !errors.Is(err, sender.ErrNoAvailableAccount) {
 			log.Error("Failed to send commitBatch tx to layer1 ", "id", id, "index", batch.Index, "err", err)
@@ -285,7 +306,9 @@ func (r *Layer2Relayer) ProcessPendingBatches() {
 }
 
 // ProcessCommittedBatches submit proof to layer 1 rollup contract
-func (r *Layer2Relayer) ProcessCommittedBatches() {
+func (r *Layer2Relayer) ProcessCommittedBatches(wg *sync.WaitGroup) {
+	defer wg.Done()
+
 	// set skipped batches in a single db operation
 	if count, err := r.db.UpdateSkippedBatches(); err != nil {
 		log.Error("UpdateSkippedBatches failed", "err", err)
@@ -371,7 +394,7 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 
 		txID := id + "-finalize"
 		// add suffix `-finalize` to avoid duplication with commit tx in unit tests
-		txHash, err := r.rollupSender.SendTransaction(txID, &r.cfg.RollupContractAddress, big.NewInt(0), data)
+		txHash, err := r.rollupSender.SendTransaction(txID, &r.cfg.RollupContractAddress, big.NewInt(0), data, 0)
 		hash := &txHash
 		if err != nil {
 			if !errors.Is(err, sender.ErrNoAvailableAccount) {
@@ -398,42 +421,30 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 
 // Start the relayer process
 func (r *Layer2Relayer) Start() {
-	loop := func(ctx context.Context, f func()) {
+	log.Info("Starting l2/relayer")
+
+	go func() {
+		// trigger by timer
 		ticker := time.NewTicker(time.Second)
 		defer ticker.Stop()
 
 		for {
 			select {
-			case <-ctx.Done():
-				return
 			case <-ticker.C:
-				f()
+				var wg = sync.WaitGroup{}
+				wg.Add(3)
+				go r.ProcessSavedEvents(&wg)
+				go r.ProcessPendingBatches(&wg)
+				go r.ProcessCommittedBatches(&wg)
+				wg.Wait()
+			case confirmation := <-r.messageCh:
+				r.handleConfirmation(confirmation)
+			case confirmation := <-r.rollupCh:
+				r.handleConfirmation(confirmation)
+			case <-r.stopCh:
+				return
 			}
 		}
-	}
-
-	go func() {
-		ctx, cancel := context.WithCancel(r.ctx)
-
-		go loop(ctx, r.ProcessSavedEvents)
-		go loop(ctx, r.ProcessPendingBatches)
-		go loop(ctx, r.ProcessCommittedBatches)
-
-		go func(ctx context.Context) {
-			for {
-				select {
-				case <-ctx.Done():
-					return
-				case confirmation := <-r.messageCh:
-					r.handleConfirmation(confirmation)
-				case confirmation := <-r.rollupCh:
-					r.handleConfirmation(confirmation)
-				}
-			}
-		}(ctx)
-
-		<-r.stopCh
-		cancel()
 	}()
 }
 
@@ -483,3 +494,12 @@ func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) {
 	}
 	log.Info("transaction confirmed in layer1", "type", transactionType, "confirmation", confirmation)
 }
+
+func estimateCommitBatchGas(callDataLength int, numBlocks int) uint64 {
+	gasLimit := uint64(0)
+	gasLimit += 16 * uint64(callDataLength)   // calldata cost
+	gasLimit += 4*2100 + 3*22100              // fixed cost per batch
+	gasLimit += 4 * 22100 * uint64(numBlocks) // cost per block in batch
+	gasLimit = gasLimit * 12 / 10             // apply multiplier
+	return gasLimit
+}

bridge/l2/relayer_test.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"math/big"
 	"os"
+	"sync"
 	"testing"
 	"time"
 
@@ -94,7 +95,10 @@ func testL2RelayerProcessSaveEvents(t *testing.T) {
 	err = db.UpdateRollupStatus(context.Background(), batchID, orm.RollupFinalized)
 	assert.NoError(t, err)
 
-	relayer.ProcessSavedEvents()
+	var wg = sync.WaitGroup{}
+	wg.Add(1)
+	relayer.ProcessSavedEvents(&wg)
+	wg.Wait()
 
 	msg, err := db.GetL2MessageByNonce(templateL2Message[0].Nonce)
 	assert.NoError(t, err)
@@ -150,7 +154,10 @@ func testL2RelayerProcessPendingBatches(t *testing.T) {
 	// err = db.UpdateRollupStatus(context.Background(), batchID, orm.RollupPending)
 	// assert.NoError(t, err)
 
-	relayer.ProcessPendingBatches()
+	var wg = sync.WaitGroup{}
+	wg.Add(1)
+	relayer.ProcessPendingBatches(&wg)
+	wg.Wait()
 
 	// Check if Rollup Result is changed successfully
 	status, err := db.GetRollupStatus(batchID)
@@ -187,7 +194,10 @@ func testL2RelayerProcessCommittedBatches(t *testing.T) {
 	err = db.UpdateProvingStatus(batchID, orm.ProvingTaskVerified)
 	assert.NoError(t, err)
 
-	relayer.ProcessCommittedBatches()
+	var wg = sync.WaitGroup{}
+	wg.Add(1)
+	relayer.ProcessCommittedBatches(&wg)
+	wg.Wait()
 
 	status, err := db.GetRollupStatus(batchID)
 	assert.NoError(t, err)
@@ -244,7 +254,10 @@ func testL2RelayerSkipBatches(t *testing.T) {
 		createBatch(orm.RollupCommitted, orm.ProvingTaskVerified),
 	}
 
-	relayer.ProcessCommittedBatches()
+	var wg = sync.WaitGroup{}
+	wg.Add(1)
+	relayer.ProcessCommittedBatches(&wg)
+	wg.Wait()
 
 	for _, id := range skipped {
 		status, err := db.GetRollupStatus(id)

bridge/l2/watcher.go

@@ -14,7 +14,6 @@ import (
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/event"
 	"github.com/scroll-tech/go-ethereum/log"
-	"github.com/scroll-tech/go-ethereum/metrics"
 
 	bridge_abi "scroll-tech/bridge/abi"
 	"scroll-tech/bridge/utils"
@@ -25,11 +24,6 @@ import (
 	"scroll-tech/bridge/config"
 )
 
-// Metrics
-var (
-	bridgeL2MsgSyncHeightGauge = metrics.NewRegisteredGauge("bridge/l2/msg/sync/height", nil)
-)
-
 type relayedMessage struct {
 	msgHash      common.Hash
 	txHash       common.Hash
@@ -45,7 +39,7 @@ type WatcherClient struct {
 
 	orm database.OrmFactory
 
-	confirmations    utils.ConfirmationParams
+	confirmations    uint64
 	messengerAddress common.Address
 	messengerABI     *abi.ABI
 
@@ -59,7 +53,7 @@ type WatcherClient struct {
 }
 
 // NewL2WatcherClient take a l2geth instance to generate a l2watcherclient instance
-func NewL2WatcherClient(ctx context.Context, client *ethclient.Client, confirmations utils.ConfirmationParams, bpCfg *config.BatchProposerConfig, messengerAddress common.Address, orm database.OrmFactory) *WatcherClient {
+func NewL2WatcherClient(ctx context.Context, client *ethclient.Client, confirmations uint64, bpCfg *config.BatchProposerConfig, messengerAddress common.Address, orm database.OrmFactory) *WatcherClient {
 	savedHeight, err := orm.GetLayer2LatestWatchedHeight()
 	if err != nil {
 		log.Warn("fetch height from db failed", "err", err)
@@ -82,6 +76,8 @@ func NewL2WatcherClient(ctx context.Context, client *ethclient.Client, confirmat
 
 // Start the Listening process
 func (w *WatcherClient) Start() {
+	log.Info("Starting l2/watcher")
+
 	go func() {
 		if reflect.ValueOf(w.orm).IsNil() {
 			panic("must run L2 watcher with DB")
@@ -100,12 +96,19 @@ func (w *WatcherClient) Start() {
 					return
 
 				case <-ticker.C:
-					number, err := utils.GetLatestConfirmedBlockNumber(ctx, w.Client, w.confirmations)
+					// get current height
+					number, err := w.BlockNumber(ctx)
 					if err != nil {
-						log.Error("failed to get block number", "err", err)
+						log.Error("failed to get_BlockNumber", "err", err)
 						continue
 					}
 
+					if number >= w.confirmations {
+						number = number - w.confirmations
+					} else {
+						number = 0
+					}
+
 					w.tryFetchRunningMissingBlocks(ctx, number)
 				}
 			}
@@ -122,12 +125,19 @@ func (w *WatcherClient) Start() {
 					return
 
 				case <-ticker.C:
-					number, err := utils.GetLatestConfirmedBlockNumber(ctx, w.Client, w.confirmations)
+					// get current height
+					number, err := w.BlockNumber(ctx)
 					if err != nil {
-						log.Error("failed to get block number", "err", err)
+						log.Error("failed to get_BlockNumber", "err", err)
 						continue
 					}
 
+					if number >= w.confirmations {
+						number = number - w.confirmations
+					} else {
+						number = 0
+					}
+
 					w.FetchContractEvent(number)
 				}
 			}
@@ -255,7 +265,6 @@ func (w *WatcherClient) FetchContractEvent(blockHeight uint64) {
 		}
 		if len(logs) == 0 {
 			w.processedMsgHeight = uint64(to)
-			bridgeL2MsgSyncHeightGauge.Update(to)
 			continue
 		}
 		log.Info("received new L2 messages", "fromBlock", from, "toBlock", to, "cnt", len(logs))
@@ -288,7 +297,6 @@ func (w *WatcherClient) FetchContractEvent(blockHeight uint64) {
 		}
 
 		w.processedMsgHeight = uint64(to)
-		bridgeL2MsgSyncHeightGauge.Update(to)
 	}
 }
 

bridge/l2/watcher_test.go

@@ -14,8 +14,6 @@ import (
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/stretchr/testify/assert"
 
-	"scroll-tech/bridge/utils"
-
 	"scroll-tech/bridge/config"
 	"scroll-tech/bridge/mock_bridge"
 	"scroll-tech/bridge/sender"
@@ -38,7 +36,7 @@ func testCreateNewWatcherAndStop(t *testing.T) {
 	defer rc.Stop()
 
 	l1cfg := cfg.L1Config
-	l1cfg.RelayerConfig.SenderConfig.Confirmations = utils.ConfirmationParams{Type: utils.BlockNumberConfirmation, Number: 0}
+	l1cfg.RelayerConfig.SenderConfig.Confirmations = 0
 	newSender, err := sender.NewSender(context.Background(), l1cfg.RelayerConfig.SenderConfig, l1cfg.RelayerConfig.MessageSenderPrivateKeys)
 	assert.NoError(t, err)
 
@@ -46,7 +44,7 @@ func testCreateNewWatcherAndStop(t *testing.T) {
 	numTransactions := 3
 	toAddress := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
 	for i := 0; i < numTransactions; i++ {
-		_, err = newSender.SendTransaction(strconv.Itoa(1000+i), &toAddress, big.NewInt(1000000000), nil)
+		_, err = newSender.SendTransaction(strconv.Itoa(1000+i), &toAddress, big.NewInt(1000000000), nil, 0)
 		assert.NoError(t, err)
 		<-newSender.ConfirmChan()
 	}
@@ -192,8 +190,7 @@ func testFetchMultipleSentMessageInOneBlock(t *testing.T) {
 }
 
 func prepareRelayerClient(l2Cli *ethclient.Client, bpCfg *config.BatchProposerConfig, db database.OrmFactory, contractAddr common.Address) *WatcherClient {
-	confirmations := utils.ConfirmationParams{Type: utils.BlockNumberConfirmation, Number: 0}
-	return NewL2WatcherClient(context.Background(), l2Cli, confirmations, bpCfg, contractAddr, db)
+	return NewL2WatcherClient(context.Background(), l2Cli, 0, bpCfg, contractAddr, db)
 }
 
 func prepareAuth(t *testing.T, l2Cli *ethclient.Client, privateKey *ecdsa.PrivateKey) *bind.TransactOpts {

bridge/sender/sender.go

@@ -20,8 +20,6 @@ import (
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
 
-	"scroll-tech/bridge/utils"
-
 	"scroll-tech/bridge/config"
 )
 
@@ -122,15 +120,6 @@ func NewSender(ctx context.Context, config *config.SenderConfig, privs []*ecdsa.
 		return nil, err
 	}
 
-	var baseFeePerGas uint64
-	if config.TxType == DynamicFeeTxType {
-		if header.BaseFee != nil {
-			baseFeePerGas = header.BaseFee.Uint64()
-		} else {
-			return nil, errors.New("DynamicFeeTxType not supported, header.BaseFee nil")
-		}
-	}
-
 	sender := &Sender{
 		ctx:           ctx,
 		config:        config,
@@ -139,7 +128,7 @@ func NewSender(ctx context.Context, config *config.SenderConfig, privs []*ecdsa.
 		auths:         auths,
 		confirmCh:     make(chan *Confirmation, 128),
 		blockNumber:   header.Number.Uint64(),
-		baseFeePerGas: baseFeePerGas,
+		baseFeePerGas: header.BaseFee.Uint64(),
 		pendingTxs:    sync.Map{},
 		stopCh:        make(chan struct{}),
 	}
@@ -165,18 +154,21 @@ func (s *Sender) NumberOfAccounts() int {
 	return len(s.auths.accounts)
 }
 
-func (s *Sender) getFeeData(auth *bind.TransactOpts, target *common.Address, value *big.Int, data []byte) (*FeeData, error) {
-	// estimate gas limit
-	gasLimit, err := s.client.EstimateGas(s.ctx, geth.CallMsg{From: auth.From, To: target, Value: value, Data: data})
-	if err != nil {
-		return nil, err
+func (s *Sender) getFeeData(auth *bind.TransactOpts, target *common.Address, value *big.Int, data []byte, gasLimit uint64) (*FeeData, error) {
+	if gasLimit == 0 {
+		// estimate gas limit
+		var err error
+		gasLimit, err = s.client.EstimateGas(s.ctx, geth.CallMsg{From: auth.From, To: target, Value: value, Data: data})
+		if err != nil {
+			return nil, err
+		}
+		gasLimit = gasLimit * 15 / 10 // 50% extra gas to void out of gas error
 	}
-	gasLimit = gasLimit * 15 / 10 // 50% extra gas to void out of gas error
+
 	// @todo change it when Scroll enable EIP1559
 	if s.config.TxType != DynamicFeeTxType {
 		// estimate gas price
-		var gasPrice *big.Int
-		gasPrice, err = s.client.SuggestGasPrice(s.ctx)
+		gasPrice, err := s.client.SuggestGasPrice(s.ctx)
 		if err != nil {
 			return nil, err
 		}
@@ -200,7 +192,7 @@ func (s *Sender) getFeeData(auth *bind.TransactOpts, target *common.Address, val
 }
 
 // SendTransaction send a signed L2tL1 transaction.
-func (s *Sender) SendTransaction(ID string, target *common.Address, value *big.Int, data []byte) (hash common.Hash, err error) {
+func (s *Sender) SendTransaction(ID string, target *common.Address, value *big.Int, data []byte, gasLimit uint64) (hash common.Hash, err error) {
 	// We occupy the ID, in case some other threads call with the same ID in the same time
 	if _, loaded := s.pendingTxs.LoadOrStore(ID, nil); loaded {
 		return common.Hash{}, fmt.Errorf("has the repeat tx ID, ID: %s", ID)
@@ -224,9 +216,10 @@ func (s *Sender) SendTransaction(ID string, target *common.Address, value *big.I
 		tx      *types.Transaction
 	)
 	// estimate gas fee
-	if feeData, err = s.getFeeData(auth, target, value, data); err != nil {
+	if feeData, err = s.getFeeData(auth, target, value, data, gasLimit); err != nil {
 		return
 	}
+
 	if tx, err = s.createAndSendTx(auth, feeData, target, value, data, nil); err == nil {
 		// add pending transaction to queue
 		pending := &PendingTransaction{
@@ -363,20 +356,11 @@ func (s *Sender) resubmitTransaction(feeData *FeeData, auth *bind.TransactOpts,
 	return s.createAndSendTx(auth, feeData, tx.To(), tx.Value(), tx.Data(), &nonce)
 }
 
-// checkPendingTransaction checks the confirmation status of pending transactions against the latest confirmed block number.
-// If a transaction hasn't been confirmed after a certain number of blocks, it will be resubmitted with an increased gas price.
-func (s *Sender) checkPendingTransaction(header *types.Header, confirmed uint64) {
+// CheckPendingTransaction Check pending transaction given number of blocks to wait before confirmation.
+func (s *Sender) CheckPendingTransaction(header *types.Header) {
 	number := header.Number.Uint64()
 	atomic.StoreUint64(&s.blockNumber, number)
-
-	if s.config.TxType == DynamicFeeTxType {
-		if header.BaseFee != nil {
-			atomic.StoreUint64(&s.baseFeePerGas, header.BaseFee.Uint64())
-		} else {
-			log.Error("DynamicFeeTxType not supported, header.BaseFee nil")
-		}
-	}
-
+	atomic.StoreUint64(&s.baseFeePerGas, header.BaseFee.Uint64())
 	s.pendingTxs.Range(func(key, value interface{}) bool {
 		// ignore empty id, since we use empty id to occupy pending task
 		if value == nil || reflect.ValueOf(value).IsNil() {
@@ -386,7 +370,7 @@ func (s *Sender) checkPendingTransaction(header *types.Header, confirmed uint64)
 		pending := value.(*PendingTransaction)
 		receipt, err := s.client.TransactionReceipt(s.ctx, pending.tx.Hash())
 		if (err == nil) && (receipt != nil) {
-			if receipt.BlockNumber.Uint64() <= confirmed {
+			if number >= receipt.BlockNumber.Uint64()+s.config.Confirmations {
 				s.pendingTxs.Delete(key)
 				// send confirm message
 				s.confirmCh <- &Confirmation{
@@ -460,14 +444,7 @@ func (s *Sender) loop(ctx context.Context) {
 				log.Error("failed to get latest head", "err", err)
 				continue
 			}
-
-			confirmed, err := utils.GetLatestConfirmedBlockNumber(s.ctx, s.client, s.config.Confirmations)
-			if err != nil {
-				log.Error("failed to get latest confirmed block number", "err", err)
-				continue
-			}
-
-			s.checkPendingTransaction(header, confirmed)
+			s.CheckPendingTransaction(header)
 		case <-checkBalanceTicker.C:
 			// Check and set balance.
 			_ = s.auths.checkAndSetBalances(ctx)

bridge/sender/sender_test.go

@@ -18,8 +18,6 @@ import (
 
 	"scroll-tech/common/docker"
 
-	"scroll-tech/bridge/utils"
-
 	"scroll-tech/bridge/config"
 	"scroll-tech/bridge/sender"
 )
@@ -70,7 +68,7 @@ func testBatchSender(t *testing.T, batchSize int) {
 	}
 
 	senderCfg := cfg.L1Config.RelayerConfig.SenderConfig
-	senderCfg.Confirmations = utils.ConfirmationParams{Type: utils.BlockNumberConfirmation, Number: 0}
+	senderCfg.Confirmations = 0
 	newSender, err := sender.NewSender(context.Background(), senderCfg, privateKeys)
 	if err != nil {
 		t.Fatal(err)
@@ -89,7 +87,7 @@ func testBatchSender(t *testing.T, batchSize int) {
 			for i := 0; i < TXBatch; i++ {
 				toAddr := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
 				id := strconv.Itoa(i + index*1000)
-				_, err := newSender.SendTransaction(id, &toAddr, big.NewInt(1), nil)
+				_, err := newSender.SendTransaction(id, &toAddr, big.NewInt(1), nil, 0)
 				if errors.Is(err, sender.ErrNoAvailableAccount) {
 					<-time.After(time.Second)
 					continue

bridge/tests/bridge_test.go

@@ -4,11 +4,8 @@ import (
 	"context"
 	"crypto/ecdsa"
 	"math/big"
-	"testing"
-
 	"scroll-tech/common/docker"
-
-	"scroll-tech/bridge/utils"
+	"testing"
 
 	"scroll-tech/bridge/config"
 	"scroll-tech/bridge/mock_bridge"
@@ -66,10 +63,10 @@ func setupEnv(t *testing.T) {
 	// Load config.
 	cfg, err = config.NewConfig("../config.json")
 	assert.NoError(t, err)
-	cfg.L1Config.Confirmations = utils.ConfirmationParams{Type: utils.BlockNumberConfirmation, Number: 0}
+	cfg.L1Config.Confirmations = 0
 	cfg.L1Config.RelayerConfig.MessageSenderPrivateKeys = []*ecdsa.PrivateKey{messagePrivateKey}
 	cfg.L1Config.RelayerConfig.RollupSenderPrivateKeys = []*ecdsa.PrivateKey{rollupPrivateKey}
-	cfg.L2Config.Confirmations = utils.ConfirmationParams{Type: utils.BlockNumberConfirmation, Number: 0}
+	cfg.L2Config.Confirmations = 0
 	cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys = []*ecdsa.PrivateKey{messagePrivateKey}
 	cfg.L2Config.RelayerConfig.RollupSenderPrivateKeys = []*ecdsa.PrivateKey{rollupPrivateKey}
 

bridge/tests/l2_message_relay_test.go

@@ -6,10 +6,9 @@ import (
 	"scroll-tech/database"
 	"scroll-tech/database/migrate"
 	"scroll-tech/database/orm"
+	"sync"
 	"testing"
 
-	"scroll-tech/bridge/utils"
-
 	"scroll-tech/bridge/l1"
 	"scroll-tech/bridge/l2"
 
@@ -26,6 +25,9 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	assert.NoError(t, migrate.ResetDB(db.GetDB().DB))
 	defer db.Close()
 
+	var wg sync.WaitGroup
+	wg.Add(3)
+
 	prepareContracts(t)
 
 	// Create L2Relayer
@@ -35,12 +37,11 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	defer l2Relayer.Stop()
 
 	// Create L2Watcher
-	confirmations := utils.ConfirmationParams{Type: utils.BlockNumberConfirmation, Number: 0}
-	l2Watcher := l2.NewL2WatcherClient(context.Background(), l2Client, confirmations, l2Cfg.BatchProposerConfig, l2Cfg.L2MessengerAddress, db)
+	l2Watcher := l2.NewL2WatcherClient(context.Background(), l2Client, 0, l2Cfg.BatchProposerConfig, l2Cfg.L2MessengerAddress, db)
 
 	// Create L1Watcher
 	l1Cfg := cfg.L1Config
-	l1Watcher := l1.NewWatcher(context.Background(), l1Client, 0, confirmations, l1Cfg.L1MessengerAddress, l1Cfg.RollupContractAddress, db)
+	l1Watcher := l1.NewWatcher(context.Background(), l1Client, 0, 0, l1Cfg.L1MessengerAddress, l1Cfg.RollupContractAddress, db)
 
 	// send message through l2 messenger contract
 	nonce, err := l2MessengerInstance.MessageNonce(&bind.CallOpts{})
@@ -110,7 +111,7 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	assert.NoError(t, err)
 
 	// process pending batch and check status
-	l2Relayer.ProcessPendingBatches()
+	l2Relayer.ProcessPendingBatches(&wg)
 	status, err := db.GetRollupStatus(batchID)
 	assert.NoError(t, err)
 	assert.Equal(t, orm.RollupCommitting, status)
@@ -131,7 +132,7 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	assert.Equal(t, orm.RollupCommitted, status)
 
 	// process committed batch and check status
-	l2Relayer.ProcessCommittedBatches()
+	l2Relayer.ProcessCommittedBatches(&wg)
 	status, err = db.GetRollupStatus(batchID)
 	assert.NoError(t, err)
 	assert.Equal(t, orm.RollupFinalizing, status)
@@ -152,7 +153,7 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	assert.Equal(t, orm.RollupFinalized, status)
 
 	// process l2 messages
-	l2Relayer.ProcessSavedEvents()
+	l2Relayer.ProcessSavedEvents(&wg)
 	msg, err = db.GetL2MessageByNonce(nonce.Uint64())
 	assert.NoError(t, err)
 	assert.Equal(t, msg.Status, orm.MsgSubmitted)

bridge/tests/rollup_test.go

@@ -6,6 +6,7 @@ import (
 	"scroll-tech/database"
 	"scroll-tech/database/migrate"
 	"scroll-tech/database/orm"
+	"sync"
 	"testing"
 
 	"scroll-tech/bridge/l1"
@@ -34,7 +35,7 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 
 	// Create L1Watcher
 	l1Cfg := cfg.L1Config
-	l1Watcher := l1.NewWatcher(context.Background(), l1Client, 0, l1Cfg.Confirmations, l1Cfg.L1MessengerAddress, l1Cfg.RollupContractAddress, db)
+	l1Watcher := l1.NewWatcher(context.Background(), l1Client, 0, 0, l1Cfg.L1MessengerAddress, l1Cfg.RollupContractAddress, db)
 
 	// add some blocks to db
 	var traces []*types.BlockTrace
@@ -78,8 +79,11 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 	err = dbTx.Commit()
 	assert.NoError(t, err)
 
+	var wg = sync.WaitGroup{}
+	wg.Add(1)
 	// process pending batch and check status
-	l2Relayer.ProcessPendingBatches()
+	l2Relayer.ProcessPendingBatches(&wg)
+	wg.Wait()
 
 	status, err := db.GetRollupStatus(batchID)
 	assert.NoError(t, err)
@@ -108,8 +112,10 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 	err = db.UpdateProvingStatus(batchID, orm.ProvingTaskVerified)
 	assert.NoError(t, err)
 
+	wg.Add(1)
 	// process committed batch and check status
-	l2Relayer.ProcessCommittedBatches()
+	l2Relayer.ProcessCommittedBatches(&wg)
+	wg.Wait()
 
 	status, err = db.GetRollupStatus(batchID)
 	assert.NoError(t, err)

bridge/utils/confirmation.go

@@ -1,144 +0,0 @@
-package utils
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"math/big"
-	"regexp"
-	"strconv"
-
-	"github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/scroll-tech/go-ethereum/rpc"
-)
-
-var pattern = regexp.MustCompile(`^number=(\d{1,3})$`)
-
-// ConfirmationType defines the type of confirmation logic used by the watcher or the relayer.
-type ConfirmationType int
-
-const (
-	// FinalizedTagConfirmation means that we consider a block confirmed based on the "finalized" Ethereum tag.
-	FinalizedTagConfirmation ConfirmationType = iota
-
-	// SafeTagConfirmation means that we consider a block confirmed based on the "safe" Ethereum tag.
-	SafeTagConfirmation
-
-	// BlockNumberConfirmation means that we consider a block confirmed after waiting for a certain number of blocks.
-	BlockNumberConfirmation
-)
-
-// ConfirmationParams defines the confirmation configuration parameters used by the watcher or the relayer.
-type ConfirmationParams struct {
-	// Type shows whether we confirm by specific block tags or by block number.
-	Type ConfirmationType
-
-	// Number specifies the number of blocks after which a block is considered confirmed.
-	// This field can only be used when Type is set to Number.
-	Number uint64
-}
-
-// UnmarshalJSON implements custom JSON decoding from JSON string to ConfirmationParams.
-func (c *ConfirmationParams) UnmarshalJSON(input []byte) error {
-	var raw string
-
-	if err := json.Unmarshal(input, &raw); err != nil {
-		return err
-	}
-
-	if raw == "finalized" {
-		c.Type = FinalizedTagConfirmation
-		return nil
-	}
-
-	if raw == "safe" {
-		c.Type = SafeTagConfirmation
-		return nil
-	}
-
-	matches := pattern.FindStringSubmatch(raw)
-	if len(matches) != 2 {
-		return fmt.Errorf("invalid configuration value for confirmations: %v", raw)
-	}
-
-	number, err := strconv.Atoi(matches[1])
-	if err != nil {
-		return fmt.Errorf("invalid configuration value for confirmations: %v", raw)
-	}
-
-	c.Type = BlockNumberConfirmation
-	c.Number = uint64(number)
-	return nil
-}
-
-// MarshalJSON implements custom JSON encoding from ConfirmationParams to JSON string.
-func (c *ConfirmationParams) MarshalJSON() ([]byte, error) {
-	var raw string
-
-	switch c.Type {
-	case FinalizedTagConfirmation:
-		raw = "finalized"
-
-	case SafeTagConfirmation:
-		raw = "safe"
-
-	case BlockNumberConfirmation:
-		raw = fmt.Sprintf("number=%d", c.Number)
-
-	default:
-		return nil, fmt.Errorf("unable to marshal unknown confirmation type: %v", c.Type)
-	}
-
-	return json.Marshal(&raw)
-}
-
-type ethClient interface {
-	BlockNumber(ctx context.Context) (uint64, error)
-	HeaderByNumber(ctx context.Context, number *big.Int) (*types.Header, error)
-}
-
-// GetLatestConfirmedBlockNumber queries the RPC provider and returns the latest
-// confirmed block number according to the provided confirmation parameters.
-func GetLatestConfirmedBlockNumber(ctx context.Context, client ethClient, confirmations ConfirmationParams) (uint64, error) {
-	switch confirmations.Type {
-	// use eth_getBlockByNumber and a tag
-	case FinalizedTagConfirmation:
-	case SafeTagConfirmation:
-		var tag *big.Int
-
-		if confirmations.Type == FinalizedTagConfirmation {
-			tag = big.NewInt(int64(rpc.FinalizedBlockNumber))
-		} else {
-			tag = big.NewInt(int64(rpc.SafeBlockNumber))
-		}
-
-		header, err := client.HeaderByNumber(ctx, tag)
-		if err != nil {
-			return 0, err
-		}
-
-		if !header.Number.IsUint64() {
-			return 0, fmt.Errorf("received invalid block number: %v", header.Number)
-		}
-
-		return header.Number.Uint64(), nil
-
-	// use eth_blockNumber
-	case BlockNumberConfirmation:
-		number, err := client.BlockNumber(ctx)
-		if err != nil {
-			return 0, err
-		}
-
-		if number >= confirmations.Number {
-			return number - confirmations.Number, nil
-		}
-
-		return 0, nil
-
-	default:
-		return 0, fmt.Errorf("unknown confirmation type: %v", confirmations.Type)
-	}
-
-	return 0, nil
-}

bridge/utils/confirmation_test.go

@@ -1,100 +0,0 @@
-package utils_test
-
-import (
-	"context"
-	"encoding/json"
-	"math/big"
-	"strings"
-	"testing"
-
-	"scroll-tech/bridge/utils"
-
-	"github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestUnmarshalJSON(t *testing.T) {
-	var params utils.ConfirmationParams
-
-	decoder := json.NewDecoder(strings.NewReader(`"finalized"`))
-	decoder.DisallowUnknownFields()
-	err := decoder.Decode(&params)
-	assert.Nil(t, err)
-	assert.Equal(t, utils.FinalizedTagConfirmation, params.Type)
-
-	decoder = json.NewDecoder(strings.NewReader(`"safe"`))
-	decoder.DisallowUnknownFields()
-	err = decoder.Decode(&params)
-	assert.Nil(t, err)
-	assert.Equal(t, utils.SafeTagConfirmation, params.Type)
-
-	decoder = json.NewDecoder(strings.NewReader(`"number=6"`))
-	decoder.DisallowUnknownFields()
-	err = decoder.Decode(&params)
-	assert.Nil(t, err)
-	assert.Equal(t, utils.BlockNumberConfirmation, params.Type)
-	assert.Equal(t, uint64(6), params.Number)
-
-	decoder = json.NewDecoder(strings.NewReader(`"number=999"`))
-	decoder.DisallowUnknownFields()
-	err = decoder.Decode(&params)
-	assert.Nil(t, err)
-	assert.Equal(t, utils.BlockNumberConfirmation, params.Type)
-	assert.Equal(t, uint64(999), params.Number)
-
-	decoder = json.NewDecoder(strings.NewReader(`"number=1000"`))
-	decoder.DisallowUnknownFields()
-	err = decoder.Decode(&params)
-	assert.NotNil(t, err)
-
-	decoder = json.NewDecoder(strings.NewReader(`"number=6x"`))
-	decoder.DisallowUnknownFields()
-	err = decoder.Decode(&params)
-	assert.NotNil(t, err)
-
-	decoder = json.NewDecoder(strings.NewReader(`"latest"`))
-	decoder.DisallowUnknownFields()
-	err = decoder.Decode(&params)
-	assert.NotNil(t, err)
-}
-
-func TestMarshalJSON(t *testing.T) {
-	bytes, err := json.Marshal(&utils.ConfirmationParams{Type: utils.FinalizedTagConfirmation, Number: 6})
-	assert.Nil(t, err)
-	assert.Equal(t, `"finalized"`, string(bytes))
-
-	bytes, err = json.Marshal(&utils.ConfirmationParams{Type: utils.SafeTagConfirmation, Number: 6})
-	assert.Nil(t, err)
-	assert.Equal(t, `"safe"`, string(bytes))
-
-	bytes, err = json.Marshal(&utils.ConfirmationParams{Type: utils.BlockNumberConfirmation, Number: 6})
-	assert.Nil(t, err)
-	assert.Equal(t, `"number=6"`, string(bytes))
-}
-
-type MockEthClient struct {
-	val uint64
-}
-
-func (e MockEthClient) BlockNumber(ctx context.Context) (uint64, error) {
-	return e.val, nil
-}
-
-func (e MockEthClient) HeaderByNumber(ctx context.Context, number *big.Int) (*types.Header, error) {
-	return &types.Header{Number: new(big.Int).SetUint64(e.val)}, nil
-}
-
-func TestGetLatestConfirmedBlockNumber(t *testing.T) {
-	ctx := context.Background()
-	client := MockEthClient{}
-
-	client.val = 5
-	confirmed, err := utils.GetLatestConfirmedBlockNumber(ctx, &client, utils.ConfirmationParams{Type: utils.BlockNumberConfirmation, Number: 6})
-	assert.Nil(t, err)
-	assert.Equal(t, uint64(0), confirmed)
-
-	client.val = 7
-	confirmed, err = utils.GetLatestConfirmedBlockNumber(ctx, &client, utils.ConfirmationParams{Type: utils.BlockNumberConfirmation, Number: 6})
-	assert.Nil(t, err)
-	assert.Equal(t, uint64(1), confirmed)
-}

build/dockerfiles/coordinator.Dockerfile

@@ -32,15 +32,12 @@ RUN go mod download -x
 FROM base as builder
 COPY . .
 RUN cp -r ./common/libzkp/interface ./coordinator/verifier/lib
-COPY --from=zkp-builder /app/target/release/libzkp.so ./coordinator/verifier/lib/
-RUN cd ./coordinator && go build -v -p 4 -o /bin/coordinator ./cmd && mv verifier/lib /bin/
+COPY --from=zkp-builder /app/target/release/libzkp.a ./coordinator/verifier/lib/
+RUN cd ./coordinator && go build -v -p 4 -o /bin/coordinator ./cmd
 
 # Pull coordinator into a second stage deploy alpine container
 FROM ubuntu:20.04
 
-RUN mkdir -p /src/coordinator/verifier/lib
-COPY --from=builder /bin/lib /src/coordinator/verifier/lib
 COPY --from=builder /bin/coordinator /bin/
 
-
 ENTRYPOINT ["/bin/coordinator"]

build/dockerfiles/intermediate/Makefile

@@ -1,6 +1,6 @@
 GO_VERSION := 1.18
 PYTHON_VERSION := 3.10
-RUST_VERSION := nightly-2022-12-10
+RUST_VERSION := nightly-2022-08-23
 
 .PHONY: all go-alpine-builder rust-builder rust-alpine-builder go-rust-alpine-builder go-rust-builder py-runner
 

build/dockerfiles/intermediate/go-alpine-builder.Dockerfile

@@ -4,4 +4,4 @@ FROM golang:1.18-alpine
 
 # RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
 
-RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates openssl-dev
+RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates

build/dockerfiles/intermediate/go-rust-alpine-builder.Dockerfile

@@ -1,8 +1,8 @@
 FROM golang:1.18-alpine
 ARG CARGO_CHEF_TAG=0.1.41
-ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-12-10
+ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-08-23
 
-RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates openssl-dev
+RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates
 
 # RUN apk add --no-cache libc6-compat
 # RUN apk add --no-cache gcompat

build/dockerfiles/intermediate/go-rust-builder.Dockerfile

@@ -14,7 +14,7 @@ ENV PATH="/root/.cargo/bin:${PATH}"
 ENV CARGO_HOME=/root/.cargo
 
 # Add Toolchain
-RUN rustup toolchain install nightly-2022-12-10
+RUN rustup toolchain install nightly-2022-08-23
 
 # TODO: make this ARG
 ENV CARGO_CHEF_TAG=0.1.41

build/dockerfiles/intermediate/rust-alpine-builder.Dockerfile

@@ -1,11 +1,10 @@
 ARG ALPINE_VERSION=3.15
 FROM alpine:${ALPINE_VERSION}
 ARG CARGO_CHEF_TAG=0.1.41
-ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-12-10
+ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-08-23
 
 RUN apk add --no-cache \
         ca-certificates \
-        openssl-dev \
         gcc \
         git \
         musl-dev

build/dockerfiles/intermediate/rust-builder.Dockerfile

@@ -13,4 +13,4 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
 # Add Toolchain
-RUN rustup toolchain install nightly-2022-12-10
+RUN rustup toolchain install nightly-2022-08-23

common/docker/l2geth/Dockerfile

@@ -1,4 +1,4 @@
-FROM scrolltech/l2geth:prealpha-v5.1
+FROM scrolltech/l2geth:prealpha-v4.2
 
 RUN mkdir -p /l2geth/keystore
 

common/libzkp/impl/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]
-crate-type = ["dylib"]
+crate-type = ["staticlib"]
 
 [dependencies]
 zkevm = { git = "https://github.com/scroll-tech/scroll-zkevm", branch="fix/mpt_limit" }

common/metrics/metrics.go

@@ -1,53 +0,0 @@
-package metrics
-
-import (
-	"context"
-	"net"
-	"net/http"
-	"strconv"
-
-	"github.com/scroll-tech/go-ethereum/log"
-	"github.com/scroll-tech/go-ethereum/metrics"
-	"github.com/scroll-tech/go-ethereum/metrics/prometheus"
-	"github.com/scroll-tech/go-ethereum/rpc"
-
-	"github.com/urfave/cli/v2"
-
-	"scroll-tech/common/utils"
-)
-
-// Serve starts the metrics server on the given address, will be closed when the given
-// context is canceled.
-func Serve(ctx context.Context, c *cli.Context) {
-	if !c.Bool(utils.MetricsEnabled.Name) {
-		return
-	}
-
-	address := net.JoinHostPort(
-		c.String(utils.MetricsAddr.Name),
-		strconv.Itoa(c.Int(utils.MetricsPort.Name)),
-	)
-
-	server := &http.Server{
-		Addr:         address,
-		Handler:      prometheus.Handler(metrics.DefaultRegistry),
-		ReadTimeout:  rpc.DefaultHTTPTimeouts.ReadTimeout,
-		WriteTimeout: rpc.DefaultHTTPTimeouts.WriteTimeout,
-		IdleTimeout:  rpc.DefaultHTTPTimeouts.IdleTimeout,
-	}
-
-	go func() {
-		<-ctx.Done()
-		if err := server.Close(); err != nil {
-			log.Error("Failed to close metrics server", "error", err)
-		}
-	}()
-
-	log.Info("Starting metrics server", "address", address)
-
-	go func() {
-		if err := server.ListenAndServe(); err != nil {
-			log.Error("start metrics server error", "error", err)
-		}
-	}()
-}

common/utils/flags.go

@@ -12,9 +12,6 @@ var (
 		&LogFileFlag,
 		&LogJSONFormat,
 		&LogDebugFlag,
-		&MetricsEnabled,
-		&MetricsAddr,
-		&MetricsPort,
 	}
 	// ConfigFileFlag load json type config file.
 	ConfigFileFlag = cli.StringFlag{
@@ -45,25 +42,4 @@ var (
 		Name:  "log.debug",
 		Usage: "Prepends log messages with call-site location (file and line number)",
 	}
-	// MetricsEnabled enable metrics collection and reporting
-	MetricsEnabled = cli.BoolFlag{
-		Name:     "metrics",
-		Usage:    "Enable metrics collection and reporting",
-		Category: "METRICS",
-		Value:    false,
-	}
-	// MetricsAddr is listening address of Metrics reporting server
-	MetricsAddr = cli.StringFlag{
-		Name:     "metrics.addr",
-		Usage:    "Metrics reporting server listening address",
-		Category: "METRICS",
-		Value:    "0.0.0.0",
-	}
-	// MetricsPort is listening port of Metrics reporting server
-	MetricsPort = cli.IntFlag{
-		Name:     "metrics.port",
-		Usage:    "Metrics reporting server listening port",
-		Category: "METRICS",
-		Value:    6060,
-	}
 )

common/version/version.go

@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "prealpha-v12.0"
+var tag = "prealpha-v11.14"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

contracts/scripts/foundry/DeployL2BridgeContracts.s.sol

@@ -13,7 +13,6 @@ import { L2ERC721Gateway } from "../../src/L2/gateways/L2ERC721Gateway.sol";
 import { L2GatewayRouter } from "../../src/L2/gateways/L2GatewayRouter.sol";
 import { L2ScrollMessenger } from "../../src/L2/L2ScrollMessenger.sol";
 import { L2StandardERC20Gateway } from "../../src/L2/gateways/L2StandardERC20Gateway.sol";
-import { Whitelist } from "../../src/L2/predeploys/Whitelist.sol";
 import { ScrollStandardERC20 } from "../../src/libraries/token/ScrollStandardERC20.sol";
 import { ScrollStandardERC20Factory } from "../../src/libraries/token/ScrollStandardERC20Factory.sol";
 
@@ -32,7 +31,6 @@ contract DeployL2BridgeContracts is Script {
         deployL2CustomERC20Gateway();
         deployL2ERC721Gateway();
         deployL2ERC1155Gateway();
-        deployL2Whitelist();
 
         vm.stopBroadcast();
     }
@@ -98,13 +96,6 @@ contract DeployL2BridgeContracts is Script {
         logAddress("L2_ERC1155_GATEWAY_PROXY_ADDR", address(proxy));
     }
 
-    function deployL2Whitelist() internal {
-        address owner = vm.addr(L2_DEPLOYER_PRIVATE_KEY);
-        Whitelist whitelist = new Whitelist(owner);
-
-        logAddress("L2_WHITELIST_ADDR", address(whitelist));
-    }
-
     function logAddress(string memory name, address addr) internal {
         console.log(string(abi.encodePacked(name, "=", vm.toString(address(addr)))));
     }

contracts/scripts/foundry/InitializeL2BridgeContracts.s.sol

@@ -3,13 +3,11 @@ pragma solidity ^0.8.10;
 
 import { Script } from "forge-std/Script.sol";
 
-import { L2ScrollMessenger } from "../../src/L2/L2ScrollMessenger.sol";
 import { L2CustomERC20Gateway } from "../../src/L2/gateways/L2CustomERC20Gateway.sol";
 import { L2ERC1155Gateway } from "../../src/L2/gateways/L2ERC1155Gateway.sol";
 import { L2ERC721Gateway } from "../../src/L2/gateways/L2ERC721Gateway.sol";
 import { L2GatewayRouter } from "../../src/L2/gateways/L2GatewayRouter.sol";
 import { L2StandardERC20Gateway } from "../../src/L2/gateways/L2StandardERC20Gateway.sol";
-import { Whitelist } from "../../src/L2/predeploys/Whitelist.sol";
 import { ScrollStandardERC20Factory } from "../../src/libraries/token/ScrollStandardERC20Factory.sol";
 
 contract InitializeL2BridgeContracts is Script {
@@ -28,7 +26,6 @@ contract InitializeL2BridgeContracts is Script {
     address L2_CUSTOM_ERC20_GATEWAY_PROXY_ADDR = vm.envAddress("L2_CUSTOM_ERC20_GATEWAY_PROXY_ADDR");
     address L2_ERC721_GATEWAY_PROXY_ADDR = vm.envAddress("L2_ERC721_GATEWAY_PROXY_ADDR");
     address L2_ERC1155_GATEWAY_PROXY_ADDR = vm.envAddress("L2_ERC1155_GATEWAY_PROXY_ADDR");
-    address L2_WHITELIST_ADDR = vm.envAddress("L2_WHITELIST_ADDR");
 
     function run() external {
         vm.startBroadcast(deployerPrivateKey);
@@ -72,20 +69,6 @@ contract InitializeL2BridgeContracts is Script {
             L2_SCROLL_MESSENGER_ADDR
         );
 
-        // whitelist contracts which can call sendMessage
-        {
-            address[] memory gateways = new address[](5);
-            gateways[0] = L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR;
-            gateways[1] = L2_GATEWAY_ROUTER_PROXY_ADDR;
-            gateways[2] = L2_CUSTOM_ERC20_GATEWAY_PROXY_ADDR;
-            gateways[3] = L2_ERC1155_GATEWAY_PROXY_ADDR;
-            gateways[4] = L2_ERC721_GATEWAY_PROXY_ADDR;
-            Whitelist(L2_WHITELIST_ADDR).updateWhitelistStatus(gateways, true);
-        }
-
-        // update whitelist contract for messenger
-        L2ScrollMessenger(payable(L2_SCROLL_MESSENGER_ADDR)).updateWhitelist(L2_WHITELIST_ADDR);
-
         vm.stopBroadcast();
     }
 }

contracts/src/L2/L2ScrollMessenger.sol

@@ -86,10 +86,12 @@ contract L2ScrollMessenger is ScrollMessengerBase, OwnableBase, IL2ScrollMesseng
     uint256 _deadline,
     uint256 _nonce,
     bytes memory _message
-  ) external override onlyWhitelistedSender(msg.sender) {
+  ) external override {
     // anti reentrance
     require(xDomainMessageSender == ScrollConstants.DEFAULT_XDOMAIN_MESSAGE_SENDER, "already in execution");
 
+    // @todo only privileged accounts can call
+
     // solhint-disable-next-line not-rely-on-time
     require(_deadline >= block.timestamp, "Message expired");
 

coordinator/Makefile

@@ -14,7 +14,7 @@ test:
 	go test -v -race -coverprofile=coverage.txt -covermode=atomic -p 1 $(PWD)/...
 
 libzkp:
-	cd ../common/libzkp/impl && cargo build --release && cp ./target/release/libzkp.so ../interface/
+	cd ../common/libzkp/impl && cargo build --release && cp ./target/release/libzkp.a ../interface/
 	rm -rf ./verifier/lib && cp -r ../common/libzkp/interface ./verifier/lib
 
 coordinator: libzkp ## Builds the Coordinator instance.

coordinator/config.json

@@ -1,6 +1,7 @@
 {
   "roller_manager_config": {
     "rollers_per_session": 1,
+    "verifier_endpoint": "/tmp/verifier.sock",
     "collection_time": 180,
     "token_time_to_live": 60,
     "verifier": {

coordinator/verifier/verifier.go

@@ -3,8 +3,8 @@
 package verifier
 
 /*
-#cgo LDFLAGS: ${SRCDIR}/lib/libzkp.so -lm -ldl
-#cgo gpu LDFLAGS: ${SRCDIR}/lib/libzkp.so -lm -ldl -lgmp -lstdc++ -lprocps -L/usr/local/cuda/lib64/ -lcudart
+#cgo LDFLAGS: ${SRCDIR}/lib/libzkp.a -lm -ldl
+#cgo gpu LDFLAGS: ${SRCDIR}/lib/libzkp.a -lm -ldl -lgmp -lstdc++ -lprocps -L/usr/local/cuda/lib64/ -lcudart
 #include <stdlib.h>
 #include "./lib/libzkp.h"
 */

coordinator/verifier/verifier_test.go

@@ -16,23 +16,17 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-const (
-	paramsPath = "../assets/test_params"
-	aggVkPath  = "../assets/agg_vk"
-	proofPath  = "../assets/agg_proof"
-)
-
 func TestFFI(t *testing.T) {
 	as := assert.New(t)
 	cfg := &config.VerifierConfig{
 		MockMode:   false,
-		ParamsPath: paramsPath,
-		AggVkPath:  aggVkPath,
+		ParamsPath: "../assets/test_params",
+		AggVkPath:  "../assets/agg_vk",
 	}
 	v, err := verifier.NewVerifier(cfg)
 	as.NoError(err)
 
-	f, err := os.Open(proofPath)
+	f, err := os.Open("../assets/agg_proof")
 	as.NoError(err)
 	byt, err := io.ReadAll(f)
 	as.NoError(err)

roller/Makefile

@@ -10,7 +10,7 @@ else
 endif
 
 libzkp:
-	cd ../common/libzkp/impl && cargo build --release && cp ./target/release/libzkp.so ../interface/
+	cd ../common/libzkp/impl && cargo build --release && cp ./target/release/libzkp.a ../interface/
 	rm -rf ./prover/lib && cp -r ../common/libzkp/interface ./prover/lib
 
 roller: libzkp ## Build the Roller instance.

roller/assets/traces/01.json

@@ -1,41 +1,200 @@
 {
-  "coinbase": {
-    "address": "0x7157f3b0aee00adbe3d8b6609eda9480e141065a",
-    "nonce": 0,
-    "balance": "0x0",
-    "codeHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-  },
-  "header": {
-    "parentHash": "0xde613062d01fdfb97065e60ac4bc0da9118e80c1e394007b68dafa542e043d53",
-    "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-    "miner": "0x0000000000000000000000000000000000000000",
-    "stateRoot": "0x00b5b217bbb123cc3ba125a02c3e85168ef125844d17f5190d0dfca3c847f5e8",
-    "transactionsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-    "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-    "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "difficulty": "0x1",
-    "number": "0x1",
-    "gasLimit": "0x37f94131",
-    "gasUsed": "0x0",
-    "timestamp": "0x63808894",
-    "extraData": "0xd983010a0d846765746889676f312e31372e3133856c696e75780000000000002e12fa7e17d64b31990ba42a4c726fc620c51ff9be07c1e151ee909f9a43329d0853a8902b60e94da9f3979fb91dec57022b8962c146e3c265c6b4eecc282d0600",
-    "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "nonce": "0x0000000000000000",
-    "baseFeePerGas": "0x342770c0",
-    "hash": "0xfa0235b7e860c08d5156a18c1f4d6fd89eed8202de7f3043bd10d46a4bb3f8c4"
-  },
-  "transactions": [],
-  "storageTrace": {
-    "rootBefore": "0x00b5b217bbb123cc3ba125a02c3e85168ef125844d17f5190d0dfca3c847f5e8",
-    "rootAfter": "0x00b5b217bbb123cc3ba125a02c3e85168ef125844d17f5190d0dfca3c847f5e8",
-    "proofs": {
-      "0x7157F3b0AEe00adBe3D8B6609edA9480E141065a": [
-        "0x0023817270d692108d3f2583c4fdddb93f05840da992233af555384642d2d480e02c05b065c0e03cc9ea9c6f16cd37395379d47225f9adfe626a288ed94807bd46",
-        "0x0012f68259c5658fa795d5efebf43f2cdda388eb1f15db83e305743c458fce44100b0c36cf61ec8e8522dcac76c3418bff6e2cb91215e5c61fbc0ec735aff79a3a",
-        "0x0124307d227b4219bed858923ccd524f3a235905a749e4372e26522bc8a4f58e0a04040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000021e19e0c9bab2400000c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470000000000000000000000000000000000000000000000000000000000000000020222214dcc294b72e40d2f37111a1f966aaefdbdd000000000000000000000000",
-        "0x5448495320495320534f4d45204d4147494320425954455320464f5220534d54206d3172525867503278704449"
-      ]
-    }
-  },
-  "executionResults": []
+  "jsonrpc": "2.0",
+  "id": 1,
+  "result": {
+    "blockTrace": {
+      "number": "0x1",
+      "hash": "0x5366b507fd5ec49c1090655d6858835823b179b1b2773a45654687e0db4ec627",
+      "gasLimit": 939082033,
+      "difficulty": "0x2",
+      "baseFee": "0x342770c0",
+      "coinbase": {
+        "address": "0x4cb1ab63af5d8931ce09673ebd8ae2ce16fd6571",
+        "nonce": 0,
+        "balance": "0x3635c9adc5dea00000",
+        "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
+      },
+      "time": 1663875646,
+      "transactions": []
+    },
+    "storageTrace": {
+      "rootBefore": "0x1358bd270133c112737e834e13d3fe6381d0cf9aea7afecb46d19188d078c451",
+      "rootAfter": "0x1358bd270133c112737e834e13d3fe6381d0cf9aea7afecb46d19188d078c451",
+      "proofs": {
+        "0x4cb1aB63aF5D8931Ce09673EbD8ae2ce16fD6571": [
+          "0x001a4f0d7d9eb169b9a45c37b1a2995ef5d15849e7a582cb935ad18ed10363bfd91bdb4da71c0bc7067be54de6667dc1a8e2e4032141815a5fee2ea58014657014",
+          "0x0129bdbea092f4f7e6de593fd1a16ddb50b1c2a6297d4ae141a60f8da631e4817504040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003635c9adc5dea00000c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a4700000000000000000000000000000000000000000000000000000000000000000204cb1ab63af5d8931ce09673ebd8ae2ce16fd6571000000000000000000000000",
+          "0x5448495320495320534f4d45204d4147494320425954455320464f5220534d54206d3172525867503278704449"
+        ]
+      }
+    },
+    "executionResults": [],
+    "mptwitness": [
+      {
+        "address": "0x4cb1ab63af5d8931ce09673ebd8ae2ce16fd6571",
+        "accountKey": "0x7581e431a68d0fa641e14a7d29a6c2b150db6da1d13f59dee6f7f492a0bebd29",
+        "accountPath": [
+          {
+            "pathPart": "0x1",
+            "root": "0x51c478d08891d146cbfe7aea9acfd08163fed3134e837e7312c1330127bd5813",
+            "path": [
+              {
+                "value": "0x1470651480a52eee5f5a81412103e4e2a8c17d66e64de57b06c70b1ca74ddb1b",
+                "sibling": "0xd9bf6303d18ed15a93cb82a5e74958d1f55e99a2b1375ca4b969b19e7d0d4f1a"
+              }
+            ],
+            "leaf": {
+              "value": "0xad23a3af3faa69c7bb5215f7a927404429cdeea43d07430790241bebdce9270b",
+              "sibling": "0x7581e431a68d0fa641e14a7d29a6c2b150db6da1d13f59dee6f7f492a0bebd29"
+            }
+          },
+          {
+            "pathPart": "0x1",
+            "root": "0x51c478d08891d146cbfe7aea9acfd08163fed3134e837e7312c1330127bd5813",
+            "path": [
+              {
+                "value": "0x1470651480a52eee5f5a81412103e4e2a8c17d66e64de57b06c70b1ca74ddb1b",
+                "sibling": "0xd9bf6303d18ed15a93cb82a5e74958d1f55e99a2b1375ca4b969b19e7d0d4f1a"
+              }
+            ],
+            "leaf": {
+              "value": "0xad23a3af3faa69c7bb5215f7a927404429cdeea43d07430790241bebdce9270b",
+              "sibling": "0x7581e431a68d0fa641e14a7d29a6c2b150db6da1d13f59dee6f7f492a0bebd29"
+            }
+          }
+        ],
+        "accountUpdate": [
+          {
+            "nonce": 0,
+            "balance": "0x3635c9adc5dea00000",
+            "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
+          },
+          {
+            "nonce": 0,
+            "balance": "0x3635c9adc5dea00000",
+            "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
+          }
+        ],
+        "commonStateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "statePath": [
+          null,
+          null
+        ],
+        "stateUpdate": [
+          null,
+          null
+        ]
+      },
+      {
+        "address": "0x4cb1ab63af5d8931ce09673ebd8ae2ce16fd6571",
+        "accountKey": "0x7581e431a68d0fa641e14a7d29a6c2b150db6da1d13f59dee6f7f492a0bebd29",
+        "accountPath": [
+          {
+            "pathPart": "0x1",
+            "root": "0x51c478d08891d146cbfe7aea9acfd08163fed3134e837e7312c1330127bd5813",
+            "path": [
+              {
+                "value": "0x1470651480a52eee5f5a81412103e4e2a8c17d66e64de57b06c70b1ca74ddb1b",
+                "sibling": "0xd9bf6303d18ed15a93cb82a5e74958d1f55e99a2b1375ca4b969b19e7d0d4f1a"
+              }
+            ],
+            "leaf": {
+              "value": "0xad23a3af3faa69c7bb5215f7a927404429cdeea43d07430790241bebdce9270b",
+              "sibling": "0x7581e431a68d0fa641e14a7d29a6c2b150db6da1d13f59dee6f7f492a0bebd29"
+            }
+          },
+          {
+            "pathPart": "0x1",
+            "root": "0x51c478d08891d146cbfe7aea9acfd08163fed3134e837e7312c1330127bd5813",
+            "path": [
+              {
+                "value": "0x1470651480a52eee5f5a81412103e4e2a8c17d66e64de57b06c70b1ca74ddb1b",
+                "sibling": "0xd9bf6303d18ed15a93cb82a5e74958d1f55e99a2b1375ca4b969b19e7d0d4f1a"
+              }
+            ],
+            "leaf": {
+              "value": "0xad23a3af3faa69c7bb5215f7a927404429cdeea43d07430790241bebdce9270b",
+              "sibling": "0x7581e431a68d0fa641e14a7d29a6c2b150db6da1d13f59dee6f7f492a0bebd29"
+            }
+          }
+        ],
+        "accountUpdate": [
+          {
+            "nonce": 0,
+            "balance": "0x3635c9adc5dea00000",
+            "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
+          },
+          {
+            "nonce": 0,
+            "balance": "0x3635c9adc5dea00000",
+            "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
+          }
+        ],
+        "commonStateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "statePath": [
+          null,
+          null
+        ],
+        "stateUpdate": [
+          null,
+          null
+        ]
+      },
+      {
+        "address": "0x4cb1ab63af5d8931ce09673ebd8ae2ce16fd6571",
+        "accountKey": "0x7581e431a68d0fa641e14a7d29a6c2b150db6da1d13f59dee6f7f492a0bebd29",
+        "accountPath": [
+          {
+            "pathPart": "0x1",
+            "root": "0x51c478d08891d146cbfe7aea9acfd08163fed3134e837e7312c1330127bd5813",
+            "path": [
+              {
+                "value": "0x1470651480a52eee5f5a81412103e4e2a8c17d66e64de57b06c70b1ca74ddb1b",
+                "sibling": "0xd9bf6303d18ed15a93cb82a5e74958d1f55e99a2b1375ca4b969b19e7d0d4f1a"
+              }
+            ],
+            "leaf": {
+              "value": "0xad23a3af3faa69c7bb5215f7a927404429cdeea43d07430790241bebdce9270b",
+              "sibling": "0x7581e431a68d0fa641e14a7d29a6c2b150db6da1d13f59dee6f7f492a0bebd29"
+            }
+          },
+          {
+            "pathPart": "0x1",
+            "root": "0x51c478d08891d146cbfe7aea9acfd08163fed3134e837e7312c1330127bd5813",
+            "path": [
+              {
+                "value": "0x1470651480a52eee5f5a81412103e4e2a8c17d66e64de57b06c70b1ca74ddb1b",
+                "sibling": "0xd9bf6303d18ed15a93cb82a5e74958d1f55e99a2b1375ca4b969b19e7d0d4f1a"
+              }
+            ],
+            "leaf": {
+              "value": "0xad23a3af3faa69c7bb5215f7a927404429cdeea43d07430790241bebdce9270b",
+              "sibling": "0x7581e431a68d0fa641e14a7d29a6c2b150db6da1d13f59dee6f7f492a0bebd29"
+            }
+          }
+        ],
+        "accountUpdate": [
+          {
+            "nonce": 0,
+            "balance": "0x3635c9adc5dea00000",
+            "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
+          },
+          {
+            "nonce": 0,
+            "balance": "0x3635c9adc5dea00000",
+            "codeHash": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
+          }
+        ],
+        "commonStateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "statePath": [
+          null,
+          null
+        ],
+        "stateUpdate": [
+          null,
+          null
+        ]
+      }
+    ]
+  }
 }

roller/assets/traces/04.json

@@ -1,41 +0,0 @@
-{
-  "coinbase": {
-    "address": "0xadf5218f7ca8c80d90ff63af5fef486af57c2096",
-    "nonce": 0,
-    "balance": "0x0",
-    "codeHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-  },
-  "header": {
-    "parentHash": "0x33292f2ec508af712c7f98dc3799021b4a3391dfa6456ef8041f8aa1556c1bc0",
-    "sha3Uncles": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347",
-    "miner": "0x0000000000000000000000000000000000000000",
-    "stateRoot": "0x00b5b217bbb123cc3ba125a02c3e85168ef125844d17f5190d0dfca3c847f5e8",
-    "transactionsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-    "receiptsRoot": "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-    "logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-    "difficulty": "0x2",
-    "number": "0x4",
-    "gasLimit": "0x37cf50c2",
-    "gasUsed": "0x0",
-    "timestamp": "0x6380889d",
-    "extraData": "0xd983010a0d846765746889676f312e31372e3133856c696e75780000000000006c7674d5a049e0d4e5d884745f98b17df096eb9814ce788e232bb55976ebba271a3b59cf5e5c69eeb08cb6679453e05ccc4f6279d023beb0e392816c16b113df00",
-    "mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-    "nonce": "0x0000000000000000",
-    "baseFeePerGas": "0x22f06c09",
-    "hash": "0x4b1fb45bfaa6e7662cb1331312f10575997b976bbd772332681a9a005adfc329"
-  },
-  "transactions": [],
-  "storageTrace": {
-    "rootBefore": "0x00b5b217bbb123cc3ba125a02c3e85168ef125844d17f5190d0dfca3c847f5e8",
-    "rootAfter": "0x00b5b217bbb123cc3ba125a02c3e85168ef125844d17f5190d0dfca3c847f5e8",
-    "proofs": {
-      "0xadf5218f7ca8C80d90Ff63af5FEF486Af57C2096": [
-        "0x0023817270d692108d3f2583c4fdddb93f05840da992233af555384642d2d480e02c05b065c0e03cc9ea9c6f16cd37395379d47225f9adfe626a288ed94807bd46",
-        "0x0012f68259c5658fa795d5efebf43f2cdda388eb1f15db83e305743c458fce44100b0c36cf61ec8e8522dcac76c3418bff6e2cb91215e5c61fbc0ec735aff79a3a",
-        "0x0124307d227b4219bed858923ccd524f3a235905a749e4372e26522bc8a4f58e0a04040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000021e19e0c9bab2400000c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470000000000000000000000000000000000000000000000000000000000000000020222214dcc294b72e40d2f37111a1f966aaefdbdd000000000000000000000000",
-        "0x5448495320495320534f4d45204d4147494320425954455320464f5220534d54206d3172525867503278704449"
-      ]
-    }
-  },
-  "executionResults": []
-}

roller/prover/prover.go

@@ -4,8 +4,8 @@
 package prover
 
 /*
-#cgo LDFLAGS: ${SRCDIR}/lib/libzkp.so -lm -ldl
-#cgo gpu LDFLAGS: ${SRCDIR}/lib/libzkp.so -lm -ldl -lgmp -lstdc++ -lprocps -L/usr/local/cuda/lib64/ -lcudart
+#cgo LDFLAGS: ${SRCDIR}/lib/libzkp.a -lm -ldl
+#cgo gpu LDFLAGS: ${SRCDIR}/lib/libzkp.a -lm -ldl -lgmp -lstdc++ -lprocps -L/usr/local/cuda/lib64/ -lcudart
 #include <stdlib.h>
 #include "./lib/libzkp.h"
 */

roller/prover/prover_test.go

@@ -17,12 +17,17 @@ import (
 )
 
 const (
-	paramsPath    = "../assets/test_params"
-	seedPath      = "../assets/test_seed"
-	tracesPath    = "../assets/traces"
-	proofDumpPath = "agg_proof"
+	paramsPath = "../assets/test_params"
+	seedPath   = "../assets/test_seed"
+	tracesPath = "../assets/traces"
 )
 
+type RPCTrace struct {
+	Jsonrpc string            `json:"jsonrpc"`
+	ID      int64             `json:"id"`
+	Result  *types.BlockTrace `json:"result"`
+}
+
 func TestFFI(t *testing.T) {
 	as := assert.New(t)
 	cfg := &config.ProverConfig{
@@ -45,20 +50,11 @@ func TestFFI(t *testing.T) {
 		as.NoError(err)
 		byt, err = io.ReadAll(f)
 		as.NoError(err)
-		trace := &types.BlockTrace{}
-		as.NoError(json.Unmarshal(byt, trace))
-		traces = append(traces, trace)
+		rpcTrace := &RPCTrace{}
+		as.NoError(json.Unmarshal(byt, rpcTrace))
+		traces = append(traces, rpcTrace.Result)
 	}
-	proof, err := prover.Prove(traces)
+	_, err = prover.Prove(traces)
 	as.NoError(err)
 	t.Log("prove success")
-
-	// dump the proof
-	os.RemoveAll(proofDumpPath)
-	proofByt, err := json.Marshal(proof)
-	as.NoError(err)
-	proofFile, err := os.Create(proofDumpPath)
-	as.NoError(err)
-	_, err = proofFile.Write(proofByt)
-	as.NoError(err)
 }

tests/integration-test/common.go

@@ -28,8 +28,6 @@ import (
 	"scroll-tech/common/cmd"
 	"scroll-tech/common/docker"
 
-	"scroll-tech/bridge/utils"
-
 	_ "scroll-tech/coordinator/cmd/app"
 	coordinatorConfig "scroll-tech/coordinator/config"
 )
@@ -121,10 +119,10 @@ func runSender(t *testing.T, endpoint string) *sender.Sender {
 		Endpoint:            endpoint,
 		CheckPendingTime:    3,
 		EscalateBlocks:      100,
-		Confirmations:       utils.ConfirmationParams{Type: utils.BlockNumberConfirmation, Number: 0},
+		Confirmations:       0,
 		EscalateMultipleNum: 11,
 		EscalateMultipleDen: 10,
-		TxType:              "LegacyTx",
+		TxType:              "DynamicFeeTx",
 	}, []*ecdsa.PrivateKey{priv})
 	assert.NoError(t, err)
 	return newSender

tests/integration-test/integration_test.go

@@ -1,16 +1,8 @@
 package integration
 
 import (
-	"crypto/rand"
-	"io/ioutil"
-	"math/big"
-	"net/http"
-	"strconv"
-	"strings"
 	"testing"
 	"time"
-
-	"github.com/stretchr/testify/assert"
 )
 
 func TestIntegration(t *testing.T) {
@@ -24,9 +16,6 @@ func TestIntegration(t *testing.T) {
 	// test bridge service
 	t.Run("testStartProcess", testStartProcess)
 
-	// test monitor metrics
-	t.Run("testMonitorMetrics", testMonitorMetrics)
-
 	t.Cleanup(func() {
 		free(t)
 	})
@@ -54,28 +43,3 @@ func testStartProcess(t *testing.T) {
 	bridgeCmd.WaitExit()
 	coordinatorCmd.WaitExit()
 }
-
-func testMonitorMetrics(t *testing.T) {
-	// migrate db.
-	runDBCliApp(t, "reset", "successful to reset")
-	runDBCliApp(t, "migrate", "current version:")
-
-	// Start bridge process with metrics server.
-	port, _ := rand.Int(rand.Reader, big.NewInt(2000))
-	svrPort := strconv.FormatInt(port.Int64()+50000, 10)
-	bridgeCmd := runBridgeApp(t, "--metrics", "--metrics.addr", "localhost", "--metrics.port", svrPort)
-	bridgeCmd.RunApp(func() bool { return bridgeCmd.WaitResult(time.Second*20, "Start bridge successfully") })
-
-	// Get monitor metrics.
-	resp, err := http.Get("http://localhost:" + svrPort)
-	assert.NoError(t, err)
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	assert.NoError(t, err)
-	bodyStr := string(body)
-	assert.Equal(t, 200, resp.StatusCode)
-	assert.Equal(t, true, strings.Contains(bodyStr, "bridge_l1_msg_sync_height"))
-	assert.Equal(t, true, strings.Contains(bodyStr, "bridge_l2_msg_sync_height"))
-
-	bridgeCmd.WaitExit()
-}