Merge pull request #24867 from holiman/no_preop_memexpand

core/vm: for tracing, do not report post-op memory
ethereum · May 24, 2022 · 64d6c78 · 64d6c78
2 parents c9e324c + 97f308a
commit 64d6c78
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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)
  }
- }
- if in.cfg.Debug {
+ } else if in.cfg.Debug {
  in.cfg.Tracer.CaptureState(pc, op, gasCopy, cost, callContext, in.returnData, in.evm.depth, err)
  logged = true
  }