EVM Simulator Flag

core/lib/config/src/configs/mod.rs

@@ -63,6 +63,7 @@ pub mod pruning;
 pub mod secrets;
 pub mod snapshot_recovery;
 pub mod snapshots_creator;
+pub mod use_evm_simulator;
 pub mod utils;
 pub mod vm_runner;
 pub mod wallets;

core/lib/config/src/configs/use_evm_simulator.rs

@@ -0,0 +1,7 @@
+use serde::Deserialize;
+
+/// Configuration for the use evm simulator
+#[derive(Debug, Deserialize, Clone, PartialEq)]
+pub struct UseEvmSimulator {
+    pub use_evm_simulator: bool,
+}

core/lib/contracts/Cargo.toml

@@ -12,6 +12,8 @@ categories.workspace = true
 
 [dependencies]
 zksync_utils.workspace = true
+zksync_config.workspace = true
+zksync_env_config.workspace = true
 
 ethabi.workspace = true
 serde_json.workspace = true

core/lib/contracts/src/lib.rs

@@ -16,6 +16,11 @@ use ethabi::{
 };
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
+use zksync_config::configs::{
+    house_keeper::HouseKeeperConfig,
+    use_evm_simulator::{self, UseEvmSimulator},
+};
+use zksync_env_config::FromEnv;
 use zksync_utils::{bytecode::hash_bytecode, bytes_to_be_words, workspace_dir_or_current_dir};
 
 pub mod test_contracts;
@@ -342,10 +347,16 @@ impl BaseSystemContracts {
             hash,
         };
 
-        let evm_simulator_bytecode =
+        let mut evm_simulator_bytecode =
             read_sys_contract_bytecode("", "EvmInterpreter", ContractLanguage::Yul);
         let evm_simulator_hash = hash_bytecode(&evm_simulator_bytecode);
 
+        let use_evm_simulator =
+            UseEvmSimulator::from_env().expect("USE EVM SIMULATOR FLAG SHOULD BE SET");
+        if !use_evm_simulator.use_evm_simulator {
+            evm_simulator_bytecode = vec![];
+        }
+
         let evm_simulator = SystemContractCode {
             code: bytes_to_be_words(evm_simulator_bytecode),
             hash: evm_simulator_hash,

core/lib/env_config/src/lib.rs

@@ -29,6 +29,7 @@ mod genesis;
 mod prover_job_monitor;
 #[cfg(test)]
 mod test_utils;
+mod use_evm_simulator;
 mod vm_runner;
 mod wallets;
 

core/lib/env_config/src/use_evm_simulator.rs

@@ -0,0 +1,9 @@
+use zksync_config::configs::use_evm_simulator::UseEvmSimulator;
+
+use crate::{envy_load, FromEnv};
+
+impl FromEnv for UseEvmSimulator {
+    fn from_env() -> anyhow::Result<Self> {
+        envy_load("use_evm_simulator", "USE_EVM_SIMULATOR_")
+    }
+}

etc/env/base/use_evm_simulator.toml

@@ -0,0 +1,2 @@
+[use_evm_simulator]
+use_evm_simulator = true