feat: Integrate tracers and implement circuits tracer in vm2

Cargo.toml

@@ -217,7 +217,7 @@ zk_evm_1_4_1 = { package = "zk_evm", version = "0.141.0" }
 zk_evm_1_5_0 = { package = "zk_evm", version = "=0.150.4" }
 
 # New VM; pinned to a specific commit because of instability
-vm2 = { git = "https://github.com/matter-labs/vm2.git", rev = "2276b7b5af520fca0477bdafe43781b51896d235" }
+vm2 = { git = "https://github.com/matter-labs/vm2.git", rev = "b6c8d3c011f3f6fde181b7677263c0aa5f228e43" }
 
 # Consensus dependencies.
 zksync_concurrency = "=0.1.0-rc.11"

core/lib/contracts/src/lib.rs

@@ -63,6 +63,8 @@ const LOADNEXT_CONTRACT_FILE: &str =
     "etc/contracts-test-data/artifacts-zk/contracts/loadnext/loadnext_contract.sol/LoadnextContract.json";
 const LOADNEXT_SIMPLE_CONTRACT_FILE: &str =
     "etc/contracts-test-data/artifacts-zk/contracts/loadnext/loadnext_contract.sol/Foo.json";
+const FAILEDCALL_CONTRACT_FILE: &str =
+    "etc/contracts-test-data/artifacts-zk/contracts/failed-call/failed_call.sol/FailedCall.json";
 
 fn home_path() -> &'static Path {
     workspace_dir_or_current_dir()
@@ -184,11 +186,24 @@ pub fn get_loadnext_contract() -> TestContract {
     }
 }
 
+pub fn get_failedcall_contract() -> TestContract {
+    let bytecode = read_bytecode(FAILEDCALL_CONTRACT_FILE);
+    TestContract {
+        bytecode,
+        contract: failedcall_contract(),
+        factory_deps: vec![],
+    }
+}
+
 // Returns loadnext contract and its factory dependencies
 fn loadnext_contract() -> Contract {
     load_contract("etc/contracts-test-data/artifacts-zk/contracts/loadnext/loadnext_contract.sol/LoadnextContract.json")
 }
 
+fn failedcall_contract() -> Contract {
+    load_contract("etc/contracts-test-data/artifacts-zk/contracts/failed-call/failed_call.sol/FailedCall.json")
+}
+
 pub fn deployer_contract() -> Contract {
     load_sys_contract("ContractDeployer")
 }

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

@@ -165,6 +165,11 @@ impl DivergenceErrors {
         let shadow_logs = UniqueStorageLogs::new(&shadow_result.logs.storage_logs);
         self.check_match("logs.storage_logs", &main_logs, &shadow_logs);
         self.check_match("refunds", &main_result.refunds, &shadow_result.refunds);
+        self.check_match(
+            "statistics.circuit_statistic",
+            &main_result.statistics.circuit_statistic,
+            &shadow_result.statistics.circuit_statistic,
+        );
         self.check_match(
             "gas_remaining",
             &main_result.statistics.gas_remaining,

core/lib/multivm/src/versions/vm_fast/tests/tester/transaction_test_info.rs

@@ -7,7 +7,10 @@ use crate::{
         VmExecutionMode, VmExecutionResultAndLogs, VmInterface, VmInterfaceExt,
         VmInterfaceHistoryEnabled, VmRevertReason,
     },
-    vm_fast::Vm,
+    vm_fast::{
+        vm::{CircuitsTracer, World},
+        Vm,
+    },
 };
 
 #[derive(Debug, Clone)]
@@ -185,14 +188,14 @@ impl TransactionTestInfo {
 
 // TODO this doesn't include all the state of ModifiedWorld
 #[derive(Debug, PartialEq)]
-struct VmStateDump {
-    state: vm2::State,
+struct VmStateDump<S: PartialEq> {
+    state: vm2::State<CircuitsTracer, World<S, CircuitsTracer>>,
     storage_writes: Vec<((H160, U256), U256)>,
     events: Box<[vm2::Event]>,
 }
 
-impl<S: ReadStorage> Vm<S> {
-    fn dump_state(&self) -> VmStateDump {
+impl<S: ReadStorage + Clone + PartialEq> Vm<S> {
+    fn dump_state(&self) -> VmStateDump<S> {
         VmStateDump {
             state: self.inner.state.clone(),
             storage_writes: self

core/lib/multivm/src/versions/vm_fast/tests/utils.rs

@@ -17,7 +17,10 @@ use crate::interface::storage::ReadStorage;
 pub(crate) static BASE_SYSTEM_CONTRACTS: Lazy<BaseSystemContracts> =
     Lazy::new(BaseSystemContracts::load_from_disk);
 
-pub(crate) fn verify_required_memory(state: &State, required_values: Vec<(U256, HeapId, u32)>) {
+pub(crate) fn verify_required_memory<T, W>(
+    state: &State<T, W>,
+    required_values: Vec<(U256, HeapId, u32)>,
+) {
     for (required_value, memory_page, cell) in required_values {
         let current_value = state.heaps[memory_page].read_u256(cell * 32);
         assert_eq!(current_value, required_value);