resolve conflict

matter-labs · Nov 1, 2024 · 9d4fb3e · 9d4fb3e
1 parent b3fd549
commit 9d4fb3e
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/lib/multivm/src/versions/vm_fast/evm_deploy_tracer.rs b/core/lib/multivm/src/versions/vm_fast/evm_deploy_tracer.rs
@@ -6,7 +6,7 @@ use zksync_system_constants::{CONTRACT_DEPLOYER_ADDRESS, KNOWN_CODES_STORAGE_ADD
 use zksync_types::U256;
 use zksync_utils::{bytecode::hash_evm_bytecode, h256_to_u256};
 use zksync_vm2::interface::{
-    CallframeInterface, CallingMode, GlobalStateInterface, Opcode, OpcodeType, Tracer,
+    CallframeInterface, CallingMode, GlobalStateInterface, Opcode, OpcodeType, ShouldStop, Tracer,
 };
 
 use super::utils::read_fat_pointer;
@@ -76,9 +76,13 @@ impl EvmDeployTracer {
 
 impl Tracer for EvmDeployTracer {
     #[inline(always)]
-    fn after_instruction<OP: OpcodeType, S: GlobalStateInterface>(&mut self, state: &mut S) {
+    fn after_instruction<OP: OpcodeType, S: GlobalStateInterface>(
+        &mut self,
+        state: &mut S,
+    ) -> ShouldStop {
         if matches!(OP::VALUE, Opcode::FarCall(CallingMode::Normal)) {
             self.handle_far_call(state);
         }
+        ShouldStop::Continue
     }
 }