File tree Expand file tree Collapse file tree 1 file changed +7
-5
lines changed
crates/chain-orchestrator/src Expand file tree Collapse file tree 1 file changed +7
-5
lines changed Original file line number Diff line number Diff line change @@ -36,13 +36,15 @@ pub(crate) async fn reconcile_batch<L2P: Provider<Scroll>>(
3636 // Extract the block info with L1 messages.
3737 let block_info: L2BlockInfoWithL1Messages = ( & current_block) . into ( ) ;
3838
39- // The derived attributes match the L2 chain but are associated with a block
40- // number less than or equal to the finalized block, so skip.
41- if attributes. block_number <= fcs. finalized_block_info ( ) . number {
39+ // The block matches the derived attributes and the block is below or equal to the
40+ // safe current safe head.
41+ if attributes. block_number <= fcs. finalized_block_info ( ) . number ||
42+ ( ( attributes. block_number <= fcs. safe_block_info ( ) . number ) &&
43+ batch. target_status . is_consolidated ( ) )
44+ {
4245 Ok :: < _ , ChainOrchestratorError > ( BlockConsolidationAction :: Skip ( block_info) )
4346 } else {
44- // The block matches the derived attributes but is above the finalized block,
45- // so we need to update the fcs.
47+ // The block matches the derived attributes, no action is needed.
4648 Ok :: < _ , ChainOrchestratorError > ( BlockConsolidationAction :: UpdateFcs ( block_info) )
4749 }
4850 } else {
You can’t perform that action at this time.
0 commit comments