Merge branch 'main' into morty-add-anvil-to-test-fixture

Author: yiweichi

Cargo.lock

@@ -1,7 +1,7 @@
 [workspace.package]
-version = "0.0.1"
+version = "1.0.0"
 edition = "2021"
-rust-version = "1.82"
+rust-version = "1.83"
 license = "MIT OR Apache-2.0"
 exclude = [".github/"]
 
@@ -221,8 +221,10 @@ 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"
+moka = "0.12.11"
 parking_lot = "0.12"
 rand = { version = "0.9" }
 rayon = "1.7"

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

@@ -643,6 +643,14 @@ impl DatabaseReadOperations for Database {
         )
     }
 
+    async fn get_max_block_data_hint_block_number(&self) -> Result<u64, DatabaseError> {
+        metered!(
+            DatabaseOperation::GetMaxBlockDataHintBlockNumber,
+            self,
+            tx(|tx| async move { tx.get_max_block_data_hint_block_number().await })
+        )
+    }
+
     async fn get_l2_block_and_batch_info_by_hash(
         &self,
         block_hash: B256,
@@ -862,7 +870,7 @@ mod test {
         BatchCommitData, BatchInfo, BlockInfo, L1MessageEnvelope, L2BlockInfoWithL1Messages,
     };
     use scroll_alloy_consensus::TxL1Message;
-    use sea_orm::{ColumnTrait, EntityTrait, QueryFilter};
+    use sea_orm::EntityTrait;
 
     #[tokio::test]
     async fn test_database_round_trip_batch_commit() {
@@ -1227,11 +1235,13 @@ mod test {
 
     #[tokio::test]
     async fn test_delete_l1_messages_gt() {
+        reth_tracing::init_test_tracing();
+
         // Set up the test database.
         let db = setup_test_db().await;
 
         // Generate unstructured bytes.
-        let mut bytes = [0u8; 1024];
+        let mut bytes = [0u8; 10240];
         rand::rng().fill(bytes.as_mut_slice());
         let mut u = Unstructured::new(&bytes);
 
@@ -1276,6 +1286,8 @@ mod test {
 
     #[tokio::test]
     async fn test_get_l2_block_info_by_number() {
+        reth_tracing::init_test_tracing();
+
         // Set up the test database.
         let db = setup_test_db().await;
 
@@ -1475,67 +1487,6 @@ mod test {
         }
     }
 
-    #[tokio::test]
-    async fn test_insert_block_upsert_behavior() {
-        reth_tracing::init_test_tracing();
-
-        // Set up the test database.
-        let db = setup_test_db().await;
-
-        // Generate unstructured bytes.
-        let mut bytes = [0u8; 1024];
-        rand::rng().fill(bytes.as_mut_slice());
-        let mut u = Unstructured::new(&bytes);
-
-        // Generate batches
-        let batch_data_1 = BatchCommitData { index: 100, ..Arbitrary::arbitrary(&mut u).unwrap() };
-        let batch_info_1: BatchInfo = batch_data_1.clone().into();
-        let batch_data_2 = BatchCommitData { index: 200, ..Arbitrary::arbitrary(&mut u).unwrap() };
-        let batch_info_2: BatchInfo = batch_data_2.clone().into();
-
-        db.insert_batch(batch_data_1).await.unwrap();
-        db.insert_batch(batch_data_2).await.unwrap();
-
-        // Insert initial block
-        let block_info = BlockInfo { number: 600, hash: B256::arbitrary(&mut u).unwrap() };
-        db.insert_blocks(vec![block_info], batch_info_1).await.unwrap();
-
-        // Verify initial insertion
-        let retrieved_block = db.get_l2_block_info_by_number(600).await.unwrap();
-        assert_eq!(retrieved_block, Some(block_info));
-
-        // Verify initial batch association using model conversion
-        let initial_l2_block_model = models::l2_block::Entity::find()
-            .filter(models::l2_block::Column::BlockNumber.eq(600))
-            .one(db.inner().get_connection())
-            .await
-            .unwrap()
-            .unwrap();
-        let (initial_block_info, initial_batch_info): (BlockInfo, BatchInfo) =
-            initial_l2_block_model.into();
-        assert_eq!(initial_block_info, block_info);
-        assert_eq!(initial_batch_info, batch_info_1);
-
-        // Update the same block with different batch info (upsert)
-        db.insert_blocks(vec![block_info], batch_info_2).await.unwrap();
-
-        // Verify the block still exists and was updated
-        let retrieved_block = db.get_l2_block_info_by_number(600).await.unwrap().unwrap();
-        assert_eq!(retrieved_block, block_info);
-
-        // Verify batch association was updated using model conversion
-        let updated_l2_block_model = models::l2_block::Entity::find()
-            .filter(models::l2_block::Column::BlockNumber.eq(600))
-            .one(db.inner().get_connection())
-            .await
-            .unwrap()
-            .unwrap();
-        let (updated_block_info, updated_batch_info): (BlockInfo, BatchInfo) =
-            updated_l2_block_model.into();
-        assert_eq!(updated_block_info, block_info);
-        assert_eq!(updated_batch_info, batch_info_2);
-    }
-
     #[tokio::test]
     async fn test_prepare_on_startup() {
         let db = setup_test_db().await;

crates/database/db/src/db.rs

@@ -9,6 +9,9 @@ pub use db::Database;
 mod error;
 pub use error::DatabaseError;
 
+mod maintenance;
+pub use maintenance::DatabaseMaintenance;
+
 mod metrics;
 
 mod models;