Era vm integration v2

.github/workflows/ci-core-reusable.yml

@@ -63,7 +63,11 @@ jobs:
         run: ci_run yarn l1-contracts test
 
       - name: Rust unit tests
-        run: ci_run zk test rust
+        run: |
+          ci_run zk test rust
+          # Benchmarks are not tested by `cargo nextest` unless specified explicitly, and even then `criterion` harness is incompatible
+          # with how `cargo nextest` runs tests. Thus, we run criterion-based benchmark tests manually.
+          ci_run zk f cargo test --release -p vm-benchmark --bench criterion --bench fill_bootloader
 
   loadtest:
     runs-on: [matterlabs-ci-runner]

Cargo.toml

@@ -172,7 +172,7 @@ strum = "0.26"
 tempfile = "3.0.2"
 test-casing = "0.1.2"
 test-log = "0.2.15"
-thiserror = "1"
+thiserror = "1.0.62"
 thread_local = "1.1"
 tikv-jemallocator = "0.5"
 tiny-keccak = "2"
@@ -298,3 +298,6 @@ zksync_contract_verification_server = { version = "0.1.0", path = "core/node/con
 zksync_node_api_server = { version = "0.1.0", path = "core/node/api_server" }
 zksync_tee_verifier_input_producer = { version = "0.1.0", path = "core/node/tee_verifier_input_producer" }
 zksync_base_token_adjuster = { version = "0.1.0", path = "core/node/base_token_adjuster" }
+
+[patch.crates-io]
+iai = { git = "https://github.com/lambdaclass/iai", branch = "fix/valgrind-forward-compatibility" }

core/lib/multivm/Cargo.toml

@@ -17,6 +17,8 @@ zk_evm_1_4_0.workspace = true
 zk_evm_1_3_3.workspace = true
 zk_evm_1_3_1.workspace = true
 vm2.workspace = true
+era_vm = {path = "../../../../"}
+# era_vm = {git = "https://github.com/lambdaclass/era_vm.git", branch = "main"}
 
 circuit_sequencer_api_1_3_3.workspace = true
 circuit_sequencer_api_1_4_0.workspace = true

core/lib/multivm/src/glue/tracers/mod.rs

@@ -30,7 +30,7 @@
 //! - Add this trait as a trait bound for `T` in `MultiVMTracer` implementation.
 //! - Implement the trait for `T` with a bound to `VmTracer` for a specific version.
 
-use zksync_state::WriteStorage;
+use zksync_state::{ImmutableStorageView, WriteStorage};
 
 use crate::{tracers::old_tracers::OldTracers, HistoryMode};
 
@@ -44,6 +44,7 @@ pub trait MultiVMTracer<S: WriteStorage, H: HistoryMode>:
     + IntoVm1_4_1IntegrationTracer<S, H>
     + IntoVm1_4_2IntegrationTracer<S, H>
     + IntoOldVmTracer
+    + IntoEraVmTracer<S, H>
 {
     fn into_tracer_pointer(self) -> MultiVmTracerPointer<S, H>
     where
@@ -57,6 +58,10 @@ pub trait IntoLatestTracer<S: WriteStorage, H: HistoryMode> {
     fn latest(&self) -> crate::vm_latest::TracerPointer<S, H::Vm1_5_0>;
 }
 
+pub trait IntoEraVmTracer<S: WriteStorage, H: HistoryMode> {
+    fn into_era_vm(&self) -> Box<dyn crate::era_vm::tracers::traits::VmTracer<S>>;
+}
+
 pub trait IntoVmVirtualBlocksTracer<S: WriteStorage, H: HistoryMode> {
     fn vm_virtual_blocks(
         &self,
@@ -106,6 +111,17 @@ where
     }
 }
 
+impl<S, T, H> IntoEraVmTracer<S, H> for T
+where
+    S: WriteStorage,
+    H: HistoryMode,
+    T: crate::era_vm::tracers::traits::VmTracer<S> + Clone + 'static,
+{
+    fn into_era_vm(&self) -> Box<dyn crate::era_vm::tracers::traits::VmTracer<S>> {
+        Box::new(self.clone())
+    }
+}
+
 impl<S, T, H> IntoVmVirtualBlocksTracer<S, H> for T
 where
     S: WriteStorage,
@@ -180,6 +196,7 @@ where
         + IntoVmBoojumIntegrationTracer<S, H>
         + IntoVm1_4_1IntegrationTracer<S, H>
         + IntoVm1_4_2IntegrationTracer<S, H>
-        + IntoOldVmTracer,
+        + IntoOldVmTracer
+        + IntoEraVmTracer<S, H>,
 {
 }

core/lib/multivm/src/lib.rs

@@ -12,8 +12,8 @@ pub use crate::{
         tracers::{MultiVMTracer, MultiVmTracerPointer},
     },
     versions::{
-        vm_1_3_2, vm_1_4_1, vm_1_4_2, vm_boojum_integration, vm_fast, vm_latest, vm_m5, vm_m6,
-        vm_refunds_enhancement, vm_virtual_blocks,
+        era_vm, vm_1_3_2, vm_1_4_1, vm_1_4_2, vm_boojum_integration, vm_fast, vm_latest, vm_m5,
+        vm_m6, vm_refunds_enhancement, vm_virtual_blocks,
     },
     vm_instance::VmInstance,
 };