tweaks

Author: colinlyguo

rollup/README.md

@@ -41,7 +41,7 @@ make rollup_bins
 1. Set genesis config to enable desired hardforks in [`proposer-tool-genesis.json`](./proposer-tool-genesis.json).
 2. Set proposer config in [`proposer-tool-config.json`](./proposer-tool-config.json) for data analysis.
 
-### Start the proposer tool using docker-compose.
+### Start the proposer tool using docker-compose
 
 ```
 cd rollup

rollup/cmd/proposer_tool/app/app.go

@@ -65,15 +65,15 @@ func action(ctx *cli.Context) error {
 		}
 	}()
 
-	// Init l2BlockOrm connection
+	// Init dbForReplay connection
 	dbForReplay, err := database.InitDB(cfg.DBConfigForReplay)
 	if err != nil {
-		log.Crit("failed to init l2BlockOrm connection", "err", err)
+		log.Crit("failed to init dbForReplay connection", "err", err)
 	}
 	defer func() {
 		cancel()
 		if err = database.CloseDB(dbForReplay); err != nil {
-			log.Crit("failed to close l2BlockOrm connection", "error", err)
+			log.Crit("failed to close dbForReplay connection", "error", err)
 		}
 	}()
 

rollup/internal/controller/watcher/batch_proposer.go

@@ -231,8 +231,8 @@ func (p *BatchProposer) updateDBBatchInfo(batch *encoding.Batch, codecVersion en
 			return dbErr
 		}
 		if p.replayMode {
-			// if replayMode is true, it means that the batch is proposed by the proposer tool, set the batch status to types.RollupCommitted
-			// and commit tx hash to a unique value so that new bundles can be proposed
+			// If replayMode is true, meaning the batch was proposed by the proposer tool,
+			// set batch status to types.RollupCommitted and assign a unique commit tx hash to enable new bundle proposals.
 			if dbErr = p.batchOrm.UpdateCommitTxHashAndRollupStatus(p.ctx, dbBatch.Hash, dbBatch.Hash, types.RollupCommitted, dbTX); dbErr != nil {
 				log.Warn("BatchProposer.UpdateCommitTxHashAndRollupStatus update the batch's commit tx hash failure", "hash", dbBatch.Hash, "error", dbErr)
 				return dbErr

rollup/internal/controller/watcher/chunk_proposer.go

@@ -243,9 +243,10 @@ func (p *ChunkProposer) updateDBChunkInfo(chunk *encoding.Chunk, codecVersion en
 			log.Warn("ChunkProposer.InsertChunk failed", "codec version", codecVersion, "err", err)
 			return err
 		}
+		// In replayMode we don't need to update chunk_hash in l2_block table.
 		if !p.replayMode {
 			if err := p.l2BlockOrm.UpdateChunkHashInRange(p.ctx, dbChunk.StartBlockNumber, dbChunk.EndBlockNumber, dbChunk.Hash, dbTX); err != nil {
-				log.Error("failed to update chunk_hash for l2_blocks", "chunk hash", dbChunk.Hash, "start block", dbChunk.StartBlockNumber, "end block", dbChunk.EndBlockNumber, "err", err)
+				log.Error("failed to update chunk_hash for l2_block", "chunk hash", dbChunk.Hash, "start block", dbChunk.StartBlockNumber, "end block", dbChunk.EndBlockNumber, "err", err)
 				return err
 			}
 		}