From 5c9d3b41ed5f307015d8d90f9db5b2de98e60e8c Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Wed, 15 Sep 2021 10:31:27 +0200
Subject: [PATCH] eth/tracers: abort evm execution when trace is aborted

---
 eth/tracers/tracer.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eth/tracers/tracer.go b/eth/tracers/tracer.go
index 2c52761f5e4d..e1372b23bc49 100644
--- a/eth/tracers/tracer.go
+++ b/eth/tracers/tracer.go
@@ -600,6 +600,7 @@ func (jst *Tracer) CaptureState(env *vm.EVM, pc uint64, op vm.OpCode, gas, cost
 	// If tracing was interrupted, set the error and stop
 	if atomic.LoadUint32(&jst.interrupt) > 0 {
 		jst.err = jst.reason
+		env.Cancel()
 		return
 	}
 	jst.opWrapper.op = op