From 0a14b16e9b09a5463ef20057a9c3b78998ec006d Mon Sep 17 00:00:00 2001 From: zerosnacks Date: Mon, 25 Aug 2025 11:34:47 +0200 Subject: [PATCH 1/7] fix merge conflicts --- Cargo.lock | 62 +++++++++++++++++++---------------------- Cargo.toml | 18 ++++++------ crates/anvil/src/evm.rs | 19 +++++++------ 3 files changed, 49 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3c44f726f8e6a..62f2153a3fab3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -223,8 +223,7 @@ dependencies = [ [[package]] name = "alloy-evm" version = "0.18.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7808e88376405c92315b4d752d9b207f25328e04b31d13e9b1c73f9236486f63" +source = "git+https://github.com/alloy-rs/evm.git?rev=2b2b09f#2b2b09fec26e5c87f2b048624b7055ae3d0800f9" dependencies = [ "alloy-consensus", "alloy-eips", @@ -334,9 +333,8 @@ dependencies = [ [[package]] name = "alloy-op-evm" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ead219a54943c27b0bb568401cbfa6afe04398b97a76fd33b29745d0c0f35b43" +version = "0.18.4" +source = "git+https://github.com/alloy-rs/evm.git?rev=2b2b09f#2b2b09fec26e5c87f2b048624b7055ae3d0800f9" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4821,8 +4819,7 @@ dependencies = [ [[package]] name = "foundry-fork-db" version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c27c4edfa7aa67dd25e4125d0eb12206d9bb2d5149df62e02fd90fedb79b84ca" +source = "git+https://github.com/foundry-rs/foundry-fork-db?rev=83cdcf0#83cdcf0e677a1a1baaf08ea6303fc2919c7c2eb9" dependencies = [ "alloy-chains", "alloy-consensus", @@ -6942,9 +6939,9 @@ dependencies = [ [[package]] name = "op-revm" -version = "9.0.1" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6889cdfed74c6c924a54b2357982fce232e06473c6bb73b9a0c71a9151bfabd" +checksum = "5ba21d705bbbfc947a423cba466d75e4af0c7d43ee89ba0a0f1cfa04963cede9" dependencies = [ "auto_impl", "revm", @@ -8047,9 +8044,9 @@ dependencies = [ [[package]] name = "revm" -version = "28.0.1" +version = "29.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee5d3f7d031e90ab47c7488061bdc4875abc4e9dcea6c18f5dee09732d0436fb" +checksum = "0c278b6ee9bba9e25043e3fae648fdce632d1944d3ba16f5203069b43bddd57f" dependencies = [ "revm-bytecode", "revm-context", @@ -8066,9 +8063,9 @@ dependencies = [ [[package]] name = "revm-bytecode" -version = "6.2.1" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d800e6c2119457ded5b0af71634eb2468040bf97de468eee5a730272a106da0" +checksum = "66c52031b73cae95d84cd1b07725808b5fd1500da3e5e24574a3b2dc13d9f16d" dependencies = [ "bitvec", "phf", @@ -8078,9 +8075,9 @@ dependencies = [ [[package]] name = "revm-context" -version = "9.0.1" +version = "9.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c63485b4d1b0e67f342f9a8c0e9f78b6b5f1750863a39bdf6ceabdbaaf4aed1" +checksum = "0fb02c5dab3b535aa5b18277b1d21c5117a25d42af717e6ce133df0ea56663e1" dependencies = [ "bitvec", "cfg-if", @@ -8095,9 +8092,9 @@ dependencies = [ [[package]] name = "revm-context-interface" -version = "10.0.1" +version = "10.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "550cb8b9465e00bdb0a384922b69f864c5bcc228bed19c8ecbfa69fff2256382" +checksum = "6b8e9311d27cf75fbf819e7ba4ca05abee1ae02e44ff6a17301c7ab41091b259" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -8111,9 +8108,9 @@ dependencies = [ [[package]] name = "revm-database" -version = "7.0.4" +version = "7.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40000c7d917c865f6c232a78581b78e70c43f52db17282bd1b52d4f0565bc8a2" +checksum = "39a276ed142b4718dcf64bc9624f474373ed82ef20611025045c3fb23edbef9c" dependencies = [ "alloy-eips", "revm-bytecode", @@ -8125,9 +8122,9 @@ dependencies = [ [[package]] name = "revm-database-interface" -version = "7.0.4" +version = "7.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4ccea7a168cba1196b1e57dd3e22c36047208c135f600f8e58cbe7d49957dba" +checksum = "8c523c77e74eeedbac5d6f7c092e3851dbe9c7fec6f418b85992bd79229db361" dependencies = [ "auto_impl", "either", @@ -8138,9 +8135,9 @@ dependencies = [ [[package]] name = "revm-handler" -version = "9.0.1" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cb09d07e6799823ce5a344f1604236b53fe1a92bacd7122c0b16286f92254c2" +checksum = "528d2d81cc918d311b8231c35330fac5fba8b69766ddc538833e2b5593ee016e" dependencies = [ "auto_impl", "derive-where", @@ -8157,9 +8154,9 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "9.1.0" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2770c0d7e9f4f23660dc0b8b954b7a1eee8989ec97f936ebce366c78b6d7b915" +checksum = "bf443b664075999a14916b50c5ae9e35a7d71186873b8f8302943d50a672e5e0" dependencies = [ "auto_impl", "either", @@ -8176,8 +8173,7 @@ dependencies = [ [[package]] name = "revm-inspectors" version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "364d0b3c46727dc810a9ddc40799805e85236424a1a9ddec3909c734e03f0657" +source = "git+https://github.com/zerosnacks/revm-inspectors.git?rev=74e215d#74e215d0496107f9037de20051a5b266d5a7ff55" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", @@ -8195,9 +8191,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "25.0.1" +version = "25.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c938c0d4d617c285203cad8aba1cefeec383fcff2fdf94a4469f588ab979b5" +checksum = "53d6406b711fac73b4f13120f359ed8e65964380dd6182bd12c4c09ad0d4641f" dependencies = [ "revm-bytecode", "revm-context-interface", @@ -8207,9 +8203,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "26.0.1" +version = "27.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7bb5e8b92891c5ac9dd8dae157bd1d90aab01973ad4f99d4135d507facc3e7" +checksum = "25b57d4bd9e6b5fe469da5452a8a137bc2d030a3cd47c46908efc615bbc699da" dependencies = [ "ark-bls12-381", "ark-bn254", @@ -8245,9 +8241,9 @@ dependencies = [ [[package]] name = "revm-state" -version = "7.0.4" +version = "7.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d7f39ea56df3bfbb3c81c99b1f028d26f205b6004156baffbf1a4f84b46cfa" +checksum = "1f64fbacb86008394aaebd3454f9643b7d5a782bd251135e17c5b33da592d84d" dependencies = [ "bitflags 2.9.3", "revm-bytecode", diff --git a/Cargo.toml b/Cargo.toml index 65a3a93fd4723..0e22f0a6c33e5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -262,13 +262,13 @@ op-alloy-rpc-types = "0.18.13" op-alloy-flz = "0.13.1" ## revm -revm = { version = "28.0.0", default-features = false } -revm-inspectors = { version = "0.28.0", features = ["serde"] } -op-revm = { version = "9.0.1", default-features = false } +revm = { version = "29.0.0", default-features = false } +revm-inspectors = { version = "0.28.2", features = ["serde"] } +op-revm = { version = "10.0.0", default-features = false } ## alloy-evm -alloy-evm = "0.18.3" -alloy-op-evm = "0.18.3" +alloy-evm = "0.18.4" +alloy-op-evm = "0.18.4" ## cli anstream = "0.6" @@ -399,18 +399,18 @@ idna_adapter = "=1.1.0" # alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "7fab7ee" } ## alloy-evm -# alloy-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "7762adc" } -# alloy-op-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "7762adc" } +alloy-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "2b2b09f" } +alloy-op-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "2b2b09f" } ## revm # revm = { git = "https://github.com/bluealloy/revm.git", rev = "d9cda3a" } # op-revm = { git = "https://github.com/bluealloy/revm.git", rev = "d9cda3a" } -# revm-inspectors = { git = "https://github.com/paradigmxyz/revm-inspectors.git", rev = "956bc98" } +revm-inspectors = { git = "https://github.com/zerosnacks/revm-inspectors.git", rev = "74e215d" } ## foundry # foundry-block-explorers = { git = "https://github.com/foundry-rs/block-explorers.git", rev = "e09cb89" } # foundry-compilers = { git = "https://github.com/foundry-rs/compilers.git", rev = "e4a9b04" } -# foundry-fork-db = { git = "https://github.com/foundry-rs/foundry-fork-db", rev = "50683eb" } +foundry-fork-db = { git = "https://github.com/foundry-rs/foundry-fork-db", rev = "83cdcf0" } ## solar # solar-ast = { git = "https://github.com/paradigmxyz/solar.git", branch = "main" } diff --git a/crates/anvil/src/evm.rs b/crates/anvil/src/evm.rs index 9393ba65f602c..d67171058d0f8 100644 --- a/crates/anvil/src/evm.rs +++ b/crates/anvil/src/evm.rs @@ -6,25 +6,27 @@ use alloy_evm::{ use foundry_evm_core::either_evm::EitherEvm; use op_revm::OpContext; -use revm::{Inspector, precompile::PrecompileWithAddress}; +use revm::{Inspector, precompile::Precompile}; use std::fmt::Debug; /// Object-safe trait that enables injecting extra precompiles when using /// `anvil` as a library. pub trait PrecompileFactory: Send + Sync + Unpin + Debug { /// Returns a set of precompiles to extend the EVM with. - fn precompiles(&self) -> Vec<(PrecompileWithAddress, u64)>; + fn precompiles(&self) -> Vec<(Precompile, u64)>; } /// Inject precompiles into the EVM dynamically. pub fn inject_precompiles( evm: &mut EitherEvm, - precompiles: Vec<(PrecompileWithAddress, u64)>, + precompiles: Vec<(Precompile, u64)>, ) where DB: Database, I: Inspector> + Inspector>, { - for (PrecompileWithAddress(addr, func), gas) in precompiles { + for (precompile, gas) in precompiles { + let addr = *precompile.address(); + let func = *precompile.precompile(); evm.precompiles_mut().apply_precompile(&addr, move |_| { Some(DynPrecompile::from(move |input: PrecompileInput<'_>| func(input.data, gas))) }); @@ -33,7 +35,7 @@ pub fn inject_precompiles( #[cfg(test)] mod tests { - use std::convert::Infallible; + use std::{borrow::Cow, convert::Infallible}; use alloy_evm::{EthEvm, Evm, EvmEnv, eth::EthEvmContext, precompiles::PrecompilesMap}; use alloy_op_evm::OpEvm; @@ -49,7 +51,7 @@ mod tests { inspector::NoOpInspector, interpreter::interpreter::EthInterpreter, precompile::{ - PrecompileOutput, PrecompileResult, PrecompileSpecId, PrecompileWithAddress, + Precompile, PrecompileId, PrecompileOutput, PrecompileResult, PrecompileSpecId, Precompiles, }, primitives::hardfork::SpecId, @@ -71,9 +73,10 @@ mod tests { struct CustomPrecompileFactory; impl PrecompileFactory for CustomPrecompileFactory { - fn precompiles(&self) -> Vec<(PrecompileWithAddress, u64)> { + fn precompiles(&self) -> Vec<(Precompile, u64)> { vec![( - PrecompileWithAddress::from(( + Precompile::from(( + PrecompileId::Custom(Cow::Borrowed("custom_echo")), PRECOMPILE_ADDR, custom_echo_precompile as fn(&[u8], u64) -> PrecompileResult, )), From 3aa8da7f2fd2c5c0599bcf47312e3daa8d38e32e Mon Sep 17 00:00:00 2001 From: zerosnacks Date: Mon, 25 Aug 2025 12:15:23 +0200 Subject: [PATCH 2/7] bump deps --- Cargo.lock | 11 ++++++----- Cargo.toml | 10 +++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 62f2153a3fab3..040ada7708216 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -223,7 +223,7 @@ dependencies = [ [[package]] name = "alloy-evm" version = "0.18.4" -source = "git+https://github.com/alloy-rs/evm.git?rev=2b2b09f#2b2b09fec26e5c87f2b048624b7055ae3d0800f9" +source = "git+https://github.com/alloy-rs/evm.git?rev=3c6cebb#3c6cebb92c34c8d836a11857474c3c057d2a4ea1" dependencies = [ "alloy-consensus", "alloy-eips", @@ -334,7 +334,7 @@ dependencies = [ [[package]] name = "alloy-op-evm" version = "0.18.4" -source = "git+https://github.com/alloy-rs/evm.git?rev=2b2b09f#2b2b09fec26e5c87f2b048624b7055ae3d0800f9" +source = "git+https://github.com/alloy-rs/evm.git?rev=3c6cebb#3c6cebb92c34c8d836a11857474c3c057d2a4ea1" dependencies = [ "alloy-consensus", "alloy-eips", @@ -4819,7 +4819,7 @@ dependencies = [ [[package]] name = "foundry-fork-db" version = "0.17.0" -source = "git+https://github.com/foundry-rs/foundry-fork-db?rev=83cdcf0#83cdcf0e677a1a1baaf08ea6303fc2919c7c2eb9" +source = "git+https://github.com/foundry-rs/foundry-fork-db?rev=eee6563#eee6563393acf9ba2b38f1eecc2c2aaa1e2cb90d" dependencies = [ "alloy-chains", "alloy-consensus", @@ -8172,8 +8172,9 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.28.2" -source = "git+https://github.com/zerosnacks/revm-inspectors.git?rev=74e215d#74e215d0496107f9037de20051a5b266d5a7ff55" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b5c15d9c33ae98988a2a6a8db85b6a9e3389d1f3f2fdb95628a992f2b65b2c1" dependencies = [ "alloy-primitives", "alloy-rpc-types-eth", diff --git a/Cargo.toml b/Cargo.toml index 0e22f0a6c33e5..2f9b51e5e4d5e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -263,7 +263,7 @@ op-alloy-flz = "0.13.1" ## revm revm = { version = "29.0.0", default-features = false } -revm-inspectors = { version = "0.28.2", features = ["serde"] } +revm-inspectors = { version = "0.29.0", features = ["serde"] } op-revm = { version = "10.0.0", default-features = false } ## alloy-evm @@ -399,18 +399,18 @@ idna_adapter = "=1.1.0" # alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "7fab7ee" } ## alloy-evm -alloy-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "2b2b09f" } -alloy-op-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "2b2b09f" } +alloy-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "3c6cebb" } +alloy-op-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "3c6cebb" } ## revm # revm = { git = "https://github.com/bluealloy/revm.git", rev = "d9cda3a" } # op-revm = { git = "https://github.com/bluealloy/revm.git", rev = "d9cda3a" } -revm-inspectors = { git = "https://github.com/zerosnacks/revm-inspectors.git", rev = "74e215d" } +# revm-inspectors = { git = "https://github.com/zerosnacks/revm-inspectors.git", rev = "74e215d" } ## foundry # foundry-block-explorers = { git = "https://github.com/foundry-rs/block-explorers.git", rev = "e09cb89" } # foundry-compilers = { git = "https://github.com/foundry-rs/compilers.git", rev = "e4a9b04" } -foundry-fork-db = { git = "https://github.com/foundry-rs/foundry-fork-db", rev = "83cdcf0" } +foundry-fork-db = { git = "https://github.com/foundry-rs/foundry-fork-db", rev = "eee6563" } ## solar # solar-ast = { git = "https://github.com/paradigmxyz/solar.git", branch = "main" } From 513d4c4697356ca04cca05879a63b62cc0a89fb3 Mon Sep 17 00:00:00 2001 From: zerosnacks Date: Mon, 25 Aug 2025 12:32:37 +0200 Subject: [PATCH 3/7] bump foundry-fork-db --- Cargo.lock | 5 +++-- Cargo.toml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 040ada7708216..dc7ca979cbeed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4818,8 +4818,9 @@ dependencies = [ [[package]] name = "foundry-fork-db" -version = "0.17.0" -source = "git+https://github.com/foundry-rs/foundry-fork-db?rev=eee6563#eee6563393acf9ba2b38f1eecc2c2aaa1e2cb90d" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f393054b70525583a48b137776f62c9fe68f1f432f2c5ee143c224b1491cdab3" dependencies = [ "alloy-chains", "alloy-consensus", diff --git a/Cargo.toml b/Cargo.toml index 2f9b51e5e4d5e..28cf0e376913f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -205,7 +205,7 @@ foundry-linking = { path = "crates/linking" } # solc & compilation utilities foundry-block-explorers = { version = "0.20.0", default-features = false } foundry-compilers = { version = "0.18.2", default-features = false } -foundry-fork-db = "0.17" +foundry-fork-db = "0.18" solang-parser = { version = "=0.3.9", package = "foundry-solang-parser" } solar-ast = { version = "=0.1.5", default-features = false } solar-parse = { version = "=0.1.5", default-features = false } @@ -410,7 +410,7 @@ alloy-op-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "3c6cebb" } ## foundry # foundry-block-explorers = { git = "https://github.com/foundry-rs/block-explorers.git", rev = "e09cb89" } # foundry-compilers = { git = "https://github.com/foundry-rs/compilers.git", rev = "e4a9b04" } -foundry-fork-db = { git = "https://github.com/foundry-rs/foundry-fork-db", rev = "eee6563" } +# foundry-fork-db = { git = "https://github.com/foundry-rs/foundry-fork-db", rev = "eee6563" } ## solar # solar-ast = { git = "https://github.com/paradigmxyz/solar.git", branch = "main" } From f8d225be2a655520456591e06e7184e3ccfb16b0 Mon Sep 17 00:00:00 2001 From: zerosnacks Date: Mon, 25 Aug 2025 13:32:43 +0200 Subject: [PATCH 4/7] apply fixes of 1.3.0: https://github.com/foundry-rs/foundry/commit/c4245d663339cdfdf478a4a17588c8fc0528e896 --- crates/evm/core/src/backend/mod.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/crates/evm/core/src/backend/mod.rs b/crates/evm/core/src/backend/mod.rs index 24474e8c60170..1664d6492f05d 100644 --- a/crates/evm/core/src/backend/mod.rs +++ b/crates/evm/core/src/backend/mod.rs @@ -1131,8 +1131,6 @@ impl DatabaseExt for Backend { // selected. This ensures that there are no gaps in depth which would // otherwise cause issues with the tracer fork.journaled_state.depth = active_journaled_state.depth; - // Set proper journal of state changes into the fork. - fork.journaled_state.journal = active_journaled_state.journal.clone(); // another edge case where a fork is created and selected during setup with not // necessarily the same caller as for the test, however we must always @@ -1200,8 +1198,7 @@ impl DatabaseExt for Backend { active.journaled_state = self.fork_init_journaled_state.clone(); active.journaled_state.depth = journaled_state.depth; - // Set proper journal of state changes into the fork. - active.journaled_state.journal = journaled_state.journal.clone(); + for addr in persistent_addrs { merge_journaled_state_data(addr, journaled_state, &mut active.journaled_state); } From 72d020fae7f0067d5b632de532738001852dc7b2 Mon Sep 17 00:00:00 2001 From: zerosnacks Date: Mon, 25 Aug 2025 13:34:04 +0200 Subject: [PATCH 5/7] nit --- crates/evm/core/src/backend/mod.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/evm/core/src/backend/mod.rs b/crates/evm/core/src/backend/mod.rs index 1664d6492f05d..3da6cb45fe657 100644 --- a/crates/evm/core/src/backend/mod.rs +++ b/crates/evm/core/src/backend/mod.rs @@ -1196,7 +1196,6 @@ impl DatabaseExt for Backend { let active = self.inner.get_fork_mut(active_idx); active.journaled_state = self.fork_init_journaled_state.clone(); - active.journaled_state.depth = journaled_state.depth; for addr in persistent_addrs { From b85abee8bb81fb559b0ce970ba3e7f7d55ff9459 Mon Sep 17 00:00:00 2001 From: zerosnacks Date: Mon, 25 Aug 2025 14:15:00 +0200 Subject: [PATCH 6/7] bump alloy-evm --- Cargo.lock | 36 ++++++++++++++++++++++++++---------- Cargo.toml | 8 ++++---- 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dc7ca979cbeed..c715c99705ba5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -222,8 +222,9 @@ dependencies = [ [[package]] name = "alloy-evm" -version = "0.18.4" -source = "git+https://github.com/alloy-rs/evm.git?rev=3c6cebb#3c6cebb92c34c8d836a11857474c3c057d2a4ea1" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce2c723dd19c7b7e6dac0f52dae208beae40ce093c176cf82e2e4d3ead756d3" dependencies = [ "alloy-consensus", "alloy-eips", @@ -233,7 +234,7 @@ dependencies = [ "alloy-sol-types", "auto_impl", "derive_more 2.0.1", - "op-alloy-consensus", + "op-alloy-consensus 0.19.0", "op-revm", "revm", "thiserror 2.0.16", @@ -333,8 +334,9 @@ dependencies = [ [[package]] name = "alloy-op-evm" -version = "0.18.4" -source = "git+https://github.com/alloy-rs/evm.git?rev=3c6cebb#3c6cebb92c34c8d836a11857474c3c057d2a4ea1" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93e9a39a883b63c7fe816627377baf25de35564d1b3c480a4fbcabeec2d22279" dependencies = [ "alloy-consensus", "alloy-eips", @@ -342,7 +344,7 @@ dependencies = [ "alloy-op-hardforks", "alloy-primitives", "auto_impl", - "op-alloy-consensus", + "op-alloy-consensus 0.19.0", "op-revm", "revm", ] @@ -1077,7 +1079,7 @@ dependencies = [ "futures", "hyper", "itertools 0.14.0", - "op-alloy-consensus", + "op-alloy-consensus 0.18.14", "op-alloy-rpc-types", "op-revm", "parking_lot", @@ -1110,7 +1112,7 @@ dependencies = [ "bytes", "foundry-common", "foundry-evm", - "op-alloy-consensus", + "op-alloy-consensus 0.18.14", "op-revm", "rand 0.9.2", "revm", @@ -2553,7 +2555,7 @@ dependencies = [ "foundry-wallets", "futures", "itertools 0.14.0", - "op-alloy-consensus", + "op-alloy-consensus 0.18.14", "op-alloy-flz", "rand 0.8.5", "rand 0.9.2", @@ -6913,6 +6915,20 @@ dependencies = [ "thiserror 2.0.16", ] +[[package]] +name = "op-alloy-consensus" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72910bfa281935a41094d6d1d84b38ce8d4d8c98472a47f5c9db4328d5db6e45" +dependencies = [ + "alloy-consensus", + "alloy-eips", + "alloy-primitives", + "alloy-rlp", + "derive_more 2.0.1", + "thiserror 2.0.16", +] + [[package]] name = "op-alloy-flz" version = "0.13.1" @@ -6932,7 +6948,7 @@ dependencies = [ "alloy-rpc-types-eth", "alloy-serde", "derive_more 2.0.1", - "op-alloy-consensus", + "op-alloy-consensus 0.18.14", "serde", "serde_json", "thiserror 2.0.16", diff --git a/Cargo.toml b/Cargo.toml index 28cf0e376913f..2756bac80c414 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -267,8 +267,8 @@ revm-inspectors = { version = "0.29.0", features = ["serde"] } op-revm = { version = "10.0.0", default-features = false } ## alloy-evm -alloy-evm = "0.18.4" -alloy-op-evm = "0.18.4" +alloy-evm = "0.19.0" +alloy-op-evm = "0.19.0" ## cli anstream = "0.6" @@ -399,8 +399,8 @@ idna_adapter = "=1.1.0" # alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy", rev = "7fab7ee" } ## alloy-evm -alloy-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "3c6cebb" } -alloy-op-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "3c6cebb" } +# alloy-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "3c6cebb" } +# alloy-op-evm = { git = "https://github.com/alloy-rs/evm.git", rev = "3c6cebb" } ## revm # revm = { git = "https://github.com/bluealloy/revm.git", rev = "d9cda3a" } From e7c1ed25199d1929c78637bd31ba1e2ddad2b4d0 Mon Sep 17 00:00:00 2001 From: zerosnacks Date: Mon, 25 Aug 2025 15:40:48 +0200 Subject: [PATCH 7/7] bump op-alloy-* to avoid duplicate deps w/ alloy-evm --- Cargo.lock | 34 ++++++++++------------------------ Cargo.toml | 4 ++-- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c715c99705ba5..24ce880b9f61c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -234,7 +234,7 @@ dependencies = [ "alloy-sol-types", "auto_impl", "derive_more 2.0.1", - "op-alloy-consensus 0.19.0", + "op-alloy-consensus", "op-revm", "revm", "thiserror 2.0.16", @@ -344,7 +344,7 @@ dependencies = [ "alloy-op-hardforks", "alloy-primitives", "auto_impl", - "op-alloy-consensus 0.19.0", + "op-alloy-consensus", "op-revm", "revm", ] @@ -1079,7 +1079,7 @@ dependencies = [ "futures", "hyper", "itertools 0.14.0", - "op-alloy-consensus 0.18.14", + "op-alloy-consensus", "op-alloy-rpc-types", "op-revm", "parking_lot", @@ -1112,7 +1112,7 @@ dependencies = [ "bytes", "foundry-common", "foundry-evm", - "op-alloy-consensus 0.18.14", + "op-alloy-consensus", "op-revm", "rand 0.9.2", "revm", @@ -2555,7 +2555,7 @@ dependencies = [ "foundry-wallets", "futures", "itertools 0.14.0", - "op-alloy-consensus 0.18.14", + "op-alloy-consensus", "op-alloy-flz", "rand 0.8.5", "rand 0.9.2", @@ -6899,9 +6899,9 @@ dependencies = [ [[package]] name = "op-alloy-consensus" -version = "0.18.14" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c88d2940558fd69f8f07b3cbd7bb3c02fc7d31159c1a7ba9deede50e7881024" +checksum = "72910bfa281935a41094d6d1d84b38ce8d4d8c98472a47f5c9db4328d5db6e45" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6915,20 +6915,6 @@ dependencies = [ "thiserror 2.0.16", ] -[[package]] -name = "op-alloy-consensus" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72910bfa281935a41094d6d1d84b38ce8d4d8c98472a47f5c9db4328d5db6e45" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "derive_more 2.0.1", - "thiserror 2.0.16", -] - [[package]] name = "op-alloy-flz" version = "0.13.1" @@ -6937,9 +6923,9 @@ checksum = "a79f352fc3893dcd670172e615afef993a41798a1d3fc0db88a3e60ef2e70ecc" [[package]] name = "op-alloy-rpc-types" -version = "0.18.14" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f22201e53e8cbb67a053e88b534b4e7f02265c5406994bf35978482a9ad0ae26" +checksum = "ad11296eb598cd835db304145e1bd6e300eb29caedee8f50b62a3140a98fa8ca" dependencies = [ "alloy-consensus", "alloy-eips", @@ -6948,7 +6934,7 @@ dependencies = [ "alloy-rpc-types-eth", "alloy-serde", "derive_more 2.0.1", - "op-alloy-consensus 0.18.14", + "op-alloy-consensus", "serde", "serde_json", "thiserror 2.0.16", diff --git a/Cargo.toml b/Cargo.toml index 2756bac80c414..378b1dfb85962 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -257,8 +257,8 @@ alloy-rlp = "0.3" alloy-trie = "0.9" ## op-alloy -op-alloy-consensus = "0.18.13" -op-alloy-rpc-types = "0.18.13" +op-alloy-consensus = "0.19.0" +op-alloy-rpc-types = "0.19.0" op-alloy-flz = "0.13.1" ## revm