diff --git a/Cargo.toml b/Cargo.toml index df90cf93..b7a4e052 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,17 +24,17 @@ 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.8" } +alloy-consensus = { version = "0.9" } alloy-rlp = { version = "0.3.8" } -alloy-primitives = { version = "0.8.8" } -alloy-sol-types = { version = "0.8.8" } +alloy-primitives = { version = "0.8.16" } +alloy-sol-types = { version = "0.8.16" } # OP Steel -op-alloy-network = { version = "0.8" } +op-alloy-network = { version = "0.9" } # Alloy host dependencies -alloy = { version = "0.8" } -alloy-trie = { version = "0.7" } +alloy = { version = "0.9" } +alloy-trie = { version = "0.7.5" } # Beacon chain support ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus.git", rev = "cf3c404043230559660810bc0c9d6d5a8498d819" } @@ -44,8 +44,7 @@ anyhow = { version = "1.0" } bincode = { version = "1.3" } clap = { version = "4.5", features = ["derive", "env"] } log = "0.4" -nybbles = { version = "0.2" } -revm = { version = "18.0", default-features = false, features = ["std"] } +revm = { version = "19.2", default-features = false, features = ["std"] } reqwest = "0.12" serde = "1.0" serde_json = "1.0" diff --git a/examples/erc20-counter/Cargo.toml b/examples/erc20-counter/Cargo.toml index e0913bd4..a65688b5 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.8", features = ["full"] } +alloy = { version = "0.9", 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 5cc8dea7..15cb2a28 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.8", features = ["full"] } +alloy = { version = "0.9", 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 00f3999a..9df376a3 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.8" } +alloy = "0.9" diff --git a/op-steel/src/optimism/mod.rs b/op-steel/src/optimism/mod.rs index 22e4a4ff..405fadd5 100644 --- a/op-steel/src/optimism/mod.rs +++ b/op-steel/src/optimism/mod.rs @@ -112,7 +112,7 @@ impl EvmBlockHeader for OpBlockHeader { // technically, this is only valid after EIP-4399 but revm makes sure it is not used before blk_env.prevrandao = Some(header.mix_hash); if let Some(excess_blob_gas) = header.excess_blob_gas { - blk_env.set_blob_excess_gas_and_price(excess_blob_gas) + blk_env.set_blob_excess_gas_and_price(excess_blob_gas, false) }; } } diff --git a/steel/Cargo.toml b/steel/Cargo.toml index 83b8cf26..466e79c1 100644 --- a/steel/Cargo.toml +++ b/steel/Cargo.toml @@ -18,11 +18,10 @@ alloy-consensus = { workspace = true } alloy-primitives = { workspace = true, features = ["rlp", "serde"] } alloy-rlp = { workspace = true } alloy-sol-types = { workspace = true } -alloy-trie = { workspace = true } +alloy-trie = { workspace = true, features = ["serde"] } anyhow = { workspace = true } ethereum-consensus = { workspace = true, optional = true } log = { workspace = true, optional = true } -nybbles = { workspace = true, features = ["serde"] } reqwest = { workspace = true, optional = true } revm = { workspace = true, features = ["serde"] } serde = { workspace = true } diff --git a/steel/src/contract.rs b/steel/src/contract.rs index 945e7599..437d4490 100644 --- a/steel/src/contract.rs +++ b/steel/src/contract.rs @@ -273,7 +273,7 @@ mod host { } } -impl<'a, S, H> CallBuilder> +impl CallBuilder> where S: SolCall, H: EvmBlockHeader, diff --git a/steel/src/ethereum.rs b/steel/src/ethereum.rs index 496dde6a..c3b9953e 100644 --- a/steel/src/ethereum.rs +++ b/steel/src/ethereum.rs @@ -93,7 +93,7 @@ impl EvmBlockHeader for EthBlockHeader { // technically, this is only valid after EIP-4399 but revm makes sure it is not used before blk_env.prevrandao = Some(header.mix_hash); if let Some(excess_blob_gas) = header.excess_blob_gas { - blk_env.set_blob_excess_gas_and_price(excess_blob_gas) + blk_env.set_blob_excess_gas_and_price(excess_blob_gas, false); }; } } diff --git a/steel/src/mpt.rs b/steel/src/mpt.rs index 4cc89f7f..b444801e 100644 --- a/steel/src/mpt.rs +++ b/steel/src/mpt.rs @@ -16,8 +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 alloy_trie::{nodes::encode_path_leaf, nybbles::Nibbles}; use serde::{Deserialize, Serialize}; /// Root hash of an empty Merkle Patricia trie, i.e. `keccak256(RLP(""))`.