local kona 11-5

succinctlabs · Nov 5, 2024 · c8abb07 · c8abb07
1 parent 8860260
commit c8abb07
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -42,17 +42,15 @@ tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
 
 # kona
 # Note: Switch to latest version of kona once the std::process::Command issue is resolved.
-kona-common = { git = "https://github.com/moongate-forks/kona", branch = "patch-10-17-kona" }
-kona-common-proc = { git = "https://github.com/moongate-forks/kona", branch = "patch-10-17-kona" }
-kona-preimage = { git = "https://github.com/moongate-forks/kona", branch = "patch-10-17-kona", features = [
-    "rkyv",
-] }
-kona-primitives = { git = "https://github.com/moongate-forks/kona", branch = "patch-10-17-kona" }
-kona-mpt = { git = "https://github.com/moongate-forks/kona", branch = "patch-10-17-kona" }
-kona-derive = { git = "https://github.com/moongate-forks/kona", branch = "patch-10-17-kona", default-features = false }
-kona-executor = { git = "https://github.com/moongate-forks/kona", branch = "patch-10-17-kona" }
-kona-client = { git = "https://github.com/moongate-forks/kona", branch = "patch-10-17-kona" }
-kona-host = { git = "https://github.com/moongate-forks/kona", branch = "patch-10-17-kona" }
+kona-common = { path = "../kona/crates/common" }
+kona-common-proc = { path = "../kona/crates/common-proc" }
+kona-preimage = { path = "../kona/crates/preimage", features = ["rkyv"] }
+kona-primitives = { path = "../kona/crates/primitives" }
+kona-mpt = { path = "../kona/crates/mpt" }
+kona-derive = { path = "../kona/crates/derive", default-features = false }
+kona-executor = { path = "../kona/crates/executor" }
+kona-client = { path = "../kona/bin/client" }
+kona-host = { path = "../kona/bin/host" }
 
 # op-succinct
 op-succinct-prove = { path = "scripts/prove" }

diff --git a/scripts/utils/bin/cost_estimator.rs b/scripts/utils/bin/cost_estimator.rs
@@ -278,6 +278,8 @@ async fn main() -> Result<()> {
 
     let l2_chain_id = data_fetcher.get_l2_chain_id().await?;
 
+    println!("L2 Chain ID: {}", l2_chain_id);
+
     let split_ranges = split_range(args.start, args.end, l2_chain_id, args.batch_size);
 
     info!(

diff --git a/utils/host/src/fetcher.rs b/utils/host/src/fetcher.rs
@@ -633,7 +633,10 @@ impl OPSuccinctDataFetcher {
         };
         let claimed_l2_output_root = keccak256(l2_claim_encoded.abi_encode());
 
-        let (l1_head_hash, _l1_head_number) = self.get_l1_head(l2_end_block).await?;
+        let (l1_head_hash, l1_head_number) = self.get_l1_head(l2_end_block).await?;
+
+        println!("L1 Head Number: {}", l1_head_number);
+        println!("L2 End Block: {}", l2_end_block);
 
         // Get the workspace root, which is where the data directory is.
         let metadata = MetadataCommand::new().exec().unwrap();
@@ -725,6 +728,7 @@ impl OPSuccinctDataFetcher {
             .await?;
 
         let l1_origin = optimism_output_data.block_ref.l1_origin;
+        println!("L1 origin of L2 end block: {}", l1_origin.number);
 
         // Search forward from the l1Origin, skipping forward in 5 minute increments until an L1 block with an L2 safe head greater than the l2_end_block is found.
         let mut current_l1_block_number = l1_origin.number;
-Original file line number
+Diff line change
@@ Expand Up / @@ -278,6 +278,8 @@ async fn main() -> Result<()> { @@
         let l2_chain_id = data_fetcher.get_l2_chain_id().await?;
+        println!("L2 Chain ID: {}", l2_chain_id);
         let split_ranges = split_range(args.start, args.end, l2_chain_id, args.batch_size);
         info!(
@@ Expand Down @@