Use rollup config from celo-registry prior to the one from node RPC and bump celo-kona (#113)

* Use rollup config from celo-registry prior to the one from node RPC

* Update celo-kona to Chaos Jovian ready version

Author: seolaoh

Cargo.lock

@@ -104,11 +104,12 @@ kona-genesis = { git = "https://github.com/op-rs/kona", tag = "kona-client/v1.2.
 
 # TODO: replace commit hash with tag when available
 # celo-kona
-celo-driver = { git = "https://github.com/celo-org/celo-kona", rev = "444db61" }
-celo-proof = { git = "https://github.com/celo-org/celo-kona", rev = "444db61" }
-celo-host = { git = "https://github.com/celo-org/celo-kona", rev = "444db61" }
-celo-protocol = { git = "https://github.com/celo-org/celo-kona", rev = "444db61", default-features = false }
-celo-genesis = { git = "https://github.com/celo-org/celo-kona", rev = "444db61", default-features = false }
+celo-driver = { git = "https://github.com/celo-org/celo-kona", rev = "066f949" }
+celo-proof = { git = "https://github.com/celo-org/celo-kona", rev = "066f949" }
+celo-host = { git = "https://github.com/celo-org/celo-kona", rev = "066f949" }
+celo-protocol = { git = "https://github.com/celo-org/celo-kona", rev = "066f949", default-features = false }
+celo-genesis = { git = "https://github.com/celo-org/celo-kona", rev = "066f949", default-features = false }
+celo-registry = { git = "https://github.com/celo-org/celo-kona", rev = "066f949", default-features = false }
 
 # hana
 hana-blobstream = { git = "https://github.com/celestiaorg/hana", tag = "1.5.0-mocha" }
@@ -199,10 +200,10 @@ op-alloy-rpc-types-engine = { version = "0.22.4", default-features = false }
 op-alloy-network = { version = "0.22.4", default-features = false }
 
 # Celo Alloy
-celo-alloy-consensus = { git = "https://github.com/celo-org/celo-kona", rev = "444db61", default-features = false }
-celo-alloy-rpc-types = { git = "https://github.com/celo-org/celo-kona", rev = "444db61", default-features = false }
-celo-alloy-rpc-types-engine = { git = "https://github.com/celo-org/celo-kona", rev = "444db61", default-features = false }
-celo-alloy-network = { git = "https://github.com/celo-org/celo-kona", rev = "444db61", default-features = false }
+celo-alloy-consensus = { git = "https://github.com/celo-org/celo-kona", rev = "066f949", default-features = false }
+celo-alloy-rpc-types = { git = "https://github.com/celo-org/celo-kona", rev = "066f949", default-features = false }
+celo-alloy-rpc-types-engine = { git = "https://github.com/celo-org/celo-kona", rev = "066f949", default-features = false }
+celo-alloy-network = { git = "https://github.com/celo-org/celo-kona", rev = "066f949", default-features = false }
 
 # Execution
 alloy-evm = { version = "0.24.2", default-features = false }
@@ -216,7 +217,7 @@ revm-precompile = { version = "31.0.0", default-features = false }
 op-revm = { version = "14.1.0", default-features = false }
 
 # Celo Execution
-alloy-celo-evm = { git = "https://github.com/celo-org/celo-kona", rev = "444db61", default-features = false }
+alloy-celo-evm = { git = "https://github.com/celo-org/celo-kona", rev = "066f949", default-features = false }
 
 # SP1
 sp1-sdk = { version = "=5.2.4", default-features = false, features = ["network"] }

Cargo.toml

@@ -41,6 +41,7 @@ celo-host.workspace = true
 celo-protocol.workspace = true
 celo-genesis.workspace = true
 celo-proof.workspace = true
+celo-registry.workspace = true
 
 # hana
 hana-host.workspace = true

elf/aggregation-elf

@@ -19,11 +19,12 @@ use celo_alloy_consensus::CeloBlock;
 use celo_alloy_network::Celo;
 use celo_genesis::CeloRollupConfig;
 use celo_protocol::CeloL2BlockInfo;
+use celo_registry::ROLLUP_CONFIGS;
 use futures::{stream, StreamExt};
 use kona_host::single::SingleChainHost;
 use kona_registry::L1_CONFIGS;
 use op_alloy_network::{primitives::HeaderResponse, BlockResponse, Network};
-use op_succinct_client_utils::boot::BootInfoStruct;
+use op_succinct_client_utils::boot::{hash_rollup_config, BootInfoStruct};
 use reqwest::Url;
 use serde::{Deserialize, Serialize};
 use serde_json::{json, Value};
@@ -313,8 +314,55 @@ impl OPSuccinctDataFetcher {
     async fn fetch_and_save_rollup_config(
         rpc_config: &RPCConfig,
     ) -> Result<(CeloRollupConfig, PathBuf)> {
-        let rollup_config: CeloRollupConfig =
-            Self::fetch_rpc_data(&rpc_config.l2_node_rpc, "optimism_rollupConfig", vec![]).await?;
+        // Fetch chain ID to look up registry config
+        let chain_id: String =
+            Self::fetch_rpc_data(&rpc_config.l2_rpc, "eth_chainId", vec![]).await?;
+        let chain_id: u64 = chain_id.parse::<U64>().unwrap().to();
+
+        // Fetch rollup config from node RPC (best-effort for hash comparison)
+        let node_rpc_config: Option<CeloRollupConfig> =
+            Self::fetch_rpc_data(&rpc_config.l2_node_rpc, "optimism_rollupConfig", vec![])
+                .await
+                .inspect(|_| {
+                    tracing::info!("Loaded L2 config for chain ID {} from node RPC", chain_id);
+                })
+                .map_err(|e| {
+                    tracing::warn!(
+                        "Failed to fetch rollup config from node RPC for chain ID {}: {:?}",
+                        chain_id,
+                        e
+                    );
+                })
+                .ok();
+
+        // Try to fetch rollup config from celo-registry; if found, compare hashes and use it
+        let rollup_config = if let Some(registry_config) = ROLLUP_CONFIGS.get(&chain_id) {
+            tracing::info!("Loaded L2 config for chain ID {} from registry", chain_id);
+            if let Some(ref node_config) = node_rpc_config {
+                let registry_hash = hash_rollup_config(registry_config);
+                let node_rpc_hash = hash_rollup_config(node_config);
+                if registry_hash != node_rpc_hash {
+                    tracing::warn!(
+                        "Rollup config hash mismatch for chain ID {}: registry hash = {:?}, node RPC hash = {:?}",
+                        chain_id,
+                        registry_hash,
+                        node_rpc_hash
+                    );
+                }
+            }
+            registry_config.clone()
+        } else {
+            tracing::warn!(
+                "No rollup config found in registry for chain ID {}. Falling back to node RPC config",
+                chain_id
+            );
+            node_rpc_config.ok_or_else(|| {
+                anyhow::anyhow!(
+                    "No rollup config available for chain ID {}: not in registry and node RPC fetch failed",
+                    chain_id
+                )
+            })?
+        };
 
         // Create configs directory if it doesn't exist
         let default_dir = PathBuf::from("configs/L2");