chore: update kona (#174)

* chore: update kona * feat: more cleanup, simplify
succinctlabs · Oct 18, 2024 · 91db989 · 91db989
1 parent fadc4bf
commit 91db989
Show file tree

Hide file tree

Showing 13 changed files with 173 additions and 74 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/configs/808813/rollup.json b/configs/808813/rollup.json
@@ -0,0 +1,48 @@
+{
+  "genesis": {
+    "l1": {
+      "number": 6404314,
+      "hash": "0x3908ceae1d5aa3135f57fa1017231bb62c2e661e966a68fe80fd7dff0a2e7564"
+    },
+    "l2": {
+      "number": 0,
+      "hash": "0xa286e5b6f82269ac1477f4136c09fb5c2ac9f005837ed2852610fc3e559b7256"
+    },
+    "l2_time": 1722352488,
+    "system_config": {
+      "batcherAddr": "0x0c2ac914b2378e5afaecbab08a171c769d34947c",
+      "overhead": "0xbc",
+      "scalar": "0xa6fe0",
+      "gasLimit": 30000000,
+      "baseFeeScalar": null,
+      "blobBaseFeeScalar": null,
+      "eip1559Denominator": null,
+      "eip1559Elasticity": null
+    }
+  },
+  "block_time": 2,
+  "max_sequencer_drift": 600,
+  "seq_window_size": 3600,
+  "channel_timeout": 300,
+  "granite_channel_timeout": 50,
+  "l1_chain_id": 11155111,
+  "l2_chain_id": 808813,
+  "base_fee_params": {
+    "max_change_denominator": "0x32",
+    "elasticity_multiplier": "0x6"
+  },
+  "canyon_base_fee_params": {
+    "max_change_denominator": "0xfa",
+    "elasticity_multiplier": "0x6"
+  },
+  "regolith_time": 0,
+  "canyon_time": 0,
+  "delta_time": 0,
+  "ecotone_time": 0,
+  "fjord_time": 0,
+  "granite_time": 1725984001,
+  "batch_inbox_address": "0x734dde12fd466c14a85de838788efe6f1993c84c",
+  "deposit_contract_address": "0xbaaf3bafdbd660380938b27d21c31bb7d072a799",
+  "l1_system_config_address": "0x3974436fa4bb4deb5a04ace51a704b10ff5a1f25",
+  "protocol_versions_address": "0x0000000000000000000000000000000000000000"
+}
diff --git a/elf/aggregation-elf b/elf/aggregation-elf
diff --git a/elf/fault-proof-elf b/elf/fault-proof-elf
diff --git a/elf/range-elf b/elf/range-elf
diff --git a/programs/fault-proof/Cargo.toml b/programs/fault-proof/Cargo.toml
@@ -11,15 +11,10 @@ homepage.workspace = true
 cfg-if.workspace = true
 serde_json.workspace = true
 
-# workspace (ethereum)
-alloy-consensus.workspace = true
-
 # sp1
 sp1-zkvm = { workspace = true }
 
 # kona
-kona-primitives.workspace = true
-kona-executor.workspace = true
 kona-client.workspace = true
 
 # op-succinct

diff --git a/programs/range/Cargo.toml b/programs/range/Cargo.toml
@@ -22,10 +22,8 @@ alloy-eips.workspace = true
 sp1-zkvm.workspace = true
 
 # kona
-kona-primitives.workspace = true
 kona-executor.workspace = true
 kona-client.workspace = true
-kona-derive.workspace = true
 
 # op-succinct
 op-succinct-client-utils.workspace = true
diff --git a/programs/range/src/main.rs b/programs/range/src/main.rs
@@ -19,7 +19,6 @@ use kona_client::{
     l1::{OracleBlobProvider, OracleL1ChainProvider},
     BootInfo,
 };
-use kona_executor::StatelessL2BlockExecutor;
 use log::info;
 use op_alloy_consensus::{OpBlock, OpTxEnvelope};
 use op_succinct_client_utils::{
@@ -117,14 +116,13 @@ fn main() {
         println!("cycle-tracker-report-end: payload-derivation");
 
         println!("cycle-tracker-start: execution-instantiation");
-        let mut executor = StatelessL2BlockExecutor::builder(
+        let mut executor = driver.new_executor(
             &boot.rollup_config,
-            l2_provider.clone(),
-            l2_provider.clone(),
-        )
-        .with_parent_header(driver.clone_l2_safe_head_header())
-        .with_handle_register(zkvm_handle_register)
-        .build();
+            &l2_provider,
+            &l2_provider,
+            zkvm_handle_register,
+        );
+
         println!("cycle-tracker-end: execution-instantiation");
 
         let mut l2_block_info;

diff --git a/scripts/prove/Cargo.toml b/scripts/prove/Cargo.toml
@@ -27,16 +27,12 @@ clap = { workspace = true }
 cargo_metadata = { workspace = true }
 anyhow.workspace = true
 dotenv.workspace = true
-num-format.workspace = true
 csv.workspace = true
 
 # local
 op-succinct-host-utils.workspace = true
 op-succinct-client-utils.workspace = true
 
-# op-alloy
-op-alloy-genesis.workspace = true
-
 # sp1
 sp1-sdk = { workspace = true }
 

diff --git a/scripts/prove/build.rs b/scripts/prove/build.rs
@@ -59,7 +59,8 @@ fn build_zkvm_program(program: &str) {
         &format!("../../programs/{}", program),
         BuildArgs {
             elf_name: format!("{}-elf", program),
-            // docker: true,
+            docker: true,
+            tag: "v3.0.0-rc4".to_string(),
             ..Default::default()
         },
     );

diff --git a/utils/client/Cargo.toml b/utils/client/Cargo.toml
@@ -26,12 +26,11 @@ op-alloy-rpc-types-engine.workspace = true
 
 # workspace (kona)
 kona-common.workspace = true
-kona-primitives.workspace = true
 kona-client.workspace = true
 kona-preimage.workspace = true
 kona-mpt.workspace = true
 kona-derive.workspace = true
-
+kona-executor.workspace = true
 # general
 serde.workspace = true
 rkyv.workspace = true