feat: enable hardfork support (#152)

Author: zerosnacks

Cargo.lock

@@ -207,6 +207,7 @@ foundry-evm = { path = "crates/evm/evm" }
 foundry-evm-abi = { path = "crates/evm/abi" }
 foundry-evm-core = { path = "crates/evm/core" }
 foundry-evm-coverage = { path = "crates/evm/coverage" }
+foundry-evm-hardforks = { path = "crates/evm/hardforks" }
 foundry-evm-networks = { path = "crates/evm/networks" }
 foundry-evm-fuzz = { path = "crates/evm/fuzz" }
 foundry-evm-traces = { path = "crates/evm/traces" }

Cargo.toml

@@ -689,6 +689,13 @@ impl NodeConfig {
         self
     }
 
+    /// Sets the hardfork
+    #[must_use]
+    pub fn with_hardfork(mut self, hardfork: Option<FoundryHardfork>) -> Self {
+        self.hardfork = hardfork;
+        self
+    }
+
     /// Sets the init genesis (genesis.json)
     #[must_use]
     pub fn with_genesis(mut self, genesis: Option<Genesis>) -> Self {
@@ -728,13 +735,6 @@ impl NodeConfig {
             .unwrap_or(0)
     }
 
-    /// Sets the hardfork
-    #[must_use]
-    pub fn with_hardfork(mut self, hardfork: Option<FoundryHardfork>) -> Self {
-        self.hardfork = hardfork;
-        self
-    }
-
     /// Sets the genesis accounts
     #[must_use]
     pub fn with_genesis_accounts(mut self, accounts: Vec<PrivateKeySigner>) -> Self {

crates/anvil/src/config.rs

@@ -29,6 +29,7 @@ use foundry_config::{
 };
 use foundry_evm::{
     executors::TracingExecutor,
+    hardforks::FoundryHardfork,
     opts::EvmOpts,
     traces::{InternalTraceMode, TraceMode},
 };
@@ -117,6 +118,11 @@ pub struct CallArgs {
     #[arg(long, requires = "trace")]
     evm_version: Option<EvmVersion>,
 
+    /// The EVM hardfork to use.
+    /// Can only be used with `--trace`.
+    #[arg(long, requires = "trace")]
+    pub hardfork: Option<FoundryHardfork>,
+
     /// The block height to query at.
     ///
     /// Can also be the tags earliest, finalized, safe, latest, or pending.
@@ -224,6 +230,7 @@ impl CallArgs {
             block,
             trace,
             evm_version,
+            hardfork,
             debug,
             decode_internal,
             labels,
@@ -301,10 +308,12 @@ impl CallArgs {
                     InternalTraceMode::None
                 })
                 .with_state_changes(shell::verbosity() > 4);
+
             let mut executor = TracingExecutor::new(
                 env,
                 fork,
                 evm_version,
+                hardfork,
                 trace_mode,
                 networks,
                 create2_deployer,

crates/cast/src/cmd/call.rs

@@ -27,6 +27,7 @@ use foundry_evm::{
     Env,
     core::env::AsEnvMut,
     executors::{EvmError, Executor, TracingExecutor},
+    hardforks::FoundryHardfork,
     opts::EvmOpts,
     traces::{InternalTraceMode, TraceMode, Traces},
 };
@@ -85,6 +86,12 @@ pub struct RunArgs {
     #[arg(long)]
     evm_version: Option<EvmVersion>,
 
+    /// The EVM hardfork to use.
+    ///
+    /// Overrides the hardfork specified in the config.
+    #[arg(long)]
+    hardfork: Option<FoundryHardfork>,
+
     /// Sets the number of assumed available compute units per second for this provider
     ///
     /// default value: 330
@@ -197,6 +204,7 @@ impl RunArgs {
             env.clone(),
             fork,
             evm_version,
+            self.hardfork,
             trace_mode,
             networks,
             create2_deployer,

crates/cast/src/cmd/run.rs

@@ -227,6 +227,7 @@ impl SessionSource {
             })
             .gas_limit(self.config.evm_opts.gas_limit())
             .spec_id(self.config.foundry_config.evm_spec_id())
+            .hardfork(self.config.foundry_config.hardfork())
             .legacy_assertions(self.config.foundry_config.legacy_assertions)
             .build(env, backend);
 

crates/chisel/src/executor.rs

@@ -20,6 +20,7 @@ foundry-compilers = { workspace = true, features = ["svm-solc"] }
 alloy-chains = { workspace = true, features = ["serde"] }
 alloy-primitives = { workspace = true, features = ["serde"] }
 
+foundry-evm-hardforks.workspace = true
 foundry-evm-networks.workspace = true
 
 revm.workspace = true

crates/config/Cargo.toml

@@ -39,6 +39,7 @@ use foundry_compilers::{
     multi::{MultiCompilerParser, MultiCompilerRestrictions},
     solc::{CliSettings, SolcLanguage, SolcSettings},
 };
+use foundry_evm_hardforks::FoundryHardfork;
 use regex::Regex;
 use revm::primitives::hardfork::SpecId;
 use semver::Version;
@@ -235,6 +236,8 @@ pub struct Config {
     /// The EVM version to use when building contracts.
     #[serde(with = "from_str_lowercase")]
     pub evm_version: EvmVersion,
+    /// The EVM hardfork to use when simulating execution.
+    pub hardfork: Option<FoundryHardfork>,
     /// List of contracts to generate gas reports for.
     pub gas_reports: Vec<String>,
     /// List of contracts to ignore for gas reports.
@@ -2483,6 +2486,7 @@ impl Default for Config {
             include_paths: vec![],
             force: false,
             evm_version: EvmVersion::Prague,
+            hardfork: None,
             gas_reports: vec!["*".to_string()],
             gas_reports_ignore: vec![],
             gas_reports_include_tests: false,

crates/config/src/lib.rs

@@ -18,14 +18,14 @@ foundry-cheatcodes-spec.workspace = true
 foundry-common.workspace = true
 foundry-config.workspace = true
 foundry-evm-abi.workspace = true
+foundry-evm-hardforks.workspace = true
 foundry-evm-networks.workspace = true
 
 alloy-chains.workspace = true
 alloy-dyn-abi = { workspace = true, features = ["arbitrary", "eip712"] }
 alloy-evm.workspace = true
 alloy-genesis.workspace = true
 alloy-hardforks.workspace = true
-alloy-op-hardforks.workspace = true
 alloy-json-abi.workspace = true
 alloy-primitives = { workspace = true, features = [
     "serde",

crates/evm/core/Cargo.toml

@@ -36,7 +36,6 @@ pub mod decode;
 pub mod either_evm;
 pub mod evm;
 pub mod fork;
-pub mod hardfork;
 pub mod ic;
 pub mod opts;
 pub mod precompiles;