Skip to content
This repository has been archived by the owner on Feb 10, 2025. It is now read-only.

Commit

Permalink
still trying to fix dep
Browse files Browse the repository at this point in the history
  • Loading branch information
Connor O'Hara committed Dec 11, 2024
1 parent f5bce44 commit 8886b09
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 9 deletions.
16 changes: 13 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "*"
5 changes: 3 additions & 2 deletions program/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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" }
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"]}
4 changes: 2 additions & 2 deletions program/src/main.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
5 changes: 4 additions & 1 deletion script/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand All @@ -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"]}

0 comments on commit 8886b09

Please sign in to comment.