Add bootloader hook fn to tracer

core/lib/multivm/src/versions/era_vm/hook.rs

@@ -1,6 +1,6 @@
 #[derive(Debug)]
 
-pub(crate) enum Hook {
+pub enum Hook {
     AccountValidationEntered,
     PaymasterValidationEntered,
     AccountValidationExited,

core/lib/multivm/src/versions/era_vm/tracers/traits.rs

@@ -1,10 +1,14 @@
 pub use era_vm::tracers::tracer::Tracer;
 use zksync_state::ReadStorage;
+use zksync_types::U256;
 
+use crate::era_vm::hook::Hook;
 pub use crate::{era_vm::vm::Vm, vm_latest::ExecutionResult};
 
 pub trait VmTracer<S: ReadStorage>: Tracer {
     fn before_bootloader_execution(&mut self, _state: &mut Vm<S>) {}
 
     fn after_bootloader_execution(&mut self, _state: &mut Vm<S>, _stop_reason: ExecutionResult) {}
+
+    fn bootloader_hook_call(&mut self, _state: &mut Vm<S>, _hook: Hook, _hook_params: &[U256; 3]) {}
 }

core/lib/multivm/src/versions/era_vm/vm.rs

@@ -219,6 +219,8 @@ impl<S: ReadStorage + 'static> Vm<S> {
                 }
             };
 
+            tracer.bootloader_hook_call(self, Hook::from_u32(result), &self.get_hook_params());
+
             match Hook::from_u32(result) {
                 Hook::PaymasterValidationEntered => {
                     // unused
@@ -372,15 +374,6 @@ impl<S: ReadStorage + 'static> Vm<S> {
         (stop_reason, refunds)
     }
 
-    fn get_vm_hook_params(&self, heap: &era_vm::execution::Heap) -> Vec<U256> {
-        (get_vm_hook_start_position_latest()..get_vm_hook_start_position_latest() + 2)
-            .map(|word| {
-                let res = heap.read((word * 32) as u32);
-                res
-            })
-            .collect()
-    }
-
     pub(crate) fn insert_bytecodes<'a>(&mut self, bytecodes: impl IntoIterator<Item = &'a [u8]>) {
         for code in bytecodes {
             let mut program_code = vec![];