feat: custom rollup config

.gitignore

@@ -19,3 +19,6 @@ data
 
 # DB data
 db/
+
+# Rollup Config
+rollup-config.json

Cargo.toml

@@ -46,7 +46,7 @@ futures = "0.3.30"
 serde_cbor = "0.11.2"
 log = "0.4.22"
 itertools = "0.13.0"
-
+tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", branch = "patch-v2.0.2" }
 
 # serialization
 serde = { version = "1.0.198", features = ["derive"] }

client-programs/aggregation/src/main.rs

@@ -6,7 +6,7 @@ sp1_zkvm::entrypoint!(main);
 
 use alloy_consensus::Header;
 use alloy_primitives::B256;
-use client_utils::{types::AggregationInputs, RawBootInfo};
+use client_utils::{types::AggregationInputs, BootInfoWithHashedConfig};
 use sha2::{Digest, Sha256};
 use std::collections::HashMap;
 
@@ -72,6 +72,13 @@ pub fn main() {
         // The chain ID must be the same for all the boot infos, to ensure they're
         // from the same chain and span batch range.
         assert_eq!(prev_boot_info.chain_id, boot_info.chain_id);
+
+        // The rollup config must be the same for all the boot infos, to ensure they're
+        // from the same chain and span batch range.
+        assert_eq!(
+            prev_boot_info.rollup_config_hash,
+            boot_info.rollup_config_hash
+        );
     });
 
     // Verify each multi-block program proof.
@@ -92,13 +99,14 @@ pub fn main() {
     let first_boot_info = &agg_inputs.boot_infos[0];
     let last_boot_info = &agg_inputs.boot_infos[agg_inputs.boot_infos.len() - 1];
     // Consolidate the boot info into a single BootInfo struct that represents the range proven.
-    let final_boot_info = RawBootInfo {
+    let final_boot_info = BootInfoWithHashedConfig {
         // The first boot info's L2 output root is the L2 output root of the range.
         l2_output_root: first_boot_info.l2_output_root,
         l2_claim_block: last_boot_info.l2_claim_block,
         l2_claim: last_boot_info.l2_claim,
         l1_head: agg_inputs.latest_l1_checkpoint_head,
         chain_id: last_boot_info.chain_id,
+        rollup_config_hash: last_boot_info.rollup_config_hash,
     };
 
     // Commit to the aggregated boot info.

client-programs/fault-proof/Cargo.toml

@@ -11,6 +11,7 @@ homepage.workspace = true
 
 # workspace (general)
 cfg-if.workspace = true
+serde_json.workspace = true
 
 # workspace (ethereum)
 alloy-consensus.workspace = true

client-programs/fault-proof/src/main.rs

@@ -21,10 +21,14 @@ cfg_if! {
     // from SP1 and compile to a program that can be run in zkVM.
     if #[cfg(target_os = "zkvm")] {
         sp1_zkvm::entrypoint!(main);
-        use client_utils::{RawBootInfo, InMemoryOracle};
+
+        use client_utils::{InMemoryOracle, BootInfoWithNoConfig, BootInfoWithHashedConfig};
+        use kona_primitives::RollupConfig;
         use alloc::vec::Vec;
+        use serde_json;
     } else {
         use kona_client::CachingOracle;
+        use client_utils::pipes::{ORACLE_READER, HINT_WRITER};
     }
 }
 
@@ -39,9 +43,20 @@ fn main() {
             // and in memory oracle.
             if #[cfg(target_os = "zkvm")] {
                 println!("cycle-tracker-start: boot-load");
-                let raw_boot_info = sp1_zkvm::io::read::<RawBootInfo>();
-                sp1_zkvm::io::commit_slice(&raw_boot_info.abi_encode());
-                let boot: Arc<BootInfo> = Arc::new(raw_boot_info.into());
+                let boot_info_with_no_config = sp1_zkvm::io::read::<BootInfoWithNoConfig>();
+                let rollup_config_bytes = sp1_zkvm::io::read_vec();
+                let boot_info_with_hashed_config = BootInfoWithHashedConfig::new(&boot_info_with_no_config, &rollup_config_bytes);
+                sp1_zkvm::io::commit::<BootInfoWithHashedConfig>(&boot_info_with_hashed_config);
+
+                let rollup_config: RollupConfig = serde_json::from_slice(&rollup_config_bytes).expect("failed to parse rollup config");
+                let boot: Arc<BootInfo> = Arc::new(BootInfo {
+                    l1_head: boot_info_with_no_config.l1_head,
+                    l2_output_root: boot_info_with_no_config.l2_output_root,
+                    l2_claim: boot_info_with_no_config.l2_claim,
+                    l2_claim_block: boot_info_with_no_config.l2_claim_block,
+                    chain_id: boot_info_with_no_config.chain_id,
+                    rollup_config,
+                });
                 println!("cycle-tracker-end: boot-load");
 
                 println!("cycle-tracker-start: oracle-load");
@@ -58,7 +73,7 @@ fn main() {
             // If we are compiling for online mode, create a caching oracle that speaks to the
             // fetcher via hints, and gather boot info from this oracle.
             } else {
-                let oracle = Arc::new(CachingOracle::new(1024));
+                let oracle = Arc::new(CachingOracle::new(1024, ORACLE_READER, HINT_WRITER));
                 let boot = Arc::new(BootInfo::load(oracle.as_ref()).await.unwrap());
                 let precompile_overrides = NoPrecompileOverride;
             }

client-programs/range/Cargo.toml

@@ -11,6 +11,7 @@ repository.workspace = true
 # workspace (general)
 cfg-if.workspace = true
 client-utils.workspace = true
+serde_json.workspace = true
 
 # workspace (ethereum)
 op-alloy-consensus.workspace = true
@@ -26,3 +27,4 @@ kona-client.workspace = true
 sp1-zkvm.workspace = true
 
 log.workspace = true
+bincode.workspace = true