Merge pull request #24867 from holiman/no_preop_memexpand

core/vm: for tracing, do not report post-op memory

Merge pull request #24867 from holiman/no_preop_memexpand
core/vm: for tracing, do not report post-op memory
64d6c787 · Péter Szilágyi · GitHub · c9e324ce · 97f308a9 · 64d6c787
Unverified Commit 64d6c787 authored May 24, 2022 by Péter Szilágyi Committed by GitHub May 24, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

interpreter.go core/vm/interpreter.go +6 -2

No files found.
--- a/core/vm/interpreter.go
+++ b/core/vm/interpreter.go
@@ -223,11 +223,15 @@ func (in *EVMInterpreter) Run(contract *Contract, input []byte, readOnly bool) (
 			if err != nil || !contract.UseGas(dynamicCost) {
 				return nil, ErrOutOfGas
 			}
+			// Do tracing before memory expansion
+			if in.cfg.Debug {
+				in.cfg.Tracer.CaptureState(pc, op, gasCopy, cost, callContext, in.returnData, in.evm.depth, err)
+				logged = true
+			}
 			if memorySize > 0 {
 				mem.Resize(memorySize)
 			}
-		}
+		} else if in.cfg.Debug {
-		if in.cfg.Debug {
 			in.cfg.Tracer.CaptureState(pc, op, gasCopy, cost, callContext, in.returnData, in.evm.depth, err)
 			logged = true
 		}