wip

succinctlabs · Jan 24, 2025 · 02312d2 · 02312d2
1 parent 0f84397
commit 02312d2
Show file tree

Hide file tree

Showing 12 changed files with 120 additions and 317 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -44,19 +44,29 @@ tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
 # kona
 # Note: Switch to latest version of kona once the std::process::Command issue is resolved.
 # Branch: patch-kona-proof-v0.1.0
-kona-mpt = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1" }
-kona-derive = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1", default-features = false }
-kona-driver = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1" }
-kona-preimage = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1", features = [
-    "rkyv",
-] }
-kona-executor = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1" }
-kona-proof = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1" }
+# kona-mpt = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1" }
+# kona-derive = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1", default-features = false }
+# kona-driver = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1" }
+# kona-preimage = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1", features = [
+#     "rkyv",
+# ] }
+# kona-executor = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1" }
+# kona-proof = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1" }
 
-kona-common-proc = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1" }
+# kona-common-proc = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1" }
+
+# kona-client = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1" }
+# kona-host = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1" }
+kona-mpt = { path = "../kona/crates/mpt" }
+kona-derive = { path = "../kona/crates/derive", default-features = false }
+kona-driver = { path = "../kona/crates/driver" }
+kona-preimage = { path = "../kona/crates/proof-sdk/preimage", features = ["rkyv"] }
+kona-executor = { path = "../kona/crates/executor" }
+kona-proof = { path = "../kona/crates/proof-sdk/proof" }
+
+kona-client = { path = "../kona/bin/client" }
+kona-host = { path = "../kona/bin/host" }
 
-kona-client = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1" }
-kona-host = { git = "https://github.com/op-rs/kona", rev = "a59f643d0627320efff49f40f4803741ae9194f1" }
 
 # op-succinct
 op-succinct-prove = { path = "scripts/prove" }
@@ -68,25 +78,37 @@ op-succinct-proposer = { path = "proposer/succinct" }
 
 # Alloy
 alloy = { version = "0.9.2", default-features = false, features = ["full"] }
-# Uses sha3 instead of tiny-keccak. Reduces cycle count for Keccak by 50%.
-alloy-primitives = { version = "0.8.18", default-features = false, features = [
-    "sha3-keccak",
-] }
 alloy-rlp = { version = "0.3.10", default-features = false }
+alloy-trie = { version = "0.7.8", default-features = false }
 alloy-eips = { version = "0.9.2", default-features = false }
-revm = { version = "19.3.0", default-features = false, features = ["kzg-rs"] }
-alloy-consensus = { version = "0.6.4", default-features = false }
-alloy-sol-types = { version = "0.8.18" }
+alloy-serde = { version = "0.9.2", default-features = false }
+alloy-provider = { version = "0.9.2", default-features = false }
+alloy-consensus = { version = "0.9.2", default-features = false }
+alloy-transport = { version = "0.9.2", default-features = false }
+alloy-rpc-types = { version = "0.9.2", default-features = false }
+alloy-rpc-client = { version = "0.9.2", default-features = false }
+alloy-primitives = { version = "0.8.14", default-features = false }
+alloy-node-bindings = { version = "0.9.2", default-features = false }
+alloy-transport-http = { version = "0.9.2", default-features = false }
+alloy-rpc-types-engine = { version = "0.9.2", default-features = false }
+alloy-rpc-types-beacon = { version = "0.9.2", default-features = false }
+alloy-sol-types = { version = "0.8.18", default-features = false }
 
 # OP Alloy
-op-alloy-consensus = { version = "0.6.8", default-features = false }
-op-alloy-genesis = { version = "0.6.8", default-features = false, features = [
-    "serde",
-] }
-op-alloy-protocol = { version = "0.6.8", default-features = false }
-op-alloy-rpc-types = { version = "0.6.8", default-features = false }
-op-alloy-rpc-types-engine = { version = "0.6.8", default-features = false }
-op-alloy-network = { version = "0.6.8", default-features = false }
+op-alloy-consensus = { version = "0.9.5", default-features = false }
+op-alloy-rpc-types = { version = "0.9.5", default-features = false }
+op-alloy-rpc-types-engine = { version = "0.9.5", default-features = false }
+op-alloy-network = { version = "0.9.5", default-features = false }
+
+# Maili
+maili-consensus = { version = "0.1.6", default-features = false }
+maili-protocol = { version = "0.1.6", default-features = false }
+maili-registry = { version = "0.1.6", default-features = false }
+maili-genesis = { version = "0.1.6", default-features = false }
+
+# Revm
+revm = { version = "19.3.0", default-features = false }
+
 
 # sp1
 sp1-lib = { version = "4.0.0", features = ["verify"] }

diff --git a/programs/range/Cargo.toml b/programs/range/Cargo.toml
@@ -17,8 +17,9 @@ anyhow.workspace = true
 # workspace (ethereum)
 op-alloy-consensus.workspace = true
 op-alloy-rpc-types-engine.workspace = true
-op-alloy-protocol.workspace = true
-op-alloy-genesis.workspace = true
+maili-protocol.workspace = true
+maili-genesis.workspace = true
+
 alloy-consensus.workspace = true
 alloy-eips.workspace = true
 alloy-rlp.workspace = true

diff --git a/programs/range/src/main.rs b/programs/range/src/main.rs
@@ -18,8 +18,8 @@ use alloy_rlp::Decodable;
 use cfg_if::cfg_if;
 use core::fmt::Debug;
 use op_alloy_consensus::{OpBlock, OpTxEnvelope, OpTxType};
-use op_alloy_genesis::RollupConfig;
-use op_alloy_protocol::L2BlockInfo;
+use maili_genesis::RollupConfig;
+use maili_protocol::L2BlockInfo;
 use op_alloy_rpc_types_engine::OpAttributesWithParent;
 use op_succinct_client_utils::precompiles::zkvm_handle_register;
 use tracing::{error, info, warn};
@@ -90,6 +90,8 @@ fn main() {
                 println!("cycle-tracker-report-start: oracle-verify");
                 oracle.verify().expect("key value verification failed");
                 println!("cycle-tracker-report-end: oracle-verify");
+            } else {
+                let oracle = Arc::new(CachingOracle::new(ORACLE_LRU_SIZE, oracle_client, hint_client));
             }
         }
 

diff --git a/utils/client/Cargo.toml b/utils/client/Cargo.toml
@@ -21,8 +21,8 @@ alloy-sol-types.workspace = true
 revm.workspace = true
 
 # workspace (op-alloy)
-op-alloy-genesis.workspace = true
-op-alloy-protocol.workspace = true
+maili-genesis.workspace = true
+maili-protocol.workspace = true
 op-alloy-rpc-types-engine.workspace = true
 
 # workspace (kona)

diff --git a/utils/client/src/boot.rs b/utils/client/src/boot.rs
@@ -3,7 +3,7 @@
 
 use alloy_primitives::B256;
 use alloy_sol_types::sol;
-use op_alloy_genesis::RollupConfig;
+use maili_genesis::RollupConfig;
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 

diff --git a/utils/client/src/l2_chain_provider.rs b/utils/client/src/l2_chain_provider.rs
@@ -17,9 +17,9 @@ use kona_preimage::{CommsClient, PreimageKey, PreimageKeyType};
 use kona_proof::{
     errors::OracleProviderError, l1::OracleL1ChainProvider, BootInfo, FlushableCache, HintType,
 };
+use maili_genesis::{RollupConfig, SystemConfig};
+use maili_protocol::{to_system_config, BatchValidationProvider, L2BlockInfo};
 use op_alloy_consensus::{OpBlock, OpTxEnvelope};
-use op_alloy_genesis::{RollupConfig, SystemConfig};
-use op_alloy_protocol::{to_system_config, BatchValidationProvider, L2BlockInfo};
 use std::{collections::HashMap, sync::Mutex};
 
 use crate::block_on;

diff --git a/utils/client/src/pipeline.rs b/utils/client/src/pipeline.rs
@@ -18,8 +18,8 @@ use kona_derive::{
 use kona_driver::{DriverPipeline, PipelineCursor};
 use kona_preimage::CommsClient;
 use kona_proof::{l1::OracleL1ChainProvider, FlushableCache};
-use op_alloy_genesis::{RollupConfig, SystemConfig};
-use op_alloy_protocol::{BlockInfo, L2BlockInfo};
+use maili_genesis::{RollupConfig, SystemConfig};
+use maili_protocol::{BlockInfo, L2BlockInfo};
 use op_alloy_rpc_types_engine::OpAttributesWithParent;
 
 use crate::l2_chain_provider::MultiblockOracleL2ChainProvider;

diff --git a/utils/host/Cargo.toml b/utils/host/Cargo.toml
@@ -13,10 +13,10 @@ sp1-sdk.workspace = true
 op-succinct-client-utils.workspace = true
 
 # op-alloy
-op-alloy-genesis.workspace = true
+maili-genesis.workspace = true
 op-alloy-rpc-types.workspace = true
 op-alloy-network.workspace = true
-op-alloy-protocol.workspace = true
+maili-protocol.workspace = true
 op-alloy-consensus.workspace = true
 
 # alloy
@@ -44,4 +44,3 @@ serde.workspace = true
 reqwest.workspace = true
 log.workspace = true
 sysinfo = "0.32.0"
-
diff --git a/utils/host/src/fetcher.rs b/utils/host/src/fetcher.rs
@@ -15,14 +15,14 @@ use anyhow::{anyhow, bail};
 use cargo_metadata::MetadataCommand;
 use futures::{stream, StreamExt};
 use kona_host::HostCli;
+use maili_genesis::RollupConfig;
+use maili_protocol::calculate_tx_l1_cost_fjord;
+use maili_protocol::L2BlockInfo;
 use op_alloy_consensus::OpBlock;
-use op_alloy_genesis::RollupConfig;
 use op_alloy_network::{
     primitives::{BlockTransactions, BlockTransactionsKind, HeaderResponse},
     BlockResponse, Network, Optimism,
 };
-use op_alloy_protocol::calculate_tx_l1_cost_fjord;
-use op_alloy_protocol::L2BlockInfo;
 use op_alloy_rpc_types::{OpTransactionReceipt, OutputResponse, SafeHeadResponse};
 use op_succinct_client_utils::boot::BootInfoStruct;
 use serde::{Deserialize, Serialize};

diff --git a/utils/host/src/lib.rs b/utils/host/src/lib.rs
@@ -13,7 +13,7 @@ use kona_host::{
     kv::{DiskKeyValueStore, MemoryKeyValueStore},
     HostCli,
 };
-use op_alloy_genesis::RollupConfig;
+use maili_genesis::RollupConfig;
 use op_succinct_client_utils::{
     boot::BootInfoStruct, types::AggregationInputs, BootInfoWithBytesConfig, BytesHasherBuilder,
     InMemoryOracleData,

diff --git a/utils/host/src/rollup_config.rs b/utils/host/src/rollup_config.rs
@@ -4,8 +4,8 @@ use std::path::PathBuf;
 use alloy::eips::eip1559::BaseFeeParams;
 use alloy_primitives::Address;
 use anyhow::Result;
-use op_alloy_genesis::ChainGenesis;
-use op_alloy_genesis::RollupConfig;
+use maili_genesis::ChainGenesis;
+use maili_genesis::RollupConfig;
 use serde::{Deserialize, Serialize};
 
 use crate::fetcher::RunContext;