Further additions to v1.10.13 update.

eth/tracers/api.go

@@ -885,27 +885,18 @@ func (api *API) traceTx(ctx context.Context, message core.Message, txctx *Contex
 			// Constuct the JavaScript tracer to execute with
 			if t, err := New(*config.Tracer, txctx); err != nil {
 				return nil, err
+			} else {
+				deadlineCtx, cancel := context.WithTimeout(ctx, timeout)
+				go func() {
+					<-deadlineCtx.Done()
+					if errors.Is(deadlineCtx.Err(), context.DeadlineExceeded) {
+						t.Stop(errors.New("execution timeout"))
+					}
+				}()
+				defer cancel()
+				tracer = t
 			}
-			// Handle timeouts and RPC cancellations
-			deadlineCtx, cancel := context.WithTimeout(ctx, timeout)
-			go func() {
-				<-deadlineCtx.Done()
-				if errors.Is(deadlineCtx.Err(), context.DeadlineExceeded) {
-					t.Stop(errors.New("execution timeout"))
-				}
-			}()
-			defer cancel()
-			tracer = t
 		}
-		// Handle timeouts and RPC cancellations
-		deadlineCtx, cancel := context.WithTimeout(ctx, timeout)
-		go func() {
-			<-deadlineCtx.Done()
-			if deadlineCtx.Err() == context.DeadlineExceeded {
-				tracer.(*Tracer).Stop(errors.New("execution timeout"))
-			}
-		}()
-		defer cancel()
 	default:
 		tracer = vm.NewStructLogger(config.LogConfig)
 	}