diff --git a/Cargo.toml b/Cargo.toml index 7b05fc16..df90cf93 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,16 +24,16 @@ risc0-zkvm = { git = "https://github.com/risc0/risc0", branch = "main", default- risc0-binfmt = { git = "https://github.com/risc0/risc0", branch = "main", default-features = false } # Alloy guest dependencies -alloy-consensus = { version = "0.7" } +alloy-consensus = { version = "0.8" } alloy-rlp = { version = "0.3.8" } alloy-primitives = { version = "0.8.8" } alloy-sol-types = { version = "0.8.8" } # OP Steel -op-alloy-network = { version = "0.7" } +op-alloy-network = { version = "0.8" } # Alloy host dependencies -alloy = { version = "0.7.0" } +alloy = { version = "0.8" } alloy-trie = { version = "0.7" } # Beacon chain support @@ -44,7 +44,7 @@ anyhow = { version = "1.0" } bincode = { version = "1.3" } clap = { version = "4.5", features = ["derive", "env"] } log = "0.4" -nybbles = { version = "0.2.1" } +nybbles = { version = "0.2" } revm = { version = "18.0", default-features = false, features = ["std"] } reqwest = "0.12" serde = "1.0" diff --git a/examples/erc20-counter/Cargo.toml b/examples/erc20-counter/Cargo.toml index e1da573c..e0913bd4 100644 --- a/examples/erc20-counter/Cargo.toml +++ b/examples/erc20-counter/Cargo.toml @@ -18,7 +18,7 @@ risc0-build = { git = "https://github.com/risc0/risc0", branch = "main", feature risc0-zkvm = { git = "https://github.com/risc0/risc0", branch = "main", default-features = false } risc0-zkp = { git = "https://github.com/risc0/risc0", branch = "main", default-features = false } -alloy = { version = "0.7", features = ["full"] } +alloy = { version = "0.8", features = ["full"] } alloy-primitives = { version = "0.8", features = ["rlp", "serde", "std"] } alloy-sol-types = { version = "0.8" } anyhow = { version = "1.0.75" } diff --git a/examples/governance/apps/Cargo.toml b/examples/governance/apps/Cargo.toml index 863133a3..5cc8dea7 100644 --- a/examples/governance/apps/Cargo.toml +++ b/examples/governance/apps/Cargo.toml @@ -4,7 +4,7 @@ version = { workspace = true } edition = { workspace = true } [dependencies] -alloy = { version = "0.7", features = ["full"] } +alloy = { version = "0.8", features = ["full"] } alloy-primitives = { workspace = true } alloy-sol-types = { workspace = true } anyhow = { workspace = true } diff --git a/examples/op/Cargo.toml b/examples/op/Cargo.toml index dc9c4d17..00f3999a 100644 --- a/examples/op/Cargo.toml +++ b/examples/op/Cargo.toml @@ -13,4 +13,4 @@ risc0-op-steel = { path = "../../op-steel" } risc0-steel = { path = "../../steel" } risc0-ethereum-contracts = { path = "../../contracts" } examples-common = { path = "common" } -alloy = { version = "0.7" } +alloy = { version = "0.8" } diff --git a/steel/Cargo.toml b/steel/Cargo.toml index a5f4a5a6..83b8cf26 100644 --- a/steel/Cargo.toml +++ b/steel/Cargo.toml @@ -18,6 +18,7 @@ alloy-consensus = { workspace = true } alloy-primitives = { workspace = true, features = ["rlp", "serde"] } alloy-rlp = { workspace = true } alloy-sol-types = { workspace = true } +alloy-trie = { workspace = true } anyhow = { workspace = true } ethereum-consensus = { workspace = true, optional = true } log = { workspace = true, optional = true } @@ -34,7 +35,6 @@ url = { workspace = true, optional = true } [dev-dependencies] alloy = { workspace = true, features = ["contract", "node-bindings"] } -alloy-trie = { workspace = true } bincode = { workspace = true } risc0-steel = { path = ".", features = ["host"] } serde_json = { workspace = true } diff --git a/steel/src/mpt.rs b/steel/src/mpt.rs index f7e60b57..4cc89f7f 100644 --- a/steel/src/mpt.rs +++ b/steel/src/mpt.rs @@ -16,6 +16,7 @@ use std::fmt::Debug; use alloy_primitives::{b256, keccak256, map::B256HashMap, B256}; use alloy_rlp::{BufMut, Decodable, Encodable, Header, PayloadView, EMPTY_STRING_CODE}; +use alloy_trie::nodes::encode_path_leaf; use nybbles::Nibbles; use serde::{Deserialize, Serialize}; @@ -152,7 +153,7 @@ impl Node { match self { Node::Null => vec![EMPTY_STRING_CODE], Node::Leaf(prefix, value) => { - let path = prefix.encode_path_leaf(true); + let path = encode_path_leaf(prefix, true); let mut out = encode_list_header(path.length() + value.length()); path.encode(&mut out); value.encode(&mut out); @@ -160,7 +161,7 @@ impl Node { out } Node::Extension(prefix, child) => { - let path = prefix.encode_path_leaf(false); + let path = encode_path_leaf(prefix, false); let node_ref = NodeRef::from_node(child); let mut out = encode_list_header(path.length() + node_ref.length()); path.encode(&mut out);