diff --git a/Cargo.lock b/Cargo.lock index 43768a287b..be3197e487 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -264,9 +264,9 @@ dependencies = [ [[package]] name = "alloy-evm" -version = "0.23.2" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6223235f0b785a83dd10dc1599b7f3763c65e4f98b4e9e4e10e576bbbdf7dfa2" +checksum = "c84786dbd1a354358a01fc682862a22a47ff8c9e9bf4472d8d36bb02e3da5e54" dependencies = [ "alloy-consensus", "alloy-eips", @@ -278,8 +278,7 @@ dependencies = [ "alloy-sol-types", "auto_impl", "derive_more", - "op-alloy-consensus", - "op-alloy-rpc-types-engine", + "op-alloy", "op-revm", "revm", "thiserror 2.0.17", @@ -381,9 +380,9 @@ dependencies = [ [[package]] name = "alloy-op-evm" -version = "0.23.2" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ad8f3a679eb44ee21481edabd628d191c9a42d182ed29923b4d43a27a0f2cc8" +checksum = "85412ba830f756ada62e6a231db0d213ca7472c7161ed0086ae55ab262e8f9fc" dependencies = [ "alloy-consensus", "alloy-eips", @@ -391,7 +390,7 @@ dependencies = [ "alloy-op-hardforks", "alloy-primitives", "auto_impl", - "op-alloy-consensus", + "op-alloy", "op-revm", "revm", "thiserror 2.0.17", @@ -6157,6 +6156,19 @@ version = "11.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" +[[package]] +name = "op-alloy" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7fddee84041ec456eb6a7c2718cc1a38c06f6260280eb30ff8718ecdbcb5f88" +dependencies = [ + "op-alloy-consensus", + "op-alloy-network", + "op-alloy-provider", + "op-alloy-rpc-types", + "op-alloy-rpc-types-engine", +] + [[package]] name = "op-alloy-consensus" version = "0.22.0" @@ -6199,6 +6211,21 @@ dependencies = [ "op-alloy-rpc-types", ] +[[package]] +name = "op-alloy-provider" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12ef7a7c6bfa366b29c44af9abe6e176c32ce54ed700ec1edd7526c469dcd28c" +dependencies = [ + "alloy-network", + "alloy-primitives", + "alloy-provider", + "alloy-rpc-types-engine", + "alloy-transport", + "async-trait", + "op-alloy-rpc-types-engine", +] + [[package]] name = "op-alloy-rpc-jsonrpsee" version = "0.22.0" @@ -6271,9 +6298,9 @@ dependencies = [ [[package]] name = "op-revm" -version = "12.0.2" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e31622d03b29c826e48800f4c8f389c8a9c440eb796a3e35203561a288f12985" +checksum = "f887a8353e22df6ce5b150e4d3a51838bc6a64d4644c5f7416bef70f442c2857" dependencies = [ "auto_impl", "revm", @@ -10757,7 +10784,7 @@ dependencies = [ "reth-storage-api", "reth-tasks", "reth-tracing", - "revm-interpreter", + "revm-interpreter 29.0.1", "revm-primitives", "rustc-hash", "schnellru", @@ -10963,18 +10990,18 @@ dependencies = [ [[package]] name = "revm" -version = "31.0.2" +version = "33.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb67a5223602113cae59a305acde2d9936bc18f2478dda879a6124b267cebfb6" +checksum = "151be0bca9fd5ebfbbbc02af9f75f1e1610f71c750eea71b4d91fe7b65362c61" dependencies = [ "revm-bytecode", "revm-context", - "revm-context-interface", + "revm-context-interface 13.0.0", "revm-database", "revm-database-interface", "revm-handler", "revm-inspector", - "revm-interpreter", + "revm-interpreter 31.0.0", "revm-precompile", "revm-primitives", "revm-state", @@ -10994,15 +11021,15 @@ dependencies = [ [[package]] name = "revm-context" -version = "11.0.2" +version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92850e150f4f99d46c05a20ad0cd09286a7ad4ee21866fffb87101de6e602231" +checksum = "e4e6ab8619ee12fdcd34ee8e932364153340b744c75e2fdaebbc8f76308b0826" dependencies = [ "bitvec", "cfg-if", "derive-where", "revm-bytecode", - "revm-context-interface", + "revm-context-interface 13.0.0", "revm-database-interface", "revm-primitives", "revm-state", @@ -11025,6 +11052,22 @@ dependencies = [ "serde", ] +[[package]] +name = "revm-context-interface" +version = "13.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d8fb70266f324e266fe5d75cfd9b1c0f5d4556c756a8ee50ddb329347fd695c" +dependencies = [ + "alloy-eip2930", + "alloy-eip7702", + "auto_impl", + "either", + "revm-database-interface", + "revm-primitives", + "revm-state", + "serde", +] + [[package]] name = "revm-database" version = "9.0.5" @@ -11054,17 +11097,17 @@ dependencies = [ [[package]] name = "revm-handler" -version = "12.0.2" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45418ed95cfdf0cb19effdbb7633cf2144cab7fb0e6ffd6b0eb9117a50adff6" +checksum = "fa52757cd0287eac51864aa9a6a583a327d29a0d08b3c91b7f91157f229cd28a" dependencies = [ "auto_impl", "derive-where", "revm-bytecode", "revm-context", - "revm-context-interface", + "revm-context-interface 13.0.0", "revm-database-interface", - "revm-interpreter", + "revm-interpreter 31.0.0", "revm-precompile", "revm-primitives", "revm-state", @@ -11073,16 +11116,16 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "12.0.2" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c99801eac7da06cc112df2244bd5a64024f4ef21240e923b26e73c4b4a0e5da6" +checksum = "6421be68d5f649faf26b9684d7e0339568695096ae2faaf789a56b12cfea3fcf" dependencies = [ "auto_impl", "either", "revm-context", "revm-database-interface", "revm-handler", - "revm-interpreter", + "revm-interpreter 31.0.0", "revm-primitives", "revm-state", "serde", @@ -11091,9 +11134,9 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.32.0" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21caa99f22184a6818946362778cccd3ff02f743c1e085bee87700671570ecb7" +checksum = "a91cee0a75ef5f96b7e86f6c6a8bd4fda86eb37b57d501df6790418ee2b03c18" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -11116,7 +11159,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22789ce92c5808c70185e3bc49732f987dc6fd907f77828c8d3470b2299c9c65" dependencies = [ "revm-bytecode", - "revm-context-interface", + "revm-context-interface 12.0.1", + "revm-primitives", + "revm-state", + "serde", +] + +[[package]] +name = "revm-interpreter" +version = "31.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8201c0fbd91334a8d4d0aae955f8d4534a118d55855ed9b03aec8f83fb62561e" +dependencies = [ + "revm-bytecode", + "revm-context-interface 13.0.0", "revm-primitives", "revm-state", "serde", @@ -11124,9 +11180,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "29.0.1" +version = "31.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968b124028960201abf6d6bf8e223f15fadebb4307df6b7dc9244a0aab5d2d05" +checksum = "9a62958af953cc4043e93b5be9b8497df84cc3bd612b865c49a7a7dfa26a84e2" dependencies = [ "ark-bls12-381", "ark-bn254", diff --git a/Cargo.toml b/Cargo.toml index bc4f4155f2..dc45ae7ebd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -466,24 +466,24 @@ reth-ress-protocol = { path = "crates/ress/protocol" } reth-ress-provider = { path = "crates/ress/provider" } # revm -revm = { version = "31.0.2", default-features = false } +revm = { version = "33.0.0", default-features = false } revm-bytecode = { version = "7.1.1", default-features = false } revm-database = { version = "9.0.5", default-features = false } revm-state = { version = "8.1.1", default-features = false } revm-primitives = { version = "21.0.2", default-features = false } revm-interpreter = { version = "29.0.1", default-features = false } revm-inspector = { version = "12.0.2", default-features = false } -revm-context = { version = "11.0.2", default-features = false } +revm-context = { version = "12.0.0", default-features = false } revm-context-interface = { version = "12.0.1", default-features = false } revm-database-interface = { version = "8.0.5", default-features = false } -op-revm = { version = "12.0.2", default-features = false } -revm-inspectors = "0.32.0" +op-revm = { version = "14.0.0", default-features = false } +revm-inspectors = "0.33.0" # eth alloy-chains = { version = "0.2.5", default-features = false } alloy-dyn-abi = "1.4.1" alloy-eip2124 = { version = "0.2.0", default-features = false } -alloy-evm = { version = "0.23.0", default-features = false } +alloy-evm = { version = "0.24.1", default-features = false } alloy-primitives = { version = "1.4.1", default-features = false, features = ["map-foldhash"] } alloy-rlp = { version = "0.3.10", default-features = false, features = ["core-net"] } alloy-sol-macro = "1.4.1" @@ -521,7 +521,7 @@ alloy-transport-ipc = { version = "1.0.41", default-features = false } alloy-transport-ws = { version = "1.0.41", default-features = false } # op -alloy-op-evm = { version = "0.23.0", default-features = false } +alloy-op-evm = { version = "0.24.1", default-features = false } alloy-op-hardforks = "0.4.4" op-alloy-rpc-types = { version = "0.22.0", default-features = false } op-alloy-rpc-types-engine = { version = "0.22.0", default-features = false } diff --git a/crates/engine/tree/src/tree/precompile_cache.rs b/crates/engine/tree/src/tree/precompile_cache.rs index 1183dfbe98..fd58eee4d6 100644 --- a/crates/engine/tree/src/tree/precompile_cache.rs +++ b/crates/engine/tree/src/tree/precompile_cache.rs @@ -274,7 +274,12 @@ mod tests { #[test] fn test_precompile_cache_basic() { let dyn_precompile: DynPrecompile = (|_input: PrecompileInput<'_>| -> PrecompileResult { - Ok(PrecompileOutput { gas_used: 0, bytes: Bytes::default(), reverted: false }) + Ok(PrecompileOutput { + gas_used: 0, + gas_refunded: 0, + bytes: Bytes::default(), + reverted: false, + }) }) .into(); @@ -283,6 +288,7 @@ mod tests { let output = PrecompileOutput { gas_used: 50, + gas_refunded: 0, bytes: alloy_primitives::Bytes::copy_from_slice(b"cached_result"), reverted: false, }; @@ -315,6 +321,7 @@ mod tests { Ok(PrecompileOutput { gas_used: 5000, + gas_refunded: 0, bytes: alloy_primitives::Bytes::copy_from_slice(b"output_from_precompile_1"), reverted: false, }) @@ -329,6 +336,7 @@ mod tests { Ok(PrecompileOutput { gas_used: 7000, + gas_refunded: 0, bytes: alloy_primitives::Bytes::copy_from_slice(b"output_from_precompile_2"), reverted: false, })