diff --git a/Cargo.lock b/Cargo.lock index be98bf0..455799d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -947,7 +947,7 @@ dependencies = [ "alloy-sol-types 0.7.7", "bincode", "celestia-types", - "nmt-rs", + "nmt-rs 0.1.0", "reth-primitives", "rsp-client-executor", "sp1-zkvm", @@ -963,7 +963,7 @@ dependencies = [ "celestia-types", "clap", "hex", - "nmt-rs", + "nmt-rs 0.1.0", "reth-primitives", "rsp-client-executor", "serde", @@ -1188,7 +1188,7 @@ dependencies = [ "libp2p-identity", "multiaddr", "multihash", - "nmt-rs", + "nmt-rs 0.2.3", "prost", "ruint", "serde", @@ -3585,6 +3585,16 @@ dependencies = [ "tempfile", ] +[[package]] +name = "nmt-rs" +version = "0.1.0" +source = "git+https://github.com/Sovereign-Labs/nmt-rs.git?rev=ac03d7c#ac03d7c7620bab1e14256aa2fde8e425631a5278" +dependencies = [ + "bytes", + "serde", + "sha2 0.10.8", +] + [[package]] name = "nmt-rs" version = "0.2.3" diff --git a/Cargo.toml b/Cargo.toml index caba1fe..f5a8946 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,4 +17,4 @@ celestia-types = "0.9.0" tendermint-proto = "*" tendermint = "*" bincode = "1.3.3" -nmt-rs = { git = "https://github.com/Sovereign-Labs/nmt-rs.git", features = ["serde"] } +# nmt-rs = "*" \ No newline at end of file diff --git a/program/Cargo.toml b/program/Cargo.toml index d499811..5c1479b 100644 --- a/program/Cargo.toml +++ b/program/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" alloy-sol-types = { workspace = true } sp1-zkvm = "3.0.0-rc4" rsp-client-executor = {workspace=true} -nmt-rs = {workspace=true} +nmt-rs = {git="https://github.com/Sovereign-Labs/nmt-rs.git", rev="ac03d7c", features=["serde"]} celestia-types = {workspace=true} reth-primitives = {workspace=true} tendermint = {workspace=true} @@ -16,4 +16,5 @@ bincode = {workspace=true} [patch.crates-io] sha2-v0-10-8 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", tag = "sha2-v0.10.8-patch-v1" } crypto-bigint = { git = "https://github.com/sp1-patches/RustCrypto-bigint", tag = "crypto_bigint-v0.5.5-patch-v1" } -tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", tag = "tiny_keccak-v2.0.2-patch-v1" } \ No newline at end of file +tiny-keccak = { git = "https://github.com/sp1-patches/tiny-keccak", tag = "tiny_keccak-v2.0.2-patch-v1" } +nmt-rs = {git="https://github.com/Sovereign-Labs/nmt-rs.git", rev="ac03d7c", features=["serde"]} \ No newline at end of file diff --git a/program/src/main.rs b/program/src/main.rs index 3097152..faa0650 100644 --- a/program/src/main.rs +++ b/program/src/main.rs @@ -1,14 +1,14 @@ #![no_main] sp1_zkvm::entrypoint!(main); -use celestia_types::nmt::NamespacedHash; use celestia_types::{nmt::Namespace, AppVersion, Blob}; use celestia_types::{ nmt::{NamespaceProof, NamespacedHashExt}, ExtendedHeader, }; use nmt_rs::simple_merkle::tree::MerkleHash; -use nmt_rs::{simple_merkle::proof::Proof, TmSha2Hasher}; +//use nmt_rs::{simple_merkle::proof::Proof, TmSha2Hasher}; +use nmt_rs::{simple_merkle::proof::Proof, NamespacedHash, TmSha2Hasher}; use reth_primitives::Block; use rsp_client_executor::{ io::ClientExecutorInput, ChainVariant, ClientExecutor, EthereumVariant, CHAIN_ID_ETH_MAINNET, diff --git a/script/Cargo.toml b/script/Cargo.toml index 2cf220a..fba52b2 100644 --- a/script/Cargo.toml +++ b/script/Cargo.toml @@ -9,7 +9,7 @@ name = "blevm" path = "src/bin/main.rs" [dependencies] -nmt-rs = {workspace=true} +nmt-rs = {git="https://github.com/Sovereign-Labs/nmt-rs.git", rev="ac03d7c", features=["serde"]} sp1-sdk = "3.0.0" serde_json = { version = "1.0", default-features = false, features = ["alloc"] } serde = { version = "1.0.200", default-features = false, features = ["derive"] } @@ -26,3 +26,6 @@ rsp-client-executor = {workspace=true} [build-dependencies] sp1-helper = "3.0.0" + +[patch.crates-io] +nmt-rs = {git="https://github.com/Sovereign-Labs/nmt-rs.git", features=["serde"]} \ No newline at end of file