address comments

Author: colinlyguo

rollup/cmd/proposer_tool/app/app.go

@@ -93,12 +93,6 @@ func action(ctx *cli.Context) error {
 	}
 
 	startL2BlockHeight := ctx.Uint64(utils.StartL2BlockFlag.Name)
-	startL2Block, err := l2Client.BlockByNumber(context.Background(), big.NewInt(int64(startL2BlockHeight)))
-	if err != nil {
-		log.Crit("failed to get start l2 block", "startL2BlockHeight", startL2BlockHeight, "error", err)
-	}
-
-	chunk := &encoding.Chunk{Blocks: []*encoding.Block{{Header: startL2Block.Header()}}}
 
 	prevChunk, err := orm.NewChunk(dbForReplay).GetParentChunkByBlockNumber(subCtx, startL2BlockHeight)
 	if err != nil {
@@ -110,12 +104,32 @@ func action(ctx *cli.Context) error {
 		startQueueIndex = prevChunk.TotalL1MessagesPoppedBefore + prevChunk.TotalL1MessagesPoppedInChunk
 	}
 
-	for _, tx := range startL2Block.Transactions() {
-		if tx.Type() == gethTypes.L1MessageTxType {
-			startQueueIndex++
+	startBlock := uint64(0)
+	if prevChunk != nil {
+		startBlock = prevChunk.EndBlockNumber + 1
+	}
+
+	var chunk *encoding.Chunk
+	for blockNum := startBlock; blockNum <= startL2BlockHeight; blockNum++ {
+		block, err := l2Client.BlockByNumber(context.Background(), big.NewInt(int64(blockNum)))
+		if err != nil {
+			log.Crit("failed to get block", "block number", blockNum, "error", err)
+		}
+
+		for _, tx := range block.Transactions() {
+			if tx.Type() == gethTypes.L1MessageTxType {
+				startQueueIndex++
+			}
+		}
+
+		if blockNum == startL2BlockHeight {
+			chunk = &encoding.Chunk{Blocks: []*encoding.Block{{Header: block.Header()}}}
 		}
 	}
 
+	// Setting empty hash as the post_l1_message_queue_hash of the first chunk,
+	// i.e., treating the first L1 message after this chunk as the first L1 message in message queue v2.
+	// Though this setting is different from mainnet, it's simple yet sufficient for data analysis usage.
 	_, err = orm.NewChunk(db).InsertTestChunkForProposerTool(subCtx, chunk, encoding.CodecV0, startQueueIndex)
 	if err != nil {
 		log.Crit("failed to insert chunk", "error", err)

rollup/internal/orm/chunk.go

@@ -291,19 +291,21 @@ func (o *Chunk) InsertTestChunkForProposerTool(ctx context.Context, chunk *encod
 	}
 
 	numBlocks := len(chunk.Blocks)
+	firstBlock := chunk.Blocks[0]
+	lastBlock := chunk.Blocks[numBlocks-1]
 	newChunk := Chunk{
 		Index:                       0,
 		Hash:                        chunkHash.Hex(),
-		StartBlockNumber:            chunk.Blocks[0].Header.Number.Uint64(),
-		StartBlockHash:              chunk.Blocks[0].Header.Hash().Hex(),
-		EndBlockNumber:              chunk.Blocks[numBlocks-1].Header.Number.Uint64(),
-		EndBlockHash:                chunk.Blocks[numBlocks-1].Header.Hash().Hex(),
+		StartBlockNumber:            firstBlock.Header.Number.Uint64(),
+		StartBlockHash:              firstBlock.Header.Hash().Hex(),
+		EndBlockNumber:              lastBlock.Header.Number.Uint64(),
+		EndBlockHash:                lastBlock.Header.Hash().Hex(),
 		TotalL2TxGas:                chunk.TotalGasUsed(),
 		TotalL2TxNum:                chunk.NumL2Transactions(),
-		StartBlockTime:              chunk.Blocks[0].Header.Time,
+		StartBlockTime:              firstBlock.Header.Time,
 		TotalL1MessagesPoppedBefore: totalL1MessagePoppedBefore,
-		StateRoot:                   chunk.Blocks[numBlocks-1].Header.Root.Hex(),
-		WithdrawRoot:                chunk.Blocks[numBlocks-1].WithdrawRoot.Hex(),
+		StateRoot:                   lastBlock.Header.Root.Hex(),
+		WithdrawRoot:                lastBlock.WithdrawRoot.Hex(),
 		CodecVersion:                int16(codecVersion),
 	}