feat: set initial fcs from db

crates/chain-orchestrator/src/lib.rs

@@ -456,9 +456,7 @@ impl<
             Box::pin(async move {
                 let head = block_infos.last().expect("block info must not be empty").clone();
                 let tx = database.tx_mut().await?;
-                for block in block_infos {
-                    tx.insert_block(block, batch_info).await?;
-                }
+                tx.insert_blocks(block_infos, batch_info).await?;
                 tx.commit().await?;
                 Result::<_, ChainOrchestratorError>::Ok(Some(
                     ChainOrchestratorEvent::L2ConsolidatedBlockCommitted(head),

crates/database/db/src/operations.rs

@@ -573,7 +573,9 @@ pub trait DatabaseReadOperations: ReadConnectionProvider + Sync {
             })?)
     }
 
-    /// Get the latest safe L2 ([`BlockInfo`], [`BatchInfo`]) from the database.
+    /// Get the latest safe/finalized L2 ([`BlockInfo`], [`BatchInfo`]) from the database. Until we
+    /// update the batch handling logic with issue #273, we don't differentiate between safe and
+    /// finalized l2 blocks.
     async fn get_latest_safe_l2_info(
         &self,
     ) -> Result<Option<(BlockInfo, BatchInfo)>, DatabaseError> {

crates/engine/Cargo.toml

@@ -40,6 +40,7 @@ rollup-node-providers.workspace = true
 rollup-node-signer.workspace = true
 
 # scroll
+scroll-db.workspace = true
 scroll-network.workspace = true
 
 # misc
@@ -70,6 +71,7 @@ test-utils = [
     "rollup-node-providers/test-utils",
     "reth-chainspec/test-utils",
     "reth-primitives-traits/test-utils",
+    "scroll-db/test-utils",
 ]
 serde = [
     "alloy-eips/serde",

crates/engine/src/fcs.rs

@@ -33,7 +33,7 @@ impl ForkchoiceState {
 
     /// Creates a new [`ForkchoiceState`] instance setting the `head`, `safe` and `finalized` block
     /// info to the provided `genesis` hash.
-    pub const fn head_from_genesis(genesis: B256) -> Self {
+    pub const fn from_genesis(genesis: B256) -> Self {
         Self::new(
             BlockInfo { hash: genesis, number: 0 },
             BlockInfo { hash: genesis, number: 0 },
@@ -43,7 +43,7 @@ impl ForkchoiceState {
 
     /// Creates a [`ForkchoiceState`] instance setting the `head`, `safe` and `finalized` hash to
     /// the appropriate genesis values by reading from the provider.
-    pub async fn head_from_provider<P: Provider<Scroll>>(provider: P) -> Option<Self> {
+    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 =
@@ -65,7 +65,7 @@ impl ForkchoiceState {
     pub fn head_from_chain_spec<CS: EthChainSpec<Header: BlockHeader>>(
         chain_spec: CS,
     ) -> Option<Self> {
-        Some(Self::head_from_genesis(genesis_hash_from_chain_spec(chain_spec)?))
+        Some(Self::from_genesis(genesis_hash_from_chain_spec(chain_spec)?))
     }
 
     /// Updates the `head` block info.

crates/node/src/args.rs

@@ -16,6 +16,7 @@ use alloy_signer_local::PrivateKeySigner;
 use alloy_transport::layers::RetryBackoffLayer;
 use aws_sdk_kms::config::BehaviorVersion;
 use clap::ArgAction;
+use futures::StreamExt;
 use reth_chainspec::EthChainSpec;
 use reth_network::NetworkProtocols;
 use reth_network_api::FullNetwork;
@@ -243,9 +244,30 @@ impl ScrollRollupNodeConfig {
             ForkchoiceState::head_from_chain_spec(chain_spec.clone())
                 .expect("failed to derive forkchoice state from chain spec")
         };
-        let mut fcs = ForkchoiceState::head_from_provider(l2_provider.clone())
-            .await
-            .unwrap_or_else(chain_spec_fcs);
+        let mut fcs =
+            ForkchoiceState::from_provider(&l2_provider).await.unwrap_or_else(chain_spec_fcs);
+
+        // Update the head block info from the database if available.
+        if let Some(latest_block) = db.tx().await?.get_l2_blocks().await?.next().await {
+            let latest_block = latest_block?;
+            fcs.update_head_block_info(latest_block);
+        }
+
+        // On startup we replay the latest batch of blocks from the database as such we set the safe
+        // block hash to the latest block hash associated with the previous consolidated
+        // batch in the database.
+        let tx = db.tx_mut().await?;
+        let (startup_safe_block, l1_start_block_number) =
+            tx.prepare_on_startup(chain_spec.genesis_hash()).await?;
+        tx.commit().await?;
+        if let Some(block_info) = startup_safe_block {
+            fcs.update_safe_block_info(block_info);
+        } else {
+            fcs.update_safe_block_info(BlockInfo {
+                hash: genesis_hash_from_chain_spec(chain_spec.clone()).unwrap(),
+                number: 0,
+            });
+        }
 
         let chain_spec = Arc::new(chain_spec.clone());
 
@@ -267,22 +289,6 @@ impl ScrollRollupNodeConfig {
             authorized_signer,
         );
 
-        // On startup we replay the latest batch of blocks from the database as such we set the safe
-        // block hash to the latest block hash associated with the previous consolidated
-        // batch in the database.
-        let tx = db.tx_mut().await?;
-        let (startup_safe_block, l1_start_block_number) =
-            tx.prepare_on_startup(chain_spec.genesis_hash()).await?;
-        tx.commit().await?;
-        if let Some(block_info) = startup_safe_block {
-            fcs.update_safe_block_info(block_info);
-        } else {
-            fcs.update_safe_block_info(BlockInfo {
-                hash: genesis_hash_from_chain_spec(chain_spec.clone()).unwrap(),
-                number: 0,
-            });
-        }
-
         tracing::info!(target: "scroll::node::args", fcs = ?fcs, payload_building_duration = ?self.sequencer_args.payload_building_duration, "Starting engine driver");
         let engine = EngineDriver::new(
             Arc::new(engine_api),