Merge pull request #6627 from m-Peter/mpeter/fix-evm-trace-zero-gas-field

[Flow EVM] Move tracing reset to `OnTxEnd` hook

Author: janezpodhostnik

fvm/evm/debug/tracer.go

@@ -165,12 +165,6 @@ func NewSafeTxTracer(ct *CallTracer) *tracers.Tracer {
 		if ct.tracer.OnTxStart != nil {
 			ct.tracer.OnTxStart(vm, tx, from)
 		}
-		// reset tracing to have fresh state
-		if err := ct.ResetTracer(); err != nil {
-			l.Error().Err(err).
-				Msg("failed to reset tracer")
-			return
-		}
 	}
 
 	wrapped.OnTxEnd = func(receipt *types.Receipt, err error) {
@@ -197,6 +191,13 @@ func NewSafeTxTracer(ct *CallTracer) *tracers.Tracer {
 			return
 		}
 		ct.resultsByTxID[receipt.TxHash] = res
+
+		// reset tracing to have fresh state
+		if err := ct.ResetTracer(); err != nil {
+			l.Error().Err(err).
+				Msg("failed to reset tracer")
+			return
+		}
 	}
 
 	wrapped.OnEnter = func(