feat: vm2 tracers can access storage

matter-labs · Oct 16, 2024 · 4fd710c · 4fd710c
1 parent 525ba9f
commit 4fd710c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -230,7 +230,7 @@ zk_evm_1_4_1 = { package = "zk_evm", version = "0.141" }
 zk_evm_1_5_0 = { package = "zk_evm", version = "=0.150.5" }
 
 # New VM; pinned to a specific commit because of instability
-zksync_vm2 = { git = "https://github.com/matter-labs/vm2.git", rev = "a233d44bbe61dc6a758a754c3b78fe4f83e56699" }
+zksync_vm2 = { git = "https://github.com/matter-labs/vm2.git", rev = "f27d9ff086032ab9c382e0baa7244bd247d10e49" }
 
 # Consensus dependencies.
 zksync_concurrency = "=0.5.0"

diff --git a/core/lib/multivm/src/versions/vm_fast/circuits_tracer.rs b/core/lib/multivm/src/versions/vm_fast/circuits_tracer.rs
@@ -24,7 +24,11 @@ pub struct CircuitsTracer {
 }
 
 impl Tracer for CircuitsTracer {
-    fn after_instruction<OP: OpcodeType, S: StateInterface>(&mut self, _state: &mut S) {
+    fn after_instruction<OP: OpcodeType, S: StateInterface>(
+        &mut self,
+        _: &mut S,
+        _: &mut S::StorageInterface,
+    ) {
         self.main_vm_cycles += 1;
 
         match OP::VALUE {

diff --git a/core/tests/vm-benchmark/src/vm.rs b/core/tests/vm-benchmark/src/vm.rs
@@ -107,6 +107,7 @@ impl<Tr: vm_fast::Tracer + Default + 'static> BenchmarkingVmFactory for Fast<Tr>
             >(
                 &mut self,
                 _: &mut S,
+                _: &mut S::StorageInterface,
             ) {
                 self.0 += 1;
             }