Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WEB3-263: Update alloy requirement from 0.7.0 to 0.8.0 #363

Merged
merged 3 commits into from
Dec 16, 2024
Merged

WEB3-263: Update alloy requirement from 0.7.0 to 0.8.0 #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d161821
Update alloy requirement from 0.7.0 to 0.8.0
dependabot[bot] Dec 11, 2024
5dff71d
update all dependencies
Wollac Dec 16, 2024
1cd5cbe
fix build issues
Wollac Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion examples/erc20-counter/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion examples/governance/apps/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion examples/op/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion steel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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 }
Expand Down
5 changes: 3 additions & 2 deletions steel/src/mpt.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};

Expand Down Expand Up @@ -152,15 +153,15 @@ 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);

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);
Expand Down
Loading