fix(Inspector): frame_end called multiple times (#2037)

bluealloy · Jan 28, 2025 · 249531c · 249531c
1 parent 03f84f3
commit 249531c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/crates/handler/interface/src/item_or_result.rs b/crates/handler/interface/src/item_or_result.rs
@@ -1,5 +1,6 @@
 use crate::Frame;
 
+#[derive(Clone, Debug)]
 pub enum ItemOrResult<ITEM, RES> {
     Item(ITEM),
     Result(RES),

diff --git a/crates/inspector/src/inspector.rs b/crates/inspector/src/inspector.rs
@@ -266,14 +266,9 @@ where
             .handler
             .frame_init_first(context, frame_context, frame_input);
 
-        match &mut ret {
-            Ok(ItemOrResult::Result(res)) => {
-                context.frame_end(res);
-            }
-            Ok(ItemOrResult::Item(frame)) => {
-                context.initialize_interp(frame.interpreter());
-            }
-            _ => (),
+        // only if new frame is created call initialize_interp hook.
+        if let Ok(ItemOrResult::Item(frame)) = &mut ret {
+            context.initialize_interp(frame.interpreter());
         }
         ret
     }
@@ -297,14 +292,10 @@ where
         let mut ret = self
             .handler
             .frame_init(frame, context, frame_context, frame_input);
-        match &mut ret {
-            Ok(ItemOrResult::Result(res)) => {
-                context.frame_end(res);
-            }
-            Ok(ItemOrResult::Item(frame)) => {
-                context.initialize_interp(frame.interpreter());
-            }
-            _ => (),
+
+        // only if new frame is created call initialize_interp hook.
+        if let Ok(ItemOrResult::Item(frame)) = &mut ret {
+            context.initialize_interp(frame.interpreter());
         }
         ret
     }

diff --git a/crates/precompile/src/bn128.rs b/crates/precompile/src/bn128.rs
@@ -283,7 +283,7 @@ mod tests {
         .unwrap();
 
         let res = run_add(&input, BYZANTIUM_ADD_GAS_COST, 499);
-        println!("{:?}", res);
+
         assert!(matches!(
             res,
             Err(PrecompileErrors::Error(PrecompileError::OutOfGas))