refactor: move breakpoints to foundry-evm-core (#11889)

onbjerg · DaniPopes · web-flow · commit 15194e9b5140 · 2025-09-30T17:18:01.000+02:00
* refactor: move breakpoints to foundry-evm-core

* chore: ws

Co-authored-by: DaniPopes &lt;57450786+DaniPopes@users.noreply.github.com&gt;

---------

Co-authored-by: DaniPopes &lt;57450786+DaniPopes@users.noreply.github.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/anvil/Cargo.toml b/crates/anvil/Cargo.toml
@@ -27,7 +27,6 @@ foundry-cli.workspace = true
 foundry-common.workspace = true
 foundry-config.workspace = true
 foundry-evm.workspace = true
-foundry-evm-core.workspace = true
 foundry-evm-networks.workspace = true
 
 # alloy
diff --git a/crates/anvil/src/config.rs b/crates/anvil/src/config.rs
@@ -39,9 +39,9 @@ use foundry_config::Config;
 use foundry_evm::{
     backend::{BlockchainDb, BlockchainDbMeta, SharedBackend},
     constants::DEFAULT_CREATE2_DEPLOYER,
+    core::AsEnvMut,
     utils::{apply_chain_and_block_specific_env_changes, get_blob_base_fee_update_fraction},
 };
-use foundry_evm_core::AsEnvMut;
 use itertools::Itertools;
 use op_revm::OpTransaction;
 use parking_lot::RwLock;
diff --git a/crates/anvil/src/eth/backend/env.rs b/crates/anvil/src/eth/backend/env.rs
@@ -1,6 +1,5 @@
 use alloy_evm::EvmEnv;
-use foundry_evm::EnvMut;
-use foundry_evm_core::AsEnvMut;
+use foundry_evm::{EnvMut, core::AsEnvMut};
 use foundry_evm_networks::NetworkConfigs;
 use op_revm::OpTransaction;
 use revm::context::{BlockEnv, CfgEnv, TxEnv};
diff --git a/crates/anvil/src/eth/backend/executor.rs b/crates/anvil/src/eth/backend/executor.rs
@@ -31,9 +31,9 @@ use anvil_core::eth::{
 };
 use foundry_evm::{
     backend::DatabaseError,
+    core::{either_evm::EitherEvm, precompiles::EC_RECOVER},
     traces::{CallTraceDecoder, CallTraceNode},
 };
-use foundry_evm_core::{either_evm::EitherEvm, precompiles::EC_RECOVER};
 use foundry_evm_networks::NetworkConfigs;
 use op_revm::{L1BlockInfo, OpContext, precompiles::OpPrecompiles};
 use revm::{
diff --git a/crates/anvil/src/eth/backend/mem/mod.rs b/crates/anvil/src/eth/backend/mem/mod.rs
@@ -99,6 +99,7 @@ use flate2::{Compression, read::GzDecoder, write::GzEncoder};
 use foundry_evm::{
     backend::{DatabaseError, DatabaseResult, RevertStateSnapshotAction},
     constants::DEFAULT_CREATE2_DEPLOYER_RUNTIME_CODE,
+    core::{either_evm::EitherEvm, precompiles::EC_RECOVER},
     decode::RevertDecoder,
     inspectors::AccessListInspector,
     traces::{
@@ -107,7 +108,6 @@ use foundry_evm::{
     },
     utils::{get_blob_base_fee_update_fraction, get_blob_base_fee_update_fraction_by_spec_id},
 };
-use foundry_evm_core::{either_evm::EitherEvm, precompiles::EC_RECOVER};
 use futures::channel::mpsc::{UnboundedSender, unbounded};
 use op_alloy_consensus::DEPOSIT_TX_TYPE_ID;
 use op_revm::{
diff --git a/crates/anvil/src/evm.rs b/crates/anvil/src/evm.rs
@@ -4,7 +4,7 @@ use alloy_evm::{
     precompiles::{DynPrecompile, PrecompileInput, PrecompilesMap},
 };
 
-use foundry_evm_core::either_evm::EitherEvm;
+use foundry_evm::core::either_evm::EitherEvm;
 use op_revm::OpContext;
 use revm::{Inspector, precompile::Precompile};
 use std::fmt::Debug;
@@ -41,7 +41,7 @@ mod tests {
     use alloy_evm::{EthEvm, Evm, EvmEnv, eth::EthEvmContext, precompiles::PrecompilesMap};
     use alloy_op_evm::OpEvm;
     use alloy_primitives::{Address, Bytes, TxKind, U256, address};
-    use foundry_evm_core::either_evm::EitherEvm;
+    use foundry_evm::core::either_evm::EitherEvm;
     use foundry_evm_networks::NetworkConfigs;
     use itertools::Itertools;
     use op_revm::{L1BlockInfo, OpContext, OpSpecId, OpTransaction, precompiles::OpPrecompiles};
diff --git a/crates/cast/Cargo.toml b/crates/cast/Cargo.toml
@@ -27,7 +27,6 @@ foundry-common.workspace = true
 foundry-compilers.workspace = true
 foundry-config.workspace = true
 foundry-debugger.workspace = true
-foundry-evm-core.workspace = true
 foundry-evm.workspace = true
 foundry-wallets.workspace = true
 forge-fmt.workspace = true
diff --git a/crates/cast/src/cmd/run.rs b/crates/cast/src/cmd/run.rs
@@ -24,12 +24,12 @@ use foundry_config::{
 };
 use foundry_evm::{
     Env,
+    core::env::AsEnvMut,
     executors::{EvmError, TracingExecutor},
     opts::EvmOpts,
     traces::{InternalTraceMode, TraceMode, Traces},
     utils::configure_tx_env,
 };
-use foundry_evm_core::env::AsEnvMut;
 
 use crate::utils::apply_chain_and_block_specific_env_changes;
 
diff --git a/crates/cast/src/lib.rs b/crates/cast/src/lib.rs
@@ -35,7 +35,7 @@ use foundry_common::{
     fs, get_pretty_tx_receipt_attr, shell,
 };
 use foundry_config::Chain;
-use foundry_evm_core::ic::decode_instructions;
+use foundry_evm::core::ic::decode_instructions;
 use futures::{FutureExt, StreamExt, future::Either};
 use op_alloy_consensus::OpTxEnvelope;
 use rayon::prelude::*;
diff --git a/crates/cheatcodes/src/inspector.rs b/crates/cheatcodes/src/inspector.rs
@@ -34,11 +34,10 @@ use alloy_rpc_types::{
 use alloy_sol_types::{SolCall, SolInterface, SolValue};
 use foundry_common::{
     SELECTOR_LEN, TransactionMaybeSigned,
-    evm::Breakpoints,
     mapping_slots::{MappingSlots, step as mapping_step},
 };
 use foundry_evm_core::{
-    InspectorExt,
+    Breakpoints, InspectorExt,
     abi::Vm::stopExpectSafeMemoryCall,
     backend::{DatabaseError, DatabaseExt, RevertDiagnostic},
     constants::{CHEATCODE_ADDRESS, HARDHAT_CONSOLE_ADDRESS, MAGIC_ASSUME},
diff --git a/crates/common/src/evm.rs b/crates/common/src/evm.rs
diff --git a/crates/common/src/lib.rs b/crates/common/src/lib.rs
@@ -23,7 +23,6 @@ pub mod compile;
 pub mod constants;
 pub mod contracts;
 pub mod errors;
-pub mod evm;
 pub mod fs;
 pub mod iter;
 pub mod mapping_slots;
diff --git a/crates/debugger/src/builder.rs b/crates/debugger/src/builder.rs
@@ -2,7 +2,8 @@
 
 use crate::{DebugNode, Debugger, node::flatten_call_trace};
 use alloy_primitives::{Address, map::AddressHashMap};
-use foundry_common::{evm::Breakpoints, get_contract_name};
+use foundry_common::get_contract_name;
+use foundry_evm_core::Breakpoints;
 use foundry_evm_traces::{CallTraceArena, CallTraceDecoder, Traces, debug::ContractSources};
 
 /// Debugger builder.
diff --git a/crates/debugger/src/debugger.rs b/crates/debugger/src/debugger.rs
@@ -3,7 +3,7 @@
 use crate::{DebugNode, DebuggerBuilder, ExitReason, tui::TUI};
 use alloy_primitives::map::AddressHashMap;
 use eyre::Result;
-use foundry_common::evm::Breakpoints;
+use foundry_evm_core::Breakpoints;
 use foundry_evm_traces::debug::ContractSources;
 use std::path::Path;
 
diff --git a/crates/evm/core/src/lib.rs b/crates/evm/core/src/lib.rs
@@ -7,12 +7,15 @@
 
 use crate::constants::DEFAULT_CREATE2_DEPLOYER;
 use alloy_evm::eth::EthEvmContext;
-use alloy_primitives::Address;
+use alloy_primitives::{Address, map::HashMap};
 use auto_impl::auto_impl;
 use backend::DatabaseExt;
 use revm::{Inspector, inspector::NoOpInspector, interpreter::CreateInputs};
 use revm_inspectors::access_list::AccessListInspector;
 
+/// Map keyed by breakpoints char to their location (contract address, pc)
+pub type Breakpoints = HashMap<char, (Address, usize)>;
+
 #[macro_use]
 extern crate tracing;
 
diff --git a/crates/evm/evm/src/executors/fuzz/mod.rs b/crates/evm/evm/src/executors/fuzz/mod.rs
@@ -5,9 +5,10 @@ use alloy_dyn_abi::JsonAbiExt;
 use alloy_json_abi::Function;
 use alloy_primitives::{Address, Bytes, Log, U256, map::HashMap};
 use eyre::Result;
-use foundry_common::{evm::Breakpoints, sh_println};
+use foundry_common::sh_println;
 use foundry_config::FuzzConfig;
 use foundry_evm_core::{
+    Breakpoints,
     constants::{CHEATCODE_ADDRESS, MAGIC_ASSUME},
     decode::{RevertDecoder, SkipReason},
 };
diff --git a/crates/evm/evm/src/executors/fuzz/types.rs b/crates/evm/evm/src/executors/fuzz/types.rs
@@ -1,6 +1,6 @@
 use crate::executors::RawCallResult;
 use alloy_primitives::{Bytes, Log, map::HashMap};
-use foundry_common::evm::Breakpoints;
+use foundry_evm_core::Breakpoints;
 use foundry_evm_coverage::HitMaps;
 use foundry_evm_fuzz::FuzzCase;
 use foundry_evm_traces::SparsedTraceArena;
diff --git a/crates/evm/evm/src/lib.rs b/crates/evm/evm/src/lib.rs
@@ -11,6 +11,7 @@ extern crate tracing;
 pub mod executors;
 pub mod inspectors;
 
+pub use foundry_evm_core as core;
 pub use foundry_evm_core::{
     Env, EnvMut, EvmEnv, InspectorExt, backend, constants, decode, fork, opts, utils,
 };
diff --git a/crates/evm/fuzz/src/lib.rs b/crates/evm/fuzz/src/lib.rs
@@ -13,7 +13,8 @@ use alloy_primitives::{
     Address, Bytes, Log,
     map::{AddressHashMap, HashMap},
 };
-use foundry_common::{calc, contracts::ContractsByAddress, evm::Breakpoints};
+use foundry_common::{calc, contracts::ContractsByAddress};
+use foundry_evm_core::Breakpoints;
 use foundry_evm_coverage::HitMaps;
 use foundry_evm_traces::{CallTraceArena, SparsedTraceArena};
 use itertools::Itertools;
diff --git a/crates/forge/Cargo.toml b/crates/forge/Cargo.toml
@@ -29,7 +29,6 @@ foundry-common.workspace = true
 foundry-compilers.workspace = true
 foundry-config.workspace = true
 foundry-evm.workspace = true
-foundry-evm-core.workspace = true
 foundry-evm-networks.workspace = true
 foundry-linking.workspace = true
 
diff --git a/crates/forge/src/cmd/coverage.rs b/crates/forge/src/cmd/coverage.rs
@@ -15,8 +15,7 @@ use foundry_compilers::{
     artifacts::{CompactBytecode, CompactDeployedBytecode, SolcLanguage, sourcemap::SourceMap},
 };
 use foundry_config::Config;
-use foundry_evm::opts::EvmOpts;
-use foundry_evm_core::ic::IcPcMap;
+use foundry_evm::{core::ic::IcPcMap, opts::EvmOpts};
 use rayon::prelude::*;
 use semver::{Version, VersionReq};
 use std::path::{Path, PathBuf};
diff --git a/crates/forge/src/result.rs b/crates/forge/src/result.rs
@@ -10,8 +10,9 @@ use alloy_primitives::{
     map::{AddressHashMap, HashMap},
 };
 use eyre::Report;
-use foundry_common::{evm::Breakpoints, get_contract_name, get_file_name, shell};
+use foundry_common::{get_contract_name, get_file_name, shell};
 use foundry_evm::{
+    core::Breakpoints,
     coverage::HitMaps,
     decode::SkipReason,
     executors::{RawCallResult, invariant::InvariantMetrics},
diff --git a/crates/script/src/lib.rs b/crates/script/src/lib.rs
@@ -32,7 +32,6 @@ use foundry_cli::{
 use foundry_common::{
     CONTRACT_MAX_SIZE, ContractsByArtifact, SELECTOR_LEN,
     abi::{encode_function_args, get_func},
-    evm::Breakpoints,
     shell,
 };
 use foundry_compilers::ArtifactId;
@@ -45,6 +44,7 @@ use foundry_config::{
 };
 use foundry_evm::{
     backend::Backend,
+    core::Breakpoints,
     executors::ExecutorBuilder,
     inspectors::{
         CheatsConfig,
diff --git a/crates/verify/Cargo.toml b/crates/verify/Cargo.toml
@@ -18,7 +18,6 @@ foundry-config.workspace = true
 foundry-cli.workspace = true
 foundry-common.workspace = true
 foundry-evm.workspace = true
-foundry-evm-core.workspace = true
 serde_json.workspace = true
 alloy-json-abi.workspace = true
 alloy-primitives.workspace = true
diff --git a/crates/verify/src/bytecode.rs b/crates/verify/src/bytecode.rs
@@ -26,8 +26,9 @@ use foundry_cli::{
 use foundry_common::shell;
 use foundry_compilers::{artifacts::EvmVersion, info::ContractInfo};
 use foundry_config::{Config, figment, impl_figment_convert};
-use foundry_evm::{constants::DEFAULT_CREATE2_DEPLOYER, utils::configure_tx_req_env};
-use foundry_evm_core::AsEnvMut;
+use foundry_evm::{
+    constants::DEFAULT_CREATE2_DEPLOYER, core::AsEnvMut, utils::configure_tx_req_env,
+};
 use revm::state::AccountInfo;
 use std::path::PathBuf;
 
