cmd/evm/internal/t8ntool: simplify

cmd/evm/internal/t8ntool/execution.go

@@ -33,7 +33,6 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
-	"github.com/ethereum/go-ethereum/eth/tracers"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/params"
@@ -129,8 +128,7 @@ type rejectedTx struct {
 
 // Apply applies a set of transactions to a pre-state
 func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
-	txIt txIterator, miningReward int64,
+	txIt txIterator, miningReward int64) (*state.StateDB, *ExecutionResult, []byte, error) {
-	tracer *tracers.Tracer) (*state.StateDB, *ExecutionResult, []byte, error) {
 	// Capture errors for BLOCKHASH operation, if we haven't been supplied the
 	// required blockhashes
 	var hashError error
@@ -239,19 +237,13 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
 				continue
 			}
 		}
-		// TODO (rjl493456442) it's a bit weird to reset the tracer in the
-		// middle of block execution, please improve it somehow.
-		if tracer != nil {
-			evm.SetTracer(tracer.Hooks)
-		}
 		statedb.SetTxContext(tx.Hash(), txIndex)
-
 		var (
 			snapshot = statedb.Snapshot()
 			prevGas  = gaspool.Gas()
 		)
-		if tracer != nil && tracer.OnTxStart != nil {
+		if evm.Config.Tracer != nil && evm.Config.Tracer.OnTxStart != nil {
-			tracer.OnTxStart(evm.GetVMContext(), tx, msg.From)
+			evm.Config.Tracer.OnTxStart(evm.GetVMContext(), tx, msg.From)
 		}
 		// (ret []byte, usedGas uint64, failed bool, err error)
 		msgResult, err := core.ApplyMessage(evm, msg, gaspool)
@@ -260,8 +252,8 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
 			log.Info("rejected tx", "index", i, "hash", tx.Hash(), "from", msg.From, "error", err)
 			rejectedTxs = append(rejectedTxs, &rejectedTx{i, err.Error()})
 			gaspool.SetGas(prevGas)
-			if tracer != nil && tracer.OnTxEnd != nil {
+			if evm.Config.Tracer != nil && evm.Config.Tracer.OnTxEnd != nil {
-				tracer.OnTxEnd(nil, err)
+				evm.Config.Tracer.OnTxEnd(nil, err)
 			}
 			continue
 		}
@@ -305,8 +297,8 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
 			//receipt.BlockNumber
 			receipt.TransactionIndex = uint(txIndex)
 			receipts = append(receipts, receipt)
-			if tracer != nil && tracer.Hooks.OnTxEnd != nil {
+			if evm.Config.Tracer != nil && evm.Config.Tracer.OnTxEnd != nil {
-				tracer.Hooks.OnTxEnd(receipt, nil)
+				evm.Config.Tracer.OnTxEnd(receipt, nil)
 			}
 		}
 

cmd/evm/internal/t8ntool/file_tracer.go

@@ -134,18 +134,16 @@ func (l *fileWritingTracer) Tracer() *tracers.Tracer {
 	hooks := &tracing.Hooks{
 		OnTxStart: l.OnTxStartJSONL,
 		OnTxEnd:   l.OnTxEnd,
-		OnSystemCallStart: func() {
+		// intentional no-op: we instantiate the l.inner on tx start, which has
-			if l.inner.OnSystemCallStart != nil {
+		// not yet happened at this point
-				l.inner.OnSystemCallStart()
+		//OnSystemCallStart: func() {},
-			}
-		},
 		OnEnter: func(depth int, typ byte, from common.Address, to common.Address, input []byte, gas uint64, value *big.Int) {
-			if l.inner.OnEnter != nil {
+			if l.inner != nil && l.inner.OnEnter != nil {
 				l.inner.OnEnter(depth, typ, from, to, input, gas, value)
 			}
 		},
 		OnExit: func(depth int, output []byte, gasUsed uint64, err error, reverted bool) {
-			if l.inner.OnExit != nil {
+			if l.inner != nil && l.inner.OnExit != nil {
 				l.inner.OnExit(depth, output, gasUsed, err, reverted)
 			}
 		},
@@ -155,7 +153,7 @@ func (l *fileWritingTracer) Tracer() *tracers.Tracer {
 			}
 		},
 		OnFault: func(pc uint64, op byte, gas, cost uint64, scope tracing.OpContext, depth int, err error) {
-			if l.inner.OnFault != nil {
+			if l.inner != nil && l.inner.OnFault != nil {
 				l.inner.OnFault(pc, op, gas, cost, scope, depth, err)
 			}
 		},

cmd/evm/internal/t8ntool/transition.go

@@ -30,7 +30,6 @@ import (
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/ethereum/go-ethereum/eth/tracers"
 	"github.com/ethereum/go-ethereum/eth/tracers/logger"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/params"
@@ -150,21 +149,21 @@ func Transition(ctx *cli.Context) error {
 	}
 
 	// Configure tracer
-	var tracer *tracers.Tracer
 	if ctx.IsSet(TraceTracerFlag.Name) { // Custom tracing
 		config := json.RawMessage(ctx.String(TraceTracerConfigFlag.Name))
-		tracer = newFileWritingCustomTracer(baseDir, ctx.String(TraceTracerFlag.Name), config, chainConfig).Tracer()
+		tracer := newFileWritingCustomTracer(baseDir, ctx.String(TraceTracerFlag.Name), config, chainConfig).Tracer()
+		vmConfig.Tracer = tracer.Hooks
 	} else if ctx.Bool(TraceFlag.Name) { // JSON opcode tracing
 		logConfig := &logger.Config{
 			DisableStack:     ctx.Bool(TraceDisableStackFlag.Name),
 			EnableMemory:     ctx.Bool(TraceEnableMemoryFlag.Name),
 			EnableReturnData: ctx.Bool(TraceEnableReturnDataFlag.Name),
 		}
-		tracer = newFileWritingTracer(baseDir, logConfig, ctx.Bool(TraceEnableCallFramesFlag.Name)).Tracer()
+		tracer := newFileWritingTracer(baseDir, logConfig, ctx.Bool(TraceEnableCallFramesFlag.Name)).Tracer()
+		vmConfig.Tracer = tracer.Hooks
 	}
-
 	// Run the test and aggregate the result
-	s, result, body, err := prestate.Apply(vmConfig, chainConfig, txIt, ctx.Int64(RewardFlag.Name), tracer)
+	s, result, body, err := prestate.Apply(vmConfig, chainConfig, txIt, ctx.Int64(RewardFlag.Name))
 	if err != nil {
 		return err
 	}