Handle new Espresso fields in the config.

Author: philippecamacho

utils/ethereum/host/src/host.rs

@@ -52,8 +52,21 @@ impl OPSuccinctHost for SingleChainOPSuccinctHost {
         fetcher: &OPSuccinctDataFetcher,
         _: u64,
     ) -> Result<Option<u64>> {
-        let finalized_l2_block_number = fetcher.get_l2_header(BlockId::finalized()).await?;
-        Ok(Some(finalized_l2_block_number.number))
+        // Use safe head instead of finalized for devnet/testing scenarios where
+        // altDA finalization may not be working properly.
+        // Controlled by USE_SAFE_HEAD_FOR_PROPOSALS env var.
+        let use_safe_head = std::env::var("USE_SAFE_HEAD_FOR_PROPOSALS")
+            .map(|v| v.to_lowercase() == "true" || v == "1")
+            .unwrap_or(false);
+
+        let block_id = if use_safe_head {
+            BlockId::safe()
+        } else {
+            BlockId::finalized()
+        };
+
+        let l2_block_number = fetcher.get_l2_header(block_id).await?;
+        Ok(Some(l2_block_number.number))
     }
 
     async fn calculate_safe_l1_head(

utils/host/src/fetcher.rs

@@ -313,9 +313,22 @@ impl OPSuccinctDataFetcher {
     async fn fetch_and_save_rollup_config(
         rpc_config: &RPCConfig,
     ) -> Result<(CeloRollupConfig, PathBuf)> {
-        let rollup_config: CeloRollupConfig =
+        // Fetch raw JSON first to handle unknown fields (e.g., Espresso's batch_authenticator_address)
+        let mut raw_config: Value =
             Self::fetch_rpc_data(&rpc_config.l2_node_rpc, "optimism_rollupConfig", vec![]).await?;
 
+        // Strip unknown fields that are not part of the standard rollup config
+        // This allows compatibility with Espresso and other forks that add custom fields
+        if let Some(obj) = raw_config.as_object_mut() {
+            // Remove Espresso-specific fields that CeloRollupConfig doesn't recognize
+            obj.remove("batch_authenticator_address");
+            obj.remove("caff_node_config");
+        }
+
+        // Deserialize the cleaned config
+        let rollup_config: CeloRollupConfig = serde_json::from_value(raw_config.clone())
+            .with_context(|| format!("Failed to parse rollup config: {:?}", raw_config))?;
+
         // Create configs directory if it doesn't exist
         let rollup_config_dir = PathBuf::from("configs/L2");
         fs::create_dir_all(&rollup_config_dir)?;