fix

Author: colinlyguo

rollup/cmd/proposer_tool/app/app.go

@@ -9,15 +9,19 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/scroll-tech/da-codec/encoding"
+	"github.com/scroll-tech/go-ethereum/common"
 	"github.com/scroll-tech/go-ethereum/log"
 	"github.com/urfave/cli/v2"
 
 	"scroll-tech/common/database"
+	"scroll-tech/common/types"
 	"scroll-tech/common/utils"
 	"scroll-tech/common/version"
 
 	"scroll-tech/rollup/internal/config"
 	"scroll-tech/rollup/internal/controller/watcher"
+	"scroll-tech/rollup/internal/orm"
+	rutils "scroll-tech/rollup/internal/utils"
 )
 
 var app *cli.App
@@ -59,17 +63,51 @@ func action(ctx *cli.Context) error {
 	}()
 
 	// Init l2BlockOrm connection
-	l2BlockDB, err := database.InitDB(cfg.L2BlockDBConfigForProposerTool)
+	dbForReplay, err := database.InitDB(cfg.DBConfigForReplay)
 	if err != nil {
 		log.Crit("failed to init l2BlockOrm connection", "err", err)
 	}
 	defer func() {
 		cancel()
-		if err = database.CloseDB(l2BlockDB); err != nil {
+		if err = database.CloseDB(dbForReplay); err != nil {
 			log.Crit("failed to close l2BlockOrm connection", "error", err)
 		}
 	}()
 
+	blocks, err := orm.NewL2Block(dbForReplay).GetL2BlocksInRange(subCtx, cfg.L2Config.ReplayStartHeight, cfg.L2Config.ReplayStartHeight)
+	if err != nil {
+		log.Crit("failed to get l2 blocks", "start block", cfg.L2Config.ReplayStartHeight, "end block", cfg.L2Config.ReplayStartHeight, "error", err)
+	}
+
+	chunk := &encoding.Chunk{Blocks: blocks}
+
+	var dbChunk *orm.Chunk
+	dbChunk, err = orm.NewChunk(db).InsertChunk(subCtx, chunk, encoding.CodecV0, rutils.ChunkMetrics{})
+	if err != nil {
+		log.Crit("failed to insert chunk", "error", err)
+	}
+
+	if err = orm.NewChunk(db).UpdateProvingStatus(subCtx, dbChunk.Hash, types.ProvingTaskVerified); err != nil {
+		log.Crit("failed to update genesis chunk proving status", "error", err)
+	}
+
+	batch := &encoding.Batch{
+		Index:                      0,
+		TotalL1MessagePoppedBefore: 0,
+		ParentBatchHash:            common.Hash{},
+		Chunks:                     []*encoding.Chunk{chunk},
+	}
+
+	var dbBatch *orm.Batch
+	dbBatch, err = orm.NewBatch(db).InsertBatch(subCtx, batch, encoding.CodecV0, rutils.BatchMetrics{})
+	if err != nil {
+		log.Crit("failed to insert batch", "error", err)
+	}
+
+	if err = orm.NewChunk(db).UpdateBatchHashInRange(subCtx, 0, 0, dbBatch.Hash); err != nil {
+		log.Crit("failed to update batch hash for chunks", "error", err)
+	}
+
 	registry := prometheus.DefaultRegisterer
 
 	genesisPath := ctx.String(utils.Genesis.Name)
@@ -87,8 +125,8 @@ func action(ctx *cli.Context) error {
 	}
 
 	minCodecVersion := encoding.CodecVersion(ctx.Uint(utils.MinCodecVersionFlag.Name))
-	chunkProposer := watcher.NewChunkProposer(subCtx, cfg.L2Config.ChunkProposerConfig, minCodecVersion, genesis.Config, l2BlockDB, db, registry, true /* used by tool */)
-	batchProposer := watcher.NewBatchProposer(subCtx, cfg.L2Config.BatchProposerConfig, minCodecVersion, genesis.Config, l2BlockDB, db, registry)
+	chunkProposer := watcher.NewChunkProposer(subCtx, cfg.L2Config.ChunkProposerConfig, minCodecVersion, genesis.Config, dbForReplay, db, registry, true /* used by tool */)
+	batchProposer := watcher.NewBatchProposer(subCtx, cfg.L2Config.BatchProposerConfig, minCodecVersion, genesis.Config, dbForReplay, db, registry)
 	bundleProposer := watcher.NewBundleProposer(subCtx, cfg.L2Config.BundleProposerConfig, minCodecVersion, genesis.Config, db, registry)
 
 	go utils.Loop(subCtx, 100*time.Millisecond, chunkProposer.TryProposeChunk)

rollup/conf/config.json

@@ -32,6 +32,7 @@
     }
   },
   "l2_config": {
+    "replay_start_height": 1000000,
     "confirmations": "0x1",
     "endpoint": "https://rpc.scroll.io",
     "l2_message_queue_address": "0x0000000000000000000000000000000000000000",

rollup/internal/config/config.go

@@ -15,10 +15,10 @@ import (
 
 // Config load configuration items.
 type Config struct {
-	L1Config                       *L1Config        `json:"l1_config"`
-	L2Config                       *L2Config        `json:"l2_config"`
-	DBConfig                       *database.Config `json:"db_config"`
-	L2BlockDBConfigForProposerTool *database.Config `json:"l2_block_db_config_for_proposer_tool"`
+	L1Config          *L1Config        `json:"l1_config"`
+	L2Config          *L2Config        `json:"l2_config"`
+	DBConfig          *database.Config `json:"db_config"`
+	DBConfigForReplay *database.Config `json:"db_config_for_replay"`
 }
 
 // NewConfig returns a new instance of Config.

rollup/internal/config/l2.go

@@ -24,6 +24,8 @@ type L2Config struct {
 	BatchProposerConfig *BatchProposerConfig `json:"batch_proposer_config"`
 	// The bundle_proposer config
 	BundleProposerConfig *BundleProposerConfig `json:"bundle_proposer_config"`
+
+	ReplayStartHeight uint64 `json:"replay_start_height"`
 }
 
 // ChunkProposerConfig loads chunk_proposer configuration items.