@@ -241,10 +241,15 @@ func (s *RollupSyncService) parseAndUpdateRollupEventLogs(logs []types.Log, endB
241241 log .Warn ("got nil when reading last finalized batch index. This should happen only once." )
242242 }
243243
244+ parentBatchMeta := & rawdb.FinalizedBatchMeta {}
245+ if startBatchIndex > 0 {
246+ parentBatchMeta = rawdb .ReadFinalizedBatchMeta (s .db , startBatchIndex - 1 )
247+ }
248+
244249 var highestFinalizedBlockNumber uint64
245250 batchWriter := s .db .NewBatch ()
246251 for index := startBatchIndex ; index <= batchIndex ; index ++ {
247- parentBatchMeta , chunks , err := s .getLocalInfoForBatch (index )
252+ chunks , err := s .getLocalChunksForBatch (index )
248253 if err != nil {
249254 return fmt .Errorf ("failed to get local node info, batch index: %v, err: %w" , index , err )
250255 }
@@ -256,6 +261,7 @@ func (s *RollupSyncService) parseAndUpdateRollupEventLogs(logs []types.Log, endB
256261
257262 rawdb .WriteFinalizedBatchMeta (batchWriter , index , finalizedBatchMeta )
258263 highestFinalizedBlockNumber = endBlock
264+ parentBatchMeta = finalizedBatchMeta
259265
260266 if index % 100 == 0 {
261267 log .Info ("finalized batch progress" , "batch index" , index , "finalized l2 block height" , endBlock )
@@ -283,17 +289,17 @@ func (s *RollupSyncService) parseAndUpdateRollupEventLogs(logs []types.Log, endB
283289 return nil
284290}
285291
286- func (s * RollupSyncService ) getLocalInfoForBatch (batchIndex uint64 ) (* rawdb. FinalizedBatchMeta , []* encoding.Chunk , error ) {
292+ func (s * RollupSyncService ) getLocalChunksForBatch (batchIndex uint64 ) ([]* encoding.Chunk , error ) {
287293 chunkBlockRanges := rawdb .ReadBatchChunkRanges (s .db , batchIndex )
288294 if len (chunkBlockRanges ) == 0 {
289- return nil , nil , fmt .Errorf ("failed to get batch chunk ranges, empty chunk block ranges" )
295+ return nil , fmt .Errorf ("failed to get batch chunk ranges, empty chunk block ranges" )
290296 }
291297
292298 endBlockNumber := chunkBlockRanges [len (chunkBlockRanges )- 1 ].EndBlockNumber
293299 for i := 0 ; i < defaultMaxRetries ; i ++ {
294300 if s .ctx .Err () != nil {
295301 log .Info ("Context canceled" , "reason" , s .ctx .Err ())
296- return nil , nil , s .ctx .Err ()
302+ return nil , s .ctx .Err ()
297303 }
298304
299305 localSyncedBlockHeight := s .bc .CurrentBlock ().Number ().Uint64 ()
@@ -308,7 +314,7 @@ func (s *RollupSyncService) getLocalInfoForBatch(batchIndex uint64) (*rawdb.Fina
308314
309315 localSyncedBlockHeight := s .bc .CurrentBlock ().Number ().Uint64 ()
310316 if localSyncedBlockHeight < endBlockNumber {
311- return nil , nil , fmt .Errorf ("local node is not synced up to the required block height: %v, local synced block height: %v" , endBlockNumber , localSyncedBlockHeight )
317+ return nil , fmt .Errorf ("local node is not synced up to the required block height: %v, local synced block height: %v" , endBlockNumber , localSyncedBlockHeight )
312318 }
313319
314320 chunks := make ([]* encoding.Chunk , len (chunkBlockRanges ))
@@ -317,12 +323,12 @@ func (s *RollupSyncService) getLocalInfoForBatch(batchIndex uint64) (*rawdb.Fina
317323 for j := cr .StartBlockNumber ; j <= cr .EndBlockNumber ; j ++ {
318324 block := s .bc .GetBlockByNumber (j )
319325 if block == nil {
320- return nil , nil , fmt .Errorf ("failed to get block by number: %v" , i )
326+ return nil , fmt .Errorf ("failed to get block by number: %v" , i )
321327 }
322328 txData := encoding .TxsToTxsData (block .Transactions ())
323329 state , err := s .bc .StateAt (block .Root ())
324330 if err != nil {
325- return nil , nil , fmt .Errorf ("failed to get block state, block: %v, err: %w" , block .Hash ().Hex (), err )
331+ return nil , fmt .Errorf ("failed to get block state, block: %v, err: %w" , block .Hash ().Hex (), err )
326332 }
327333 withdrawRoot := withdrawtrie .ReadWTRSlot (rcfg .L2MessageQueueAddress , state )
328334 chunks [i ].Blocks [j - cr .StartBlockNumber ] = & encoding.Block {
@@ -333,13 +339,7 @@ func (s *RollupSyncService) getLocalInfoForBatch(batchIndex uint64) (*rawdb.Fina
333339 }
334340 }
335341
336- // get metadata of parent batch: default to genesis batch metadata.
337- parentBatchMeta := & rawdb.FinalizedBatchMeta {}
338- if batchIndex > 0 {
339- parentBatchMeta = rawdb .ReadFinalizedBatchMeta (s .db , batchIndex - 1 )
340- }
341-
342- return parentBatchMeta , chunks , nil
342+ return chunks , nil
343343}
344344
345345func (s * RollupSyncService ) getChunkRanges (batchIndex uint64 , vLog * types.Log ) ([]* rawdb.ChunkBlockRange , error ) {
0 commit comments