[WIP] Evm equivalence Yul

core/bin/genesis_generator/src/main.rs

@@ -91,6 +91,7 @@ async fn generate_new_config(
         genesis_commitment: None,
         bootloader_hash: Some(base_system_contracts.bootloader),
         default_aa_hash: Some(base_system_contracts.default_aa),
+        evm_simulator_hash: Some(base_system_contracts.evm_simulator),
         ..genesis_config
     };
 

core/bin/system-constants-generator/src/utils.rs

@@ -71,12 +71,19 @@ pub static GAS_TEST_SYSTEM_CONTRACTS: Lazy<BaseSystemContracts> = Lazy::new(|| {
 
     let bytecode = read_sys_contract_bytecode("", "DefaultAccount", ContractLanguage::Sol);
     let hash = hash_bytecode(&bytecode);
+    let evm_simulator_bytecode =
+        read_sys_contract_bytecode("", "EvmInterpreter", ContractLanguage::Yul);
+    let evm_simulator_hash = hash_bytecode(&evm_simulator_bytecode);
     BaseSystemContracts {
         default_aa: SystemContractCode {
             code: bytes_to_be_words(bytecode),
             hash,
         },
         bootloader,
+        evm_simulator: SystemContractCode {
+            code: bytes_to_be_words(evm_simulator_bytecode),
+            hash: evm_simulator_hash,
+        },
     }
 });
 
@@ -89,7 +96,7 @@ pub(super) fn get_l2_tx(
     pubdata_price: u32,
 ) -> L2Tx {
     L2Tx::new_signed(
-        contract_address,
+        Some(contract_address),
         vec![],
         Nonce(0),
         Fee {
@@ -134,7 +141,7 @@ pub(super) fn get_l1_tx(
 ) -> L1Tx {
     L1Tx {
         execute: Execute {
-            contract_address,
+            contract_address: Some(contract_address),
             calldata: custom_calldata.unwrap_or_default(),
             value: U256::from(0),
             factory_deps,
@@ -219,9 +226,18 @@ pub(super) fn execute_internal_transfer_test() -> u32 {
         hash,
     };
 
+    let evm_simulator_bytecode =
+        read_sys_contract_bytecode("", "EvmInterpreter", ContractLanguage::Yul);
+    let evm_simulator_hash = hash_bytecode(&evm_simulator_bytecode);
+    let evm_simulator = SystemContractCode {
+        code: bytes_to_be_words(evm_simulator_bytecode),
+        hash: evm_simulator_hash,
+    };
+
     let base_system_smart_contracts = BaseSystemContracts {
         bootloader,
         default_aa,
+        evm_simulator,
     };
 
     let system_env = SystemEnv {

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

@@ -138,6 +138,8 @@ pub struct StateKeeperConfig {
     pub bootloader_hash: Option<H256>,
     #[deprecated(note = "Use GenesisConfig::default_aa_hash instead")]
     pub default_aa_hash: Option<H256>,
+    #[deprecated(note = "Use GenesisConfig::evm_simulator_hash instead")]
+    pub evm_simulator_hash: Option<H256>,
     #[deprecated(note = "Use GenesisConfig::l1_batch_commit_data_generator_mode instead")]
     #[serde(default)]
     pub l1_batch_commit_data_generator_mode: L1BatchCommitmentMode,
@@ -178,6 +180,7 @@ impl StateKeeperConfig {
             protective_reads_persistence_enabled: true,
             bootloader_hash: None,
             default_aa_hash: None,
+            evm_simulator_hash: None,
             l1_batch_commit_data_generator_mode: L1BatchCommitmentMode::Rollup,
         }
     }

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

@@ -17,6 +17,7 @@ pub struct GenesisConfig {
     pub genesis_commitment: Option<H256>,
     pub bootloader_hash: Option<H256>,
     pub default_aa_hash: Option<H256>,
+    pub evm_simulator_hash: Option<H256>,
     pub l1_chain_id: L1ChainId,
     pub sl_chain_id: Option<SLChainId>,
     pub l2_chain_id: L2ChainId,
@@ -49,6 +50,7 @@ impl GenesisConfig {
             genesis_commitment: Some(H256::repeat_byte(0x17)),
             bootloader_hash: Default::default(),
             default_aa_hash: Default::default(),
+            evm_simulator_hash: Default::default(),
             l1_chain_id: L1ChainId(9),
             sl_chain_id: None,
             protocol_version: Some(ProtocolSemanticVersion {

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/config/src/testonly.rs

@@ -185,6 +185,7 @@ impl Distribution<configs::chain::StateKeeperConfig> for EncodeDist {
             fee_account_addr: None,
             bootloader_hash: None,
             default_aa_hash: None,
+            evm_simulator_hash: None,
             l1_batch_commit_data_generator_mode: Default::default(),
         }
     }
@@ -724,6 +725,7 @@ impl Distribution<configs::GenesisConfig> for EncodeDist {
             genesis_commitment: Some(rng.gen()),
             bootloader_hash: Some(rng.gen()),
             default_aa_hash: Some(rng.gen()),
+            evm_simulator_hash: Some(rng.gen()),
             fee_account: rng.gen(),
             l1_chain_id: L1ChainId(self.sample(rng)),
             sl_chain_id: None,

core/lib/constants/src/contracts.rs

@@ -125,6 +125,11 @@ pub const CODE_ORACLE_ADDRESS: Address = H160([
     0x00, 0x00, 0x80, 0x12,
 ]);
 
+pub const EVM_GAS_MANAGER_ADDRESS: Address = H160([
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x80, 0x13,
+]);
+
 /// Note, that the `Create2Factory` is explicitly deployed on a non-system-contract address.
 pub const CREATE2_FACTORY_ADDRESS: Address = H160([
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

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,8 @@ use ethabi::{
 };
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
+use zksync_config::configs::use_evm_simulator::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;
@@ -193,6 +195,10 @@ pub fn deployer_contract() -> Contract {
     load_sys_contract("ContractDeployer")
 }
 
+pub fn known_code_storage_contract() -> Contract {
+    load_sys_contract("KnownCodesStorage")
+}
+
 pub fn l1_messenger_contract() -> Contract {
     load_sys_contract("L1Messenger")
 }
@@ -303,18 +309,21 @@ pub struct SystemContractCode {
 pub struct BaseSystemContracts {
     pub bootloader: SystemContractCode,
     pub default_aa: SystemContractCode,
+    pub evm_simulator: SystemContractCode,
 }
 
 #[derive(Debug, Clone, Copy, Default, Serialize, Deserialize, PartialEq)]
 pub struct BaseSystemContractsHashes {
     pub bootloader: H256,
     pub default_aa: H256,
+    pub evm_simulator: H256,
 }
 
 impl PartialEq for BaseSystemContracts {
     fn eq(&self, other: &Self) -> bool {
         self.bootloader.hash == other.bootloader.hash
             && self.default_aa.hash == other.default_aa.hash
+            && self.evm_simulator.hash == other.evm_simulator.hash
     }
 }
 
@@ -335,9 +344,25 @@ impl BaseSystemContracts {
             hash,
         };
 
+        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,
+        };
+
         BaseSystemContracts {
             bootloader,
             default_aa,
+            evm_simulator,
         }
     }
     // BaseSystemContracts with proved bootloader - for handling transactions.
@@ -474,6 +499,7 @@ impl BaseSystemContracts {
         BaseSystemContractsHashes {
             bootloader: self.bootloader.hash,
             default_aa: self.default_aa.hash,
+            evm_simulator: self.evm_simulator.hash,
         }
     }
 }