From 11d9ab31d7dd98f1bd8350e94d4e4b694b8b7aba Mon Sep 17 00:00:00 2001 From: Rami <2418646+hashcashier@users.noreply.github.com> Date: Thu, 19 Dec 2024 12:28:52 +0200 Subject: [PATCH] Chore: Update c-kzg patch (#134) * update kzg patch * cleanup deps --- guests/reth-ethereum/Cargo.lock | 5 +---- guests/reth-ethereum/Cargo.toml | 6 ------ guests/reth-ethereum/src/main.rs | 10 ---------- guests/reth-optimism/Cargo.lock | 5 +---- guests/reth-optimism/Cargo.toml | 6 ------ guests/reth-optimism/src/main.rs | 10 ---------- 6 files changed, 2 insertions(+), 40 deletions(-) diff --git a/guests/reth-ethereum/Cargo.lock b/guests/reth-ethereum/Cargo.lock index 294fb562..f7bf3b7c 100644 --- a/guests/reth-ethereum/Cargo.lock +++ b/guests/reth-ethereum/Cargo.lock @@ -795,7 +795,7 @@ dependencies = [ [[package]] name = "c-kzg" version = "1.0.3" -source = "git+https://github.com/risc0/c-kzg-4844.git?branch=p1.0.3#795934e2e8768d0a4dcb79e280e58fd73d6c9e17" +source = "git+https://github.com/risc0/c-kzg-4844.git?branch=p1.0.3#a42f908740c7e7d66b2d8b9846eeab67cf5fb76c" dependencies = [ "blst", "cc", @@ -3948,10 +3948,7 @@ dependencies = [ name = "zeth-guests-reth-ethereum" version = "0.1.0" dependencies = [ - "anyhow", "c-kzg", - "lazy_static", - "reth-chainspec", "risc0-zkvm", "risc0-zkvm-platform", "zeth-core", diff --git a/guests/reth-ethereum/Cargo.toml b/guests/reth-ethereum/Cargo.toml index c461f624..8b33eb70 100644 --- a/guests/reth-ethereum/Cargo.toml +++ b/guests/reth-ethereum/Cargo.toml @@ -34,13 +34,7 @@ path = "../../crates/core-ethereum" default-features = false [dependencies] -anyhow = { version = "1.0.86", default-features = false } c-kzg = { version = "=1.0.3", features = ["risc0-ffi"] } -lazy_static = "1.5.0" - -reth-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [ - "std", -] } [patch.crates-io] c-kzg = { git = "https://github.com/risc0/c-kzg-4844.git", branch = "p1.0.3" } diff --git a/guests/reth-ethereum/src/main.rs b/guests/reth-ethereum/src/main.rs index a4be958d..2db0d6a5 100644 --- a/guests/reth-ethereum/src/main.rs +++ b/guests/reth-ethereum/src/main.rs @@ -12,20 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -// use c_kzg::KzgSettings; use risc0_zkvm::guest::env; use zeth_core::db::trie::TrieDB; use zeth_core::stateless::client::StatelessClient; use zeth_core_ethereum::{RethCoreDriver, RethStatelessClient}; -// todo: use this instead of the alloy KzgEnv to save cycles -// lazy_static::lazy_static! { -// /// KZG Ceremony data -// pub static ref KZG: (Vec, KzgSettings) = { -// let mut data = Vec::from(include_bytes!("../kzg_settings_raw.bin")); -// let settings = KzgSettings::from_u8_slice(&mut data); -// (data, settings) -// }; -// } #[no_mangle] pub extern "C" fn __ctzsi2(x: u32) -> usize { diff --git a/guests/reth-optimism/Cargo.lock b/guests/reth-optimism/Cargo.lock index ca2cc5c4..0f25a72b 100644 --- a/guests/reth-optimism/Cargo.lock +++ b/guests/reth-optimism/Cargo.lock @@ -771,7 +771,7 @@ dependencies = [ [[package]] name = "c-kzg" version = "1.0.3" -source = "git+https://github.com/risc0/c-kzg-4844.git?branch=p1.0.3#795934e2e8768d0a4dcb79e280e58fd73d6c9e17" +source = "git+https://github.com/risc0/c-kzg-4844.git?branch=p1.0.3#a42f908740c7e7d66b2d8b9846eeab67cf5fb76c" dependencies = [ "blst", "cc", @@ -3991,10 +3991,7 @@ dependencies = [ name = "zeth-guests-reth-optimism" version = "0.1.0" dependencies = [ - "anyhow", "c-kzg", - "lazy_static", - "reth-optimism-chainspec", "risc0-zkvm", "risc0-zkvm-platform", "zeth-core", diff --git a/guests/reth-optimism/Cargo.toml b/guests/reth-optimism/Cargo.toml index c8be82de..6b981d83 100644 --- a/guests/reth-optimism/Cargo.toml +++ b/guests/reth-optimism/Cargo.toml @@ -34,13 +34,7 @@ path = "../../crates/core-optimism" default-features = false [dependencies] -anyhow = { version = "1.0.86", default-features = false } c-kzg = { version = "=1.0.3", features = ["risc0-ffi"] } -lazy_static = "1.5.0" - -reth-optimism-chainspec = { git = "https://github.com/risc0/reth", branch = "p1.1.0_zstd", default-features = false, features = [ - "std", -] } [patch.crates-io] c-kzg = { git = "https://github.com/risc0/c-kzg-4844.git", branch = "p1.0.3" } diff --git a/guests/reth-optimism/src/main.rs b/guests/reth-optimism/src/main.rs index 7a376bc5..e86f9c36 100644 --- a/guests/reth-optimism/src/main.rs +++ b/guests/reth-optimism/src/main.rs @@ -12,20 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -// use c_kzg::KzgSettings; use risc0_zkvm::guest::env; use zeth_core::db::trie::TrieDB; use zeth_core::stateless::client::StatelessClient; use zeth_core_optimism::{OpRethCoreDriver, OpRethStatelessClient}; -// todo: use this instead of the alloy KzgEnv to save cycles -// lazy_static::lazy_static! { -// /// KZG Ceremony data -// pub static ref KZG: (Vec, KzgSettings) = { -// let mut data = Vec::from(include_bytes!("../kzg_settings_raw.bin")); -// let settings = KzgSettings::from_u8_slice(&mut data); -// (data, settings) -// }; -// } #[no_mangle] pub extern "C" fn __ctzsi2(x: u32) -> usize {