Merge branch 'master' into rusowsky/ast-fuzz-dict

Author: 0xrusowsky

Cargo.lock

@@ -609,6 +609,18 @@ interface Vm {
     #[cheatcode(group = Evm, safety = Unsafe)]
     function coolSlot(address target, bytes32 slot) external;
 
+    /// Returns the test or script execution evm version.
+    ///
+    /// **Note:** The execution evm version is not the same as the compilation one.
+    #[cheatcode(group = Evm, safety = Safe)]
+    function getEvmVersion() external pure returns (string memory evm);
+
+    /// Set the exact test or script execution evm version, e.g. `berlin`, `cancun`.
+    ///
+    /// **Note:** The execution evm version is not the same as the compilation one.
+    #[cheatcode(group = Evm, safety = Safe)]
+    function setEvmVersion(string calldata evm) external;
+
     // -------- Call Manipulation --------
     // --- Mocks ---
 

crates/cheatcodes/assets/cheatcodes.json

@@ -21,6 +21,7 @@ use foundry_common::{
         SlotInfo,
     },
 };
+use foundry_compilers::artifacts::EvmVersion;
 use foundry_evm_core::{
     ContextExt,
     backend::{DatabaseExt, RevertStateSnapshotAction},
@@ -45,6 +46,7 @@ use std::{
 
 mod record_debug_step;
 use foundry_common::fmt::format_token_raw;
+use foundry_config::evm_spec_id;
 use record_debug_step::{convert_call_trace_to_debug_step, flatten_call_trace};
 use serde::Serialize;
 
@@ -1103,6 +1105,23 @@ impl Cheatcode for stopAndReturnDebugTraceRecordingCall {
     }
 }
 
+impl Cheatcode for setEvmVersionCall {
+    fn apply_stateful(&self, ccx: &mut CheatsCtxt) -> Result {
+        let Self { evm } = self;
+        ccx.ecx.cfg.spec = evm_spec_id(
+            EvmVersion::from_str(evm)
+                .map_err(|_| Error::from(format!("invalid evm version {evm}")))?,
+        );
+        Ok(Default::default())
+    }
+}
+
+impl Cheatcode for getEvmVersionCall {
+    fn apply_stateful(&self, ccx: &mut CheatsCtxt) -> Result {
+        Ok(ccx.ecx.cfg.spec.to_string().to_lowercase().abi_encode())
+    }
+}
+
 pub(super) fn get_nonce(ccx: &mut CheatsCtxt, address: &Address) -> Result {
     let account = ccx.ecx.journaled_state.load_account(*address)?;
     Ok(account.info.nonce.abi_encode())

crates/cheatcodes/spec/src/vm.rs

@@ -136,11 +136,6 @@ pub struct EvmArgs {
     #[arg(long)]
     #[serde(skip)]
     pub isolate: bool,
-
-    /// Whether to enable Celo precompiles.
-    #[arg(long)]
-    #[serde(skip)]
-    pub celo: bool,
 }
 
 // Make this set of options a `figment::Provider` so that it can be merged into the `Config`
@@ -167,10 +162,6 @@ impl Provider for EvmArgs {
             dict.insert("isolate".to_string(), self.isolate.into());
         }
 
-        if self.celo {
-            dict.insert("celo".to_string(), self.celo.into());
-        }
-
         if self.always_use_create_2_factory {
             dict.insert(
                 "always_use_create_2_factory".to_string(),

crates/cheatcodes/src/evm.rs

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

crates/cli/src/opts/evm.rs

@@ -128,6 +128,7 @@ pub use compilation::{CompilationRestrictions, SettingsOverrides};
 pub mod extend;
 use extend::Extends;
 
+use foundry_evm_networks::NetworkConfigs;
 pub use semver;
 
 /// Foundry configuration
@@ -530,9 +531,9 @@ pub struct Config {
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub extra_args: Vec<String>,
 
-    /// Whether to enable Celo precompiles.
-    #[serde(default)]
-    pub celo: bool,
+    /// Networks with enabled features.
+    #[serde(flatten)]
+    pub networks: NetworkConfigs,
 
     /// Timeout for transactions in seconds.
     pub transaction_timeout: u64,
@@ -2568,7 +2569,7 @@ impl Default for Config {
             legacy_assertions: false,
             warnings: vec![],
             extra_args: vec![],
-            celo: false,
+            networks: Default::default(),
             transaction_timeout: 120,
             additional_compiler_profiles: Default::default(),
             compilation_restrictions: Default::default(),

crates/config/Cargo.toml

@@ -14,7 +14,7 @@ use std::collections::BTreeMap;
 
 pub mod celo;
 
-#[derive(Clone, Debug, Default, Parser, Copy, Serialize, Deserialize)]
+#[derive(Clone, Debug, Default, Parser, Copy, Serialize, Deserialize, PartialEq)]
 pub struct NetworkConfigs {
     /// Enable Optimism network features.
     #[arg(help_heading = "Networks", long, visible_alias = "optimism", conflicts_with = "celo")]
@@ -23,6 +23,7 @@ pub struct NetworkConfigs {
     optimism: bool,
     /// Enable Celo network features.
     #[arg(help_heading = "Networks", long, conflicts_with = "optimism")]
+    #[serde(default)]
     celo: bool,
 }
 

crates/config/src/lib.rs

@@ -319,9 +319,7 @@ impl TestRunnerConfig {
 
         self.spec_id = config.evm_spec_id();
         self.sender = config.sender;
-        if config.celo {
-            self.networks = NetworkConfigs::with_celo();
-        }
+        self.networks = config.networks;
         self.isolation = config.isolate;
 
         // Specific to Forge, not present in config.

crates/evm/networks/src/lib.rs

@@ -350,7 +350,7 @@ forgetest!(can_extract_config_values, |prj, cmd| {
         assertions_revert: true,
         legacy_assertions: false,
         extra_args: vec![],
-        celo: false,
+        networks: Default::default(),
         transaction_timeout: 120,
         additional_compiler_profiles: Default::default(),
         compilation_restrictions: Default::default(),