fix: correctly adjust depth when calling cheatcodes with --isolate (#8273)

klkvr · web-flow · commit d3572af7be6d · 2024-06-27T16:06:23.000+02:00
fix: correctly adjust depth when calling cheatcodes with --isolate
diff --git a/crates/evm/evm/src/inspectors/stack.rs b/crates/evm/evm/src/inspectors/stack.rs
@@ -702,13 +702,16 @@ impl<'a, DB: DatabaseExt> Inspector<DB> for InspectorStackRefMut<'a> {
             ecx
         );
 
+        ecx.journaled_state.depth += self.in_inner_context as usize;
         if let Some(cheatcodes) = self.cheatcodes.as_deref_mut() {
             if let Some(output) = cheatcodes.call_with_executor(ecx, call, self.inner) {
                 if output.result.result != InstructionResult::Continue {
+                    ecx.journaled_state.depth -= self.in_inner_context as usize;
                     return Some(output)
                 }
             }
         }
+        ecx.journaled_state.depth -= self.in_inner_context as usize;
 
         if self.enable_isolation &&
             call.scheme == CallScheme::Call &&

Original file line number	Diff line number	Diff line change
`@@ -702,13 +702,16 @@ impl<'a, DB: DatabaseExt> Inspector<DB> for InspectorStackRefMut<'a> {`
`702`	`702`	`ecx`
`703`	`703`	`);`
`704`	`704`
	`705`	`+ ecx.journaled_state.depth += self.in_inner_context as usize;`
`705`	`706`	`if let Some(cheatcodes) = self.cheatcodes.as_deref_mut() {`
`706`	`707`	`if let Some(output) = cheatcodes.call_with_executor(ecx, call, self.inner) {`
`707`	`708`	`if output.result.result != InstructionResult::Continue {`
	`709`	`+ ecx.journaled_state.depth -= self.in_inner_context as usize;`
`708`	`710`	`return Some(output)`
`709`	`711`	`}`
`710`	`712`	`}`
`711`	`713`	`}`
	`714`	`+ ecx.journaled_state.depth -= self.in_inner_context as usize;`
`712`	`715`
`713`	`716`	`if self.enable_isolation &&`
`714`	`717`	`call.scheme == CallScheme::Call &&`