feat(confirmations): Upgrade confirm (#291)

Co-authored-by: colin <102356659+colinlyguo@users.noreply.github.com>
Co-authored-by: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>

.gitignore

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

bridge/cmd/app/app.go

@@ -1,6 +1,7 @@
 package app
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"os/signal"
@@ -10,6 +11,7 @@ import (
 
 	"scroll-tech/database"
 
+	"scroll-tech/common/metrics"
 	"scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
@@ -49,7 +51,10 @@ func action(ctx *cli.Context) error {
 		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
 	}
 
-	// init db connection
+	// Start metrics server.
+	metrics.Serve(context.Background(), ctx)
+
+	// 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": 6,
+    "confirmations": "0x6",
     "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": 1,
+        "confirmations": "0x1",
         "escalate_multiple_num": 11,
         "escalate_multiple_den": 10,
         "max_gas_price": 10000000000,
-        "tx_type": "AccessListTx",
+        "tx_type": "LegacyTx",
         "min_balance": 100000000000000000000
       },
       "message_sender_private_keys": [
@@ -24,7 +24,7 @@
     }
   },
   "l2_config": {
-    "confirmations": 1,
+    "confirmations": "0x1",
     "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": 6,
+        "confirmations": "0x6",
         "escalate_multiple_num": 11,
         "escalate_multiple_den": 10,
         "max_gas_price": 10000000000,
-        "tx_type": "DynamicFeeTx",
+        "tx_type": "LegacyTx",
         "min_balance": 100000000000000000000
       },
       "message_sender_private_keys": [
@@ -61,15 +61,7 @@
     }
   },
   "db_config": {
-    "persistence": {
-      "driver_name": "postgres",
-      "dsn": "postgres://admin:123456@localhost/test?sslmode=disable"
-    },
-    "redis": {
-      "url": "redis://default:@localhost:6379/0",
-      "expirations": {
-        "trace": 3600
-      }
-    }
+    "driver_name": "postgres",
+    "dsn": "postgres://admin:123456@localhost/test?sslmode=disable"
   }
 }

bridge/config/l1_config.go

@@ -1,11 +1,14 @@
 package config
 
-import "github.com/scroll-tech/go-ethereum/common"
+import (
+	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/rpc"
+)
 
 // L1Config loads l1eth configuration items.
 type L1Config struct {
 	// Confirmations block height confirmations number.
-	Confirmations uint64 `json:"confirmations"`
+	Confirmations rpc.BlockNumber `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,13 +3,15 @@ package config
 import (
 	"encoding/json"
 
+	"github.com/scroll-tech/go-ethereum/rpc"
+
 	"github.com/scroll-tech/go-ethereum/common"
 )
 
 // L2Config loads l2geth configuration items.
 type L2Config struct {
 	// Confirmations block height confirmations number.
-	Confirmations uint64 `json:"confirmations"`
+	Confirmations rpc.BlockNumber `json:"confirmations"`
 	// l2geth node url.
 	Endpoint string `json:"endpoint"`
 	// The messenger contract address deployed on layer 2 chain.

bridge/config/relayer_config.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/crypto"
+	"github.com/scroll-tech/go-ethereum/rpc"
 )
 
 // SenderConfig The config for transaction sender
@@ -19,7 +20,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 uint64 `json:"confirmations"`
+	Confirmations rpc.BlockNumber `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,8 +5,8 @@ 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.20230113082126-cdaea939622e
-	github.com/stretchr/testify v1.8.1
+	github.com/scroll-tech/go-ethereum v1.10.14-0.20230210091139-8224bc8b9ca5
+	github.com/stretchr/testify v1.8.0
 	github.com/urfave/cli/v2 v2.10.2
 	golang.org/x/sync v0.1.0
 	modernc.org/mathutil v1.4.1
@@ -14,7 +14,7 @@ require (
 
 require (
 	github.com/btcsuite/btcd v0.20.1-beta // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set v1.8.0 // indirect
@@ -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.3.1 // indirect
+	github.com/scroll-tech/zktrie v0.4.3 // 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

@@ -73,8 +73,8 @@ github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
 github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -350,11 +350,10 @@ 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.20230113082126-cdaea939622e h1:TAqAeQiQI6b+TRyqyQ6qhizqY35LhqYe8lWhG0nNRGw=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230113082126-cdaea939622e/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.3.1 h1:HlR+fMBdjXX1/7cUMqpUgGEhGy/3vN1JpwQ0ovg/Ys8=
-github.com/scroll-tech/zktrie v0.3.1/go.mod h1:CuJFlG1/soTJJBAySxCZgTF7oPvd5qF6utHOEciC43Q=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230210091139-8224bc8b9ca5 h1:CvkJOFK7Zapepx6Dwyc+86dZWWypXhSP4RFJmv6EJDk=
+github.com/scroll-tech/go-ethereum v1.10.14-0.20230210091139-8224bc8b9ca5/go.mod h1:OH4ZTAz6RM1IL0xcQ1zM6+Iy9s2vtcYqqwcEQdfHV7g=
+github.com/scroll-tech/zktrie v0.4.3 h1:RyhusIu8F8u5ITmzqZjkAwlL6jdC9TK9i6tfuJoZcpk=
+github.com/scroll-tech/zktrie v0.4.3/go.mod h1:XvNo7vAk8yxNyTjBDj5WIiFzYW4bx/gJ78+NK6Zn6Uk=
 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=
@@ -374,7 +373,6 @@ github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZL
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -382,9 +380,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=

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, client, int64(cfg.Confirmations), orm, cfg.RelayerConfig)
+	relayer, err := NewLayer1Relayer(ctx, orm, cfg.RelayerConfig)
 	if err != nil {
 		return nil, err
 	}

bridge/l1/l1_test.go

@@ -37,8 +37,8 @@ func setupEnv(t *testing.T) {
 	cfg.L2Config.Endpoint = l2gethImg.Endpoint()
 
 	// Create db container.
-	dbImg = docker.NewTestDBDocker(t, cfg.DBConfig.Persistence.DriverName)
-	cfg.DBConfig.Persistence.DSN = dbImg.Endpoint()
+	dbImg = docker.NewTestDBDocker(t, cfg.DBConfig.DriverName)
+	cfg.DBConfig.DSN = dbImg.Endpoint()
 }
 
 func free(t *testing.T) {

bridge/l1/relayer.go

@@ -11,7 +11,6 @@ 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"
@@ -29,7 +28,6 @@ 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
@@ -43,7 +41,7 @@ type Layer1Relayer struct {
 }
 
 // NewLayer1Relayer will return a new instance of Layer1RelayerClient
-func NewLayer1Relayer(ctx context.Context, ethClient *ethclient.Client, l1ConfirmNum int64, db orm.L1MessageOrm, cfg *config.RelayerConfig) (*Layer1Relayer, error) {
+func NewLayer1Relayer(ctx context.Context, db orm.L1MessageOrm, cfg *config.RelayerConfig) (*Layer1Relayer, error) {
 	l2MessengerABI, err := bridge_abi.L2MessengerMetaData.GetAbi()
 	if err != nil {
 		log.Warn("new L2MessengerABI failed", "err", err)
@@ -59,7 +57,6 @@ func NewLayer1Relayer(ctx context.Context, ethClient *ethclient.Client, l1Confir
 
 	return &Layer1Relayer{
 		ctx:            ctx,
-		client:         ethClient,
 		sender:         sender,
 		db:             db,
 		l2MessengerABI: l2MessengerABI,

bridge/l1/relayer_test.go

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

bridge/l1/watcher.go

@@ -11,6 +11,8 @@ 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"
+	"github.com/scroll-tech/go-ethereum/rpc"
 
 	"scroll-tech/database"
 	"scroll-tech/database/orm"
@@ -19,6 +21,10 @@ import (
 	"scroll-tech/bridge/utils"
 )
 
+var (
+	bridgeL1MsgSyncHeightGauge = metrics.NewRegisteredGauge("bridge/l1/msg/sync/height", nil)
+)
+
 type relayedMessage struct {
 	msgHash      common.Hash
 	txHash       common.Hash
@@ -38,7 +44,7 @@ type Watcher struct {
 	db     database.OrmFactory
 
 	// The number of new blocks to wait for a block to be confirmed
-	confirmations    uint64
+	confirmations    rpc.BlockNumber
 	messengerAddress common.Address
 	messengerABI     *abi.ABI
 
@@ -53,7 +59,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 uint64, messengerAddress common.Address, rollupAddress common.Address, db database.OrmFactory) *Watcher {
+func NewWatcher(ctx context.Context, client *ethclient.Client, startHeight uint64, confirmations rpc.BlockNumber, 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)
@@ -91,12 +97,13 @@ func (w *Watcher) Start() {
 				return
 
 			default:
-				blockNumber, err := w.client.BlockNumber(w.ctx)
+				number, err := utils.GetLatestConfirmedBlockNumber(w.ctx, w.client, w.confirmations)
 				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(blockNumber); err != nil {
+
+				if err := w.FetchContractEvent(number); err != nil {
 					log.Error("Failed to fetch bridge contract", "err", err)
 				}
 			}
@@ -111,14 +118,14 @@ func (w *Watcher) Stop() {
 
 const contractEventsBlocksFetchLimit = int64(10)
 
-// FetchContractEvent pull latest event logs from given contract address and save in Persistence
+// FetchContractEvent pull latest event logs from given contract address and save in DB
 func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 	defer func() {
 		log.Info("l1 watcher fetchContractEvent", "w.processedMsgHeight", w.processedMsgHeight)
 	}()
 
 	fromBlock := int64(w.processedMsgHeight) + 1
-	toBlock := int64(blockHeight) - int64(w.confirmations)
+	toBlock := int64(blockHeight)
 
 	for from := fromBlock; from <= toBlock; from += contractEventsBlocksFetchLimit {
 		to := from + contractEventsBlocksFetchLimit - 1
@@ -151,6 +158,7 @@ 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))
@@ -215,6 +223,7 @@ func (w *Watcher) FetchContractEvent(blockHeight uint64) error {
 		}
 
 		w.processedMsgHeight = uint64(to)
+		bridgeL1MsgSyncHeightGauge.Update(to)
 	}
 
 	return nil

bridge/l2/backend.go

@@ -32,10 +32,7 @@ func New(ctx context.Context, cfg *config.L2Config, orm database.OrmFactory) (*B
 		return nil, err
 	}
 
-	l2Watcher, err := NewL2WatcherClient(ctx, client, cfg.Confirmations, cfg.BatchProposerConfig, cfg.L2MessengerAddress, orm)
-	if err != nil {
-		return nil, err
-	}
+	l2Watcher := NewL2WatcherClient(ctx, client, cfg.Confirmations, cfg.BatchProposerConfig, cfg.L2MessengerAddress, orm)
 
 	return &Backend{
 		cfg:       cfg,

bridge/l2/l2_test.go

@@ -19,7 +19,6 @@ var (
 	l1gethImg docker.ImgInstance
 	l2gethImg docker.ImgInstance
 	dbImg     docker.ImgInstance
-	redisImg  docker.ImgInstance
 
 	// l2geth client
 	l2Cli *ethclient.Client
@@ -41,12 +40,8 @@ func setupEnv(t *testing.T) (err error) {
 	cfg.L2Config.Endpoint = l2gethImg.Endpoint()
 
 	// Create db container.
-	dbImg = docker.NewTestDBDocker(t, cfg.DBConfig.Persistence.DriverName)
-	cfg.DBConfig.Persistence.DSN = dbImg.Endpoint()
-
-	// Create redis container.
-	redisImg = docker.NewTestRedisDocker(t)
-	cfg.DBConfig.Redis.URL = redisImg.Endpoint()
+	dbImg = docker.NewTestDBDocker(t, cfg.DBConfig.DriverName)
+	cfg.DBConfig.DSN = dbImg.Endpoint()
 
 	// Create l2geth client.
 	l2Cli, err = ethclient.Dial(cfg.L2Config.Endpoint)
@@ -65,9 +60,6 @@ func free(t *testing.T) {
 	if l2gethImg != nil {
 		assert.NoError(t, l2gethImg.Stop())
 	}
-	if redisImg != nil {
-		assert.NoError(t, redisImg.Stop())
-	}
 }
 
 func TestFunction(t *testing.T) {

bridge/l2/relayer.go

@@ -96,8 +96,7 @@ 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(wg *sync.WaitGroup) {
-	defer wg.Done()
+func (r *Layer2Relayer) ProcessSavedEvents() {
 	batch, err := r.db.GetLatestFinalizedBatch()
 	if err != nil {
 		log.Error("GetLatestFinalizedBatch failed", "err", err)
@@ -193,8 +192,7 @@ func (r *Layer2Relayer) processSavedEvent(msg *orm.L2Message, index uint64) erro
 }
 
 // ProcessPendingBatches submit batch data to layer 1 rollup contract
-func (r *Layer2Relayer) ProcessPendingBatches(wg *sync.WaitGroup) {
-	defer wg.Done()
+func (r *Layer2Relayer) ProcessPendingBatches() {
 	// batches are sorted by batch index in increasing order
 	batchesInDB, err := r.db.GetPendingBatches(1)
 	if err != nil {
@@ -287,9 +285,7 @@ func (r *Layer2Relayer) ProcessPendingBatches(wg *sync.WaitGroup) {
 }
 
 // ProcessCommittedBatches submit proof to layer 1 rollup contract
-func (r *Layer2Relayer) ProcessCommittedBatches(wg *sync.WaitGroup) {
-	defer wg.Done()
-
+func (r *Layer2Relayer) ProcessCommittedBatches() {
 	// set skipped batches in a single db operation
 	if count, err := r.db.UpdateSkippedBatches(); err != nil {
 		log.Error("UpdateSkippedBatches failed", "err", err)
@@ -402,28 +398,42 @@ func (r *Layer2Relayer) ProcessCommittedBatches(wg *sync.WaitGroup) {
 
 // Start the relayer process
 func (r *Layer2Relayer) Start() {
-	go func() {
-		// trigger by timer
+	loop := func(ctx context.Context, f func()) {
 		ticker := time.NewTicker(time.Second)
 		defer ticker.Stop()
 
 		for {
 			select {
-			case <-ticker.C:
-				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:
+			case <-ctx.Done():
 				return
+			case <-ticker.C:
+				f()
 			}
 		}
+	}
+
+	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()
 	}()
 }
 

bridge/l2/relayer_test.go

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

bridge/l2/watcher.go

@@ -14,6 +14,8 @@ 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"
+	"github.com/scroll-tech/go-ethereum/rpc"
 
 	bridge_abi "scroll-tech/bridge/abi"
 	"scroll-tech/bridge/utils"
@@ -24,6 +26,11 @@ 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
@@ -39,7 +46,7 @@ type WatcherClient struct {
 
 	orm database.OrmFactory
 
-	confirmations    uint64
+	confirmations    rpc.BlockNumber
 	messengerAddress common.Address
 	messengerABI     *abi.ABI
 
@@ -53,14 +60,14 @@ type WatcherClient struct {
 }
 
 // NewL2WatcherClient take a l2geth instance to generate a l2watcherclient instance
-func NewL2WatcherClient(ctx context.Context, client *ethclient.Client, confirmations uint64, bpCfg *config.BatchProposerConfig, messengerAddress common.Address, orm database.OrmFactory) (*WatcherClient, error) {
+func NewL2WatcherClient(ctx context.Context, client *ethclient.Client, confirmations rpc.BlockNumber, 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)
 		savedHeight = 0
 	}
 
-	watcher := &WatcherClient{
+	return &WatcherClient{
 		ctx:                ctx,
 		Client:             client,
 		orm:                orm,
@@ -72,20 +79,13 @@ func NewL2WatcherClient(ctx context.Context, client *ethclient.Client, confirmat
 		stopped:            0,
 		batchProposer:      newBatchProposer(bpCfg, orm),
 	}
-	// Init cache, if traces in cache expired reset it.
-	if err = watcher.initCache(ctx); err != nil {
-		log.Error("failed to init cache in l2 watcher")
-		return nil, err
-	}
-
-	return watcher, nil
 }
 
 // Start the Listening process
 func (w *WatcherClient) Start() {
 	go func() {
 		if reflect.ValueOf(w.orm).IsNil() {
-			panic("must run L2 watcher with Persistence")
+			panic("must run L2 watcher with DB")
 		}
 
 		ctx, cancel := context.WithCancel(w.ctx)
@@ -101,19 +101,12 @@ func (w *WatcherClient) Start() {
 					return
 
 				case <-ticker.C:
-					// get current height
-					number, err := w.BlockNumber(ctx)
+					number, err := utils.GetLatestConfirmedBlockNumber(ctx, w.Client, w.confirmations)
 					if err != nil {
-						log.Error("failed to get_BlockNumber", "err", err)
+						log.Error("failed to get block number", "err", err)
 						continue
 					}
 
-					if number >= w.confirmations {
-						number = number - w.confirmations
-					} else {
-						number = 0
-					}
-
 					w.tryFetchRunningMissingBlocks(ctx, number)
 				}
 			}
@@ -130,19 +123,12 @@ func (w *WatcherClient) Start() {
 					return
 
 				case <-ticker.C:
-					// get current height
-					number, err := w.BlockNumber(ctx)
+					number, err := utils.GetLatestConfirmedBlockNumber(ctx, w.Client, w.confirmations)
 					if err != nil {
-						log.Error("failed to get_BlockNumber", "err", err)
+						log.Error("failed to get block number", "err", err)
 						continue
 					}
 
-					if number >= w.confirmations {
-						number = number - w.confirmations
-					} else {
-						number = 0
-					}
-
 					w.FetchContractEvent(number)
 				}
 			}
@@ -178,7 +164,7 @@ const blockTracesFetchLimit = uint64(10)
 
 // try fetch missing blocks if inconsistent
 func (w *WatcherClient) tryFetchRunningMissingBlocks(ctx context.Context, blockHeight uint64) {
-	// Get newest block in Persistence. must have blocks at that time.
+	// Get newest block in DB. must have blocks at that time.
 	// Don't use "block_trace" table "trace" column's BlockTrace.Number,
 	// because it might be empty if the corresponding rollup_result is finalized/finalization_skipped
 	heightInDB, err := w.orm.GetBlockTracesLatestHeight()
@@ -220,6 +206,7 @@ func (w *WatcherClient) getAndStoreBlockTraces(ctx context.Context, from, to uin
 		log.Info("retrieved block trace", "height", trace.Header.Number, "hash", trace.Header.Hash().String())
 
 		traces = append(traces, trace)
+
 	}
 	if len(traces) > 0 {
 		if err := w.orm.InsertBlockTraces(traces); err != nil {
@@ -232,7 +219,7 @@ func (w *WatcherClient) getAndStoreBlockTraces(ctx context.Context, from, to uin
 
 const contractEventsBlocksFetchLimit = int64(10)
 
-// FetchContractEvent pull latest event logs from given contract address and save in Persistence
+// FetchContractEvent pull latest event logs from given contract address and save in DB
 func (w *WatcherClient) FetchContractEvent(blockHeight uint64) {
 	defer func() {
 		log.Info("l2 watcher fetchContractEvent", "w.processedMsgHeight", w.processedMsgHeight)
@@ -269,6 +256,7 @@ 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))
@@ -301,6 +289,7 @@ func (w *WatcherClient) FetchContractEvent(blockHeight uint64) {
 		}
 
 		w.processedMsgHeight = uint64(to)
+		bridgeL2MsgSyncHeightGauge.Update(to)
 	}
 }
 

bridge/l2/watcher_api.go

@@ -1,21 +1,5 @@
 package l2
 
-import (
-	"context"
-
-	"github.com/scroll-tech/go-ethereum/core/types"
-)
-
 // WatcherAPI watcher api service
 type WatcherAPI interface {
-	GetTracesByBatchIndex(ctx context.Context, index uint64) ([]*types.BlockTrace, error)
-}
-
-// GetTracesByBatchIndex get traces by batch_id.
-func (w *WatcherClient) GetTracesByBatchIndex(ctx context.Context, index uint64) ([]*types.BlockTrace, error) {
-	id, err := w.orm.GetBatchIDByIndex(index)
-	if err != nil {
-		return nil, err
-	}
-	return w.orm.GetBlockTraces(map[string]interface{}{"batch_id": id})
 }

bridge/l2/watcher_init.go

@@ -1,121 +0,0 @@
-package l2
-
-import (
-	"context"
-	"fmt"
-	"math/big"
-	"runtime"
-
-	"github.com/scroll-tech/go-ethereum/log"
-	"golang.org/x/sync/errgroup"
-
-	"scroll-tech/database/cache"
-	"scroll-tech/database/orm"
-)
-
-func (w *WatcherClient) initCache(ctx context.Context) error {
-	var (
-		// Use at most half of the system threads.
-		parallel = (runtime.GOMAXPROCS(0) + 1) / 2
-		db       = w.orm
-	)
-
-	// Fill unsigned block traces.
-	for {
-		batches, err := db.GetBlockBatches(
-			map[string]interface{}{"proving_status": orm.ProvingTaskUnassigned},
-			fmt.Sprintf("ORDER BY index ASC LIMIT %d;", parallel),
-		)
-		if err != nil {
-			log.Error("failed to get block batch", "err", err)
-			return err
-		}
-		if len(batches) == 0 {
-			break
-		}
-
-		var eg errgroup.Group
-		for _, batch := range batches {
-			batch := batch
-			eg.Go(func() error {
-				return w.fillTraceByNumber(ctx, batch.StartBlockNumber, batch.EndBlockNumber)
-			})
-		}
-		if err = eg.Wait(); err != nil {
-			return err
-		}
-	}
-
-	// Fill assigned and under proofing block traces into cache.
-	ids, err := w.orm.GetAssignedBatchIDs()
-	if err != nil {
-		return err
-	}
-	for _, id := range ids {
-		err = w.fillTraceByID(ctx, id)
-		if err != nil {
-			log.Error("failed to fill traces by id", "id", id, "err", err)
-			return err
-		}
-	}
-
-	// Fill pending block traces into cache.
-	for {
-		ids, err = w.orm.GetPendingBatches(uint64(parallel))
-		if err != nil {
-			log.Error("failed to get pending batch ids", "err", err)
-			return err
-		}
-		if len(ids) == 0 {
-			log.Info("L2 WatcherClient initCache done")
-			return nil
-		}
-		for _, id := range ids {
-			err = w.fillTraceByID(ctx, id)
-			if err != nil {
-				log.Error("failed to fill traces by id", "id", id, "err", err)
-				return err
-			}
-		}
-	}
-}
-
-// fillTraceByID Fill block traces by batch id.
-func (w *WatcherClient) fillTraceByID(ctx context.Context, id string) error {
-	batches, err := w.orm.GetBlockBatches(map[string]interface{}{"id": id})
-	if err != nil || len(batches) == 0 {
-		return err
-	}
-	batch := batches[0]
-	err = w.fillTraceByNumber(ctx, batch.StartBlockNumber, batch.EndBlockNumber)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (w *WatcherClient) fillTraceByNumber(ctx context.Context, start, end uint64) error {
-	var (
-		rdb    = w.orm.(cache.Cache)
-		client = w.Client
-	)
-	for height := start; height <= end; height++ {
-		number := big.NewInt(0).SetUint64(height)
-		exist, err := rdb.ExistTrace(ctx, number)
-		if err != nil {
-			return err
-		}
-		if exist {
-			continue
-		}
-		trace, err := client.GetBlockTraceByNumber(ctx, number)
-		if err != nil {
-			return err
-		}
-		err = rdb.SetBlockTrace(ctx, trace)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}

bridge/l2/watcher_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/rpc"
 	"github.com/stretchr/testify/assert"
 
 	"scroll-tech/bridge/config"
@@ -31,13 +32,12 @@ func testCreateNewWatcherAndStop(t *testing.T) {
 	defer l2db.Close()
 
 	l2cfg := cfg.L2Config
-	rc, err := NewL2WatcherClient(context.Background(), l2Cli, l2cfg.Confirmations, l2cfg.BatchProposerConfig, l2cfg.L2MessengerAddress, l2db)
-	assert.NoError(t, err)
+	rc := NewL2WatcherClient(context.Background(), l2Cli, l2cfg.Confirmations, l2cfg.BatchProposerConfig, l2cfg.L2MessengerAddress, l2db)
 	rc.Start()
 	defer rc.Stop()
 
 	l1cfg := cfg.L1Config
-	l1cfg.RelayerConfig.SenderConfig.Confirmations = 0
+	l1cfg.RelayerConfig.SenderConfig.Confirmations = rpc.LatestBlockNumber
 	newSender, err := sender.NewSender(context.Background(), l1cfg.RelayerConfig.SenderConfig, l1cfg.RelayerConfig.MessageSenderPrivateKeys)
 	assert.NoError(t, err)
 
@@ -73,8 +73,7 @@ func testMonitorBridgeContract(t *testing.T) {
 	address, err := bind.WaitDeployed(context.Background(), l2Cli, tx)
 	assert.NoError(t, err)
 
-	rc, err := prepareRelayerClient(l2Cli, cfg.L2Config.BatchProposerConfig, db, address)
-	assert.NoError(t, err)
+	rc := prepareRelayerClient(l2Cli, cfg.L2Config.BatchProposerConfig, db, address)
 	rc.Start()
 	defer rc.Stop()
 
@@ -112,7 +111,7 @@ func testMonitorBridgeContract(t *testing.T) {
 	// check if we successfully stored events
 	height, err := db.GetLayer2LatestWatchedHeight()
 	assert.NoError(t, err)
-	t.Log("Height in Persistence is", height)
+	t.Log("Height in DB is", height)
 	assert.Greater(t, height, int64(previousHeight))
 	msgs, err := db.GetL2Messages(map[string]interface{}{"status": orm.MsgPending})
 	assert.NoError(t, err)
@@ -136,8 +135,7 @@ func testFetchMultipleSentMessageInOneBlock(t *testing.T) {
 	address, err := bind.WaitDeployed(context.Background(), l2Cli, trx)
 	assert.NoError(t, err)
 
-	rc, err := prepareRelayerClient(l2Cli, cfg.L2Config.BatchProposerConfig, db, address)
-	assert.NoError(t, err)
+	rc := prepareRelayerClient(l2Cli, cfg.L2Config.BatchProposerConfig, db, address)
 	rc.Start()
 	defer rc.Stop()
 
@@ -192,8 +190,9 @@ func testFetchMultipleSentMessageInOneBlock(t *testing.T) {
 	assert.Equal(t, 5, len(msgs))
 }
 
-func prepareRelayerClient(l2Cli *ethclient.Client, bpCfg *config.BatchProposerConfig, db database.OrmFactory, contractAddr common.Address) (*WatcherClient, error) {
-	return NewL2WatcherClient(context.Background(), l2Cli, 0, bpCfg, contractAddr, db)
+func prepareRelayerClient(l2Cli *ethclient.Client, bpCfg *config.BatchProposerConfig, db database.OrmFactory, contractAddr common.Address) *WatcherClient {
+	confirmations := rpc.LatestBlockNumber
+	return NewL2WatcherClient(context.Background(), l2Cli, confirmations, bpCfg, contractAddr, db)
 }
 
 func prepareAuth(t *testing.T, l2Cli *ethclient.Client, privateKey *ecdsa.PrivateKey) *bind.TransactOpts {

bridge/sender/sender.go

@@ -20,6 +20,8 @@ import (
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
 
+	"scroll-tech/bridge/utils"
+
 	"scroll-tech/bridge/config"
 )
 
@@ -120,6 +122,15 @@ 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,
@@ -128,7 +139,7 @@ func NewSender(ctx context.Context, config *config.SenderConfig, privs []*ecdsa.
 		auths:         auths,
 		confirmCh:     make(chan *Confirmation, 128),
 		blockNumber:   header.Number.Uint64(),
-		baseFeePerGas: header.BaseFee.Uint64(),
+		baseFeePerGas: baseFeePerGas,
 		pendingTxs:    sync.Map{},
 		stopCh:        make(chan struct{}),
 	}
@@ -352,11 +363,20 @@ func (s *Sender) resubmitTransaction(feeData *FeeData, auth *bind.TransactOpts,
 	return s.createAndSendTx(auth, feeData, tx.To(), tx.Value(), tx.Data(), &nonce)
 }
 
-// CheckPendingTransaction Check pending transaction given number of blocks to wait before confirmation.
-func (s *Sender) CheckPendingTransaction(header *types.Header) {
+// 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) {
 	number := header.Number.Uint64()
 	atomic.StoreUint64(&s.blockNumber, number)
-	atomic.StoreUint64(&s.baseFeePerGas, header.BaseFee.Uint64())
+
+	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")
+		}
+	}
+
 	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() {
@@ -366,7 +386,7 @@ func (s *Sender) CheckPendingTransaction(header *types.Header) {
 		pending := value.(*PendingTransaction)
 		receipt, err := s.client.TransactionReceipt(s.ctx, pending.tx.Hash())
 		if (err == nil) && (receipt != nil) {
-			if number >= receipt.BlockNumber.Uint64()+s.config.Confirmations {
+			if receipt.BlockNumber.Uint64() <= confirmed {
 				s.pendingTxs.Delete(key)
 				// send confirm message
 				s.confirmCh <- &Confirmation{
@@ -440,7 +460,14 @@ func (s *Sender) loop(ctx context.Context) {
 				log.Error("failed to get latest head", "err", err)
 				continue
 			}
-			s.CheckPendingTransaction(header)
+
+			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)
 		case <-checkBalanceTicker.C:
 			// Check and set balance.
 			_ = s.auths.checkAndSetBalances(ctx)

bridge/sender/sender_test.go

@@ -14,6 +14,7 @@ import (
 	cmap "github.com/orcaman/concurrent-map"
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/crypto"
+	"github.com/scroll-tech/go-ethereum/rpc"
 	"github.com/stretchr/testify/assert"
 
 	"scroll-tech/common/docker"
@@ -68,7 +69,7 @@ func testBatchSender(t *testing.T, batchSize int) {
 	}
 
 	senderCfg := cfg.L1Config.RelayerConfig.SenderConfig
-	senderCfg.Confirmations = 0
+	senderCfg.Confirmations = rpc.LatestBlockNumber
 	newSender, err := sender.NewSender(context.Background(), senderCfg, privateKeys)
 	if err != nil {
 		t.Fatal(err)

bridge/tests/bridge_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/crypto"
 	"github.com/scroll-tech/go-ethereum/ethclient"
+	"github.com/scroll-tech/go-ethereum/rpc"
 	"github.com/stretchr/testify/assert"
 
 	"scroll-tech/bridge/config"
@@ -30,7 +31,6 @@ var (
 	l1gethImg docker.ImgInstance
 	l2gethImg docker.ImgInstance
 	dbImg     docker.ImgInstance
-	redisImg  docker.ImgInstance
 
 	// clients
 	l1Client *ethclient.Client
@@ -65,10 +65,10 @@ func setupEnv(t *testing.T) {
 	// Load config.
 	cfg, err = config.NewConfig("../config.json")
 	assert.NoError(t, err)
-	cfg.L1Config.Confirmations = 0
+	cfg.L1Config.Confirmations = rpc.LatestBlockNumber
 	cfg.L1Config.RelayerConfig.MessageSenderPrivateKeys = []*ecdsa.PrivateKey{messagePrivateKey}
 	cfg.L1Config.RelayerConfig.RollupSenderPrivateKeys = []*ecdsa.PrivateKey{rollupPrivateKey}
-	cfg.L2Config.Confirmations = 0
+	cfg.L2Config.Confirmations = rpc.LatestBlockNumber
 	cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys = []*ecdsa.PrivateKey{messagePrivateKey}
 	cfg.L2Config.RelayerConfig.RollupSenderPrivateKeys = []*ecdsa.PrivateKey{rollupPrivateKey}
 
@@ -83,11 +83,8 @@ func setupEnv(t *testing.T) {
 	cfg.L2Config.Endpoint = l2gethImg.Endpoint()
 
 	// Create db container.
-	dbImg = docker.NewTestDBDocker(t, cfg.DBConfig.Persistence.DriverName)
-	cfg.DBConfig.Persistence.DSN = dbImg.Endpoint()
-
-	redisImg = docker.NewTestRedisDocker(t)
-	cfg.DBConfig.Redis.URL = redisImg.Endpoint()
+	dbImg = docker.NewTestDBDocker(t, cfg.DBConfig.DriverName)
+	cfg.DBConfig.DSN = dbImg.Endpoint()
 
 	// Create l1geth and l2geth client.
 	l1Client, err = ethclient.Dial(cfg.L1Config.Endpoint)
@@ -151,9 +148,6 @@ func free(t *testing.T) {
 	if l2gethImg != nil {
 		assert.NoError(t, l2gethImg.Stop())
 	}
-	if redisImg != nil {
-		assert.NoError(t, redisImg.Stop())
-	}
 }
 
 func prepareContracts(t *testing.T) {

bridge/tests/l2_message_relay_test.go

@@ -3,20 +3,20 @@ package tests
 import (
 	"context"
 	"math/big"
-	"sync"
 	"testing"
 
+	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
+	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/rpc"
+	"github.com/stretchr/testify/assert"
+
 	"scroll-tech/database"
 	"scroll-tech/database/migrate"
 	"scroll-tech/database/orm"
 
 	"scroll-tech/bridge/l1"
 	"scroll-tech/bridge/l2"
-
-	"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/stretchr/testify/assert"
 )
 
 func testRelayL2MessageSucceed(t *testing.T) {
@@ -26,9 +26,6 @@ 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
@@ -38,12 +35,12 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	defer l2Relayer.Stop()
 
 	// Create L2Watcher
-	l2Watcher, err := l2.NewL2WatcherClient(context.Background(), l2Client, 0, l2Cfg.BatchProposerConfig, l2Cfg.L2MessengerAddress, db)
-	assert.NoError(t, err)
+	confirmations := rpc.LatestBlockNumber
+	l2Watcher := l2.NewL2WatcherClient(context.Background(), l2Client, confirmations, l2Cfg.BatchProposerConfig, l2Cfg.L2MessengerAddress, db)
 
 	// Create L1Watcher
 	l1Cfg := cfg.L1Config
-	l1Watcher := l1.NewWatcher(context.Background(), l1Client, 0, 0, l1Cfg.L1MessengerAddress, l1Cfg.RollupContractAddress, db)
+	l1Watcher := l1.NewWatcher(context.Background(), l1Client, 0, confirmations, l1Cfg.L1MessengerAddress, l1Cfg.RollupContractAddress, db)
 
 	// send message through l2 messenger contract
 	nonce, err := l2MessengerInstance.MessageNonce(&bind.CallOpts{})
@@ -113,7 +110,7 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	assert.NoError(t, err)
 
 	// process pending batch and check status
-	l2Relayer.ProcessPendingBatches(&wg)
+	l2Relayer.ProcessPendingBatches()
 	status, err := db.GetRollupStatus(batchID)
 	assert.NoError(t, err)
 	assert.Equal(t, orm.RollupCommitting, status)
@@ -134,7 +131,7 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	assert.Equal(t, orm.RollupCommitted, status)
 
 	// process committed batch and check status
-	l2Relayer.ProcessCommittedBatches(&wg)
+	l2Relayer.ProcessCommittedBatches()
 	status, err = db.GetRollupStatus(batchID)
 	assert.NoError(t, err)
 	assert.Equal(t, orm.RollupFinalizing, status)
@@ -155,7 +152,7 @@ func testRelayL2MessageSucceed(t *testing.T) {
 	assert.Equal(t, orm.RollupFinalized, status)
 
 	// process l2 messages
-	l2Relayer.ProcessSavedEvents(&wg)
+	l2Relayer.ProcessSavedEvents()
 	msg, err = db.GetL2MessageByNonce(nonce.Uint64())
 	assert.NoError(t, err)
 	assert.Equal(t, msg.Status, orm.MsgSubmitted)

bridge/tests/rollup_test.go

@@ -3,12 +3,10 @@ package tests
 import (
 	"context"
 	"math/big"
-	"sync"
-	"testing"
-
 	"scroll-tech/database"
 	"scroll-tech/database/migrate"
 	"scroll-tech/database/orm"
+	"testing"
 
 	"scroll-tech/bridge/l1"
 	"scroll-tech/bridge/l2"
@@ -36,7 +34,7 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 
 	// Create L1Watcher
 	l1Cfg := cfg.L1Config
-	l1Watcher := l1.NewWatcher(context.Background(), l1Client, 0, 0, l1Cfg.L1MessengerAddress, l1Cfg.RollupContractAddress, db)
+	l1Watcher := l1.NewWatcher(context.Background(), l1Client, 0, l1Cfg.Confirmations, l1Cfg.L1MessengerAddress, l1Cfg.RollupContractAddress, db)
 
 	// add some blocks to db
 	var traces []*types.BlockTrace
@@ -80,11 +78,8 @@ 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(&wg)
-	wg.Wait()
+	l2Relayer.ProcessPendingBatches()
 
 	status, err := db.GetRollupStatus(batchID)
 	assert.NoError(t, err)
@@ -113,10 +108,8 @@ 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(&wg)
-	wg.Wait()
+	l2Relayer.ProcessCommittedBatches()
 
 	status, err = db.GetRollupStatus(batchID)
 	assert.NoError(t, err)

bridge/utils/confirmation.go

@@ -0,0 +1,56 @@
+package utils
+
+import (
+	"context"
+	"fmt"
+	"math/big"
+
+	"github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/rpc"
+)
+
+type ethClient interface {
+	BlockNumber(ctx context.Context) (uint64, error)
+	HeaderByNumber(ctx context.Context, number *big.Int) (*types.Header, error)
+}
+
+// GetLatestConfirmedBlockNumber get confirmed block number by rpc.BlockNumber type.
+func GetLatestConfirmedBlockNumber(ctx context.Context, client ethClient, confirm rpc.BlockNumber) (uint64, error) {
+	switch true {
+	case confirm == rpc.SafeBlockNumber || confirm == rpc.FinalizedBlockNumber:
+		var tag *big.Int
+		if confirm == rpc.FinalizedBlockNumber {
+			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.IsInt64() {
+			return 0, fmt.Errorf("received invalid block confirm: %v", header.Number)
+		}
+		return header.Number.Uint64(), nil
+	case confirm == rpc.LatestBlockNumber:
+		number, err := client.BlockNumber(ctx)
+		if err != nil {
+			return 0, err
+		}
+		return number, nil
+	case confirm.Int64() >= 0: // If it's positive integer, consider it as a certain confirm value.
+		number, err := client.BlockNumber(ctx)
+		if err != nil {
+			return 0, err
+		}
+		cfmNum := uint64(confirm.Int64())
+
+		if number >= cfmNum {
+			return number - cfmNum, nil
+		}
+		return 0, nil
+	default:
+		return 0, fmt.Errorf("unknown confirmation type: %v", confirm)
+	}
+}

bridge/utils/confirmation_test.go

@@ -0,0 +1,107 @@
+package utils_test
+
+import (
+	"context"
+	"encoding/json"
+	"math/big"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/scroll-tech/go-ethereum/common/math"
+	"github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/rpc"
+
+	"scroll-tech/bridge/utils"
+)
+
+var (
+	tests = []struct {
+		input    string
+		mustFail bool
+		expected rpc.BlockNumber
+	}{
+		{`"0x"`, true, rpc.BlockNumber(0)},
+		{`"0x0"`, false, rpc.BlockNumber(0)},
+		{`"0X1"`, false, rpc.BlockNumber(1)},
+		{`"0x00"`, true, rpc.BlockNumber(0)},
+		{`"0x01"`, true, rpc.BlockNumber(0)},
+		{`"0x1"`, false, rpc.BlockNumber(1)},
+		{`"0x12"`, false, rpc.BlockNumber(18)},
+		{`"0x7fffffffffffffff"`, false, rpc.BlockNumber(math.MaxInt64)},
+		{`"0x8000000000000000"`, true, rpc.BlockNumber(0)},
+		{"0", true, rpc.BlockNumber(0)},
+		{`"ff"`, true, rpc.BlockNumber(0)},
+		{`"safe"`, false, rpc.SafeBlockNumber},
+		{`"finalized"`, false, rpc.FinalizedBlockNumber},
+		{`"pending"`, false, rpc.PendingBlockNumber},
+		{`"latest"`, false, rpc.LatestBlockNumber},
+		{`"earliest"`, false, rpc.EarliestBlockNumber},
+		{`someString`, true, rpc.BlockNumber(0)},
+		{`""`, true, rpc.BlockNumber(0)},
+		{``, true, rpc.BlockNumber(0)},
+	}
+)
+
+func TestUnmarshalJSON(t *testing.T) {
+	for i, test := range tests {
+		var num rpc.BlockNumber
+		err := json.Unmarshal([]byte(test.input), &num)
+		if test.mustFail && err == nil {
+			t.Errorf("Test %d should fail", i)
+			continue
+		}
+		if !test.mustFail && err != nil {
+			t.Errorf("Test %d should pass but got err: %v", i, err)
+			continue
+		}
+		if num != test.expected {
+			t.Errorf("Test %d got unexpected value, want %d, got %d", i, test.expected, num)
+		}
+	}
+}
+
+func TestMarshalJSON(t *testing.T) {
+	for i, test := range tests {
+		var num rpc.BlockNumber
+		want, err := json.Marshal(test.expected)
+		assert.Nil(t, err)
+		if !test.mustFail {
+			err = json.Unmarshal([]byte(test.input), &num)
+			assert.Nil(t, err)
+			got, err := json.Marshal(&num)
+			assert.Nil(t, err)
+			if string(want) != string(got) {
+				t.Errorf("Test %d got unexpected value, want %d, got %d", i, test.expected, num)
+
+			}
+		}
+	}
+}
+
+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, 6)
+	assert.Nil(t, err)
+	assert.Equal(t, uint64(0), confirmed)
+
+	client.val = 7
+	confirmed, err = utils.GetLatestConfirmedBlockNumber(ctx, &client, 6)
+	assert.Nil(t, err)
+	assert.Equal(t, uint64(1), confirmed)
+}

build/dockerfiles/coordinator.Dockerfile

@@ -32,12 +32,15 @@ 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.a ./coordinator/verifier/lib/
-RUN cd ./coordinator && go build -v -p 4 -o /bin/coordinator ./cmd
+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/
 
 # 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-08-23
+RUST_VERSION := nightly-2022-12-10
 
 .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
+RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates openssl-dev

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-08-23
+ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-12-10
 
-RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates
+RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates openssl-dev
 
 # 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-08-23
+RUN rustup toolchain install nightly-2022-12-10
 
 # TODO: make this ARG
 ENV CARGO_CHEF_TAG=0.1.41

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

@@ -1,10 +1,11 @@
 ARG ALPINE_VERSION=3.15
 FROM alpine:${ALPINE_VERSION}
 ARG CARGO_CHEF_TAG=0.1.41
-ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-08-23
+ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-12-10
 
 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-08-23
+RUN rustup toolchain install nightly-2022-12-10

common/docker/docker_redis.go

@@ -1,120 +0,0 @@
-package docker
-
-import (
-	"context"
-	"fmt"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types"
-
-	"scroll-tech/common/cmd"
-	"scroll-tech/common/utils"
-)
-
-// ImgRedis the redis image.
-type ImgRedis struct {
-	image string
-	name  string
-	id    string
-
-	port    int
-	running bool
-	cmd     *cmd.Cmd
-}
-
-// NewImgRedis return redis img instance.
-func NewImgRedis(t *testing.T, image string, port int) ImgInstance {
-	img := &ImgRedis{
-		image: image,
-		name:  fmt.Sprintf("%s-%d", image, time.Now().Nanosecond()),
-		port:  port,
-	}
-	img.cmd = cmd.NewCmd(t, img.name, img.prepare()...)
-	return img
-}
-
-// Start run image and check if it is running healthily.
-func (r *ImgRedis) Start() error {
-	id := GetContainerID(r.name)
-	if id != "" {
-		return fmt.Errorf("container already exist, name: %s", r.name)
-	}
-	// Add check status function.
-	keyword := "Ready to accept connections"
-	okCh := make(chan struct{}, 1)
-	r.cmd.RegistFunc(keyword, func(buf string) {
-		if strings.Contains(buf, keyword) {
-			select {
-			case okCh <- struct{}{}:
-			default:
-				return
-			}
-		}
-	})
-	defer r.cmd.UnRegistFunc(keyword)
-
-	// Start redis.
-	r.cmd.RunCmd(true)
-
-	// Wait result of keyword.
-	select {
-	case <-okCh:
-		utils.TryTimes(3, func() bool {
-			r.id = GetContainerID(r.name)
-			return r.id != ""
-		})
-	case <-time.After(time.Second * 10):
-	}
-
-	// Set redis status.
-	r.running = r.id != ""
-	if !r.running {
-		_ = r.Stop()
-		return fmt.Errorf("failed to start image: %s", r.image)
-	}
-	return nil
-}
-
-// Stop the docker container.
-func (r *ImgRedis) Stop() error {
-	if !r.running {
-		return nil
-	}
-	r.running = false
-	ctx := context.Background()
-	id := GetContainerID(r.name)
-	if id != "" {
-		timeout := time.Second * 3
-		if err := cli.ContainerStop(ctx, id, &timeout); err != nil {
-			return err
-		}
-		r.id = id
-	}
-	// remove the stopped container.
-	return cli.ContainerRemove(ctx, r.id, types.ContainerRemoveOptions{})
-}
-
-// Endpoint return the connection endpoint.
-func (r *ImgRedis) Endpoint() string {
-	if !r.running {
-		return ""
-	}
-	port := 6379
-	if r.port != 0 {
-		port = r.port
-	}
-	return fmt.Sprintf("redis://default:redistest@localhost:%d/0", port)
-}
-
-// docker run --name redis-xxx -p randomport:6379 --requirepass "redistest" redis
-func (r *ImgRedis) prepare() []string {
-	cmds := []string{"docker", "run", "--name", r.name}
-	var ports []string
-	if r.port != 0 {
-		ports = append(ports, []string{"-p", strconv.Itoa(r.port) + ":6379"}...)
-	}
-	return append(append(cmds, ports...), r.image)
-}

common/docker/docker_test.go

@@ -16,7 +16,6 @@ func TestDocker(t *testing.T) {
 	t.Run("testL1Geth", testL1Geth)
 	t.Run("testL2Geth", testL2Geth)
 	t.Run("testDB", testDB)
-	t.Run("testRedis", testRedis)
 }
 
 func testL1Geth(t *testing.T) {
@@ -58,8 +57,3 @@ func testDB(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NoError(t, db.Ping())
 }
-
-func testRedis(t *testing.T) {
-	redisImg := NewTestRedisDocker(t)
-	defer redisImg.Stop()
-}

common/docker/interface.go

@@ -33,8 +33,6 @@ func GetContainerID(name string) string {
 	filter := filters.NewArgs()
 	filter.Add("name", name)
 	lst, _ := cli.ContainerList(context.Background(), types.ContainerListOptions{
-		Latest:  true,
-		Limit:   1,
 		Filters: filter,
 	})
 	if len(lst) > 0 {

common/docker/l2geth/Dockerfile

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

common/docker/mock.go

@@ -6,7 +6,6 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/go-redis/redis/v8"
 	"github.com/jmoiron/sqlx"
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/stretchr/testify/assert"
@@ -18,7 +17,6 @@ var (
 	l1StartPort = 10000
 	l2StartPort = 20000
 	dbStartPort = 30000
-	rsStartPort = 40000
 )
 
 // NewTestL1Docker starts and returns l1geth docker
@@ -78,24 +76,3 @@ func NewTestDBDocker(t *testing.T, driverName string) ImgInstance {
 
 	return imgDB
 }
-
-// NewTestRedisDocker starts and run redis docker.
-func NewTestRedisDocker(t *testing.T) ImgInstance {
-	id, _ := rand.Int(rand.Reader, big.NewInt(2000))
-	imgRedis := NewImgRedis(t, "redis", rsStartPort+int(id.Int64()))
-	assert.NoError(t, imgRedis.Start())
-
-	op, err := redis.ParseURL(imgRedis.Endpoint())
-	assert.NoError(t, err)
-	if t.Failed() {
-		return nil
-	}
-
-	rdb := redis.NewClient(op)
-	utils.TryTimes(3, func() bool {
-		err = rdb.Ping(context.Background()).Err()
-		return err == nil
-	})
-
-	return imgRedis
-}

common/go.mod

@@ -4,14 +4,13 @@ go 1.18
 
 require (
 	github.com/docker/docker v20.10.21+incompatible
-	github.com/go-redis/redis/v8 v8.11.5
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/lib/pq v1.10.6
 	github.com/mattn/go-colorable v0.1.8
 	github.com/mattn/go-isatty v0.0.14
 	github.com/orcaman/concurrent-map v1.0.0
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20230113082126-cdaea939622e
-	github.com/stretchr/testify v1.8.1
+	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
 )
 
@@ -19,12 +18,11 @@ require (
 	github.com/Microsoft/go-winio v0.6.0 // indirect
 	github.com/VictoriaMetrics/fastcache v1.6.0 // indirect
 	github.com/btcsuite/btcd v0.20.1-beta // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set v1.8.0 // indirect
 	github.com/deepmap/oapi-codegen v1.8.2 // indirect
-	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/docker/distribution v2.8.1+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
@@ -36,7 +34,7 @@ require (
 	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/graph-gophers/graphql-go v1.3.0 // indirect
@@ -58,7 +56,6 @@ require (
 	github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
-	github.com/onsi/gomega v1.25.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.0.2 // indirect
 	github.com/opentracing/opentracing-go v1.1.0 // indirect

common/go.sum

@@ -78,8 +78,8 @@ github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
 github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -107,8 +107,6 @@ github.com/deepmap/oapi-codegen v1.8.2 h1:SegyeYGcdi0jLLrpbCMoJxnUUn8GBXHsvr4rbz
 github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
@@ -157,8 +155,6 @@ github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
-github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
@@ -203,8 +199,8 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -346,21 +342,20 @@ github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
 github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
+github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
-github.com/onsi/gomega v1.25.0/go.mod h1:r+zV744Re+DiYCIPRlYOTxn0YkOLcAnW8k1xXdMPGhM=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
@@ -409,8 +404,8 @@ 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.20230113082126-cdaea939622e h1:TAqAeQiQI6b+TRyqyQ6qhizqY35LhqYe8lWhG0nNRGw=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230113082126-cdaea939622e/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.3.1 h1:HlR+fMBdjXX1/7cUMqpUgGEhGy/3vN1JpwQ0ovg/Ys8=
 github.com/scroll-tech/zktrie v0.3.1/go.mod h1:CuJFlG1/soTJJBAySxCZgTF7oPvd5qF6utHOEciC43Q=
@@ -435,7 +430,6 @@ github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZL
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -443,9 +437,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
@@ -669,6 +662,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618=
 gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
 gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
 gonum.org/v1/gonum v0.6.0/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU=

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 = ["staticlib"]
+crate-type = ["dylib"]
 
 [dependencies]
 zkevm = { git = "https://github.com/scroll-tech/scroll-zkevm", branch="fix/mpt_limit" }

common/metrics/metrics.go

@@ -0,0 +1,53 @@
+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,6 +12,9 @@ var (
 		&LogFileFlag,
 		&LogJSONFormat,
 		&LogDebugFlag,
+		&MetricsEnabled,
+		&MetricsAddr,
+		&MetricsPort,
 	}
 	// ConfigFileFlag load json type config file.
 	ConfigFileFlag = cli.StringFlag{
@@ -42,4 +45,25 @@ 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.1"
+var tag = "prealpha-v13.0"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {

contracts/scripts/foundry/DeployL2BridgeContracts.s.sol

@@ -13,17 +13,34 @@ 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 { L2TxFeeVault } from "../../src/L2/predeploys/L2TxFeeVault.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";
 
 contract DeployL2BridgeContracts is Script {
     uint256 L2_DEPLOYER_PRIVATE_KEY = vm.envUint("L2_DEPLOYER_PRIVATE_KEY");
+    address L1_TX_FEE_RECIPIENT_ADDR = vm.envAddress("L1_TX_FEE_RECIPIENT_ADDR");
+
+    L2ScrollMessenger messenger;
     ProxyAdmin proxyAdmin;
 
+    address L2_SCROLL_MESSENGER_PREDEPLOY_ADDR = vm.envOr("L2_SCROLL_MESSENGER_PREDEPLOY_ADDR", address(0));
+    address L2_TX_FEE_VAULT_PREDEPLOY_ADDR = vm.envOr("L2_TX_FEE_VAULT_PREDEPLOY_ADDR", address(0));
+    address L2_PROXY_ADMIN_PREDEPLOY_ADDR = vm.envOr("L2_PROXY_ADMIN_PREDEPLOY_ADDR", address(0));
+    address L2_STANDARD_ERC20_GATEWAY_PROXY_PREDEPLOY_ADDR = vm.envOr("L2_STANDARD_ERC20_GATEWAY_PROXY_PREDEPLOY_ADDR", address(0));
+    address L2_GATEWAY_ROUTER_PROXY_PREDEPLOY_ADDR = vm.envOr("L2_GATEWAY_ROUTER_PROXY_PREDEPLOY_ADDR", address(0));
+    address L2_SCROLL_STANDARD_ERC20_FACTORY_PREDEPLOY_ADDR = vm.envOr("L2_SCROLL_STANDARD_ERC20_FACTORY_PREDEPLOY_ADDR", address(0));
+    address L2_CUSTOM_ERC20_GATEWAY_PROXY_PREDEPLOY_ADDR = vm.envOr("L2_CUSTOM_ERC20_GATEWAY_PROXY_PREDEPLOY_ADDR", address(0));
+    address L2_ERC721_GATEWAY_PROXY_PREDEPLOY_ADDR = vm.envOr("L2_ERC721_GATEWAY_PROXY_PREDEPLOY_ADDR", address(0));
+    address L2_ERC1155_GATEWAY_PROXY_PREDEPLOY_ADDR = vm.envOr("L2_ERC1155_GATEWAY_PROXY_PREDEPLOY_ADDR", address(0));
+    address L2_WHITELIST_PREDEPLOY_ADDR = vm.envOr("L2_WHITELIST_PREDEPLOY_ADDR", address(0));
+
     function run() external {
         vm.startBroadcast(L2_DEPLOYER_PRIVATE_KEY);
 
         deployL2ScrollMessenger();
+        deployTxFeeVault();
         deployProxyAdmin();
         deployL2StandardERC20Gateway();
         deployL2GatewayRouter();
@@ -31,24 +48,51 @@ contract DeployL2BridgeContracts is Script {
         deployL2CustomERC20Gateway();
         deployL2ERC721Gateway();
         deployL2ERC1155Gateway();
+        deployL2Whitelist();
 
         vm.stopBroadcast();
     }
 
     function deployL2ScrollMessenger() internal {
-        address owner = vm.addr(L2_DEPLOYER_PRIVATE_KEY);
-        L2ScrollMessenger l2ScrollMessenger = new L2ScrollMessenger(owner);
+        if (L2_SCROLL_MESSENGER_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_SCROLL_MESSENGER_ADDR", address(L2_SCROLL_MESSENGER_PREDEPLOY_ADDR));
+            return;
+        }
 
-        logAddress("L2_SCROLL_MESSENGER_ADDR", address(l2ScrollMessenger));
+        address owner = vm.addr(L2_DEPLOYER_PRIVATE_KEY);
+        messenger = new L2ScrollMessenger(owner);
+
+        logAddress("L2_SCROLL_MESSENGER_ADDR", address(messenger));
+    }
+
+    function deployTxFeeVault() internal {
+        if (L2_TX_FEE_VAULT_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_TX_FEE_VAULT_ADDR", address(L2_TX_FEE_VAULT_PREDEPLOY_ADDR));
+            return;
+        }
+
+        L2TxFeeVault feeVault = new L2TxFeeVault(address(messenger), L1_TX_FEE_RECIPIENT_ADDR);
+
+        logAddress("L2_TX_FEE_VAULT_ADDR", address(feeVault));
     }
 
     function deployProxyAdmin() internal {
+        if (L2_PROXY_ADMIN_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_PROXY_ADMIN_ADDR", address(L2_PROXY_ADMIN_PREDEPLOY_ADDR));
+            return;
+        }
+
         proxyAdmin = new ProxyAdmin();
 
         logAddress("L2_PROXY_ADMIN_ADDR", address(proxyAdmin));
     }
 
     function deployL2StandardERC20Gateway() internal {
+        if (L2_STANDARD_ERC20_GATEWAY_PROXY_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR", address(L2_STANDARD_ERC20_GATEWAY_PROXY_PREDEPLOY_ADDR));
+            return;
+        }
+
         L2StandardERC20Gateway impl = new L2StandardERC20Gateway();
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(impl), address(proxyAdmin), new bytes(0));
 
@@ -57,6 +101,11 @@ contract DeployL2BridgeContracts is Script {
     }
 
     function deployL2GatewayRouter() internal {
+        if (L2_GATEWAY_ROUTER_PROXY_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_GATEWAY_ROUTER_PROXY_ADDR", address(L2_GATEWAY_ROUTER_PROXY_PREDEPLOY_ADDR));
+            return;
+        }
+
         L2GatewayRouter impl = new L2GatewayRouter();
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(impl), address(proxyAdmin), new bytes(0));
 
@@ -65,6 +114,11 @@ contract DeployL2BridgeContracts is Script {
     }
 
     function deployScrollStandardERC20Factory() internal {
+        if (L2_SCROLL_STANDARD_ERC20_FACTORY_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_SCROLL_STANDARD_ERC20_FACTORY_ADDR", address(L2_SCROLL_STANDARD_ERC20_FACTORY_PREDEPLOY_ADDR));
+            return;
+        }
+
         ScrollStandardERC20 tokenImpl = new ScrollStandardERC20();
         ScrollStandardERC20Factory scrollStandardERC20Factory = new ScrollStandardERC20Factory(address(tokenImpl));
 
@@ -73,6 +127,11 @@ contract DeployL2BridgeContracts is Script {
     }
 
     function deployL2CustomERC20Gateway() internal {
+        if (L2_CUSTOM_ERC20_GATEWAY_PROXY_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_CUSTOM_ERC20_GATEWAY_PROXY_ADDR", address(L2_CUSTOM_ERC20_GATEWAY_PROXY_PREDEPLOY_ADDR));
+            return;
+        }
+
         L2CustomERC20Gateway impl = new L2CustomERC20Gateway();
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(impl), address(proxyAdmin), new bytes(0));
 
@@ -81,6 +140,11 @@ contract DeployL2BridgeContracts is Script {
     }
 
     function deployL2ERC721Gateway() internal {
+        if (L2_ERC721_GATEWAY_PROXY_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_ERC721_GATEWAY_PROXY_ADDR", address(L2_ERC721_GATEWAY_PROXY_PREDEPLOY_ADDR));
+            return;
+        }
+
         L2ERC721Gateway impl = new L2ERC721Gateway();
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(impl), address(proxyAdmin), new bytes(0));
 
@@ -89,6 +153,11 @@ contract DeployL2BridgeContracts is Script {
     }
 
     function deployL2ERC1155Gateway() internal {
+        if (L2_ERC1155_GATEWAY_PROXY_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_ERC1155_GATEWAY_PROXY_ADDR", address(L2_ERC1155_GATEWAY_PROXY_PREDEPLOY_ADDR));
+            return;
+        }
+
         L2ERC1155Gateway impl = new L2ERC1155Gateway();
         TransparentUpgradeableProxy proxy = new TransparentUpgradeableProxy(address(impl), address(proxyAdmin), new bytes(0));
 
@@ -96,6 +165,18 @@ contract DeployL2BridgeContracts is Script {
         logAddress("L2_ERC1155_GATEWAY_PROXY_ADDR", address(proxy));
     }
 
+    function deployL2Whitelist() internal {
+        if (L2_WHITELIST_PREDEPLOY_ADDR != address(0)) {
+            logAddress("L2_WHITELIST_ADDR", address(L2_WHITELIST_PREDEPLOY_ADDR));
+            return;
+        }
+
+        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,11 +3,13 @@ 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 {
@@ -20,12 +22,14 @@ contract InitializeL2BridgeContracts is Script {
     address L1_ERC1155_GATEWAY_PROXY_ADDR = vm.envAddress("L1_ERC1155_GATEWAY_PROXY_ADDR");
 
     address L2_SCROLL_MESSENGER_ADDR = vm.envAddress("L2_SCROLL_MESSENGER_ADDR");
+    address L2_TX_FEE_VAULT_ADDR = vm.envAddress("L2_TX_FEE_VAULT_ADDR");
     address L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR = vm.envAddress("L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR");
     address L2_GATEWAY_ROUTER_PROXY_ADDR = vm.envAddress("L2_GATEWAY_ROUTER_PROXY_ADDR");
     address L2_SCROLL_STANDARD_ERC20_FACTORY_ADDR = vm.envAddress("L2_SCROLL_STANDARD_ERC20_FACTORY_ADDR");
     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);
@@ -69,6 +73,21 @@ contract InitializeL2BridgeContracts is Script {
             L2_SCROLL_MESSENGER_ADDR
         );
 
+        // whitelist contracts which can call sendMessage
+        {
+            address[] memory gateways = new address[](6);
+            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;
+            gateways[5] = L2_TX_FEE_VAULT_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,12 +86,10 @@ contract L2ScrollMessenger is ScrollMessengerBase, OwnableBase, IL2ScrollMesseng
     uint256 _deadline,
     uint256 _nonce,
     bytes memory _message
-  ) external override {
+  ) external override onlyWhitelistedSender(msg.sender) {
     // 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");
 

contracts/src/L2/predeploys/L2TxFeeVault.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import { FeeVault } from "../../libraries/FeeVault.sol";
+
+/// @title L2TxFeeVault
+/// @notice The `L2TxFeeVault` contract collects all L2 transaction fees and allows withdrawing these fees to a predefined L1 address.
+/// The minimum withdrawal amount is 10 ether.
+contract L2TxFeeVault is FeeVault {
+  /// @param _messenger The address of L2ScrollMessenger.
+  /// @param _recipient The fee recipient address on L1.
+  constructor(address _messenger, address _recipient) FeeVault(_messenger, _recipient, 10 ether) {}
+}

contracts/src/libraries/FeeVault.sol

@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: MIT
+
+// MIT License
+
+// Copyright (c) 2022 Optimism
+// Copyright (c) 2022 Scroll
+
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+pragma solidity ^0.8.0;
+
+import { IL2ScrollMessenger } from "../L2/IL2ScrollMessenger.sol";
+
+/**
+ * @title FeeVault
+ * @notice The FeeVault contract contains the basic logic for the various different vault contracts
+ *         used to hold fee revenue generated by the L2 system.
+ */
+abstract contract FeeVault {
+  /**
+   * @notice Emits each time that a withdrawal occurs.
+   *
+   * @param value Amount that was withdrawn (in wei).
+   * @param to    Address that the funds were sent to.
+   * @param from  Address that triggered the withdrawal.
+   */
+  event Withdrawal(uint256 value, address to, address from);
+
+  /**
+   * @notice Minimum balance before a withdrawal can be triggered.
+   */
+  uint256 public MIN_WITHDRAWAL_AMOUNT;
+
+  /**
+   * @notice Scroll L2 messenger address.
+   */
+  address public MESSENGER;
+
+  /**
+   * @notice Wallet that will receive the fees on L1.
+   */
+  address public RECIPIENT;
+
+  /**
+   * @notice Total amount of wei processed by the contract.
+   */
+  uint256 public totalProcessed;
+
+  /**
+   * @param _recipient           Wallet that will receive the fees on L1.
+   * @param _minWithdrawalAmount Minimum balance before a withdrawal can be triggered.
+   */
+  constructor(
+    address _messenger,
+    address _recipient,
+    uint256 _minWithdrawalAmount
+  ) {
+    MIN_WITHDRAWAL_AMOUNT = _minWithdrawalAmount;
+    MESSENGER = _messenger;
+    RECIPIENT = _recipient;
+  }
+
+  /**
+   * @notice Allow the contract to receive ETH.
+   */
+  receive() external payable {}
+
+  /**
+   * @notice Triggers a withdrawal of funds to the L1 fee wallet.
+   */
+  function withdraw() external {
+    uint256 value = address(this).balance;
+
+    require(
+      value >= MIN_WITHDRAWAL_AMOUNT,
+      "FeeVault: withdrawal amount must be greater than minimum withdrawal amount"
+    );
+
+    unchecked {
+      totalProcessed += value;
+    }
+
+    emit Withdrawal(value, RECIPIENT, msg.sender);
+
+    IL2ScrollMessenger(MESSENGER).sendMessage{ value: value }(
+      RECIPIENT,
+      0, // no fee provided
+      bytes(""), // no message (simple eth transfer)
+      0 // _gasLimit is not used for eth transfers
+    );
+  }
+}

contracts/src/test/L2TxFeeVault.t.sol

@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+import { DSTestPlus } from "solmate/test/utils/DSTestPlus.sol";
+
+import { MockScrollMessenger } from "./mocks/MockScrollMessenger.sol";
+import { L2TxFeeVault } from "../L2/predeploys/L2TxFeeVault.sol";
+
+contract L2TxFeeVaultTest is DSTestPlus {
+  MockScrollMessenger private messenger;
+  L2TxFeeVault private vault;
+
+  function setUp() public {
+    messenger = new MockScrollMessenger();
+    vault = new L2TxFeeVault(address(messenger), address(1));
+  }
+
+  function testCantWithdrawBelowMinimum() public {
+    hevm.deal(address(vault), 9 ether);
+    hevm.expectRevert("FeeVault: withdrawal amount must be greater than minimum withdrawal amount");
+    vault.withdraw();
+  }
+
+  function testWithdrawOnce() public {
+    hevm.deal(address(vault), 11 ether);
+    vault.withdraw();
+    assertEq(address(messenger).balance, 11 ether);
+    assertEq(vault.totalProcessed(), 11 ether);
+  }
+
+  function testWithdrawTwice() public {
+    hevm.deal(address(vault), 11 ether);
+    vault.withdraw();
+    assertEq(address(messenger).balance, 11 ether);
+    assertEq(vault.totalProcessed(), 11 ether);
+
+    hevm.deal(address(vault), 22 ether);
+    vault.withdraw();
+    assertEq(address(messenger).balance, 33 ether);
+    assertEq(vault.totalProcessed(), 33 ether);
+  }
+}

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.a ../interface/
+	cd ../common/libzkp/impl && cargo build --release && cp ./target/release/libzkp.so ../interface/
 	rm -rf ./verifier/lib && cp -r ../common/libzkp/interface ./verifier/lib
 
 coordinator: libzkp ## Builds the Coordinator instance.

coordinator/cmd/app/app.go

@@ -5,6 +5,8 @@ import (
 	"os"
 	"os/signal"
 
+	"github.com/scroll-tech/go-ethereum/ethclient"
+
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/urfave/cli/v2"
 
@@ -53,8 +55,13 @@ func action(ctx *cli.Context) error {
 		log.Crit("failed to init db connection", "err", err)
 	}
 
+	client, err := ethclient.Dial(cfg.L2Config.Endpoint)
+	if err != nil {
+		return err
+	}
+
 	// Initialize all coordinator modules.
-	rollerManager, err := coordinator.New(ctx.Context, cfg.RollerManagerConfig, ormFactory)
+	rollerManager, err := coordinator.New(ctx.Context, cfg.RollerManagerConfig, ormFactory, client)
 	if err != nil {
 		return err
 	}

coordinator/config.json

@@ -1,7 +1,6 @@
 {
   "roller_manager_config": {
     "rollers_per_session": 1,
-    "verifier_endpoint": "/tmp/verifier.sock",
     "collection_time": 180,
     "token_time_to_live": 60,
     "verifier": {
@@ -11,15 +10,10 @@
     }
   },
   "db_config": {
-    "persistence": {
-      "driver_name": "postgres",
-      "dsn": "postgres://admin:123456@localhost/test?sslmode=disable"
-    },
-    "redis": {
-      "url": "redis://default:@localhost:6379/0",
-      "expirations": {
-        "trace": 3600
-      }
-    }
+    "driver_name": "postgres",
+    "dsn": "postgres://admin:123456@localhost/test?sslmode=disable"
+  },
+  "l2_config": {
+    "endpoint": "/var/lib/jenkins/workspace/SequencerPipeline/MyPrivateNetwork/geth.ipc"
   }
 }

coordinator/config/config.go

@@ -24,10 +24,17 @@ type RollerManagerConfig struct {
 	TokenTimeToLive int `json:"token_time_to_live"`
 }
 
+// L2Config loads l2geth configuration items.
+type L2Config struct {
+	// l2geth node url.
+	Endpoint string `json:"endpoint"`
+}
+
 // Config load configuration items.
 type Config struct {
 	RollerManagerConfig *RollerManagerConfig `json:"roller_manager_config"`
 	DBConfig            *db_config.DBConfig  `json:"db_config"`
+	L2Config            *L2Config            `json:"l2_config"`
 }
 
 // VerifierConfig load zk verifier config.

coordinator/go.mod

@@ -5,24 +5,27 @@ go 1.18
 require (
 	github.com/orcaman/concurrent-map v1.0.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20230113082126-cdaea939622e
-	github.com/stretchr/testify v1.8.1
+	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
 )
 
 require (
 	github.com/btcsuite/btcd v0.20.1-beta // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set v1.8.0 // indirect
 	github.com/ethereum/go-ethereum v1.10.26 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/iden3/go-iden3-crypto v0.0.13 // indirect
 	github.com/kr/pretty v0.3.0 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rogpeppe/go-internal v1.8.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect

coordinator/go.sum

@@ -72,8 +72,8 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
 github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -105,6 +105,7 @@ github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r
 github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk=
 github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
 github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts=
+github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw=
 github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
@@ -112,10 +113,12 @@ github.com/ethereum/go-ethereum v1.10.13/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQ
 github.com/ethereum/go-ethereum v1.10.26 h1:i/7d9RBBwiXCEuyduBQzJw/mKmnvzsN14jqBmytw72s=
 github.com/ethereum/go-ethereum v1.10.26/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
+github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c=
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI=
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
 github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
 github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
@@ -179,6 +182,8 @@ github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OI
 github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+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/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
@@ -187,15 +192,19 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc=
+github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE=
 github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuWpEqDnvIw251EVy4zlP8gWbsGj4BsUKCRpYs=
 github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
 github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
+github.com/holiman/uint256 v1.2.0 h1:gpSYcPLWGv4sG43I2mVLiDZCNDh/EpGjSk8tmtxitHM=
 github.com/holiman/uint256 v1.2.0/go.mod h1:y4ga/t+u+Xwd7CpDgZESaRcWy0I7XMlTMA25ApIH5Jw=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/huin/goupnp v1.0.2/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSamkM=
+github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ=
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/iden3/go-iden3-crypto v0.0.12/go.mod h1:swXIv0HFbJKobbQBtsB50G7IHr6PbTowutSew/iBEoo=
@@ -214,6 +223,7 @@ github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bS
 github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0=
 github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po=
 github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
+github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
@@ -257,6 +267,7 @@ github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIG
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc=
 github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc=
@@ -264,6 +275,8 @@ github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
@@ -271,6 +284,9 @@ github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsO
 github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
+github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A=
 github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
@@ -322,17 +338,19 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
 github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc=
+github.com/rjeczalik/notify v0.9.1 h1:CLCKso/QK1snAlnhNR/CNvNiFU2saUtjV0bx3EwNeCE=
 github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
 github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
+github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
 github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU=
 github.com/russross/blackfriday/v2 v2.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.20230113082126-cdaea939622e h1:TAqAeQiQI6b+TRyqyQ6qhizqY35LhqYe8lWhG0nNRGw=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230113082126-cdaea939622e/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.3.1 h1:HlR+fMBdjXX1/7cUMqpUgGEhGy/3vN1JpwQ0ovg/Ys8=
 github.com/scroll-tech/zktrie v0.3.1/go.mod h1:CuJFlG1/soTJJBAySxCZgTF7oPvd5qF6utHOEciC43Q=
@@ -350,11 +368,11 @@ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasO
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg=
 github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -362,9 +380,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
@@ -374,6 +391,7 @@ github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYa
 github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM=
 github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
 github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
+github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef h1:wHSqTBrZW24CsNJDfeh9Ex6Pm0Rcpc7qrgKBiL44vF4=
 github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
 github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y=
@@ -516,6 +534,7 @@ golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -534,9 +553,11 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -623,6 +644,7 @@ gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
 gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0=
 gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

coordinator/manager.go

@@ -11,6 +11,9 @@ import (
 
 	cmap "github.com/orcaman/concurrent-map"
 	"github.com/patrickmn/go-cache"
+	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/core/types"
+	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/scroll-tech/go-ethereum/rpc"
 
@@ -71,6 +74,9 @@ type Manager struct {
 	// db interface
 	orm database.OrmFactory
 
+	// l2geth client
+	*ethclient.Client
+
 	// Token cache
 	tokenCache *cache.Cache
 	// A mutex guarding registration
@@ -79,7 +85,7 @@ type Manager struct {
 
 // New returns a new instance of Manager. The instance will be not fully prepared,
 // and still needs to be finalized and ran by calling `manager.Start`.
-func New(ctx context.Context, cfg *config.RollerManagerConfig, orm database.OrmFactory) (*Manager, error) {
+func New(ctx context.Context, cfg *config.RollerManagerConfig, orm database.OrmFactory, client *ethclient.Client) (*Manager, error) {
 	v, err := verifier.NewVerifier(cfg.Verifier)
 	if err != nil {
 		return nil, err
@@ -94,6 +100,7 @@ func New(ctx context.Context, cfg *config.RollerManagerConfig, orm database.OrmF
 		failedSessionInfos: make(map[string]*SessionInfo),
 		verifier:           v,
 		orm:                orm,
+		Client:             client,
 		tokenCache:         cache.New(time.Duration(cfg.TokenTimeToLive)*time.Second, 1*time.Hour),
 	}, nil
 }
@@ -418,12 +425,29 @@ func (m *Manager) StartProofGenerationSession(task *orm.BlockBatch) (success boo
 		}
 	}()
 
-	// Get traces by batch id.
-	traces, err := m.orm.GetBlockTraces(map[string]interface{}{"batch_id": task.ID})
+	// Get block traces.
+	blockInfos, err := m.orm.GetBlockInfos(map[string]interface{}{"batch_id": task.ID})
 	if err != nil {
-		log.Error("failed to get block traces", "batch_id", task.ID, "error", err)
+		log.Error(
+			"could not GetBlockInfos",
+			"batch_id", task.ID,
+			"error", err,
+		)
 		return false
 	}
+	traces := make([]*types.BlockTrace, len(blockInfos))
+	for i, blockInfo := range blockInfos {
+		traces[i], err = m.Client.GetBlockTraceByHash(m.ctx, common.HexToHash(blockInfo.Hash))
+		if err != nil {
+			log.Error(
+				"could not GetBlockTraceByNumber",
+				"block number", blockInfo.Number,
+				"block hash", blockInfo.Hash,
+				"error", err,
+			)
+			return false
+		}
+	}
 
 	// Dispatch task to rollers.
 	rollers := make(map[string]*orm.RollerStatus)

coordinator/manager_test.go

@@ -36,10 +36,8 @@ import (
 )
 
 var (
-	dbImg    docker.ImgInstance
-	redisImg docker.ImgInstance
-
-	cfg *bridge_config.Config
+	cfg   *bridge_config.Config
+	dbImg docker.ImgInstance
 )
 
 func randomURL() string {
@@ -53,25 +51,12 @@ func setEnv(t *testing.T) (err error) {
 	assert.NoError(t, err)
 
 	// Create db container.
-	dbImg = docker.NewTestDBDocker(t, cfg.DBConfig.Persistence.DriverName)
-	cfg.DBConfig.Persistence.DSN = dbImg.Endpoint()
-
-	// Create redis container.
-	redisImg = docker.NewTestRedisDocker(t)
-	cfg.DBConfig.Redis.URL = redisImg.Endpoint()
+	dbImg = docker.NewTestDBDocker(t, cfg.DBConfig.DriverName)
+	cfg.DBConfig.DSN = dbImg.Endpoint()
 
 	return
 }
 
-func free(t *testing.T) {
-	if dbImg != nil {
-		assert.NoError(t, dbImg.Stop())
-	}
-	if redisImg != nil {
-		assert.NoError(t, redisImg.Stop())
-	}
-}
-
 func TestApis(t *testing.T) {
 	// Set up the test environment.
 	assert.True(t, assert.NoError(t, setEnv(t)), "failed to setup the test environment.")
@@ -88,7 +73,7 @@ func TestApis(t *testing.T) {
 
 	// Teardown
 	t.Cleanup(func() {
-		free(t)
+		dbImg.Stop()
 	})
 }
 
@@ -500,7 +485,7 @@ func setupCoordinator(t *testing.T, dbCfg *database.DBConfig, rollersPerSession
 		Verifier:          &coordinator_config.VerifierConfig{MockMode: true},
 		CollectionTime:    1,
 		TokenTimeToLive:   5,
-	}, db)
+	}, db, nil)
 	assert.NoError(t, err)
 	assert.NoError(t, rollerManager.Start())
 

coordinator/verifier/verifier.go

@@ -3,8 +3,8 @@
 package verifier
 
 /*
-#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
+#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
 #include <stdlib.h>
 #include "./lib/libzkp.h"
 */

coordinator/verifier/verifier_test.go

@@ -16,17 +16,23 @@ 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: "../assets/test_params",
-		AggVkPath:  "../assets/agg_vk",
+		ParamsPath: paramsPath,
+		AggVkPath:  aggVkPath,
 	}
 	v, err := verifier.NewVerifier(cfg)
 	as.NoError(err)
 
-	f, err := os.Open("../assets/agg_proof")
+	f, err := os.Open(proofPath)
 	as.NoError(err)
 	byt, err := io.ReadAll(f)
 	as.NoError(err)

database/cache/fastcache.go

@@ -1,139 +0,0 @@
-package cache
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"github.com/VictoriaMetrics/fastcache"
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/core/types"
-	"math/big"
-	"sync"
-	"time"
-)
-
-var (
-	defFastConfig = &FastConfig{
-		CacheSize:      64 * 1024 * 1024,
-		TraceExpireSec: 3600,
-	}
-)
-
-type FastConfig struct {
-	CacheSize      int
-	TraceExpireSec int64
-}
-
-type FastCache struct {
-	// trace expire time second.
-	traceExpireSec int64
-	// fast cache handler.
-	cache *fastcache.Cache
-	// Handle all the key and it's insert time.
-	expireTime sync.Map
-}
-
-func NewFastCache(ctx context.Context, cfg *FastConfig) Cache {
-	if cfg == nil {
-		cfg = defFastConfig
-	}
-	cache := &FastCache{
-		cache:          fastcache.New(cfg.CacheSize),
-		traceExpireSec: cfg.TraceExpireSec,
-	}
-
-	go cache.loop(ctx)
-	return cache
-}
-
-func (f *FastCache) loop(ctx context.Context) {
-	tick := time.NewTicker(time.Second * 10)
-	for {
-		select {
-		case <-ctx.Done():
-			// Free cache.
-			f.cache.Reset()
-			return
-		case <-tick.C:
-			f.expireTime.Range(func(key, value any) bool {
-				number := key.(*big.Int)
-				if f.isExpired(number) {
-					// Delete key in expire map.
-					f.freeTrace(number)
-				}
-				return true
-			})
-		}
-	}
-}
-
-func (f *FastCache) ExistTrace(ctx context.Context, number *big.Int) (bool, error) {
-	// Get hash by number.
-	if f.isExpired(number) {
-		f.freeTrace(number)
-		return false, nil
-	}
-	return true, nil
-}
-
-func (f *FastCache) GetBlockTrace(ctx context.Context, hash common.Hash) (*types.BlockTrace, error) {
-	data := f.cache.Get(nil, hash.Bytes())
-	if data == nil {
-		return nil, fmt.Errorf("trace if not stored in fastcache, hash: %s", hash.String())
-	}
-	var trace = &types.BlockTrace{}
-	return trace, json.Unmarshal(data, &trace)
-}
-
-func (f *FastCache) SetBlockTrace(ctx context.Context, trace *types.BlockTrace) error {
-	hash := trace.Header.Hash()
-	number := trace.Header.Number
-
-	// The trace is not expired, don't need to reset.
-	if !f.isExpired(number) {
-		return nil
-	} else {
-		// Try to delete the fragment data.
-		f.freeTrace(number)
-	}
-
-	// Unmarshal trace.
-	data, err := json.Marshal(trace)
-	if err != nil {
-		return err
-	}
-
-	// Get time stamp(second unit).
-	curSec := time.Now().Unix()
-	// Set expire time.
-	f.expireTime.Store(number, curSec)
-	// Set index of number to hash.
-	f.cache.Set(number.Bytes(), hash.Bytes())
-	// Set trace content in memory cache.
-	f.cache.Set(hash.Bytes(), data)
-
-	return nil
-}
-
-// If the trace is expired delete the number and
-func (f *FastCache) freeTrace(number *big.Int) {
-	val := f.cache.Get(nil, number.Bytes())
-	if val == nil {
-		return
-	}
-	// delete number index.
-	f.cache.Del(number.Bytes())
-	// delete trace content.
-	f.cache.Del(val)
-	// delete expire key.
-	f.expireTime.Delete(number)
-}
-
-func (f *FastCache) isExpired(key interface{}) bool {
-	curSec := time.Now().Unix()
-	val, ok := f.expireTime.Load(key)
-	if ok {
-		return curSec-val.(int64) > f.traceExpireSec
-	}
-	return false
-}

database/cache/fastcache_test.go

@@ -1,25 +0,0 @@
-package cache_test
-
-import (
-	"context"
-	"encoding/json"
-	"github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/stretchr/testify/assert"
-	"os"
-	"scroll-tech/database/cache"
-	"testing"
-)
-
-func TestFastCache(t *testing.T) {
-	fdb := cache.NewFastCache(context.Background(), &cache.FastConfig{})
-
-	var (
-		data  []byte
-		trace = &types.BlockTrace{}
-	)
-	data, err := os.ReadFile("../../common/testdata/blockTrace_02.json")
-	assert.NoError(t, err)
-
-	assert.NoError(t, json.Unmarshal(data, &trace))
-	assert.NoError(t, fdb.SetBlockTrace(context.Background(), trace))
-}

database/cache/interface.go

@@ -1,16 +0,0 @@
-package cache
-
-import (
-	"context"
-	"math/big"
-
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/core/types"
-)
-
-// Cache cache common interface.
-type Cache interface {
-	ExistTrace(ctx context.Context, number *big.Int) (bool, error)
-	GetBlockTrace(ctx context.Context, hash common.Hash) (*types.BlockTrace, error)
-	SetBlockTrace(ctx context.Context, trace *types.BlockTrace) error
-}

database/cache/redis.go

@@ -1,104 +0,0 @@
-package cache
-
-import (
-	"context"
-	"encoding/json"
-	"math/big"
-	"time"
-
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/core/types"
-
-	"github.com/redis/go-redis/v9"
-)
-
-// RedisConfig redis cache config.
-type RedisConfig struct {
-	URL         string           `json:"url"`
-	Mode        string           `json:"mode,omitempty"`
-	Expirations map[string]int64 `json:"expirations,omitempty"`
-}
-
-// RedisClientWrapper handle redis client and some expires.
-type RedisClientWrapper struct {
-	client      redisClient
-	traceExpire time.Duration
-}
-
-// redisClient wrap around single-redis-node / redis-cluster
-type redisClient interface {
-	Exists(context.Context, ...string) *redis.IntCmd
-	Set(context.Context, string, interface{}, time.Duration) *redis.StatusCmd
-	Get(context.Context, string) *redis.StringCmd
-}
-
-// NewRedisClientWrapper create a redis client and become Cache interface.
-func NewRedisClientWrapper(redisConfig *RedisConfig) (Cache, error) {
-	var traceExpire = time.Second * 60
-	if val, exist := redisConfig.Expirations["trace"]; exist {
-		traceExpire = time.Duration(val) * time.Second
-	}
-
-	if redisConfig.Mode == "cluster" {
-		op, err := redis.ParseClusterURL(redisConfig.URL)
-		if err != nil {
-			return nil, err
-		}
-		return &RedisClientWrapper{
-			client:      redis.NewClusterClient(op),
-			traceExpire: traceExpire,
-		}, nil
-	}
-
-	op, err := redis.ParseURL(redisConfig.URL)
-	if err != nil {
-		return nil, err
-	}
-	return &RedisClientWrapper{
-		client:      redis.NewClient(op),
-		traceExpire: traceExpire,
-	}, nil
-}
-
-// ExistTrace check the trace is exist or not.
-func (r *RedisClientWrapper) ExistTrace(ctx context.Context, number *big.Int) (bool, error) {
-	n, err := r.client.Exists(ctx, number.String()).Result()
-	return err == nil && n > 0, err
-}
-
-// SetBlockTrace Set trace to redis.
-func (r *RedisClientWrapper) SetBlockTrace(ctx context.Context, trace *types.BlockTrace) (setErr error) {
-	hash, number := trace.Header.Hash().String(), trace.Header.Number.String()
-
-	// If return error or the trace is exist return this function.
-	n, err := r.client.Exists(ctx, hash).Result()
-	if err != nil || n > 0 {
-		return err
-	}
-	// Set trace expire time.
-	defer func() {
-		if setErr == nil {
-			r.client.Set(ctx, number, hash, r.traceExpire)
-		}
-	}()
-
-	var data []byte
-	data, setErr = json.Marshal(trace)
-	if setErr != nil {
-		return setErr
-	}
-	return r.client.Set(ctx, hash, data, r.traceExpire).Err()
-}
-
-// GetBlockTrace get block trace by number, hash.
-func (r *RedisClientWrapper) GetBlockTrace(ctx context.Context, hash common.Hash) (*types.BlockTrace, error) {
-	// Get trace content.
-	data, err := r.client.Get(ctx, hash.String()).Bytes()
-	if err != nil {
-		return nil, err
-	}
-
-	// Unmarshal trace and return result.
-	var trace types.BlockTrace
-	return &trace, json.Unmarshal(data, &trace)
-}

database/cache/redis_test.go

@@ -1,46 +0,0 @@
-package cache_test
-
-import (
-	"context"
-	"encoding/json"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/stretchr/testify/assert"
-
-	"scroll-tech/common/docker"
-
-	"scroll-tech/database/cache"
-)
-
-func TestRedisCache(t *testing.T) {
-	redisImg := docker.NewTestRedisDocker(t)
-	defer redisImg.Stop()
-	rdb, err := cache.NewRedisClientWrapper(&cache.RedisConfig{
-		URL: redisImg.Endpoint(),
-		Expirations: map[string]int64{
-			"trace": 3600,
-		},
-	})
-	assert.NoError(t, err)
-
-	var (
-		data  []byte
-		trace = &types.BlockTrace{}
-	)
-	data, err = os.ReadFile("../../common/testdata/blockTrace_02.json")
-	assert.NoError(t, err)
-
-	assert.NoError(t, json.Unmarshal(data, &trace))
-	assert.NoError(t, rdb.SetBlockTrace(context.Background(), trace))
-
-	exist, err := rdb.ExistTrace(context.Background(), trace.Header.Number)
-	assert.NoError(t, err)
-	assert.Equal(t, true, exist)
-}
-
-func TestNewRedisClientWrapper(t *testing.T) {
-	t.Log(time.Now().Unix())
-}

database/cmd/app/client.go

@@ -20,9 +20,8 @@ func getConfig(ctx *cli.Context) (*database.DBConfig, error) {
 	return dbCfg, nil
 }
 
-func initDB(cfg *database.DBConfig) (*sqlx.DB, error) {
-	dbCfg := cfg.Persistence
-	factory, err := database.NewOrmFactory(cfg)
+func initDB(dbCfg *database.DBConfig) (*sqlx.DB, error) {
+	factory, err := database.NewOrmFactory(dbCfg)
 	if err != nil {
 		return nil, err
 	}

database/config.go

@@ -4,12 +4,10 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
-
-	"scroll-tech/database/cache"
 )
 
-// PersistenceConfig persistence db config.
-type PersistenceConfig struct {
+// DBConfig db config
+type DBConfig struct {
 	// data source name
 	DSN        string `json:"dsn"`
 	DriverName string `json:"driver_name"`
@@ -18,12 +16,6 @@ type PersistenceConfig struct {
 	MaxIdleNum int `json:"maxIdleNum" default:"20"`
 }
 
-// DBConfig db config
-type DBConfig struct {
-	Persistence *PersistenceConfig `json:"persistence"`
-	Redis       *cache.RedisConfig `json:"redis"`
-}
-
 // NewConfig returns a new instance of Config.
 func NewConfig(file string) (*DBConfig, error) {
 	buf, err := os.ReadFile(filepath.Clean(file))

database/config.json

@@ -1,12 +1,4 @@
 {
-  "persistence": {
-    "driver_name": "postgres",
-    "dsn": "postgres://admin:123456@localhost/test?sslmode=disable"
-  },
-  "redis": {
-    "url": "redis://default:@localhost:6379/0",
-    "expirations": {
-      "trace": 3600
-    }
-  }
+  "dsn": "postgres://postgres:123456@localhost:5444/test?sslmode=disable",
+  "driver_name": "postgres"
 }

database/go.mod

@@ -7,22 +7,18 @@ require (
 	github.com/lib/pq v1.10.6
 	github.com/mattn/go-sqlite3 v1.14.14
 	github.com/pressly/goose/v3 v3.7.0
-	github.com/redis/go-redis/v9 v9.0.0-rc.4
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20230113082126-cdaea939622e
-	github.com/stretchr/testify v1.8.1
+	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
 )
 
 require (
-	github.com/VictoriaMetrics/fastcache v1.12.0 // indirect
 	github.com/btcsuite/btcd v0.20.1-beta // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/ethereum/go-ethereum v1.10.26 // indirect
 	github.com/go-stack/stack v1.8.0 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
 	github.com/iden3/go-iden3-crypto v0.0.13 // indirect
 	github.com/kr/pretty v0.3.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect

database/go.sum

@@ -38,8 +38,6 @@ github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAE
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c3fqvvgKm5o=
 github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw=
-github.com/VictoriaMetrics/fastcache v1.12.0 h1:vnVi/y9yKDcD9akmc4NqAoqgQhJrOwUF+j9LTgn4QDE=
-github.com/VictoriaMetrics/fastcache v1.12.0/go.mod h1:tjiYeEfYXCqacuvYw/7UoDIeJaNxq6132xHICNP77w8=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
@@ -72,12 +70,10 @@ github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46f
 github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
-github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -101,8 +97,6 @@ github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE
 github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-bitstream v0.0.0-20180413035011-3522498ce2c8/go.mod h1:VMaSuZ+SZcx/wljOQKvp5srsbCiKDEb6K2wC4+PiBmQ=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
@@ -119,7 +113,6 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
 github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0=
 github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
-github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
 github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
@@ -179,7 +172,6 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -296,7 +288,6 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
 github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
 github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
-github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
@@ -304,11 +295,9 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
-github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y=
 github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.0.3-0.20180606204148-bd9c31933947/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
 github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
@@ -339,8 +328,6 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
 github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
-github.com/redis/go-redis/v9 v9.0.0-rc.4 h1:JUhsiZMTZknz3vn50zSVlkwcSeTGPd51lMO3IKUrWpY=
-github.com/redis/go-redis/v9 v9.0.0-rc.4/go.mod h1:Vo3EsyWnicKnSKCA7HhgnvnyA74wOA69Cd2Meli5mmA=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc=
 github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho=
@@ -352,8 +339,8 @@ 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.20230113082126-cdaea939622e h1:TAqAeQiQI6b+TRyqyQ6qhizqY35LhqYe8lWhG0nNRGw=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230113082126-cdaea939622e/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.3.1 h1:HlR+fMBdjXX1/7cUMqpUgGEhGy/3vN1JpwQ0ovg/Ys8=
 github.com/scroll-tech/zktrie v0.3.1/go.mod h1:CuJFlG1/soTJJBAySxCZgTF7oPvd5qF6utHOEciC43Q=
@@ -375,7 +362,6 @@ github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZL
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -383,9 +369,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
@@ -483,7 +468,6 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -540,7 +524,6 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
@@ -556,7 +539,6 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -646,7 +628,6 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
 gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

database/migrate/migrate_test.go

@@ -10,30 +10,21 @@ import (
 	"scroll-tech/common/docker"
 
 	"scroll-tech/database"
-	"scroll-tech/database/cache"
 )
 
 var (
-	pgDB     *sqlx.DB
-	dbImg    docker.ImgInstance
-	redisImg docker.ImgInstance
+	pgDB  *sqlx.DB
+	dbImg docker.ImgInstance
 )
 
 func initEnv(t *testing.T) error {
 	// Start db container.
 	dbImg = docker.NewTestDBDocker(t, "postgres")
-	redisImg = docker.NewTestRedisDocker(t)
 
 	// Create db orm handler.
 	factory, err := database.NewOrmFactory(&database.DBConfig{
-		Persistence: &database.PersistenceConfig{
-			DriverName: "postgres",
-			DSN:        dbImg.Endpoint(),
-		},
-		Redis: &cache.RedisConfig{
-			Expirations: map[string]int64{"trace": 30},
-			URL:         redisImg.Endpoint(),
-		},
+		DriverName: "postgres",
+		DSN:        dbImg.Endpoint(),
 	})
 	if err != nil {
 		return err
@@ -57,9 +48,6 @@ func TestMigrate(t *testing.T) {
 		if dbImg != nil {
 			assert.NoError(t, dbImg.Stop())
 		}
-		if redisImg != nil {
-			assert.NoError(t, redisImg.Stop())
-		}
 	})
 }
 

database/migrate/migrations/00001_block_trace.sql

@@ -3,7 +3,6 @@
 
 -- TODO: use foreign key for batch_id?
 -- TODO: why tx_num is bigint?
--- TODO: trace content is stored in cache, this field is empty and can be removed later.
 create table block_trace
 (
     number                  BIGINT          NOT NULL,

database/orm/block_batch.go

@@ -14,8 +14,6 @@ import (
 	"github.com/scroll-tech/go-ethereum/log"
 
 	"scroll-tech/common/utils"
-
-	"scroll-tech/database/cache"
 )
 
 // ProvingStatus block_batch proving_status (unassigned, assigned, proved, verified, submitted)
@@ -103,25 +101,14 @@ type BlockBatch struct {
 }
 
 type blockBatchOrm struct {
-	db    *sqlx.DB
-	cache cache.Cache
+	db *sqlx.DB
 }
 
 var _ BlockBatchOrm = (*blockBatchOrm)(nil)
 
 // NewBlockBatchOrm create an blockBatchOrm instance
-func NewBlockBatchOrm(db *sqlx.DB, cache cache.Cache) BlockBatchOrm {
-	return &blockBatchOrm{db: db, cache: cache}
-}
-
-// GetBatchIDByIndex get batch id by index.
-func (o *blockBatchOrm) GetBatchIDByIndex(index uint64) (string, error) {
-	row := o.db.QueryRowx(`SELECT id FROM public.block_batch WHERE index = $1;`, index)
-	var id string
-	if err := row.Scan(&id); err != nil {
-		return "", err
-	}
-	return id, nil
+func NewBlockBatchOrm(db *sqlx.DB) BlockBatchOrm {
+	return &blockBatchOrm{db: db}
 }
 
 func (o *blockBatchOrm) GetBlockBatches(fields map[string]interface{}, args ...string) ([]*BlockBatch, error) {
@@ -228,8 +215,8 @@ func (o *blockBatchOrm) NewBatchInDBTx(dbTx *sqlx.Tx, startBlock *BlockInfo, end
 			"total_tx_num":       totalTxNum,
 			"total_l2_gas":       totalL2Gas,
 			"created_at":         time.Now(),
-			// "proving_status":     ProvingTaskUnassigned, // actually no need, because we have default value in Persistence schema
-			// "rollup_status":      RollupPending,         // actually no need, because we have default value in Persistence schema
+			// "proving_status":     ProvingTaskUnassigned, // actually no need, because we have default value in DB schema
+			// "rollup_status":      RollupPending,         // actually no need, because we have default value in DB schema
 		}); err != nil {
 		return "", err
 	}

database/orm/block_trace.go

@@ -1,8 +1,8 @@
 package orm
 
 import (
-	"context"
 	"database/sql"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"strings"
@@ -12,24 +12,18 @@ import (
 	"github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/log"
 
-	"scroll-tech/database/cache"
-
 	"scroll-tech/common/utils"
 )
 
 type blockTraceOrm struct {
-	db    *sqlx.DB
-	cache cache.Cache
+	db *sqlx.DB
 }
 
 var _ BlockTraceOrm = (*blockTraceOrm)(nil)
 
 // NewBlockTraceOrm create an blockTraceOrm instance
-func NewBlockTraceOrm(db *sqlx.DB, cache cache.Cache) BlockTraceOrm {
-	return &blockTraceOrm{
-		db:    db,
-		cache: cache,
-	}
+func NewBlockTraceOrm(db *sqlx.DB) BlockTraceOrm {
+	return &blockTraceOrm{db: db}
 }
 
 func (o *blockTraceOrm) Exist(number uint64) (bool, error) {
@@ -55,7 +49,11 @@ func (o *blockTraceOrm) GetBlockTracesLatestHeight() (int64, error) {
 }
 
 func (o *blockTraceOrm) GetBlockTraces(fields map[string]interface{}, args ...string) ([]*types.BlockTrace, error) {
-	query := "SELECT hash FROM block_trace WHERE 1 = 1 "
+	type Result struct {
+		Trace string
+	}
+
+	query := "SELECT trace FROM block_trace WHERE 1 = 1 "
 	for key := range fields {
 		query += fmt.Sprintf("AND %s=:%s ", key, key)
 	}
@@ -67,24 +65,18 @@ func (o *blockTraceOrm) GetBlockTraces(fields map[string]interface{}, args ...st
 		return nil, err
 	}
 
-	var (
-		traces []*types.BlockTrace
-		rdb    = o.cache
-	)
+	var traces []*types.BlockTrace
 	for rows.Next() {
-		var (
-			trace *types.BlockTrace
-			hash  string
-		)
-		if err = rows.Scan(&hash); err != nil {
+		result := &Result{}
+		if err = rows.StructScan(result); err != nil {
 			break
 		}
-
-		trace, err = rdb.GetBlockTrace(context.Background(), common.HexToHash(hash))
+		trace := types.BlockTrace{}
+		err = json.Unmarshal([]byte(result.Trace), &trace)
 		if err != nil {
-			return nil, err
+			break
 		}
-		traces = append(traces, trace)
+		traces = append(traces, &trace)
 	}
 	if err != nil && !errors.Is(err, sql.ErrNoRows) {
 		return nil, err
@@ -161,7 +153,6 @@ func (o *blockTraceOrm) GetHashByNumber(number uint64) (*common.Hash, error) {
 
 func (o *blockTraceOrm) InsertBlockTraces(blockTraces []*types.BlockTrace) error {
 	traceMaps := make([]map[string]interface{}, len(blockTraces))
-	rdb := o.cache
 	for i, trace := range blockTraces {
 		number, hash, txNum, mtime := trace.Header.Number.Int64(),
 			trace.Header.Hash().String(),
@@ -169,22 +160,24 @@ func (o *blockTraceOrm) InsertBlockTraces(blockTraces []*types.BlockTrace) error
 			trace.Header.Time
 
 		gasCost := utils.ComputeTraceGasCost(trace)
+		// clear the `StructLogs` to reduce storage cost
+		for _, executionResult := range trace.ExecutionResults {
+			executionResult.StructLogs = nil
+		}
+		data, err := json.Marshal(trace)
+		if err != nil {
+			log.Error("failed to marshal blockTrace", "hash", hash, "err", err)
+			return err
+		}
 		traceMaps[i] = map[string]interface{}{
-			"number":      number,
-			"hash":        hash,
-			"parent_hash": trace.Header.ParentHash.String(),
-			// Empty json
-			"trace":           "{}",
+			"number":          number,
+			"hash":            hash,
+			"parent_hash":     trace.Header.ParentHash.String(),
+			"trace":           string(data),
 			"tx_num":          txNum,
 			"gas_used":        gasCost,
 			"block_timestamp": mtime,
 		}
-		if rdb != nil {
-			err := rdb.SetBlockTrace(context.Background(), trace)
-			if err != nil {
-				return err
-			}
-		}
 	}
 	_, err := o.db.NamedExec(`INSERT INTO public.block_trace (number, hash, parent_hash, trace, tx_num, gas_used, block_timestamp) VALUES (:number, :hash, :parent_hash, :trace, :tx_num, :gas_used, :block_timestamp);`, traceMaps)
 	if err != nil {

database/orm/interface.go

@@ -137,7 +137,6 @@ type SessionInfoOrm interface {
 
 // BlockBatchOrm block_batch operation interface
 type BlockBatchOrm interface {
-	GetBatchIDByIndex(index uint64) (string, error)
 	GetBlockBatches(fields map[string]interface{}, args ...string) ([]*BlockBatch, error)
 	GetProvingStatusByID(id string) (ProvingStatus, error)
 	GetVerifiedProofAndInstanceByID(id string) ([]byte, []byte, error)

database/orm/l1_message.go

@@ -7,20 +7,17 @@ import (
 
 	"github.com/jmoiron/sqlx"
 	"github.com/scroll-tech/go-ethereum/log"
-
-	"scroll-tech/database/cache"
 )
 
 type l1MessageOrm struct {
-	db    *sqlx.DB
-	cache cache.Cache
+	db *sqlx.DB
 }
 
 var _ L1MessageOrm = (*l1MessageOrm)(nil)
 
 // NewL1MessageOrm create an L1MessageOrm instance
-func NewL1MessageOrm(db *sqlx.DB, cache cache.Cache) L1MessageOrm {
-	return &l1MessageOrm{db: db, cache: cache}
+func NewL1MessageOrm(db *sqlx.DB) L1MessageOrm {
+	return &l1MessageOrm{db: db}
 }
 
 // GetL1MessageByMsgHash fetch message by nonce

database/orm/l2_message.go

@@ -9,20 +9,17 @@ import (
 
 	"github.com/jmoiron/sqlx"
 	"github.com/scroll-tech/go-ethereum/log"
-
-	"scroll-tech/database/cache"
 )
 
 type layer2MessageOrm struct {
-	db    *sqlx.DB
-	cache cache.Cache
+	db *sqlx.DB
 }
 
 var _ L2MessageOrm = (*layer2MessageOrm)(nil)
 
 // NewL2MessageOrm create an L2MessageOrm instance
-func NewL2MessageOrm(db *sqlx.DB, cache cache.Cache) L2MessageOrm {
-	return &layer2MessageOrm{db: db, cache: cache}
+func NewL2MessageOrm(db *sqlx.DB) L2MessageOrm {
+	return &layer2MessageOrm{db: db}
 }
 
 // GetL2MessageByNonce fetch message by nonce

database/orm/session_info.go

@@ -4,20 +4,17 @@ import (
 	"encoding/json"
 
 	"github.com/jmoiron/sqlx"
-
-	"scroll-tech/database/cache"
 )
 
 type sessionInfoOrm struct {
-	db    *sqlx.DB
-	cache cache.Cache
+	db *sqlx.DB
 }
 
 var _ SessionInfoOrm = (*sessionInfoOrm)(nil)
 
 // NewSessionInfoOrm create an sessionInfoOrm instance
-func NewSessionInfoOrm(db *sqlx.DB, cache cache.Cache) SessionInfoOrm {
-	return &sessionInfoOrm{db: db, cache: cache}
+func NewSessionInfoOrm(db *sqlx.DB) SessionInfoOrm {
+	return &sessionInfoOrm{db: db}
 }
 
 func (o *sessionInfoOrm) GetSessionInfosByIDs(ids []string) ([]*SessionInfo, error) {

database/orm_factory.go

@@ -1,12 +1,9 @@
 package database
 
 import (
-	"fmt"
-
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq" //nolint:golint
 
-	"scroll-tech/database/cache"
 	"scroll-tech/database/orm"
 )
 
@@ -17,7 +14,6 @@ type OrmFactory interface {
 	orm.L1MessageOrm
 	orm.L2MessageOrm
 	orm.SessionInfoOrm
-	cache.Cache
 	GetDB() *sqlx.DB
 	Beginx() (*sqlx.Tx, error)
 	Close() error
@@ -30,41 +26,28 @@ type ormFactory struct {
 	orm.L2MessageOrm
 	orm.SessionInfoOrm
 	*sqlx.DB
-	// cache interface.
-	cache.Cache
 }
 
 // NewOrmFactory create an ormFactory factory include all ormFactory interface
 func NewOrmFactory(cfg *DBConfig) (OrmFactory, error) {
-	pCfg, rCfg := cfg.Persistence, cfg.Redis
-	if rCfg == nil {
-		return nil, fmt.Errorf("redis config is empty")
-	}
 	// Initialize sql/sqlx
-	db, err := sqlx.Open(pCfg.DriverName, pCfg.DSN)
+	db, err := sqlx.Open(cfg.DriverName, cfg.DSN)
 	if err != nil {
 		return nil, err
 	}
 
-	db.SetMaxIdleConns(pCfg.MaxOpenNum)
-	db.SetMaxIdleConns(pCfg.MaxIdleNum)
+	db.SetMaxIdleConns(cfg.MaxOpenNum)
+	db.SetMaxIdleConns(cfg.MaxIdleNum)
 	if err = db.Ping(); err != nil {
 		return nil, err
 	}
 
-	// Create redis client.
-	cacheOrm, err := cache.NewRedisClientWrapper(rCfg)
-	if err != nil {
-		return nil, err
-	}
-
 	return &ormFactory{
-		BlockTraceOrm:  orm.NewBlockTraceOrm(db, cacheOrm),
-		BlockBatchOrm:  orm.NewBlockBatchOrm(db, cacheOrm),
-		L1MessageOrm:   orm.NewL1MessageOrm(db, cacheOrm),
-		L2MessageOrm:   orm.NewL2MessageOrm(db, cacheOrm),
-		SessionInfoOrm: orm.NewSessionInfoOrm(db, cacheOrm),
-		Cache:          cacheOrm,
+		BlockTraceOrm:  orm.NewBlockTraceOrm(db),
+		BlockBatchOrm:  orm.NewBlockBatchOrm(db),
+		L1MessageOrm:   orm.NewL1MessageOrm(db),
+		L2MessageOrm:   orm.NewL2MessageOrm(db),
+		SessionInfoOrm: orm.NewSessionInfoOrm(db),
 		DB:             db,
 	}, nil
 }

database/orm_test.go

@@ -15,7 +15,6 @@ import (
 	"scroll-tech/common/docker"
 
 	"scroll-tech/database"
-	"scroll-tech/database/cache"
 	"scroll-tech/database/migrate"
 	"scroll-tech/database/orm"
 )
@@ -81,7 +80,6 @@ var (
 
 	dbConfig   *database.DBConfig
 	dbImg      docker.ImgInstance
-	redisImg   docker.ImgInstance
 	ormBlock   orm.BlockTraceOrm
 	ormLayer1  orm.L1MessageOrm
 	ormLayer2  orm.L2MessageOrm
@@ -91,18 +89,9 @@ var (
 
 func setupEnv(t *testing.T) error {
 	// Init db config and start db container.
-	dbImg = docker.NewTestDBDocker(t, "postgres")
-	redisImg = docker.NewTestRedisDocker(t)
-	dbConfig = &database.DBConfig{
-		Persistence: &database.PersistenceConfig{
-			DriverName: "postgres",
-			DSN:        dbImg.Endpoint(),
-		},
-		Redis: &cache.RedisConfig{
-			URL:         redisImg.Endpoint(),
-			Expirations: map[string]int64{"trace": 30},
-		},
-	}
+	dbConfig = &database.DBConfig{DriverName: "postgres"}
+	dbImg = docker.NewTestDBDocker(t, dbConfig.DriverName)
+	dbConfig.DSN = dbImg.Endpoint()
 
 	// Create db handler and reset db.
 	factory, err := database.NewOrmFactory(dbConfig)
@@ -111,11 +100,11 @@ func setupEnv(t *testing.T) error {
 	assert.NoError(t, migrate.ResetDB(db.DB))
 
 	// Init several orm handles.
-	ormBlock = orm.BlockTraceOrm(factory)
-	ormLayer1 = orm.L1MessageOrm(factory)
-	ormLayer2 = orm.L2MessageOrm(factory)
-	ormBatch = orm.BlockBatchOrm(factory)
-	ormSession = orm.SessionInfoOrm(factory)
+	ormBlock = orm.NewBlockTraceOrm(db)
+	ormLayer1 = orm.NewL1MessageOrm(db)
+	ormLayer2 = orm.NewL2MessageOrm(db)
+	ormBatch = orm.NewBlockBatchOrm(db)
+	ormSession = orm.NewSessionInfoOrm(db)
 
 	templateBlockTrace, err := os.ReadFile("../common/testdata/blockTrace_03.json")
 	if err != nil {
@@ -126,21 +115,16 @@ func setupEnv(t *testing.T) error {
 	return json.Unmarshal(templateBlockTrace, blockTrace)
 }
 
-func freeDB(t *testing.T) {
-	if dbImg != nil {
-		assert.NoError(t, dbImg.Stop())
-	}
-	if redisImg != nil {
-		assert.NoError(t, redisImg.Stop())
-	}
-}
-
 // TestOrmFactory run several test cases.
 func TestOrmFactory(t *testing.T) {
+	defer func() {
+		if dbImg != nil {
+			assert.NoError(t, dbImg.Stop())
+		}
+	}()
 	if err := setupEnv(t); err != nil {
 		t.Fatal(err)
 	}
-	defer freeDB(t)
 
 	t.Run("testOrmBlockTraces", testOrmBlockTraces)
 

go.work.sum

@@ -119,6 +119,7 @@ github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KE
 github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
 github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tFY=
 github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/gofrs/uuid v3.3.0+incompatible h1:8K4tyRfvU1CYPgJsveYFQMhpFd/wXNM7iK6rR7UHz84=
 github.com/golang-jwt/jwt/v4 v4.3.0 h1:kHL1vqdqWNfATmA0FNMdmZNMyZI1U6O31X4rlIPoBog=
 github.com/golang-jwt/jwt/v4 v4.3.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
@@ -129,15 +130,17 @@ github.com/golang/geo v0.0.0-20190916061304-5b978397cfec h1:lJwO/92dFXWeXOZdoGXg
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 h1:5ZkaAPbicIKTF2I64qf5Fh8Aa83Q/dnOafMYV0OMwjA=
 github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
 github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219 h1:utua3L2IbQJmauC5IXdEA547bcoU5dozgQAfc8Onsg4=
 github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo=
 github.com/google/flatbuffers v1.11.0 h1:O7CEyB8Cb3/DmtxODGtLHcEvpr81Jm5qLg/hsHnxA2A=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa h1:Q75Upo5UN4JbPFURXZ8nLKYUvF85dyFRop/vQ0Rv+64=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc h1:DLpL8pWq0v4JYoRpEhDfsJhhJyGKCcQM2WPW2TJs31c=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0 h1:GOZbcHa3HfsPKPlmyPyN2KEohoMXOhdMbHrvbpl2QaA=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -147,6 +150,7 @@ github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150 h1:vlNjIqmUZ9CMAWsbURYl3a6wZbw7q5RHVvlXTNS/Bs8=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6 h1:UDMh68UUwekSh5iP2OMhRRZJiiBccgV7axzUG8vi56c=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/influxdata/flux v0.65.1 h1:77BcVUCzvN5HMm8+j9PRBQ4iZcu98Dl4Y9rf+J5vhnc=
@@ -220,7 +224,6 @@ github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52 h1:RnWNS9Hlm8BI
 github.com/scroll-tech/go-ethereum v1.10.14-0.20221202061207-804e7edc23ba/go.mod h1:jurIpDQ0hqtp9//xxeWzr8X9KMP/+TYn+vz3K1wZrv0=
 github.com/scroll-tech/go-ethereum v1.10.14-0.20221213034543-78c1f57fcfea/go.mod h1:jurIpDQ0hqtp9//xxeWzr8X9KMP/+TYn+vz3K1wZrv0=
 github.com/scroll-tech/go-ethereum v1.10.14-0.20221221073256-5ca70bf3a257/go.mod h1:jurIpDQ0hqtp9//xxeWzr8X9KMP/+TYn+vz3K1wZrv0=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230112091133-2891916a0f81/go.mod h1:jurIpDQ0hqtp9//xxeWzr8X9KMP/+TYn+vz3K1wZrv0=
 github.com/segmentio/kafka-go v0.2.0 h1:HtCSf6B4gN/87yc5qTl7WsxPKQIIGXLPPM1bMCPOsoY=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
 github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
@@ -279,7 +282,9 @@ google.golang.org/api v0.15.0 h1:yzlyyDW/J0w8yNFJIhiAJy4kq74S+1DOLdawELNxFMA=
 google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
 google.golang.org/genproto v0.0.0-20200108215221-bd8f9a0ef82f h1:2wh8dWY8959cBGQvk1RD+/eQBgRYYDaZ+hT0/zsARoA=
 google.golang.org/grpc v1.26.0 h1:2dTRdpdFEEhJYQD8EMLB61nnrzSCTbG38PhqdhvOltg=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
 gopkg.in/errgo.v2 v2.1.0 h1:0vLT13EuvQ0hNvakwLuFZ/jYrLp5F3kcWHXdRggjCE8=
 gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=

roller/Makefile

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

roller/assets/traces/01.json

@@ -1,200 +1,41 @@
 {
-  "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
-        ]
-      }
-    ]
-  }
+  "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": []
 }

roller/assets/traces/04.json

@@ -0,0 +1,41 @@
+{
+  "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/go.mod

@@ -3,15 +3,15 @@ module scroll-tech/roller
 go 1.18
 
 require (
-	github.com/scroll-tech/go-ethereum v1.10.14-0.20230113082126-cdaea939622e
-	github.com/stretchr/testify v1.8.1
+	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
 	go.etcd.io/bbolt v1.3.6
 )
 
 require (
 	github.com/btcsuite/btcd v0.20.1-beta // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/ethereum/go-ethereum v1.10.26 // indirect

roller/go.sum

@@ -72,8 +72,8 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA
 github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
+github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
@@ -323,8 +323,8 @@ 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.20230113082126-cdaea939622e h1:TAqAeQiQI6b+TRyqyQ6qhizqY35LhqYe8lWhG0nNRGw=
-github.com/scroll-tech/go-ethereum v1.10.14-0.20230113082126-cdaea939622e/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.3.1 h1:HlR+fMBdjXX1/7cUMqpUgGEhGy/3vN1JpwQ0ovg/Ys8=
 github.com/scroll-tech/zktrie v0.3.1/go.mod h1:CuJFlG1/soTJJBAySxCZgTF7oPvd5qF6utHOEciC43Q=
@@ -346,7 +346,6 @@ github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZL
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
@@ -354,9 +353,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
 github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=

roller/prover/prover.go

@@ -4,8 +4,8 @@
 package prover
 
 /*
-#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
+#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
 #include <stdlib.h>
 #include "./lib/libzkp.h"
 */

roller/prover/prover_test.go

@@ -17,17 +17,12 @@ import (
 )
 
 const (
-	paramsPath = "../assets/test_params"
-	seedPath   = "../assets/test_seed"
-	tracesPath = "../assets/traces"
+	paramsPath    = "../assets/test_params"
+	seedPath      = "../assets/test_seed"
+	tracesPath    = "../assets/traces"
+	proofDumpPath = "agg_proof"
 )
 
-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{
@@ -50,11 +45,20 @@ func TestFFI(t *testing.T) {
 		as.NoError(err)
 		byt, err = io.ReadAll(f)
 		as.NoError(err)
-		rpcTrace := &RPCTrace{}
-		as.NoError(json.Unmarshal(byt, rpcTrace))
-		traces = append(traces, rpcTrace.Result)
+		trace := &types.BlockTrace{}
+		as.NoError(json.Unmarshal(byt, trace))
+		traces = append(traces, trace)
 	}
-	_, err = prover.Prove(traces)
+	proof, 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

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"github.com/scroll-tech/go-ethereum/crypto"
+	"github.com/scroll-tech/go-ethereum/rpc"
 	"github.com/stretchr/testify/assert"
 
 	"scroll-tech/database"
@@ -36,7 +37,6 @@ var (
 	l1gethImg docker.ImgInstance
 	l2gethImg docker.ImgInstance
 	dbImg     docker.ImgInstance
-	redisImg  docker.ImgInstance
 
 	timestamp int
 	wsPort    int64
@@ -54,7 +54,6 @@ func setupEnv(t *testing.T) {
 	l1gethImg = docker.NewTestL1Docker(t)
 	l2gethImg = docker.NewTestL2Docker(t)
 	dbImg = docker.NewTestDBDocker(t, "postgres")
-	redisImg = docker.NewTestRedisDocker(t)
 
 	// Create a random ws port.
 	port, _ := rand.Int(rand.Reader, big.NewInt(2000))
@@ -72,7 +71,6 @@ func free(t *testing.T) {
 	assert.NoError(t, l1gethImg.Stop())
 	assert.NoError(t, l2gethImg.Stop())
 	assert.NoError(t, dbImg.Stop())
-	assert.NoError(t, redisImg.Stop())
 
 	// Delete temporary files.
 	assert.NoError(t, os.Remove(bridgeFile))
@@ -122,10 +120,10 @@ func runSender(t *testing.T, endpoint string) *sender.Sender {
 		Endpoint:            endpoint,
 		CheckPendingTime:    3,
 		EscalateBlocks:      100,
-		Confirmations:       0,
+		Confirmations:       rpc.LatestBlockNumber,
 		EscalateMultipleNum: 11,
 		EscalateMultipleDen: 10,
-		TxType:              "DynamicFeeTx",
+		TxType:              "LegacyTx",
 	}, []*ecdsa.PrivateKey{priv})
 	assert.NoError(t, err)
 	return newSender
@@ -145,10 +143,7 @@ func mockBridgeConfig(t *testing.T) string {
 		cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = l2gethImg.Endpoint()
 	}
 	if dbImg != nil {
-		cfg.DBConfig.Persistence.DSN = dbImg.Endpoint()
-	}
-	if redisImg != nil {
-		cfg.DBConfig.Redis.URL = redisImg.Endpoint()
+		cfg.DBConfig.DSN = dbImg.Endpoint()
 	}
 
 	// Store changed bridge config into a temp file.
@@ -167,10 +162,11 @@ func mockCoordinatorConfig(t *testing.T) string {
 
 	cfg.RollerManagerConfig.Verifier.MockMode = true
 	if dbImg != nil {
-		cfg.DBConfig.Persistence.DSN = dbImg.Endpoint()
+		cfg.DBConfig.DSN = dbImg.Endpoint()
 	}
-	if redisImg != nil {
-		cfg.DBConfig.Redis.URL = redisImg.Endpoint()
+
+	if l2gethImg != nil {
+		cfg.L2Config.Endpoint = l2gethImg.Endpoint()
 	}
 
 	data, err := json.Marshal(cfg)
@@ -187,12 +183,8 @@ func mockDatabaseConfig(t *testing.T) string {
 	cfg, err := database.NewConfig("../../database/config.json")
 	assert.NoError(t, err)
 	if dbImg != nil {
-		cfg.Persistence.DSN = dbImg.Endpoint()
+		cfg.DSN = dbImg.Endpoint()
 	}
-	if redisImg != nil {
-		cfg.Redis.URL = redisImg.Endpoint()
-	}
-
 	data, err := json.Marshal(cfg)
 	assert.NoError(t, err)