handle finalized head in reconciliation

Author: frisitano

crates/chain-orchestrator/src/consolidation.rs

@@ -39,7 +39,8 @@ pub(crate) async fn reconcile_batch<L2P: Provider<Scroll>>(
                 // The block matches the derived attributes and the block is below or equal to the
                 // safe current safe head.
                 if attributes.block_number <= fcs.finalized_block_info().number ||
-                    attributes.block_number <= fcs.safe_block_info().number
+                    ((attributes.block_number <= fcs.safe_block_info().number) &&
+                        batch.target_status.is_consolidated())
                 {
                     Ok::<_, ChainOrchestratorError>(BlockConsolidationAction::Skip(block_info))
                 } else {

crates/engine/src/fcs.rs

@@ -48,10 +48,16 @@ impl ForkchoiceState {
     pub async fn from_provider<P: Provider<Scroll>>(provider: &P) -> Option<Self> {
         let latest_block =
             provider.get_block(BlockId::Number(BlockNumberOrTag::Latest)).await.ok()??;
-        let safe_block =
+        let mut safe_block =
             provider.get_block(BlockId::Number(BlockNumberOrTag::Safe)).await.ok()??;
         let finalized_block =
             provider.get_block(BlockId::Number(BlockNumberOrTag::Finalized)).await.ok()??;
+
+        // Ensure safe is at least finalized.
+        if safe_block.header.number < finalized_block.header.number {
+            safe_block = finalized_block.clone();
+        }
+
         Some(Self {
             head: BlockInfo { number: latest_block.header.number, hash: latest_block.header.hash },
             safe: BlockInfo { number: safe_block.header.number, hash: safe_block.header.hash },

crates/primitives/src/batch.rs

@@ -79,6 +79,11 @@ pub enum BatchStatus {
 }
 
 impl BatchStatus {
+    /// Returns true if the batch status is consolidated.
+    pub const fn is_consolidated(&self) -> bool {
+        matches!(self, Self::Consolidated)
+    }
+
     /// Returns true if the batch status is finalized.
     pub const fn is_finalized(&self) -> bool {
         matches!(self, Self::Finalized)