Merge remote-tracking branch 'origin/main' into feat/self-healing-l1-events

Author: jonastheis

Cargo.lock

@@ -1,7 +1,7 @@
 [workspace.package]
 version = "0.0.1"
 edition = "2021"
-rust-version = "1.82"
+rust-version = "1.83"
 license = "MIT OR Apache-2.0"
 exclude = [".github/"]
 
@@ -220,6 +220,7 @@ clap = { version = "4", features = ["derive", "env"] }
 derive_more = { version = "2.0", default-features = false }
 eyre = "0.6"
 futures = { version = "0.3", default-features = false }
+lru = "0.13.0"
 metrics = "0.24.0"
 metrics-derive = "0.1"
 parking_lot = "0.12"

Cargo.toml

@@ -36,15 +36,13 @@ pub(crate) async fn reconcile_batch<L2P: Provider<Scroll>>(
                 // Extract the block info with L1 messages.
                 let block_info: L2BlockInfoWithL1Messages = (&current_block).into();
 
-                // 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) &&
-                        batch.target_status.is_consolidated())
-                {
+                // The derived attributes match the L2 chain but are associated with a block
+                // number less than or equal to the finalized block, so skip.
+                if attributes.block_number <= fcs.finalized_block_info().number {
                     Ok::<_, ChainOrchestratorError>(BlockConsolidationAction::Skip(block_info))
                 } else {
-                    // The block matches the derived attributes, no action is needed.
+                    // The block matches the derived attributes but is above the finalized block,
+                    // so we need to update the fcs.
                     Ok::<_, ChainOrchestratorError>(BlockConsolidationAction::UpdateFcs(block_info))
                 }
             } else {

crates/chain-orchestrator/src/consolidation.rs

@@ -26,12 +26,12 @@ impl SyncState {
     }
 
     /// Returns a mutable reference to the sync mode of L1.
-    pub fn l1_mut(&mut self) -> &mut SyncMode {
+    pub const fn l1_mut(&mut self) -> &mut SyncMode {
         &mut self.l1
     }
 
     /// Returns a mutable reference to the sync mode of L2.
-    pub fn l2_mut(&mut self) -> &mut SyncMode {
+    pub const fn l2_mut(&mut self) -> &mut SyncMode {
         &mut self.l2
     }
 
@@ -64,12 +64,12 @@ impl SyncMode {
     }
 
     /// Sets the sync mode to [`SyncMode::Synced`].
-    pub fn set_synced(&mut self) {
+    pub const fn set_synced(&mut self) {
         *self = Self::Synced;
     }
 
     /// Sets the sync mode to [`SyncMode::Syncing`].
-    pub fn set_syncing(&mut self) {
+    pub const fn set_syncing(&mut self) {
         *self = Self::Syncing;
     }
 }

crates/chain-orchestrator/src/sync.rs

@@ -49,7 +49,7 @@ impl L1MessagesAssertion {
 
 impl<'a> BlockBuilder<'a> {
     /// Create a new block builder.
-    pub(crate) fn new(fixture: &'a mut TestFixture) -> Self {
+    pub(crate) const fn new(fixture: &'a mut TestFixture) -> Self {
         Self {
             fixture,
             expected_tx_hashes: Vec::new(),

crates/node/src/test_utils/block_builder.rs

@@ -22,7 +22,7 @@ pub struct EventWaiter<'a> {
 
 impl<'a> EventWaiter<'a> {
     /// Create a new multi-node event waiter.
-    pub fn new(fixture: &'a mut TestFixture, node_indices: Vec<usize>) -> Self {
+    pub const fn new(fixture: &'a mut TestFixture, node_indices: Vec<usize>) -> Self {
         Self { fixture, node_indices, timeout_duration: Duration::from_secs(30) }
     }
 

crates/node/src/test_utils/event_utils.rs

@@ -146,17 +146,17 @@ impl TestFixture {
     }
 
     /// Start building a block using the sequencer.
-    pub fn build_block(&mut self) -> BlockBuilder<'_> {
+    pub const fn build_block(&mut self) -> BlockBuilder<'_> {
         BlockBuilder::new(self)
     }
 
     /// Get L1 helper for managing L1 interactions.
-    pub fn l1(&mut self) -> L1Helper<'_> {
+    pub const fn l1(&mut self) -> L1Helper<'_> {
         L1Helper::new(self)
     }
 
     /// Get transaction helper for creating and injecting transactions.
-    pub fn tx(&mut self) -> TxHelper<'_> {
+    pub const fn tx(&mut self) -> TxHelper<'_> {
         TxHelper::new(self)
     }
 
@@ -484,7 +484,7 @@ impl TestFixtureBuilder {
     }
 
     /// Get a mutable reference to the underlying config for advanced customization.
-    pub fn config_mut(&mut self) -> &mut ScrollRollupNodeConfig {
+    pub const fn config_mut(&mut self) -> &mut ScrollRollupNodeConfig {
         &mut self.config
     }
 

crates/node/src/test_utils/fixture.rs

@@ -17,7 +17,7 @@ pub struct L1Helper<'a> {
 
 impl<'a> L1Helper<'a> {
     /// Create a new L1 helper.
-    pub(crate) fn new(fixture: &'a mut TestFixture) -> Self {
+    pub(crate) const fn new(fixture: &'a mut TestFixture) -> Self {
         Self { fixture, target_node_index: None }
     }
 

crates/node/src/test_utils/l1_helpers.rs

@@ -161,7 +161,7 @@ pub struct ReputationChecker<'a> {
 
 impl<'a> ReputationChecker<'a> {
     /// Create a new reputation checker.
-    pub fn new(fixture: &'a mut TestFixture, observer_node: usize) -> Self {
+    pub const fn new(fixture: &'a mut TestFixture, observer_node: usize) -> Self {
         Self {
             fixture,
             observer_node,

crates/node/src/test_utils/network_helpers.rs

@@ -13,7 +13,7 @@ pub struct TxHelper<'a> {
 
 impl<'a> TxHelper<'a> {
     /// Create a new transaction helper.
-    pub(crate) fn new(fixture: &'a mut TestFixture) -> Self {
+    pub(crate) const fn new(fixture: &'a mut TestFixture) -> Self {
         Self { fixture, target_node_index: 0 }
     }