diff --git a/Cargo.lock b/Cargo.lock index bb780df3a..8f1565904 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1153,9 +1153,9 @@ dependencies = [ [[package]] name = "c-kzg" -version = "0.4.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a4bc5367b6284358d2a6a6a1dc2d92ec4b86034561c3b9d3341909752fd848" +checksum = "3130f3d8717cc02e668a896af24984d5d5d4e8bf12e278e982e0f1bd88a0f9af" dependencies = [ "blst", "cc", @@ -6768,9 +6768,9 @@ dependencies = [ [[package]] name = "revm" -version = "7.1.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "217d21144d329f21d5245b8e6a46e0d6d0a527d9917d7a087f225b161e529169" +checksum = "24fd3ed4b62dc61c647552d8b781811ae25ec74d23309055077e4dfb392444d2" dependencies = [ "auto_impl", "cfg-if", @@ -6784,7 +6784,7 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.1.0" -source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=f96bc1f#f96bc1fb2f024c1314157a2b4277092136ac488c" +source = "git+https://github.com/paradigmxyz/evm-inspectors?rev=2b48b65#2b48b65f3880803f51883948c319012da09ecba7" dependencies = [ "alloy-primitives", "alloy-rpc-trace-types", @@ -6801,9 +6801,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "776848391ed76d5103ca1aa1632cd21b521e2870afb30b63723da862d69efd0f" +checksum = "9f0a1818f8c876b0d71a0714217c34da7df8a42c0462750768779d55680e4554" dependencies = [ "revm-primitives", "serde", @@ -6811,9 +6811,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "5.0.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3fd1856a7cb09197a02669d779e1afb5a627b0888a24814ba2b6a1ad4c3ff8d" +checksum = "7a9645a70f1df1e5bd7fa8718b9ba486fac9c3f0467aa6b58e7f590d5f6fd0f7" dependencies = [ "aurora-engine-modexp", "c-kzg", @@ -6828,9 +6828,9 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "3.0.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4d7d3e793e907dc0797a9d3b43abfdf5226d133855214db9bd27d4cee33ebd" +checksum = "323ad597cf75ac9cb1d161be29fcc3562426f0278a1d04741697fca556e1ceea" dependencies = [ "alloy-primitives", "auto_impl", @@ -7228,6 +7228,7 @@ version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" dependencies = [ + "rand 0.8.5", "secp256k1-sys 0.9.2", ] diff --git a/Cargo.toml b/Cargo.toml index 62ef3edb9..4f2635d94 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -196,9 +196,9 @@ reth-trie = { path = "crates/trie" } reth-trie-parallel = { path = "crates/trie-parallel" } # revm -revm = { version = "7.1.0", features = ["std", "secp256k1"], default-features = false } -revm-primitives = { version = "3.0.0", features = ["std"], default-features = false } -revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "f96bc1f" } +revm = { version = "7.2.0", features = ["std", "secp256k1"], default-features = false } +revm-primitives = { version = "3.1.0", features = ["std"], default-features = false } +revm-inspectors = { git = "https://github.com/paradigmxyz/evm-inspectors", rev = "2b48b65" } # eth alloy-chains = { version = "0.1", feature = ["serde", "rlp", "arbitrary"] } @@ -288,7 +288,7 @@ secp256k1 = { version = "0.27.0", default-features = false, features = [ enr = { version = "=0.10.0", default-features = false, features = ["k256"] } # for eip-4844 -c-kzg = "0.4.2" +c-kzg = "1.0.0" # config confy = "0.6" diff --git a/crates/storage/provider/src/bundle_state/bundle_state_with_receipts.rs b/crates/storage/provider/src/bundle_state/bundle_state_with_receipts.rs index bf8a2109e..804dcece8 100644 --- a/crates/storage/provider/src/bundle_state/bundle_state_with_receipts.rs +++ b/crates/storage/provider/src/bundle_state/bundle_state_with_receipts.rs @@ -12,14 +12,13 @@ use reth_primitives::{ StorageEntry, B256, U256, }; use reth_trie::HashedPostState; +pub use revm::db::states::OriginalValuesKnown; use revm::{ db::{states::BundleState, BundleAccount}, primitives::AccountInfo, }; use std::collections::HashMap; -pub use revm::db::states::OriginalValuesKnown; - /// Bundle state of post execution changes and reverts #[derive(Default, Debug, Clone, PartialEq, Eq)] pub struct BundleStateWithReceipts { @@ -366,8 +365,7 @@ mod tests { EmptyDB, }, primitives::{ - Account as RevmAccount, AccountInfo as RevmAccountInfo, AccountStatus, HashMap, - StorageSlot, + Account as RevmAccount, AccountInfo as RevmAccountInfo, AccountStatus, StorageSlot, }, DatabaseCommit, State, };