Merge branch 'main' into upstream-59f354c

Author: elfedy

Cargo.lock

@@ -23,6 +23,7 @@ members = [
     "crates/script-sequence/",
     "crates/macros/",
     "crates/test-utils/",
+    "crates/strategy/zksync/",
 ]
 resolver = "2"
 
@@ -173,6 +174,7 @@ foundry-linking = { path = "crates/linking" }
 foundry-zksync-core = { path = "crates/zksync/core" }
 foundry-zksync-compilers = { path = "crates/zksync/compilers" }
 foundry-zksync-inspectors = { path = "crates/zksync/inspectors" }
+foundry-strategy-zksync = { path = "crates/strategy/zksync" }
 
 # solc & compilation utilities
 foundry-block-explorers = { version = "0.9.0", default-features = false }

Cargo.toml

@@ -120,6 +120,7 @@ impl CallArgs {
         let figment = Into::<Figment>::into(&self.eth).merge(&self);
         let evm_opts = figment.extract::<EvmOpts>()?;
         let mut config = Config::try_from(figment)?.sanitized();
+        let strategy = utils::get_executor_strategy(&config);
 
         let Self {
             to,
@@ -195,8 +196,15 @@ impl CallArgs {
                     InternalTraceMode::None
                 })
                 .with_state_changes(shell::verbosity() > 4);
-            let mut executor =
-                TracingExecutor::new(env, fork, evm_version, trace_mode, odyssey, create2_deployer);
+            let mut executor = TracingExecutor::new(
+                env,
+                fork,
+                evm_version,
+                trace_mode,
+                odyssey,
+                create2_deployer,
+                strategy,
+            );
 
             let value = tx.value.unwrap_or_default();
             let input = tx.inner.input.into_input().unwrap_or_default();

crates/cast/bin/cmd/call.rs

@@ -8,7 +8,7 @@ use clap::Parser;
 use eyre::{Result, WrapErr};
 use foundry_cli::{
     opts::{EtherscanOpts, RpcOpts},
-    utils::{handle_traces, init_progress, TraceResult},
+    utils::{self, handle_traces, init_progress, TraceResult},
 };
 use foundry_common::{is_known_system_sender, shell, SYSTEM_TRANSACTION_TYPE};
 use foundry_compilers::artifacts::EvmVersion;
@@ -104,6 +104,7 @@ impl RunArgs {
         let figment = Into::<Figment>::into(&self.rpc).merge(&self);
         let evm_opts = figment.extract::<EvmOpts>()?;
         let mut config = Config::try_from(figment)?.sanitized();
+        let strategy = utils::get_executor_strategy(&config);
 
         let compute_units_per_second =
             if self.no_rate_limit { Some(u64::MAX) } else { self.compute_units_per_second };
@@ -178,6 +179,7 @@ impl RunArgs {
             trace_mode,
             odyssey,
             create2_deployer,
+            strategy,
         );
         let mut env =
             EnvWithHandlerCfg::new_with_spec_id(Box::new(env.clone()), executor.spec_id());

crates/cast/bin/cmd/run.rs

@@ -32,11 +32,8 @@ foundry-evm-traces.workspace = true
 foundry-wallets.workspace = true
 forge-script-sequence.workspace = true
 foundry-zksync-core.workspace = true
-foundry-zksync-compilers.workspace = true
 foundry-zksync-inspectors.workspace = true
 
-zksync_types.workspace = true
-
 alloy-dyn-abi.workspace = true
 alloy-json-abi.workspace = true
 alloy-primitives.workspace = true

crates/cheatcodes/Cargo.toml

@@ -1,5 +1,8 @@
 use super::Result;
-use crate::Vm::Rpc;
+use crate::{
+    strategy::{CheatcodeInspectorStrategy, EvmCheatcodeInspectorStrategy},
+    Vm::Rpc,
+};
 use alloy_primitives::{map::AddressHashMap, U256};
 use foundry_common::{fs::normalize_path, ContractsByArtifact};
 use foundry_compilers::{utils::canonicalize, ProjectPathsConfig};
@@ -8,8 +11,6 @@ use foundry_config::{
     ResolvedRpcEndpoints,
 };
 use foundry_evm_core::opts::EvmOpts;
-use foundry_zksync_compilers::dual_compiled_contracts::DualCompiledContracts;
-use foundry_zksync_core::vm::ZkEnv;
 use semver::Version;
 use std::{
     path::{Path, PathBuf},
@@ -55,16 +56,12 @@ pub struct CheatsConfig {
     pub running_contract: Option<String>,
     /// Version of the script/test contract which is currently running.
     pub running_version: Option<Version>,
-    /// ZKSolc -> Solc Contract codes
-    pub dual_compiled_contracts: DualCompiledContracts,
-    /// Use ZK-VM on startup
-    pub use_zk: bool,
+    /// The behavior strategy.
+    pub strategy: Box<dyn CheatcodeInspectorStrategy>,
     /// Whether to enable legacy (non-reverting) assertions.
     pub assertions_revert: bool,
     /// Optional seed for the RNG algorithm.
     pub seed: Option<U256>,
-    /// Era Vm environment
-    pub zk_env: Option<ZkEnv>,
 }
 
 impl CheatsConfig {
@@ -76,9 +73,7 @@ impl CheatsConfig {
         available_artifacts: Option<ContractsByArtifact>,
         running_contract: Option<String>,
         running_version: Option<Version>,
-        dual_compiled_contracts: DualCompiledContracts,
-        use_zk: bool,
-        zk_env: Option<ZkEnv>,
+        strategy: Box<dyn CheatcodeInspectorStrategy>,
     ) -> Self {
         let mut allowed_paths = vec![config.root.clone()];
         allowed_paths.extend(config.libs.iter().cloned());
@@ -108,11 +103,9 @@ impl CheatsConfig {
             available_artifacts,
             running_contract,
             running_version,
-            dual_compiled_contracts,
-            use_zk,
+            strategy,
             assertions_revert: config.assertions_revert,
             seed: config.fuzz.seed,
-            zk_env,
         }
     }
 
@@ -124,9 +117,7 @@ impl CheatsConfig {
             self.available_artifacts.clone(),
             self.running_contract.clone(),
             self.running_version.clone(),
-            self.dual_compiled_contracts.clone(),
-            self.use_zk,
-            self.zk_env.clone(),
+            self.strategy.new_cloned(),
         )
     }
 
@@ -255,11 +246,9 @@ impl Default for CheatsConfig {
             available_artifacts: Default::default(),
             running_contract: Default::default(),
             running_version: Default::default(),
-            dual_compiled_contracts: Default::default(),
-            use_zk: false,
+            strategy: Box::new(EvmCheatcodeInspectorStrategy::default()),
             assertions_revert: true,
             seed: None,
-            zk_env: Default::default(),
         }
     }
 }
@@ -276,9 +265,7 @@ mod tests {
             None,
             None,
             None,
-            Default::default(),
-            false,
-            None,
+            Box::new(EvmCheatcodeInspectorStrategy::default()),
         )
     }