test(vm): Test EVM emulator in multivm crate

.gitignore

@@ -99,6 +99,7 @@ db-ssd/
 backups/
 artifacts/
 artifacts-zk/
+cache-evm/
 cache-zk/
 zksolc
 verified_sources

core/lib/contracts/src/lib.rs

@@ -227,16 +227,26 @@ pub fn read_bytecode_from_path(
 ) -> Option<Vec<u8>> {
     let artifact = read_file_to_json_value(&artifact_path)?;
 
-    let bytecode = if let Some(bytecode) = artifact["bytecode"].as_str() {
-        bytecode
-            .strip_prefix("0x")
-            .unwrap_or_else(|| panic!("Bytecode in {:?} is not hex", artifact_path))
-    } else {
-        artifact["bytecode"]["object"]
-            .as_str()
-            .unwrap_or_else(|| panic!("Bytecode not found in {:?}", artifact_path))
-    };
+    let bytecode = artifact["bytecode"]
+        .as_str()
+        .or_else(|| artifact["bytecode"]["object"].as_str())
+        .unwrap_or_else(|| panic!("Bytecode not found in {:?}", artifact_path));
+    // Strip an optional `0x` prefix.
+    let bytecode = bytecode.strip_prefix("0x").unwrap_or(bytecode);
+    Some(
+        hex::decode(bytecode)
+            .unwrap_or_else(|err| panic!("Can't decode bytecode in {:?}: {}", artifact_path, err)),
+    )
+}
 
+pub fn read_deployed_bytecode_from_path(artifact_path: &Path) -> Option<Vec<u8>> {
+    let artifact = read_file_to_json_value(artifact_path)?;
+    let bytecode = artifact["deployedBytecode"]
+        .as_str()
+        .or_else(|| artifact["deployedBytecode"]["object"].as_str())
+        .unwrap_or_else(|| panic!("Deployed bytecode not found in {:?}", artifact_path));
+    // Strip an optional `0x` prefix.
+    let bytecode = bytecode.strip_prefix("0x").unwrap_or(bytecode);
     Some(
         hex::decode(bytecode)
             .unwrap_or_else(|err| panic!("Can't decode bytecode in {:?}: {}", artifact_path, err)),

core/lib/multivm/Cargo.toml

@@ -43,6 +43,7 @@ ethabi.workspace = true
 [dev-dependencies]
 assert_matches.workspace = true
 pretty_assertions.workspace = true
+rand.workspace = true
 test-casing.workspace = true
 zksync_test_account.workspace = true
 zksync_eth_signer.workspace = true

core/lib/multivm/src/versions/shadow/tests.rs

@@ -197,10 +197,10 @@ mod default_aa {
     }
 }
 
-mod evm_emulator {
+mod mock_evm {
     use test_casing::{test_casing, Product};
 
-    use crate::versions::testonly::evm_emulator::*;
+    use crate::versions::testonly::mock_evm::*;
 
     #[test]
     fn tracing_evm_contract_deployment() {

core/lib/multivm/src/versions/testonly/bootloader.rs

@@ -9,7 +9,6 @@ pub(crate) fn test_dummy_bootloader<VM: TestedVm>() {
     base_system_contracts.bootloader = get_bootloader("dummy");
 
     let mut vm = VmTesterBuilder::new()
-        .with_empty_in_memory_storage()
         .with_base_system_smart_contracts(base_system_contracts)
         .with_execution_mode(TxExecutionMode::VerifyExecute)
         .build::<VM>();
@@ -27,7 +26,6 @@ pub(crate) fn test_bootloader_out_of_gas<VM: TestedVm>() {
     base_system_contracts.bootloader = get_bootloader("dummy");
 
     let mut vm = VmTesterBuilder::new()
-        .with_empty_in_memory_storage()
         .with_base_system_smart_contracts(base_system_contracts)
         .with_bootloader_gas_limit(10)
         .with_execution_mode(TxExecutionMode::VerifyExecute)

core/lib/multivm/src/versions/testonly/bytecode_publishing.rs

@@ -10,7 +10,6 @@ pub(crate) fn test_bytecode_publishing<VM: TestedVm>() {
     // In this test, we aim to ensure that the contents of the compressed bytecodes
     // are included as part of the L2->L1 long messages
     let mut vm = VmTesterBuilder::new()
-        .with_empty_in_memory_storage()
         .with_execution_mode(TxExecutionMode::VerifyExecute)
         .with_rich_accounts(1)
         .build::<VM>();

core/lib/multivm/src/versions/testonly/circuits.rs

@@ -11,7 +11,6 @@ use crate::{
 /// from hardcoded expected value.
 pub(crate) fn test_circuits<VM: TestedVm>() {
     let mut vm = VmTesterBuilder::new()
-        .with_empty_in_memory_storage()
         .with_rich_accounts(1)
         .with_bootloader_gas_limit(BATCH_COMPUTATIONAL_GAS_LIMIT)
         .with_execution_mode(TxExecutionMode::VerifyExecute)

core/lib/multivm/src/versions/testonly/code_oracle.rs

@@ -35,7 +35,6 @@ pub(crate) fn test_code_oracle<VM: TestedVm>() {
     // In this test, we aim to test whether a simple account interaction (without any fee logic)
     // will work. The account will try to deploy a simple contract from integration tests.
     let mut vm = VmTesterBuilder::new()
-        .with_empty_in_memory_storage()
         .with_execution_mode(TxExecutionMode::VerifyExecute)
         .with_rich_accounts(1)
         .with_custom_contracts(vec![ContractToDeploy::new(
@@ -126,7 +125,6 @@ pub(crate) fn test_code_oracle_big_bytecode<VM: TestedVm>() {
     // In this test, we aim to test whether a simple account interaction (without any fee logic)
     // will work. The account will try to deploy a simple contract from integration tests.
     let mut vm = VmTesterBuilder::new()
-        .with_empty_in_memory_storage()
         .with_execution_mode(TxExecutionMode::VerifyExecute)
         .with_rich_accounts(1)
         .with_custom_contracts(vec![ContractToDeploy::new(

core/lib/multivm/src/versions/testonly/default_aa.rs

@@ -17,7 +17,6 @@ pub(crate) fn test_default_aa_interaction<VM: TestedVm>() {
     // In this test, we aim to test whether a simple account interaction (without any fee logic)
     // will work. The account will try to deploy a simple contract from integration tests.
     let mut vm = VmTesterBuilder::new()
-        .with_empty_in_memory_storage()
         .with_execution_mode(TxExecutionMode::VerifyExecute)
         .with_rich_accounts(1)
         .build::<VM>();