Reapply "fix: use the correct l2_chain_id (succinctlabs#782)" (#107)

* Reapply "fix: use the correct l2_chain_id (succinctlabs#782)"

This reverts commit 18c6583.

The next commits should resolve the problems that made it necessary to
skip that commit.

* Use celo-org/hokulea with custom BootInfo parameter

See celo-org/hokulea#1

* Pass CeloBootInfo to hokulea

so that hokulea does not have to rely on kona-registry.

* Update ELF files

* Update hokulea to avoid using a fork

Layr-Labs/hokulea@bf561cc
is merged in upstream and provides what we need, so we can stop
depending on our own hokulea fork.

* Update ELF files

Author: karlb

Cargo.lock

@@ -116,15 +116,15 @@ hana-host = { git = "https://github.com/celestiaorg/hana", tag = "1.5.0-mocha" }
 hana-oracle = { git = "https://github.com/celestiaorg/hana", tag = "1.5.0-mocha" }
 
 # hokulea
-hokulea-compute-proof = { git = "https://github.com/Layr-Labs/hokulea", tag = "hokulea-client/v1.1.4" }
-hokulea-eigenda = { git = "https://github.com/Layr-Labs/hokulea", tag = "hokulea-client/v1.1.4" }
-hokulea-host-bin = { git = "https://github.com/Layr-Labs/hokulea", tag = "hokulea-client/v1.1.4" }
-hokulea-proof = { git = "https://github.com/Layr-Labs/hokulea", tag = "hokulea-client/v1.1.4" }
-hokulea-witgen = { git = "https://github.com/Layr-Labs/hokulea", tag = "hokulea-client/v1.1.4" }
-hokulea-zkvm-verification = { git = "https://github.com/Layr-Labs/hokulea", tag = "hokulea-client/v1.1.4" }
-canoe-sp1-cc-host = { git = "https://github.com/Layr-Labs/hokulea", tag = "hokulea-client/v1.1.4" }
-canoe-sp1-cc-verifier = { git = "https://github.com/Layr-Labs/hokulea", tag = "hokulea-client/v1.1.4" }
-canoe-verifier-address-fetcher = { git = "https://github.com/Layr-Labs/hokulea", tag = "hokulea-client/v1.1.4" }
+hokulea-compute-proof = { git = "https://github.com/Layr-Labs/hokulea", rev = "bf561cc" }
+hokulea-eigenda = { git = "https://github.com/Layr-Labs/hokulea", rev = "bf561cc" }
+hokulea-host-bin = { git = "https://github.com/Layr-Labs/hokulea", rev = "bf561cc" }
+hokulea-proof = { git = "https://github.com/Layr-Labs/hokulea", rev = "bf561cc" }
+hokulea-witgen = { git = "https://github.com/Layr-Labs/hokulea", rev = "bf561cc" }
+hokulea-zkvm-verification = { git = "https://github.com/Layr-Labs/hokulea", rev = "bf561cc" }
+canoe-sp1-cc-host = { git = "https://github.com/Layr-Labs/hokulea", rev = "bf561cc" }
+canoe-sp1-cc-verifier = { git = "https://github.com/Layr-Labs/hokulea", rev = "bf561cc" }
+canoe-verifier-address-fetcher = { git = "https://github.com/Layr-Labs/hokulea", rev = "bf561cc" }
 
 # op-succinct
 op-succinct-prove = { path = "scripts/prove" }

Cargo.toml

@@ -15,6 +15,9 @@ serde_cbor.workspace = true
 # kona
 kona-proof.workspace = true
 
+# celo-kona
+celo-proof.workspace = true
+
 # hokulea
 hokulea-proof.workspace = true
 hokulea-zkvm-verification.workspace = true

elf/aggregation-elf

@@ -11,6 +11,7 @@ sp1_zkvm::entrypoint!(main);
 
 use canoe_sp1_cc_verifier::CanoeSp1CCVerifier;
 use canoe_verifier_address_fetcher::CanoeVerifierAddressFetcherDeployedByEigenLabs;
+use celo_proof::CeloBootInfo;
 use hokulea_proof::eigenda_witness::EigenDAWitness;
 use hokulea_zkvm_verification::eigenda_witness_to_preloaded_provider;
 use op_succinct_client_utils::witness::{EigenDAWitnessData, WitnessData};
@@ -35,12 +36,17 @@ fn main() {
             .await
             .expect("Failed to load oracle and blob provider");
 
+        // Load boot info using CeloBootInfo which uses celo_registry (has Celo chain configs)
+        let celo_boot =
+            CeloBootInfo::load(oracle.as_ref()).await.expect("Failed to load boot info");
+
         let eigenda_witness: EigenDAWitness = serde_cbor::from_slice(
             &witness_data.eigenda_data.clone().expect("eigenda witness data is not present"),
         )
         .expect("cannot deserialize eigenda witness");
         let preloaded_preimage_provider = eigenda_witness_to_preloaded_provider(
             oracle.clone(),
+            &celo_boot.op_boot_info,
             CanoeSp1CCVerifier {},
             CanoeVerifierAddressFetcherDeployedByEigenLabs {},
             eigenda_witness,

elf/eigenda-range-elf-embedded

@@ -678,10 +678,9 @@ impl OPSuccinctDataFetcher {
         l2_end_block: u64,
         l1_head_hash: B256,
     ) -> Result<SingleChainHost> {
-        // If the rollup config is not already loaded, fetch and save it.
-        if self.rollup_config.is_none() {
+        let Some(rollup_config) = &self.rollup_config else {
             return Err(anyhow::anyhow!("Rollup config not loaded."));
-        }
+        };
 
         if l2_start_block >= l2_end_block {
             return Err(anyhow::anyhow!(
@@ -744,7 +743,7 @@ impl OPSuccinctDataFetcher {
             agreed_l2_head_hash,
             claimed_l2_output_root,
             claimed_l2_block_number: l2_end_block,
-            l2_chain_id: None,
+            l2_chain_id: Some(rollup_config.l2_chain_id.id()),
             // Trim the trailing slash to avoid double slashes in the URL.
             l2_node_address: Some(
                 self.rpc_config.l2_rpc.as_str().trim_end_matches('/').to_string(),