Merge branch 'develop' into move_coordinator_api

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

.github/workflows/bridge_history_api.yml

@@ -25,20 +25,20 @@ defaults:
     working-directory: 'bridge-history-api'
 
 jobs:
-  # check:
-  #   if: github.event.pull_request.draft == false
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #   - name: Install Go
-  #     uses: actions/setup-go@v2
-  #     with:
-  #       go-version: 1.19.x
-  #   - name: Checkout code
-  #     uses: actions/checkout@v2
-  #   - name: Lint
-  #     run: |
-  #       rm -rf $HOME/.cache/golangci-lint
-  #       make lint
+  check:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+    - name: Install Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.19.x
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Lint
+      run: |
+        rm -rf $HOME/.cache/golangci-lint
+        make lint
   test:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest

.github/workflows/prover_stats_api.yml

@@ -0,0 +1,80 @@
+name: ProverStatsAPI
+
+on:
+  push:
+    branches:
+      - main
+      - staging
+      - develop
+      - alpha
+    paths:
+      - 'prover-stats-api/**'
+      - '.github/workflows/prover_stats_api.yml'
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+    paths:
+      - 'prover-stats-api/**'
+      - '.github/workflows/prover_stats_api.yml'
+
+defaults:
+  run:
+    working-directory: 'prover-stats-api'
+
+jobs:
+  check:
+     if: github.event.pull_request.draft == false
+     runs-on: ubuntu-latest
+     steps:
+     - name: Install Go
+       uses: actions/setup-go@v2
+       with:
+         go-version: 1.19.x
+     - name: Checkout code
+       uses: actions/checkout@v2
+     - name: Lint
+       run: |
+         rm -rf $HOME/.cache/golangci-lint
+         make lint
+  test:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.19.x
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Test
+        run: |
+          make test
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v3
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+        with:
+          flags: prover-stats-api
+  goimports-lint:
+    if: github.event.pull_request.draft == false
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.19.x
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Install goimports
+        run: go install golang.org/x/tools/cmd/goimports
+      - run: goimports -local scroll-tech/prover-stats-api/ -w .
+      - run: go mod tidy
+      # If there are any diffs from goimports or go mod tidy, fail.
+      - name: Verify no changes from goimports and go mod tidy
+        run: |
+          if [ -n "$(git status --porcelain)" ]; then
+            exit 1
+          fi

.github/workflows/roller.yml

@@ -29,6 +29,25 @@ jobs:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     steps:
+    - name: Install Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.19.x
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Test
+      run: |
+        go test -tags="mock_prover" -v -coverprofile=coverage.txt ./...
+    - name: Upload coverage reports to Codecov
+      uses: codecov/codecov-action@v3
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+      with:
+        flags: roller
+  compile:
+    if: github.event_name == 'push' # will only be triggered when pushing to main & staging & develop & alpha
+    runs-on: ubuntu-latest
+    steps:
     - uses: actions-rs/toolchain@v1
       with:
         toolchain: nightly-2022-12-10
@@ -47,13 +66,6 @@ jobs:
     - name: Test
       run: |
         make roller
-        go test -tags="mock_prover" -v -coverprofile=coverage.txt ./...
-    - name: Upload coverage reports to Codecov
-      uses: codecov/codecov-action@v3
-      env:
-        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-      with:
-        flags: roller
   check:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest

bridge-history-api/abi/backend_abi.go

@@ -39,6 +39,12 @@ var (
 	L2WithdrawERC721Sig      common.Hash
 	L2WithdrawERC1155Sig     common.Hash
 
+	// batch nft sigs
+	L1BatchDepositERC721Sig   common.Hash
+	L1BatchDepositERC1155Sig  common.Hash
+	L2BatchWithdrawERC721Sig  common.Hash
+	L2BatchWithdrawERC1155Sig common.Hash
+
 	// scroll mono repo
 
 	// ScrollChainABI holds information about ScrollChain's context and available invokable methods.
@@ -116,6 +122,12 @@ func init() {
 	L2ERC1155GatewayABI, _ = L2ERC1155GatewayMetaData.GetAbi()
 	L2WithdrawERC1155Sig = L2ERC1155GatewayABI.Events["WithdrawERC1155"].ID
 
+	// batch nft events
+	L1BatchDepositERC721Sig = L1ERC721GatewayABI.Events["BatchDepositERC721"].ID
+	L1BatchDepositERC1155Sig = L1ERC1155GatewayABI.Events["BatchDepositERC1155"].ID
+	L2BatchWithdrawERC721Sig = L2ERC721GatewayABI.Events["BatchWithdrawERC721"].ID
+	L2BatchWithdrawERC1155Sig = L2ERC1155GatewayABI.Events["BatchWithdrawERC1155"].ID
+
 	// scroll monorepo
 	ScrollChainABI, _ = ScrollChainMetaData.GetAbi()
 	ScrollChainV2ABI, _ = ScrollChainV2MetaData.GetAbi()
@@ -277,6 +289,23 @@ type ERC1155MessageEvent struct {
 	Amount  *big.Int
 }
 
+type BatchERC721MessageEvent struct {
+	L1Token  common.Address
+	L2Token  common.Address
+	From     common.Address
+	To       common.Address
+	TokenIDs []*big.Int
+}
+
+type BatchERC1155MessageEvent struct {
+	L1Token      common.Address
+	L2Token      common.Address
+	From         common.Address
+	To           common.Address
+	TokenIDs     []*big.Int
+	TokenAmounts []*big.Int
+}
+
 // scroll monorepo
 
 // L1SentMessageEvent represents a SentMessage event raised by the L1ScrollMessenger contract.

bridge-history-api/cmd/backend_server/app/app.go

@@ -24,26 +24,40 @@ var (
 var database db.OrmFactory
 
 func pong(ctx iris.Context) {
-	ctx.WriteString("pong")
+	_, err := ctx.WriteString("pong")
+	if err != nil {
+		log.Error("failed to write pong", "err", err)
+	}
 }
 
-func setupQueryByAddressHandler(backend_app *mvc.Application) {
+func setupQueryByAddressHandler(backendApp *mvc.Application) {
 	// Register Dependencies.
-	backend_app.Register(
+	backendApp.Register(
 		database,
 		service.NewHistoryService,
 	)
 
 	// Register Controllers.
-	backend_app.Handle(new(controller.QueryAddressController))
+	backendApp.Handle(new(controller.QueryAddressController))
 }
 
-func setupQueryByHashHandler(backend_app *mvc.Application) {
-	backend_app.Register(
+func setupQueryClaimableHandler(backendApp *mvc.Application) {
+	// Register Dependencies.
+	backendApp.Register(
 		database,
 		service.NewHistoryService,
 	)
-	backend_app.Handle(new(controller.QueryHashController))
+
+	// Register Controllers.
+	backendApp.Handle(new(controller.QueryClaimableController))
+}
+
+func setupQueryByHashHandler(backendApp *mvc.Application) {
+	backendApp.Register(
+		database,
+		service.NewHistoryService,
+	)
+	backendApp.Handle(new(controller.QueryHashController))
 }
 
 func init() {
@@ -76,13 +90,18 @@ func action(ctx *cli.Context) error {
 	if err != nil {
 		log.Crit("can not connect to database", "err", err)
 	}
-	defer database.Close()
+	defer func() {
+		if err = database.Close(); err != nil {
+			log.Error("failed to close database", "err", err)
+		}
+	}()
 	bridgeApp := iris.New()
 	bridgeApp.UseRouter(corsOptions)
 	bridgeApp.Get("/ping", pong).Describe("healthcheck")
 
 	mvc.Configure(bridgeApp.Party("/api/txs"), setupQueryByAddressHandler)
 	mvc.Configure(bridgeApp.Party("/api/txsbyhashes"), setupQueryByHashHandler)
+	mvc.Configure(bridgeApp.Party("/api/claimable"), setupQueryClaimableHandler)
 
 	// TODO: make debug mode configurable
 	err = bridgeApp.Listen(cfg.Server.HostPort, iris.WithLogLevel("debug"))

bridge-history-api/cmd/cross_msg_fetcher/app/app.go

@@ -12,8 +12,8 @@ import (
 	"github.com/urfave/cli/v2"
 
 	"bridge-history-api/config"
-	"bridge-history-api/cross_msg"
-	"bridge-history-api/cross_msg/message_proof"
+	"bridge-history-api/crossmsg"
+	"bridge-history-api/crossmsg/messageproof"
 	"bridge-history-api/db"
 	cutils "bridge-history-api/utils"
 )
@@ -54,15 +54,20 @@ func action(ctx *cli.Context) error {
 	if err != nil {
 		log.Crit("failed to connect l2 geth", "config file", cfgFile, "error", err)
 	}
+
 	db, err := db.NewOrmFactory(cfg)
-	defer db.Close()
+	defer func() {
+		if deferErr := db.Close(); deferErr != nil {
+			log.Error("failed to close db", "err", err)
+		}
+	}()
 	if err != nil {
 		log.Crit("failed to connect to db", "config file", cfgFile, "error", err)
 	}
 
-	l1worker := &cross_msg.FetchEventWorker{F: cross_msg.L1FetchAndSaveEvents, G: cross_msg.GetLatestL1ProcessedHeight, Name: "L1 events fetch Worker"}
+	l1worker := &crossmsg.FetchEventWorker{F: crossmsg.L1FetchAndSaveEvents, G: crossmsg.GetLatestL1ProcessedHeight, Name: "L1 events fetch Worker"}
 
-	l2worker := &cross_msg.FetchEventWorker{F: cross_msg.L2FetchAndSaveEvents, G: cross_msg.GetLatestL2ProcessedHeight, Name: "L2 events fetch Worker"}
+	l2worker := &crossmsg.FetchEventWorker{F: crossmsg.L2FetchAndSaveEvents, G: crossmsg.GetLatestL2ProcessedHeight, Name: "L2 events fetch Worker"}
 
 	l1AddressList := []common.Address{
 		common.HexToAddress(cfg.L1.CustomERC20GatewayAddr),
@@ -84,7 +89,7 @@ func action(ctx *cli.Context) error {
 		common.HexToAddress(cfg.L2.WETHGatewayAddr),
 	}
 
-	l1crossMsgFetcher, err := cross_msg.NewCrossMsgFetcher(subCtx, cfg.L1, db, l1client, l1worker, l1AddressList, cross_msg.L1ReorgHandling)
+	l1crossMsgFetcher, err := crossmsg.NewMsgFetcher(subCtx, cfg.L1, db, l1client, l1worker, l1AddressList, crossmsg.L1ReorgHandling)
 	if err != nil {
 		log.Crit("failed to create l1 cross message fetcher", "error", err)
 	}
@@ -92,7 +97,7 @@ func action(ctx *cli.Context) error {
 	go l1crossMsgFetcher.Start()
 	defer l1crossMsgFetcher.Stop()
 
-	l2crossMsgFetcher, err := cross_msg.NewCrossMsgFetcher(subCtx, cfg.L2, db, l2client, l2worker, l2AddressList, cross_msg.L2ReorgHandling)
+	l2crossMsgFetcher, err := crossmsg.NewMsgFetcher(subCtx, cfg.L2, db, l2client, l2worker, l2AddressList, crossmsg.L2ReorgHandling)
 	if err != nil {
 		log.Crit("failed to create l2 cross message fetcher", "error", err)
 	}
@@ -101,17 +106,17 @@ func action(ctx *cli.Context) error {
 	defer l2crossMsgFetcher.Stop()
 
 	// BlockTimestamp fetcher for l1 and l2
-	l1BlockTimeFetcher := cross_msg.NewBlockTimestampFetcher(subCtx, cfg.L1.Confirmation, int(cfg.L1.BlockTime), l1client, db.UpdateL1BlockTimestamp, db.GetL1EarliestNoBlockTimestampHeight)
+	l1BlockTimeFetcher := crossmsg.NewBlockTimestampFetcher(subCtx, cfg.L1.Confirmation, int(cfg.L1.BlockTime), l1client, db.UpdateL1BlockTimestamp, db.GetL1EarliestNoBlockTimestampHeight)
 	go l1BlockTimeFetcher.Start()
 	defer l1BlockTimeFetcher.Stop()
 
-	l2BlockTimeFetcher := cross_msg.NewBlockTimestampFetcher(subCtx, cfg.L2.Confirmation, int(cfg.L2.BlockTime), l2client, db.UpdateL2BlockTimestamp, db.GetL2EarliestNoBlockTimestampHeight)
+	l2BlockTimeFetcher := crossmsg.NewBlockTimestampFetcher(subCtx, cfg.L2.Confirmation, int(cfg.L2.BlockTime), l2client, db.UpdateL2BlockTimestamp, db.GetL2EarliestNoBlockTimestampHeight)
 	go l2BlockTimeFetcher.Start()
 	defer l2BlockTimeFetcher.Stop()
 
 	// Proof updater and batch fetcher
-	l2msgProofUpdater := message_proof.NewMsgProofUpdater(subCtx, cfg.L1.Confirmation, cfg.BatchInfoFetcher.BatchIndexStartBlock, db)
-	batchFetcher := cross_msg.NewBatchInfoFetcher(subCtx, common.HexToAddress(cfg.BatchInfoFetcher.ScrollChainAddr), cfg.BatchInfoFetcher.BatchIndexStartBlock, cfg.L1.Confirmation, int(cfg.L1.BlockTime), l1client, db, l2msgProofUpdater)
+	l2msgProofUpdater := messageproof.NewMsgProofUpdater(subCtx, cfg.L1.Confirmation, cfg.BatchInfoFetcher.BatchIndexStartBlock, db)
+	batchFetcher := crossmsg.NewBatchInfoFetcher(subCtx, common.HexToAddress(cfg.BatchInfoFetcher.ScrollChainAddr), cfg.BatchInfoFetcher.BatchIndexStartBlock, cfg.L1.Confirmation, int(cfg.L1.BlockTime), l1client, db, l2msgProofUpdater)
 	go batchFetcher.Start()
 	defer batchFetcher.Stop()
 

bridge-history-api/config/config.go

@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 )
 
+// BatchInfoFetcherConfig is the configuration of BatchInfoFetcher
 type BatchInfoFetcherConfig struct {
 	BatchIndexStartBlock uint64 `json:"batchIndexStartBlock"`
 	ScrollChainAddr      string `json:"ScrollChainAddr"`
@@ -21,6 +22,7 @@ type DBConfig struct {
 	MaxIdleNum int `json:"maxIdleNum"`
 }
 
+// LayerConfig is the configuration of Layer1/Layer2
 type LayerConfig struct {
 	Confirmation           uint64 `json:"confirmation"`
 	Endpoint               string `json:"endpoint"`
@@ -35,6 +37,7 @@ type LayerConfig struct {
 	CustomERC20GatewayAddr string `json:"CustomERC20GatewayAddr"`
 }
 
+// ServerConfig is the configuration of the bridge history backend server port
 type ServerConfig struct {
 	HostPort string `json:"hostPort"`
 }

bridge-history-api/controller/controller.go

@@ -7,14 +7,36 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 )
 
+// QueryAddressController contains the query by address service
 type QueryAddressController struct {
 	Service service.HistoryService
 }
 
+// QueryHashController contains the query by hash service
 type QueryHashController struct {
 	Service service.HistoryService
 }
 
+// QueryClaimableController contains the query claimable txs service
+type QueryClaimableController struct {
+	Service service.HistoryService
+}
+
+// Get defines the http get method behavior for QueryClaimableController
+func (c *QueryClaimableController) Get(req model.QueryByAddressRequest) (*model.QueryByAddressResponse, error) {
+	txs, total, err := c.Service.GetClaimableTxsByAddress(common.HexToAddress(req.Address), int64(req.Offset), int64(req.Limit))
+	if err != nil {
+		return &model.QueryByAddressResponse{Message: "500", Data: &model.Data{}}, err
+	}
+
+	return &model.QueryByAddressResponse{Message: "ok",
+		Data: &model.Data{
+			Result: txs,
+			Total:  total,
+		}}, nil
+}
+
+// Get defines the http get method behavior for QueryAddressController
 func (c *QueryAddressController) Get(req model.QueryByAddressRequest) (*model.QueryByAddressResponse, error) {
 	message, total, err := c.Service.GetTxsByAddress(common.HexToAddress(req.Address), int64(req.Offset), int64(req.Limit))
 	if err != nil {
@@ -28,6 +50,7 @@ func (c *QueryAddressController) Get(req model.QueryByAddressRequest) (*model.Qu
 		}}, nil
 }
 
+// Post defines the http post method behavior for QueryHashController
 func (c *QueryHashController) Post(req model.QueryByHashRequest) (*model.QueryByHashResponse, error) {
 	result, err := c.Service.GetTxsByHashes(req.Txs)
 	if err != nil {

bridge-history-api/crossmsg/batch_info_fetcher.go

@@ -1,4 +1,4 @@
-package cross_msg
+package crossmsg
 
 import (
 	"context"
@@ -8,11 +8,12 @@ import (
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
 
-	"bridge-history-api/cross_msg/message_proof"
+	"bridge-history-api/crossmsg/messageproof"
 	"bridge-history-api/db"
 	"bridge-history-api/utils"
 )
 
+// BatchInfoFetcher fetches batch info from l1 chain and update db
 type BatchInfoFetcher struct {
 	ctx                  context.Context
 	scrollChainAddr      common.Address
@@ -21,10 +22,11 @@ type BatchInfoFetcher struct {
 	blockTimeInSec       int
 	client               *ethclient.Client
 	db                   db.OrmFactory
-	msgProofUpdater      *message_proof.MsgProofUpdater
+	msgProofUpdater      *messageproof.MsgProofUpdater
 }
 
-func NewBatchInfoFetcher(ctx context.Context, scrollChainAddr common.Address, batchInfoStartNumber uint64, confirmation uint64, blockTimeInSec int, client *ethclient.Client, db db.OrmFactory, msgProofUpdater *message_proof.MsgProofUpdater) *BatchInfoFetcher {
+// NewBatchInfoFetcher creates a new BatchInfoFetcher instance
+func NewBatchInfoFetcher(ctx context.Context, scrollChainAddr common.Address, batchInfoStartNumber uint64, confirmation uint64, blockTimeInSec int, client *ethclient.Client, db db.OrmFactory, msgProofUpdater *messageproof.MsgProofUpdater) *BatchInfoFetcher {
 	return &BatchInfoFetcher{
 		ctx:                  ctx,
 		scrollChainAddr:      scrollChainAddr,
@@ -37,13 +39,14 @@ func NewBatchInfoFetcher(ctx context.Context, scrollChainAddr common.Address, ba
 	}
 }
 
+// Start the BatchInfoFetcher
 func (b *BatchInfoFetcher) Start() {
 	log.Info("BatchInfoFetcher Start")
 	// Fetch batch info at beginning
 	// Then start msg proof updater after db have some bridge batch
 	err := b.fetchBatchInfo()
 	if err != nil {
-		log.Error("fetch batch info at begining failed: ", "err", err)
+		log.Error("fetch batch info at beginning failed: ", "err", err)
 	}
 
 	go b.msgProofUpdater.Start()
@@ -65,6 +68,7 @@ func (b *BatchInfoFetcher) Start() {
 	}()
 }
 
+// Stop the BatchInfoFetcher and call msg proof updater to stop
 func (b *BatchInfoFetcher) Stop() {
 	log.Info("BatchInfoFetcher Stop")
 	b.msgProofUpdater.Stop()

bridge-history-api/crossmsg/block_timestamp_fetcher.go

@@ -1,4 +1,4 @@
-package cross_msg
+package crossmsg
 
 import (
 	"context"
@@ -9,9 +9,13 @@ import (
 	"github.com/ethereum/go-ethereum/log"
 )
 
+// GetEarliestNoBlockTimestampHeightFunc is a function type that gets the earliest record without block timestamp from database
 type GetEarliestNoBlockTimestampHeightFunc func() (uint64, error)
+
+// UpdateBlockTimestampFunc is a function type that updates block timestamp into database
 type UpdateBlockTimestampFunc func(height uint64, timestamp time.Time) error
 
+// BlockTimestampFetcher fetches block timestamp from blockchain and saves them to database
 type BlockTimestampFetcher struct {
 	ctx                                   context.Context
 	confirmation                          uint64
@@ -21,6 +25,7 @@ type BlockTimestampFetcher struct {
 	getEarliestNoBlockTimestampHeightFunc GetEarliestNoBlockTimestampHeightFunc
 }
 
+// NewBlockTimestampFetcher creates a new BlockTimestampFetcher instance
 func NewBlockTimestampFetcher(ctx context.Context, confirmation uint64, blockTimeInSec int, client *ethclient.Client, updateBlockTimestampFunc UpdateBlockTimestampFunc, getEarliestNoBlockTimestampHeightFunc GetEarliestNoBlockTimestampHeightFunc) *BlockTimestampFetcher {
 	return &BlockTimestampFetcher{
 		ctx:                                   ctx,
@@ -32,6 +37,7 @@ func NewBlockTimestampFetcher(ctx context.Context, confirmation uint64, blockTim
 	}
 }
 
+// Start the BlockTimestampFetcher
 func (b *BlockTimestampFetcher) Start() {
 	go func() {
 		tick := time.NewTicker(time.Duration(b.blockTimeInSec) * time.Second)
@@ -73,6 +79,7 @@ func (b *BlockTimestampFetcher) Start() {
 	}()
 }
 
+// Stop the BlockTimestampFetcher and log the info
 func (b *BlockTimestampFetcher) Stop() {
 	log.Info("BlockTimestampFetcher Stop")
 }

bridge-history-api/crossmsg/cross_msg_fetcher.go

@@ -1,4 +1,4 @@
-package cross_msg
+package crossmsg
 
 import (
 	"context"
@@ -18,7 +18,8 @@ import (
 	"bridge-history-api/utils"
 )
 
-type CrossMsgFetcher struct {
+// MsgFetcher fetches cross message events from blockchain and saves them to database
+type MsgFetcher struct {
 	ctx           context.Context
 	config        *config.LayerConfig
 	db            db.OrmFactory
@@ -32,8 +33,9 @@ type CrossMsgFetcher struct {
 	reorgEndCh    chan struct{}
 }
 
-func NewCrossMsgFetcher(ctx context.Context, config *config.LayerConfig, db db.OrmFactory, client *ethclient.Client, worker *FetchEventWorker, addressList []common.Address, reorg ReorgHandling) (*CrossMsgFetcher, error) {
-	crossMsgFetcher := &CrossMsgFetcher{
+// NewMsgFetcher creates a new MsgFetcher instance
+func NewMsgFetcher(ctx context.Context, config *config.LayerConfig, db db.OrmFactory, client *ethclient.Client, worker *FetchEventWorker, addressList []common.Address, reorg ReorgHandling) (*MsgFetcher, error) {
+	msgFetcher := &MsgFetcher{
 		ctx:           ctx,
 		config:        config,
 		db:            db,
@@ -45,11 +47,12 @@ func NewCrossMsgFetcher(ctx context.Context, config *config.LayerConfig, db db.O
 		reorgStartCh:  make(chan struct{}),
 		reorgEndCh:    make(chan struct{}),
 	}
-	return crossMsgFetcher, nil
+	return msgFetcher, nil
 }
 
-func (c *CrossMsgFetcher) Start() {
-	log.Info("CrossMsgFetcher Start")
+// Start the MsgFetcher
+func (c *MsgFetcher) Start() {
+	log.Info("MsgFetcher Start")
 	// fetch missing events from finalized blocks, we don't handle reorgs here
 	c.forwardFetchAndSaveMissingEvents(c.config.Confirmation)
 
@@ -75,7 +78,7 @@ func (c *CrossMsgFetcher) Start() {
 				return
 			case <-tick.C:
 				c.mu.Lock()
-				c.forwardFetchAndSaveMissingEvents(0)
+				c.forwardFetchAndSaveMissingEvents(1)
 				c.mu.Unlock()
 			}
 		}
@@ -94,12 +97,13 @@ func (c *CrossMsgFetcher) Start() {
 	}()
 }
 
-func (c *CrossMsgFetcher) Stop() {
-	log.Info("CrossMsgFetcher Stop")
+// Stop the MsgFetcher and log the info
+func (c *MsgFetcher) Stop() {
+	log.Info("MsgFetcher Stop")
 }
 
 // forwardFetchAndSaveMissingEvents will fetch all events from the latest processed height to the latest block number.
-func (c *CrossMsgFetcher) forwardFetchAndSaveMissingEvents(confirmation uint64) {
+func (c *MsgFetcher) forwardFetchAndSaveMissingEvents(confirmation uint64) {
 	// if we fetch to the latest block, shall not exceed cachedHeaders
 	var number uint64
 	var err error
@@ -124,7 +128,7 @@ func (c *CrossMsgFetcher) forwardFetchAndSaveMissingEvents(confirmation uint64)
 	if processedHeight <= 0 || processedHeight < int64(c.config.StartHeight) {
 		processedHeight = int64(c.config.StartHeight)
 	} else {
-		processedHeight += 1
+		processedHeight++
 	}
 	for from := processedHeight; from <= int64(number); from += fetchLimit {
 		to := from + fetchLimit - 1
@@ -139,7 +143,7 @@ func (c *CrossMsgFetcher) forwardFetchAndSaveMissingEvents(confirmation uint64)
 	}
 }
 
-func (c *CrossMsgFetcher) fetchMissingLatestHeaders() {
+func (c *MsgFetcher) fetchMissingLatestHeaders() {
 	var start int64
 	number, err := c.client.BlockNumber(c.ctx)
 	if err != nil {
@@ -159,7 +163,7 @@ func (c *CrossMsgFetcher) fetchMissingLatestHeaders() {
 			close(c.reorgEndCh)
 			return
 		default:
-			header, err := c.client.HeaderByNumber(c.ctx, big.NewInt(int64(i)))
+			header, err := c.client.HeaderByNumber(c.ctx, big.NewInt(i))
 			if err != nil {
 				log.Error("failed to get latest header", "err", err)
 				return
@@ -181,9 +185,9 @@ func (c *CrossMsgFetcher) fetchMissingLatestHeaders() {
 			c.mu.Lock()
 			index, ok, validHeaders := BackwardFindReorgBlock(c.ctx, c.cachedHeaders, c.client, header)
 			if !ok {
-				log.Error("Reorg happended too earlier than cached headers", "reorg height", header.Number)
-				num, err := utils.GetSafeBlockNumber(c.ctx, c.client, c.config.Confirmation)
-				if err != nil {
+				log.Error("Reorg happened too earlier than cached headers", "reorg height", header.Number)
+				num, getSafeErr := utils.GetSafeBlockNumber(c.ctx, c.client, c.config.Confirmation)
+				if getSafeErr != nil {
 					log.Crit("Can not get safe number during reorg, quit the process", "err", err)
 				}
 				// clear all our saved data, because no data is safe now

bridge-history-api/crossmsg/fetch_missing_event.go

@@ -1,4 +1,4 @@
-package cross_msg
+package crossmsg
 
 import (
 	"context"
@@ -8,7 +8,6 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/ethereum/go-ethereum/log"
-	"github.com/jmoiron/sqlx"
 
 	backendabi "bridge-history-api/abi"
 	"bridge-history-api/db"
@@ -26,14 +25,15 @@ type FetchAndSave func(ctx context.Context, client *ethclient.Client, database d
 
 // GetLatestProcessed is a function type that gets the latest processed block height from database
 type GetLatestProcessed func(db db.OrmFactory) (int64, error)
-type UpdateXHash func(ctx context.Context)
 
+// FetchEventWorker defines worker with fetch and save function, processed number getter, and name
 type FetchEventWorker struct {
 	F    FetchAndSave
 	G    GetLatestProcessed
 	Name string
 }
 
+// GetLatestL1ProcessedHeight get L1 the latest processed height
 func GetLatestL1ProcessedHeight(db db.OrmFactory) (int64, error) {
 	crossHeight, err := db.GetLatestL1ProcessedHeight()
 	if err != nil {
@@ -47,11 +47,11 @@ func GetLatestL1ProcessedHeight(db db.OrmFactory) (int64, error) {
 	}
 	if crossHeight > relayedHeight {
 		return crossHeight, nil
-	} else {
-		return relayedHeight, nil
 	}
+	return relayedHeight, nil
 }
 
+// GetLatestL2ProcessedHeight get L2 latest processed height
 func GetLatestL2ProcessedHeight(db db.OrmFactory) (int64, error) {
 	crossHeight, err := db.GetLatestL2ProcessedHeight()
 	if err != nil {
@@ -78,6 +78,7 @@ func GetLatestL2ProcessedHeight(db db.OrmFactory) (int64, error) {
 	return maxHeight, nil
 }
 
+// L1FetchAndSaveEvents fetch and save events on L1
 func L1FetchAndSaveEvents(ctx context.Context, client *ethclient.Client, database db.OrmFactory, from int64, to int64, addrList []common.Address) error {
 	query := geth.FilterQuery{
 		FromBlock: big.NewInt(from), // inclusive
@@ -99,7 +100,7 @@ func L1FetchAndSaveEvents(ctx context.Context, client *ethclient.Client, databas
 		log.Warn("Failed to get l1 event logs", "err", err)
 		return err
 	}
-	depositL1CrossMsgs, msgHashes, relayedMsg, err := utils.ParseBackendL1EventLogs(logs)
+	depositL1CrossMsgs, relayedMsg, err := utils.ParseBackendL1EventLogs(logs)
 	if err != nil {
 		log.Error("l1FetchAndSaveEvents: Failed to parse cross msg event logs", "err", err)
 		return err
@@ -111,24 +112,25 @@ func L1FetchAndSaveEvents(ctx context.Context, client *ethclient.Client, databas
 	}
 	err = database.BatchInsertL1CrossMsgDBTx(dbTx, depositL1CrossMsgs)
 	if err != nil {
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Crit("l1FetchAndSaveEvents: Failed to insert cross msg event logs", "err", err)
 	}
 
 	err = database.BatchInsertRelayedMsgDBTx(dbTx, relayedMsg)
 	if err != nil {
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Crit("l1FetchAndSaveEvents: Failed to insert relayed message event logs", "err", err)
 	}
-	err = updateL1CrossMsgMsgHash(ctx, dbTx, database, msgHashes)
-	if err != nil {
-		dbTx.Rollback()
-		log.Crit("l1FetchAndSaveEvents: Failed to update msgHash in L1 cross msg", "err", err)
-	}
 	err = dbTx.Commit()
 	if err != nil {
 		// if we can not insert into DB, there must something wrong, need a on-call member handle the dababase manually
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Error("l1FetchAndSaveEvents: Failed to commit db transaction", "err", err)
 		return err
 	}
@@ -136,6 +138,7 @@ func L1FetchAndSaveEvents(ctx context.Context, client *ethclient.Client, databas
 	return nil
 }
 
+// L2FetchAndSaveEvents fetche and save events on L2
 func L2FetchAndSaveEvents(ctx context.Context, client *ethclient.Client, database db.OrmFactory, from int64, to int64, addrList []common.Address) error {
 	query := geth.FilterQuery{
 		FromBlock: big.NewInt(from), // inclusive
@@ -157,11 +160,12 @@ func L2FetchAndSaveEvents(ctx context.Context, client *ethclient.Client, databas
 		log.Warn("Failed to get l2 event logs", "err", err)
 		return err
 	}
-	depositL2CrossMsgs, msgHashes, relayedMsg, l2sentMsgs, err := utils.ParseBackendL2EventLogs(logs)
+	depositL2CrossMsgs, relayedMsg, l2SentMsgs, err := utils.ParseBackendL2EventLogs(logs)
 	if err != nil {
 		log.Error("l2FetchAndSaveEvents: Failed to parse cross msg event logs", "err", err)
 		return err
 	}
+
 	dbTx, err := database.Beginx()
 	if err != nil {
 		log.Error("l2FetchAndSaveEvents: Failed to begin db transaction", "err", err)
@@ -169,32 +173,34 @@ func L2FetchAndSaveEvents(ctx context.Context, client *ethclient.Client, databas
 	}
 	err = database.BatchInsertL2CrossMsgDBTx(dbTx, depositL2CrossMsgs)
 	if err != nil {
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Crit("l2FetchAndSaveEvents: Failed to insert cross msg event logs", "err", err)
 	}
 
 	err = database.BatchInsertRelayedMsgDBTx(dbTx, relayedMsg)
 	if err != nil {
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Crit("l2FetchAndSaveEvents: Failed to insert relayed message event logs", "err", err)
 	}
 
-	err = updateL2CrossMsgMsgHash(ctx, dbTx, database, msgHashes)
+	err = database.BatchInsertL2SentMsgDBTx(dbTx, l2SentMsgs)
 	if err != nil {
-		dbTx.Rollback()
-		log.Crit("l2FetchAndSaveEvents: Failed to update msgHash in L2 cross msg", "err", err)
-	}
-
-	err = database.BatchInsertL2SentMsgDBTx(dbTx, l2sentMsgs)
-	if err != nil {
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Crit("l2FetchAndSaveEvents: Failed to insert l2 sent message", "err", err)
 	}
 
 	err = dbTx.Commit()
 	if err != nil {
 		// if we can not insert into DB, there must something wrong, need a on-call member handle the dababase manually
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Error("l2FetchAndSaveEvents: Failed to commit db transaction", "err", err)
 		return err
 	}
@@ -202,6 +208,7 @@ func L2FetchAndSaveEvents(ctx context.Context, client *ethclient.Client, databas
 	return nil
 }
 
+// FetchAndSaveBatchIndex fetche and save batch index
 func FetchAndSaveBatchIndex(ctx context.Context, client *ethclient.Client, database db.OrmFactory, from int64, to int64, scrollChainAddr common.Address) error {
 	query := geth.FilterQuery{
 		FromBlock: big.NewInt(from), // inclusive
@@ -228,37 +235,19 @@ func FetchAndSaveBatchIndex(ctx context.Context, client *ethclient.Client, datab
 	}
 	err = database.BatchInsertRollupBatchDBTx(dbTx, rollupBatches)
 	if err != nil {
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Crit("FetchAndSaveBatchIndex: Failed to insert batch commit msg event logs", "err", err)
 	}
 	err = dbTx.Commit()
 	if err != nil {
 		// if we can not insert into DB, there must something wrong, need a on-call member handle the dababase manually
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Error("FetchAndSaveBatchIndex: Failed to commit db transaction", "err", err)
 		return err
 	}
 	return nil
 }
-
-func updateL1CrossMsgMsgHash(ctx context.Context, dbTx *sqlx.Tx, database db.OrmFactory, msgHashes []utils.MsgHashWrapper) error {
-	for _, msgHash := range msgHashes {
-		err := database.UpdateL1CrossMsgHashDBTx(ctx, dbTx, msgHash.TxHash, msgHash.MsgHash)
-		if err != nil {
-			log.Error("updateL1CrossMsgMsgHash: can not update layer1 cross msg MsgHash", "layer1 hash", msgHash.TxHash, "err", err)
-			continue
-		}
-	}
-	return nil
-}
-
-func updateL2CrossMsgMsgHash(ctx context.Context, dbTx *sqlx.Tx, database db.OrmFactory, msgHashes []utils.MsgHashWrapper) error {
-	for _, msgHash := range msgHashes {
-		err := database.UpdateL2CrossMsgHashDBTx(ctx, dbTx, msgHash.TxHash, msgHash.MsgHash)
-		if err != nil {
-			log.Error("updateL2CrossMsgMsgHash: can not update layer2 cross msg MsgHash", "layer2 hash", msgHash.TxHash, "err", err)
-			continue
-		}
-	}
-	return nil
-}

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

@@ -1,4 +1,4 @@
-package message_proof
+package messageproof
 
 import (
 	"context"
@@ -14,12 +14,14 @@ import (
 	"bridge-history-api/db/orm"
 )
 
+// MsgProofUpdater is used to update message proof in db
 type MsgProofUpdater struct {
 	ctx          context.Context
 	db           db.OrmFactory
 	withdrawTrie *WithdrawTrie
 }
 
+// NewMsgProofUpdater new MsgProofUpdater instance
 func NewMsgProofUpdater(ctx context.Context, confirmations uint64, startBlock uint64, db db.OrmFactory) *MsgProofUpdater {
 	return &MsgProofUpdater{
 		ctx:          ctx,
@@ -28,6 +30,7 @@ func NewMsgProofUpdater(ctx context.Context, confirmations uint64, startBlock ui
 	}
 }
 
+// Start the MsgProofUpdater
 func (m *MsgProofUpdater) Start() {
 	log.Info("MsgProofUpdater Start")
 	m.initialize(m.ctx)
@@ -83,6 +86,7 @@ func (m *MsgProofUpdater) Start() {
 
 }
 
+// Stop the MsgProofUpdater
 func (m *MsgProofUpdater) Stop() {
 	log.Info("MsgProofUpdater Stop")
 }
@@ -112,7 +116,7 @@ func (m *MsgProofUpdater) initializeWithdrawTrie() error {
 		return fmt.Errorf("failed to get first l2 message: %v", err)
 	}
 	// no l2 message
-	// 	TO DO: check if we realy dont have l2 sent message with nonce 0
+	// 	TO DO: check if we really dont have l2 sent message with nonce 0
 	if firstMsg == nil {
 		log.Info("No first l2sentmsg in db")
 		return nil
@@ -183,7 +187,7 @@ func (m *MsgProofUpdater) updateMsgProof(msgs []*orm.L2SentMsg, proofs [][]byte,
 	if len(msgs) == 0 {
 		return nil
 	}
-	// this should not happend, but double checked
+	// this should not happen, but double check
 	if len(msgs) != len(proofs) {
 		return fmt.Errorf("illegal state: len(msgs) != len(proofs)")
 	}

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

@@ -1,4 +1,4 @@
-package message_proof
+package messageproof
 
 import (
 	"github.com/ethereum/go-ethereum/common"

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

@@ -1,4 +1,4 @@
-package message_proof
+package messageproof
 
 import (
 	"math/big"

bridge-history-api/crossmsg/msg_fetcher_test.go

@@ -1,4 +1,4 @@
-package cross_msg_test
+package crossmsg_test
 
 import (
 	"crypto/rand"
@@ -9,7 +9,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/stretchr/testify/assert"
 
-	"bridge-history-api/cross_msg"
+	"bridge-history-api/crossmsg"
 )
 
 func TestMergeIntoList(t *testing.T) {
@@ -18,7 +18,7 @@ func TestMergeIntoList(t *testing.T) {
 	assert.Equal(t, headers[0].Hash(), headers[1].ParentHash)
 	headers2, err := generateHeaders(18)
 	assert.NoError(t, err)
-	result := cross_msg.MergeAddIntoHeaderList(headers, headers2, 64)
+	result := crossmsg.MergeAddIntoHeaderList(headers, headers2, 64)
 	assert.Equal(t, 64, len(result))
 	assert.Equal(t, headers2[len(headers2)-1], result[len(result)-1])
 	assert.NotEqual(t, headers[0], result[0])
@@ -53,7 +53,7 @@ func generateHeaders(amount int) ([]*types.Header, error) {
 			Time:        uint64(i * 15),
 			Extra:       []byte{},
 			MixDigest:   common.Hash{},
-			Nonce:       types.EncodeNonce(uint64(nonce.Uint64())),
+			Nonce:       types.EncodeNonce(nonce.Uint64()),
 		}
 		headers[i] = header
 	}

bridge-history-api/crossmsg/reorg_handle.go

@@ -1,4 +1,4 @@
-package cross_msg
+package crossmsg
 
 import (
 	"context"
@@ -10,6 +10,7 @@ import (
 	"bridge-history-api/db"
 )
 
+// ReorgHandling handles reorg function type
 type ReorgHandling func(ctx context.Context, reorgHeight int64, db db.OrmFactory) error
 
 func reverseArray(arr []*types.Header) []*types.Header {
@@ -20,10 +21,12 @@ func reverseArray(arr []*types.Header) []*types.Header {
 	return arr
 }
 
+// IsParentAndChild match the child header ParentHash with parent header Hash
 func IsParentAndChild(parentHeader *types.Header, header *types.Header) bool {
 	return header.ParentHash == parentHeader.Hash()
 }
 
+// MergeAddIntoHeaderList merges two header lists, if exceed the max length then drop the oldest entries
 func MergeAddIntoHeaderList(baseArr, extraArr []*types.Header, maxLength int) []*types.Header {
 	mergedArr := append(baseArr, extraArr...)
 	if len(mergedArr) <= maxLength {
@@ -34,11 +37,12 @@ func MergeAddIntoHeaderList(baseArr, extraArr []*types.Header, maxLength int) []
 	return mergedArr[startIndex:]
 }
 
-func BackwardFindReorgBlock(ctx context.Context, headers []*types.Header, client *ethclient.Client, header *types.Header) (int, bool, []*types.Header) {
+// BackwardFindReorgBlock finds the reorg block by backward search
+func BackwardFindReorgBlock(ctx context.Context, headers []*types.Header, client *ethclient.Client, lastHeader *types.Header) (int, bool, []*types.Header) {
 	maxStep := len(headers)
-	backwardHeaderList := []*types.Header{header}
+	backwardHeaderList := []*types.Header{lastHeader}
 	for iterRound := 0; iterRound < maxStep; iterRound++ {
-		header, err := client.HeaderByHash(ctx, header.ParentHash)
+		header, err := client.HeaderByHash(ctx, lastHeader.ParentHash)
 		if err != nil {
 			log.Error("BackwardFindReorgBlock failed", "error", err)
 			return -1, false, nil
@@ -50,10 +54,12 @@ func BackwardFindReorgBlock(ctx context.Context, headers []*types.Header, client
 				return j, true, backwardHeaderList
 			}
 		}
+		lastHeader = header
 	}
 	return -1, false, nil
 }
 
+// L1ReorgHandling handles l1 reorg
 func L1ReorgHandling(ctx context.Context, reorgHeight int64, db db.OrmFactory) error {
 	dbTx, err := db.Beginx()
 	if err != nil {
@@ -61,47 +67,64 @@ func L1ReorgHandling(ctx context.Context, reorgHeight int64, db db.OrmFactory) e
 	}
 	err = db.DeleteL1CrossMsgAfterHeightDBTx(dbTx, reorgHeight)
 	if err != nil {
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Crit("delete l1 cross msg from height", "height", reorgHeight, "err", err)
 	}
 	err = db.DeleteL1RelayedHashAfterHeightDBTx(dbTx, reorgHeight)
 	if err != nil {
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Crit("delete l1 relayed hash from height", "height", reorgHeight, "err", err)
 	}
 	err = dbTx.Commit()
 	if err != nil {
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Error("commit tx failed", "err", err)
 		return err
 	}
 	return nil
 }
 
+// L2ReorgHandling handles l2 reorg
 func L2ReorgHandling(ctx context.Context, reorgHeight int64, db db.OrmFactory) error {
 	dbTx, err := db.Beginx()
 	if err != nil {
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Crit("begin db tx failed", "err", err)
 	}
 	err = db.DeleteL2CrossMsgFromHeightDBTx(dbTx, reorgHeight)
 	if err != nil {
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Crit("delete l2 cross msg from height", "height", reorgHeight, "err", err)
 	}
 	err = db.DeleteL2RelayedHashAfterHeightDBTx(dbTx, reorgHeight)
 	if err != nil {
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Crit("delete l2 relayed hash from height", "height", reorgHeight, "err", err)
 	}
 	err = db.DeleteL2SentMsgAfterHeightDBTx(dbTx, reorgHeight)
 	if err != nil {
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Crit("delete l2 sent msg from height", "height", reorgHeight, "err", err)
 	}
 	err = dbTx.Commit()
 	if err != nil {
-		dbTx.Rollback()
+		if rollBackErr := dbTx.Rollback(); rollBackErr != nil {
+			log.Error("dbTx Rollback failed", "err", rollBackErr)
+		}
 		log.Error("commit tx failed", "err", err)
 		return err
 	}

bridge-history-api/db/migrate/migrations/00001_cross_msg.sql

@@ -3,7 +3,7 @@
 create table cross_message
 (
     id              BIGSERIAL PRIMARY KEY,
-    msg_hash        VARCHAR NOT NULL DEFAULT '',
+    msg_hash        VARCHAR NOT NULL,
     height          BIGINT  NOT NULL,
     sender          VARCHAR NOT NULL,
     target          VARCHAR NOT NULL,
@@ -12,30 +12,30 @@ create table cross_message
     layer2_hash     VARCHAR NOT NULL DEFAULT '',
     layer1_token    VARCHAR NOT NULL DEFAULT '',
     layer2_token    VARCHAR NOT NULL DEFAULT '',
-    token_id        BIGINT NOT NULL DEFAULT 0,
     asset           SMALLINT NOT NULL,
     msg_type        SMALLINT NOT NULL,
-    is_deleted      BOOLEAN NOT NULL DEFAULT FALSE,
+    token_ids       TEXT NOT NULL DEFAULT '',
+    token_amounts   TEXT NOT NULL DEFAULT '',
     block_timestamp TIMESTAMP(0) DEFAULT NULL,
     created_at      TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     updated_at      TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     deleted_at      TIMESTAMP(0) DEFAULT NULL
 );
 
+create unique index uk_msg_hash_msg_type
+on cross_message (msg_hash, msg_type) where deleted_at IS NULL;
+
 comment
 on column cross_message.asset is 'ETH, ERC20, ERC721, ERC1155';
 
 comment
 on column cross_message.msg_type is 'unknown, l1msg, l2msg';
 
-comment 
-on column cross_message.is_deleted is 'NotDeleted false, Deleted true';
+CREATE INDEX idx_l1_msg_index ON cross_message (layer1_hash, deleted_at);
 
-CREATE INDEX valid_l1_msg_index ON cross_message (layer1_hash, is_deleted);
+CREATE INDEX idx_l2_msg_index ON cross_message (layer2_hash, deleted_at);
 
-CREATE INDEX valid_l2_msg_index ON cross_message (layer2_hash, is_deleted);
-
-CREATE INDEX valid_height_index ON cross_message (height, msg_type, is_deleted);
+CREATE INDEX idx_height_msg_type_index ON cross_message (height, msg_type, deleted_at);
 
 CREATE OR REPLACE FUNCTION update_timestamp()
 RETURNS TRIGGER AS $$
@@ -49,22 +49,6 @@ CREATE TRIGGER update_timestamp BEFORE UPDATE
 ON cross_message FOR EACH ROW EXECUTE PROCEDURE
 update_timestamp();
 
-CREATE OR REPLACE FUNCTION deleted_at_trigger()
-RETURNS TRIGGER AS $$
-BEGIN
-    IF NEW.is_deleted AND OLD.is_deleted != NEW.is_deleted THEN
-        UPDATE cross_message SET deleted_at = NOW() WHERE id = NEW.id;
-    END IF;
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
-CREATE TRIGGER deleted_at_trigger
-AFTER UPDATE ON cross_message
-FOR EACH ROW
-EXECUTE FUNCTION deleted_at_trigger();
-
-
 -- +goose StatementEnd
 
 -- +goose Down

bridge-history-api/db/migrate/migrations/00002_relayed_msg.sql

@@ -7,17 +7,19 @@ create table relayed_msg
     height      BIGINT NOT NULL,
     layer1_hash VARCHAR NOT NULL DEFAULT '',
     layer2_hash VARCHAR NOT NULL DEFAULT '',
-    is_deleted  BOOLEAN NOT NULL DEFAULT FALSE,
     created_at  TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     updated_at  TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     deleted_at  TIMESTAMP(0) DEFAULT NULL
 );
 
-comment 
-on column relayed_msg.is_deleted is 'NotDeleted, Deleted';
+create unique index uk_msg_hash_l1_hash_l2_hash
+on relayed_msg (msg_hash, layer1_hash, layer2_hash) where deleted_at IS NULL;
 
-create unique index relayed_msg_hash_uindex
-on relayed_msg (msg_hash);
+CREATE INDEX idx_l1_msg_relayed_msg ON relayed_msg (layer1_hash, deleted_at);
+
+CREATE INDEX idx_l2_msg_relayed_msg ON relayed_msg (layer2_hash, deleted_at);
+
+CREATE INDEX idx_msg_hash_deleted_at_relayed_msg on relayed_msg (msg_hash, deleted_at);
 
 CREATE OR REPLACE FUNCTION update_timestamp()
 RETURNS TRIGGER AS $$
@@ -31,22 +33,6 @@ CREATE TRIGGER update_timestamp BEFORE UPDATE
 ON relayed_msg FOR EACH ROW EXECUTE PROCEDURE
 update_timestamp();
 
-CREATE OR REPLACE FUNCTION deleted_at_trigger()
-RETURNS TRIGGER AS $$
-BEGIN
-    IF NEW.is_deleted AND OLD.is_deleted != NEW.is_deleted THEN
-        UPDATE relayed_msg SET deleted_at = NOW() WHERE id = NEW.id;
-    END IF;
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
-CREATE TRIGGER deleted_at_trigger
-AFTER UPDATE ON relayed_msg
-FOR EACH ROW
-EXECUTE FUNCTION deleted_at_trigger();
-
-
 -- +goose StatementEnd
 
 -- +goose Down

bridge-history-api/db/migrate/migrations/00003_l2_sent_msg.sql

@@ -3,6 +3,8 @@
 create table l2_sent_msg
 (
     id               BIGSERIAL PRIMARY KEY,
+    original_sender  VARCHAR NOT NULL DEFAULT '',
+    tx_hash          VARCHAR NOT NULL,
     sender           VARCHAR NOT NULL,
     target           VARCHAR NOT NULL,
     value            VARCHAR NOT NULL,
@@ -12,14 +14,18 @@ create table l2_sent_msg
     batch_index      BIGINT NOT NULL DEFAULT 0,
     msg_proof        TEXT NOT NULL DEFAULT '',
     msg_data         TEXT NOT NULL DEFAULT '',
-    is_deleted       BOOLEAN NOT NULL DEFAULT FALSE,
     created_at       TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     updated_at       TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     deleted_at       TIMESTAMP(0) DEFAULT NULL
 );
 
-comment 
-on column l2_sent_msg.is_deleted is 'NotDeleted, Deleted';
+create unique index uk_msg_hash
+on l2_sent_msg (msg_hash) where deleted_at IS NULL;
+
+create unique index uk_nonce
+on l2_sent_msg (nonce) where deleted_at IS NULL;
+
+CREATE INDEX idx_msg_hash_deleted_at_l2_sent_msg on l2_sent_msg (msg_hash, deleted_at);
 
 CREATE OR REPLACE FUNCTION update_timestamp()
 RETURNS TRIGGER AS $$
@@ -33,22 +39,6 @@ CREATE TRIGGER update_timestamp BEFORE UPDATE
 ON l2_sent_msg FOR EACH ROW EXECUTE PROCEDURE
 update_timestamp();
 
-CREATE OR REPLACE FUNCTION deleted_at_trigger()
-RETURNS TRIGGER AS $$
-BEGIN
-    IF NEW.is_deleted AND OLD.is_deleted != NEW.is_deleted THEN
-        UPDATE l2_sent_msg SET deleted_at = NOW() WHERE id = NEW.id;
-    END IF;
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
-CREATE TRIGGER deleted_at_trigger
-AFTER UPDATE ON l2_sent_msg
-FOR EACH ROW
-EXECUTE FUNCTION deleted_at_trigger();
-
-
 -- +goose StatementEnd
 
 -- +goose Down

bridge-history-api/db/migrate/migrations/00004_rollup_batch.sql

@@ -8,12 +8,17 @@ create table rollup_batch
     start_block_number  BIGINT NOT NULL,
     end_block_number    BIGINT NOT NULL,
     batch_hash          VARCHAR NOT NULL,
-    is_deleted          BOOLEAN NOT NULL DEFAULT FALSE,
     created_at          TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     updated_at          TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
     deleted_at          TIMESTAMP(0) DEFAULT NULL
 );
 
+create unique index uk_batch_index
+on rollup_batch (batch_index) where deleted_at IS NULL;
+
+create unique index uk_batch_hash
+on rollup_batch (batch_hash) where deleted_at IS NULL;
+
 CREATE OR REPLACE FUNCTION update_timestamp()
 RETURNS TRIGGER AS $$
 BEGIN
@@ -26,21 +31,6 @@ CREATE TRIGGER update_timestamp BEFORE UPDATE
 ON rollup_batch FOR EACH ROW EXECUTE PROCEDURE
 update_timestamp();
 
-CREATE OR REPLACE FUNCTION deleted_at_trigger()
-RETURNS TRIGGER AS $$
-BEGIN
-    IF NEW.is_deleted AND OLD.is_deleted != NEW.is_deleted THEN
-        UPDATE rollup_batch SET deleted_at = NOW() WHERE id = NEW.id;
-    END IF;
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;
-
-CREATE TRIGGER deleted_at_trigger
-AFTER UPDATE ON rollup_batch
-FOR EACH ROW
-EXECUTE FUNCTION deleted_at_trigger();
-
 -- +goose StatementEnd
 
 -- +goose Down

bridge-history-api/db/orm/batch.go

@@ -2,7 +2,6 @@ package orm
 
 import (
 	"database/sql"
-	"fmt"
 
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/jmoiron/sqlx"
@@ -12,6 +11,7 @@ type rollupBatchOrm struct {
 	db *sqlx.DB
 }
 
+// RollupBatch is the struct for rollup_batch table
 type RollupBatch struct {
 	ID               uint64 `json:"id" db:"id"`
 	BatchIndex       uint64 `json:"batch_index" db:"batch_index"`
@@ -40,14 +40,6 @@ func (b *rollupBatchOrm) BatchInsertRollupBatchDBTx(dbTx *sqlx.Tx, batches []*Ro
 			"start_block_number": batch.StartBlockNumber,
 			"end_block_number":   batch.EndBlockNumber,
 		}
-		var exists bool
-		err = dbTx.QueryRow(`SELECT EXISTS(SELECT 1 FROM rollup_batch WHERE batch_index = $1 AND NOT is_deleted)`, batch.BatchIndex).Scan(&exists)
-		if err != nil {
-			return err
-		}
-		if exists {
-			return fmt.Errorf("BatchInsertRollupBatchDBTx: batch index %v already exists at height %v", batch.BatchIndex, batch.CommitHeight)
-		}
 	}
 	_, err = dbTx.NamedExec(`insert into rollup_batch(commit_height, batch_index, batch_hash, start_block_number, end_block_number) values(:commit_height, :batch_index, :batch_hash, :start_block_number, :end_block_number);`, batchMaps)
 	if err != nil {

bridge-history-api/db/orm/interface.go

@@ -8,7 +8,10 @@ import (
 	"github.com/jmoiron/sqlx"
 )
 
+// AssetType can be ETH/ERC20/ERC1155/ERC721
 type AssetType int
+
+// MsgType can be layer1/layer2 msg
 type MsgType int
 
 func (a AssetType) String() string {
@@ -26,45 +29,45 @@ func (a AssetType) String() string {
 }
 
 const (
+	// ETH = 0
 	ETH AssetType = iota
+	// ERC20 = 1
 	ERC20
+	// ERC721 = 2
 	ERC721
+	// ERC1155 = 3
 	ERC1155
 )
 
 const (
+	// UnknownMsg = 0
 	UnknownMsg MsgType = iota
+	// Layer1Msg = 1
 	Layer1Msg
+	// Layer2Msg = 2
 	Layer2Msg
 )
 
 // CrossMsg represents a cross message from layer 1 to layer 2
 type CrossMsg struct {
-	ID          uint64     `json:"id" db:"id"`
-	MsgHash     string     `json:"msg_hash" db:"msg_hash"`
-	Height      uint64     `json:"height" db:"height"`
-	Sender      string     `json:"sender" db:"sender"`
-	Target      string     `json:"target" db:"target"`
-	Amount      string     `json:"amount" db:"amount"`
-	Layer1Hash  string     `json:"layer1_hash" db:"layer1_hash"`
-	Layer2Hash  string     `json:"layer2_hash" db:"layer2_hash"`
-	Layer1Token string     `json:"layer1_token" db:"layer1_token"`
-	Layer2Token string     `json:"layer2_token" db:"layer2_token"`
-	TokenID     uint64     `json:"token_id" db:"token_id"`
-	Asset       int        `json:"asset" db:"asset"`
-	MsgType     int        `json:"msg_type" db:"msg_type"`
-	IsDeleted   bool       `json:"is_deleted" db:"is_deleted"`
-	Timestamp   *time.Time `json:"timestamp" db:"block_timestamp"`
-	CreatedAt   *time.Time `json:"created_at" db:"created_at"`
-	UpdatedAt   *time.Time `json:"updated_at" db:"updated_at"`
-	DeletedAt   *time.Time `json:"deleted_at" db:"deleted_at"`
-}
-
-type RelayedMsg struct {
-	MsgHash    string `json:"msg_hash" db:"msg_hash"`
-	Height     uint64 `json:"height" db:"height"`
-	Layer1Hash string `json:"layer1_hash" db:"layer1_hash"`
-	Layer2Hash string `json:"layer2_hash" db:"layer2_hash"`
+	ID           uint64     `json:"id" db:"id"`
+	MsgHash      string     `json:"msg_hash" db:"msg_hash"`
+	Height       uint64     `json:"height" db:"height"`
+	Sender       string     `json:"sender" db:"sender"`
+	Target       string     `json:"target" db:"target"`
+	Amount       string     `json:"amount" db:"amount"`
+	Layer1Hash   string     `json:"layer1_hash" db:"layer1_hash"`
+	Layer2Hash   string     `json:"layer2_hash" db:"layer2_hash"`
+	Layer1Token  string     `json:"layer1_token" db:"layer1_token"`
+	Layer2Token  string     `json:"layer2_token" db:"layer2_token"`
+	TokenIDs     string     `json:"token_ids" db:"token_ids"`
+	TokenAmounts string     `json:"token_amounts" db:"token_amounts"`
+	Asset        int        `json:"asset" db:"asset"`
+	MsgType      int        `json:"msg_type" db:"msg_type"`
+	Timestamp    *time.Time `json:"timestamp" db:"block_timestamp"`
+	CreatedAt    *time.Time `json:"created_at" db:"created_at"`
+	UpdatedAt    *time.Time `json:"updated_at" db:"updated_at"`
+	DeletedAt    *time.Time `json:"deleted_at" db:"deleted_at"`
 }
 
 // L1CrossMsgOrm provides operations on l1_cross_message table
@@ -93,17 +96,20 @@ type L2CrossMsgOrm interface {
 	DeleteL2CrossMsgFromHeightDBTx(dbTx *sqlx.Tx, height int64) error
 	UpdateL2BlockTimestamp(height uint64, timestamp time.Time) error
 	GetL2EarliestNoBlockTimestampHeight() (uint64, error)
+	GetL2CrossMsgByMsgHashList(msgHashList []string) ([]*CrossMsg, error)
 }
 
+// RelayedMsgOrm provides operations on relayed_msg table
 type RelayedMsgOrm interface {
 	BatchInsertRelayedMsgDBTx(dbTx *sqlx.Tx, messages []*RelayedMsg) error
-	GetRelayedMsgByHash(msg_hash string) (*RelayedMsg, error)
+	GetRelayedMsgByHash(msgHash string) (*RelayedMsg, error)
 	GetLatestRelayedHeightOnL1() (int64, error)
 	GetLatestRelayedHeightOnL2() (int64, error)
 	DeleteL1RelayedHashAfterHeightDBTx(dbTx *sqlx.Tx, height int64) error
 	DeleteL2RelayedHashAfterHeightDBTx(dbTx *sqlx.Tx, height int64) error
 }
 
+// L2SentMsgOrm provides operations on l2_sent_msg table
 type L2SentMsgOrm interface {
 	BatchInsertL2SentMsgDBTx(dbTx *sqlx.Tx, messages []*L2SentMsg) error
 	GetL2SentMsgByHash(l2Hash string) (*L2SentMsg, error)
@@ -111,11 +117,14 @@ type L2SentMsgOrm interface {
 	GetL2SentMessageByNonce(nonce uint64) (*L2SentMsg, error)
 	GetLatestL2SentMsgLEHeight(endBlockNumber uint64) (*L2SentMsg, error)
 	GetL2SentMsgMsgHashByHeightRange(startHeight, endHeight uint64) ([]*L2SentMsg, error)
-	UpdateL2MessageProofInDBTx(ctx context.Context, dbTx *sqlx.Tx, msgHash string, proof string, batch_index uint64) error
+	UpdateL2MessageProofInDBTx(ctx context.Context, dbTx *sqlx.Tx, msgHash string, proof string, batchIndex uint64) error
 	GetLatestL2SentMsgBatchIndex() (int64, error)
+	GetClaimableL2SentMsgByAddressWithOffset(address string, offset int64, limit int64) ([]*L2SentMsg, error)
+	GetClaimableL2SentMsgByAddressTotalNum(address string) (uint64, error)
 	DeleteL2SentMsgAfterHeightDBTx(dbTx *sqlx.Tx, height int64) error
 }
 
+// RollupBatchOrm provides operations on rollup_batch table
 type RollupBatchOrm interface {
 	GetLatestRollupBatch() (*RollupBatch, error)
 	GetRollupBatchByIndex(index uint64) (*RollupBatch, error)

bridge-history-api/db/orm/l1_cross_msg.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"database/sql"
 	"errors"
-	"fmt"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
@@ -23,7 +22,7 @@ func NewL1CrossMsgOrm(db *sqlx.DB) L1CrossMsgOrm {
 
 func (l *l1CrossMsgOrm) GetL1CrossMsgByHash(l1Hash common.Hash) (*CrossMsg, error) {
 	result := &CrossMsg{}
-	row := l.db.QueryRowx(`SELECT * FROM cross_message WHERE layer1_hash = $1 AND msg_type = $2 AND NOT is_deleted;`, l1Hash.String(), Layer1Msg)
+	row := l.db.QueryRowx(`SELECT * FROM cross_message WHERE layer1_hash = $1 AND msg_type = $2 AND deleted_at IS NULL;`, l1Hash.String(), Layer1Msg)
 	if err := row.StructScan(result); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
 			return nil, nil
@@ -37,8 +36,15 @@ func (l *l1CrossMsgOrm) GetL1CrossMsgByHash(l1Hash common.Hash) (*CrossMsg, erro
 // Warning: return empty slice if no data found
 func (l *l1CrossMsgOrm) GetL1CrossMsgsByAddress(sender common.Address) ([]*CrossMsg, error) {
 	var results []*CrossMsg
-	rows, err := l.db.Queryx(`SELECT * FROM cross_message WHERE sender = $1 AND msg_type = 1 AND NOT is_deleted;`, sender.String(), Layer1Msg)
-
+	rows, err := l.db.Queryx(`SELECT * FROM cross_message WHERE sender = $1 AND msg_type = 1 AND deleted_at IS NULL;`, sender.String(), Layer1Msg)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err = rows.Close(); err != nil {
+			log.Error("failed to close rows", "err", err)
+		}
+	}()
 	for rows.Next() {
 		msg := &CrossMsg{}
 		if err = rows.StructScan(msg); err != nil {
@@ -66,22 +72,15 @@ func (l *l1CrossMsgOrm) BatchInsertL1CrossMsgDBTx(dbTx *sqlx.Tx, messages []*Cro
 			"target":       msg.Target,
 			"amount":       msg.Amount,
 			"asset":        msg.Asset,
+			"msg_hash":     msg.MsgHash,
 			"layer1_hash":  msg.Layer1Hash,
 			"layer1_token": msg.Layer1Token,
 			"layer2_token": msg.Layer2Token,
-			"token_id":     msg.TokenID,
+			"token_ids":    msg.TokenIDs,
 			"msg_type":     Layer1Msg,
 		}
-		var exists bool
-		err = dbTx.QueryRow(`SELECT EXISTS(SELECT 1 FROM cross_message WHERE layer1_hash = $1 AND NOT is_deleted)`, msg.Layer1Hash).Scan(&exists)
-		if err != nil {
-			return err
-		}
-		if exists {
-			return fmt.Errorf("BatchInsertL1CrossMsgDBTx: l1 cross msg layer1Hash %v already exists at height %v", msg.Layer1Hash, msg.Height)
-		}
 	}
-	_, err = dbTx.NamedExec(`insert into cross_message(height, sender, target, asset, layer1_hash, layer1_token, layer2_token, token_id, amount, msg_type) values(:height, :sender, :target, :asset, :layer1_hash, :layer1_token, :layer2_token, :token_id, :amount, :msg_type);`, messageMaps)
+	_, err = dbTx.NamedExec(`insert into cross_message(height, sender, target, amount, asset, msg_hash, layer1_hash, layer1_token, layer2_token, token_ids, msg_type) values(:height, :sender, :target, :amount, :asset, :msg_hash, :layer1_hash, :layer1_token, :layer2_token, :token_ids, :msg_type);`, messageMaps)
 	if err != nil {
 		log.Error("BatchInsertL1CrossMsgDBTx: failed to insert l1 cross msgs", "err", err)
 		return err
@@ -92,7 +91,7 @@ func (l *l1CrossMsgOrm) BatchInsertL1CrossMsgDBTx(dbTx *sqlx.Tx, messages []*Cro
 
 // UpdateL1CrossMsgHashDBTx update l1 cross msg hash in db, no need to check msg_type since layer1_hash wont be empty if its layer1 msg
 func (l *l1CrossMsgOrm) UpdateL1CrossMsgHashDBTx(ctx context.Context, dbTx *sqlx.Tx, l1Hash, msgHash common.Hash) error {
-	if _, err := dbTx.ExecContext(ctx, l.db.Rebind("update public.cross_message set msg_hash = ? where layer1_hash = ? AND NOT is_deleted;"), msgHash.String(), l1Hash.String()); err != nil {
+	if _, err := dbTx.ExecContext(ctx, l.db.Rebind("update public.cross_message set msg_hash = ? where layer1_hash = ? AND deleted_at IS NULL;"), msgHash.String(), l1Hash.String()); err != nil {
 		return err
 	}
 	return nil
@@ -100,7 +99,7 @@ func (l *l1CrossMsgOrm) UpdateL1CrossMsgHashDBTx(ctx context.Context, dbTx *sqlx
 }
 
 func (l *l1CrossMsgOrm) UpdateL1CrossMsgHash(ctx context.Context, l1Hash, msgHash common.Hash) error {
-	if _, err := l.db.ExecContext(ctx, l.db.Rebind("update public.l1_cross_message set msg_hash = ? where layer1_hash = ? AND NOT is_deleted;"), msgHash.String(), l1Hash.String()); err != nil {
+	if _, err := l.db.ExecContext(ctx, l.db.Rebind("update public.l1_cross_message set msg_hash = ? where layer1_hash = ? AND deleted_at IS NULL;"), msgHash.String(), l1Hash.String()); err != nil {
 		return err
 	}
 	return nil
@@ -108,7 +107,7 @@ func (l *l1CrossMsgOrm) UpdateL1CrossMsgHash(ctx context.Context, l1Hash, msgHas
 }
 
 func (l *l1CrossMsgOrm) GetLatestL1ProcessedHeight() (int64, error) {
-	row := l.db.QueryRowx(`SELECT height FROM cross_message WHERE msg_type = $1 AND NOT is_deleted ORDER BY id DESC LIMIT 1;`, Layer1Msg)
+	row := l.db.QueryRowx(`SELECT height FROM cross_message WHERE msg_type = $1 AND deleted_at IS NULL ORDER BY id DESC LIMIT 1;`, Layer1Msg)
 	var result sql.NullInt64
 	if err := row.Scan(&result); err != nil {
 		if err == sql.ErrNoRows || !result.Valid {
@@ -123,21 +122,21 @@ func (l *l1CrossMsgOrm) GetLatestL1ProcessedHeight() (int64, error) {
 }
 
 func (l *l1CrossMsgOrm) DeleteL1CrossMsgAfterHeightDBTx(dbTx *sqlx.Tx, height int64) error {
-	if _, err := l.db.Exec(`UPDATE cross_message SET is_deleted = true WHERE height > $1 AND msg_type = $2;`, height, Layer1Msg); err != nil {
+	if _, err := l.db.Exec(`UPDATE cross_message SET deleted_at = current_timestamp WHERE height > $1 AND msg_type = $2;`, height, Layer1Msg); err != nil {
 		return err
 	}
 	return nil
 }
 
 func (l *l1CrossMsgOrm) UpdateL1BlockTimestamp(height uint64, timestamp time.Time) error {
-	if _, err := l.db.Exec(`UPDATE cross_message SET block_timestamp = $1 where height = $2 AND msg_type = $3 AND NOT is_deleted`, timestamp, height, Layer1Msg); err != nil {
+	if _, err := l.db.Exec(`UPDATE cross_message SET block_timestamp = $1 where height = $2 AND msg_type = $3 AND deleted_at IS NULL`, timestamp, height, Layer1Msg); err != nil {
 		return err
 	}
 	return nil
 }
 
 func (l *l1CrossMsgOrm) GetL1EarliestNoBlockTimestampHeight() (uint64, error) {
-	row := l.db.QueryRowx(`SELECT height FROM cross_message WHERE block_timestamp IS NULL AND msg_type = $1 AND NOT is_deleted ORDER BY height ASC LIMIT 1;`, Layer1Msg)
+	row := l.db.QueryRowx(`SELECT height FROM cross_message WHERE block_timestamp IS NULL AND msg_type = $1 AND deleted_at IS NULL ORDER BY height ASC LIMIT 1;`, Layer1Msg)
 	var result uint64
 	if err := row.Scan(&result); err != nil {
 		if err == sql.ErrNoRows {

bridge-history-api/db/orm/l2_cross_msg.go

@@ -4,12 +4,12 @@ import (
 	"context"
 	"database/sql"
 	"errors"
-	"fmt"
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/jmoiron/sqlx"
+	"github.com/lib/pq"
 )
 
 type l2CrossMsgOrm struct {
@@ -23,7 +23,7 @@ func NewL2CrossMsgOrm(db *sqlx.DB) L2CrossMsgOrm {
 
 func (l *l2CrossMsgOrm) GetL2CrossMsgByHash(l2Hash common.Hash) (*CrossMsg, error) {
 	result := &CrossMsg{}
-	row := l.db.QueryRowx(`SELECT * FROM cross_message WHERE layer2_hash = $1 AND NOT is_deleted;`, l2Hash.String())
+	row := l.db.QueryRowx(`SELECT * FROM cross_message WHERE layer2_hash = $1 AND deleted_at IS NULL;`, l2Hash.String())
 	if err := row.StructScan(result); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
 			return nil, nil
@@ -37,8 +37,15 @@ func (l *l2CrossMsgOrm) GetL2CrossMsgByHash(l2Hash common.Hash) (*CrossMsg, erro
 // Warning: return empty slice if no data found
 func (l *l2CrossMsgOrm) GetL2CrossMsgByAddress(sender common.Address) ([]*CrossMsg, error) {
 	var results []*CrossMsg
-	rows, err := l.db.Queryx(`SELECT * FROM cross_message WHERE sender = $1 AND msg_type = $2 AND NOT is_deleted;`, sender.String(), Layer2Msg)
-
+	rows, err := l.db.Queryx(`SELECT * FROM cross_message WHERE sender = $1 AND msg_type = $2 AND deleted_at IS NULL;`, sender.String(), Layer2Msg)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err = rows.Close(); err != nil {
+			log.Error("failed to close rows", "err", err)
+		}
+	}()
 	for rows.Next() {
 		msg := &CrossMsg{}
 		if err = rows.StructScan(msg); err != nil {
@@ -56,7 +63,7 @@ func (l *l2CrossMsgOrm) GetL2CrossMsgByAddress(sender common.Address) ([]*CrossM
 }
 
 func (l *l2CrossMsgOrm) DeleteL2CrossMsgFromHeightDBTx(dbTx *sqlx.Tx, height int64) error {
-	_, err := dbTx.Exec(`UPDATE cross_message SET is_deleted = true where height > $1 AND msg_type = $2 ;`, height, Layer2Msg)
+	_, err := dbTx.Exec(`UPDATE cross_message SET deleted_at = current_timestamp where height > $1 AND msg_type = $2 ;`, height, Layer2Msg)
 	if err != nil {
 		log.Error("DeleteL1CrossMsgAfterHeightDBTx: failed to delete", "height", height, "err", err)
 		return err
@@ -72,29 +79,21 @@ func (l *l2CrossMsgOrm) BatchInsertL2CrossMsgDBTx(dbTx *sqlx.Tx, messages []*Cro
 	var err error
 	messageMaps := make([]map[string]interface{}, len(messages))
 	for i, msg := range messages {
-
 		messageMaps[i] = map[string]interface{}{
 			"height":       msg.Height,
 			"sender":       msg.Sender,
 			"target":       msg.Target,
 			"asset":        msg.Asset,
+			"msg_hash":     msg.MsgHash,
 			"layer2_hash":  msg.Layer2Hash,
 			"layer1_token": msg.Layer1Token,
 			"layer2_token": msg.Layer2Token,
-			"token_id":     msg.TokenID,
+			"token_ids":    msg.TokenIDs,
 			"amount":       msg.Amount,
 			"msg_type":     Layer2Msg,
 		}
-		var exists bool
-		err = dbTx.QueryRow(`SELECT EXISTS(SELECT 1 FROM cross_message WHERE layer2_hash = $1 AND NOT is_deleted)`, msg.Layer2Hash).Scan(&exists)
-		if err != nil {
-			return err
-		}
-		if exists {
-			return fmt.Errorf("BatchInsertL2CrossMsgDBTx: l2 cross msg layer2Hash %v already exists at height %v", msg.Layer2Hash, msg.Height)
-		}
 	}
-	_, err = dbTx.NamedExec(`insert into cross_message(height, sender, target, asset, layer2_hash, layer1_token, layer2_token, token_id, amount, msg_type) values(:height, :sender, :target, :asset, :layer2_hash, :layer1_token, :layer2_token, :token_id, :amount, :msg_type);`, messageMaps)
+	_, err = dbTx.NamedExec(`insert into cross_message(height, sender, target, asset, msg_hash, layer2_hash, layer1_token, layer2_token, token_ids, amount, msg_type) values(:height, :sender, :target, :asset, :msg_hash, :layer2_hash, :layer1_token, :layer2_token, :token_ids, :amount, :msg_type);`, messageMaps)
 	if err != nil {
 		log.Error("BatchInsertL2CrossMsgDBTx: failed to insert l2 cross msgs", "err", err)
 		return err
@@ -103,21 +102,21 @@ func (l *l2CrossMsgOrm) BatchInsertL2CrossMsgDBTx(dbTx *sqlx.Tx, messages []*Cro
 }
 
 func (l *l2CrossMsgOrm) UpdateL2CrossMsgHashDBTx(ctx context.Context, dbTx *sqlx.Tx, l2Hash, msgHash common.Hash) error {
-	if _, err := dbTx.ExecContext(ctx, l.db.Rebind("update public.cross_message set msg_hash = ? where layer2_hash = ? AND NOT is_deleted;"), msgHash.String(), l2Hash.String()); err != nil {
+	if _, err := dbTx.ExecContext(ctx, l.db.Rebind("update cross_message set msg_hash = ? where layer2_hash = ? AND deleted_at IS NULL;"), msgHash.String(), l2Hash.String()); err != nil {
 		return err
 	}
 	return nil
 }
 
 func (l *l2CrossMsgOrm) UpdateL2CrossMsgHash(ctx context.Context, l2Hash, msgHash common.Hash) error {
-	if _, err := l.db.ExecContext(ctx, l.db.Rebind("update public.cross_message set msg_hash = ? where layer2_hash = ? AND NOT is_deleted;"), msgHash.String(), l2Hash.String()); err != nil {
+	if _, err := l.db.ExecContext(ctx, l.db.Rebind("update cross_message set msg_hash = ? where layer2_hash = ? AND deleted_at IS NULL;"), msgHash.String(), l2Hash.String()); err != nil {
 		return err
 	}
 	return nil
 }
 
 func (l *l2CrossMsgOrm) GetLatestL2ProcessedHeight() (int64, error) {
-	row := l.db.QueryRowx(`SELECT height FROM cross_message WHERE msg_type = $1 AND NOT is_deleted ORDER BY id DESC LIMIT 1;`, Layer2Msg)
+	row := l.db.QueryRowx(`SELECT height FROM cross_message WHERE msg_type = $1 AND deleted_at IS NULL ORDER BY id DESC LIMIT 1;`, Layer2Msg)
 	var result sql.NullInt64
 	if err := row.Scan(&result); err != nil {
 		if err == sql.ErrNoRows || !result.Valid {
@@ -132,14 +131,14 @@ func (l *l2CrossMsgOrm) GetLatestL2ProcessedHeight() (int64, error) {
 }
 
 func (l *l2CrossMsgOrm) UpdateL2BlockTimestamp(height uint64, timestamp time.Time) error {
-	if _, err := l.db.Exec(`UPDATE cross_message SET block_timestamp = $1 where height = $2 AND msg_type = $3 AND NOT is_deleted`, timestamp, height, Layer2Msg); err != nil {
+	if _, err := l.db.Exec(`UPDATE cross_message SET block_timestamp = $1 where height = $2 AND msg_type = $3 AND deleted_at IS NULL`, timestamp, height, Layer2Msg); err != nil {
 		return err
 	}
 	return nil
 }
 
 func (l *l2CrossMsgOrm) GetL2EarliestNoBlockTimestampHeight() (uint64, error) {
-	row := l.db.QueryRowx(`SELECT height FROM cross_message WHERE block_timestamp IS NULL AND msg_type = $1 AND NOT is_deleted ORDER BY height ASC LIMIT 1;`, Layer2Msg)
+	row := l.db.QueryRowx(`SELECT height FROM cross_message WHERE block_timestamp IS NULL AND msg_type = $1 AND deleted_at IS NULL ORDER BY height ASC LIMIT 1;`, Layer2Msg)
 	var result uint64
 	if err := row.Scan(&result); err != nil {
 		if err == sql.ErrNoRows {
@@ -149,3 +148,30 @@ func (l *l2CrossMsgOrm) GetL2EarliestNoBlockTimestampHeight() (uint64, error) {
 	}
 	return result, nil
 }
+
+func (l *l2CrossMsgOrm) GetL2CrossMsgByMsgHashList(msgHashList []string) ([]*CrossMsg, error) {
+	var results []*CrossMsg
+	rows, err := l.db.Queryx(`SELECT * FROM cross_message WHERE msg_hash = ANY($1) AND msg_type = $2 AND deleted_at IS NULL;`, pq.Array(msgHashList), Layer2Msg)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err = rows.Close(); err != nil {
+			log.Error("failed to close rows", "err", err)
+		}
+	}()
+	for rows.Next() {
+		msg := &CrossMsg{}
+		if err = rows.StructScan(msg); err != nil {
+			break
+		}
+		results = append(results, msg)
+	}
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		return nil, err
+	}
+	if len(results) == 0 {
+		log.Debug("no L2CrossMsg under given msg hashes", "msg hash list", msgHashList)
+	}
+	return results, nil
+}

bridge-history-api/db/orm/l2_sent_msg.go

@@ -3,28 +3,29 @@ package orm
 import (
 	"context"
 	"database/sql"
-	"fmt"
 	"time"
 
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/jmoiron/sqlx"
 )
 
+// L2SentMsg defines the struct for l2_sent_msg table record
 type L2SentMsg struct {
-	ID         uint64     `json:"id" db:"id"`
-	MsgHash    string     `json:"msg_hash" db:"msg_hash"`
-	Sender     string     `json:"sender" db:"sender"`
-	Target     string     `json:"target" db:"target"`
-	Value      string     `json:"value" db:"value"`
-	Height     uint64     `json:"height" db:"height"`
-	Nonce      uint64     `json:"nonce" db:"nonce"`
-	BatchIndex uint64     `json:"batch_index" db:"batch_index"`
-	MsgProof   string     `json:"msg_proof" db:"msg_proof"`
-	MsgData    string     `json:"msg_data" db:"msg_data"`
-	IsDeleted  bool       `json:"is_deleted" db:"is_deleted"`
-	CreatedAt  *time.Time `json:"created_at" db:"created_at"`
-	UpdatedAt  *time.Time `json:"updated_at" db:"updated_at"`
-	DeletedAt  *time.Time `json:"deleted_at" db:"deleted_at"`
+	ID             uint64     `json:"id" db:"id"`
+	OriginalSender string     `json:"original_sender" db:"original_sender"`
+	TxHash         string     `json:"tx_hash" db:"tx_hash"`
+	MsgHash        string     `json:"msg_hash" db:"msg_hash"`
+	Sender         string     `json:"sender" db:"sender"`
+	Target         string     `json:"target" db:"target"`
+	Value          string     `json:"value" db:"value"`
+	Height         uint64     `json:"height" db:"height"`
+	Nonce          uint64     `json:"nonce" db:"nonce"`
+	BatchIndex     uint64     `json:"batch_index" db:"batch_index"`
+	MsgProof       string     `json:"msg_proof" db:"msg_proof"`
+	MsgData        string     `json:"msg_data" db:"msg_data"`
+	CreatedAt      *time.Time `json:"created_at" db:"created_at"`
+	UpdatedAt      *time.Time `json:"updated_at" db:"updated_at"`
+	DeletedAt      *time.Time `json:"deleted_at" db:"deleted_at"`
 }
 
 type l2SentMsgOrm struct {
@@ -38,7 +39,7 @@ func NewL2SentMsgOrm(db *sqlx.DB) L2SentMsgOrm {
 
 func (l *l2SentMsgOrm) GetL2SentMsgByHash(msgHash string) (*L2SentMsg, error) {
 	result := &L2SentMsg{}
-	row := l.db.QueryRowx(`SELECT * FROM l2_sent_msg WHERE msg_hash = $1 AND NOT is_deleted;`, msgHash)
+	row := l.db.QueryRowx(`SELECT * FROM l2_sent_msg WHERE msg_hash = $1 AND deleted_at IS NULL;`, msgHash)
 	if err := row.StructScan(result); err != nil {
 		return nil, err
 	}
@@ -53,35 +54,29 @@ func (l *l2SentMsgOrm) BatchInsertL2SentMsgDBTx(dbTx *sqlx.Tx, messages []*L2Sen
 	messageMaps := make([]map[string]interface{}, len(messages))
 	for i, msg := range messages {
 		messageMaps[i] = map[string]interface{}{
-			"sender":      msg.Sender,
-			"target":      msg.Target,
-			"value":       msg.Value,
-			"msg_hash":    msg.MsgHash,
-			"height":      msg.Height,
-			"nonce":       msg.Nonce,
-			"batch_index": msg.BatchIndex,
-			"msg_proof":   msg.MsgProof,
-			"msg_data":    msg.MsgData,
-		}
-		var exists bool
-		err = dbTx.QueryRow(`SELECT EXISTS(SELECT 1 FROM l2_sent_msg WHERE (msg_hash = $1 OR nonce = $2) AND NOT is_deleted)`, msg.MsgHash, msg.Nonce).Scan(&exists)
-		if err != nil {
-			return err
-		}
-		if exists {
-			return fmt.Errorf("BatchInsertL2SentMsgDBTx: l2 sent msg_hash %v already exists at height %v", msg.MsgHash, msg.Height)
+			"original_sender": msg.OriginalSender,
+			"tx_hash":         msg.TxHash,
+			"sender":          msg.Sender,
+			"target":          msg.Target,
+			"value":           msg.Value,
+			"msg_hash":        msg.MsgHash,
+			"height":          msg.Height,
+			"nonce":           msg.Nonce,
+			"batch_index":     msg.BatchIndex,
+			"msg_proof":       msg.MsgProof,
+			"msg_data":        msg.MsgData,
 		}
 	}
-	_, err = dbTx.NamedExec(`insert into l2_sent_msg(sender, target, value, msg_hash, height, nonce, batch_index, msg_proof, msg_data) values(:sender, :target, :value, :msg_hash, :height, :nonce, :batch_index, :msg_proof, :msg_data);`, messageMaps)
+	_, err = dbTx.NamedExec(`insert into l2_sent_msg(original_sender, tx_hash, sender, target, value, msg_hash, height, nonce, batch_index, msg_proof, msg_data) values(:original_sender, :tx_hash, :sender, :target, :value, :msg_hash, :height, :nonce, :batch_index, :msg_proof, :msg_data);`, messageMaps)
 	if err != nil {
-		log.Error("BatchInsertL2SentMsgDBTx: failed to insert l2 sent msgs", "msg_Hash", "err", err)
+		log.Error("BatchInsertL2SentMsgDBTx: failed to insert l2 sent msgs", "err", err)
 		return err
 	}
 	return err
 }
 
 func (l *l2SentMsgOrm) GetLatestSentMsgHeightOnL2() (int64, error) {
-	row := l.db.QueryRow(`SELECT height FROM l2_sent_msg WHERE NOT is_deleted ORDER BY nonce DESC LIMIT 1;`)
+	row := l.db.QueryRow(`SELECT height FROM l2_sent_msg WHERE deleted_at IS NULL ORDER BY nonce DESC LIMIT 1;`)
 	var result sql.NullInt64
 	if err := row.Scan(&result); err != nil {
 		if err == sql.ErrNoRows || !result.Valid {
@@ -95,15 +90,15 @@ func (l *l2SentMsgOrm) GetLatestSentMsgHeightOnL2() (int64, error) {
 	return 0, nil
 }
 
-func (l *l2SentMsgOrm) UpdateL2MessageProofInDBTx(ctx context.Context, dbTx *sqlx.Tx, msgHash string, proof string, batch_index uint64) error {
-	if _, err := dbTx.ExecContext(ctx, l.db.Rebind("update l2_sent_msg set msg_proof = ?, batch_index = ? where msg_hash = ? AND NOT is_deleted;"), proof, batch_index, msgHash); err != nil {
+func (l *l2SentMsgOrm) UpdateL2MessageProofInDBTx(ctx context.Context, dbTx *sqlx.Tx, msgHash string, proof string, batchIndex uint64) error {
+	if _, err := dbTx.ExecContext(ctx, l.db.Rebind("update l2_sent_msg set msg_proof = ?, batch_index = ? where msg_hash = ? AND deleted_at IS NULL;"), proof, batchIndex, msgHash); err != nil {
 		return err
 	}
 	return nil
 }
 
 func (l *l2SentMsgOrm) GetLatestL2SentMsgBatchIndex() (int64, error) {
-	row := l.db.QueryRow(`SELECT batch_index FROM l2_sent_msg WHERE msg_proof != '' AND NOT is_deleted ORDER BY batch_index DESC LIMIT 1;`)
+	row := l.db.QueryRow(`SELECT batch_index FROM l2_sent_msg WHERE batch_index != 0 AND deleted_at IS NULL ORDER BY batch_index DESC LIMIT 1;`)
 	var result sql.NullInt64
 	if err := row.Scan(&result); err != nil {
 		if err == sql.ErrNoRows || !result.Valid {
@@ -119,10 +114,15 @@ func (l *l2SentMsgOrm) GetLatestL2SentMsgBatchIndex() (int64, error) {
 
 func (l *l2SentMsgOrm) GetL2SentMsgMsgHashByHeightRange(startHeight, endHeight uint64) ([]*L2SentMsg, error) {
 	var results []*L2SentMsg
-	rows, err := l.db.Queryx(`SELECT * FROM l2_sent_msg WHERE height >= $1 AND height <= $2 AND NOT is_deleted ORDER BY nonce ASC;`, startHeight, endHeight)
+	rows, err := l.db.Queryx(`SELECT * FROM l2_sent_msg WHERE height >= $1 AND height <= $2 AND deleted_at IS NULL ORDER BY nonce ASC;`, startHeight, endHeight)
 	if err != nil {
 		return nil, err
 	}
+	defer func() {
+		if err = rows.Close(); err != nil {
+			log.Error("failed to close rows", "err", err)
+		}
+	}()
 	for rows.Next() {
 		msg := &L2SentMsg{}
 		if err = rows.StructScan(msg); err != nil {
@@ -135,7 +135,7 @@ func (l *l2SentMsgOrm) GetL2SentMsgMsgHashByHeightRange(startHeight, endHeight u
 
 func (l *l2SentMsgOrm) GetL2SentMessageByNonce(nonce uint64) (*L2SentMsg, error) {
 	result := &L2SentMsg{}
-	row := l.db.QueryRowx(`SELECT * FROM l2_sent_msg WHERE nonce = $1 AND NOT is_deleted;`, nonce)
+	row := l.db.QueryRowx(`SELECT * FROM l2_sent_msg WHERE nonce = $1 AND deleted_at IS NULL;`, nonce)
 	err := row.StructScan(result)
 	if err != nil {
 		return nil, err
@@ -145,7 +145,7 @@ func (l *l2SentMsgOrm) GetL2SentMessageByNonce(nonce uint64) (*L2SentMsg, error)
 
 func (l *l2SentMsgOrm) GetLatestL2SentMsgLEHeight(endBlockNumber uint64) (*L2SentMsg, error) {
 	result := &L2SentMsg{}
-	row := l.db.QueryRowx(`select * from l2_sent_msg where height <= $1 AND NOT is_deleted order by nonce desc limit 1`, endBlockNumber)
+	row := l.db.QueryRowx(`select * from l2_sent_msg where height <= $1 AND deleted_at IS NULL order by nonce desc limit 1`, endBlockNumber)
 	err := row.StructScan(result)
 	if err != nil {
 		return nil, err
@@ -154,6 +154,36 @@ func (l *l2SentMsgOrm) GetLatestL2SentMsgLEHeight(endBlockNumber uint64) (*L2Sen
 }
 
 func (l *l2SentMsgOrm) DeleteL2SentMsgAfterHeightDBTx(dbTx *sqlx.Tx, height int64) error {
-	_, err := dbTx.Exec(`UPDATE l2_sent_msg SET is_deleted = true WHERE height > $1;`, height)
+	_, err := dbTx.Exec(`UPDATE l2_sent_msg SET deleted_at = current_timestamp WHERE height > $1;`, height)
 	return err
 }
+
+func (l *l2SentMsgOrm) GetClaimableL2SentMsgByAddressWithOffset(address string, offset int64, limit int64) ([]*L2SentMsg, error) {
+	var results []*L2SentMsg
+	rows, err := l.db.Queryx(`SELECT * FROM l2_sent_msg WHERE id NOT IN (SELECT l2_sent_msg.id FROM l2_sent_msg INNER JOIN relayed_msg ON l2_sent_msg.msg_hash = relayed_msg.msg_hash WHERE l2_sent_msg.deleted_at IS NULL AND relayed_msg.deleted_at IS NULL) AND (original_sender=$1 OR sender = $1) ORDER BY id DESC LIMIT $2 OFFSET $3;`, address, limit, offset)
+	if err != nil {
+		return nil, err
+	}
+	defer func() {
+		if err = rows.Close(); err != nil {
+			log.Error("failed to close rows", "err", err)
+		}
+	}()
+	for rows.Next() {
+		msg := &L2SentMsg{}
+		if err = rows.StructScan(msg); err != nil {
+			break
+		}
+		results = append(results, msg)
+	}
+	return results, err
+}
+
+func (l *l2SentMsgOrm) GetClaimableL2SentMsgByAddressTotalNum(address string) (uint64, error) {
+	var count uint64
+	row := l.db.QueryRowx(`SELECT COUNT(*) FROM l2_sent_msg WHERE id NOT IN (SELECT l2_sent_msg.id FROM l2_sent_msg INNER JOIN relayed_msg ON l2_sent_msg.msg_hash = relayed_msg.msg_hash WHERE l2_sent_msg.deleted_at IS NULL AND relayed_msg.deleted_at IS NULL) AND (original_sender=$1 OR sender = $1);`, address)
+	if err := row.Scan(&count); err != nil {
+		return 0, err
+	}
+	return count, nil
+}

bridge-history-api/db/orm/relayed_msg.go

@@ -8,6 +8,14 @@ import (
 	"github.com/jmoiron/sqlx"
 )
 
+// RelayedMsg is the struct for relayed_msg table
+type RelayedMsg struct {
+	MsgHash    string `json:"msg_hash" db:"msg_hash"`
+	Height     uint64 `json:"height" db:"height"`
+	Layer1Hash string `json:"layer1_hash" db:"layer1_hash"`
+	Layer2Hash string `json:"layer2_hash" db:"layer2_hash"`
+}
+
 type relayedMsgOrm struct {
 	db *sqlx.DB
 }
@@ -33,15 +41,15 @@ func (l *relayedMsgOrm) BatchInsertRelayedMsgDBTx(dbTx *sqlx.Tx, messages []*Rel
 	}
 	_, err = dbTx.NamedExec(`insert into relayed_msg(msg_hash, height, layer1_hash, layer2_hash) values(:msg_hash, :height, :layer1_hash, :layer2_hash);`, messageMaps)
 	if err != nil {
-		log.Error("BatchInsertRelayedMsgDBTx: failed to insert l1 cross msgs", "msg_Hashe", "err", err)
+		log.Error("BatchInsertRelayedMsgDBTx: failed to insert relayed msgs", "err", err)
 		return err
 	}
 	return nil
 }
 
-func (l *relayedMsgOrm) GetRelayedMsgByHash(msg_hash string) (*RelayedMsg, error) {
+func (l *relayedMsgOrm) GetRelayedMsgByHash(msgHash string) (*RelayedMsg, error) {
 	result := &RelayedMsg{}
-	row := l.db.QueryRowx(`SELECT msg_hash, height, layer1_hash, layer2_hash FROM relayed_msg WHERE msg_hash = $1 AND NOT is_deleted;`, msg_hash)
+	row := l.db.QueryRowx(`SELECT msg_hash, height, layer1_hash, layer2_hash FROM relayed_msg WHERE msg_hash = $1 AND deleted_at IS NULL;`, msgHash)
 	if err := row.StructScan(result); err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
 			return nil, nil
@@ -52,7 +60,7 @@ func (l *relayedMsgOrm) GetRelayedMsgByHash(msg_hash string) (*RelayedMsg, error
 }
 
 func (l *relayedMsgOrm) GetLatestRelayedHeightOnL1() (int64, error) {
-	row := l.db.QueryRow(`SELECT height FROM relayed_msg WHERE layer1_hash != '' AND NOT is_deleted ORDER BY height DESC LIMIT 1;`)
+	row := l.db.QueryRow(`SELECT height FROM relayed_msg WHERE layer1_hash != '' AND deleted_at IS NULL ORDER BY height DESC LIMIT 1;`)
 	var result sql.NullInt64
 	if err := row.Scan(&result); err != nil {
 		if err == sql.ErrNoRows || !result.Valid {
@@ -67,7 +75,7 @@ func (l *relayedMsgOrm) GetLatestRelayedHeightOnL1() (int64, error) {
 }
 
 func (l *relayedMsgOrm) GetLatestRelayedHeightOnL2() (int64, error) {
-	row := l.db.QueryRow(`SELECT height FROM relayed_msg WHERE layer2_hash != '' AND NOT is_deleted ORDER BY height DESC LIMIT 1;`)
+	row := l.db.QueryRow(`SELECT height FROM relayed_msg WHERE layer2_hash != '' AND deleted_at IS NULL ORDER BY height DESC LIMIT 1;`)
 	var result sql.NullInt64
 	if err := row.Scan(&result); err != nil {
 		if err == sql.ErrNoRows || !result.Valid {
@@ -82,11 +90,11 @@ func (l *relayedMsgOrm) GetLatestRelayedHeightOnL2() (int64, error) {
 }
 
 func (l *relayedMsgOrm) DeleteL1RelayedHashAfterHeightDBTx(dbTx *sqlx.Tx, height int64) error {
-	_, err := dbTx.Exec(`UPDATE relayed_msg SET is_deleted = true WHERE height > $1 AND layer1_hash != '';`, height)
+	_, err := dbTx.Exec(`UPDATE relayed_msg SET deleted_at = current_timestamp WHERE height > $1 AND layer1_hash != '';`, height)
 	return err
 }
 
 func (l *relayedMsgOrm) DeleteL2RelayedHashAfterHeightDBTx(dbTx *sqlx.Tx, height int64) error {
-	_, err := dbTx.Exec(`UPDATE relayed_msg SET is_deleted = true WHERE height > $1 AND layer2_hash != '';`, height)
+	_, err := dbTx.Exec(`UPDATE relayed_msg SET deleted_at = current_timestamp WHERE height > $1 AND layer2_hash != '';`, height)
 	return err
 }

bridge-history-api/db/orm_factory.go

@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"errors"
 
+	"github.com/ethereum/go-ethereum/log"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq" //nolint:golint
 
@@ -68,7 +69,7 @@ func (o *ormFactory) Beginx() (*sqlx.Tx, error) {
 
 func (o *ormFactory) GetTotalCrossMsgCountByAddress(sender string) (uint64, error) {
 	var count uint64
-	row := o.DB.QueryRowx(`SELECT COUNT(*) FROM cross_message WHERE sender = $1 AND NOT is_deleted;`, sender)
+	row := o.DB.QueryRowx(`SELECT COUNT(*) FROM cross_message WHERE sender = $1 AND deleted_at IS NULL;`, sender)
 	if err := row.Scan(&count); err != nil {
 		return 0, err
 	}
@@ -78,10 +79,15 @@ func (o *ormFactory) GetTotalCrossMsgCountByAddress(sender string) (uint64, erro
 func (o *ormFactory) GetCrossMsgsByAddressWithOffset(sender string, offset int64, limit int64) ([]*orm.CrossMsg, error) {
 	para := sender
 	var results []*orm.CrossMsg
-	rows, err := o.DB.Queryx(`SELECT * FROM cross_message WHERE sender = $1 AND NOT is_deleted ORDER BY block_timestamp DESC NULLS FIRST, id DESC LIMIT $2 OFFSET $3;`, para, limit, offset)
+	rows, err := o.DB.Queryx(`SELECT * FROM cross_message WHERE sender = $1 AND deleted_at IS NULL ORDER BY block_timestamp DESC NULLS FIRST, id DESC LIMIT $2 OFFSET $3;`, para, limit, offset)
 	if err != nil || rows == nil {
 		return nil, err
 	}
+	defer func() {
+		if err = rows.Close(); err != nil {
+			log.Error("failed to close rows", "err", err)
+		}
+	}()
 	for rows.Next() {
 		msg := &orm.CrossMsg{}
 		if err = rows.StructScan(msg); err != nil {

bridge-history-api/model/request.go

@@ -1,11 +1,13 @@
 package model
 
+// QueryByAddressRequest the request parameter of address api
 type QueryByAddressRequest struct {
 	Address string `url:"address"`
 	Offset  int    `url:"offset"`
 	Limit   int    `url:"limit"`
 }
 
+// QueryByHashRequest the request parameter of hash api
 type QueryByHashRequest struct {
 	Txs []string `url:"txs"`
 }

bridge-history-api/model/response.go

@@ -2,16 +2,19 @@ package model
 
 import "bridge-history-api/service"
 
+// Data the return struct of apis
 type Data struct {
 	Result []*service.TxHistoryInfo `json:"result"`
 	Total  uint64                   `json:"total"`
 }
 
+// QueryByAddressResponse the schema of address api response
 type QueryByAddressResponse struct {
 	Message string `json:"message"`
 	Data    *Data  `json:"data"`
 }
 
+// QueryByHashResponse the schema of hash api response
 type QueryByHashResponse struct {
 	Message string `json:"message"`
 	Data    *Data  `json:"data"`

bridge-history-api/service/service.go

@@ -11,6 +11,7 @@ import (
 	"bridge-history-api/db/orm"
 )
 
+// Finalized the schema of tx finalized infos
 type Finalized struct {
 	Hash           string     `json:"hash"`
 	Amount         string     `json:"amount"`
@@ -20,6 +21,7 @@ type Finalized struct {
 	BlockTimestamp *time.Time `json:"blockTimestamp"` // uselesss
 }
 
+// UserClaimInfo the schema of tx claim infos
 type UserClaimInfo struct {
 	From       string `json:"from"`
 	To         string `json:"to"`
@@ -31,6 +33,7 @@ type UserClaimInfo struct {
 	BatchIndex string `json:"batch_index"`
 }
 
+// TxHistoryInfo the schema of tx history infos
 type TxHistoryInfo struct {
 	Hash           string         `json:"hash"`
 	Amount         string         `json:"amount"`
@@ -47,6 +50,7 @@ type TxHistoryInfo struct {
 type HistoryService interface {
 	GetTxsByAddress(address common.Address, offset int64, limit int64) ([]*TxHistoryInfo, uint64, error)
 	GetTxsByHashes(hashes []string) ([]*TxHistoryInfo, error)
+	GetClaimableTxsByAddress(address common.Address, offset int64, limit int64) ([]*TxHistoryInfo, uint64, error)
 }
 
 // NewHistoryService returns a service backed with a "db"
@@ -60,6 +64,7 @@ type historyBackend struct {
 	db     db.OrmFactory
 }
 
+// GetCrossTxClaimInfo get UserClaimInfos by address
 func GetCrossTxClaimInfo(msgHash string, db db.OrmFactory) *UserClaimInfo {
 	l2sentMsg, err := db.GetL2SentMsgByHash(msgHash)
 	if err != nil {
@@ -77,7 +82,7 @@ func GetCrossTxClaimInfo(msgHash string, db db.OrmFactory) *UserClaimInfo {
 		Value:      l2sentMsg.Value,
 		Nonce:      strconv.FormatUint(l2sentMsg.Nonce, 10),
 		Message:    l2sentMsg.MsgData,
-		Proof:      l2sentMsg.MsgProof,
+		Proof:      "0x" + l2sentMsg.MsgProof,
 		BatchHash:  batch.BatchHash,
 		BatchIndex: strconv.FormatUint(l2sentMsg.BatchIndex, 10),
 	}
@@ -106,6 +111,50 @@ func updateCrossTxHash(msgHash string, txInfo *TxHistoryInfo, db db.OrmFactory)
 
 }
 
+// GetClaimableTxsByAddress get all claimable txs under given address
+func (h *historyBackend) GetClaimableTxsByAddress(address common.Address, offset int64, limit int64) ([]*TxHistoryInfo, uint64, error) {
+	var txHistories []*TxHistoryInfo
+	total, err := h.db.GetClaimableL2SentMsgByAddressTotalNum(address.Hex())
+	if err != nil || total == 0 {
+		return txHistories, 0, err
+	}
+	results, err := h.db.GetClaimableL2SentMsgByAddressWithOffset(address.Hex(), offset, limit)
+	if err != nil || len(results) == 0 {
+		return txHistories, 0, err
+	}
+	var msgHashList []string
+	for _, result := range results {
+		msgHashList = append(msgHashList, result.MsgHash)
+	}
+	crossMsgs, err := h.db.GetL2CrossMsgByMsgHashList(msgHashList)
+	// crossMsgs can be empty, because they can be emitted by user directly call contract
+	if err != nil {
+		return txHistories, 0, err
+	}
+	crossMsgMap := make(map[string]*orm.CrossMsg)
+	for _, crossMsg := range crossMsgs {
+		crossMsgMap[crossMsg.MsgHash] = crossMsg
+	}
+	for _, result := range results {
+		txInfo := &TxHistoryInfo{
+			Hash:        result.TxHash,
+			IsL1:        false,
+			BlockNumber: result.Height,
+			FinalizeTx:  &Finalized{},
+			ClaimInfo:   GetCrossTxClaimInfo(result.MsgHash, h.db),
+		}
+		if crossMsg, exist := crossMsgMap[result.MsgHash]; exist {
+			txInfo.Amount = crossMsg.Amount
+			txInfo.To = crossMsg.Target
+			txInfo.BlockTimestamp = crossMsg.Timestamp
+			txInfo.CreatedAt = crossMsg.CreatedAt
+		}
+		txHistories = append(txHistories, txInfo)
+	}
+	return txHistories, total, err
+}
+
+// GetTxsByAddress get all txs under given address
 func (h *historyBackend) GetTxsByAddress(address common.Address, offset int64, limit int64) ([]*TxHistoryInfo, uint64, error) {
 	var txHistories []*TxHistoryInfo
 	total, err := h.db.GetTotalCrossMsgCountByAddress(address.String())
@@ -137,6 +186,7 @@ func (h *historyBackend) GetTxsByAddress(address common.Address, offset int64, l
 	return txHistories, total, nil
 }
 
+// GetTxsByHashes get tx infos under given tx hashes
 func (h *historyBackend) GetTxsByHashes(hashes []string) ([]*TxHistoryInfo, error) {
 	txHistories := make([]*TxHistoryInfo, 0)
 	for _, hash := range hashes {

bridge-history-api/utils/parse_event.go

@@ -2,8 +2,9 @@ package utils
 
 import (
 	"context"
+	"math/big"
+	"strings"
 
-	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient"
@@ -13,11 +14,7 @@ import (
 	"bridge-history-api/db/orm"
 )
 
-type MsgHashWrapper struct {
-	MsgHash common.Hash
-	TxHash  common.Hash
-}
-
+// CachedParsedTxCalldata store parsed batch infos
 type CachedParsedTxCalldata struct {
 	CallDataIndex uint64
 	BatchIndices  []uint64
@@ -25,13 +22,14 @@ type CachedParsedTxCalldata struct {
 	EndBlocks     []uint64
 }
 
-func ParseBackendL1EventLogs(logs []types.Log) ([]*orm.CrossMsg, []MsgHashWrapper, []*orm.RelayedMsg, error) {
+// ParseBackendL1EventLogs parses L1 watched events
+func ParseBackendL1EventLogs(logs []types.Log) ([]*orm.CrossMsg, []*orm.RelayedMsg, error) {
 	// Need use contract abi to parse event Log
 	// Can only be tested after we have our contracts set up
 
 	var l1CrossMsg []*orm.CrossMsg
 	var relayedMsgs []*orm.RelayedMsg
-	var msgHashes []MsgHashWrapper
+	var msgHash string
 	for _, vlog := range logs {
 		switch vlog.Topics[0] {
 		case backendabi.L1DepositETHSig:
@@ -39,7 +37,7 @@ func ParseBackendL1EventLogs(logs []types.Log) ([]*orm.CrossMsg, []MsgHashWrappe
 			err := UnpackLog(backendabi.L1ETHGatewayABI, &event, "DepositETH", vlog)
 			if err != nil {
 				log.Warn("Failed to unpack DepositETH event", "err", err)
-				return l1CrossMsg, msgHashes, relayedMsgs, err
+				return l1CrossMsg, relayedMsgs, err
 			}
 			l1CrossMsg = append(l1CrossMsg, &orm.CrossMsg{
 				Height:     vlog.BlockNumber,
@@ -48,13 +46,14 @@ func ParseBackendL1EventLogs(logs []types.Log) ([]*orm.CrossMsg, []MsgHashWrappe
 				Amount:     event.Amount.String(),
 				Asset:      int(orm.ETH),
 				Layer1Hash: vlog.TxHash.Hex(),
+				MsgHash:    msgHash,
 			})
 		case backendabi.L1DepositERC20Sig:
 			event := backendabi.ERC20MessageEvent{}
 			err := UnpackLog(backendabi.L1StandardERC20GatewayABI, &event, "DepositERC20", vlog)
 			if err != nil {
 				log.Warn("Failed to unpack DepositERC20 event", "err", err)
-				return l1CrossMsg, msgHashes, relayedMsgs, err
+				return l1CrossMsg, relayedMsgs, err
 			}
 			l1CrossMsg = append(l1CrossMsg, &orm.CrossMsg{
 				Height:      vlog.BlockNumber,
@@ -65,13 +64,14 @@ func ParseBackendL1EventLogs(logs []types.Log) ([]*orm.CrossMsg, []MsgHashWrappe
 				Layer1Hash:  vlog.TxHash.Hex(),
 				Layer1Token: event.L1Token.Hex(),
 				Layer2Token: event.L2Token.Hex(),
+				MsgHash:     msgHash,
 			})
 		case backendabi.L1DepositERC721Sig:
 			event := backendabi.ERC721MessageEvent{}
 			err := UnpackLog(backendabi.L1ERC721GatewayABI, &event, "DepositERC721", vlog)
 			if err != nil {
 				log.Warn("Failed to unpack DepositERC721 event", "err", err)
-				return l1CrossMsg, msgHashes, relayedMsgs, err
+				return l1CrossMsg, relayedMsgs, err
 			}
 			l1CrossMsg = append(l1CrossMsg, &orm.CrossMsg{
 				Height:      vlog.BlockNumber,
@@ -81,14 +81,15 @@ func ParseBackendL1EventLogs(logs []types.Log) ([]*orm.CrossMsg, []MsgHashWrappe
 				Layer1Hash:  vlog.TxHash.Hex(),
 				Layer1Token: event.L1Token.Hex(),
 				Layer2Token: event.L2Token.Hex(),
-				TokenID:     event.TokenID.Uint64(),
+				TokenIDs:    event.TokenID.String(),
+				MsgHash:     msgHash,
 			})
 		case backendabi.L1DepositERC1155Sig:
 			event := backendabi.ERC1155MessageEvent{}
 			err := UnpackLog(backendabi.L1ERC1155GatewayABI, &event, "DepositERC1155", vlog)
 			if err != nil {
 				log.Warn("Failed to unpack DepositERC1155 event", "err", err)
-				return l1CrossMsg, msgHashes, relayedMsgs, err
+				return l1CrossMsg, relayedMsgs, err
 			}
 			l1CrossMsg = append(l1CrossMsg, &orm.CrossMsg{
 				Height:      vlog.BlockNumber,
@@ -98,26 +99,62 @@ func ParseBackendL1EventLogs(logs []types.Log) ([]*orm.CrossMsg, []MsgHashWrappe
 				Layer1Hash:  vlog.TxHash.Hex(),
 				Layer1Token: event.L1Token.Hex(),
 				Layer2Token: event.L2Token.Hex(),
-				TokenID:     event.TokenID.Uint64(),
+				TokenIDs:    event.TokenID.String(),
 				Amount:      event.Amount.String(),
+				MsgHash:     msgHash,
 			})
 		case backendabi.L1SentMessageEventSignature:
 			event := backendabi.L1SentMessageEvent{}
 			err := UnpackLog(backendabi.L1ScrollMessengerABI, &event, "SentMessage", vlog)
 			if err != nil {
 				log.Warn("Failed to unpack SentMessage event", "err", err)
-				return l1CrossMsg, msgHashes, relayedMsgs, err
+				return l1CrossMsg, relayedMsgs, err
 			}
-			msgHash := ComputeMessageHash(event.Sender, event.Target, event.Value, event.MessageNonce, event.Message)
-			msgHashes = append(msgHashes, MsgHashWrapper{
-				MsgHash: msgHash,
-				TxHash:  vlog.TxHash})
+			// since every deposit event will emit after a sent event, so can use this msg_hash as next withdraw event's msg_hash
+			msgHash = ComputeMessageHash(event.Sender, event.Target, event.Value, event.MessageNonce, event.Message).Hex()
+		case backendabi.L1BatchDepositERC721Sig:
+			event := backendabi.BatchERC721MessageEvent{}
+			err := UnpackLog(backendabi.L1ERC721GatewayABI, &event, "BatchDepositERC721", vlog)
+			if err != nil {
+				log.Warn("Failed to unpack BatchDepositERC721 event", "err", err)
+				return l1CrossMsg, relayedMsgs, err
+			}
+			l1CrossMsg = append(l1CrossMsg, &orm.CrossMsg{
+				Height:      vlog.BlockNumber,
+				Sender:      event.From.String(),
+				Target:      event.To.String(),
+				Asset:       int(orm.ERC721),
+				Layer1Hash:  vlog.TxHash.Hex(),
+				Layer1Token: event.L1Token.Hex(),
+				Layer2Token: event.L2Token.Hex(),
+				TokenIDs:    convertBigIntArrayToString(event.TokenIDs),
+				MsgHash:     msgHash,
+			})
+		case backendabi.L1BatchDepositERC1155Sig:
+			event := backendabi.BatchERC1155MessageEvent{}
+			err := UnpackLog(backendabi.L1ERC1155GatewayABI, &event, "BatchDepositERC1155", vlog)
+			if err != nil {
+				log.Warn("Failed to unpack BatchDepositERC1155 event", "err", err)
+				return l1CrossMsg, relayedMsgs, err
+			}
+			l1CrossMsg = append(l1CrossMsg, &orm.CrossMsg{
+				Height:       vlog.BlockNumber,
+				Sender:       event.From.String(),
+				Target:       event.To.String(),
+				Asset:        int(orm.ERC1155),
+				Layer1Hash:   vlog.TxHash.Hex(),
+				Layer1Token:  event.L1Token.Hex(),
+				Layer2Token:  event.L2Token.Hex(),
+				TokenIDs:     convertBigIntArrayToString(event.TokenIDs),
+				TokenAmounts: convertBigIntArrayToString(event.TokenAmounts),
+				MsgHash:      msgHash,
+			})
 		case backendabi.L1RelayedMessageEventSignature:
 			event := backendabi.L1RelayedMessageEvent{}
 			err := UnpackLog(backendabi.L1ScrollMessengerABI, &event, "RelayedMessage", vlog)
 			if err != nil {
 				log.Warn("Failed to unpack RelayedMessage event", "err", err)
-				return l1CrossMsg, msgHashes, relayedMsgs, err
+				return l1CrossMsg, relayedMsgs, err
 			}
 			relayedMsgs = append(relayedMsgs, &orm.RelayedMsg{
 				MsgHash:    event.MessageHash.String(),
@@ -128,18 +165,18 @@ func ParseBackendL1EventLogs(logs []types.Log) ([]*orm.CrossMsg, []MsgHashWrappe
 		}
 
 	}
-	return l1CrossMsg, msgHashes, relayedMsgs, nil
+	return l1CrossMsg, relayedMsgs, nil
 }
 
-func ParseBackendL2EventLogs(logs []types.Log) ([]*orm.CrossMsg, []MsgHashWrapper, []*orm.RelayedMsg, []*orm.L2SentMsg, error) {
+// ParseBackendL2EventLogs parses L2 watched events
+func ParseBackendL2EventLogs(logs []types.Log) ([]*orm.CrossMsg, []*orm.RelayedMsg, []*orm.L2SentMsg, error) {
 	// Need use contract abi to parse event Log
 	// Can only be tested after we have our contracts set up
 
 	var l2CrossMsg []*orm.CrossMsg
 	// this is use to confirm finalized l1 msg
 	var relayedMsgs []*orm.RelayedMsg
-	var l2SentMsg []*orm.L2SentMsg
-	var msgHashes []MsgHashWrapper
+	var l2SentMsgs []*orm.L2SentMsg
 	for _, vlog := range logs {
 		switch vlog.Topics[0] {
 		case backendabi.L2WithdrawETHSig:
@@ -147,8 +184,9 @@ func ParseBackendL2EventLogs(logs []types.Log) ([]*orm.CrossMsg, []MsgHashWrappe
 			err := UnpackLog(backendabi.L2ETHGatewayABI, &event, "WithdrawETH", vlog)
 			if err != nil {
 				log.Warn("Failed to unpack WithdrawETH event", "err", err)
-				return l2CrossMsg, msgHashes, relayedMsgs, l2SentMsg, err
+				return l2CrossMsg, relayedMsgs, l2SentMsgs, err
 			}
+			l2SentMsgs[len(l2SentMsgs)-1].OriginalSender = event.From.Hex()
 			l2CrossMsg = append(l2CrossMsg, &orm.CrossMsg{
 				Height:     vlog.BlockNumber,
 				Sender:     event.From.String(),
@@ -156,14 +194,16 @@ func ParseBackendL2EventLogs(logs []types.Log) ([]*orm.CrossMsg, []MsgHashWrappe
 				Amount:     event.Amount.String(),
 				Asset:      int(orm.ETH),
 				Layer2Hash: vlog.TxHash.Hex(),
+				MsgHash:    l2SentMsgs[len(l2SentMsgs)-1].MsgHash,
 			})
 		case backendabi.L2WithdrawERC20Sig:
 			event := backendabi.ERC20MessageEvent{}
 			err := UnpackLog(backendabi.L2StandardERC20GatewayABI, &event, "WithdrawERC20", vlog)
 			if err != nil {
 				log.Warn("Failed to unpack WithdrawERC20 event", "err", err)
-				return l2CrossMsg, msgHashes, relayedMsgs, l2SentMsg, err
+				return l2CrossMsg, relayedMsgs, l2SentMsgs, err
 			}
+			l2SentMsgs[len(l2SentMsgs)-1].OriginalSender = event.From.Hex()
 			l2CrossMsg = append(l2CrossMsg, &orm.CrossMsg{
 				Height:      vlog.BlockNumber,
 				Sender:      event.From.String(),
@@ -173,14 +213,16 @@ func ParseBackendL2EventLogs(logs []types.Log) ([]*orm.CrossMsg, []MsgHashWrappe
 				Layer2Hash:  vlog.TxHash.Hex(),
 				Layer1Token: event.L1Token.Hex(),
 				Layer2Token: event.L2Token.Hex(),
+				MsgHash:     l2SentMsgs[len(l2SentMsgs)-1].MsgHash,
 			})
 		case backendabi.L2WithdrawERC721Sig:
 			event := backendabi.ERC721MessageEvent{}
 			err := UnpackLog(backendabi.L2ERC721GatewayABI, &event, "WithdrawERC721", vlog)
 			if err != nil {
 				log.Warn("Failed to unpack WithdrawERC721 event", "err", err)
-				return l2CrossMsg, msgHashes, relayedMsgs, l2SentMsg, err
+				return l2CrossMsg, relayedMsgs, l2SentMsgs, err
 			}
+			l2SentMsgs[len(l2SentMsgs)-1].OriginalSender = event.From.Hex()
 			l2CrossMsg = append(l2CrossMsg, &orm.CrossMsg{
 				Height:      vlog.BlockNumber,
 				Sender:      event.From.String(),
@@ -189,15 +231,17 @@ func ParseBackendL2EventLogs(logs []types.Log) ([]*orm.CrossMsg, []MsgHashWrappe
 				Layer2Hash:  vlog.TxHash.Hex(),
 				Layer1Token: event.L1Token.Hex(),
 				Layer2Token: event.L2Token.Hex(),
-				TokenID:     event.TokenID.Uint64(),
+				TokenIDs:    event.TokenID.String(),
+				MsgHash:     l2SentMsgs[len(l2SentMsgs)-1].MsgHash,
 			})
 		case backendabi.L2WithdrawERC1155Sig:
 			event := backendabi.ERC1155MessageEvent{}
 			err := UnpackLog(backendabi.L2ERC1155GatewayABI, &event, "WithdrawERC1155", vlog)
 			if err != nil {
 				log.Warn("Failed to unpack WithdrawERC1155 event", "err", err)
-				return l2CrossMsg, msgHashes, relayedMsgs, l2SentMsg, err
+				return l2CrossMsg, relayedMsgs, l2SentMsgs, err
 			}
+			l2SentMsgs[len(l2SentMsgs)-1].OriginalSender = event.From.Hex()
 			l2CrossMsg = append(l2CrossMsg, &orm.CrossMsg{
 				Height:      vlog.BlockNumber,
 				Sender:      event.From.String(),
@@ -206,35 +250,75 @@ func ParseBackendL2EventLogs(logs []types.Log) ([]*orm.CrossMsg, []MsgHashWrappe
 				Layer2Hash:  vlog.TxHash.Hex(),
 				Layer1Token: event.L1Token.Hex(),
 				Layer2Token: event.L2Token.Hex(),
-				TokenID:     event.TokenID.Uint64(),
+				TokenIDs:    event.TokenID.String(),
 				Amount:      event.Amount.String(),
+				MsgHash:     l2SentMsgs[len(l2SentMsgs)-1].MsgHash,
+			})
+		case backendabi.L2BatchWithdrawERC721Sig:
+			event := backendabi.BatchERC721MessageEvent{}
+			err := UnpackLog(backendabi.L2ERC721GatewayABI, &event, "BatchWithdrawERC721", vlog)
+			if err != nil {
+				log.Warn("Failed to unpack BatchWithdrawERC721 event", "err", err)
+				return l2CrossMsg, relayedMsgs, l2SentMsgs, err
+			}
+			l2SentMsgs[len(l2SentMsgs)-1].OriginalSender = event.From.Hex()
+			l2CrossMsg = append(l2CrossMsg, &orm.CrossMsg{
+				Height:      vlog.BlockNumber,
+				Sender:      event.From.String(),
+				Target:      event.To.String(),
+				Asset:       int(orm.ERC721),
+				Layer1Hash:  vlog.TxHash.Hex(),
+				Layer1Token: event.L1Token.Hex(),
+				Layer2Token: event.L2Token.Hex(),
+				TokenIDs:    convertBigIntArrayToString(event.TokenIDs),
+				MsgHash:     l2SentMsgs[len(l2SentMsgs)-1].MsgHash,
+			})
+		case backendabi.L2BatchWithdrawERC1155Sig:
+			event := backendabi.BatchERC1155MessageEvent{}
+			err := UnpackLog(backendabi.L2ERC1155GatewayABI, &event, "BatchWithdrawERC1155", vlog)
+			if err != nil {
+				log.Warn("Failed to unpack BatchWithdrawERC1155 event", "err", err)
+				return l2CrossMsg, relayedMsgs, l2SentMsgs, err
+			}
+			l2SentMsgs[len(l2SentMsgs)-1].OriginalSender = event.From.Hex()
+			l2CrossMsg = append(l2CrossMsg, &orm.CrossMsg{
+				Height:       vlog.BlockNumber,
+				Sender:       event.From.String(),
+				Target:       event.To.String(),
+				Asset:        int(orm.ERC1155),
+				Layer1Hash:   vlog.TxHash.Hex(),
+				Layer1Token:  event.L1Token.Hex(),
+				Layer2Token:  event.L2Token.Hex(),
+				TokenIDs:     convertBigIntArrayToString(event.TokenIDs),
+				TokenAmounts: convertBigIntArrayToString(event.TokenAmounts),
+				MsgHash:      l2SentMsgs[len(l2SentMsgs)-1].MsgHash,
 			})
 		case backendabi.L2SentMessageEventSignature:
 			event := backendabi.L2SentMessageEvent{}
 			err := UnpackLog(backendabi.L2ScrollMessengerABI, &event, "SentMessage", vlog)
 			if err != nil {
 				log.Warn("Failed to unpack SentMessage event", "err", err)
-				return l2CrossMsg, msgHashes, relayedMsgs, l2SentMsg, err
+				return l2CrossMsg, relayedMsgs, l2SentMsgs, err
 			}
+			// since every withdraw event will emit after a sent event, so can use this msg_hash as next withdraw event's msg_hash
 			msgHash := ComputeMessageHash(event.Sender, event.Target, event.Value, event.MessageNonce, event.Message)
-			msgHashes = append(msgHashes, MsgHashWrapper{
-				MsgHash: msgHash,
-				TxHash:  vlog.TxHash})
-			l2SentMsg = append(l2SentMsg, &orm.L2SentMsg{
-				Sender:  event.Sender.Hex(),
-				Target:  event.Target.Hex(),
-				Value:   event.Value.String(),
-				MsgHash: msgHash.Hex(),
-				Height:  vlog.BlockNumber,
-				Nonce:   event.MessageNonce.Uint64(),
-				MsgData: hexutil.Encode(event.Message),
-			})
+			l2SentMsgs = append(l2SentMsgs,
+				&orm.L2SentMsg{
+					Sender:  event.Sender.Hex(),
+					TxHash:  vlog.TxHash.Hex(),
+					Target:  event.Target.Hex(),
+					Value:   event.Value.String(),
+					MsgHash: msgHash.Hex(),
+					Height:  vlog.BlockNumber,
+					Nonce:   event.MessageNonce.Uint64(),
+					MsgData: hexutil.Encode(event.Message),
+				})
 		case backendabi.L2RelayedMessageEventSignature:
 			event := backendabi.L2RelayedMessageEvent{}
 			err := UnpackLog(backendabi.L2ScrollMessengerABI, &event, "RelayedMessage", vlog)
 			if err != nil {
 				log.Warn("Failed to unpack RelayedMessage event", "err", err)
-				return l2CrossMsg, msgHashes, relayedMsgs, l2SentMsg, err
+				return l2CrossMsg, relayedMsgs, l2SentMsgs, err
 			}
 			relayedMsgs = append(relayedMsgs, &orm.RelayedMsg{
 				MsgHash:    event.MessageHash.String(),
@@ -244,9 +328,10 @@ func ParseBackendL2EventLogs(logs []types.Log) ([]*orm.CrossMsg, []MsgHashWrappe
 
 		}
 	}
-	return l2CrossMsg, msgHashes, relayedMsgs, l2SentMsg, nil
+	return l2CrossMsg, relayedMsgs, l2SentMsgs, nil
 }
 
+// ParseBatchInfoFromScrollChain parses ScrollChain events
 func ParseBatchInfoFromScrollChain(ctx context.Context, client *ethclient.Client, logs []types.Log) ([]*orm.RollupBatch, error) {
 	var rollupBatches []*orm.RollupBatch
 	cache := make(map[string]CachedParsedTxCalldata)
@@ -303,3 +388,13 @@ func ParseBatchInfoFromScrollChain(ctx context.Context, client *ethclient.Client
 	}
 	return rollupBatches, nil
 }
+
+func convertBigIntArrayToString(array []*big.Int) string {
+	stringArray := make([]string, len(array))
+	for i, num := range array {
+		stringArray[i] = num.String()
+	}
+
+	result := strings.Join(stringArray, ", ")
+	return result
+}

bridge-history-api/utils/utils.go

@@ -22,6 +22,7 @@ func Keccak2(a common.Hash, b common.Hash) common.Hash {
 	return common.BytesToHash(crypto.Keccak256(append(a.Bytes()[:], b.Bytes()[:]...)))
 }
 
+// GetSafeBlockNumber get the safe block number, which is the current block number minus the confirmations
 func GetSafeBlockNumber(ctx context.Context, client *ethclient.Client, confirmations uint64) (uint64, error) {
 	number, err := client.BlockNumber(ctx)
 	if err != nil || number <= confirmations {

bridge/cmd/event_watcher/app/app.go

@@ -11,13 +11,13 @@ import (
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/urfave/cli/v2"
 
+	"scroll-tech/common/database"
 	"scroll-tech/common/metrics"
-	cutils "scroll-tech/common/utils"
+	"scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
 	"scroll-tech/bridge/internal/config"
 	"scroll-tech/bridge/internal/controller/watcher"
-	"scroll-tech/bridge/internal/utils"
 )
 
 var app *cli.App
@@ -29,18 +29,18 @@ func init() {
 	app.Name = "event-watcher"
 	app.Usage = "The Scroll Event Watcher"
 	app.Version = version.Version
-	app.Flags = append(app.Flags, cutils.CommonFlags...)
+	app.Flags = append(app.Flags, utils.CommonFlags...)
 	app.Commands = []*cli.Command{}
 	app.Before = func(ctx *cli.Context) error {
-		return cutils.LogSetup(ctx)
+		return utils.LogSetup(ctx)
 	}
 	// Register `event-watcher-test` app for integration-test.
-	cutils.RegisterSimulation(app, cutils.EventWatcherApp)
+	utils.RegisterSimulation(app, utils.EventWatcherApp)
 }
 
 func action(ctx *cli.Context) error {
 	// Load config file.
-	cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
+	cfgFile := ctx.String(utils.ConfigFileFlag.Name)
 	cfg, err := config.NewConfig(cfgFile)
 	if err != nil {
 		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
@@ -48,13 +48,13 @@ func action(ctx *cli.Context) error {
 
 	subCtx, cancel := context.WithCancel(ctx.Context)
 	// Init db connection
-	db, err := utils.InitDB(cfg.DBConfig)
+	db, err := database.InitDB(cfg.DBConfig)
 	if err != nil {
 		log.Crit("failed to init db connection", "err", err)
 	}
 	defer func() {
 		cancel()
-		if err = utils.CloseDB(db); err != nil {
+		if err = database.CloseDB(db); err != nil {
 			log.Error("can not close ormFactory", "error", err)
 		}
 	}()
@@ -75,14 +75,14 @@ func action(ctx *cli.Context) error {
 	l1watcher := watcher.NewL1WatcherClient(ctx.Context, l1client, cfg.L1Config.StartHeight, cfg.L1Config.Confirmations, cfg.L1Config.L1MessengerAddress, cfg.L1Config.L1MessageQueueAddress, cfg.L1Config.ScrollChainContractAddress, db)
 	l2watcher := watcher.NewL2WatcherClient(ctx.Context, l2client, cfg.L2Config.Confirmations, cfg.L2Config.L2MessengerAddress, cfg.L2Config.L2MessageQueueAddress, cfg.L2Config.WithdrawTrieRootSlot, db)
 
-	go cutils.Loop(subCtx, 10*time.Second, func() {
+	go utils.Loop(subCtx, 10*time.Second, func() {
 		if loopErr := l1watcher.FetchContractEvent(); loopErr != nil {
 			log.Error("Failed to fetch bridge contract", "err", loopErr)
 		}
 	})
 
 	// Start l2 watcher process
-	go cutils.Loop(subCtx, 2*time.Second, l2watcher.FetchContractEvent)
+	go utils.Loop(subCtx, 2*time.Second, l2watcher.FetchContractEvent)
 	// Finish start all l2 functions
 	log.Info("Start event-watcher successfully")
 

bridge/cmd/gas_oracle/app/app.go

@@ -11,14 +11,15 @@ import (
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/urfave/cli/v2"
 
+	"scroll-tech/common/database"
 	"scroll-tech/common/metrics"
-	cutils "scroll-tech/common/utils"
+	"scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
 	"scroll-tech/bridge/internal/config"
 	"scroll-tech/bridge/internal/controller/relayer"
 	"scroll-tech/bridge/internal/controller/watcher"
-	"scroll-tech/bridge/internal/utils"
+	butils "scroll-tech/bridge/internal/utils"
 )
 
 var app *cli.App
@@ -31,31 +32,31 @@ func init() {
 	app.Usage = "The Scroll Gas Oracle"
 	app.Description = "Scroll Gas Oracle."
 	app.Version = version.Version
-	app.Flags = append(app.Flags, cutils.CommonFlags...)
+	app.Flags = append(app.Flags, utils.CommonFlags...)
 	app.Commands = []*cli.Command{}
 	app.Before = func(ctx *cli.Context) error {
-		return cutils.LogSetup(ctx)
+		return utils.LogSetup(ctx)
 	}
 	// Register `gas-oracle-test` app for integration-test.
-	cutils.RegisterSimulation(app, cutils.GasOracleApp)
+	utils.RegisterSimulation(app, utils.GasOracleApp)
 }
 
 func action(ctx *cli.Context) error {
 	// Load config file.
-	cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
+	cfgFile := ctx.String(utils.ConfigFileFlag.Name)
 	cfg, err := config.NewConfig(cfgFile)
 	if err != nil {
 		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
 	}
 	subCtx, cancel := context.WithCancel(ctx.Context)
 	// Init db connection
-	db, err := utils.InitDB(cfg.DBConfig)
+	db, err := database.InitDB(cfg.DBConfig)
 	if err != nil {
 		log.Crit("failed to init db connection", "err", err)
 	}
 	defer func() {
 		cancel()
-		if err = utils.CloseDB(db); err != nil {
+		if err = database.CloseDB(db); err != nil {
 			log.Error("can not close ormFactory", "error", err)
 		}
 	}()
@@ -76,7 +77,8 @@ func action(ctx *cli.Context) error {
 		return err
 	}
 
-	l1watcher := watcher.NewL1WatcherClient(ctx.Context, l1client, cfg.L1Config.StartHeight, cfg.L1Config.Confirmations, cfg.L1Config.L1MessengerAddress, cfg.L1Config.L1MessageQueueAddress, cfg.L1Config.ScrollChainContractAddress, db)
+	l1watcher := watcher.NewL1WatcherClient(ctx.Context, l1client, cfg.L1Config.StartHeight, cfg.L1Config.Confirmations,
+		cfg.L1Config.L1MessengerAddress, cfg.L1Config.L1MessageQueueAddress, cfg.L1Config.ScrollChainContractAddress, db)
 
 	l1relayer, err := relayer.NewLayer1Relayer(ctx.Context, db, cfg.L1Config.RelayerConfig)
 	if err != nil {
@@ -89,8 +91,8 @@ func action(ctx *cli.Context) error {
 		return err
 	}
 	// Start l1 watcher process
-	go cutils.LoopWithContext(subCtx, 10*time.Second, func(ctx context.Context) {
-		number, loopErr := utils.GetLatestConfirmedBlockNumber(ctx, l1client, cfg.L1Config.Confirmations)
+	go utils.LoopWithContext(subCtx, 10*time.Second, func(ctx context.Context) {
+		number, loopErr := butils.GetLatestConfirmedBlockNumber(ctx, l1client, cfg.L1Config.Confirmations)
 		if loopErr != nil {
 			log.Error("failed to get block number", "err", loopErr)
 			return
@@ -102,8 +104,8 @@ func action(ctx *cli.Context) error {
 	})
 
 	// Start l1relayer process
-	go cutils.Loop(subCtx, 10*time.Second, l1relayer.ProcessGasPriceOracle)
-	go cutils.Loop(subCtx, 2*time.Second, l2relayer.ProcessGasPriceOracle)
+	go utils.Loop(subCtx, 10*time.Second, l1relayer.ProcessGasPriceOracle)
+	go utils.Loop(subCtx, 2*time.Second, l2relayer.ProcessGasPriceOracle)
 
 	// Finish start all message relayer functions
 	log.Info("Start gas-oracle successfully")

bridge/cmd/msg_relayer/app/app.go

@@ -10,13 +10,13 @@ import (
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/urfave/cli/v2"
 
+	"scroll-tech/common/database"
 	"scroll-tech/common/metrics"
-	cutils "scroll-tech/common/utils"
+	"scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
 	"scroll-tech/bridge/internal/config"
 	"scroll-tech/bridge/internal/controller/relayer"
-	"scroll-tech/bridge/internal/utils"
 )
 
 var app *cli.App
@@ -29,18 +29,18 @@ func init() {
 	app.Usage = "The Scroll Message Relayer"
 	app.Description = "Message Relayer contains two main service: 1) relay l1 message to l2. 2) relay l2 message to l1."
 	app.Version = version.Version
-	app.Flags = append(app.Flags, cutils.CommonFlags...)
+	app.Flags = append(app.Flags, utils.CommonFlags...)
 	app.Commands = []*cli.Command{}
 	app.Before = func(ctx *cli.Context) error {
-		return cutils.LogSetup(ctx)
+		return utils.LogSetup(ctx)
 	}
 	// Register `message-relayer-test` app for integration-test.
-	cutils.RegisterSimulation(app, cutils.MessageRelayerApp)
+	utils.RegisterSimulation(app, utils.MessageRelayerApp)
 }
 
 func action(ctx *cli.Context) error {
 	// Load config file.
-	cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
+	cfgFile := ctx.String(utils.ConfigFileFlag.Name)
 	cfg, err := config.NewConfig(cfgFile)
 	if err != nil {
 		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
@@ -48,13 +48,13 @@ func action(ctx *cli.Context) error {
 
 	subCtx, cancel := context.WithCancel(ctx.Context)
 	// Init db connection
-	db, err := utils.InitDB(cfg.DBConfig)
+	db, err := database.InitDB(cfg.DBConfig)
 	if err != nil {
 		log.Crit("failed to init db connection", "err", err)
 	}
 	defer func() {
 		cancel()
-		if err = utils.CloseDB(db); err != nil {
+		if err = database.CloseDB(db); err != nil {
 			log.Error("can not close ormFactory", "error", err)
 		}
 	}()
@@ -69,7 +69,7 @@ func action(ctx *cli.Context) error {
 	}
 
 	// Start l1relayer process
-	go cutils.Loop(subCtx, 10*time.Second, l1relayer.ProcessSavedEvents)
+	go utils.Loop(subCtx, 10*time.Second, l1relayer.ProcessSavedEvents)
 
 	// Finish start all message relayer functions
 	log.Info("Start message-relayer successfully")

bridge/cmd/rollup_relayer/app/app.go

@@ -11,14 +11,15 @@ import (
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/urfave/cli/v2"
 
+	"scroll-tech/common/database"
 	"scroll-tech/common/metrics"
-	cutils "scroll-tech/common/utils"
+	"scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
 	"scroll-tech/bridge/internal/config"
 	"scroll-tech/bridge/internal/controller/relayer"
 	"scroll-tech/bridge/internal/controller/watcher"
-	"scroll-tech/bridge/internal/utils"
+	butils "scroll-tech/bridge/internal/utils"
 )
 
 var app *cli.App
@@ -30,19 +31,19 @@ func init() {
 	app.Name = "rollup-relayer"
 	app.Usage = "The Scroll Rollup Relayer"
 	app.Version = version.Version
-	app.Flags = append(app.Flags, cutils.CommonFlags...)
-	app.Flags = append(app.Flags, cutils.RollupRelayerFlags...)
+	app.Flags = append(app.Flags, utils.CommonFlags...)
+	app.Flags = append(app.Flags, utils.RollupRelayerFlags...)
 	app.Commands = []*cli.Command{}
 	app.Before = func(ctx *cli.Context) error {
-		return cutils.LogSetup(ctx)
+		return utils.LogSetup(ctx)
 	}
 	// Register `rollup-relayer-test` app for integration-test.
-	cutils.RegisterSimulation(app, cutils.RollupRelayerApp)
+	utils.RegisterSimulation(app, utils.RollupRelayerApp)
 }
 
 func action(ctx *cli.Context) error {
 	// Load config file.
-	cfgFile := ctx.String(cutils.ConfigFileFlag.Name)
+	cfgFile := ctx.String(utils.ConfigFileFlag.Name)
 	cfg, err := config.NewConfig(cfgFile)
 	if err != nil {
 		log.Crit("failed to load config file", "config file", cfgFile, "error", err)
@@ -50,13 +51,13 @@ func action(ctx *cli.Context) error {
 
 	subCtx, cancel := context.WithCancel(ctx.Context)
 	// Init db connection
-	db, err := utils.InitDB(cfg.DBConfig)
+	db, err := database.InitDB(cfg.DBConfig)
 	if err != nil {
 		log.Crit("failed to init db connection", "err", err)
 	}
 	defer func() {
 		cancel()
-		if err = utils.CloseDB(db); err != nil {
+		if err = database.CloseDB(db); err != nil {
 			log.Error("can not close ormFactory", "error", err)
 		}
 	}()
@@ -71,7 +72,7 @@ func action(ctx *cli.Context) error {
 		return err
 	}
 
-	initGenesis := ctx.Bool(cutils.ImportGenesisFlag.Name)
+	initGenesis := ctx.Bool(utils.ImportGenesisFlag.Name)
 	l2relayer, err := relayer.NewLayer2Relayer(ctx.Context, l2client, db, cfg.L2Config.RelayerConfig, initGenesis)
 	if err != nil {
 		log.Error("failed to create l2 relayer", "config file", cfgFile, "error", err)
@@ -90,11 +91,12 @@ func action(ctx *cli.Context) error {
 		return err
 	}
 
-	l2watcher := watcher.NewL2WatcherClient(subCtx, l2client, cfg.L2Config.Confirmations, cfg.L2Config.L2MessengerAddress, cfg.L2Config.L2MessageQueueAddress, cfg.L2Config.WithdrawTrieRootSlot, db)
+	l2watcher := watcher.NewL2WatcherClient(subCtx, l2client, cfg.L2Config.Confirmations, cfg.L2Config.L2MessengerAddress,
+		cfg.L2Config.L2MessageQueueAddress, cfg.L2Config.WithdrawTrieRootSlot, db)
 
 	// Watcher loop to fetch missing blocks
-	go cutils.LoopWithContext(subCtx, 2*time.Second, func(ctx context.Context) {
-		number, loopErr := utils.GetLatestConfirmedBlockNumber(ctx, l2client, cfg.L2Config.Confirmations)
+	go utils.LoopWithContext(subCtx, 2*time.Second, func(ctx context.Context) {
+		number, loopErr := butils.GetLatestConfirmedBlockNumber(ctx, l2client, cfg.L2Config.Confirmations)
 		if loopErr != nil {
 			log.Error("failed to get block number", "err", loopErr)
 			return
@@ -102,13 +104,13 @@ func action(ctx *cli.Context) error {
 		l2watcher.TryFetchRunningMissingBlocks(number)
 	})
 
-	go cutils.Loop(subCtx, 2*time.Second, chunkProposer.TryProposeChunk)
+	go utils.Loop(subCtx, 2*time.Second, chunkProposer.TryProposeChunk)
 
-	go cutils.Loop(subCtx, 2*time.Second, batchProposer.TryProposeBatch)
+	go utils.Loop(subCtx, 2*time.Second, batchProposer.TryProposeBatch)
 
-	go cutils.Loop(subCtx, 2*time.Second, l2relayer.ProcessPendingBatches)
+	go utils.Loop(subCtx, 2*time.Second, l2relayer.ProcessPendingBatches)
 
-	go cutils.Loop(subCtx, 2*time.Second, l2relayer.ProcessCommittedBatches)
+	go utils.Loop(subCtx, 2*time.Second, l2relayer.ProcessCommittedBatches)
 
 	// Finish start all rollup relayer functions.
 	log.Info("Start rollup-relayer successfully")

bridge/go.mod

@@ -4,17 +4,13 @@ go 1.19
 
 require (
 	github.com/agiledragon/gomonkey/v2 v2.9.0
-	github.com/jmoiron/sqlx v1.3.5
-	github.com/lib/pq v1.10.7
 	github.com/orcaman/concurrent-map v1.0.0
 	github.com/orcaman/concurrent-map/v2 v2.0.1
-	github.com/pressly/goose/v3 v3.7.0
 	github.com/scroll-tech/go-ethereum v1.10.14-0.20230613025759-f055f50f9d56
 	github.com/smartystreets/goconvey v1.8.0
 	github.com/stretchr/testify v1.8.2
 	github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa
 	golang.org/x/sync v0.1.0
-	gorm.io/driver/postgres v1.5.0
 	gorm.io/gorm v1.25.1
 )
 
@@ -25,7 +21,6 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set v1.8.0 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-sql-driver/mysql v1.7.0 // indirect
 	github.com/go-stack/stack v1.8.1 // indirect
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
 	github.com/google/uuid v1.3.0 // indirect
@@ -34,9 +29,6 @@ require (
 	github.com/holiman/uint256 v1.2.2 // indirect
 	github.com/huin/goupnp v1.0.3 // indirect
 	github.com/iden3/go-iden3-crypto v0.0.15 // indirect
-	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
-	github.com/jackc/pgx/v5 v5.3.0 // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
@@ -45,7 +37,7 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.18 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
-	github.com/mattn/go-sqlite3 v1.14.14 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
 	github.com/rjeczalik/notify v0.9.1 // indirect
@@ -62,9 +54,8 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	golang.org/x/crypto v0.10.0 // indirect
 	golang.org/x/sys v0.9.0 // indirect
-	golang.org/x/text v0.10.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.8.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

bridge/go.sum

@@ -29,9 +29,6 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI=
 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-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
-github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
 github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -55,13 +52,6 @@ github.com/huin/goupnp v1.0.3/go.mod h1:ZxNlw5WqJj6wSsRK5+YfflQGXYfccj5VgQsMNixH
 github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o=
 github.com/iden3/go-iden3-crypto v0.0.15 h1:4MJYlrot1l31Fzlo2sF56u7EVFeHHJkxGXXZCtESgK4=
 github.com/iden3/go-iden3-crypto v0.0.15/go.mod h1:dLpM4vEPJ3nDHzhWFXDjzkn1qHoBeOT/3UEhXsEsP3E=
-github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
-github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.3.0 h1:/NQi8KHMpKWHInxXesC8yD4DhkXPrVhmnwYkjp9AmBA=
-github.com/jackc/pgx/v5 v5.3.0/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8=
-github.com/jackc/puddle/v2 v2.2.0/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
@@ -69,16 +59,11 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
-github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -86,9 +71,6 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c=
-github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw=
-github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
@@ -96,10 +78,8 @@ github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp9
 github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/mattn/go-sqlite3 v1.14.14 h1:qZgc/Rwetq+MtyE18WhzjokPD93dNqLGNT3QJuLvBGw=
-github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 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/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -113,16 +93,12 @@ github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsK
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pressly/goose/v3 v3.7.0 h1:jblaZul15uCIEKHRu5KUdA+5wDA7E60JC0TOthdrtf8=
-github.com/pressly/goose/v3 v3.7.0/go.mod h1:N5gqPdIzdxf3BiPWdmoPreIwHStkxsvKWE5xjUvfYNk=
 github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA=
-github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
 github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 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.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
@@ -146,11 +122,8 @@ github.com/status-im/keycard-go v0.2.0/go.mod h1:wlp8ZLbsmrF6g6WjugPAx+IzoLrkdf9
 github.com/stretchr/objx v0.1.0/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.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-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/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
@@ -164,68 +137,37 @@ github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa h1:5SqCsI/2Qya2bC
 github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa/go.mod h1:1CNUng3PtjQMtRzJO4FMXBQvkGtuYRxxiR9xMa7jMwI=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
 golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/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-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.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
 golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
-golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
 golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
-golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-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 h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU=
 gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c=
@@ -235,18 +177,5 @@ gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gorm.io/driver/postgres v1.5.0 h1:u2FXTy14l45qc3UeCJ7QaAXZmZfDDv0YrthvmRq1l0U=
-gorm.io/driver/postgres v1.5.0/go.mod h1:FUZXzO+5Uqg5zzwzv4KK49R8lvGIyscBOqYrtI1Ce9A=
-gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
 gorm.io/gorm v1.25.1 h1:nsSALe5Pr+cM3V1qwwQ7rOkw+6UeLrX5O4v3llhHa64=
 gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
-modernc.org/cc/v3 v3.36.1 h1:CICrjwr/1M4+6OQ4HJZ/AHxjcwe67r5vPUF518MkO8A=
-modernc.org/ccgo/v3 v3.16.8 h1:G0QNlTqI5uVgczBWfGKs7B++EPwCfXPWGD2MdeKloDs=
-modernc.org/libc v1.16.19 h1:S8flPn5ZeXx6iw/8yNa986hwTQDrY8RXU7tObZuAozo=
-modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8=
-modernc.org/memory v1.1.1 h1:bDOL0DIDLQv7bWhP3gMvIrnoFw+Eo6F7a2QK9HPDiFU=
-modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
-modernc.org/sqlite v1.18.1 h1:ko32eKt3jf7eqIkCgPAeHMBXw3riNSLhl2f3loEF7o8=
-modernc.org/strutil v1.1.2 h1:iFBDH6j1Z0bN/Q9udJnnFoFpENA4252qe/7/5woE5MI=
-modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk=

bridge/internal/config/config.go

@@ -4,13 +4,15 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
+
+	"scroll-tech/common/database"
 )
 
 // Config load configuration items.
 type Config struct {
-	L1Config *L1Config `json:"l1_config"`
-	L2Config *L2Config `json:"l2_config"`
-	DBConfig *DBConfig `json:"db_config"`
+	L1Config *L1Config        `json:"l1_config"`
+	L2Config *L2Config        `json:"l2_config"`
+	DBConfig *database.Config `json:"db_config"`
 }
 
 // NewConfig returns a new instance of Config.

bridge/internal/config/l2.go

@@ -40,7 +40,7 @@ type ChunkProposerConfig struct {
 type BatchProposerConfig struct {
 	MaxChunkNumPerBatch             uint64 `json:"max_chunk_num_per_batch"`
 	MaxL1CommitGasPerBatch          uint64 `json:"max_l1_commit_gas_per_batch"`
-	MaxL1CommitCalldataSizePerBatch uint64 `json:"max_l1_commit_calldata_size_per_batch"`
+	MaxL1CommitCalldataSizePerBatch uint32 `json:"max_l1_commit_calldata_size_per_batch"`
 	MinChunkNumPerBatch             uint64 `json:"min_chunk_num_per_batch"`
 	BatchTimeoutSec                 uint64 `json:"batch_timeout_sec"`
 }

bridge/internal/controller/relayer/l1_relayer.go

@@ -159,13 +159,13 @@ func (r *Layer1Relayer) processSavedEvent(msg *orm.L1Message) error {
 
 // ProcessGasPriceOracle imports gas price to layer2
 func (r *Layer1Relayer) ProcessGasPriceOracle() {
-	latestBlockHeight, err := r.l1Block.GetLatestL1BlockHeight()
+	latestBlockHeight, err := r.l1Block.GetLatestL1BlockHeight(r.ctx)
 	if err != nil {
 		log.Warn("Failed to fetch latest L1 block height from db", "err", err)
 		return
 	}
 
-	blocks, err := r.l1Block.GetL1Blocks(map[string]interface{}{
+	blocks, err := r.l1Block.GetL1Blocks(r.ctx, map[string]interface{}{
 		"number": latestBlockHeight,
 	})
 	if err != nil {

bridge/internal/controller/relayer/l1_relayer_test.go

@@ -12,13 +12,14 @@ import (
 	"github.com/stretchr/testify/assert"
 	"gorm.io/gorm"
 
+	"scroll-tech/common/database"
 	"scroll-tech/common/types"
 	"scroll-tech/common/utils"
 
+	"scroll-tech/database/migrate"
+
 	"scroll-tech/bridge/internal/controller/sender"
 	"scroll-tech/bridge/internal/orm"
-	"scroll-tech/bridge/internal/orm/migrate"
-	bridgeUtils "scroll-tech/bridge/internal/utils"
 )
 
 var (
@@ -49,7 +50,7 @@ var (
 )
 
 func setupL1RelayerDB(t *testing.T) *gorm.DB {
-	db, err := bridgeUtils.InitDB(cfg.DBConfig)
+	db, err := database.InitDB(cfg.DBConfig)
 	assert.NoError(t, err)
 	sqlDB, err := db.DB()
 	assert.NoError(t, err)
@@ -60,7 +61,7 @@ func setupL1RelayerDB(t *testing.T) *gorm.DB {
 // testCreateNewRelayer test create new relayer instance and stop
 func testCreateNewL1Relayer(t *testing.T) {
 	db := setupL1RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	defer database.CloseDB(db)
 	relayer, err := NewLayer1Relayer(context.Background(), db, cfg.L2Config.RelayerConfig)
 	assert.NoError(t, err)
 	assert.NotNil(t, relayer)
@@ -68,7 +69,7 @@ func testCreateNewL1Relayer(t *testing.T) {
 
 func testL1RelayerProcessSaveEvents(t *testing.T) {
 	db := setupL1RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	defer database.CloseDB(db)
 	l1MessageOrm := orm.NewL1Message(db)
 	l1Cfg := cfg.L1Config
 	relayer, err := NewLayer1Relayer(context.Background(), db, l1Cfg.RelayerConfig)
@@ -86,7 +87,7 @@ func testL1RelayerProcessSaveEvents(t *testing.T) {
 
 func testL1RelayerMsgConfirm(t *testing.T) {
 	db := setupL1RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	defer database.CloseDB(db)
 	l1MessageOrm := orm.NewL1Message(db)
 	l1Messages := []*orm.L1Message{
 		{MsgHash: "msg-1", QueueIndex: 0},
@@ -123,12 +124,12 @@ func testL1RelayerMsgConfirm(t *testing.T) {
 
 func testL1RelayerGasOracleConfirm(t *testing.T) {
 	db := setupL1RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	defer database.CloseDB(db)
 	l1BlockOrm := orm.NewL1Block(db)
 
 	l1Block := []orm.L1Block{
-		{Hash: "gas-oracle-1", Number: 0},
-		{Hash: "gas-oracle-2", Number: 1},
+		{Hash: "gas-oracle-1", Number: 0, GasOracleStatus: int16(types.GasOraclePending), BlockStatus: int16(types.L1BlockPending)},
+		{Hash: "gas-oracle-2", Number: 1, GasOracleStatus: int16(types.GasOraclePending), BlockStatus: int16(types.L1BlockPending)},
 	}
 	// Insert test data.
 	assert.NoError(t, l1BlockOrm.InsertL1Blocks(context.Background(), l1Block))
@@ -152,8 +153,8 @@ func testL1RelayerGasOracleConfirm(t *testing.T) {
 
 	// Check the database for the updated status using TryTimes.
 	ok := utils.TryTimes(5, func() bool {
-		msg1, err1 := l1BlockOrm.GetL1Blocks(map[string]interface{}{"hash": "gas-oracle-1"})
-		msg2, err2 := l1BlockOrm.GetL1Blocks(map[string]interface{}{"hash": "gas-oracle-2"})
+		msg1, err1 := l1BlockOrm.GetL1Blocks(ctx, map[string]interface{}{"hash": "gas-oracle-1"})
+		msg2, err2 := l1BlockOrm.GetL1Blocks(ctx, map[string]interface{}{"hash": "gas-oracle-2"})
 		return err1 == nil && len(msg1) == 1 && types.GasOracleStatus(msg1[0].GasOracleStatus) == types.GasOracleImported &&
 			err2 == nil && len(msg2) == 1 && types.GasOracleStatus(msg2[0].GasOracleStatus) == types.GasOracleFailed
 	})
@@ -162,7 +163,7 @@ func testL1RelayerGasOracleConfirm(t *testing.T) {
 
 func testL1RelayerProcessGasPriceOracle(t *testing.T) {
 	db := setupL1RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	l1Cfg := cfg.L1Config
 	ctx, cancel := context.WithCancel(context.Background())
@@ -174,28 +175,28 @@ func testL1RelayerProcessGasPriceOracle(t *testing.T) {
 	var l1BlockOrm *orm.L1Block
 	convey.Convey("GetLatestL1BlockHeight failure", t, func() {
 		targetErr := errors.New("GetLatestL1BlockHeight error")
-		patchGuard := gomonkey.ApplyMethodFunc(l1BlockOrm, "GetLatestL1BlockHeight", func() (uint64, error) {
+		patchGuard := gomonkey.ApplyMethodFunc(l1BlockOrm, "GetLatestL1BlockHeight", func(ctx context.Context) (uint64, error) {
 			return 0, targetErr
 		})
 		defer patchGuard.Reset()
 		l1Relayer.ProcessGasPriceOracle()
 	})
 
-	patchGuard := gomonkey.ApplyMethodFunc(l1BlockOrm, "GetLatestL1BlockHeight", func() (uint64, error) {
+	patchGuard := gomonkey.ApplyMethodFunc(l1BlockOrm, "GetLatestL1BlockHeight", func(ctx context.Context) (uint64, error) {
 		return 100, nil
 	})
 	defer patchGuard.Reset()
 
 	convey.Convey("GetL1Blocks failure", t, func() {
 		targetErr := errors.New("GetL1Blocks error")
-		patchGuard.ApplyMethodFunc(l1BlockOrm, "GetL1Blocks", func(fields map[string]interface{}) ([]orm.L1Block, error) {
+		patchGuard.ApplyMethodFunc(l1BlockOrm, "GetL1Blocks", func(ctx context.Context, fields map[string]interface{}) ([]orm.L1Block, error) {
 			return nil, targetErr
 		})
 		l1Relayer.ProcessGasPriceOracle()
 	})
 
 	convey.Convey("Block not exist", t, func() {
-		patchGuard.ApplyMethodFunc(l1BlockOrm, "GetL1Blocks", func(fields map[string]interface{}) ([]orm.L1Block, error) {
+		patchGuard.ApplyMethodFunc(l1BlockOrm, "GetL1Blocks", func(ctx context.Context, fields map[string]interface{}) ([]orm.L1Block, error) {
 			tmpInfo := []orm.L1Block{
 				{Hash: "gas-oracle-1", Number: 0},
 				{Hash: "gas-oracle-2", Number: 1},
@@ -205,12 +206,12 @@ func testL1RelayerProcessGasPriceOracle(t *testing.T) {
 		l1Relayer.ProcessGasPriceOracle()
 	})
 
-	patchGuard.ApplyMethodFunc(l1BlockOrm, "GetL1Blocks", func(fields map[string]interface{}) ([]orm.L1Block, error) {
+	patchGuard.ApplyMethodFunc(l1BlockOrm, "GetL1Blocks", func(ctx context.Context, fields map[string]interface{}) ([]orm.L1Block, error) {
 		tmpInfo := []orm.L1Block{
 			{
 				Hash:            "gas-oracle-1",
 				Number:          0,
-				GasOracleStatus: int(types.GasOraclePending),
+				GasOracleStatus: int16(types.GasOraclePending),
 			},
 		}
 		return tmpInfo, nil

bridge/internal/controller/relayer/l2_relayer.go

@@ -22,7 +22,6 @@ import (
 	"scroll-tech/bridge/internal/config"
 	"scroll-tech/bridge/internal/controller/sender"
 	"scroll-tech/bridge/internal/orm"
-	bridgeTypes "scroll-tech/bridge/internal/types"
 )
 
 var (
@@ -30,7 +29,6 @@ var (
 	bridgeL2BatchesCommittedTotalCounter          = gethMetrics.NewRegisteredCounter("bridge/l2/batches/committed/total", metrics.ScrollRegistry)
 	bridgeL2BatchesFinalizedConfirmedTotalCounter = gethMetrics.NewRegisteredCounter("bridge/l2/batches/finalized/confirmed/total", metrics.ScrollRegistry)
 	bridgeL2BatchesCommittedConfirmedTotalCounter = gethMetrics.NewRegisteredCounter("bridge/l2/batches/committed/confirmed/total", metrics.ScrollRegistry)
-	bridgeL2BatchesSkippedTotalCounter            = gethMetrics.NewRegisteredCounter("bridge/l2/batches/skipped/total", metrics.ScrollRegistry)
 )
 
 // Layer2Relayer is responsible for
@@ -44,11 +42,10 @@ type Layer2Relayer struct {
 
 	l2Client *ethclient.Client
 
-	db           *gorm.DB
-	batchOrm     *orm.Batch
-	chunkOrm     *orm.Chunk
-	l2BlockOrm   *orm.L2Block
-	l2MessageOrm *orm.L2Message
+	db         *gorm.DB
+	batchOrm   *orm.Batch
+	chunkOrm   *orm.Chunk
+	l2BlockOrm *orm.L2Block
 
 	cfg *config.RelayerConfig
 
@@ -120,10 +117,9 @@ func NewLayer2Relayer(ctx context.Context, l2Client *ethclient.Client, db *gorm.
 		ctx: ctx,
 		db:  db,
 
-		batchOrm:     orm.NewBatch(db),
-		l2MessageOrm: orm.NewL2Message(db),
-		l2BlockOrm:   orm.NewL2Block(db),
-		chunkOrm:     orm.NewChunk(db),
+		batchOrm:   orm.NewBatch(db),
+		l2BlockOrm: orm.NewL2Block(db),
+		chunkOrm:   orm.NewChunk(db),
 
 		l2Client: l2Client,
 
@@ -173,8 +169,8 @@ func (r *Layer2Relayer) initializeGenesis() error {
 
 	log.Info("retrieved L2 genesis header", "hash", genesis.Hash().String())
 
-	chunk := &bridgeTypes.Chunk{
-		Blocks: []*bridgeTypes.WrappedBlock{{
+	chunk := &types.Chunk{
+		Blocks: []*types.WrappedBlock{{
 			Header:           genesis,
 			Transactions:     nil,
 			WithdrawTrieRoot: common.Hash{},
@@ -193,7 +189,7 @@ func (r *Layer2Relayer) initializeGenesis() error {
 		}
 
 		var batch *orm.Batch
-		batch, err = r.batchOrm.InsertBatch(r.ctx, 0, 0, dbChunk.Hash, dbChunk.Hash, []*bridgeTypes.Chunk{chunk}, dbTX)
+		batch, err = r.batchOrm.InsertBatch(r.ctx, 0, 0, dbChunk.Hash, dbChunk.Hash, []*types.Chunk{chunk}, dbTX)
 		if err != nil {
 			return fmt.Errorf("failed to insert batch: %v", err)
 		}
@@ -321,7 +317,7 @@ func (r *Layer2Relayer) ProcessPendingBatches() {
 	}
 	for _, batch := range pendingBatches {
 		// get current header and parent header.
-		currentBatchHeader, err := bridgeTypes.DecodeBatchHeader(batch.BatchHeader)
+		currentBatchHeader, err := types.DecodeBatchHeader(batch.BatchHeader)
 		if err != nil {
 			log.Error("Failed to decode batch header", "index", batch.Index, "error", err)
 			return
@@ -348,7 +344,7 @@ func (r *Layer2Relayer) ProcessPendingBatches() {
 
 		encodedChunks := make([][]byte, len(dbChunks))
 		for i, c := range dbChunks {
-			var wrappedBlocks []*bridgeTypes.WrappedBlock
+			var wrappedBlocks []*types.WrappedBlock
 			wrappedBlocks, err = r.l2BlockOrm.GetL2BlocksInRange(r.ctx, c.StartBlockNumber, c.EndBlockNumber)
 			if err != nil {
 				log.Error("Failed to fetch wrapped blocks",
@@ -356,7 +352,7 @@ func (r *Layer2Relayer) ProcessPendingBatches() {
 					"end number", c.EndBlockNumber, "error", err)
 				return
 			}
-			chunk := &bridgeTypes.Chunk{
+			chunk := &types.Chunk{
 				Blocks: wrappedBlocks,
 			}
 			var chunkBytes []byte
@@ -397,15 +393,6 @@ func (r *Layer2Relayer) ProcessPendingBatches() {
 
 // ProcessCommittedBatches submit proof to layer 1 rollup contract
 func (r *Layer2Relayer) ProcessCommittedBatches() {
-	// set skipped batches in a single db operation
-	if count, err := r.batchOrm.UpdateSkippedBatches(r.ctx); err != nil {
-		log.Error("UpdateSkippedBatches failed", "err", err)
-		// continue anyway
-	} else if count > 0 {
-		bridgeL2BatchesSkippedTotalCounter.Inc(int64(count))
-		log.Info("Skipping batches", "count", count)
-	}
-
 	// retrieves the earliest batch whose rollup status is 'committed'
 	fields := map[string]interface{}{
 		"rollup_status": types.RollupCommitted,
@@ -433,11 +420,6 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 		// It's an intermediate state. The roller manager received the proof but has not verified
 		// the proof yet. We don't roll up the proof until it's verified.
 		return
-	case types.ProvingTaskFailed, types.ProvingTaskSkipped:
-		// note: this is covered by UpdateSkippedBatches, but we keep it for completeness's sake
-		if err = r.batchOrm.UpdateRollupStatus(r.ctx, hash, types.RollupFinalizationSkipped); err != nil {
-			log.Warn("UpdateRollupStatus failed", "hash", hash, "err", err)
-		}
 	case types.ProvingTaskVerified:
 		log.Info("Start to roll up zk proof", "hash", hash)
 		success := false
@@ -457,8 +439,8 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 		defer func() {
 			// TODO: need to revisit this and have a more fine-grained error handling
 			if !success {
-				log.Info("Failed to upload the proof, change rollup status to FinalizationSkipped", "hash", hash)
-				if err = r.batchOrm.UpdateRollupStatus(r.ctx, hash, types.RollupFinalizationSkipped); err != nil {
+				log.Info("Failed to upload the proof, change rollup status to RollupFinalizeFailed", "hash", hash)
+				if err = r.batchOrm.UpdateRollupStatus(r.ctx, hash, types.RollupFinalizeFailed); err != nil {
 					log.Warn("UpdateRollupStatus failed", "hash", hash, "err", err)
 				}
 			}
@@ -521,7 +503,6 @@ func (r *Layer2Relayer) ProcessCommittedBatches() {
 
 func (r *Layer2Relayer) handleConfirmation(confirmation *sender.Confirmation) {
 	transactionType := "Unknown"
-
 	// check whether it is CommitBatches transaction
 	if batchHash, ok := r.processingCommitment.Load(confirmation.ID); ok {
 		transactionType = "BatchesCommitment"

bridge/internal/controller/relayer/l2_relayer_test.go

@@ -12,19 +12,19 @@ import (
 	"github.com/stretchr/testify/assert"
 	"gorm.io/gorm"
 
+	"scroll-tech/common/database"
 	"scroll-tech/common/types"
 	"scroll-tech/common/types/message"
 	"scroll-tech/common/utils"
 
+	"scroll-tech/database/migrate"
+
 	"scroll-tech/bridge/internal/controller/sender"
 	"scroll-tech/bridge/internal/orm"
-	"scroll-tech/bridge/internal/orm/migrate"
-	bridgeTypes "scroll-tech/bridge/internal/types"
-	bridgeUtils "scroll-tech/bridge/internal/utils"
 )
 
 func setupL2RelayerDB(t *testing.T) *gorm.DB {
-	db, err := bridgeUtils.InitDB(cfg.DBConfig)
+	db, err := database.InitDB(cfg.DBConfig)
 	assert.NoError(t, err)
 	sqlDB, err := db.DB()
 	assert.NoError(t, err)
@@ -34,7 +34,7 @@ func setupL2RelayerDB(t *testing.T) *gorm.DB {
 
 func testCreateNewRelayer(t *testing.T) {
 	db := setupL2RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	defer database.CloseDB(db)
 	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, cfg.L2Config.RelayerConfig, false)
 	assert.NoError(t, err)
 	assert.NotNil(t, relayer)
@@ -42,14 +42,14 @@ func testCreateNewRelayer(t *testing.T) {
 
 func testL2RelayerProcessPendingBatches(t *testing.T) {
 	db := setupL2RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	l2Cfg := cfg.L2Config
 	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig, false)
 	assert.NoError(t, err)
 
 	l2BlockOrm := orm.NewL2Block(db)
-	err = l2BlockOrm.InsertL2Blocks(context.Background(), []*bridgeTypes.WrappedBlock{wrappedBlock1, wrappedBlock2})
+	err = l2BlockOrm.InsertL2Blocks(context.Background(), []*types.WrappedBlock{wrappedBlock1, wrappedBlock2})
 	assert.NoError(t, err)
 	chunkOrm := orm.NewChunk(db)
 	dbChunk1, err := chunkOrm.InsertChunk(context.Background(), chunk1)
@@ -57,7 +57,7 @@ func testL2RelayerProcessPendingBatches(t *testing.T) {
 	dbChunk2, err := chunkOrm.InsertChunk(context.Background(), chunk2)
 	assert.NoError(t, err)
 	batchOrm := orm.NewBatch(db)
-	batch, err := batchOrm.InsertBatch(context.Background(), 0, 1, dbChunk1.Hash, dbChunk2.Hash, []*bridgeTypes.Chunk{chunk1, chunk2})
+	batch, err := batchOrm.InsertBatch(context.Background(), 0, 1, dbChunk1.Hash, dbChunk2.Hash, []*types.Chunk{chunk1, chunk2})
 	assert.NoError(t, err)
 
 	relayer.ProcessPendingBatches()
@@ -70,13 +70,13 @@ func testL2RelayerProcessPendingBatches(t *testing.T) {
 
 func testL2RelayerProcessCommittedBatches(t *testing.T) {
 	db := setupL2RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	l2Cfg := cfg.L2Config
 	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig, false)
 	assert.NoError(t, err)
 	batchOrm := orm.NewBatch(db)
-	batch, err := batchOrm.InsertBatch(context.Background(), 0, 1, chunkHash1.Hex(), chunkHash2.Hex(), []*bridgeTypes.Chunk{chunk1, chunk2})
+	batch, err := batchOrm.InsertBatch(context.Background(), 0, 1, chunkHash1.Hex(), chunkHash2.Hex(), []*types.Chunk{chunk1, chunk2})
 	assert.NoError(t, err)
 
 	err = batchOrm.UpdateRollupStatus(context.Background(), batch.Hash, types.RollupCommitted)
@@ -90,7 +90,7 @@ func testL2RelayerProcessCommittedBatches(t *testing.T) {
 	statuses, err := batchOrm.GetRollupStatusByHashList(context.Background(), []string{batch.Hash})
 	assert.NoError(t, err)
 	assert.Equal(t, 1, len(statuses))
-	assert.Equal(t, types.RollupFinalizationSkipped, statuses[0])
+	assert.Equal(t, types.RollupFinalizeFailed, statuses[0])
 
 	err = batchOrm.UpdateRollupStatus(context.Background(), batch.Hash, types.RollupCommitted)
 	assert.NoError(t, err)
@@ -108,70 +108,9 @@ func testL2RelayerProcessCommittedBatches(t *testing.T) {
 	assert.Equal(t, types.RollupFinalizing, statuses[0])
 }
 
-func testL2RelayerSkipBatches(t *testing.T) {
-	db := setupL2RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
-
-	l2Cfg := cfg.L2Config
-	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, l2Cfg.RelayerConfig, false)
-	assert.NoError(t, err)
-
-	batchOrm := orm.NewBatch(db)
-	createBatch := func(rollupStatus types.RollupStatus, provingStatus types.ProvingStatus) string {
-		batch, err := batchOrm.InsertBatch(context.Background(), 0, 1, chunkHash1.Hex(), chunkHash2.Hex(), []*bridgeTypes.Chunk{chunk1, chunk2})
-		assert.NoError(t, err)
-
-		err = batchOrm.UpdateRollupStatus(context.Background(), batch.Hash, rollupStatus)
-		assert.NoError(t, err)
-
-		proof := &message.AggProof{
-			Proof:     []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31},
-			FinalPair: []byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31},
-		}
-		err = batchOrm.UpdateProofByHash(context.Background(), batch.Hash, proof, 100)
-		assert.NoError(t, err)
-		err = batchOrm.UpdateProvingStatus(context.Background(), batch.Hash, provingStatus)
-		assert.NoError(t, err)
-		return batch.Hash
-	}
-
-	skipped := []string{
-		createBatch(types.RollupCommitted, types.ProvingTaskSkipped),
-		createBatch(types.RollupCommitted, types.ProvingTaskFailed),
-	}
-
-	notSkipped := []string{
-		createBatch(types.RollupPending, types.ProvingTaskSkipped),
-		createBatch(types.RollupCommitting, types.ProvingTaskSkipped),
-		createBatch(types.RollupFinalizing, types.ProvingTaskSkipped),
-		createBatch(types.RollupFinalized, types.ProvingTaskSkipped),
-		createBatch(types.RollupPending, types.ProvingTaskFailed),
-		createBatch(types.RollupCommitting, types.ProvingTaskFailed),
-		createBatch(types.RollupFinalizing, types.ProvingTaskFailed),
-		createBatch(types.RollupFinalized, types.ProvingTaskFailed),
-		createBatch(types.RollupCommitted, types.ProvingTaskVerified),
-	}
-
-	relayer.ProcessCommittedBatches()
-
-	for _, id := range skipped {
-		statuses, err := batchOrm.GetRollupStatusByHashList(context.Background(), []string{id})
-		assert.NoError(t, err)
-		assert.Equal(t, 1, len(statuses))
-		assert.Equal(t, types.RollupFinalizationSkipped, statuses[0])
-	}
-
-	for _, id := range notSkipped {
-		statuses, err := batchOrm.GetRollupStatusByHashList(context.Background(), []string{id})
-		assert.NoError(t, err)
-		assert.Equal(t, 1, len(statuses))
-		assert.NotEqual(t, types.RollupFinalizationSkipped, statuses[0])
-	}
-}
-
 func testL2RelayerRollupConfirm(t *testing.T) {
 	db := setupL2RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	// Create and set up the Layer2 Relayer.
 	l2Cfg := cfg.L2Config
@@ -187,7 +126,7 @@ func testL2RelayerRollupConfirm(t *testing.T) {
 	batchOrm := orm.NewBatch(db)
 	batchHashes := make([]string, len(processingKeys))
 	for i := range batchHashes {
-		batch, err := batchOrm.InsertBatch(context.Background(), 0, 1, chunkHash1.Hex(), chunkHash2.Hex(), []*bridgeTypes.Chunk{chunk1, chunk2})
+		batch, err := batchOrm.InsertBatch(context.Background(), 0, 1, chunkHash1.Hex(), chunkHash2.Hex(), []*types.Chunk{chunk1, chunk2})
 		assert.NoError(t, err)
 		batchHashes[i] = batch.Hash
 	}
@@ -232,13 +171,13 @@ func testL2RelayerRollupConfirm(t *testing.T) {
 
 func testL2RelayerGasOracleConfirm(t *testing.T) {
 	db := setupL2RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	batchOrm := orm.NewBatch(db)
-	batch1, err := batchOrm.InsertBatch(context.Background(), 0, 0, chunkHash1.Hex(), chunkHash1.Hex(), []*bridgeTypes.Chunk{chunk1})
+	batch1, err := batchOrm.InsertBatch(context.Background(), 0, 0, chunkHash1.Hex(), chunkHash1.Hex(), []*types.Chunk{chunk1})
 	assert.NoError(t, err)
 
-	batch2, err := batchOrm.InsertBatch(context.Background(), 1, 1, chunkHash2.Hex(), chunkHash2.Hex(), []*bridgeTypes.Chunk{chunk2})
+	batch2, err := batchOrm.InsertBatch(context.Background(), 1, 1, chunkHash2.Hex(), chunkHash2.Hex(), []*types.Chunk{chunk2})
 	assert.NoError(t, err)
 
 	// Create and set up the Layer2 Relayer.
@@ -281,7 +220,7 @@ func testL2RelayerGasOracleConfirm(t *testing.T) {
 
 func testLayer2RelayerProcessGasPriceOracle(t *testing.T) {
 	db := setupL2RelayerDB(t)
-	defer bridgeUtils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	relayer, err := NewLayer2Relayer(context.Background(), l2Cli, db, cfg.L2Config.RelayerConfig, false)
 	assert.NoError(t, err)

bridge/internal/controller/relayer/relayer_test.go

@@ -9,10 +9,11 @@ import (
 	"github.com/scroll-tech/go-ethereum/ethclient"
 	"github.com/stretchr/testify/assert"
 
+	"scroll-tech/common/database"
 	"scroll-tech/common/docker"
+	"scroll-tech/common/types"
 
 	"scroll-tech/bridge/internal/config"
-	bridgeTypes "scroll-tech/bridge/internal/types"
 )
 
 var (
@@ -25,12 +26,12 @@ var (
 	l2Cli *ethclient.Client
 
 	// l2 block
-	wrappedBlock1 *bridgeTypes.WrappedBlock
-	wrappedBlock2 *bridgeTypes.WrappedBlock
+	wrappedBlock1 *types.WrappedBlock
+	wrappedBlock2 *types.WrappedBlock
 
 	// chunk
-	chunk1     *bridgeTypes.Chunk
-	chunk2     *bridgeTypes.Chunk
+	chunk1     *types.Chunk
+	chunk2     *types.Chunk
 	chunkHash1 common.Hash
 	chunkHash2 common.Hash
 )
@@ -45,7 +46,7 @@ func setupEnv(t *testing.T) {
 
 	cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = base.L1gethImg.Endpoint()
 	cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = base.L2gethImg.Endpoint()
-	cfg.DBConfig = &config.DBConfig{
+	cfg.DBConfig = &database.Config{
 		DSN:        base.DBConfig.DSN,
 		DriverName: base.DBConfig.DriverName,
 		MaxOpenNum: base.DBConfig.MaxOpenNum,
@@ -58,19 +59,19 @@ func setupEnv(t *testing.T) {
 
 	templateBlockTrace1, err := os.ReadFile("../../../testdata/blockTrace_02.json")
 	assert.NoError(t, err)
-	wrappedBlock1 = &bridgeTypes.WrappedBlock{}
+	wrappedBlock1 = &types.WrappedBlock{}
 	err = json.Unmarshal(templateBlockTrace1, wrappedBlock1)
 	assert.NoError(t, err)
-	chunk1 = &bridgeTypes.Chunk{Blocks: []*bridgeTypes.WrappedBlock{wrappedBlock1}}
+	chunk1 = &types.Chunk{Blocks: []*types.WrappedBlock{wrappedBlock1}}
 	chunkHash1, err = chunk1.Hash(0)
 	assert.NoError(t, err)
 
 	templateBlockTrace2, err := os.ReadFile("../../../testdata/blockTrace_03.json")
 	assert.NoError(t, err)
-	wrappedBlock2 = &bridgeTypes.WrappedBlock{}
+	wrappedBlock2 = &types.WrappedBlock{}
 	err = json.Unmarshal(templateBlockTrace2, wrappedBlock2)
 	assert.NoError(t, err)
-	chunk2 = &bridgeTypes.Chunk{Blocks: []*bridgeTypes.WrappedBlock{wrappedBlock2}}
+	chunk2 = &types.Chunk{Blocks: []*types.WrappedBlock{wrappedBlock2}}
 	chunkHash2, err = chunk2.Hash(chunk1.NumL1Messages(0))
 	assert.NoError(t, err)
 }
@@ -96,7 +97,6 @@ func TestFunctions(t *testing.T) {
 	t.Run("TestCreateNewRelayer", testCreateNewRelayer)
 	t.Run("TestL2RelayerProcessPendingBatches", testL2RelayerProcessPendingBatches)
 	t.Run("TestL2RelayerProcessCommittedBatches", testL2RelayerProcessCommittedBatches)
-	t.Run("TestL2RelayerSkipBatches", testL2RelayerSkipBatches)
 	t.Run("TestL2RelayerRollupConfirm", testL2RelayerRollupConfirm)
 	t.Run("TestL2RelayerGasOracleConfirm", testL2RelayerGasOracleConfirm)
 	t.Run("TestLayer2RelayerProcessGasPriceOracle", testLayer2RelayerProcessGasPriceOracle)

bridge/internal/controller/sender/sender.go

@@ -343,6 +343,20 @@ func (s *Sender) resubmitTransaction(feeData *FeeData, auth *bind.TransactOpts,
 		if gasTipCap.Cmp(feeData.gasTipCap) < 0 {
 			gasTipCap = feeData.gasTipCap
 		}
+
+		// adjust for rising basefee
+		adjBaseFee := big.NewInt(0)
+		if feeGas := atomic.LoadUint64(&s.baseFeePerGas); feeGas != 0 {
+			adjBaseFee.SetUint64(feeGas)
+		}
+		adjBaseFee = adjBaseFee.Mul(adjBaseFee, escalateMultipleNum)
+		adjBaseFee = adjBaseFee.Div(adjBaseFee, escalateMultipleDen)
+		currentGasFeeCap := new(big.Int).Add(gasTipCap, adjBaseFee)
+		if gasFeeCap.Cmp(currentGasFeeCap) < 0 {
+			gasFeeCap = currentGasFeeCap
+		}
+
+		// but don't exceed maxGasPrice
 		if gasFeeCap.Cmp(maxGasPrice) > 0 {
 			gasFeeCap = maxGasPrice
 		}

bridge/internal/controller/sender/sender_test.go

@@ -65,6 +65,7 @@ func TestSender(t *testing.T) {
 
 	t.Run("test min gas limit", testMinGasLimit)
 	t.Run("test resubmit transaction", testResubmitTransaction)
+	t.Run("test resubmit transaction with rising base fee", testResubmitTransactionWithRisingBaseFee)
 	t.Run("test check pending transaction", testCheckPendingTransaction)
 
 	t.Run("test 1 account sender", func(t *testing.T) { testBatchSender(t, 1) })
@@ -154,6 +155,43 @@ func testResubmitTransaction(t *testing.T) {
 	}
 }
 
+func testResubmitTransactionWithRisingBaseFee(t *testing.T) {
+	txType := "DynamicFeeTx"
+
+	cfgCopy := *cfg.L1Config.RelayerConfig.SenderConfig
+	cfgCopy.TxType = txType
+	s, err := NewSender(context.Background(), &cfgCopy, privateKeys)
+	assert.NoError(t, err)
+	auth := s.auths.getAccount()
+	tx := types.NewTransaction(auth.Nonce.Uint64(), common.Address{}, big.NewInt(0), 0, big.NewInt(0), nil)
+	s.baseFeePerGas = 1000
+	feeData, err := s.getFeeData(auth, &common.Address{}, big.NewInt(0), nil, 0)
+	assert.NoError(t, err)
+	// bump the basefee by 10x
+	s.baseFeePerGas *= 10
+	// resubmit and check that the gas fee has been adjusted accordingly
+	newTx, err := s.resubmitTransaction(feeData, auth, tx)
+	assert.NoError(t, err)
+
+	escalateMultipleNum := new(big.Int).SetUint64(s.config.EscalateMultipleNum)
+	escalateMultipleDen := new(big.Int).SetUint64(s.config.EscalateMultipleDen)
+	maxGasPrice := new(big.Int).SetUint64(s.config.MaxGasPrice)
+
+	adjBaseFee := new(big.Int)
+	adjBaseFee.SetUint64(s.baseFeePerGas)
+	adjBaseFee = adjBaseFee.Mul(adjBaseFee, escalateMultipleNum)
+	adjBaseFee = adjBaseFee.Div(adjBaseFee, escalateMultipleDen)
+
+	expectedGasFeeCap := new(big.Int).Add(feeData.gasTipCap, adjBaseFee)
+	if expectedGasFeeCap.Cmp(maxGasPrice) > 0 {
+		expectedGasFeeCap = maxGasPrice
+	}
+
+	assert.Equal(t, expectedGasFeeCap.Int64(), newTx.GasFeeCap().Int64())
+
+	s.Stop()
+}
+
 func testCheckPendingTransaction(t *testing.T) {
 	for _, txType := range txTypes {
 		cfgCopy := *cfg.L1Config.RelayerConfig.SenderConfig

bridge/internal/controller/watcher/batch_proposer.go

@@ -8,9 +8,10 @@ import (
 	"github.com/scroll-tech/go-ethereum/log"
 	"gorm.io/gorm"
 
+	"scroll-tech/common/types"
+
 	"scroll-tech/bridge/internal/config"
 	"scroll-tech/bridge/internal/orm"
-	bridgeTypes "scroll-tech/bridge/internal/types"
 )
 
 // BatchProposer proposes batches based on available unbatched chunks.
@@ -24,7 +25,7 @@ type BatchProposer struct {
 
 	maxChunkNumPerBatch             uint64
 	maxL1CommitGasPerBatch          uint64
-	maxL1CommitCalldataSizePerBatch uint64
+	maxL1CommitCalldataSizePerBatch uint32
 	minChunkNumPerBatch             uint64
 	batchTimeoutSec                 uint64
 }
@@ -92,7 +93,6 @@ func (p *BatchProposer) proposeBatchChunks() ([]*orm.Chunk, error) {
 	}
 
 	if len(dbChunks) == 0 {
-		log.Warn("No Unbatched Chunks")
 		return nil, nil
 	}
 
@@ -146,7 +146,7 @@ func (p *BatchProposer) proposeBatchChunks() ([]*orm.Chunk, error) {
 	}
 
 	if !hasChunkTimeout && uint64(len(dbChunks)) < p.minChunkNumPerBatch {
-		log.Warn("The payload size of the batch is less than the minimum limit",
+		log.Warn("The chunk number of the batch is less than the minimum limit",
 			"chunk num", len(dbChunks), "minChunkNumPerBatch", p.minChunkNumPerBatch,
 		)
 		return nil, nil
@@ -154,8 +154,8 @@ func (p *BatchProposer) proposeBatchChunks() ([]*orm.Chunk, error) {
 	return dbChunks, nil
 }
 
-func (p *BatchProposer) dbChunksToBridgeChunks(dbChunks []*orm.Chunk) ([]*bridgeTypes.Chunk, error) {
-	chunks := make([]*bridgeTypes.Chunk, len(dbChunks))
+func (p *BatchProposer) dbChunksToBridgeChunks(dbChunks []*orm.Chunk) ([]*types.Chunk, error) {
+	chunks := make([]*types.Chunk, len(dbChunks))
 	for i, c := range dbChunks {
 		wrappedBlocks, err := p.l2Block.GetL2BlocksInRange(p.ctx, c.StartBlockNumber, c.EndBlockNumber)
 		if err != nil {
@@ -163,7 +163,7 @@ func (p *BatchProposer) dbChunksToBridgeChunks(dbChunks []*orm.Chunk) ([]*bridge
 				"start number", c.StartBlockNumber, "end number", c.EndBlockNumber, "error", err)
 			return nil, err
 		}
-		chunks[i] = &bridgeTypes.Chunk{
+		chunks[i] = &types.Chunk{
 			Blocks: wrappedBlocks,
 		}
 	}

bridge/internal/controller/watcher/batch_proposer_test.go

@@ -6,21 +6,20 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"scroll-tech/common/database"
 	"scroll-tech/common/types"
 
 	"scroll-tech/bridge/internal/config"
 	"scroll-tech/bridge/internal/orm"
-	bridgeTypes "scroll-tech/bridge/internal/types"
-	"scroll-tech/bridge/internal/utils"
 )
 
 // TODO: Add unit tests that the limits are enforced correctly.
 func testBatchProposer(t *testing.T) {
 	db := setupDB(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	l2BlockOrm := orm.NewL2Block(db)
-	err := l2BlockOrm.InsertL2Blocks(context.Background(), []*bridgeTypes.WrappedBlock{wrappedBlock1, wrappedBlock2})
+	err := l2BlockOrm.InsertL2Blocks(context.Background(), []*types.WrappedBlock{wrappedBlock1, wrappedBlock2})
 	assert.NoError(t, err)
 
 	cp := NewChunkProposer(context.Background(), &config.ChunkProposerConfig{

bridge/internal/controller/watcher/chunk_proposer.go

@@ -8,9 +8,10 @@ import (
 	"github.com/scroll-tech/go-ethereum/log"
 	"gorm.io/gorm"
 
+	"scroll-tech/common/types"
+
 	"scroll-tech/bridge/internal/config"
 	"scroll-tech/bridge/internal/orm"
-	bridgeTypes "scroll-tech/bridge/internal/types"
 )
 
 // ChunkProposer proposes chunks based on available unchunked blocks.
@@ -58,9 +59,8 @@ func (p *ChunkProposer) TryProposeChunk() {
 	}
 }
 
-func (p *ChunkProposer) updateChunkInfoInDB(chunk *bridgeTypes.Chunk) error {
+func (p *ChunkProposer) updateChunkInfoInDB(chunk *types.Chunk) error {
 	if chunk == nil {
-		log.Warn("proposed chunk is nil, cannot update in DB")
 		return nil
 	}
 
@@ -78,14 +78,13 @@ func (p *ChunkProposer) updateChunkInfoInDB(chunk *bridgeTypes.Chunk) error {
 	return err
 }
 
-func (p *ChunkProposer) proposeChunk() (*bridgeTypes.Chunk, error) {
+func (p *ChunkProposer) proposeChunk() (*types.Chunk, error) {
 	blocks, err := p.l2BlockOrm.GetUnchunkedBlocks(p.ctx)
 	if err != nil {
 		return nil, err
 	}
 
 	if len(blocks) == 0 {
-		log.Warn("no un-chunked blocks")
 		return nil, nil
 	}
 
@@ -106,15 +105,6 @@ func (p *ChunkProposer) proposeChunk() (*bridgeTypes.Chunk, error) {
 		)
 	}
 
-	if totalTxGasUsed > p.maxTxGasPerChunk {
-		return nil, fmt.Errorf(
-			"the first block exceeds l2 tx gas limit; block number: %v, gas used: %v, max gas limit: %v",
-			firstBlock.Header.Number,
-			totalTxGasUsed,
-			p.maxTxGasPerChunk,
-		)
-	}
-
 	if totalL1CommitGas > p.maxL1CommitGasPerChunk {
 		return nil, fmt.Errorf(
 			"the first block exceeds l1 commit gas limit; block number: %v, commit gas: %v, max commit gas limit: %v",
@@ -133,6 +123,16 @@ func (p *ChunkProposer) proposeChunk() (*bridgeTypes.Chunk, error) {
 		)
 	}
 
+	// Check if the first block breaks any soft limits.
+	if totalTxGasUsed > p.maxTxGasPerChunk {
+		log.Warn(
+			"The first block in chunk exceeds l2 tx gas limit",
+			"block number", firstBlock.Header.Number,
+			"gas used", totalTxGasUsed,
+			"max gas limit", p.maxTxGasPerChunk,
+		)
+	}
+
 	for i, block := range blocks[1:] {
 		totalTxGasUsed += block.Header.GasUsed
 		totalL2TxNum += block.L2TxsNum()
@@ -165,5 +165,5 @@ func (p *ChunkProposer) proposeChunk() (*bridgeTypes.Chunk, error) {
 		)
 		return nil, nil
 	}
-	return &bridgeTypes.Chunk{Blocks: blocks}, nil
+	return &types.Chunk{Blocks: blocks}, nil
 }

bridge/internal/controller/watcher/chunk_proposer_test.go

@@ -6,19 +6,20 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"scroll-tech/common/database"
+	"scroll-tech/common/types"
+
 	"scroll-tech/bridge/internal/config"
 	"scroll-tech/bridge/internal/orm"
-	bridgeTypes "scroll-tech/bridge/internal/types"
-	"scroll-tech/bridge/internal/utils"
 )
 
 // TODO: Add unit tests that the limits are enforced correctly.
 func testChunkProposer(t *testing.T) {
 	db := setupDB(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	l2BlockOrm := orm.NewL2Block(db)
-	err := l2BlockOrm.InsertL2Blocks(context.Background(), []*bridgeTypes.WrappedBlock{wrappedBlock1, wrappedBlock2})
+	err := l2BlockOrm.InsertL2Blocks(context.Background(), []*types.WrappedBlock{wrappedBlock1, wrappedBlock2})
 	assert.NoError(t, err)
 
 	cp := NewChunkProposer(context.Background(), &config.ChunkProposerConfig{
@@ -31,8 +32,8 @@ func testChunkProposer(t *testing.T) {
 	}, db)
 	cp.TryProposeChunk()
 
-	expectedChunk := &bridgeTypes.Chunk{
-		Blocks: []*bridgeTypes.WrappedBlock{wrappedBlock1, wrappedBlock2},
+	expectedChunk := &types.Chunk{
+		Blocks: []*types.WrappedBlock{wrappedBlock1, wrappedBlock2},
 	}
 	expectedHash, err := expectedChunk.Hash(0)
 	assert.NoError(t, err)

bridge/internal/controller/watcher/l1_watcher.go

@@ -24,10 +24,9 @@ import (
 )
 
 var (
-	bridgeL1MsgsSyncHeightGauge           = gethMetrics.NewRegisteredGauge("bridge/l1/msgs/sync/height", metrics.ScrollRegistry)
-	bridgeL1MsgsSentEventsTotalCounter    = gethMetrics.NewRegisteredCounter("bridge/l1/msgs/sent/events/total", metrics.ScrollRegistry)
-	bridgeL1MsgsRelayedEventsTotalCounter = gethMetrics.NewRegisteredCounter("bridge/l1/msgs/relayed/events/total", metrics.ScrollRegistry)
-	bridgeL1MsgsRollupEventsTotalCounter  = gethMetrics.NewRegisteredCounter("bridge/l1/msgs/rollup/events/total", metrics.ScrollRegistry)
+	bridgeL1MsgsSyncHeightGauge          = gethMetrics.NewRegisteredGauge("bridge/l1/msgs/sync/height", metrics.ScrollRegistry)
+	bridgeL1MsgsSentEventsTotalCounter   = gethMetrics.NewRegisteredCounter("bridge/l1/msgs/sent/events/total", metrics.ScrollRegistry)
+	bridgeL1MsgsRollupEventsTotalCounter = gethMetrics.NewRegisteredCounter("bridge/l1/msgs/rollup/events/total", metrics.ScrollRegistry)
 )
 
 type rollupEvent struct {
@@ -41,7 +40,6 @@ type L1WatcherClient struct {
 	ctx          context.Context
 	client       *ethclient.Client
 	l1MessageOrm *orm.L1Message
-	l2MessageOrm *orm.L2Message
 	l1BlockOrm   *orm.L1Block
 	batchOrm     *orm.Batch
 
@@ -76,7 +74,7 @@ func NewL1WatcherClient(ctx context.Context, client *ethclient.Client, startHeig
 	}
 
 	l1BlockOrm := orm.NewL1Block(db)
-	savedL1BlockHeight, err := l1BlockOrm.GetLatestL1BlockHeight()
+	savedL1BlockHeight, err := l1BlockOrm.GetLatestL1BlockHeight(ctx)
 	if err != nil {
 		log.Warn("Failed to fetch latest L1 block height from db", "err", err)
 		savedL1BlockHeight = 0
@@ -91,7 +89,6 @@ func NewL1WatcherClient(ctx context.Context, client *ethclient.Client, startHeig
 		l1MessageOrm:  l1MessageOrm,
 		l1BlockOrm:    l1BlockOrm,
 		batchOrm:      orm.NewBatch(db),
-		l2MessageOrm:  orm.NewL2Message(db),
 		confirmations: confirmations,
 
 		messengerAddress: messengerAddress,
@@ -152,9 +149,11 @@ func (w *L1WatcherClient) FetchBlockHeader(blockHeight uint64) error {
 			baseFee = block.BaseFee.Uint64()
 		}
 		blocks = append(blocks, orm.L1Block{
-			Number:  uint64(height),
-			Hash:    block.Hash().String(),
-			BaseFee: baseFee,
+			Number:          uint64(height),
+			Hash:            block.Hash().String(),
+			BaseFee:         baseFee,
+			GasOracleStatus: int16(types.GasOraclePending),
+			BlockStatus:     int16(types.L1BlockPending),
 		})
 	}
 
@@ -227,18 +226,16 @@ func (w *L1WatcherClient) FetchContractEvent() error {
 		}
 		log.Info("Received new L1 events", "fromBlock", from, "toBlock", to, "cnt", len(logs))
 
-		sentMessageEvents, relayedMessageEvents, rollupEvents, err := w.parseBridgeEventLogs(logs)
+		sentMessageEvents, rollupEvents, err := w.parseBridgeEventLogs(logs)
 		if err != nil {
 			log.Error("Failed to parse emitted events log", "err", err)
 			return err
 		}
 		sentMessageCount := int64(len(sentMessageEvents))
-		relayedMessageCount := int64(len(relayedMessageEvents))
 		rollupEventCount := int64(len(rollupEvents))
 		bridgeL1MsgsSentEventsTotalCounter.Inc(sentMessageCount)
-		bridgeL1MsgsRelayedEventsTotalCounter.Inc(relayedMessageCount)
 		bridgeL1MsgsRollupEventsTotalCounter.Inc(rollupEventCount)
-		log.Info("L1 events types", "SentMessageCount", sentMessageCount, "RelayedMessageCount", relayedMessageCount, "RollupEventCount", rollupEventCount)
+		log.Info("L1 events types", "SentMessageCount", sentMessageCount, "RollupEventCount", rollupEventCount)
 
 		// use rollup event to update rollup results db status
 		var batchHashes []string
@@ -272,21 +269,6 @@ func (w *L1WatcherClient) FetchContractEvent() error {
 			}
 		}
 
-		// Update relayed message first to make sure we don't forget to update submitted message.
-		// Since, we always start sync from the latest unprocessed message.
-		for _, msg := range relayedMessageEvents {
-			var msgStatus types.MsgStatus
-			if msg.isSuccessful {
-				msgStatus = types.MsgConfirmed
-			} else {
-				msgStatus = types.MsgFailed
-			}
-			if err = w.l2MessageOrm.UpdateLayer2StatusAndLayer1Hash(w.ctx, msg.msgHash.String(), msgStatus, msg.txHash.String()); err != nil {
-				log.Error("Failed to update layer1 status and layer2 hash", "err", err)
-				return err
-			}
-		}
-
 		if err = w.l1MessageOrm.SaveL1Messages(w.ctx, sentMessageEvents); err != nil {
 			return err
 		}
@@ -298,11 +280,10 @@ func (w *L1WatcherClient) FetchContractEvent() error {
 	return nil
 }
 
-func (w *L1WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]*orm.L1Message, []relayedMessage, []rollupEvent, error) {
+func (w *L1WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]*orm.L1Message, []rollupEvent, error) {
 	// Need use contract abi to parse event Log
 	// Can only be tested after we have our contracts set up
 	var l1Messages []*orm.L1Message
-	var relayedMessages []relayedMessage
 	var rollupEvents []rollupEvent
 	for _, vLog := range logs {
 		switch vLog.Topics[0] {
@@ -311,7 +292,7 @@ func (w *L1WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]*orm.L1M
 			err := utils.UnpackLog(w.messageQueueABI, &event, "QueueTransaction", vLog)
 			if err != nil {
 				log.Warn("Failed to unpack layer1 QueueTransaction event", "err", err)
-				return l1Messages, relayedMessages, rollupEvents, err
+				return l1Messages, rollupEvents, err
 			}
 
 			msgHash := common.BytesToHash(crypto.Keccak256(event.Data))
@@ -327,38 +308,12 @@ func (w *L1WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]*orm.L1M
 				GasLimit:   event.GasLimit.Uint64(),
 				Layer1Hash: vLog.TxHash.Hex(),
 			})
-		case bridgeAbi.L1RelayedMessageEventSignature:
-			event := bridgeAbi.L1RelayedMessageEvent{}
-			err := utils.UnpackLog(w.messengerABI, &event, "RelayedMessage", vLog)
-			if err != nil {
-				log.Warn("Failed to unpack layer1 RelayedMessage event", "err", err)
-				return l1Messages, relayedMessages, rollupEvents, err
-			}
-
-			relayedMessages = append(relayedMessages, relayedMessage{
-				msgHash:      event.MessageHash,
-				txHash:       vLog.TxHash,
-				isSuccessful: true,
-			})
-		case bridgeAbi.L1FailedRelayedMessageEventSignature:
-			event := bridgeAbi.L1FailedRelayedMessageEvent{}
-			err := utils.UnpackLog(w.messengerABI, &event, "FailedRelayedMessage", vLog)
-			if err != nil {
-				log.Warn("Failed to unpack layer1 FailedRelayedMessage event", "err", err)
-				return l1Messages, relayedMessages, rollupEvents, err
-			}
-
-			relayedMessages = append(relayedMessages, relayedMessage{
-				msgHash:      event.MessageHash,
-				txHash:       vLog.TxHash,
-				isSuccessful: false,
-			})
 		case bridgeAbi.L1CommitBatchEventSignature:
 			event := bridgeAbi.L1CommitBatchEvent{}
 			err := utils.UnpackLog(w.scrollChainABI, &event, "CommitBatch", vLog)
 			if err != nil {
 				log.Warn("Failed to unpack layer1 CommitBatch event", "err", err)
-				return l1Messages, relayedMessages, rollupEvents, err
+				return l1Messages, rollupEvents, err
 			}
 
 			rollupEvents = append(rollupEvents, rollupEvent{
@@ -371,7 +326,7 @@ func (w *L1WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]*orm.L1M
 			err := utils.UnpackLog(w.scrollChainABI, &event, "FinalizeBatch", vLog)
 			if err != nil {
 				log.Warn("Failed to unpack layer1 FinalizeBatch event", "err", err)
-				return l1Messages, relayedMessages, rollupEvents, err
+				return l1Messages, rollupEvents, err
 			}
 
 			rollupEvents = append(rollupEvents, rollupEvent{
@@ -384,5 +339,5 @@ func (w *L1WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]*orm.L1M
 		}
 	}
 
-	return l1Messages, relayedMessages, rollupEvents, nil
+	return l1Messages, rollupEvents, nil
 }

bridge/internal/controller/watcher/l1_watcher_test.go

@@ -17,6 +17,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"gorm.io/gorm"
 
+	"scroll-tech/common/database"
 	commonTypes "scroll-tech/common/types"
 
 	bridgeAbi "scroll-tech/bridge/abi"
@@ -36,13 +37,13 @@ func setupL1Watcher(t *testing.T) (*L1WatcherClient, *gorm.DB) {
 
 func testFetchContractEvent(t *testing.T) {
 	watcher, db := setupL1Watcher(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 	assert.NoError(t, watcher.FetchContractEvent())
 }
 
 func testL1WatcherClientFetchBlockHeader(t *testing.T) {
 	watcher, db := setupL1Watcher(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 	convey.Convey("test toBlock < fromBlock", t, func() {
 		var blockHeight uint64
 		if watcher.ProcessedBlockHeight() <= 0 {
@@ -114,7 +115,7 @@ func testL1WatcherClientFetchBlockHeader(t *testing.T) {
 
 func testL1WatcherClientFetchContractEvent(t *testing.T) {
 	watcher, db := setupL1Watcher(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	watcher.SetConfirmations(rpc.SafeBlockNumber)
 	convey.Convey("get latest confirmed block number failure", t, func() {
@@ -159,14 +160,14 @@ func testL1WatcherClientFetchContractEvent(t *testing.T) {
 
 	convey.Convey("parse bridge event logs failure", t, func() {
 		targetErr := errors.New("parse log failure")
-		patchGuard.ApplyPrivateMethod(watcher, "parseBridgeEventLogs", func(*L1WatcherClient, []types.Log) ([]*orm.L1Message, []relayedMessage, []rollupEvent, error) {
-			return nil, nil, nil, targetErr
+		patchGuard.ApplyPrivateMethod(watcher, "parseBridgeEventLogs", func(*L1WatcherClient, []types.Log) ([]*orm.L1Message, []rollupEvent, error) {
+			return nil, nil, targetErr
 		})
 		err := watcher.FetchContractEvent()
 		assert.EqualError(t, err, targetErr.Error())
 	})
 
-	patchGuard.ApplyPrivateMethod(watcher, "parseBridgeEventLogs", func(*L1WatcherClient, []types.Log) ([]*orm.L1Message, []relayedMessage, []rollupEvent, error) {
+	patchGuard.ApplyPrivateMethod(watcher, "parseBridgeEventLogs", func(*L1WatcherClient, []types.Log) ([]*orm.L1Message, []rollupEvent, error) {
 		rollupEvents := []rollupEvent{
 			{
 				batchHash: common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
@@ -179,20 +180,7 @@ func testL1WatcherClientFetchContractEvent(t *testing.T) {
 				status:    commonTypes.RollupCommitted,
 			},
 		}
-
-		relayedMessageEvents := []relayedMessage{
-			{
-				msgHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-				txHash:       common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5"),
-				isSuccessful: true,
-			},
-			{
-				msgHash:      common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5"),
-				txHash:       common.HexToHash("0xb4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d30"),
-				isSuccessful: false,
-			},
-		}
-		return nil, relayedMessageEvents, rollupEvents, nil
+		return nil, rollupEvents, nil
 	})
 
 	var batchOrm *orm.Batch
@@ -250,20 +238,6 @@ func testL1WatcherClientFetchContractEvent(t *testing.T) {
 		return nil
 	})
 
-	var l2MessageOrm *orm.L2Message
-	convey.Convey("db update layer2 status and layer1 hash failure", t, func() {
-		targetErr := errors.New("UpdateLayer2StatusAndLayer1Hash failure")
-		patchGuard.ApplyMethodFunc(l2MessageOrm, "UpdateLayer2StatusAndLayer1Hash", func(context.Context, string, commonTypes.MsgStatus, string) error {
-			return targetErr
-		})
-		err := watcher.FetchContractEvent()
-		assert.Equal(t, targetErr.Error(), err.Error())
-	})
-
-	patchGuard.ApplyMethodFunc(l2MessageOrm, "UpdateLayer2StatusAndLayer1Hash", func(context.Context, string, commonTypes.MsgStatus, string) error {
-		return nil
-	})
-
 	var l1MessageOrm *orm.L1Message
 	convey.Convey("db save l1 message failure", t, func() {
 		targetErr := errors.New("SaveL1Messages failure")
@@ -286,7 +260,7 @@ func testL1WatcherClientFetchContractEvent(t *testing.T) {
 
 func testParseBridgeEventLogsL1QueueTransactionEventSignature(t *testing.T) {
 	watcher, db := setupL1Watcher(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	logs := []types.Log{
 		{
@@ -303,10 +277,9 @@ func testParseBridgeEventLogsL1QueueTransactionEventSignature(t *testing.T) {
 		})
 		defer patchGuard.Reset()
 
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
+		l2Messages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
 		assert.EqualError(t, err, targetErr.Error())
 		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
 		assert.Empty(t, rollupEvents)
 	})
 
@@ -323,105 +296,17 @@ func testParseBridgeEventLogsL1QueueTransactionEventSignature(t *testing.T) {
 		})
 		defer patchGuard.Reset()
 
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
+		l2Messages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
 		assert.NoError(t, err)
-		assert.Empty(t, relayedMessages)
 		assert.Empty(t, rollupEvents)
 		assert.Len(t, l2Messages, 1)
 		assert.Equal(t, l2Messages[0].Value, big.NewInt(1000).String())
 	})
 }
 
-func testParseBridgeEventLogsL1RelayedMessageEventSignature(t *testing.T) {
-	watcher, db := setupL1Watcher(t)
-	defer utils.CloseDB(db)
-
-	logs := []types.Log{
-		{
-			Topics:      []common.Hash{bridgeAbi.L1RelayedMessageEventSignature},
-			BlockNumber: 100,
-			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-		},
-	}
-
-	convey.Convey("unpack RelayedMessage log failure", t, func() {
-		targetErr := errors.New("UnpackLog RelayedMessage failure")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log types.Log) error {
-			return targetErr
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
-		assert.EqualError(t, err, targetErr.Error())
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-		assert.Empty(t, rollupEvents)
-	})
-
-	convey.Convey("L1RelayedMessageEventSignature success", t, func() {
-		msgHash := common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log types.Log) error {
-			tmpOut := out.(*bridgeAbi.L1RelayedMessageEvent)
-			tmpOut.MessageHash = msgHash
-			return nil
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
-		assert.NoError(t, err)
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, rollupEvents)
-		assert.Len(t, relayedMessages, 1)
-		assert.Equal(t, relayedMessages[0].msgHash, msgHash)
-	})
-}
-
-func testParseBridgeEventLogsL1FailedRelayedMessageEventSignature(t *testing.T) {
-	watcher, db := setupL1Watcher(t)
-	defer utils.CloseDB(db)
-	logs := []types.Log{
-		{
-			Topics:      []common.Hash{bridgeAbi.L1FailedRelayedMessageEventSignature},
-			BlockNumber: 100,
-			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-		},
-	}
-
-	convey.Convey("unpack FailedRelayedMessage log failure", t, func() {
-		targetErr := errors.New("UnpackLog FailedRelayedMessage failure")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log types.Log) error {
-			return targetErr
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
-		assert.EqualError(t, err, targetErr.Error())
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-		assert.Empty(t, rollupEvents)
-	})
-
-	convey.Convey("L1FailedRelayedMessageEventSignature success", t, func() {
-		msgHash := common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log types.Log) error {
-			tmpOut := out.(*bridgeAbi.L1FailedRelayedMessageEvent)
-			tmpOut.MessageHash = msgHash
-			return nil
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
-		assert.NoError(t, err)
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, rollupEvents)
-		assert.Len(t, relayedMessages, 1)
-		assert.Equal(t, relayedMessages[0].msgHash, msgHash)
-	})
-}
-
 func testParseBridgeEventLogsL1CommitBatchEventSignature(t *testing.T) {
 	watcher, db := setupL1Watcher(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 	logs := []types.Log{
 		{
 			Topics:      []common.Hash{bridgeAbi.L1CommitBatchEventSignature},
@@ -437,10 +322,9 @@ func testParseBridgeEventLogsL1CommitBatchEventSignature(t *testing.T) {
 		})
 		defer patchGuard.Reset()
 
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
+		l2Messages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
 		assert.EqualError(t, err, targetErr.Error())
 		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
 		assert.Empty(t, rollupEvents)
 	})
 
@@ -453,10 +337,9 @@ func testParseBridgeEventLogsL1CommitBatchEventSignature(t *testing.T) {
 		})
 		defer patchGuard.Reset()
 
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
+		l2Messages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
 		assert.NoError(t, err)
 		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
 		assert.Len(t, rollupEvents, 1)
 		assert.Equal(t, rollupEvents[0].batchHash, msgHash)
 		assert.Equal(t, rollupEvents[0].status, commonTypes.RollupCommitted)
@@ -465,7 +348,7 @@ func testParseBridgeEventLogsL1CommitBatchEventSignature(t *testing.T) {
 
 func testParseBridgeEventLogsL1FinalizeBatchEventSignature(t *testing.T) {
 	watcher, db := setupL1Watcher(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 	logs := []types.Log{
 		{
 			Topics:      []common.Hash{bridgeAbi.L1FinalizeBatchEventSignature},
@@ -481,10 +364,9 @@ func testParseBridgeEventLogsL1FinalizeBatchEventSignature(t *testing.T) {
 		})
 		defer patchGuard.Reset()
 
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
+		l2Messages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
 		assert.EqualError(t, err, targetErr.Error())
 		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
 		assert.Empty(t, rollupEvents)
 	})
 
@@ -497,10 +379,9 @@ func testParseBridgeEventLogsL1FinalizeBatchEventSignature(t *testing.T) {
 		})
 		defer patchGuard.Reset()
 
-		l2Messages, relayedMessages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
+		l2Messages, rollupEvents, err := watcher.parseBridgeEventLogs(logs)
 		assert.NoError(t, err)
 		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
 		assert.Len(t, rollupEvents, 1)
 		assert.Equal(t, rollupEvents[0].batchHash, msgHash)
 		assert.Equal(t, rollupEvents[0].status, commonTypes.RollupFinalized)

bridge/internal/controller/watcher/l2_watcher.go

@@ -2,7 +2,6 @@ package watcher
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"math/big"
 
@@ -23,7 +22,6 @@ import (
 
 	bridgeAbi "scroll-tech/bridge/abi"
 	"scroll-tech/bridge/internal/orm"
-	bridgeTypes "scroll-tech/bridge/internal/types"
 	"scroll-tech/bridge/internal/utils"
 )
 
@@ -32,8 +30,6 @@ var (
 	bridgeL2MsgsSyncHeightGauge           = gethMetrics.NewRegisteredGauge("bridge/l2/msgs/sync/height", metrics.ScrollRegistry)
 	bridgeL2BlocksFetchedHeightGauge      = gethMetrics.NewRegisteredGauge("bridge/l2/blocks/fetched/height", metrics.ScrollRegistry)
 	bridgeL2BlocksFetchedGapGauge         = gethMetrics.NewRegisteredGauge("bridge/l2/blocks/fetched/gap", metrics.ScrollRegistry)
-	bridgeL2MsgsSentEventsTotalCounter    = gethMetrics.NewRegisteredCounter("bridge/l2/msgs/sent/events/total", metrics.ScrollRegistry)
-	bridgeL2MsgsAppendEventsTotalCounter  = gethMetrics.NewRegisteredCounter("bridge/l2/msgs/append/events/total", metrics.ScrollRegistry)
 	bridgeL2MsgsRelayedEventsTotalCounter = gethMetrics.NewRegisteredCounter("bridge/l2/msgs/relayed/events/total", metrics.ScrollRegistry)
 )
 
@@ -46,7 +42,6 @@ type L2WatcherClient struct {
 
 	l2BlockOrm   *orm.L2Block
 	l1MessageOrm *orm.L1Message
-	l2MessageOrm *orm.L2Message
 
 	confirmations rpc.BlockNumber
 
@@ -65,11 +60,20 @@ type L2WatcherClient struct {
 
 // NewL2WatcherClient take a l2geth instance to generate a l2watcherclient instance
 func NewL2WatcherClient(ctx context.Context, client *ethclient.Client, confirmations rpc.BlockNumber, messengerAddress, messageQueueAddress common.Address, withdrawTrieRootSlot common.Hash, db *gorm.DB) *L2WatcherClient {
-	l2MessageOrm := orm.NewL2Message(db)
-	savedHeight, err := l2MessageOrm.GetLayer2LatestWatchedHeight()
-	if err != nil {
+	l1MessageOrm := orm.NewL1Message(db)
+	var savedHeight uint64
+	l1msg, err := l1MessageOrm.GetLayer1LatestMessageWithLayer2Hash()
+	if err != nil || l1msg == nil {
 		log.Warn("fetch height from db failed", "err", err)
 		savedHeight = 0
+	} else {
+		receipt, err := client.TransactionReceipt(ctx, common.HexToHash(l1msg.Layer2Hash))
+		if err != nil || receipt == nil {
+			log.Warn("get tx from l2 failed", "err", err)
+			savedHeight = 0
+		} else {
+			savedHeight = receipt.BlockNumber.Uint64()
+		}
 	}
 
 	w := L2WatcherClient{
@@ -78,8 +82,7 @@ func NewL2WatcherClient(ctx context.Context, client *ethclient.Client, confirmat
 
 		l2BlockOrm:         orm.NewL2Block(db),
 		l1MessageOrm:       orm.NewL1Message(db),
-		l2MessageOrm:       l2MessageOrm,
-		processedMsgHeight: uint64(savedHeight),
+		processedMsgHeight: savedHeight,
 		confirmations:      confirmations,
 
 		messengerAddress: messengerAddress,
@@ -106,7 +109,7 @@ func (w *L2WatcherClient) TryFetchRunningMissingBlocks(blockHeight uint64) {
 	}
 
 	// Fetch and store block traces for missing blocks
-	for from := uint64(heightInDB) + 1; from <= blockHeight; from += blockTracesFetchLimit {
+	for from := heightInDB + 1; from <= blockHeight; from += blockTracesFetchLimit {
 		to := from + blockTracesFetchLimit - 1
 
 		if to > blockHeight {
@@ -126,10 +129,20 @@ func txsToTxsData(txs gethTypes.Transactions) []*gethTypes.TransactionData {
 	txsData := make([]*gethTypes.TransactionData, len(txs))
 	for i, tx := range txs {
 		v, r, s := tx.RawSignatureValues()
+
+		nonce := tx.Nonce()
+
+		// We need QueueIndex in `NewBatchHeader`. However, `TransactionData`
+		// does not have this field. Since `L1MessageTx` do not have a nonce,
+		// we reuse this field for storing the queue index.
+		if msg := tx.AsL1MessageTx(); msg != nil {
+			nonce = msg.QueueIndex
+		}
+
 		txsData[i] = &gethTypes.TransactionData{
 			Type:     tx.Type(),
 			TxHash:   tx.Hash().String(),
-			Nonce:    tx.Nonce(),
+			Nonce:    nonce,
 			ChainId:  (*hexutil.Big)(tx.ChainId()),
 			Gas:      tx.Gas(),
 			GasPrice: (*hexutil.Big)(tx.GasPrice()),
@@ -146,7 +159,7 @@ func txsToTxsData(txs gethTypes.Transactions) []*gethTypes.TransactionData {
 }
 
 func (w *L2WatcherClient) getAndStoreBlockTraces(ctx context.Context, from, to uint64) error {
-	var blocks []*bridgeTypes.WrappedBlock
+	var blocks []*types.WrappedBlock
 	for number := from; number <= to; number++ {
 		log.Debug("retrieving block", "height", number)
 		block, err2 := w.BlockByNumber(ctx, big.NewInt(int64(number)))
@@ -161,7 +174,7 @@ func (w *L2WatcherClient) getAndStoreBlockTraces(ctx context.Context, from, to u
 			return fmt.Errorf("failed to get withdrawTrieRoot: %v. number: %v", err3, number)
 		}
 
-		blocks = append(blocks, &bridgeTypes.WrappedBlock{
+		blocks = append(blocks, &types.WrappedBlock{
 			Header:           block.Header(),
 			Transactions:     txsToTxsData(block.Transactions()),
 			WithdrawTrieRoot: common.BytesToHash(withdrawTrieRoot),
@@ -227,17 +240,15 @@ func (w *L2WatcherClient) FetchContractEvent() {
 		}
 		log.Info("received new L2 messages", "fromBlock", from, "toBlock", to, "cnt", len(logs))
 
-		sentMessageEvents, relayedMessageEvents, err := w.parseBridgeEventLogs(logs)
+		relayedMessageEvents, err := w.parseBridgeEventLogs(logs)
 		if err != nil {
 			log.Error("failed to parse emitted event log", "err", err)
 			return
 		}
 
-		sentMessageCount := int64(len(sentMessageEvents))
 		relayedMessageCount := int64(len(relayedMessageEvents))
-		bridgeL2MsgsSentEventsTotalCounter.Inc(sentMessageCount)
 		bridgeL2MsgsRelayedEventsTotalCounter.Inc(relayedMessageCount)
-		log.Info("L2 events types", "SentMessageCount", sentMessageCount, "RelayedMessageCount", relayedMessageCount)
+		log.Info("L2 events types", "RelayedMessageCount", relayedMessageCount)
 
 		// Update relayed message first to make sure we don't forget to update submited message.
 		// Since, we always start sync from the latest unprocessed message.
@@ -254,71 +265,24 @@ func (w *L2WatcherClient) FetchContractEvent() {
 			}
 		}
 
-		if err = w.l2MessageOrm.SaveL2Messages(w.ctx, sentMessageEvents); err != nil {
-			log.Error("failed to save l2 messages", "err", err)
-			return
-		}
-
 		w.processedMsgHeight = uint64(to)
 		bridgeL2MsgsSyncHeightGauge.Update(to)
 	}
 }
 
-func (w *L2WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]orm.L2Message, []relayedMessage, error) {
+func (w *L2WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]relayedMessage, error) {
 	// Need use contract abi to parse event Log
 	// Can only be tested after we have our contracts set up
 
-	var l2Messages []orm.L2Message
 	var relayedMessages []relayedMessage
-	var lastAppendMsgHash common.Hash
-	var lastAppendMsgNonce uint64
 	for _, vLog := range logs {
 		switch vLog.Topics[0] {
-		case bridgeAbi.L2SentMessageEventSignature:
-			event := bridgeAbi.L2SentMessageEvent{}
-			err := utils.UnpackLog(w.messengerABI, &event, "SentMessage", vLog)
-			if err != nil {
-				log.Error("failed to unpack layer2 SentMessage event", "err", err)
-				return l2Messages, relayedMessages, err
-			}
-
-			computedMsgHash := utils.ComputeMessageHash(
-				event.Sender,
-				event.Target,
-				event.Value,
-				event.MessageNonce,
-				event.Message,
-			)
-
-			// `AppendMessage` event is always emitted before `SentMessage` event
-			// So they should always match, just double check
-			if event.MessageNonce.Uint64() != lastAppendMsgNonce {
-				errMsg := fmt.Sprintf("l2 message nonces mismatch: AppendMessage.nonce=%v, SentMessage.nonce=%v, tx_hash=%v",
-					lastAppendMsgNonce, event.MessageNonce.Uint64(), vLog.TxHash.Hex())
-				return l2Messages, relayedMessages, errors.New(errMsg)
-			}
-			if computedMsgHash != lastAppendMsgHash {
-				errMsg := fmt.Sprintf("l2 message hashes mismatch: AppendMessage.msg_hash=%v, SentMessage.msg_hash=%v, tx_hash=%v",
-					lastAppendMsgHash.Hex(), computedMsgHash.Hex(), vLog.TxHash.Hex())
-				return l2Messages, relayedMessages, errors.New(errMsg)
-			}
-
-			l2Messages = append(l2Messages, orm.L2Message{
-				Nonce:      event.MessageNonce.Uint64(),
-				MsgHash:    computedMsgHash.String(),
-				Height:     vLog.BlockNumber,
-				Sender:     event.Sender.String(),
-				Value:      event.Value.String(),
-				Target:     event.Target.String(),
-				Calldata:   common.Bytes2Hex(event.Message),
-				Layer2Hash: vLog.TxHash.Hex(),
-			})
 		case bridgeAbi.L2RelayedMessageEventSignature:
 			event := bridgeAbi.L2RelayedMessageEvent{}
 			err := utils.UnpackLog(w.messengerABI, &event, "RelayedMessage", vLog)
 			if err != nil {
 				log.Warn("Failed to unpack layer2 RelayedMessage event", "err", err)
-				return l2Messages, relayedMessages, err
+				return relayedMessages, err
 			}
 
 			relayedMessages = append(relayedMessages, relayedMessage{
@@ -331,7 +295,7 @@ func (w *L2WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]orm.L2Me
 			err := utils.UnpackLog(w.messengerABI, &event, "FailedRelayedMessage", vLog)
 			if err != nil {
 				log.Warn("Failed to unpack layer2 FailedRelayedMessage event", "err", err)
-				return l2Messages, relayedMessages, err
+				return relayedMessages, err
 			}
 
 			relayedMessages = append(relayedMessages, relayedMessage{
@@ -339,21 +303,9 @@ func (w *L2WatcherClient) parseBridgeEventLogs(logs []gethTypes.Log) ([]orm.L2Me
 				txHash:       vLog.TxHash,
 				isSuccessful: false,
 			})
-		case bridgeAbi.L2AppendMessageEventSignature:
-			event := bridgeAbi.L2AppendMessageEvent{}
-			err := utils.UnpackLog(w.messageQueueABI, &event, "AppendMessage", vLog)
-			if err != nil {
-				log.Warn("Failed to unpack layer2 AppendMessage event", "err", err)
-				return l2Messages, relayedMessages, err
-			}
-
-			lastAppendMsgHash = event.MessageHash
-			lastAppendMsgNonce = event.Index.Uint64()
-			bridgeL2MsgsAppendEventsTotalCounter.Inc(1)
-		default:
 			log.Error("Unknown event", "topic", vLog.Topics[0], "txHash", vLog.TxHash)
 		}
 	}
 
-	return l2Messages, relayedMessages, nil
+	return relayedMessages, nil
 }

bridge/internal/controller/watcher/l2_watcher_test.go

@@ -21,7 +21,7 @@ import (
 	"github.com/smartystreets/goconvey/convey"
 	"github.com/stretchr/testify/assert"
 
-	"scroll-tech/common/types"
+	"scroll-tech/common/database"
 	cutils "scroll-tech/common/utils"
 
 	bridgeAbi "scroll-tech/bridge/abi"
@@ -43,7 +43,7 @@ func testCreateNewWatcherAndStop(t *testing.T) {
 	subCtx, cancel := context.WithCancel(context.Background())
 	defer func() {
 		cancel()
-		defer utils.CloseDB(db)
+		defer database.CloseDB(db)
 	}()
 
 	loopToFetchEvent(subCtx, wc)
@@ -67,140 +67,9 @@ func testCreateNewWatcherAndStop(t *testing.T) {
 	assert.GreaterOrEqual(t, blockNum, uint64(numTransactions))
 }
 
-func testMonitorBridgeContract(t *testing.T) {
-	wc, db := setupL2Watcher(t)
-	subCtx, cancel := context.WithCancel(context.Background())
-	defer func() {
-		cancel()
-		defer utils.CloseDB(db)
-	}()
-
-	loopToFetchEvent(subCtx, wc)
-
-	previousHeight, err := l2Cli.BlockNumber(context.Background())
-	assert.NoError(t, err)
-
-	auth := prepareAuth(t, l2Cli, cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys[0])
-
-	// deploy mock bridge
-	_, tx, instance, err := mock_bridge.DeployMockBridgeL2(auth, l2Cli)
-	assert.NoError(t, err)
-	address, err := bind.WaitDeployed(context.Background(), l2Cli, tx)
-	assert.NoError(t, err)
-
-	rc := prepareWatcherClient(l2Cli, db, address)
-	loopToFetchEvent(subCtx, rc)
-	// Call mock_bridge instance sendMessage to trigger emit events
-	toAddress := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
-	message := []byte("testbridgecontract")
-	fee := big.NewInt(0)
-	gasLimit := big.NewInt(1)
-
-	tx, err = instance.SendMessage(auth, toAddress, fee, message, gasLimit)
-	assert.NoError(t, err)
-	receipt, err := bind.WaitMined(context.Background(), l2Cli, tx)
-	if receipt.Status != gethTypes.ReceiptStatusSuccessful || err != nil {
-		t.Fatalf("Call failed")
-	}
-
-	// extra block mined
-	toAddress = common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
-	message = []byte("testbridgecontract")
-	tx, err = instance.SendMessage(auth, toAddress, fee, message, gasLimit)
-	assert.NoError(t, err)
-	receipt, err = bind.WaitMined(context.Background(), l2Cli, tx)
-	if receipt.Status != gethTypes.ReceiptStatusSuccessful || err != nil {
-		t.Fatalf("Call failed")
-	}
-
-	l2MessageOrm := orm.NewL2Message(db)
-	// check if we successfully stored events
-	assert.True(t, cutils.TryTimes(10, func() bool {
-		height, err := l2MessageOrm.GetLayer2LatestWatchedHeight()
-		return err == nil && height > int64(previousHeight)
-	}))
-
-	// check l1 messages.
-	assert.True(t, cutils.TryTimes(10, func() bool {
-		msgs, err := l2MessageOrm.GetL2Messages(map[string]interface{}{"status": types.MsgPending}, nil, 0)
-		return err == nil && len(msgs) == 2
-	}))
-}
-
-func testFetchMultipleSentMessageInOneBlock(t *testing.T) {
-	_, db := setupL2Watcher(t)
-	subCtx, cancel := context.WithCancel(context.Background())
-	defer func() {
-		cancel()
-		defer utils.CloseDB(db)
-	}()
-
-	previousHeight, err := l2Cli.BlockNumber(context.Background()) // shallow the global previousHeight
-	assert.NoError(t, err)
-
-	auth := prepareAuth(t, l2Cli, cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys[0])
-
-	_, trx, instance, err := mock_bridge.DeployMockBridgeL2(auth, l2Cli)
-	assert.NoError(t, err)
-	address, err := bind.WaitDeployed(context.Background(), l2Cli, trx)
-	assert.NoError(t, err)
-
-	wc := prepareWatcherClient(l2Cli, db, address)
-	loopToFetchEvent(subCtx, wc)
-
-	// Call mock_bridge instance sendMessage to trigger emit events multiple times
-	numTransactions := 4
-	var tx *gethTypes.Transaction
-	for i := 0; i < numTransactions; i++ {
-		addr := common.HexToAddress("0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63")
-		nonce, nounceErr := l2Cli.PendingNonceAt(context.Background(), addr)
-		assert.NoError(t, nounceErr)
-		auth.Nonce = big.NewInt(int64(nonce))
-		toAddress := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
-		message := []byte("testbridgecontract")
-		fee := big.NewInt(0)
-		gasLimit := big.NewInt(1)
-		tx, err = instance.SendMessage(auth, toAddress, fee, message, gasLimit)
-		assert.NoError(t, err)
-	}
-
-	receipt, err := bind.WaitMined(context.Background(), l2Cli, tx)
-	if receipt.Status != gethTypes.ReceiptStatusSuccessful || err != nil {
-		t.Fatalf("Call failed")
-	}
-
-	// extra block mined
-	addr := common.HexToAddress("0x1c5a77d9fa7ef466951b2f01f724bca3a5820b63")
-	nonce, nounceErr := l2Cli.PendingNonceAt(context.Background(), addr)
-	assert.NoError(t, nounceErr)
-	auth.Nonce = big.NewInt(int64(nonce))
-	toAddress := common.HexToAddress("0x4592d8f8d7b001e72cb26a73e4fa1806a51ac79d")
-	message := []byte("testbridgecontract")
-	fee := big.NewInt(0)
-	gasLimit := big.NewInt(1)
-	tx, err = instance.SendMessage(auth, toAddress, fee, message, gasLimit)
-	assert.NoError(t, err)
-	receipt, err = bind.WaitMined(context.Background(), l2Cli, tx)
-	if receipt.Status != gethTypes.ReceiptStatusSuccessful || err != nil {
-		t.Fatalf("Call failed")
-	}
-
-	l2MessageOrm := orm.NewL2Message(db)
-	// check if we successfully stored events
-	assert.True(t, cutils.TryTimes(10, func() bool {
-		height, err := l2MessageOrm.GetLayer2LatestWatchedHeight()
-		return err == nil && height > int64(previousHeight)
-	}))
-
-	assert.True(t, cutils.TryTimes(10, func() bool {
-		msgs, err := l2MessageOrm.GetL2Messages(map[string]interface{}{"status": types.MsgPending}, nil, 0)
-		return err == nil && len(msgs) == 5
-	}))
-}
-
 func testFetchRunningMissingBlocks(t *testing.T) {
 	_, db := setupL2Watcher(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	auth := prepareAuth(t, l2Cli, cfg.L2Config.RelayerConfig.MessageSenderPrivateKeys[0])
 
@@ -219,7 +88,7 @@ func testFetchRunningMissingBlocks(t *testing.T) {
 		wc := prepareWatcherClient(l2Cli, db, address)
 		wc.TryFetchRunningMissingBlocks(latestHeight)
 		fetchedHeight, err := l2BlockOrm.GetL2BlocksLatestHeight(context.Background())
-		return err == nil && uint64(fetchedHeight) == latestHeight
+		return err == nil && fetchedHeight == latestHeight
 	})
 	assert.True(t, ok)
 }
@@ -244,60 +113,9 @@ func loopToFetchEvent(subCtx context.Context, watcher *L2WatcherClient) {
 	go cutils.Loop(subCtx, 2*time.Second, watcher.FetchContractEvent)
 }
 
-func testParseBridgeEventLogsL2SentMessageEventSignature(t *testing.T) {
-	watcher, db := setupL2Watcher(t)
-	defer utils.CloseDB(db)
-
-	logs := []gethTypes.Log{
-		{
-			Topics: []common.Hash{
-				bridgeAbi.L2SentMessageEventSignature,
-			},
-			BlockNumber: 100,
-			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-		},
-	}
-
-	convey.Convey("unpack SentMessage log failure", t, func() {
-		targetErr := errors.New("UnpackLog SentMessage failure")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log gethTypes.Log) error {
-			return targetErr
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, err := watcher.parseBridgeEventLogs(logs)
-		assert.EqualError(t, err, targetErr.Error())
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-	})
-
-	convey.Convey("L2SentMessageEventSignature success", t, func() {
-		tmpSendAddr := common.HexToAddress("0xb4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d30")
-		tmpTargetAddr := common.HexToAddress("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5")
-		tmpValue := big.NewInt(1000)
-		tmpMessageNonce := big.NewInt(100)
-		tmpMessage := []byte("test for L2SentMessageEventSignature")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log gethTypes.Log) error {
-			tmpOut := out.(*bridgeAbi.L2SentMessageEvent)
-			tmpOut.Sender = tmpSendAddr
-			tmpOut.Value = tmpValue
-			tmpOut.Target = tmpTargetAddr
-			tmpOut.MessageNonce = tmpMessageNonce
-			tmpOut.Message = tmpMessage
-			return nil
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, err := watcher.parseBridgeEventLogs(logs)
-		assert.Error(t, err)
-		assert.Empty(t, relayedMessages)
-		assert.Empty(t, l2Messages)
-	})
-}
-
 func testParseBridgeEventLogsL2RelayedMessageEventSignature(t *testing.T) {
 	watcher, db := setupL2Watcher(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	logs := []gethTypes.Log{
 		{
@@ -314,9 +132,8 @@ func testParseBridgeEventLogsL2RelayedMessageEventSignature(t *testing.T) {
 		})
 		defer patchGuard.Reset()
 
-		l2Messages, relayedMessages, err := watcher.parseBridgeEventLogs(logs)
+		relayedMessages, err := watcher.parseBridgeEventLogs(logs)
 		assert.EqualError(t, err, targetErr.Error())
-		assert.Empty(t, l2Messages)
 		assert.Empty(t, relayedMessages)
 	})
 
@@ -329,9 +146,8 @@ func testParseBridgeEventLogsL2RelayedMessageEventSignature(t *testing.T) {
 		})
 		defer patchGuard.Reset()
 
-		l2Messages, relayedMessages, err := watcher.parseBridgeEventLogs(logs)
+		relayedMessages, err := watcher.parseBridgeEventLogs(logs)
 		assert.NoError(t, err)
-		assert.Empty(t, l2Messages)
 		assert.Len(t, relayedMessages, 1)
 		assert.Equal(t, relayedMessages[0].msgHash, msgHash)
 	})
@@ -339,7 +155,7 @@ func testParseBridgeEventLogsL2RelayedMessageEventSignature(t *testing.T) {
 
 func testParseBridgeEventLogsL2FailedRelayedMessageEventSignature(t *testing.T) {
 	watcher, db := setupL2Watcher(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	logs := []gethTypes.Log{
 		{
@@ -356,9 +172,8 @@ func testParseBridgeEventLogsL2FailedRelayedMessageEventSignature(t *testing.T)
 		})
 		defer patchGuard.Reset()
 
-		l2Messages, relayedMessages, err := watcher.parseBridgeEventLogs(logs)
+		relayedMessages, err := watcher.parseBridgeEventLogs(logs)
 		assert.EqualError(t, err, targetErr.Error())
-		assert.Empty(t, l2Messages)
 		assert.Empty(t, relayedMessages)
 	})
 
@@ -371,51 +186,9 @@ func testParseBridgeEventLogsL2FailedRelayedMessageEventSignature(t *testing.T)
 		})
 		defer patchGuard.Reset()
 
-		l2Messages, relayedMessages, err := watcher.parseBridgeEventLogs(logs)
+		relayedMessages, err := watcher.parseBridgeEventLogs(logs)
 		assert.NoError(t, err)
-		assert.Empty(t, l2Messages)
 		assert.Len(t, relayedMessages, 1)
 		assert.Equal(t, relayedMessages[0].msgHash, msgHash)
 	})
 }
-
-func testParseBridgeEventLogsL2AppendMessageEventSignature(t *testing.T) {
-	watcher, db := setupL2Watcher(t)
-	defer utils.CloseDB(db)
-	logs := []gethTypes.Log{
-		{
-			Topics:      []common.Hash{bridgeAbi.L2AppendMessageEventSignature},
-			BlockNumber: 100,
-			TxHash:      common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-		},
-	}
-
-	convey.Convey("unpack AppendMessage log failure", t, func() {
-		targetErr := errors.New("UnpackLog AppendMessage failure")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log gethTypes.Log) error {
-			return targetErr
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, err := watcher.parseBridgeEventLogs(logs)
-		assert.EqualError(t, err, targetErr.Error())
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-	})
-
-	convey.Convey("L2AppendMessageEventSignature success", t, func() {
-		msgHash := common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5")
-		patchGuard := gomonkey.ApplyFunc(utils.UnpackLog, func(c *abi.ABI, out interface{}, event string, log gethTypes.Log) error {
-			tmpOut := out.(*bridgeAbi.L2AppendMessageEvent)
-			tmpOut.MessageHash = msgHash
-			tmpOut.Index = big.NewInt(100)
-			return nil
-		})
-		defer patchGuard.Reset()
-
-		l2Messages, relayedMessages, err := watcher.parseBridgeEventLogs(logs)
-		assert.NoError(t, err)
-		assert.Empty(t, l2Messages)
-		assert.Empty(t, relayedMessages)
-	})
-}

bridge/internal/controller/watcher/watcher_test.go

@@ -9,12 +9,13 @@ import (
 	"github.com/stretchr/testify/assert"
 	"gorm.io/gorm"
 
+	"scroll-tech/common/database"
 	"scroll-tech/common/docker"
+	"scroll-tech/common/types"
+
+	"scroll-tech/database/migrate"
 
 	"scroll-tech/bridge/internal/config"
-	"scroll-tech/bridge/internal/orm/migrate"
-	bridgeTypes "scroll-tech/bridge/internal/types"
-	"scroll-tech/bridge/internal/utils"
 )
 
 var (
@@ -27,8 +28,8 @@ var (
 	l2Cli *ethclient.Client
 
 	// block trace
-	wrappedBlock1 *bridgeTypes.WrappedBlock
-	wrappedBlock2 *bridgeTypes.WrappedBlock
+	wrappedBlock1 *types.WrappedBlock
+	wrappedBlock2 *types.WrappedBlock
 )
 
 func setupEnv(t *testing.T) (err error) {
@@ -40,7 +41,7 @@ func setupEnv(t *testing.T) (err error) {
 
 	cfg.L2Config.RelayerConfig.SenderConfig.Endpoint = base.L1gethImg.Endpoint()
 	cfg.L1Config.RelayerConfig.SenderConfig.Endpoint = base.L2gethImg.Endpoint()
-	cfg.DBConfig = &config.DBConfig{
+	cfg.DBConfig = &database.Config{
 		DSN:        base.DBConfig.DSN,
 		DriverName: base.DBConfig.DriverName,
 		MaxOpenNum: base.DBConfig.MaxOpenNum,
@@ -56,7 +57,7 @@ func setupEnv(t *testing.T) (err error) {
 		return err
 	}
 	// unmarshal blockTrace
-	wrappedBlock1 = &bridgeTypes.WrappedBlock{}
+	wrappedBlock1 = &types.WrappedBlock{}
 	if err = json.Unmarshal(templateBlockTrace1, wrappedBlock1); err != nil {
 		return err
 	}
@@ -66,7 +67,7 @@ func setupEnv(t *testing.T) (err error) {
 		return err
 	}
 	// unmarshal blockTrace
-	wrappedBlock2 = &bridgeTypes.WrappedBlock{}
+	wrappedBlock2 = &types.WrappedBlock{}
 	if err = json.Unmarshal(templateBlockTrace2, wrappedBlock2); err != nil {
 		return err
 	}
@@ -74,7 +75,7 @@ func setupEnv(t *testing.T) (err error) {
 }
 
 func setupDB(t *testing.T) *gorm.DB {
-	db, err := utils.InitDB(cfg.DBConfig)
+	db, err := database.InitDB(cfg.DBConfig)
 	assert.NoError(t, err)
 	sqlDB, err := db.DB()
 	assert.NoError(t, err)
@@ -100,20 +101,14 @@ func TestFunction(t *testing.T) {
 	t.Run("TestL1WatcherClientFetchBlockHeader", testL1WatcherClientFetchBlockHeader)
 	t.Run("TestL1WatcherClientFetchContractEvent", testL1WatcherClientFetchContractEvent)
 	t.Run("TestParseBridgeEventLogsL1QueueTransactionEventSignature", testParseBridgeEventLogsL1QueueTransactionEventSignature)
-	t.Run("TestParseBridgeEventLogsL1RelayedMessageEventSignature", testParseBridgeEventLogsL1RelayedMessageEventSignature)
-	t.Run("TestParseBridgeEventLogsL1FailedRelayedMessageEventSignature", testParseBridgeEventLogsL1FailedRelayedMessageEventSignature)
 	t.Run("TestParseBridgeEventLogsL1CommitBatchEventSignature", testParseBridgeEventLogsL1CommitBatchEventSignature)
 	t.Run("TestParseBridgeEventLogsL1FinalizeBatchEventSignature", testParseBridgeEventLogsL1FinalizeBatchEventSignature)
 
 	// Run l2 watcher test cases.
 	t.Run("TestCreateNewWatcherAndStop", testCreateNewWatcherAndStop)
-	t.Run("TestMonitorBridgeContract", testMonitorBridgeContract)
-	t.Run("TestFetchMultipleSentMessageInOneBlock", testFetchMultipleSentMessageInOneBlock)
 	t.Run("TestFetchRunningMissingBlocks", testFetchRunningMissingBlocks)
-	t.Run("TestParseBridgeEventLogsL2SentMessageEventSignature", testParseBridgeEventLogsL2SentMessageEventSignature)
 	t.Run("TestParseBridgeEventLogsL2RelayedMessageEventSignature", testParseBridgeEventLogsL2RelayedMessageEventSignature)
 	t.Run("TestParseBridgeEventLogsL2FailedRelayedMessageEventSignature", testParseBridgeEventLogsL2FailedRelayedMessageEventSignature)
-	t.Run("TestParseBridgeEventLogsL2AppendMessageEventSignature", testParseBridgeEventLogsL2AppendMessageEventSignature)
 
 	// Run chunk-proposer test cases.
 	t.Run("TestChunkProposer", testChunkProposer)

bridge/internal/orm/batch.go

@@ -10,8 +10,6 @@ import (
 	"scroll-tech/common/types"
 	"scroll-tech/common/types/message"
 
-	bridgeTypes "scroll-tech/bridge/internal/types"
-
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/log"
 	"gorm.io/gorm"
@@ -35,11 +33,12 @@ type Batch struct {
 	BatchHeader     []byte `json:"batch_header" gorm:"column:batch_header"`
 
 	// proof
-	ProvingStatus    int16      `json:"proving_status" gorm:"column:proving_status;default:1"`
-	Proof            []byte     `json:"proof" gorm:"column:proof;default:NULL"`
-	ProverAssignedAt *time.Time `json:"prover_assigned_at" gorm:"column:prover_assigned_at;default:NULL"`
-	ProvedAt         *time.Time `json:"proved_at" gorm:"column:proved_at;default:NULL"`
-	ProofTimeSec     int        `json:"proof_time_sec" gorm:"column:proof_time_sec;default:NULL"`
+	ChunkProofsStatus int16      `json:"chunk_proofs_status" gorm:"column:chunk_proofs_status;default:1"`
+	ProvingStatus     int16      `json:"proving_status" gorm:"column:proving_status;default:1"`
+	Proof             []byte     `json:"proof" gorm:"column:proof;default:NULL"`
+	ProverAssignedAt  *time.Time `json:"prover_assigned_at" gorm:"column:prover_assigned_at;default:NULL"`
+	ProvedAt          *time.Time `json:"proved_at" gorm:"column:proved_at;default:NULL"`
+	ProofTimeSec      int32      `json:"proof_time_sec" gorm:"column:proof_time_sec;default:NULL"`
 
 	// rollup
 	RollupStatus   int16      `json:"rollup_status" gorm:"column:rollup_status;default:1"`
@@ -72,6 +71,7 @@ func (*Batch) TableName() string {
 // The returned batches are sorted in ascending order by their index.
 func (o *Batch) GetBatches(ctx context.Context, fields map[string]interface{}, orderByList []string, limit int) ([]*Batch, error) {
 	db := o.db.WithContext(ctx)
+	db = db.Model(&Batch{})
 
 	for key, value := range fields {
 		db = db.Where(key, value)
@@ -89,44 +89,51 @@ func (o *Batch) GetBatches(ctx context.Context, fields map[string]interface{}, o
 
 	var batches []*Batch
 	if err := db.Find(&batches).Error; err != nil {
-		return nil, err
+		return nil, fmt.Errorf("Batch.GetBatches error: %w, fields: %v, orderByList: %v", err, fields, orderByList)
 	}
 	return batches, nil
 }
 
 // GetBatchCount retrieves the total number of batches in the database.
 func (o *Batch) GetBatchCount(ctx context.Context) (uint64, error) {
+	db := o.db.WithContext(ctx)
+	db = db.Model(&Batch{})
+
 	var count int64
-	err := o.db.WithContext(ctx).Model(&Batch{}).Count(&count).Error
-	if err != nil {
-		return 0, err
+	if err := db.Count(&count).Error; err != nil {
+		return 0, fmt.Errorf("Batch.GetBatchCount error: %w", err)
 	}
 	return uint64(count), nil
 }
 
 // GetVerifiedProofByHash retrieves the verified aggregate proof for a batch with the given hash.
 func (o *Batch) GetVerifiedProofByHash(ctx context.Context, hash string) (*message.AggProof, error) {
+	db := o.db.WithContext(ctx)
+	db = db.Model(&Batch{})
+	db = db.Select("proof")
+	db = db.Where("hash = ? AND proving_status = ?", hash, types.ProvingTaskVerified)
+
 	var batch Batch
-	err := o.db.WithContext(ctx).Where("hash = ? AND proving_status = ?", hash, types.ProvingTaskVerified).First(&batch).Error
-	if err != nil {
-		return nil, err
+	if err := db.Find(&batch).Error; err != nil {
+		return nil, fmt.Errorf("Batch.GetVerifiedProofByHash error: %w, batch hash: %v", err, hash)
 	}
 
 	var proof message.AggProof
-	err = json.Unmarshal(batch.Proof, &proof)
-	if err != nil {
-		return nil, err
+	if err := json.Unmarshal(batch.Proof, &proof); err != nil {
+		return nil, fmt.Errorf("Batch.GetVerifiedProofByHash error: %w, batch hash: %v", err, hash)
 	}
-
 	return &proof, nil
 }
 
 // GetLatestBatch retrieves the latest batch from the database.
 func (o *Batch) GetLatestBatch(ctx context.Context) (*Batch, error) {
+	db := o.db.WithContext(ctx)
+	db = db.Model(&Batch{})
+	db = db.Order("index desc")
+
 	var latestBatch Batch
-	err := o.db.WithContext(ctx).Order("index desc").First(&latestBatch).Error
-	if err != nil {
-		return nil, err
+	if err := db.First(&latestBatch).Error; err != nil {
+		return nil, fmt.Errorf("Batch.GetLatestBatch error: %w", err)
 	}
 	return &latestBatch, nil
 }
@@ -134,13 +141,17 @@ func (o *Batch) GetLatestBatch(ctx context.Context) (*Batch, error) {
 // GetRollupStatusByHashList retrieves the rollup statuses for a list of batch hashes.
 func (o *Batch) GetRollupStatusByHashList(ctx context.Context, hashes []string) ([]types.RollupStatus, error) {
 	if len(hashes) == 0 {
-		return []types.RollupStatus{}, nil
+		return nil, nil
 	}
 
+	db := o.db.WithContext(ctx)
+	db = db.Model(&Batch{})
+	db = db.Select("hash, rollup_status")
+	db = db.Where("hash IN ?", hashes)
+
 	var batches []Batch
-	err := o.db.WithContext(ctx).Where("hash IN ?", hashes).Find(&batches).Error
-	if err != nil {
-		return nil, err
+	if err := db.Find(&batches).Error; err != nil {
+		return nil, fmt.Errorf("Batch.GetRollupStatusByHashList error: %w, hashes: %v", err, hashes)
 	}
 
 	hashToStatusMap := make(map[string]types.RollupStatus)
@@ -152,7 +163,7 @@ func (o *Batch) GetRollupStatusByHashList(ctx context.Context, hashes []string)
 	for _, hash := range hashes {
 		status, ok := hashToStatusMap[hash]
 		if !ok {
-			return nil, fmt.Errorf("hash not found in database: %s", hash)
+			return nil, fmt.Errorf("Batch.GetRollupStatusByHashList: hash not found in database: %s", hash)
 		}
 		statuses = append(statuses, status)
 	}
@@ -167,40 +178,40 @@ func (o *Batch) GetPendingBatches(ctx context.Context, limit int) ([]*Batch, err
 		return nil, errors.New("limit must be greater than zero")
 	}
 
-	var batches []*Batch
 	db := o.db.WithContext(ctx)
+	db = db.Model(&Batch{})
+	db = db.Where("rollup_status = ?", types.RollupPending)
+	db = db.Order("index ASC")
+	db = db.Limit(limit)
 
-	db = db.Where("rollup_status = ?", types.RollupPending).Order("index ASC").Limit(limit)
-
+	var batches []*Batch
 	if err := db.Find(&batches).Error; err != nil {
-		return nil, err
+		return nil, fmt.Errorf("Batch.GetPendingBatches error: %w", err)
 	}
 	return batches, nil
 }
 
 // GetBatchByIndex retrieves the batch by the given index.
 func (o *Batch) GetBatchByIndex(ctx context.Context, index uint64) (*Batch, error) {
+	db := o.db.WithContext(ctx)
+	db = db.Model(&Batch{})
+	db = db.Where("index = ?", index)
+
 	var batch Batch
-	err := o.db.WithContext(ctx).Where("index = ?", index).First(&batch).Error
-	if err != nil {
-		return nil, err
+	if err := db.First(&batch).Error; err != nil {
+		return nil, fmt.Errorf("Batch.GetBatchByIndex error: %w, index: %v", err, index)
 	}
 	return &batch, nil
 }
 
 // InsertBatch inserts a new batch into the database.
-func (o *Batch) InsertBatch(ctx context.Context, startChunkIndex, endChunkIndex uint64, startChunkHash, endChunkHash string, chunks []*bridgeTypes.Chunk, dbTX ...*gorm.DB) (*Batch, error) {
+func (o *Batch) InsertBatch(ctx context.Context, startChunkIndex, endChunkIndex uint64, startChunkHash, endChunkHash string, chunks []*types.Chunk, dbTX ...*gorm.DB) (*Batch, error) {
 	if len(chunks) == 0 {
 		return nil, errors.New("invalid args")
 	}
 
-	db := o.db
-	if len(dbTX) > 0 && dbTX[0] != nil {
-		db = dbTX[0]
-	}
-
 	parentBatch, err := o.GetLatestBatch(ctx)
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+	if err != nil && !errors.Is(errors.Unwrap(err), gorm.ErrRecordNotFound) {
 		log.Error("failed to get the latest batch", "err", err)
 		return nil, err
 	}
@@ -217,8 +228,8 @@ func (o *Batch) InsertBatch(ctx context.Context, startChunkIndex, endChunkIndex
 		batchIndex = parentBatch.Index + 1
 		parentBatchHash = common.HexToHash(parentBatch.Hash)
 
-		var parentBatchHeader *bridgeTypes.BatchHeader
-		parentBatchHeader, err = bridgeTypes.DecodeBatchHeader(parentBatch.BatchHeader)
+		var parentBatchHeader *types.BatchHeader
+		parentBatchHeader, err = types.DecodeBatchHeader(parentBatch.BatchHeader)
 		if err != nil {
 			log.Error("failed to decode parent batch header", "index", parentBatch.Index, "hash", parentBatch.Hash, "err", err)
 			return nil, err
@@ -228,7 +239,7 @@ func (o *Batch) InsertBatch(ctx context.Context, startChunkIndex, endChunkIndex
 		version = parentBatchHeader.Version()
 	}
 
-	batchHeader, err := bridgeTypes.NewBatchHeader(version, batchIndex, totalL1MessagePoppedBefore, parentBatchHash, chunks)
+	batchHeader, err := types.NewBatchHeader(version, batchIndex, totalL1MessagePoppedBefore, parentBatchHash, chunks)
 	if err != nil {
 		log.Error("failed to create batch header",
 			"index", batchIndex, "total l1 message popped before", totalL1MessagePoppedBefore,
@@ -240,59 +251,53 @@ func (o *Batch) InsertBatch(ctx context.Context, startChunkIndex, endChunkIndex
 	lastChunkBlockNum := len(chunks[numChunks-1].Blocks)
 
 	newBatch := Batch{
-		Index:           batchIndex,
-		Hash:            batchHeader.Hash().Hex(),
-		StartChunkHash:  startChunkHash,
-		StartChunkIndex: startChunkIndex,
-		EndChunkHash:    endChunkHash,
-		EndChunkIndex:   endChunkIndex,
-		StateRoot:       chunks[numChunks-1].Blocks[lastChunkBlockNum-1].Header.Root.Hex(),
-		WithdrawRoot:    chunks[numChunks-1].Blocks[lastChunkBlockNum-1].WithdrawTrieRoot.Hex(),
-		BatchHeader:     batchHeader.Encode(),
-		ProvingStatus:   int16(types.ProvingTaskUnassigned),
-		RollupStatus:    int16(types.RollupPending),
+		Index:             batchIndex,
+		Hash:              batchHeader.Hash().Hex(),
+		StartChunkHash:    startChunkHash,
+		StartChunkIndex:   startChunkIndex,
+		EndChunkHash:      endChunkHash,
+		EndChunkIndex:     endChunkIndex,
+		StateRoot:         chunks[numChunks-1].Blocks[lastChunkBlockNum-1].Header.Root.Hex(),
+		WithdrawRoot:      chunks[numChunks-1].Blocks[lastChunkBlockNum-1].WithdrawTrieRoot.Hex(),
+		BatchHeader:       batchHeader.Encode(),
+		ChunkProofsStatus: int16(types.ChunkProofsStatusPending),
+		ProvingStatus:     int16(types.ProvingTaskUnassigned),
+		RollupStatus:      int16(types.RollupPending),
+		OracleStatus:      int16(types.GasOraclePending),
 	}
 
-	if err := db.WithContext(ctx).Create(&newBatch).Error; err != nil {
+	db := o.db
+	if len(dbTX) > 0 && dbTX[0] != nil {
+		db = dbTX[0]
+	}
+	db.WithContext(ctx)
+	db = db.Model(&Batch{})
+
+	if err := db.Create(&newBatch).Error; err != nil {
 		log.Error("failed to insert batch", "batch", newBatch, "err", err)
-		return nil, err
+		return nil, fmt.Errorf("Batch.InsertBatch error: %w", err)
 	}
-
 	return &newBatch, nil
 }
 
-// UpdateSkippedBatches updates the skipped batches in the database.
-func (o *Batch) UpdateSkippedBatches(ctx context.Context) (uint64, error) {
-	provingStatusList := []interface{}{
-		int(types.ProvingTaskSkipped),
-		int(types.ProvingTaskFailed),
-	}
-	result := o.db.Model(&Batch{}).Where("rollup_status", int(types.RollupCommitted)).
-		Where("proving_status IN (?)", provingStatusList).Update("rollup_status", int(types.RollupFinalizationSkipped))
-	if result.Error != nil {
-		return 0, result.Error
-	}
-	return uint64(result.RowsAffected), nil
-}
-
 // UpdateL2GasOracleStatusAndOracleTxHash updates the L2 gas oracle status and transaction hash for a batch.
 func (o *Batch) UpdateL2GasOracleStatusAndOracleTxHash(ctx context.Context, hash string, status types.GasOracleStatus, txHash string) error {
 	updateFields := make(map[string]interface{})
 	updateFields["oracle_status"] = int(status)
 	updateFields["oracle_tx_hash"] = txHash
-	if err := o.db.WithContext(ctx).Model(&Batch{}).Where("hash", hash).Updates(updateFields).Error; err != nil {
-		return err
+
+	db := o.db.WithContext(ctx)
+	db = db.Model(&Batch{})
+	db = db.Where("hash", hash)
+
+	if err := db.Updates(updateFields).Error; err != nil {
+		return fmt.Errorf("Batch.UpdateL2GasOracleStatusAndOracleTxHash error: %w, batch hash: %v, status: %v, txHash: %v", err, hash, status.String(), txHash)
 	}
 	return nil
 }
 
 // UpdateProvingStatus updates the proving status of a batch.
 func (o *Batch) UpdateProvingStatus(ctx context.Context, hash string, status types.ProvingStatus, dbTX ...*gorm.DB) error {
-	db := o.db
-	if len(dbTX) > 0 && dbTX[0] != nil {
-		db = dbTX[0]
-	}
-
 	updateFields := make(map[string]interface{})
 	updateFields["proving_status"] = int(status)
 
@@ -303,22 +308,24 @@ func (o *Batch) UpdateProvingStatus(ctx context.Context, hash string, status typ
 		updateFields["prover_assigned_at"] = nil
 	case types.ProvingTaskProved, types.ProvingTaskVerified:
 		updateFields["proved_at"] = time.Now()
-	default:
 	}
 
-	if err := db.Model(&Batch{}).Where("hash", hash).Updates(updateFields).Error; err != nil {
-		return err
+	db := o.db
+	if len(dbTX) > 0 && dbTX[0] != nil {
+		db = dbTX[0]
+	}
+	db = db.WithContext(ctx)
+	db = db.Model(&Batch{})
+	db = db.Where("hash", hash)
+
+	if err := db.Updates(updateFields).Error; err != nil {
+		return fmt.Errorf("Batch.UpdateProvingStatus error: %w, batch hash: %v, status: %v", err, hash, status.String())
 	}
 	return nil
 }
 
 // UpdateRollupStatus updates the rollup status of a batch.
 func (o *Batch) UpdateRollupStatus(ctx context.Context, hash string, status types.RollupStatus, dbTX ...*gorm.DB) error {
-	db := o.db
-	if len(dbTX) > 0 && dbTX[0] != nil {
-		db = dbTX[0]
-	}
-
 	updateFields := make(map[string]interface{})
 	updateFields["rollup_status"] = int(status)
 
@@ -328,8 +335,17 @@ func (o *Batch) UpdateRollupStatus(ctx context.Context, hash string, status type
 	case types.RollupFinalized:
 		updateFields["finalized_at"] = time.Now()
 	}
-	if err := db.Model(&Batch{}).WithContext(ctx).Where("hash", hash).Updates(updateFields).Error; err != nil {
-		return err
+
+	db := o.db
+	if len(dbTX) > 0 && dbTX[0] != nil {
+		db = dbTX[0]
+	}
+	db = db.WithContext(ctx)
+	db = db.Model(&Batch{})
+	db = db.Where("hash", hash)
+
+	if err := db.Updates(updateFields).Error; err != nil {
+		return fmt.Errorf("Batch.UpdateRollupStatus error: %w, batch hash: %v, status: %v", err, hash, status.String())
 	}
 	return nil
 }
@@ -342,8 +358,13 @@ func (o *Batch) UpdateCommitTxHashAndRollupStatus(ctx context.Context, hash stri
 	if status == types.RollupCommitted {
 		updateFields["committed_at"] = time.Now()
 	}
-	if err := o.db.WithContext(ctx).Model(&Batch{}).Where("hash", hash).Updates(updateFields).Error; err != nil {
-		return err
+
+	db := o.db.WithContext(ctx)
+	db = db.Model(&Batch{})
+	db = db.Where("hash", hash)
+
+	if err := db.Updates(updateFields).Error; err != nil {
+		return fmt.Errorf("Batch.UpdateCommitTxHashAndRollupStatus error: %w, batch hash: %v, status: %v, commitTxHash: %v", err, hash, status.String(), commitTxHash)
 	}
 	return nil
 }
@@ -356,23 +377,35 @@ func (o *Batch) UpdateFinalizeTxHashAndRollupStatus(ctx context.Context, hash st
 	if status == types.RollupFinalized {
 		updateFields["finalized_at"] = time.Now()
 	}
-	if err := o.db.WithContext(ctx).Model(&Batch{}).Where("hash", hash).Updates(updateFields).Error; err != nil {
-		return err
+
+	db := o.db.WithContext(ctx)
+	db = db.Model(&Batch{})
+	db = db.Where("hash", hash)
+
+	if err := db.Updates(updateFields).Error; err != nil {
+		return fmt.Errorf("Batch.UpdateFinalizeTxHashAndRollupStatus error: %w, batch hash: %v, status: %v, commitTxHash: %v", err, hash, status.String(), finalizeTxHash)
 	}
 	return nil
 }
 
-// UpdateProofByHash updates the block batch proof by hash.
+// UpdateProofByHash updates the batch proof by hash.
 // for unit test.
 func (o *Batch) UpdateProofByHash(ctx context.Context, hash string, proof *message.AggProof, proofTimeSec uint64) error {
 	proofBytes, err := json.Marshal(proof)
 	if err != nil {
-		return err
+		return fmt.Errorf("Batch.UpdateProofByHash error: %w, batch hash: %v", err, hash)
 	}
 
 	updateFields := make(map[string]interface{})
 	updateFields["proof"] = proofBytes
 	updateFields["proof_time_sec"] = proofTimeSec
-	err = o.db.WithContext(ctx).Model(&Batch{}).Where("hash", hash).Updates(updateFields).Error
-	return err
+
+	db := o.db.WithContext(ctx)
+	db = db.Model(&Batch{})
+	db = db.Where("hash", hash)
+
+	if err = db.Updates(updateFields).Error; err != nil {
+		return fmt.Errorf("Batch.UpdateProofByHash error: %w, batch hash: %v", err, hash)
+	}
+	return nil
 }

bridge/internal/orm/chunk.go

@@ -3,12 +3,11 @@ package orm
 import (
 	"context"
 	"errors"
+	"fmt"
 	"time"
 
 	"scroll-tech/common/types"
 
-	bridgeTypes "scroll-tech/bridge/internal/types"
-
 	"github.com/scroll-tech/go-ethereum/log"
 	"gorm.io/gorm"
 )
@@ -26,22 +25,22 @@ type Chunk struct {
 	EndBlockHash                 string `json:"end_block_hash" gorm:"column:end_block_hash"`
 	StartBlockTime               uint64 `json:"start_block_time" gorm:"column:start_block_time"`
 	TotalL1MessagesPoppedBefore  uint64 `json:"total_l1_messages_popped_before" gorm:"column:total_l1_messages_popped_before"`
-	TotalL1MessagesPoppedInChunk uint64 `json:"total_l1_messages_popped_in_chunk" gorm:"column:total_l1_messages_popped_in_chunk"`
+	TotalL1MessagesPoppedInChunk uint32 `json:"total_l1_messages_popped_in_chunk" gorm:"column:total_l1_messages_popped_in_chunk"`
 
 	// proof
 	ProvingStatus    int16      `json:"proving_status" gorm:"column:proving_status;default:1"`
 	Proof            []byte     `json:"proof" gorm:"column:proof;default:NULL"`
 	ProverAssignedAt *time.Time `json:"prover_assigned_at" gorm:"column:prover_assigned_at;default:NULL"`
 	ProvedAt         *time.Time `json:"proved_at" gorm:"column:proved_at;default:NULL"`
-	ProofTimeSec     int16      `json:"proof_time_sec" gorm:"column:proof_time_sec;default:NULL"`
+	ProofTimeSec     int32      `json:"proof_time_sec" gorm:"column:proof_time_sec;default:NULL"`
 
 	// batch
 	BatchHash string `json:"batch_hash" gorm:"column:batch_hash;default:NULL"`
 
 	// metadata
 	TotalL2TxGas              uint64         `json:"total_l2_tx_gas" gorm:"column:total_l2_tx_gas"`
-	TotalL2TxNum              uint64         `json:"total_l2_tx_num" gorm:"column:total_l2_tx_num"`
-	TotalL1CommitCalldataSize uint64         `json:"total_l1_commit_calldata_size" gorm:"column:total_l1_commit_calldata_size"`
+	TotalL2TxNum              uint32         `json:"total_l2_tx_num" gorm:"column:total_l2_tx_num"`
+	TotalL1CommitCalldataSize uint32         `json:"total_l1_commit_calldata_size" gorm:"column:total_l1_commit_calldata_size"`
 	TotalL1CommitGas          uint64         `json:"total_l1_commit_gas" gorm:"column:total_l1_commit_gas"`
 	CreatedAt                 time.Time      `json:"created_at" gorm:"column:created_at"`
 	UpdatedAt                 time.Time      `json:"updated_at" gorm:"column:updated_at"`
@@ -63,19 +62,22 @@ func (*Chunk) TableName() string {
 // The returned chunks are sorted in ascending order by their index.
 func (o *Chunk) GetChunksInRange(ctx context.Context, startIndex uint64, endIndex uint64) ([]*Chunk, error) {
 	if startIndex > endIndex {
-		return nil, errors.New("start index should be less than or equal to end index")
+		return nil, fmt.Errorf("Chunk.GetChunksInRange: start index should be less than or equal to end index, start index: %v, end index: %v", startIndex, endIndex)
 	}
 
-	var chunks []*Chunk
-	db := o.db.WithContext(ctx).Where("index >= ? AND index <= ?", startIndex, endIndex)
+	db := o.db.WithContext(ctx)
+	db = db.Model(&Chunk{})
+	db = db.Where("index >= ? AND index <= ?", startIndex, endIndex)
 	db = db.Order("index ASC")
 
+	var chunks []*Chunk
 	if err := db.Find(&chunks).Error; err != nil {
-		return nil, err
+		return nil, fmt.Errorf("Chunk.GetChunksInRange error: %w, start index: %v, end index: %v", err, startIndex, endIndex)
 	}
 
-	if startIndex+uint64(len(chunks)) != endIndex+1 {
-		return nil, errors.New("number of chunks not expected in the specified range")
+	// sanity check
+	if uint64(len(chunks)) != endIndex-startIndex+1 {
+		return nil, fmt.Errorf("Chunk.GetChunksInRange: incorrect number of chunks, expected: %v, got: %v, start index: %v, end index: %v", endIndex-startIndex+1, len(chunks), startIndex, endIndex)
 	}
 
 	return chunks, nil
@@ -83,46 +85,43 @@ func (o *Chunk) GetChunksInRange(ctx context.Context, startIndex uint64, endInde
 
 // GetUnbatchedChunks retrieves unbatched chunks from the database.
 func (o *Chunk) GetUnbatchedChunks(ctx context.Context) ([]*Chunk, error) {
+	db := o.db.WithContext(ctx)
+	db = db.Model(&Chunk{})
+	db = db.Where("batch_hash IS NULL")
+	db = db.Order("index asc")
+
 	var chunks []*Chunk
-	err := o.db.WithContext(ctx).
-		Where("batch_hash IS NULL").
-		Order("index asc").
-		Find(&chunks).Error
-	if err != nil {
-		return nil, err
+	if err := db.Find(&chunks).Error; err != nil {
+		return nil, fmt.Errorf("Chunk.GetUnbatchedChunks error: %w", err)
 	}
 	return chunks, nil
 }
 
 // GetLatestChunk retrieves the latest chunk from the database.
 func (o *Chunk) GetLatestChunk(ctx context.Context) (*Chunk, error) {
+	db := o.db.WithContext(ctx)
+	db = db.Model(&Chunk{})
+	db = db.Order("index desc")
+
 	var latestChunk Chunk
-	err := o.db.WithContext(ctx).
-		Order("index desc").
-		First(&latestChunk).Error
-	if err != nil {
-		return nil, err
+	if err := db.First(&latestChunk).Error; err != nil {
+		return nil, fmt.Errorf("Chunk.GetLatestChunk error: %w", err)
 	}
 	return &latestChunk, nil
 }
 
 // InsertChunk inserts a new chunk into the database.
-func (o *Chunk) InsertChunk(ctx context.Context, chunk *bridgeTypes.Chunk, dbTX ...*gorm.DB) (*Chunk, error) {
+func (o *Chunk) InsertChunk(ctx context.Context, chunk *types.Chunk, dbTX ...*gorm.DB) (*Chunk, error) {
 	if chunk == nil || len(chunk.Blocks) == 0 {
 		return nil, errors.New("invalid args")
 	}
 
-	db := o.db
-	if len(dbTX) > 0 && dbTX[0] != nil {
-		db = dbTX[0]
-	}
-
 	var chunkIndex uint64
 	var totalL1MessagePoppedBefore uint64
 	parentChunk, err := o.GetLatestChunk(ctx)
-	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
+	if err != nil && !errors.Is(errors.Unwrap(err), gorm.ErrRecordNotFound) {
 		log.Error("failed to get latest chunk", "err", err)
-		return nil, err
+		return nil, fmt.Errorf("Chunk.InsertChunk error: %w", err)
 	}
 
 	// if parentChunk==nil then err==gorm.ErrRecordNotFound, which means there's
@@ -130,13 +129,13 @@ func (o *Chunk) InsertChunk(ctx context.Context, chunk *bridgeTypes.Chunk, dbTX
 	// if parentChunk!=nil then err=nil, then we fill the parentChunk-related data into the creating chunk
 	if parentChunk != nil {
 		chunkIndex = parentChunk.Index + 1
-		totalL1MessagePoppedBefore = parentChunk.TotalL1MessagesPoppedBefore + parentChunk.TotalL1MessagesPoppedInChunk
+		totalL1MessagePoppedBefore = parentChunk.TotalL1MessagesPoppedBefore + uint64(parentChunk.TotalL1MessagesPoppedInChunk)
 	}
 
 	hash, err := chunk.Hash(totalL1MessagePoppedBefore)
 	if err != nil {
 		log.Error("failed to get chunk hash", "err", err)
-		return nil, err
+		return nil, fmt.Errorf("Chunk.InsertChunk error: %w", err)
 	}
 
 	var totalL2TxGas uint64
@@ -159,18 +158,24 @@ func (o *Chunk) InsertChunk(ctx context.Context, chunk *bridgeTypes.Chunk, dbTX
 		EndBlockNumber:               chunk.Blocks[numBlocks-1].Header.Number.Uint64(),
 		EndBlockHash:                 chunk.Blocks[numBlocks-1].Header.Hash().Hex(),
 		TotalL2TxGas:                 totalL2TxGas,
-		TotalL2TxNum:                 totalL2TxNum,
-		TotalL1CommitCalldataSize:    totalL1CommitCalldataSize,
+		TotalL2TxNum:                 uint32(totalL2TxNum),
+		TotalL1CommitCalldataSize:    uint32(totalL1CommitCalldataSize),
 		TotalL1CommitGas:             totalL1CommitGas,
 		StartBlockTime:               chunk.Blocks[0].Header.Time,
 		TotalL1MessagesPoppedBefore:  totalL1MessagePoppedBefore,
-		TotalL1MessagesPoppedInChunk: chunk.NumL1Messages(totalL1MessagePoppedBefore),
+		TotalL1MessagesPoppedInChunk: uint32(chunk.NumL1Messages(totalL1MessagePoppedBefore)),
 		ProvingStatus:                int16(types.ProvingTaskUnassigned),
 	}
 
+	db := o.db
+	if len(dbTX) > 0 && dbTX[0] != nil {
+		db = dbTX[0]
+	}
+	db = db.WithContext(ctx)
+	db = db.Model(&Chunk{})
+
 	if err := db.Create(&newChunk).Error; err != nil {
-		log.Error("failed to insert chunk", "hash", hash, "err", err)
-		return nil, err
+		return nil, fmt.Errorf("Chunk.InsertChunk error: %w, chunk hash: %v", err, newChunk.Hash)
 	}
 
 	return &newChunk, nil
@@ -178,11 +183,6 @@ func (o *Chunk) InsertChunk(ctx context.Context, chunk *bridgeTypes.Chunk, dbTX
 
 // UpdateProvingStatus updates the proving status of a chunk.
 func (o *Chunk) UpdateProvingStatus(ctx context.Context, hash string, status types.ProvingStatus, dbTX ...*gorm.DB) error {
-	db := o.db
-	if len(dbTX) > 0 && dbTX[0] != nil {
-		db = dbTX[0]
-	}
-
 	updateFields := make(map[string]interface{})
 	updateFields["proving_status"] = int(status)
 
@@ -193,11 +193,18 @@ func (o *Chunk) UpdateProvingStatus(ctx context.Context, hash string, status typ
 		updateFields["prover_assigned_at"] = nil
 	case types.ProvingTaskProved, types.ProvingTaskVerified:
 		updateFields["proved_at"] = time.Now()
-	default:
 	}
 
-	if err := db.Model(&Chunk{}).Where("hash", hash).Updates(updateFields).Error; err != nil {
-		return err
+	db := o.db
+	if len(dbTX) > 0 && dbTX[0] != nil {
+		db = dbTX[0]
+	}
+	db = db.WithContext(ctx)
+	db = db.Model(&Chunk{})
+	db = db.Where("hash", hash)
+
+	if err := db.Updates(updateFields).Error; err != nil {
+		return fmt.Errorf("Chunk.UpdateProvingStatus error: %w, chunk hash: %v, status: %v", err, hash, status.String())
 	}
 	return nil
 }
@@ -209,10 +216,12 @@ func (o *Chunk) UpdateBatchHashInRange(ctx context.Context, startIndex uint64, e
 	if len(dbTX) > 0 && dbTX[0] != nil {
 		db = dbTX[0]
 	}
-	db = db.Model(&Chunk{}).Where("index >= ? AND index <= ?", startIndex, endIndex)
+	db = db.WithContext(ctx)
+	db = db.Model(&Chunk{})
+	db = db.Where("index >= ? AND index <= ?", startIndex, endIndex)
 
 	if err := db.Update("batch_hash", batchHash).Error; err != nil {
-		return err
+		return fmt.Errorf("Chunk.UpdateBatchHashInRange error: %w, start index: %v, end index: %v, batch hash: %v", err, startIndex, endIndex, batchHash)
 	}
 	return nil
 }

bridge/internal/orm/l1_block.go

@@ -2,8 +2,9 @@ package orm
 
 import (
 	"context"
+	"fmt"
+	"time"
 
-	"github.com/scroll-tech/go-ethereum/log"
 	"gorm.io/gorm"
 
 	"scroll-tech/common/types"
@@ -13,14 +14,23 @@ import (
 type L1Block struct {
 	db *gorm.DB `gorm:"column:-"`
 
-	Number          uint64 `json:"number" gorm:"column:number"`
-	Hash            string `json:"hash" gorm:"column:hash"`
-	HeaderRLP       string `json:"header_rlp" gorm:"column:header_rlp"`
-	BaseFee         uint64 `json:"base_fee" gorm:"column:base_fee"`
-	BlockStatus     int    `json:"block_status" gorm:"column:block_status;default:1"`
-	ImportTxHash    string `json:"import_tx_hash" gorm:"column:import_tx_hash;default:NULL"`
-	GasOracleStatus int    `json:"oracle_status" gorm:"column:oracle_status;default:1"`
+	// block
+	Number  uint64 `json:"number" gorm:"column:number"`
+	Hash    string `json:"hash" gorm:"column:hash"`
+	BaseFee uint64 `json:"base_fee" gorm:"column:base_fee"`
+
+	// import
+	BlockStatus  int16  `json:"block_status" gorm:"column:block_status;default:1"`
+	ImportTxHash string `json:"import_tx_hash" gorm:"column:import_tx_hash;default:NULL"`
+
+	// oracle
+	GasOracleStatus int16  `json:"oracle_status" gorm:"column:oracle_status;default:1"`
 	OracleTxHash    string `json:"oracle_tx_hash" gorm:"column:oracle_tx_hash;default:NULL"`
+
+	// metadata
+	CreatedAt time.Time      `json:"created_at" gorm:"column:created_at"`
+	UpdatedAt time.Time      `json:"updated_at" gorm:"column:updated_at"`
+	DeletedAt gorm.DeletedAt `json:"deleted_at" gorm:"column:deleted_at;default:NULL"`
 }
 
 // NewL1Block create an l1Block instance
@@ -34,54 +44,64 @@ func (*L1Block) TableName() string {
 }
 
 // GetLatestL1BlockHeight get the latest l1 block height
-func (l *L1Block) GetLatestL1BlockHeight() (uint64, error) {
-	result := l.db.Model(&L1Block{}).Select("COALESCE(MAX(number), 0)").Row()
-	if result.Err() != nil {
-		return 0, result.Err()
-	}
+func (o *L1Block) GetLatestL1BlockHeight(ctx context.Context) (uint64, error) {
+	db := o.db.WithContext(ctx)
+	db = db.Model(&L1Block{})
+	db = db.Select("COALESCE(MAX(number), 0)")
 
 	var maxNumber uint64
-	if err := result.Scan(&maxNumber); err != nil {
-		return 0, err
+	if err := db.Row().Scan(&maxNumber); err != nil {
+		return 0, fmt.Errorf("L1Block.GetLatestL1BlockHeight error: %w", err)
 	}
 	return maxNumber, nil
 }
 
 // GetL1Blocks get the l1 blocks
-func (l *L1Block) GetL1Blocks(fields map[string]interface{}) ([]L1Block, error) {
-	var l1Blocks []L1Block
-	db := l.db
+func (o *L1Block) GetL1Blocks(ctx context.Context, fields map[string]interface{}) ([]L1Block, error) {
+	db := o.db.WithContext(ctx)
+	db = db.Model(&L1Block{})
+
 	for key, value := range fields {
 		db = db.Where(key, value)
 	}
+
 	db = db.Order("number ASC")
+
+	var l1Blocks []L1Block
 	if err := db.Find(&l1Blocks).Error; err != nil {
-		return nil, err
+		return nil, fmt.Errorf("L1Block.GetL1Blocks error: %w, fields: %v", err, fields)
 	}
 	return l1Blocks, nil
 }
 
 // InsertL1Blocks batch insert l1 blocks
-func (l *L1Block) InsertL1Blocks(ctx context.Context, blocks []L1Block) error {
+func (o *L1Block) InsertL1Blocks(ctx context.Context, blocks []L1Block) error {
 	if len(blocks) == 0 {
 		return nil
 	}
 
-	err := l.db.WithContext(ctx).Create(&blocks).Error
-	if err != nil {
-		log.Error("failed to insert L1 Blocks", "err", err)
+	db := o.db.WithContext(ctx)
+	db = db.Model(&L1Block{})
+
+	if err := db.Create(&blocks).Error; err != nil {
+		return fmt.Errorf("L1Block.InsertL1Blocks error: %w", err)
 	}
-	return err
+	return nil
 }
 
 // UpdateL1GasOracleStatusAndOracleTxHash update l1 gas oracle status and oracle tx hash
-func (l *L1Block) UpdateL1GasOracleStatusAndOracleTxHash(ctx context.Context, blockHash string, status types.GasOracleStatus, txHash string) error {
+func (o *L1Block) UpdateL1GasOracleStatusAndOracleTxHash(ctx context.Context, blockHash string, status types.GasOracleStatus, txHash string) error {
 	updateFields := map[string]interface{}{
 		"oracle_status":  int(status),
 		"oracle_tx_hash": txHash,
 	}
-	if err := l.db.WithContext(ctx).Model(&L1Block{}).Where("hash", blockHash).Updates(updateFields).Error; err != nil {
-		return err
+
+	db := o.db.WithContext(ctx)
+	db = db.Model(&L1Block{})
+	db = db.Where("hash", blockHash)
+
+	if err := db.Updates(updateFields).Error; err != nil {
+		return fmt.Errorf("L1Block.UpdateL1GasOracleStatusAndOracleTxHash error: %w, block hash: %v, status: %v, tx hash: %v", err, blockHash, status.String(), txHash)
 	}
 	return nil
 }

bridge/internal/orm/l1_message.go

@@ -3,6 +3,7 @@ package orm
 import (
 	"context"
 	"database/sql"
+	"time"
 
 	"github.com/scroll-tech/go-ethereum/log"
 	"gorm.io/gorm"
@@ -25,6 +26,11 @@ type L1Message struct {
 	Layer1Hash string `json:"layer1_hash" gorm:"column:layer1_hash"`
 	Layer2Hash string `json:"layer2_hash" gorm:"column:layer2_hash;default:NULL"`
 	Status     int    `json:"status" gorm:"column:status;default:1"`
+
+	// metadata
+	CreatedAt time.Time      `json:"created_at" gorm:"column:created_at"`
+	UpdatedAt time.Time      `json:"updated_at" gorm:"column:updated_at"`
+	DeletedAt gorm.DeletedAt `json:"deleted_at" gorm:"column:deleted_at;default:NULL"`
 }
 
 // NewL1Message create an L1MessageOrm instance
@@ -52,6 +58,16 @@ func (m *L1Message) GetLayer1LatestWatchedHeight() (int64, error) {
 	return -1, nil
 }
 
+// GetLayer1LatestMessageWithLayer2Hash returns latest l1 message with layer2 hash
+func (m *L1Message) GetLayer1LatestMessageWithLayer2Hash() (*L1Message, error) {
+	var msg *L1Message
+	err := m.db.Where("layer2_hash IS NOT NULL").Order("queue_index DESC").First(&msg).Error
+	if err != nil {
+		return nil, err
+	}
+	return msg, nil
+}
+
 // GetL1MessagesByStatus fetch list of unprocessed messages given msg status
 func (m *L1Message) GetL1MessagesByStatus(status types.MsgStatus, limit uint64) ([]L1Message, error) {
 	var msgs []L1Message

bridge/internal/orm/l2_block.go

@@ -3,31 +3,39 @@ package orm
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
+	"time"
 
 	"github.com/scroll-tech/go-ethereum/common"
 	gethTypes "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/scroll-tech/go-ethereum/log"
 	"gorm.io/gorm"
 
-	"scroll-tech/bridge/internal/types"
+	"scroll-tech/common/types"
 )
 
 // L2Block represents a l2 block in the database.
 type L2Block struct {
 	db *gorm.DB `gorm:"column:-"`
 
+	// block
 	Number           uint64 `json:"number" gorm:"number"`
 	Hash             string `json:"hash" gorm:"hash"`
 	ParentHash       string `json:"parent_hash" gorm:"parent_hash"`
 	Header           string `json:"header" gorm:"header"`
 	Transactions     string `json:"transactions" gorm:"transactions"`
 	WithdrawTrieRoot string `json:"withdraw_trie_root" gorm:"withdraw_trie_root"`
-	TxNum            uint64 `json:"tx_num" gorm:"tx_num"`
+	TxNum            uint32 `json:"tx_num" gorm:"tx_num"`
 	GasUsed          uint64 `json:"gas_used" gorm:"gas_used"`
 	BlockTimestamp   uint64 `json:"block_timestamp" gorm:"block_timestamp"`
-	ChunkHash        string `json:"chunk_hash" gorm:"chunk_hash;default:NULL"`
+
+	// chunk
+	ChunkHash string `json:"chunk_hash" gorm:"chunk_hash;default:NULL"`
+
+	// metadata
+	CreatedAt time.Time      `json:"created_at" gorm:"column:created_at"`
+	UpdatedAt time.Time      `json:"updated_at" gorm:"column:updated_at"`
+	DeletedAt gorm.DeletedAt `json:"deleted_at" gorm:"column:deleted_at;default:NULL"`
 }
 
 // NewL2Block creates a new L2Block instance
@@ -42,25 +50,30 @@ func (*L2Block) TableName() string {
 
 // GetL2BlocksLatestHeight retrieves the height of the latest L2 block.
 // If the l2_block table is empty, it returns 0 to represent the genesis block height.
-// In case of an error, it returns -1 along with the error.
-func (o *L2Block) GetL2BlocksLatestHeight(ctx context.Context) (int64, error) {
-	var maxNumber int64
-	if err := o.db.WithContext(ctx).Model(&L2Block{}).Select("COALESCE(MAX(number), 0)").Row().Scan(&maxNumber); err != nil {
-		return -1, err
-	}
+func (o *L2Block) GetL2BlocksLatestHeight(ctx context.Context) (uint64, error) {
+	db := o.db.WithContext(ctx)
+	db = db.Model(&L2Block{})
+	db = db.Select("COALESCE(MAX(number), 0)")
 
+	var maxNumber uint64
+	if err := db.Row().Scan(&maxNumber); err != nil {
+		return 0, fmt.Errorf("L2Block.GetL2BlocksLatestHeight error: %w", err)
+	}
 	return maxNumber, nil
 }
 
 // GetUnchunkedBlocks get the l2 blocks that have not been put into a chunk.
 // The returned blocks are sorted in ascending order by their block number.
 func (o *L2Block) GetUnchunkedBlocks(ctx context.Context) ([]*types.WrappedBlock, error) {
+	db := o.db.WithContext(ctx)
+	db = db.Model(&L2Block{})
+	db = db.Select("header, transactions, withdraw_trie_root")
+	db = db.Where("chunk_hash IS NULL")
+	db = db.Order("number ASC")
+
 	var l2Blocks []L2Block
-	if err := o.db.WithContext(ctx).Select("header, transactions, withdraw_trie_root").
-		Where("chunk_hash IS NULL").
-		Order("number asc").
-		Find(&l2Blocks).Error; err != nil {
-		return nil, err
+	if err := db.Find(&l2Blocks).Error; err != nil {
+		return nil, fmt.Errorf("L2Block.GetUnchunkedBlocks error: %w", err)
 	}
 
 	var wrappedBlocks []*types.WrappedBlock
@@ -68,12 +81,12 @@ func (o *L2Block) GetUnchunkedBlocks(ctx context.Context) ([]*types.WrappedBlock
 		var wrappedBlock types.WrappedBlock
 
 		if err := json.Unmarshal([]byte(v.Transactions), &wrappedBlock.Transactions); err != nil {
-			return nil, err
+			return nil, fmt.Errorf("L2Block.GetUnchunkedBlocks error: %w", err)
 		}
 
 		wrappedBlock.Header = &gethTypes.Header{}
 		if err := json.Unmarshal([]byte(v.Header), wrappedBlock.Header); err != nil {
-			return nil, err
+			return nil, fmt.Errorf("L2Block.GetUnchunkedBlocks error: %w", err)
 		}
 
 		wrappedBlock.WithdrawTrieRoot = common.HexToHash(v.WithdrawTrieRoot)
@@ -87,6 +100,7 @@ func (o *L2Block) GetUnchunkedBlocks(ctx context.Context) ([]*types.WrappedBlock
 // The returned L2Blocks are sorted in ascending order by their block number.
 func (o *L2Block) GetL2Blocks(ctx context.Context, fields map[string]interface{}, orderByList []string, limit int) ([]*L2Block, error) {
 	db := o.db.WithContext(ctx)
+	db = db.Model(&L2Block{})
 
 	for key, value := range fields {
 		db = db.Where(key, value)
@@ -104,7 +118,7 @@ func (o *L2Block) GetL2Blocks(ctx context.Context, fields map[string]interface{}
 
 	var l2Blocks []*L2Block
 	if err := db.Find(&l2Blocks).Error; err != nil {
-		return nil, err
+		return nil, fmt.Errorf("L2Block.GetL2Blocks error: %w, fields: %v, orderByList: %v", err, fields, orderByList)
 	}
 	return l2Blocks, nil
 }
@@ -114,20 +128,23 @@ func (o *L2Block) GetL2Blocks(ctx context.Context, fields map[string]interface{}
 // The returned blocks are sorted in ascending order by their block number.
 func (o *L2Block) GetL2BlocksInRange(ctx context.Context, startBlockNumber uint64, endBlockNumber uint64) ([]*types.WrappedBlock, error) {
 	if startBlockNumber > endBlockNumber {
-		return nil, errors.New("start block number should be less than or equal to end block number")
+		return nil, fmt.Errorf("L2Block.GetL2BlocksInRange: start block number should be less than or equal to end block number, start block: %v, end block: %v", startBlockNumber, endBlockNumber)
 	}
 
-	var l2Blocks []L2Block
 	db := o.db.WithContext(ctx)
+	db = db.Model(&L2Block{})
+	db = db.Select("header, transactions, withdraw_trie_root")
 	db = db.Where("number >= ? AND number <= ?", startBlockNumber, endBlockNumber)
 	db = db.Order("number ASC")
 
+	var l2Blocks []L2Block
 	if err := db.Find(&l2Blocks).Error; err != nil {
-		return nil, err
+		return nil, fmt.Errorf("L2Block.GetL2BlocksInRange error: %w, start block: %v, end block: %v", err, startBlockNumber, endBlockNumber)
 	}
 
+	// sanity check
 	if uint64(len(l2Blocks)) != endBlockNumber-startBlockNumber+1 {
-		return nil, errors.New("number of blocks not expected in the specified range")
+		return nil, fmt.Errorf("L2Block.GetL2BlocksInRange: unexpected number of results, expected: %v, got: %v", endBlockNumber-startBlockNumber+1, len(l2Blocks))
 	}
 
 	var wrappedBlocks []*types.WrappedBlock
@@ -135,12 +152,12 @@ func (o *L2Block) GetL2BlocksInRange(ctx context.Context, startBlockNumber uint6
 		var wrappedBlock types.WrappedBlock
 
 		if err := json.Unmarshal([]byte(v.Transactions), &wrappedBlock.Transactions); err != nil {
-			return nil, err
+			return nil, fmt.Errorf("L2Block.GetL2BlocksInRange error: %w, start block: %v, end block: %v", err, startBlockNumber, endBlockNumber)
 		}
 
 		wrappedBlock.Header = &gethTypes.Header{}
 		if err := json.Unmarshal([]byte(v.Header), wrappedBlock.Header); err != nil {
-			return nil, err
+			return nil, fmt.Errorf("L2Block.GetL2BlocksInRange error: %w, start block: %v, end block: %v", err, startBlockNumber, endBlockNumber)
 		}
 
 		wrappedBlock.WithdrawTrieRoot = common.HexToHash(v.WithdrawTrieRoot)
@@ -157,13 +174,13 @@ func (o *L2Block) InsertL2Blocks(ctx context.Context, blocks []*types.WrappedBlo
 		header, err := json.Marshal(block.Header)
 		if err != nil {
 			log.Error("failed to marshal block header", "hash", block.Header.Hash().String(), "err", err)
-			return err
+			return fmt.Errorf("L2Block.InsertL2Blocks error: %w", err)
 		}
 
 		txs, err := json.Marshal(block.Transactions)
 		if err != nil {
 			log.Error("failed to marshal transactions", "hash", block.Header.Hash().String(), "err", err)
-			return err
+			return fmt.Errorf("L2Block.InsertL2Blocks error: %w", err)
 		}
 
 		l2Block := L2Block{
@@ -172,7 +189,7 @@ func (o *L2Block) InsertL2Blocks(ctx context.Context, blocks []*types.WrappedBlo
 			ParentHash:       block.Header.ParentHash.String(),
 			Transactions:     string(txs),
 			WithdrawTrieRoot: block.WithdrawTrieRoot.Hex(),
-			TxNum:            uint64(len(block.Transactions)),
+			TxNum:            uint32(len(block.Transactions)),
 			GasUsed:          block.Header.GasUsed,
 			BlockTimestamp:   block.Header.Time,
 			Header:           string(header),
@@ -180,9 +197,11 @@ func (o *L2Block) InsertL2Blocks(ctx context.Context, blocks []*types.WrappedBlo
 		l2Blocks = append(l2Blocks, l2Block)
 	}
 
-	if err := o.db.WithContext(ctx).Create(&l2Blocks).Error; err != nil {
-		log.Error("failed to insert l2Blocks", "err", err)
-		return err
+	db := o.db.WithContext(ctx)
+	db = db.Model(&L2Block{})
+
+	if err := db.Create(&l2Blocks).Error; err != nil {
+		return fmt.Errorf("L2Block.InsertL2Blocks error: %w", err)
 	}
 	return nil
 }
@@ -196,13 +215,19 @@ func (o *L2Block) UpdateChunkHashInRange(ctx context.Context, startIndex uint64,
 	if len(dbTX) > 0 && dbTX[0] != nil {
 		db = dbTX[0]
 	}
+	db = db.WithContext(ctx)
+	db = db.Model(&L2Block{})
+	db = db.Where("number >= ? AND number <= ?", startIndex, endIndex)
 
-	db = db.WithContext(ctx).Model(&L2Block{}).Where("number >= ? AND number <= ?", startIndex, endIndex)
 	tx := db.Update("chunk_hash", chunkHash)
-
-	if tx.RowsAffected != int64(endIndex-startIndex+1) {
-		return fmt.Errorf("expected %d rows to be updated, got %d", endIndex-startIndex+1, tx.RowsAffected)
+	if tx.Error != nil {
+		return fmt.Errorf("L2Block.UpdateChunkHashInRange error: %w, start index: %v, end index: %v, chunk hash: %v", tx.Error, startIndex, endIndex, chunkHash)
 	}
 
-	return tx.Error
+	// sanity check
+	if uint64(tx.RowsAffected) != endIndex-startIndex+1 {
+		return fmt.Errorf("L2Block.UpdateChunkHashInRange: incorrect number of rows affected, expected: %v, got: %v", endIndex-startIndex+1, tx.RowsAffected)
+	}
+
+	return nil
 }

bridge/internal/orm/l2_message.go

@@ -1,127 +0,0 @@
-package orm
-
-import (
-	"context"
-
-	"github.com/scroll-tech/go-ethereum/log"
-	"gorm.io/gorm"
-
-	"scroll-tech/common/types"
-)
-
-// L2Message is structure of stored layer2 bridge message
-type L2Message struct {
-	db *gorm.DB `gorm:"column:-"`
-
-	Nonce      uint64 `json:"nonce" gorm:"column:nonce"`
-	MsgHash    string `json:"msg_hash" gorm:"column:msg_hash"`
-	Height     uint64 `json:"height" gorm:"column:height"`
-	Sender     string `json:"sender" gorm:"column:sender"`
-	Value      string `json:"value" gorm:"column:value"`
-	Target     string `json:"target" gorm:"column:target"`
-	Calldata   string `json:"calldata" gorm:"column:calldata"`
-	Layer2Hash string `json:"layer2_hash" gorm:"column:layer2_hash"`
-	Layer1Hash string `json:"layer1_hash" gorm:"column:layer1_hash;default:NULL"`
-	Proof      string `json:"proof" gorm:"column:proof;default:NULL"`
-	Status     int    `json:"status" gorm:"column:status;default:1"`
-}
-
-// NewL2Message create an L2Message instance
-func NewL2Message(db *gorm.DB) *L2Message {
-	return &L2Message{db: db}
-}
-
-// TableName define the L2Message table name
-func (*L2Message) TableName() string {
-	return "l2_message"
-}
-
-// GetL2Messages fetch list of messages given msg status
-func (m *L2Message) GetL2Messages(fields map[string]interface{}, orderByList []string, limit int) ([]L2Message, error) {
-	var l2MsgList []L2Message
-	db := m.db
-	for key, value := range fields {
-		db = db.Where(key, value)
-	}
-
-	for _, orderBy := range orderByList {
-		db = db.Order(orderBy)
-	}
-
-	if limit != 0 {
-		db = db.Limit(limit)
-	}
-
-	if err := db.Find(&l2MsgList).Error; err != nil {
-		return nil, err
-	}
-	return l2MsgList, nil
-}
-
-// GetLayer2LatestWatchedHeight returns latest height stored in the table
-func (m *L2Message) GetLayer2LatestWatchedHeight() (int64, error) {
-	// @note It's not correct, since we may don't have message in some blocks.
-	// But it will only be called at start, some redundancy is acceptable.
-	result := m.db.Model(&L2Message{}).Select("COALESCE(MAX(height), -1)").Row()
-	if result.Err() != nil {
-		return -1, result.Err()
-	}
-
-	var maxNumber int64
-	if err := result.Scan(&maxNumber); err != nil {
-		return 0, err
-	}
-	return maxNumber, nil
-}
-
-// GetL2MessageByNonce fetch message by nonce
-// for unit test
-func (m *L2Message) GetL2MessageByNonce(nonce uint64) (*L2Message, error) {
-	var msg L2Message
-	err := m.db.Where("nonce", nonce).First(&msg).Error
-	if err != nil {
-		return nil, err
-	}
-	return &msg, nil
-}
-
-// SaveL2Messages batch save a list of layer2 messages
-func (m *L2Message) SaveL2Messages(ctx context.Context, messages []L2Message) error {
-	if len(messages) == 0 {
-		return nil
-	}
-
-	err := m.db.WithContext(ctx).Create(&messages).Error
-	if err != nil {
-		nonces := make([]uint64, 0, len(messages))
-		heights := make([]uint64, 0, len(messages))
-		for _, msg := range messages {
-			nonces = append(nonces, msg.Nonce)
-			heights = append(heights, msg.Height)
-		}
-		log.Error("failed to insert layer2Messages", "nonces", nonces, "heights", heights, "err", err)
-	}
-	return err
-}
-
-// UpdateLayer2Status updates message stauts, given message hash
-func (m *L2Message) UpdateLayer2Status(ctx context.Context, msgHash string, status types.MsgStatus) error {
-	err := m.db.Model(&L2Message{}).WithContext(ctx).Where("msg_hash", msgHash).Update("status", int(status)).Error
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// UpdateLayer2StatusAndLayer1Hash updates message stauts and layer1 transaction hash, given message hash
-func (m *L2Message) UpdateLayer2StatusAndLayer1Hash(ctx context.Context, msgHash string, status types.MsgStatus, layer1Hash string) error {
-	updateFields := map[string]interface{}{
-		"status":      int(status),
-		"layer1_hash": layer1Hash,
-	}
-	err := m.db.Model(&L2Message{}).WithContext(ctx).Where("msg_hash", msgHash).Updates(updateFields).Error
-	if err != nil {
-		return err
-	}
-	return nil
-}

bridge/internal/orm/migrate/migrate.go

@@ -1,61 +0,0 @@
-package migrate
-
-import (
-	"database/sql"
-	"embed"
-	"os"
-	"strconv"
-
-	"github.com/pressly/goose/v3"
-)
-
-//go:embed migrations/*.sql
-var embedMigrations embed.FS
-
-// MigrationsDir migration dir
-const MigrationsDir string = "migrations"
-
-func init() {
-	goose.SetBaseFS(embedMigrations)
-	goose.SetSequential(true)
-	goose.SetTableName("scroll_migrations")
-
-	verbose, _ := strconv.ParseBool(os.Getenv("LOG_SQL_MIGRATIONS"))
-	goose.SetVerbose(verbose)
-}
-
-// Migrate migrate db
-func Migrate(db *sql.DB) error {
-	return goose.Up(db, MigrationsDir, goose.WithAllowMissing())
-}
-
-// Rollback rollback to the given version
-func Rollback(db *sql.DB, version *int64) error {
-	if version != nil {
-		return goose.DownTo(db, MigrationsDir, *version)
-	}
-	return goose.Down(db, MigrationsDir)
-}
-
-// ResetDB clean and migrate db.
-func ResetDB(db *sql.DB) error {
-	if err := Rollback(db, new(int64)); err != nil {
-		return err
-	}
-	return Migrate(db)
-}
-
-// Current get current version
-func Current(db *sql.DB) (int64, error) {
-	return goose.GetDBVersion(db)
-}
-
-// Status is normal or not
-func Status(db *sql.DB) error {
-	return goose.Version(db, MigrationsDir)
-}
-
-// Create a new migration folder
-func Create(db *sql.DB, name, migrationType string) error {
-	return goose.Create(db, MigrationsDir, name, migrationType)
-}

bridge/internal/orm/migrate/migrate_test.go

@@ -1,86 +0,0 @@
-package migrate
-
-import (
-	"testing"
-
-	"github.com/jmoiron/sqlx"
-	_ "github.com/lib/pq"
-	"github.com/stretchr/testify/assert"
-
-	"scroll-tech/common/docker"
-
-	"scroll-tech/database"
-)
-
-var (
-	base *docker.App
-	pgDB *sqlx.DB
-)
-
-func initEnv(t *testing.T) error {
-	// Start db container.
-	base.RunDBImage(t)
-
-	// Create db orm handler.
-	factory, err := database.NewOrmFactory(base.DBConfig)
-	if err != nil {
-		return err
-	}
-	pgDB = factory.GetDB()
-	return nil
-}
-
-func TestMigrate(t *testing.T) {
-	base = docker.NewDockerApp()
-	if err := initEnv(t); err != nil {
-		t.Fatal(err)
-	}
-
-	t.Run("testCurrent", testCurrent)
-	t.Run("testStatus", testStatus)
-	t.Run("testResetDB", testResetDB)
-	t.Run("testMigrate", testMigrate)
-	t.Run("testRollback", testRollback)
-
-	t.Cleanup(func() {
-		base.Free()
-	})
-}
-
-func testCurrent(t *testing.T) {
-	cur, err := Current(pgDB.DB)
-	assert.NoError(t, err)
-	assert.Equal(t, 0, int(cur))
-}
-
-func testStatus(t *testing.T) {
-	status := Status(pgDB.DB)
-	assert.NoError(t, status)
-}
-
-func testResetDB(t *testing.T) {
-	assert.NoError(t, ResetDB(pgDB.DB))
-	cur, err := Current(pgDB.DB)
-	assert.NoError(t, err)
-	// total number of tables.
-	assert.Equal(t, 6, int(cur))
-}
-
-func testMigrate(t *testing.T) {
-	assert.NoError(t, Migrate(pgDB.DB))
-	cur, err := Current(pgDB.DB)
-	assert.NoError(t, err)
-	assert.Equal(t, true, cur > 0)
-}
-
-func testRollback(t *testing.T) {
-	version, err := Current(pgDB.DB)
-	assert.NoError(t, err)
-	assert.Equal(t, true, version > 0)
-
-	assert.NoError(t, Rollback(pgDB.DB, nil))
-
-	cur, err := Current(pgDB.DB)
-	assert.NoError(t, err)
-	assert.Equal(t, true, cur+1 == version)
-}

bridge/internal/orm/migrate/migrations/00001_l1_message.sql

@@ -1,37 +0,0 @@
--- +goose Up
--- +goose StatementBegin
-create table l1_message
-(
-    queue_index  BIGINT  NOT NULL,
-    msg_hash     VARCHAR NOT NULL,
-    height       BIGINT  NOT NULL,
-    gas_limit    BIGINT  NOT NULL,
-    sender       VARCHAR NOT NULL,
-    target       VARCHAR NOT NULL,
-    value        VARCHAR NOT NULL,
-    calldata     TEXT    NOT NULL,
-    layer1_hash  VARCHAR NOT NULL,
-    layer2_hash  VARCHAR DEFAULT NULL,
-    status       INTEGER  DEFAULT 1,
-    created_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP
-);
-
-comment
-on column l1_message.status is 'undefined, pending, submitted, confirmed, failed, expired, relay_failed';
-
-create unique index l1_message_hash_uindex
-on l1_message (msg_hash);
-
-create unique index l1_message_nonce_uindex
-on l1_message (queue_index);
-
-create index l1_message_height_index
-    on l1_message (height);
-
--- +goose StatementEnd
-
--- +goose Down
--- +goose StatementBegin
-drop table if exists l1_message;
--- +goose StatementEnd

bridge/internal/orm/migrate/migrations/00002_l2_message.sql

@@ -1,37 +0,0 @@
--- +goose Up
--- +goose StatementBegin
-create table l2_message
-(
-    nonce        BIGINT  NOT NULL,
-    msg_hash     VARCHAR NOT NULL,
-    height       BIGINT  NOT NULL,
-    sender       VARCHAR NOT NULL,
-    target       VARCHAR NOT NULL,
-    value        VARCHAR NOT NULL,
-    calldata     TEXT    NOT NULL,
-    layer2_hash  VARCHAR NOT NULL,
-    layer1_hash  VARCHAR DEFAULT NULL,
-    proof        TEXT    DEFAULT NULL,
-    status       INTEGER  DEFAULT 1,
-    created_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP
-);
-
-comment
-on column l2_message.status is 'undefined, pending, submitted, confirmed, failed, expired, relay_failed';
-
-create unique index l2_message_hash_uindex
-on l2_message (msg_hash);
-
-create unique index l2_message_nonce_uindex
-on l2_message (nonce);
-
-create index l2_message_height_index
-    on l2_message (height);
-
--- +goose StatementEnd
-
--- +goose Down
--- +goose StatementBegin
-drop table if exists l2_message;
--- +goose StatementEnd

bridge/internal/orm/orm_test.go

@@ -10,13 +10,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"gorm.io/gorm"
 
+	"scroll-tech/common/database"
 	"scroll-tech/common/docker"
 	"scroll-tech/common/types"
 
-	"scroll-tech/bridge/internal/config"
-	"scroll-tech/bridge/internal/orm/migrate"
-	bridgeTypes "scroll-tech/bridge/internal/types"
-	"scroll-tech/bridge/internal/utils"
+	"scroll-tech/database/migrate"
 )
 
 var (
@@ -27,10 +25,10 @@ var (
 	chunkOrm   *Chunk
 	batchOrm   *Batch
 
-	wrappedBlock1 *bridgeTypes.WrappedBlock
-	wrappedBlock2 *bridgeTypes.WrappedBlock
-	chunk1        *bridgeTypes.Chunk
-	chunk2        *bridgeTypes.Chunk
+	wrappedBlock1 *types.WrappedBlock
+	wrappedBlock2 *types.WrappedBlock
+	chunk1        *types.Chunk
+	chunk2        *types.Chunk
 	chunkHash1    common.Hash
 	chunkHash2    common.Hash
 )
@@ -46,8 +44,8 @@ func setupEnv(t *testing.T) {
 	base = docker.NewDockerApp()
 	base.RunDBImage(t)
 	var err error
-	db, err = utils.InitDB(
-		&config.DBConfig{
+	db, err = database.InitDB(
+		&database.Config{
 			DSN:        base.DBConfig.DSN,
 			DriverName: base.DBConfig.DriverName,
 			MaxOpenNum: base.DBConfig.MaxOpenNum,
@@ -64,28 +62,22 @@ func setupEnv(t *testing.T) {
 	l2BlockOrm = NewL2Block(db)
 
 	templateBlockTrace, err := os.ReadFile("../../../common/testdata/blockTrace_02.json")
-	if err != nil {
-		t.Fatalf("failed to read file: %v", err)
-	}
-	wrappedBlock1 = &bridgeTypes.WrappedBlock{}
-	if err = json.Unmarshal(templateBlockTrace, wrappedBlock1); err != nil {
-		t.Fatalf("failed to unmarshal block trace: %v", err)
-	}
+	assert.NoError(t, err)
+	wrappedBlock1 = &types.WrappedBlock{}
+	err = json.Unmarshal(templateBlockTrace, wrappedBlock1)
+	assert.NoError(t, err)
 
 	templateBlockTrace, err = os.ReadFile("../../../common/testdata/blockTrace_03.json")
-	if err != nil {
-		t.Fatalf("failed to read file: %v", err)
-	}
-	wrappedBlock2 = &bridgeTypes.WrappedBlock{}
-	if err = json.Unmarshal(templateBlockTrace, wrappedBlock2); err != nil {
-		t.Fatalf("failed to unmarshal block trace: %v", err)
-	}
+	assert.NoError(t, err)
+	wrappedBlock2 = &types.WrappedBlock{}
+	err = json.Unmarshal(templateBlockTrace, wrappedBlock2)
+	assert.NoError(t, err)
 
-	chunk1 = &bridgeTypes.Chunk{Blocks: []*bridgeTypes.WrappedBlock{wrappedBlock1}}
+	chunk1 = &types.Chunk{Blocks: []*types.WrappedBlock{wrappedBlock1}}
 	chunkHash1, err = chunk1.Hash(0)
 	assert.NoError(t, err)
 
-	chunk2 = &bridgeTypes.Chunk{Blocks: []*bridgeTypes.WrappedBlock{wrappedBlock2}}
+	chunk2 = &types.Chunk{Blocks: []*types.WrappedBlock{wrappedBlock2}}
 	chunkHash2, err = chunk2.Hash(chunk1.NumL1Messages(0))
 	assert.NoError(t, err)
 }
@@ -102,12 +94,12 @@ func TestL2BlockOrm(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NoError(t, migrate.ResetDB(sqlDB))
 
-	err = l2BlockOrm.InsertL2Blocks(context.Background(), []*bridgeTypes.WrappedBlock{wrappedBlock1, wrappedBlock2})
+	err = l2BlockOrm.InsertL2Blocks(context.Background(), []*types.WrappedBlock{wrappedBlock1, wrappedBlock2})
 	assert.NoError(t, err)
 
 	height, err := l2BlockOrm.GetL2BlocksLatestHeight(context.Background())
 	assert.NoError(t, err)
-	assert.Equal(t, int64(3), height)
+	assert.Equal(t, uint64(3), height)
 
 	blocks, err := l2BlockOrm.GetUnchunkedBlocks(context.Background())
 	assert.NoError(t, err)
@@ -135,9 +127,6 @@ func TestChunkOrm(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NoError(t, migrate.ResetDB(sqlDB))
 
-	err = l2BlockOrm.InsertL2Blocks(context.Background(), []*bridgeTypes.WrappedBlock{wrappedBlock1, wrappedBlock2})
-	assert.NoError(t, err)
-
 	dbChunk1, err := chunkOrm.InsertChunk(context.Background(), chunk1)
 	assert.NoError(t, err)
 	assert.Equal(t, dbChunk1.Hash, chunkHash1.Hex())
@@ -177,35 +166,24 @@ func TestBatchOrm(t *testing.T) {
 	assert.NoError(t, err)
 	assert.NoError(t, migrate.ResetDB(sqlDB))
 
-	err = l2BlockOrm.InsertL2Blocks(context.Background(), []*bridgeTypes.WrappedBlock{wrappedBlock1, wrappedBlock2})
-	assert.NoError(t, err)
-
-	dbChunk1, err := chunkOrm.InsertChunk(context.Background(), chunk1)
-	assert.NoError(t, err)
-	assert.Equal(t, dbChunk1.Hash, chunkHash1.Hex())
-
-	dbChunk2, err := chunkOrm.InsertChunk(context.Background(), chunk2)
-	assert.NoError(t, err)
-	assert.Equal(t, dbChunk2.Hash, chunkHash2.Hex())
-
-	batch1, err := batchOrm.InsertBatch(context.Background(), 0, 0, chunkHash1.Hex(), chunkHash1.Hex(), []*bridgeTypes.Chunk{chunk1})
+	batch1, err := batchOrm.InsertBatch(context.Background(), 0, 0, chunkHash1.Hex(), chunkHash1.Hex(), []*types.Chunk{chunk1})
 	assert.NoError(t, err)
 	hash1 := batch1.Hash
 
 	batch1, err = batchOrm.GetBatchByIndex(context.Background(), 0)
 	assert.NoError(t, err)
-	batchHeader1, err := bridgeTypes.DecodeBatchHeader(batch1.BatchHeader)
+	batchHeader1, err := types.DecodeBatchHeader(batch1.BatchHeader)
 	assert.NoError(t, err)
 	batchHash1 := batchHeader1.Hash().Hex()
 	assert.Equal(t, hash1, batchHash1)
 
-	batch2, err := batchOrm.InsertBatch(context.Background(), 1, 1, chunkHash2.Hex(), chunkHash2.Hex(), []*bridgeTypes.Chunk{chunk2})
+	batch2, err := batchOrm.InsertBatch(context.Background(), 1, 1, chunkHash2.Hex(), chunkHash2.Hex(), []*types.Chunk{chunk2})
 	assert.NoError(t, err)
 	hash2 := batch2.Hash
 
 	batch2, err = batchOrm.GetBatchByIndex(context.Background(), 1)
 	assert.NoError(t, err)
-	batchHeader2, err := bridgeTypes.DecodeBatchHeader(batch2.BatchHeader)
+	batchHeader2, err := types.DecodeBatchHeader(batch2.BatchHeader)
 	assert.NoError(t, err)
 	batchHash2 := batchHeader2.Hash().Hex()
 	assert.Equal(t, hash2, batchHash2)
@@ -224,32 +202,11 @@ func TestBatchOrm(t *testing.T) {
 	assert.Equal(t, types.RollupPending, rollupStatus[0])
 	assert.Equal(t, types.RollupPending, rollupStatus[1])
 
-	err = batchOrm.UpdateProvingStatus(context.Background(), batchHash1, types.ProvingTaskSkipped)
-	assert.NoError(t, err)
-	err = batchOrm.UpdateRollupStatus(context.Background(), batchHash1, types.RollupCommitted)
-	assert.NoError(t, err)
-	err = batchOrm.UpdateProvingStatus(context.Background(), batchHash2, types.ProvingTaskFailed)
-	assert.NoError(t, err)
-	err = batchOrm.UpdateRollupStatus(context.Background(), batchHash2, types.RollupCommitted)
-	assert.NoError(t, err)
-
-	count, err = batchOrm.UpdateSkippedBatches(context.Background())
-	assert.NoError(t, err)
-	assert.Equal(t, uint64(2), count)
-
-	count, err = batchOrm.UpdateSkippedBatches(context.Background())
-	assert.NoError(t, err)
-	assert.Equal(t, uint64(0), count)
-
-	batch, err := batchOrm.GetBatchByIndex(context.Background(), 1)
-	assert.NoError(t, err)
-	assert.Equal(t, types.RollupFinalizationSkipped, types.RollupStatus(batch.RollupStatus))
-
 	err = batchOrm.UpdateProvingStatus(context.Background(), batchHash2, types.ProvingTaskVerified)
 	assert.NoError(t, err)
 
 	dbProof, err := batchOrm.GetVerifiedProofByHash(context.Background(), batchHash1)
-	assert.Error(t, err, gorm.ErrRecordNotFound)
+	assert.Error(t, err)
 	assert.Nil(t, dbProof)
 
 	err = batchOrm.UpdateProvingStatus(context.Background(), batchHash2, types.ProvingTaskVerified)

bridge/internal/types/block.go

@@ -1,136 +0,0 @@
-package types
-
-import (
-	"encoding/binary"
-	"errors"
-	"math"
-
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/common/hexutil"
-	"github.com/scroll-tech/go-ethereum/core/types"
-)
-
-const nonZeroByteGas uint64 = 16
-const zeroByteGas uint64 = 4
-
-// WrappedBlock contains the block's Header, Transactions and WithdrawTrieRoot hash.
-type WrappedBlock struct {
-	Header *types.Header `json:"header"`
-	// Transactions is only used for recover types.Transactions, the from of types.TransactionData field is missing.
-	Transactions     []*types.TransactionData `json:"transactions"`
-	WithdrawTrieRoot common.Hash              `json:"withdraw_trie_root,omitempty"`
-}
-
-// NumL1Messages returns the number of L1 messages in this block.
-// This number is the sum of included and skipped L1 messages.
-func (w *WrappedBlock) NumL1Messages(totalL1MessagePoppedBefore uint64) uint64 {
-	var lastQueueIndex *uint64
-	for _, txData := range w.Transactions {
-		if txData.Type == types.L1MessageTxType {
-			lastQueueIndex = &txData.Nonce
-		}
-	}
-	if lastQueueIndex == nil {
-		return 0
-	}
-	// note: last queue index included before this block is totalL1MessagePoppedBefore - 1
-	// TODO: cache results
-	return *lastQueueIndex - totalL1MessagePoppedBefore + 1
-}
-
-// Encode encodes the WrappedBlock into RollupV2 BlockContext Encoding.
-func (w *WrappedBlock) Encode(totalL1MessagePoppedBefore uint64) ([]byte, error) {
-	bytes := make([]byte, 60)
-
-	if !w.Header.Number.IsUint64() {
-		return nil, errors.New("block number is not uint64")
-	}
-	if len(w.Transactions) > math.MaxUint16 {
-		return nil, errors.New("number of transactions exceeds max uint16")
-	}
-
-	numL1Messages := w.NumL1Messages(totalL1MessagePoppedBefore)
-	if numL1Messages > math.MaxUint16 {
-		return nil, errors.New("number of L1 messages exceeds max uint16")
-	}
-
-	binary.BigEndian.PutUint64(bytes[0:], w.Header.Number.Uint64())
-	binary.BigEndian.PutUint64(bytes[8:], w.Header.Time)
-	// TODO: [16:47] Currently, baseFee is 0, because we disable EIP-1559.
-	binary.BigEndian.PutUint64(bytes[48:], w.Header.GasLimit)
-	binary.BigEndian.PutUint16(bytes[56:], uint16(len(w.Transactions)))
-	binary.BigEndian.PutUint16(bytes[58:], uint16(numL1Messages))
-
-	return bytes, nil
-}
-
-// EstimateL1CommitCalldataSize calculates the calldata size in l1 commit approximately.
-// TODO: The calculation could be more accurate by using 58 + len(l2TxDataBytes) (see Chunk).
-// This needs to be adjusted in the future.
-func (w *WrappedBlock) EstimateL1CommitCalldataSize() uint64 {
-	var size uint64
-	for _, txData := range w.Transactions {
-		if txData.Type == types.L1MessageTxType {
-			continue
-		}
-		size += uint64(len(txData.Data))
-	}
-	return size
-}
-
-// EstimateL1CommitGas calculates the calldata gas in l1 commit approximately.
-// TODO: This will need to be adjusted.
-// The part added here is only the calldata cost,
-// but we have execution cost for verifying blocks / chunks / batches and storing the batch hash.
-func (w *WrappedBlock) EstimateL1CommitGas() uint64 {
-	var total uint64
-	for _, txData := range w.Transactions {
-		if txData.Type == types.L1MessageTxType {
-			continue
-		}
-		data, _ := hexutil.Decode(txData.Data)
-		tx := types.NewTx(&types.LegacyTx{
-			Nonce:    txData.Nonce,
-			To:       txData.To,
-			Value:    txData.Value.ToInt(),
-			Gas:      txData.Gas,
-			GasPrice: txData.GasPrice.ToInt(),
-			Data:     data,
-			V:        txData.V.ToInt(),
-			R:        txData.R.ToInt(),
-			S:        txData.S.ToInt(),
-		})
-		rlpTxData, _ := tx.MarshalBinary()
-
-		for _, b := range rlpTxData {
-			if b == 0 {
-				total += zeroByteGas
-			} else {
-				total += nonZeroByteGas
-			}
-		}
-
-		var txLen [4]byte
-		binary.BigEndian.PutUint32(txLen[:], uint32(len(rlpTxData)))
-
-		for _, b := range txLen {
-			if b == 0 {
-				total += zeroByteGas
-			} else {
-				total += nonZeroByteGas
-			}
-		}
-	}
-	return total
-}
-
-// L2TxsNum calculates the number of l2 txs.
-func (w *WrappedBlock) L2TxsNum() uint64 {
-	var count uint64
-	for _, txData := range w.Transactions {
-		if txData.Type != types.L1MessageTxType {
-			count++
-		}
-	}
-	return count
-}

bridge/internal/utils/db.go

@@ -1,43 +0,0 @@
-package utils
-
-import (
-	"gorm.io/driver/postgres"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-
-	"scroll-tech/bridge/internal/config"
-)
-
-// InitDB init the db handler
-func InitDB(config *config.DBConfig) (*gorm.DB, error) {
-	db, err := gorm.Open(postgres.Open(config.DSN), &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Info),
-	})
-	if err != nil {
-		return nil, err
-	}
-	sqlDB, err := db.DB()
-	if err != nil {
-		return nil, err
-	}
-
-	sqlDB.SetMaxOpenConns(config.MaxOpenNum)
-	sqlDB.SetMaxIdleConns(config.MaxIdleNum)
-
-	if err = sqlDB.Ping(); err != nil {
-		return nil, err
-	}
-	return db, nil
-}
-
-// CloseDB close the db handler. notice the db handler only can close when then program exit.
-func CloseDB(db *gorm.DB) error {
-	sqlDB, err := db.DB()
-	if err != nil {
-		return err
-	}
-	if err := sqlDB.Close(); err != nil {
-		return err
-	}
-	return nil
-}

bridge/tests/bridge_test.go

@@ -11,12 +11,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"gorm.io/gorm"
 
+	"scroll-tech/common/database"
 	"scroll-tech/common/docker"
 
+	"scroll-tech/database/migrate"
+
 	bcmd "scroll-tech/bridge/cmd"
-	"scroll-tech/bridge/internal/config"
-	"scroll-tech/bridge/internal/orm/migrate"
-	"scroll-tech/bridge/internal/utils"
 	"scroll-tech/bridge/mock_bridge"
 )
 
@@ -46,13 +46,13 @@ var (
 )
 
 func setupDB(t *testing.T) *gorm.DB {
-	cfg := &config.DBConfig{
+	cfg := &database.Config{
 		DSN:        base.DBConfig.DSN,
 		DriverName: base.DBConfig.DriverName,
 		MaxOpenNum: base.DBConfig.MaxOpenNum,
 		MaxIdleNum: base.DBConfig.MaxIdleNum,
 	}
-	db, err := utils.InitDB(cfg)
+	db, err := database.InitDB(cfg)
 	assert.NoError(t, err)
 	sqlDB, err := db.DB()
 	assert.NoError(t, err)

bridge/tests/gas_oracle_test.go

@@ -9,18 +9,17 @@ import (
 	gethTypes "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/stretchr/testify/assert"
 
+	"scroll-tech/common/database"
 	"scroll-tech/common/types"
 
 	"scroll-tech/bridge/internal/controller/relayer"
 	"scroll-tech/bridge/internal/controller/watcher"
 	"scroll-tech/bridge/internal/orm"
-	bridgeTypes "scroll-tech/bridge/internal/types"
-	"scroll-tech/bridge/internal/utils"
 )
 
 func testImportL1GasPrice(t *testing.T) {
 	db := setupDB(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	prepareContracts(t)
 
@@ -44,10 +43,10 @@ func testImportL1GasPrice(t *testing.T) {
 
 	l1BlockOrm := orm.NewL1Block(db)
 	// check db status
-	latestBlockHeight, err := l1BlockOrm.GetLatestL1BlockHeight()
+	latestBlockHeight, err := l1BlockOrm.GetLatestL1BlockHeight(context.Background())
 	assert.NoError(t, err)
 	assert.Equal(t, number, latestBlockHeight)
-	blocks, err := l1BlockOrm.GetL1Blocks(map[string]interface{}{"number": latestBlockHeight})
+	blocks, err := l1BlockOrm.GetL1Blocks(context.Background(), map[string]interface{}{"number": latestBlockHeight})
 	assert.NoError(t, err)
 	assert.Equal(t, len(blocks), 1)
 	assert.Empty(t, blocks[0].OracleTxHash)
@@ -55,7 +54,7 @@ func testImportL1GasPrice(t *testing.T) {
 
 	// relay gas price
 	l1Relayer.ProcessGasPriceOracle()
-	blocks, err = l1BlockOrm.GetL1Blocks(map[string]interface{}{"number": latestBlockHeight})
+	blocks, err = l1BlockOrm.GetL1Blocks(context.Background(), map[string]interface{}{"number": latestBlockHeight})
 	assert.NoError(t, err)
 	assert.Equal(t, len(blocks), 1)
 	assert.NotEmpty(t, blocks[0].OracleTxHash)
@@ -64,7 +63,7 @@ func testImportL1GasPrice(t *testing.T) {
 
 func testImportL2GasPrice(t *testing.T) {
 	db := setupDB(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 	prepareContracts(t)
 
 	l2Cfg := bridgeApp.Config.L2Config
@@ -72,8 +71,8 @@ func testImportL2GasPrice(t *testing.T) {
 	assert.NoError(t, err)
 
 	// add fake chunk
-	chunk := &bridgeTypes.Chunk{
-		Blocks: []*bridgeTypes.WrappedBlock{
+	chunk := &types.Chunk{
+		Blocks: []*types.WrappedBlock{
 			{
 				Header: &gethTypes.Header{
 					Number:     big.NewInt(1),
@@ -90,7 +89,7 @@ func testImportL2GasPrice(t *testing.T) {
 	assert.NoError(t, err)
 
 	batchOrm := orm.NewBatch(db)
-	_, err = batchOrm.InsertBatch(context.Background(), 0, 0, chunkHash.Hex(), chunkHash.Hex(), []*bridgeTypes.Chunk{chunk})
+	_, err = batchOrm.InsertBatch(context.Background(), 0, 0, chunkHash.Hex(), chunkHash.Hex(), []*types.Chunk{chunk})
 	assert.NoError(t, err)
 
 	// check db status

bridge/tests/l1_message_relay_test.go

@@ -11,17 +11,17 @@ import (
 	"github.com/scroll-tech/go-ethereum/rpc"
 	"github.com/stretchr/testify/assert"
 
+	"scroll-tech/common/database"
 	"scroll-tech/common/types"
 
 	"scroll-tech/bridge/internal/controller/relayer"
 	"scroll-tech/bridge/internal/controller/watcher"
 	"scroll-tech/bridge/internal/orm"
-	"scroll-tech/bridge/internal/utils"
 )
 
 func testRelayL1MessageSucceed(t *testing.T) {
 	db := setupDB(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	prepareContracts(t)
 

bridge/tests/process_start_test.go

@@ -11,16 +11,15 @@ import (
 	_ "scroll-tech/bridge/cmd/msg_relayer/app"
 	_ "scroll-tech/bridge/cmd/rollup_relayer/app"
 
+	"scroll-tech/common/database"
 	cutils "scroll-tech/common/utils"
 
-	"scroll-tech/bridge/internal/utils"
-
 	"github.com/stretchr/testify/assert"
 )
 
 func testProcessStart(t *testing.T) {
 	db := setupDB(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	bridgeApp.RunApp(t, cutils.EventWatcherApp)
 	bridgeApp.RunApp(t, cutils.GasOracleApp)
@@ -32,7 +31,7 @@ func testProcessStart(t *testing.T) {
 
 func testProcessStartEnableMetrics(t *testing.T) {
 	db := setupDB(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	port, err := rand.Int(rand.Reader, big.NewInt(2000))
 	assert.NoError(t, err)

bridge/tests/rollup_test.go

@@ -10,6 +10,7 @@ import (
 	gethTypes "github.com/scroll-tech/go-ethereum/core/types"
 	"github.com/stretchr/testify/assert"
 
+	"scroll-tech/common/database"
 	"scroll-tech/common/types"
 	"scroll-tech/common/types/message"
 
@@ -17,13 +18,11 @@ import (
 	"scroll-tech/bridge/internal/controller/relayer"
 	"scroll-tech/bridge/internal/controller/watcher"
 	"scroll-tech/bridge/internal/orm"
-	bridgeTypes "scroll-tech/bridge/internal/types"
-	"scroll-tech/bridge/internal/utils"
 )
 
 func testCommitBatchAndFinalizeBatch(t *testing.T) {
 	db := setupDB(t)
-	defer utils.CloseDB(db)
+	defer database.CloseDB(db)
 
 	prepareContracts(t)
 
@@ -37,7 +36,7 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 	l1Watcher := watcher.NewL1WatcherClient(context.Background(), l1Client, 0, l1Cfg.Confirmations, l1Cfg.L1MessengerAddress, l1Cfg.L1MessageQueueAddress, l1Cfg.ScrollChainContractAddress, db)
 
 	// add some blocks to db
-	var wrappedBlocks []*bridgeTypes.WrappedBlock
+	var wrappedBlocks []*types.WrappedBlock
 	for i := 0; i < 10; i++ {
 		header := gethTypes.Header{
 			Number:     big.NewInt(int64(i)),
@@ -45,7 +44,7 @@ func testCommitBatchAndFinalizeBatch(t *testing.T) {
 			Difficulty: big.NewInt(0),
 			BaseFee:    big.NewInt(0),
 		}
-		wrappedBlocks = append(wrappedBlocks, &bridgeTypes.WrappedBlock{
+		wrappedBlocks = append(wrappedBlocks, &types.WrappedBlock{
 			Header:           &header,
 			Transactions:     nil,
 			WithdrawTrieRoot: common.Hash{},

bridge/utils/confirmation.go

@@ -1,56 +0,0 @@
-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

@@ -1,134 +0,0 @@
-package utils
-
-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"
-)
-
-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.NoError(t, err)
-		if !test.mustFail {
-			err = json.Unmarshal([]byte(test.input), &num)
-			assert.NoError(t, err)
-			got, err := json.Marshal(&num)
-			assert.NoError(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) {
-	var blockNumber int64
-	switch number.Int64() {
-	case int64(rpc.LatestBlockNumber):
-		blockNumber = int64(e.val)
-	case int64(rpc.SafeBlockNumber):
-		blockNumber = int64(e.val) - 6
-	case int64(rpc.FinalizedBlockNumber):
-		blockNumber = int64(e.val) - 12
-	default:
-		blockNumber = number.Int64()
-	}
-	if blockNumber < 0 {
-		blockNumber = 0
-	}
-
-	return &types.Header{Number: new(big.Int).SetInt64(blockNumber)}, nil
-}
-
-func TestGetLatestConfirmedBlockNumber(t *testing.T) {
-	ctx := context.Background()
-	client := MockEthClient{}
-
-	testCases := []struct {
-		blockNumber    uint64
-		confirmation   rpc.BlockNumber
-		expectedResult uint64
-	}{
-		{5, 6, 0},
-		{7, 6, 1},
-		{10, 2, 8},
-		{0, 1, 0},
-		{3, 0, 3},
-		{15, 15, 0},
-		{16, rpc.SafeBlockNumber, 10},
-		{22, rpc.FinalizedBlockNumber, 10},
-		{10, rpc.LatestBlockNumber, 10},
-		{5, rpc.SafeBlockNumber, 0},
-		{11, rpc.FinalizedBlockNumber, 0},
-	}
-
-	for _, testCase := range testCases {
-		client.val = testCase.blockNumber
-		confirmed, err := GetLatestConfirmedBlockNumber(ctx, &client, testCase.confirmation)
-		assert.NoError(t, err)
-		assert.Equal(t, testCase.expectedResult, confirmed)
-	}
-}

bridge/utils/utils.go

@@ -1,65 +0,0 @@
-package utils
-
-import (
-	"fmt"
-	"math/big"
-
-	"github.com/scroll-tech/go-ethereum/accounts/abi"
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/scroll-tech/go-ethereum/crypto"
-
-	bridgeabi "scroll-tech/bridge/abi"
-)
-
-// Keccak2 compute the keccack256 of two concatenations of bytes32
-func Keccak2(a common.Hash, b common.Hash) common.Hash {
-	return common.BytesToHash(crypto.Keccak256(append(a.Bytes()[:], b.Bytes()[:]...)))
-}
-
-// ComputeMessageHash compute the message hash
-func ComputeMessageHash(
-	sender common.Address,
-	target common.Address,
-	value *big.Int,
-	messageNonce *big.Int,
-	message []byte,
-) common.Hash {
-	data, _ := bridgeabi.L2ScrollMessengerABI.Pack("relayMessage", sender, target, value, messageNonce, message)
-	return common.BytesToHash(crypto.Keccak256(data))
-}
-
-// BufferToUint256Le convert bytes array to uint256 array assuming little-endian
-func BufferToUint256Le(buffer []byte) []*big.Int {
-	buffer256 := make([]*big.Int, len(buffer)/32)
-	for i := 0; i < len(buffer)/32; i++ {
-		v := big.NewInt(0)
-		shft := big.NewInt(1)
-		for j := 0; j < 32; j++ {
-			v = new(big.Int).Add(v, new(big.Int).Mul(shft, big.NewInt(int64(buffer[i*32+j]))))
-			shft = new(big.Int).Mul(shft, big.NewInt(256))
-		}
-		buffer256[i] = v
-	}
-	return buffer256
-}
-
-// UnpackLog unpacks a retrieved log into the provided output structure.
-// @todo: add unit test.
-func UnpackLog(c *abi.ABI, out interface{}, event string, log types.Log) error {
-	if log.Topics[0] != c.Events[event].ID {
-		return fmt.Errorf("event signature mismatch")
-	}
-	if len(log.Data) > 0 {
-		if err := c.UnpackIntoInterface(out, event, log.Data); err != nil {
-			return err
-		}
-	}
-	var indexed abi.Arguments
-	for _, arg := range c.Events[event].Inputs {
-		if arg.Indexed {
-			indexed = append(indexed, arg)
-		}
-	}
-	return abi.ParseTopics(out, indexed, log.Topics[1:])
-}

bridge/utils/utils_test.go

@@ -1,49 +0,0 @@
-package utils
-
-import (
-	"math/big"
-	"testing"
-
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestKeccak2(t *testing.T) {
-	hash := Keccak2(common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000000"), common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000000"))
-	if hash != common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5") {
-		t.Fatalf("Invalid keccak, want %s, got %s", "0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5", hash.Hex())
-	}
-
-	hash = Keccak2(common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5"), common.HexToHash("0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5"))
-	if hash != common.HexToHash("0xb4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d30") {
-		t.Fatalf("Invalid keccak, want %s, got %s", "0xb4c11951957c6f8f642c4af61cd6b24640fec6dc7fc607ee8206a99e92410d30", hash.Hex())
-	}
-
-	hash = Keccak2(common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000001"), common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000002"))
-	if hash != common.HexToHash("0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0") {
-		t.Fatalf("Invalid keccak, want %s, got %s", "0xe90b7bceb6e7df5418fb78d8ee546e97c83a08bbccc01a0644d599ccd2a7c2e0", hash.Hex())
-	}
-}
-
-func TestComputeMessageHash(t *testing.T) {
-	hash := ComputeMessageHash(
-		common.HexToAddress("0x1C5A77d9FA7eF466951B2F01F724BCa3A5820b63"),
-		common.HexToAddress("0x4592D8f8D7B001e72Cb26A73e4Fa1806a51aC79d"),
-		big.NewInt(0),
-		big.NewInt(1),
-		[]byte("testbridgecontract"),
-	)
-	assert.Equal(t, "0xda253c04595a49017bb54b1b46088c69752b5ad2f0c47971ac76b8b25abec202", hash.String())
-}
-
-func TestBufferToUint256Le(t *testing.T) {
-	input := []byte{
-		0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	}
-	expectedOutput := []*big.Int{big.NewInt(1)}
-	result := BufferToUint256Le(input)
-	assert.Equal(t, expectedOutput, result)
-}

build/.golangci.yml

@@ -209,6 +209,13 @@ issues:
       linters:
         - errcheck
         - gosec
+        
+    # Exclude abi files in bridge-history-api
+    - path: backend_abi\.go
+      linters:
+        - errcheck
+        - gosec
+        - golint
 
     # Exclude some staticcheck messages
     - linters:

common/database/config.go

@@ -1,7 +1,7 @@
-package config
+package database
 
-// DBConfig db config
-type DBConfig struct {
+// Config db config
+type Config struct {
 	// data source name
 	DSN        string `json:"dsn"`
 	DriverName string `json:"driver_name"`

common/database/db.go

@@ -0,0 +1,80 @@
+package database
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/scroll-tech/go-ethereum/log"
+	"gorm.io/driver/postgres"
+	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
+	"gorm.io/gorm/utils"
+)
+
+type gormLogger struct {
+	gethLogger log.Logger
+}
+
+func (g *gormLogger) LogMode(level logger.LogLevel) logger.Interface {
+	return g
+}
+
+func (g *gormLogger) Info(_ context.Context, msg string, data ...interface{}) {
+	infoMsg := fmt.Sprintf(msg, data...)
+	g.gethLogger.Info("gorm", "info message", infoMsg)
+}
+
+func (g *gormLogger) Warn(_ context.Context, msg string, data ...interface{}) {
+	warnMsg := fmt.Sprintf(msg, data...)
+	g.gethLogger.Warn("gorm", "warn message", warnMsg)
+}
+
+func (g *gormLogger) Error(_ context.Context, msg string, data ...interface{}) {
+	errMsg := fmt.Sprintf(msg, data...)
+	g.gethLogger.Error("gorm", "err message", errMsg)
+}
+
+func (g *gormLogger) Trace(_ context.Context, begin time.Time, fc func() (string, int64), err error) {
+	elapsed := time.Since(begin)
+	sql, rowsAffected := fc()
+	g.gethLogger.Debug("gorm", "line", utils.FileWithLineNum(), "cost", elapsed, "sql", sql, "rowsAffected", rowsAffected, "err", err)
+}
+
+// InitDB init the db handler
+func InitDB(config *Config) (*gorm.DB, error) {
+	tmpGormLogger := gormLogger{
+		gethLogger: log.Root(),
+	}
+
+	db, err := gorm.Open(postgres.Open(config.DSN), &gorm.Config{
+		Logger: &tmpGormLogger,
+	})
+	if err != nil {
+		return nil, err
+	}
+	sqlDB, err := db.DB()
+	if err != nil {
+		return nil, err
+	}
+
+	sqlDB.SetMaxOpenConns(config.MaxOpenNum)
+	sqlDB.SetMaxIdleConns(config.MaxIdleNum)
+
+	if err = sqlDB.Ping(); err != nil {
+		return nil, err
+	}
+	return db, nil
+}
+
+// CloseDB close the db handler. notice the db handler only can close when then program exit.
+func CloseDB(db *gorm.DB) error {
+	sqlDB, err := db.DB()
+	if err != nil {
+		return err
+	}
+	if err := sqlDB.Close(); err != nil {
+		return err
+	}
+	return nil
+}

common/database/db_test.go

@@ -0,0 +1,35 @@
+package database
+
+import (
+	"context"
+	"errors"
+	"io"
+	"os"
+	"testing"
+	"time"
+
+	"github.com/mattn/go-colorable"
+	"github.com/mattn/go-isatty"
+	"github.com/scroll-tech/go-ethereum/log"
+)
+
+func TestGormLogger(t *testing.T) {
+	output := io.Writer(os.Stderr)
+	usecolor := (isatty.IsTerminal(os.Stderr.Fd()) || isatty.IsCygwinTerminal(os.Stderr.Fd())) && os.Getenv("TERM") != "dumb"
+	if usecolor {
+		output = colorable.NewColorableStderr()
+	}
+	ostream := log.StreamHandler(output, log.TerminalFormat(usecolor))
+	glogger := log.NewGlogHandler(ostream)
+	// Set log level
+	glogger.Verbosity(log.LvlTrace)
+	log.Root().SetHandler(glogger)
+
+	var gl gormLogger
+	gl.gethLogger = log.Root()
+
+	gl.Error(context.Background(), "test %s error:%v", "testError", errors.New("test error"))
+	gl.Warn(context.Background(), "test %s warn:%v", "testWarn", errors.New("test warn"))
+	gl.Info(context.Background(), "test %s warn:%v", "testInfo", errors.New("test info"))
+	gl.Trace(context.Background(), time.Now(), func() (string, int64) { return "test trace", 1 }, nil)
+}

common/go.mod

@@ -13,6 +13,8 @@ require (
 	github.com/scroll-tech/go-ethereum v1.10.14-0.20230613025759-f055f50f9d56
 	github.com/stretchr/testify v1.8.2
 	github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa
+	gorm.io/driver/postgres v1.5.0
+	gorm.io/gorm v1.25.1
 )
 
 require (
@@ -51,7 +53,12 @@ require (
 	github.com/influxdata/influxdb v1.8.3 // indirect
 	github.com/influxdata/influxdb-client-go/v2 v2.4.0 // indirect
 	github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 // indirect
+	github.com/jackc/pgpassfile v1.0.0 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
+	github.com/jackc/pgx/v5 v5.3.0 // indirect
 	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/julienschmidt/httprouter v1.3.0 // indirect
 	github.com/kr/pretty v0.3.1 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
@@ -93,7 +100,6 @@ require (
 	golang.org/x/text v0.10.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/tools v0.8.0 // indirect
-	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/urfave/cli.v1 v1.20.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

common/go.sum

@@ -212,9 +212,20 @@ github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19y
 github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bSgUQ7q5ZLSO+bKBGqJiCBGAl+9DxyW63zLTujjUlOE=
 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/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
+github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
+github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgx/v5 v5.3.0 h1:/NQi8KHMpKWHInxXesC8yD4DhkXPrVhmnwYkjp9AmBA=
+github.com/jackc/pgx/v5 v5.3.0/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8=
+github.com/jackc/puddle/v2 v2.2.0/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
 github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
 github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
+github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
+github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=
 github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ=
 github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
@@ -240,6 +251,7 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -354,6 +366,7 @@ github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUc
 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.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
@@ -393,6 +406,7 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5
 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/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY=
@@ -415,6 +429,7 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
@@ -432,6 +447,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
 golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
 golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -462,6 +479,7 @@ golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
 golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -485,6 +503,9 @@ golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -500,6 +521,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -537,21 +559,29 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210324051608-47abb6519492/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-20210616094352-59db8d763f22/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-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
 golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
 golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -591,6 +621,7 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.8.0 h1:vSDcovVPld282ceKgDimkRSC8kpaH1dgyc9UMzlt84Y=
 golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -662,6 +693,11 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gorm.io/driver/postgres v1.5.0 h1:u2FXTy14l45qc3UeCJ7QaAXZmZfDDv0YrthvmRq1l0U=
+gorm.io/driver/postgres v1.5.0/go.mod h1:FUZXzO+5Uqg5zzwzv4KK49R8lvGIyscBOqYrtI1Ce9A=
+gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
+gorm.io/gorm v1.25.1 h1:nsSALe5Pr+cM3V1qwwQ7rOkw+6UeLrX5O4v3llhHa64=
+gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
 gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
 gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=

common/libzkp/impl/Cargo.lock

@@ -1898,7 +1898,7 @@ source = "git+https://github.com/scroll-tech/halo2-snark-aggregator?branch=scrol
 dependencies = [
  "group",
  "halo2_proofs",
- "halo2curves 0.3.1 (git+https://github.com/privacy-scaling-explorations/halo2curves.git?tag=0.3.1)",
+ "halo2curves 0.3.1 (git+https://github.com/privacy-scaling-explorations//halo2curves.git?rev=9b67e19)",
  "num-bigint",
  "num-integer",
 ]
@@ -1929,7 +1929,7 @@ dependencies = [
  "digest 0.10.3",
  "group",
  "halo2_proofs",
- "halo2curves 0.3.1 (git+https://github.com/privacy-scaling-explorations/halo2curves.git?tag=0.3.1)",
+ "halo2curves 0.3.1 (git+https://github.com/privacy-scaling-explorations//halo2curves.git?rev=9b67e19)",
  "log",
  "num-bigint",
  "poseidon",
@@ -1947,7 +1947,7 @@ dependencies = [
  "halo2-ecc-circuit-lib",
  "halo2-snark-aggregator-api",
  "halo2_proofs",
- "halo2curves 0.3.1 (git+https://github.com/privacy-scaling-explorations/halo2curves.git?tag=0.3.1)",
+ "halo2curves 0.3.1 (git+https://github.com/privacy-scaling-explorations//halo2curves.git?rev=9b67e19)",
  "log",
  "rand 0.8.5",
  "rand_core 0.6.3",
@@ -1966,7 +1966,7 @@ dependencies = [
  "halo2-snark-aggregator-api",
  "halo2-snark-aggregator-circuit",
  "halo2_proofs",
- "halo2curves 0.3.1 (git+https://github.com/privacy-scaling-explorations/halo2curves.git?tag=0.3.1)",
+ "halo2curves 0.3.1 (git+https://github.com/privacy-scaling-explorations//halo2curves.git?rev=9b67e19)",
  "log",
  "num-bigint",
  "sha3 0.10.1",
@@ -2015,7 +2015,7 @@ dependencies = [
  "cfg-if 0.1.10",
  "ff",
  "group",
- "halo2curves 0.3.1 (git+https://github.com/privacy-scaling-explorations/halo2curves.git?tag=0.3.1)",
+ "halo2curves 0.3.1 (git+https://github.com/privacy-scaling-explorations//halo2curves.git?rev=9b67e19)",
  "log",
  "num-bigint",
  "num-integer",
@@ -2030,7 +2030,7 @@ dependencies = [
 [[package]]
 name = "halo2curves"
 version = "0.3.1"
-source = "git+https://github.com/privacy-scaling-explorations/halo2curves.git?tag=0.3.1#9b67e19bca30a35208b0c1b41c1723771e2c9f49"
+source = "git+https://github.com/privacy-scaling-explorations//halo2curves.git?rev=9b67e19"
 dependencies = [
  "ff",
  "group",
@@ -3245,7 +3245,7 @@ version = "0.2.0"
 source = "git+https://github.com/scroll-tech/poseidon.git?branch=scroll-dev-0220#2fb4a2385bada39b50dce12fe50cb80d2fd33476"
 dependencies = [
  "group",
- "halo2curves 0.3.1 (git+https://github.com/privacy-scaling-explorations/halo2curves.git?tag=0.3.1)",
+ "halo2curves 0.3.1 (git+https://github.com/privacy-scaling-explorations//halo2curves.git?rev=9b67e19)",
  "subtle",
 ]
 
@@ -4121,7 +4121,7 @@ source = "git+https://github.com/privacy-scaling-explorations/snark-verifier?tag
 dependencies = [
  "ecc",
  "halo2_proofs",
- "halo2curves 0.3.1 (git+https://github.com/privacy-scaling-explorations/halo2curves.git?tag=0.3.1)",
+ "halo2curves 0.3.1 (git+https://github.com/privacy-scaling-explorations//halo2curves.git?rev=9b67e19)",
  "hex",
  "itertools",
  "lazy_static",
@@ -5051,7 +5051,7 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
 [[package]]
 name = "types"
 version = "0.3.0"
-source = "git+https://github.com/scroll-tech/scroll-zkevm?rev=78ab7a7#78ab7a770f7753fa88c8aab4969296f06e1c811a"
+source = "git+https://github.com/scroll-tech/scroll-prover?rev=78ab7a7#78ab7a770f7753fa88c8aab4969296f06e1c811a"
 dependencies = [
  "base64 0.13.0",
  "blake2",
@@ -5727,7 +5727,7 @@ dependencies = [
 [[package]]
 name = "zkevm"
 version = "0.3.0"
-source = "git+https://github.com/scroll-tech/scroll-zkevm?rev=78ab7a7#78ab7a770f7753fa88c8aab4969296f06e1c811a"
+source = "git+https://github.com/scroll-tech/scroll-prover?rev=78ab7a7#78ab7a770f7753fa88c8aab4969296f06e1c811a"
 dependencies = [
  "anyhow",
  "blake2",

common/libzkp/impl/Cargo.toml

@@ -7,14 +7,17 @@ edition = "2021"
 [lib]
 crate-type = ["cdylib"]
 
+# `//` is used to skip https://github.com/rust-lang/cargo/issues/5478#issuecomment-522719793.
+[patch."https://github.com/privacy-scaling-explorations/halo2curves.git"]
+halo2curves = { git = 'https://github.com/privacy-scaling-explorations//halo2curves.git', rev = "9b67e19" }
 [patch."https://github.com/privacy-scaling-explorations/halo2.git"]
 halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "scroll-dev-0220"  }
 [patch."https://github.com/privacy-scaling-explorations/poseidon.git"]
 poseidon = { git = "https://github.com/scroll-tech/poseidon.git", branch = "scroll-dev-0220" }
 
 [dependencies]
-zkevm = { git = "https://github.com/scroll-tech/scroll-zkevm", rev="78ab7a7" }
-types = { git = "https://github.com/scroll-tech/scroll-zkevm", rev="78ab7a7" }
+zkevm = { git = "https://github.com/scroll-tech/scroll-prover", rev="78ab7a7" }
+types = { git = "https://github.com/scroll-tech/scroll-prover", rev="78ab7a7" }
 halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2022_09_10" }
 
 log = "0.4"
@@ -32,4 +35,4 @@ debug-assertions = true
 
 [profile.release]
 opt-level = 3
-debug-assertions = true
+debug-assertions = true

common/libzkp/interface/libzkp.h

@@ -1,5 +1,5 @@
-init_prover(char *params_path, char *seed_path);
+void init_prover(char *params_path, char *seed_path);
 char* create_agg_proof(char *trace);
 char* create_agg_proof_multi(char *trace);
-init_verifier(char *params_path, char *agg_vk_path);
+void init_verifier(char *params_path, char *agg_vk_path);
 char verify_agg_proof(char *proof);

common/types/batch.go

@@ -1,236 +0,0 @@
-package types
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/binary"
-	"math/big"
-
-	"github.com/scroll-tech/go-ethereum/common"
-	"github.com/scroll-tech/go-ethereum/common/hexutil"
-	"github.com/scroll-tech/go-ethereum/core/types"
-	"github.com/scroll-tech/go-ethereum/crypto"
-
-	abi "scroll-tech/bridge/abi"
-)
-
-// PublicInputHashConfig is the configuration of how to compute the public input hash.
-type PublicInputHashConfig struct {
-	MaxTxNum      int         `json:"max_tx_num"`
-	PaddingTxHash common.Hash `json:"padding_tx_hash"`
-}
-
-const defaultMaxTxNum = 44
-
-var defaultPaddingTxHash = [32]byte{}
-
-// BatchData contains info of batch to be committed.
-type BatchData struct {
-	Batch        abi.IScrollChainBatch
-	TxHashes     []common.Hash
-	TotalTxNum   uint64
-	TotalL1TxNum uint64
-	TotalL2Gas   uint64
-
-	// cache for the BatchHash
-	hash *common.Hash
-	// The config to compute the public input hash, or the block hash.
-	// If it is nil, the hash calculation will use `defaultMaxTxNum` and `defaultPaddingTxHash`.
-	piCfg *PublicInputHashConfig
-}
-
-// Timestamp returns the timestamp of the first block in the BlockData.
-func (b *BatchData) Timestamp() uint64 {
-	if len(b.Batch.Blocks) == 0 {
-		return 0
-	}
-	return b.Batch.Blocks[0].Timestamp
-}
-
-// Hash calculates the hash of this batch.
-func (b *BatchData) Hash() *common.Hash {
-	if b.hash != nil {
-		return b.hash
-	}
-
-	buf := make([]byte, 8)
-	hasher := crypto.NewKeccakState()
-
-	// 1. hash PrevStateRoot, NewStateRoot, WithdrawTrieRoot
-	// @todo: panic on error here.
-	_, _ = hasher.Write(b.Batch.PrevStateRoot[:])
-	_, _ = hasher.Write(b.Batch.NewStateRoot[:])
-	_, _ = hasher.Write(b.Batch.WithdrawTrieRoot[:])
-
-	// 2. hash all block contexts
-	for _, block := range b.Batch.Blocks {
-		// write BlockHash & ParentHash
-		_, _ = hasher.Write(block.BlockHash[:])
-		_, _ = hasher.Write(block.ParentHash[:])
-		// write BlockNumber
-		binary.BigEndian.PutUint64(buf, block.BlockNumber)
-		_, _ = hasher.Write(buf)
-		// write Timestamp
-		binary.BigEndian.PutUint64(buf, block.Timestamp)
-		_, _ = hasher.Write(buf)
-		// write BaseFee
-		var baseFee [32]byte
-		if block.BaseFee != nil {
-			baseFee = newByte32FromBytes(block.BaseFee.Bytes())
-		}
-		_, _ = hasher.Write(baseFee[:])
-		// write GasLimit
-		binary.BigEndian.PutUint64(buf, block.GasLimit)
-		_, _ = hasher.Write(buf)
-		// write NumTransactions
-		binary.BigEndian.PutUint16(buf[:2], block.NumTransactions)
-		_, _ = hasher.Write(buf[:2])
-		// write NumL1Messages
-		binary.BigEndian.PutUint16(buf[:2], block.NumL1Messages)
-		_, _ = hasher.Write(buf[:2])
-	}
-
-	// 3. add all tx hashes
-	for _, txHash := range b.TxHashes {
-		_, _ = hasher.Write(txHash[:])
-	}
-
-	// 4. append empty tx hash up to MaxTxNum
-	maxTxNum := defaultMaxTxNum
-	paddingTxHash := common.Hash(defaultPaddingTxHash)
-	if b.piCfg != nil {
-		maxTxNum = b.piCfg.MaxTxNum
-		paddingTxHash = b.piCfg.PaddingTxHash
-	}
-	for i := len(b.TxHashes); i < maxTxNum; i++ {
-		_, _ = hasher.Write(paddingTxHash[:])
-	}
-
-	b.hash = new(common.Hash)
-	_, _ = hasher.Read(b.hash[:])
-
-	return b.hash
-}
-
-// NewBatchData creates a BatchData given the parent batch information and the traces of the blocks
-// included in this batch
-func NewBatchData(parentBatch *BlockBatch, blocks []*WrappedBlock, piCfg *PublicInputHashConfig) *BatchData {
-	batchData := new(BatchData)
-	batch := &batchData.Batch
-
-	// set BatchIndex, ParentBatchHash
-	batch.BatchIndex = parentBatch.Index + 1
-	batch.ParentBatchHash = common.HexToHash(parentBatch.Hash)
-	batch.Blocks = make([]abi.IScrollChainBlockContext, len(blocks))
-
-	var batchTxDataBuf bytes.Buffer
-	batchTxDataWriter := bufio.NewWriter(&batchTxDataBuf)
-
-	for i, block := range blocks {
-		batchData.TotalTxNum += uint64(len(block.Transactions))
-		batchData.TotalL2Gas += block.Header.GasUsed
-
-		// set baseFee to 0 when it's nil in the block header
-		baseFee := block.Header.BaseFee
-		if baseFee == nil {
-			baseFee = big.NewInt(0)
-		}
-
-		batch.Blocks[i] = abi.IScrollChainBlockContext{
-			BlockHash:       block.Header.Hash(),
-			ParentHash:      block.Header.ParentHash,
-			BlockNumber:     block.Header.Number.Uint64(),
-			Timestamp:       block.Header.Time,
-			BaseFee:         baseFee,
-			GasLimit:        block.Header.GasLimit,
-			NumTransactions: uint16(len(block.Transactions)),
-			NumL1Messages:   0, // TODO: currently use 0, will re-enable after we use l2geth to include L1 messages
-		}
-
-		// fill in RLP-encoded transactions
-		for _, txData := range block.Transactions {
-			data, _ := hexutil.Decode(txData.Data)
-			// right now we only support legacy tx
-			tx := types.NewTx(&types.LegacyTx{
-				Nonce:    txData.Nonce,
-				To:       txData.To,
-				Value:    txData.Value.ToInt(),
-				Gas:      txData.Gas,
-				GasPrice: txData.GasPrice.ToInt(),
-				Data:     data,
-				V:        txData.V.ToInt(),
-				R:        txData.R.ToInt(),
-				S:        txData.S.ToInt(),
-			})
-			rlpTxData, _ := tx.MarshalBinary()
-			var txLen [4]byte
-			binary.BigEndian.PutUint32(txLen[:], uint32(len(rlpTxData)))
-			_, _ = batchTxDataWriter.Write(txLen[:])
-			_, _ = batchTxDataWriter.Write(rlpTxData)
-			batchData.TxHashes = append(batchData.TxHashes, tx.Hash())
-		}
-
-		if i == 0 {
-			batch.PrevStateRoot = common.HexToHash(parentBatch.StateRoot)
-		}
-
-		// set NewStateRoot & WithdrawTrieRoot from the last block
-		if i == len(blocks)-1 {
-			batch.NewStateRoot = block.Header.Root
-			batch.WithdrawTrieRoot = block.WithdrawTrieRoot
-		}
-	}
-
-	if err := batchTxDataWriter.Flush(); err != nil {
-		panic("Buffered I/O flush failed")
-	}
-
-	batch.L2Transactions = batchTxDataBuf.Bytes()
-	batchData.piCfg = piCfg
-
-	return batchData
-}
-
-// NewGenesisBatchData generates the batch that contains the genesis block.
-func NewGenesisBatchData(genesisBlockTrace *WrappedBlock) *BatchData {
-	header := genesisBlockTrace.Header
-	if header.Number.Uint64() != 0 {
-		panic("invalid genesis block trace: block number is not 0")
-	}
-
-	batchData := new(BatchData)
-	batch := &batchData.Batch
-
-	// fill in batch information
-	batch.BatchIndex = 0
-	batch.Blocks = make([]abi.IScrollChainBlockContext, 1)
-	batch.NewStateRoot = header.Root
-	// PrevStateRoot, WithdrawTrieRoot, ParentBatchHash should all be 0
-	// L2Transactions should be empty
-
-	// fill in block context
-	batch.Blocks[0] = abi.IScrollChainBlockContext{
-		BlockHash:       header.Hash(),
-		ParentHash:      header.ParentHash,
-		BlockNumber:     header.Number.Uint64(),
-		Timestamp:       header.Time,
-		BaseFee:         header.BaseFee,
-		GasLimit:        header.GasLimit,
-		NumTransactions: 0,
-		NumL1Messages:   0,
-	}
-
-	return batchData
-}
-
-// newByte32FromBytes converts the bytes in big-endian encoding to 32 bytes in big-endian encoding
-func newByte32FromBytes(b []byte) [32]byte {
-	var byte32 [32]byte
-
-	if len(b) > 32 {
-		b = b[len(b)-32:]
-	}
-
-	copy(byte32[32-len(b):], b)
-	return byte32
-}

common/types/batch_header.go

@@ -36,7 +36,7 @@ func NewBatchHeader(version uint8, batchIndex, totalL1MessagePoppedBefore uint64
 	// the next queue index that we need to process
 	nextIndex := totalL1MessagePoppedBefore
 
-	for _, chunk := range chunks {
+	for chunkID, chunk := range chunks {
 		// build data hash
 		totalL1MessagePoppedBeforeChunk := nextIndex
 		chunkHash, err := chunk.Hash(totalL1MessagePoppedBeforeChunk)
@@ -46,7 +46,7 @@ func NewBatchHeader(version uint8, batchIndex, totalL1MessagePoppedBefore uint64
 		dataBytes = append(dataBytes, chunkHash.Bytes()...)
 
 		// build skip bitmap
-		for _, block := range chunk.Blocks {
+		for blockID, block := range chunk.Blocks {
 			for _, tx := range block.Transactions {
 				if tx.Type != types.L1MessageTxType {
 					continue
@@ -54,7 +54,7 @@ func NewBatchHeader(version uint8, batchIndex, totalL1MessagePoppedBefore uint64
 				currentIndex := tx.Nonce
 
 				if currentIndex < nextIndex {
-					return nil, fmt.Errorf("unexpected batch payload, expected queue index: %d, got: %d", nextIndex, currentIndex)
+					return nil, fmt.Errorf("unexpected batch payload, expected queue index: %d, got: %d. Batch index: %d, chunk index in batch: %d, block index in chunk: %d, block hash: %v, transaction hash: %v", nextIndex, currentIndex, batchIndex, chunkID, blockID, block.Header.Hash(), tx.TxHash)
 				}
 
 				// mark skipped messages

common/types/batch_header_test.go

@@ -11,7 +11,7 @@ import (
 
 func TestNewBatchHeader(t *testing.T) {
 	// Without L1 Msg
-	templateBlockTrace, err := os.ReadFile("../../../common/testdata/blockTrace_02.json")
+	templateBlockTrace, err := os.ReadFile("../testdata/blockTrace_02.json")
 	assert.NoError(t, err)
 
 	wrappedBlock := &WrappedBlock{}
@@ -36,7 +36,7 @@ func TestNewBatchHeader(t *testing.T) {
 	assert.Equal(t, 0, len(batchHeader.skippedL1MessageBitmap))
 
 	// 1 L1 Msg in 1 bitmap
-	templateBlockTrace2, err := os.ReadFile("../../../common/testdata/blockTrace_04.json")
+	templateBlockTrace2, err := os.ReadFile("../testdata/blockTrace_04.json")
 	assert.NoError(t, err)
 
 	wrappedBlock2 := &WrappedBlock{}
@@ -54,7 +54,7 @@ func TestNewBatchHeader(t *testing.T) {
 	assert.Equal(t, expectedBitmap, common.Bytes2Hex(batchHeader.skippedL1MessageBitmap))
 
 	// many consecutive L1 Msgs in 1 bitmap, no leading skipped msgs
-	templateBlockTrace3, err := os.ReadFile("../../../common/testdata/blockTrace_05.json")
+	templateBlockTrace3, err := os.ReadFile("../testdata/blockTrace_05.json")
 	assert.NoError(t, err)
 
 	wrappedBlock3 := &WrappedBlock{}
@@ -87,7 +87,7 @@ func TestNewBatchHeader(t *testing.T) {
 	assert.Equal(t, expectedBitmap, common.Bytes2Hex(batchHeader.skippedL1MessageBitmap))
 
 	// many sparse L1 Msgs in 1 bitmap
-	templateBlockTrace4, err := os.ReadFile("../../../common/testdata/blockTrace_06.json")
+	templateBlockTrace4, err := os.ReadFile("../testdata/blockTrace_06.json")
 	assert.NoError(t, err)
 
 	wrappedBlock4 := &WrappedBlock{}
@@ -106,7 +106,7 @@ func TestNewBatchHeader(t *testing.T) {
 	assert.Equal(t, expectedBitmap, common.Bytes2Hex(batchHeader.skippedL1MessageBitmap))
 
 	// many L1 Msgs in each of 2 bitmaps
-	templateBlockTrace5, err := os.ReadFile("../../../common/testdata/blockTrace_07.json")
+	templateBlockTrace5, err := os.ReadFile("../testdata/blockTrace_07.json")
 	assert.NoError(t, err)
 
 	wrappedBlock5 := &WrappedBlock{}
@@ -127,7 +127,7 @@ func TestNewBatchHeader(t *testing.T) {
 
 func TestBatchHeaderEncode(t *testing.T) {
 	// Without L1 Msg
-	templateBlockTrace, err := os.ReadFile("../../../common/testdata/blockTrace_02.json")
+	templateBlockTrace, err := os.ReadFile("../testdata/blockTrace_02.json")
 	assert.NoError(t, err)
 
 	wrappedBlock := &WrappedBlock{}
@@ -154,7 +154,7 @@ func TestBatchHeaderEncode(t *testing.T) {
 	assert.Equal(t, "0100000000000000010000000000000000000000000000000010a64c9bd905f8caf5d668fbda622d6558c5a42cdb4b3895709743d159c22e534136709aabc8a23aa17fbcc833da2f7857d3c2884feec9aae73429c135f94985", common.Bytes2Hex(bytes))
 
 	// With L1 Msg
-	templateBlockTrace2, err := os.ReadFile("../../../common/testdata/blockTrace_04.json")
+	templateBlockTrace2, err := os.ReadFile("../testdata/blockTrace_04.json")
 	assert.NoError(t, err)
 
 	wrappedBlock2 := &WrappedBlock{}
@@ -174,7 +174,7 @@ func TestBatchHeaderEncode(t *testing.T) {
 
 func TestBatchHeaderHash(t *testing.T) {
 	// Without L1 Msg
-	templateBlockTrace, err := os.ReadFile("../../../common/testdata/blockTrace_02.json")
+	templateBlockTrace, err := os.ReadFile("../testdata/blockTrace_02.json")
 	assert.NoError(t, err)
 
 	wrappedBlock := &WrappedBlock{}
@@ -199,7 +199,7 @@ func TestBatchHeaderHash(t *testing.T) {
 	hash := batchHeader.Hash()
 	assert.Equal(t, "d69da4357da0073f4093c76e49f077e21bb52f48f57ee3e1fbd9c38a2881af81", common.Bytes2Hex(hash.Bytes()))
 
-	templateBlockTrace, err = os.ReadFile("../../../common/testdata/blockTrace_03.json")
+	templateBlockTrace, err = os.ReadFile("../testdata/blockTrace_03.json")
 	assert.NoError(t, err)
 
 	wrappedBlock2 := &WrappedBlock{}
@@ -216,7 +216,7 @@ func TestBatchHeaderHash(t *testing.T) {
 	assert.Equal(t, "34de600163aa745d4513113137a5b54960d13f0d3f2849e490c4b875028bf930", common.Bytes2Hex(hash2.Bytes()))
 
 	// With L1 Msg
-	templateBlockTrace3, err := os.ReadFile("../../../common/testdata/blockTrace_04.json")
+	templateBlockTrace3, err := os.ReadFile("../testdata/blockTrace_04.json")
 	assert.NoError(t, err)
 
 	wrappedBlock3 := &WrappedBlock{}

common/types/batch_test.go

@@ -1,143 +0,0 @@
-package types
-
-import (
-	"encoding/json"
-	"math/big"
-	"os"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/scroll-tech/go-ethereum/common"
-	geth_types "github.com/scroll-tech/go-ethereum/core/types"
-
-	abi "scroll-tech/bridge/abi"
-)
-
-func TestBatchHash(t *testing.T) {
-	txBytes := common.Hex2Bytes("02f8710582fd14808506e38dccc9825208944d496ccc28058b1d74b7a19541663e21154f9c848801561db11e24a43380c080a0d890606d7a35b2ab0f9b866d62c092d5b163f3e6a55537ae1485aac08c3f8ff7a023997be2d32f53e146b160fff0ba81e81dbb4491c865ab174d15c5b3d28c41ae")
-	tx := new(geth_types.Transaction)
-	if err := tx.UnmarshalBinary(txBytes); err != nil {
-		t.Fatalf("invalid tx hex string: %s", err)
-	}
-
-	batchData := new(BatchData)
-	batchData.TxHashes = append(batchData.TxHashes, tx.Hash())
-	batchData.piCfg = &PublicInputHashConfig{
-		MaxTxNum:      4,
-		PaddingTxHash: common.HexToHash("0xb5baa665b2664c3bfed7eb46e00ebc110ecf2ebd257854a9bf2b9dbc9b2c08f6"),
-	}
-
-	batch := &batchData.Batch
-	batch.PrevStateRoot = common.HexToHash("0x000000000000000000000000000000000000000000000000000000000000cafe")
-
-	block := abi.IScrollChainBlockContext{
-		BlockNumber:     51966,
-		Timestamp:       123456789,
-		BaseFee:         new(big.Int).SetUint64(0),
-		GasLimit:        10000000000000000,
-		NumTransactions: 1,
-		NumL1Messages:   0,
-	}
-	batch.Blocks = append(batch.Blocks, block)
-
-	hash := batchData.Hash()
-	assert.Equal(t, *hash, common.HexToHash("0xa9f2ca3175794f91226a410ba1e60fff07a405c957562675c4149b77e659d805"))
-
-	// use a different tx hash
-	txBytes = common.Hex2Bytes("f8628001830f424094000000000000000000000000000000000000bbbb8080820a97a064e07cd8f939e2117724bdcbadc80dda421381cbc2a1f4e0d093d9cc5c5cf68ea03e264227f80852d88743cd9e43998f2746b619180366a87e4531debf9c3fa5dc")
-	tx = new(geth_types.Transaction)
-	if err := tx.UnmarshalBinary(txBytes); err != nil {
-		t.Fatalf("invalid tx hex string: %s", err)
-	}
-	batchData.TxHashes[0] = tx.Hash()
-
-	batchData.hash = nil // clear the cache
-	assert.Equal(t, *batchData.Hash(), common.HexToHash("0x398cb22bbfa1665c1b342b813267538a4c933d7f92d8bd9184aba0dd1122987b"))
-}
-
-func TestNewGenesisBatch(t *testing.T) {
-	genesisBlock := &geth_types.Header{
-		UncleHash:   common.HexToHash("0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"),
-		Root:        common.HexToHash("0x1b186a7a90ec3b41a2417062fe44dce8ce82ae76bfbb09eae786a4f1be1895f5"),
-		TxHash:      common.HexToHash("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"),
-		ReceiptHash: common.HexToHash("0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421"),
-		Difficulty:  big.NewInt(1),
-		Number:      big.NewInt(0),
-		GasLimit:    940000000,
-		GasUsed:     0,
-		Time:        1639724192,
-		Extra:       common.Hex2Bytes("0000000000000000000000000000000000000000000000000000000000000000214f8d488aa9ebf83e30bad45fb8f9c8ee2509f5511caff794753d07e9dfb218cfc233bb62d2c57022783094e1a7edb6f069f8424bb68496a0926b130000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"),
-		BaseFee:     big.NewInt(1000000000),
-	}
-	assert.Equal(
-		t,
-		genesisBlock.Hash().Hex(),
-		"0x92826bd3aad2ef70d8061dc4e25150b305d1233d9cd7579433a77d6eb01dae1c",
-		"wrong genesis block header",
-	)
-
-	blockTrace := &WrappedBlock{genesisBlock, nil, common.Hash{}}
-	batchData := NewGenesisBatchData(blockTrace)
-	t.Log(batchData.Batch.Blocks[0])
-	batchData.piCfg = &PublicInputHashConfig{
-		MaxTxNum:      25,
-		PaddingTxHash: common.HexToHash("0xb5baa665b2664c3bfed7eb46e00ebc110ecf2ebd257854a9bf2b9dbc9b2c08f6"),
-	}
-	assert.Equal(
-		t,
-		batchData.Hash().Hex(),
-		"0x65cf210e30f75cf8fd198df124255f73bc08d6324759e828a784fa938e7ac43d",
-		"wrong genesis batch hash",
-	)
-}
-
-func TestNewBatchData(t *testing.T) {
-	templateBlockTrace, err := os.ReadFile("../testdata/blockTrace_02.json")
-	assert.NoError(t, err)
-
-	wrappedBlock := &WrappedBlock{}
-	assert.NoError(t, json.Unmarshal(templateBlockTrace, wrappedBlock))
-
-	parentBatch := &BlockBatch{
-		Index:     1,
-		Hash:      "0x0000000000000000000000000000000000000000",
-		StateRoot: "0x0000000000000000000000000000000000000000",
-	}
-	batchData1 := NewBatchData(parentBatch, []*WrappedBlock{wrappedBlock}, nil)
-	assert.NotNil(t, batchData1)
-	assert.NotNil(t, batchData1.Batch)
-	assert.Equal(t, "0xac4487c0d8f429dafda3c68cbb8983ac08af83c03c83c365d7df02864f80af37", batchData1.Hash().Hex())
-
-	templateBlockTrace, err = os.ReadFile("../testdata/blockTrace_03.json")
-	assert.NoError(t, err)
-
-	wrappedBlock2 := &WrappedBlock{}
-	assert.NoError(t, json.Unmarshal(templateBlockTrace, wrappedBlock2))
-
-	parentBatch2 := &BlockBatch{
-		Index:     batchData1.Batch.BatchIndex,
-		Hash:      batchData1.Hash().Hex(),
-		StateRoot: batchData1.Batch.NewStateRoot.Hex(),
-	}
-	batchData2 := NewBatchData(parentBatch2, []*WrappedBlock{wrappedBlock2}, nil)
-	assert.NotNil(t, batchData2)
-	assert.NotNil(t, batchData2.Batch)
-	assert.Equal(t, "0x8f1447573740b3e75b979879866b8ad02eecf88e1946275eb8cf14ab95876efc", batchData2.Hash().Hex())
-}
-
-func TestBatchDataTimestamp(t *testing.T) {
-	// Test case 1: when the batch data contains no blocks.
-	assert.Equal(t, uint64(0), (&BatchData{}).Timestamp())
-
-	// Test case 2: when the batch data contains blocks.
-	batchData := &BatchData{
-		Batch: abi.IScrollChainBatch{
-			Blocks: []abi.IScrollChainBlockContext{
-				{Timestamp: 123456789},
-				{Timestamp: 234567891},
-			},
-		},
-	}
-	assert.Equal(t, uint64(123456789), batchData.Timestamp())
-}

common/types/block.go

@@ -6,9 +6,13 @@ import (
 	"math"
 
 	"github.com/scroll-tech/go-ethereum/common"
+	"github.com/scroll-tech/go-ethereum/common/hexutil"
 	"github.com/scroll-tech/go-ethereum/core/types"
 )
 
+const nonZeroByteGas uint64 = 16
+const zeroByteGas uint64 = 4
+
 // WrappedBlock contains the block's Header, Transactions and WithdrawTrieRoot hash.
 type WrappedBlock struct {
 	Header *types.Header `json:"header"`
@@ -22,7 +26,7 @@ type WrappedBlock struct {
 func (w *WrappedBlock) NumL1Messages(totalL1MessagePoppedBefore uint64) uint64 {
 	var lastQueueIndex *uint64
 	for _, txData := range w.Transactions {
-		if txData.Type == 0x7E {
+		if txData.Type == types.L1MessageTxType {
 			lastQueueIndex = &txData.Nonce
 		}
 	}
@@ -59,3 +63,74 @@ func (w *WrappedBlock) Encode(totalL1MessagePoppedBefore uint64) ([]byte, error)
 
 	return bytes, nil
 }
+
+// EstimateL1CommitCalldataSize calculates the calldata size in l1 commit approximately.
+// TODO: The calculation could be more accurate by using 58 + len(l2TxDataBytes) (see Chunk).
+// This needs to be adjusted in the future.
+func (w *WrappedBlock) EstimateL1CommitCalldataSize() uint64 {
+	var size uint64
+	for _, txData := range w.Transactions {
+		if txData.Type == types.L1MessageTxType {
+			continue
+		}
+		size += uint64(len(txData.Data))
+	}
+	return size
+}
+
+// EstimateL1CommitGas calculates the calldata gas in l1 commit approximately.
+// TODO: This will need to be adjusted.
+// The part added here is only the calldata cost,
+// but we have execution cost for verifying blocks / chunks / batches and storing the batch hash.
+func (w *WrappedBlock) EstimateL1CommitGas() uint64 {
+	var total uint64
+	for _, txData := range w.Transactions {
+		if txData.Type == types.L1MessageTxType {
+			continue
+		}
+		data, _ := hexutil.Decode(txData.Data)
+		tx := types.NewTx(&types.LegacyTx{
+			Nonce:    txData.Nonce,
+			To:       txData.To,
+			Value:    txData.Value.ToInt(),
+			Gas:      txData.Gas,
+			GasPrice: txData.GasPrice.ToInt(),
+			Data:     data,
+			V:        txData.V.ToInt(),
+			R:        txData.R.ToInt(),
+			S:        txData.S.ToInt(),
+		})
+		rlpTxData, _ := tx.MarshalBinary()
+
+		for _, b := range rlpTxData {
+			if b == 0 {
+				total += zeroByteGas
+			} else {
+				total += nonZeroByteGas
+			}
+		}
+
+		var txLen [4]byte
+		binary.BigEndian.PutUint32(txLen[:], uint32(len(rlpTxData)))
+
+		for _, b := range txLen {
+			if b == 0 {
+				total += zeroByteGas
+			} else {
+				total += nonZeroByteGas
+			}
+		}
+	}
+	return total
+}
+
+// L2TxsNum calculates the number of l2 txs.
+func (w *WrappedBlock) L2TxsNum() uint64 {
+	var count uint64
+	for _, txData := range w.Transactions {
+		if txData.Type != types.L1MessageTxType {
+			count++
+		}
+	}
+	return count
+}

common/types/chunk_test.go

@@ -32,7 +32,7 @@ func TestChunkEncode(t *testing.T) {
 	assert.Contains(t, err.Error(), "number of blocks exceeds 1 byte")
 
 	// Test case 3: when the chunk contains one block.
-	templateBlockTrace, err := os.ReadFile("../../../common/testdata/blockTrace_02.json")
+	templateBlockTrace, err := os.ReadFile("../testdata/blockTrace_02.json")
 	assert.NoError(t, err)
 
 	wrappedBlock := &WrappedBlock{}
@@ -50,7 +50,7 @@ func TestChunkEncode(t *testing.T) {
 	assert.Equal(t, "0100000000000000020000000063807b2a0000000000000000000000000000000000000000000000000000000000000000000355418d1e81840002000000000073f87180843b9aec2e8307a12094c0c4c8baea3f6acb49b6e1fb9e2adeceeacb0ca28a152d02c7e14af60000008083019ecea0ab07ae99c67aa78e7ba5cf6781e90cc32b219b1de102513d56548a41e86df514a034cbd19feacd73e8ce64d00c4d1996b9b5243c578fd7f51bfaec288bbaf42a8b00000073f87101843b9aec2e8307a1209401bae6bf68e9a03fb2bc0615b1bf0d69ce9411ed8a152d02c7e14af60000008083019ecea0f039985866d8256f10c1be4f7b2cace28d8f20bde27e2604393eb095b7f77316a05a3e6e81065f2b4604bcec5bd4aba684835996fc3f879380aac1c09c6eed32f1", hexString)
 
 	// Test case 4: when the chunk contains one block with 1 L1MsgTx
-	templateBlockTrace2, err := os.ReadFile("../../../common/testdata/blockTrace_04.json")
+	templateBlockTrace2, err := os.ReadFile("../testdata/blockTrace_04.json")
 	assert.NoError(t, err)
 
 	wrappedBlock2 := &WrappedBlock{}
@@ -92,7 +92,7 @@ func TestChunkHash(t *testing.T) {
 	assert.Contains(t, err.Error(), "number of blocks is 0")
 
 	// Test case 2: successfully hashing a chunk on one block
-	templateBlockTrace, err := os.ReadFile("../../../common/testdata/blockTrace_02.json")
+	templateBlockTrace, err := os.ReadFile("../testdata/blockTrace_02.json")
 	assert.NoError(t, err)
 	wrappedBlock := &WrappedBlock{}
 	assert.NoError(t, json.Unmarshal(templateBlockTrace, wrappedBlock))
@@ -106,7 +106,7 @@ func TestChunkHash(t *testing.T) {
 	assert.Equal(t, "0x78c839dfc494396c16b40946f32b3f4c3e8c2d4bfd04aefcf235edec474482f8", hash.Hex())
 
 	// Test case 3: successfully hashing a chunk on two blocks
-	templateBlockTrace1, err := os.ReadFile("../../../common/testdata/blockTrace_03.json")
+	templateBlockTrace1, err := os.ReadFile("../testdata/blockTrace_03.json")
 	assert.NoError(t, err)
 	wrappedBlock1 := &WrappedBlock{}
 	assert.NoError(t, json.Unmarshal(templateBlockTrace1, wrappedBlock1))
@@ -121,7 +121,7 @@ func TestChunkHash(t *testing.T) {
 	assert.Equal(t, "0xaa9e494f72bc6965857856f0fae6916f27b2a6591c714a573b2fab46df03b8ae", hash.Hex())
 
 	// Test case 4: successfully hashing a chunk on two blocks each with L1 and L2 txs
-	templateBlockTrace2, err := os.ReadFile("../../../common/testdata/blockTrace_04.json")
+	templateBlockTrace2, err := os.ReadFile("../testdata/blockTrace_04.json")
 	assert.NoError(t, err)
 	wrappedBlock2 := &WrappedBlock{}
 	assert.NoError(t, json.Unmarshal(templateBlockTrace2, wrappedBlock2))

common/types/db.go

@@ -2,19 +2,12 @@
 package types
 
 import (
-	"database/sql"
 	"fmt"
-	"time"
-
-	"scroll-tech/common/types/message"
 )
 
 // L1BlockStatus represents current l1 block processing status
 type L1BlockStatus int
 
-// GasOracleStatus represents current gas oracle processing status
-type GasOracleStatus int
-
 const (
 	// L1BlockUndefined : undefined l1 block status
 	L1BlockUndefined L1BlockStatus = iota
@@ -32,6 +25,9 @@ const (
 	L1BlockFailed
 )
 
+// GasOracleStatus represents current gas oracle processing status
+type GasOracleStatus int
+
 const (
 	// GasOracleUndefined : undefined gas oracle status
 	GasOracleUndefined GasOracleStatus = iota
@@ -49,18 +45,21 @@ const (
 	GasOracleFailed
 )
 
-// L1BlockInfo is structure of stored l1 block
-type L1BlockInfo struct {
-	Number    uint64 `json:"number" db:"number"`
-	Hash      string `json:"hash" db:"hash"`
-	HeaderRLP string `json:"header_rlp" db:"header_rlp"`
-	BaseFee   uint64 `json:"base_fee" db:"base_fee"`
-
-	BlockStatus     L1BlockStatus   `json:"block_status" db:"block_status"`
-	GasOracleStatus GasOracleStatus `json:"oracle_status" db:"oracle_status"`
-
-	ImportTxHash sql.NullString `json:"import_tx_hash" db:"import_tx_hash"`
-	OracleTxHash sql.NullString `json:"oracle_tx_hash" db:"oracle_tx_hash"`
+func (s GasOracleStatus) String() string {
+	switch s {
+	case GasOracleUndefined:
+		return "GasOracleUndefined"
+	case GasOraclePending:
+		return "GasOraclePending"
+	case GasOracleImporting:
+		return "GasOracleImporting"
+	case GasOracleImported:
+		return "GasOracleImported"
+	case GasOracleFailed:
+		return "GasOracleFailed"
+	default:
+		return fmt.Sprintf("Undefined (%d)", int32(s))
+	}
 }
 
 // MsgStatus represents current layer1 transaction processing status
@@ -89,50 +88,14 @@ const (
 	MsgRelayFailed
 )
 
-// L1Message is structure of stored layer1 bridge message
-type L1Message struct {
-	QueueIndex uint64    `json:"queue_index" db:"queue_index"`
-	MsgHash    string    `json:"msg_hash" db:"msg_hash"`
-	Height     uint64    `json:"height" db:"height"`
-	Sender     string    `json:"sender" db:"sender"`
-	Value      string    `json:"value" db:"value"`
-	Target     string    `json:"target" db:"target"`
-	Calldata   string    `json:"calldata" db:"calldata"`
-	GasLimit   uint64    `json:"gas_limit" db:"gas_limit"`
-	Layer1Hash string    `json:"layer1_hash" db:"layer1_hash"`
-	Status     MsgStatus `json:"status" db:"status"`
-}
-
-// L2Message is structure of stored layer2 bridge message
-type L2Message struct {
-	Nonce      uint64    `json:"nonce" db:"nonce"`
-	MsgHash    string    `json:"msg_hash" db:"msg_hash"`
-	Height     uint64    `json:"height" db:"height"`
-	Sender     string    `json:"sender" db:"sender"`
-	Value      string    `json:"value" db:"value"`
-	Target     string    `json:"target" db:"target"`
-	Calldata   string    `json:"calldata" db:"calldata"`
-	Layer2Hash string    `json:"layer2_hash" db:"layer2_hash"`
-	Status     MsgStatus `json:"status" db:"status"`
-}
-
-// BlockInfo is structure of stored `block_trace` without `trace`
-type BlockInfo struct {
-	Number         uint64         `json:"number" db:"number"`
-	Hash           string         `json:"hash" db:"hash"`
-	ParentHash     string         `json:"parent_hash" db:"parent_hash"`
-	BatchHash      sql.NullString `json:"batch_hash" db:"batch_hash"`
-	TxNum          uint64         `json:"tx_num" db:"tx_num"`
-	GasUsed        uint64         `json:"gas_used" db:"gas_used"`
-	BlockTimestamp uint64         `json:"block_timestamp" db:"block_timestamp"`
-}
-
 // RollerProveStatus is the roller prove status of a block batch (session)
 type RollerProveStatus int32
 
 const (
+	// RollerProveStatusUndefined indicates an unknown roller proving status
+	RollerProveStatusUndefined RollerProveStatus = iota
 	// RollerAssigned indicates roller assigned but has not submitted proof
-	RollerAssigned RollerProveStatus = iota
+	RollerAssigned
 	// RollerProofValid indicates roller has submitted valid proof
 	RollerProofValid
 	// RollerProofInvalid indicates roller has submitted invalid proof
@@ -152,20 +115,19 @@ func (s RollerProveStatus) String() string {
 	}
 }
 
-// RollerStatus is the roller name and roller prove status
-type RollerStatus struct {
-	PublicKey string            `json:"public_key"`
-	Name      string            `json:"name"`
-	Status    RollerProveStatus `json:"status"`
-}
+// RollerFailureType is the type of a roller session's failure
+type RollerFailureType int
 
-// SessionInfo is assigned rollers info of a block batch (session)
-type SessionInfo struct {
-	ID             string                   `json:"id"`
-	Rollers        map[string]*RollerStatus `json:"rollers"`
-	StartTimestamp int64                    `json:"start_timestamp"`
-	Attempts       uint8                    `json:"attempts,omitempty"`
-	ProveType      message.ProveType        `json:"prove_type,omitempty"`
+const (
+	// RollerFailureTypeUndefined indicates an unknown roller failure type
+	RollerFailureTypeUndefined RollerFailureType = iota
+)
+
+func (s RollerFailureType) String() string {
+	switch s {
+	default:
+		return fmt.Sprintf("Undefined (%d)", int32(s))
+	}
 }
 
 // ProvingStatus block_batch proving_status (unassigned, assigned, proved, verified, submitted)
@@ -176,8 +138,6 @@ const (
 	ProvingStatusUndefined ProvingStatus = iota
 	// ProvingTaskUnassigned : proving_task is not assigned to be proved
 	ProvingTaskUnassigned
-	// ProvingTaskSkipped : proving_task is skipped for proof generation
-	ProvingTaskSkipped
 	// ProvingTaskAssigned : proving_task is assigned to be proved
 	ProvingTaskAssigned
 	// ProvingTaskProved : proof has been returned by prover
@@ -192,8 +152,6 @@ func (ps ProvingStatus) String() string {
 	switch ps {
 	case ProvingTaskUnassigned:
 		return "unassigned"
-	case ProvingTaskSkipped:
-		return "skipped"
 	case ProvingTaskAssigned:
 		return "assigned"
 	case ProvingTaskProved:
@@ -203,7 +161,32 @@ func (ps ProvingStatus) String() string {
 	case ProvingTaskFailed:
 		return "failed"
 	default:
-		return "undefined"
+		return fmt.Sprintf("Undefined (%d)", int32(ps))
+	}
+}
+
+// ChunkProofsStatus describes the proving status of chunks that belong to a batch.
+type ChunkProofsStatus int
+
+const (
+	// ChunkProofsStatusUndefined represents an undefined chunk proofs status
+	ChunkProofsStatusUndefined ChunkProofsStatus = iota
+
+	// ChunkProofsStatusPending means that some chunks that belong to this batch have not been proven
+	ChunkProofsStatusPending
+
+	// ChunkProofsStatusReady means that all chunks that belong to this batch have been proven
+	ChunkProofsStatusReady
+)
+
+func (s ChunkProofsStatus) String() string {
+	switch s {
+	case ChunkProofsStatusPending:
+		return "ChunkProofsStatusPending"
+	case ChunkProofsStatusReady:
+		return "ChunkProofsStatusReady"
+	default:
+		return fmt.Sprintf("Undefined (%d)", int32(s))
 	}
 }
 
@@ -223,51 +206,29 @@ const (
 	RollupFinalizing
 	// RollupFinalized : finalize transaction is confirmed to layer1
 	RollupFinalized
-	// RollupFinalizationSkipped : batch finalization is skipped
-	RollupFinalizationSkipped
 	// RollupCommitFailed : rollup commit transaction confirmed but failed
 	RollupCommitFailed
 	// RollupFinalizeFailed : rollup finalize transaction is confirmed but failed
 	RollupFinalizeFailed
 )
 
-// BlockBatch is structure of stored block_batch
-type BlockBatch struct {
-	Hash             string          `json:"hash" db:"hash"`
-	Index            uint64          `json:"index" db:"index"`
-	ParentHash       string          `json:"parent_hash" db:"parent_hash"`
-	StartBlockNumber uint64          `json:"start_block_number" db:"start_block_number"`
-	StartBlockHash   string          `json:"start_block_hash" db:"start_block_hash"`
-	EndBlockNumber   uint64          `json:"end_block_number" db:"end_block_number"`
-	EndBlockHash     string          `json:"end_block_hash" db:"end_block_hash"`
-	StateRoot        string          `json:"state_root" db:"state_root"`
-	TotalTxNum       uint64          `json:"total_tx_num" db:"total_tx_num"`
-	TotalL1TxNum     uint64          `json:"total_l1_tx_num" db:"total_l1_tx_num"`
-	TotalL2Gas       uint64          `json:"total_l2_gas" db:"total_l2_gas"`
-	ProvingStatus    ProvingStatus   `json:"proving_status" db:"proving_status"`
-	Proof            []byte          `json:"proof" db:"proof"`
-	ProofTimeSec     uint64          `json:"proof_time_sec" db:"proof_time_sec"`
-	RollupStatus     RollupStatus    `json:"rollup_status" db:"rollup_status"`
-	OracleStatus     GasOracleStatus `json:"oracle_status" db:"oracle_status"`
-	CommitTxHash     sql.NullString  `json:"commit_tx_hash" db:"commit_tx_hash"`
-	FinalizeTxHash   sql.NullString  `json:"finalize_tx_hash" db:"finalize_tx_hash"`
-	OracleTxHash     sql.NullString  `json:"oracle_tx_hash" db:"oracle_tx_hash"`
-	CreatedAt        *time.Time      `json:"created_at" db:"created_at"`
-	ProverAssignedAt *time.Time      `json:"prover_assigned_at" db:"prover_assigned_at"`
-	ProvedAt         *time.Time      `json:"proved_at" db:"proved_at"`
-	CommittedAt      *time.Time      `json:"committed_at" db:"committed_at"`
-	FinalizedAt      *time.Time      `json:"finalized_at" db:"finalized_at"`
-}
-
-// AggTask is a wrapper type around db AggProveTask type.
-type AggTask struct {
-	ID              string        `json:"id" db:"id"`
-	StartBatchIndex uint64        `json:"start_batch_index" db:"start_batch_index"`
-	StartBatchHash  string        `json:"start_batch_hash" db:"start_batch_hash"`
-	EndBatchIndex   uint64        `json:"end_batch_index" db:"end_batch_index"`
-	EndBatchHash    string        `json:"end_batch_hash" db:"end_batch_hash"`
-	ProvingStatus   ProvingStatus `json:"proving_status" db:"proving_status"`
-	Proof           []byte        `json:"proof" db:"proof"`
-	CreatedAt       *time.Time    `json:"created_at" db:"created_at"`
-	UpdatedAt       *time.Time    `json:"updated_at" db:"updated_at"`
+func (s RollupStatus) String() string {
+	switch s {
+	case RollupPending:
+		return "RollupPending"
+	case RollupCommitting:
+		return "RollupCommitting"
+	case RollupCommitted:
+		return "RollupCommitted"
+	case RollupFinalizing:
+		return "RollupFinalizing"
+	case RollupFinalized:
+		return "RollupFinalized"
+	case RollupCommitFailed:
+		return "RollupCommitFailed"
+	case RollupFinalizeFailed:
+		return "RollupFinalizeFailed"
+	default:
+		return fmt.Sprintf("Undefined (%d)", int32(s))
+	}
 }

common/types/db_test.go

@@ -52,11 +52,6 @@ func TestProvingStatus(t *testing.T) {
 			ProvingTaskUnassigned,
 			"unassigned",
 		},
-		{
-			"ProvingTaskSkipped",
-			ProvingTaskSkipped,
-			"skipped",
-		},
 		{
 			"ProvingTaskAssigned",
 			ProvingTaskAssigned,
@@ -80,7 +75,7 @@ func TestProvingStatus(t *testing.T) {
 		{
 			"Undefined",
 			ProvingStatus(999), // Invalid value.
-			"undefined",
+			"Undefined (999)",
 		},
 	}
 

common/types/message/message.go

@@ -23,25 +23,27 @@ const (
 	StatusProofError
 )
 
-// ProveType represents the type of roller.
-type ProveType uint8
+// ProofType represents the type of roller.
+type ProofType uint8
 
-func (r ProveType) String() string {
+func (r ProofType) String() string {
 	switch r {
-	case BasicProve:
-		return "Basic Prove"
-	case AggregatorProve:
-		return "Aggregator Prove"
+	case ProofTypeChunk:
+		return "proof type chunk"
+	case ProofTypeBatch:
+		return "proof type batch"
 	default:
-		return "Illegal Prove type"
+		return "illegal proof type"
 	}
 }
 
 const (
-	// BasicProve is default roller, it only generates zk proof from traces.
-	BasicProve ProveType = iota
-	// AggregatorProve generates zk proof from other zk proofs and aggregate them into one proof.
-	AggregatorProve
+	// ProofTypeUndefined is an unknown proof type
+	ProofTypeUndefined ProofType = iota
+	// ProofTypeChunk is default roller, it only generates zk proof from traces.
+	ProofTypeChunk
+	// ProofTypeBatch generates zk proof from other zk proofs and aggregate them into one proof.
+	ProofTypeBatch
 )
 
 // AuthMsg is the first message exchanged from the Roller to the Sequencer.
@@ -59,11 +61,9 @@ type Identity struct {
 	// Roller name
 	Name string `json:"name"`
 	// Roller RollerType
-	RollerType ProveType `json:"roller_type,omitempty"`
-	// Unverified Unix timestamp of message creation
-	Timestamp uint32 `json:"timestamp"`
+	RollerType ProofType `json:"roller_type,omitempty"`
 	// Version is common.Version+ZkVersion. Use the following to check the latest ZkVersion version.
-	// curl -sL https://api.github.com/repos/scroll-tech/scroll-zkevm/commits | jq -r ".[0].sha"
+	// curl -sL https://api.github.com/repos/scroll-tech/scroll-prover/commits | jq -r ".[0].sha"
 	Version string `json:"version"`
 	// Random unique token generated by manager
 	Token string `json:"token"`
@@ -203,7 +203,7 @@ func (a *ProofMsg) PublicKey() (string, error) {
 // TaskMsg is a wrapper type around db ProveTask type.
 type TaskMsg struct {
 	ID   string    `json:"id"`
-	Type ProveType `json:"type,omitempty"`
+	Type ProofType `json:"type,omitempty"`
 	// For decentralization, basic rollers will get block hashes from the coordinator. So that they can refer to the block hashes and fetch traces locally. Only applicable for basic rollers.
 	BlockHashes []common.Hash `json:"block_hashes,omitempty"`
 	// Only applicable for aggregator rollers.
@@ -214,7 +214,7 @@ type TaskMsg struct {
 // the proof generation succeeded, and an error message if proof generation failed.
 type ProofDetail struct {
 	ID     string     `json:"id"`
-	Type   ProveType  `json:"type,omitempty"`
+	Type   ProofType  `json:"type,omitempty"`
 	Status RespStatus `json:"status"`
 	Proof  *AggProof  `json:"proof"`
 	Error  string     `json:"error,omitempty"`

common/types/message/message_test.go

@@ -3,7 +3,6 @@ package message
 import (
 	"encoding/hex"
 	"testing"
-	"time"
 
 	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/crypto"
@@ -16,10 +15,9 @@ func TestAuthMessageSignAndVerify(t *testing.T) {
 
 	authMsg := &AuthMsg{
 		Identity: &Identity{
-			Name:      "testName",
-			Timestamp: uint32(time.Now().Unix()),
-			Version:   "testVersion",
-			Token:     "testToken",
+			Name:    "testName",
+			Version: "testVersion",
+			Token:   "testToken",
 		},
 	}
 	assert.NoError(t, authMsg.SignWithKey(privkey))
@@ -49,15 +47,14 @@ func TestGenerateToken(t *testing.T) {
 func TestIdentityHash(t *testing.T) {
 	identity := &Identity{
 		Name:       "testName",
-		RollerType: BasicProve,
-		Timestamp:  uint32(1622428800),
+		RollerType: ProofTypeChunk,
 		Version:    "testVersion",
 		Token:      "testToken",
 	}
 	hash, err := identity.Hash()
 	assert.NoError(t, err)
 
-	expectedHash := "b3f152958dc881446fc131a250526139d909710c6b91b4d3281ceded28ce2e32"
+	expectedHash := "c0411a19531fb8c6133b2bae91f361c14e65f2d318aef72b83519e6061cad001"
 	assert.Equal(t, expectedHash, hex.EncodeToString(hash))
 }
 
@@ -68,7 +65,7 @@ func TestProofMessageSignVerifyPublicKey(t *testing.T) {
 	proofMsg := &ProofMsg{
 		ProofDetail: &ProofDetail{
 			ID:     "testID",
-			Type:   BasicProve,
+			Type:   ProofTypeChunk,
 			Status: StatusOk,
 			Proof: &AggProof{
 				Proof:      []byte("testProof"),
@@ -96,7 +93,7 @@ func TestProofMessageSignVerifyPublicKey(t *testing.T) {
 func TestProofDetailHash(t *testing.T) {
 	proofDetail := &ProofDetail{
 		ID:     "testID",
-		Type:   BasicProve,
+		Type:   ProofTypeChunk,
 		Status: StatusOk,
 		Proof: &AggProof{
 			Proof:      []byte("testProof"),
@@ -109,19 +106,19 @@ func TestProofDetailHash(t *testing.T) {
 	}
 	hash, err := proofDetail.Hash()
 	assert.NoError(t, err)
-	expectedHash := "fdfaae752d6fd72a7fdd2ad034ef504d3acda9e691a799323cfa6e371684ba2b"
+	expectedHash := "8ad894c2047166a98b1a389b716b06b01dc1bd29e950e2687ffbcb3c328edda5"
 	assert.Equal(t, expectedHash, hex.EncodeToString(hash))
 }
 
 func TestProveTypeString(t *testing.T) {
-	basicProve := ProveType(0)
-	assert.Equal(t, "Basic Prove", basicProve.String())
+	proofTypeChunk := ProofType(1)
+	assert.Equal(t, "proof type chunk", proofTypeChunk.String())
 
-	aggregatorProve := ProveType(1)
-	assert.Equal(t, "Aggregator Prove", aggregatorProve.String())
+	proofTypeBatch := ProofType(2)
+	assert.Equal(t, "proof type batch", proofTypeBatch.String())
 
-	illegalProve := ProveType(3)
-	assert.Equal(t, "Illegal Prove type", illegalProve.String())
+	illegalProof := ProofType(3)
+	assert.Equal(t, "illegal proof type", illegalProof.String())
 }
 
 func TestProofMsgPublicKey(t *testing.T) {
@@ -131,7 +128,7 @@ func TestProofMsgPublicKey(t *testing.T) {
 	proofMsg := &ProofMsg{
 		ProofDetail: &ProofDetail{
 			ID:     "testID",
-			Type:   BasicProve,
+			Type:   ProofTypeChunk,
 			Status: StatusOk,
 			Proof: &AggProof{
 				Proof:      []byte("testProof"),

common/version/version.go

@@ -5,7 +5,7 @@ import (
 	"runtime/debug"
 )
 
-var tag = "v4.0.3"
+var tag = "v4.0.24"
 
 var commit = func() string {
 	if info, ok := debug.ReadBuildInfo(); ok {
@@ -22,7 +22,7 @@ var commit = func() string {
 	return ""
 }()
 
-// ZkVersion is commit-id of common/libzkp/impl/cargo.lock/scroll-zkevm
+// ZkVersion is commit-id of common/libzkp/impl/cargo.lock/scroll-prover
 var ZkVersion string
 
 // Version denote the version of scroll protocol, including the l2geth, relayer, coordinator, roller, contracts and etc.