From 9e3ddadf2f2fdfd0a07f7247bdf9561369d31a0a Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Tue, 3 Dec 2024 09:45:22 +0100
Subject: [PATCH] cmd/evm: try to consolidate evm output switches

---
 cmd/evm/internal/t8ntool/transition.go |  1 -
 cmd/evm/main.go                        |  3 +++
 cmd/evm/runner.go                      | 16 ++--------------
 eth/tracers/api.go                     |  1 -
 eth/tracers/logger/logger.go           | 15 +++++++--------
 5 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go
index d8665d22d3..231576fa42 100644
--- a/cmd/evm/internal/t8ntool/transition.go
+++ b/cmd/evm/internal/t8ntool/transition.go
@@ -97,7 +97,6 @@ func Transition(ctx *cli.Context) error {
 			DisableStack:     ctx.Bool(TraceDisableStackFlag.Name),
 			EnableMemory:     ctx.Bool(TraceEnableMemoryFlag.Name),
 			EnableReturnData: ctx.Bool(TraceEnableReturnDataFlag.Name),
-			Debug:            true,
 		}
 		getTracer = func(txIndex int, txHash common.Hash, _ *params.ChainConfig) (*tracers.Tracer, io.WriteCloser, error) {
 			traceFile, err := os.Create(filepath.Join(baseDir, fmt.Sprintf("trace-%d-%v.jsonl", txIndex, txHash.String())))
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index 6e0345ce63..e427e8d94e 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -243,6 +243,9 @@ func tracerFromFlags(ctx *cli.Context) *tracing.Hooks {
 		return logger.NewStreamingStructLogger(config, os.Stderr).Hooks()
 	case ctx.Bool(TraceFlag.Name) && ctx.String(TraceFormatFlag.Name) == "json":
 		return logger.NewJSONLogger(config, os.Stderr)
+	case ctx.Bool(TraceFlag.Name) &&
+		(ctx.String(TraceFormatFlag.Name) == "md" || ctx.String(TraceFormatFlag.Name) == "markdown"):
+		return logger.NewMarkdownLogger(config, os.Stderr).Hooks()
 	case ctx.Bool(MachineFlag.Name):
 		return logger.NewJSONLogger(config, os.Stderr)
 	case ctx.Bool(DebugFlag.Name):
diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go
index 59ad8687d5..387621cad2 100644
--- a/cmd/evm/runner.go
+++ b/cmd/evm/runner.go
@@ -39,7 +39,6 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/core/vm/runtime"
-	"github.com/ethereum/go-ethereum/eth/tracers/logger"
 	"github.com/ethereum/go-ethereum/internal/flags"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/triedb"
@@ -66,6 +65,7 @@ var runCommand = &cli.Command{
 		SenderFlag,
 		ValueFlag,
 		StatDumpFlag,
+		DumpFlag,
 	}, traceFlags),
 }
 
@@ -197,13 +197,6 @@ func timedExec(bench bool, execFunc func() ([]byte, uint64, error)) ([]byte, exe
 }
 
 func runCmd(ctx *cli.Context) error {
-	logconfig := &logger.Config{
-		EnableMemory:     !ctx.Bool(TraceDisableMemoryFlag.Name),
-		DisableStack:     ctx.Bool(TraceDisableStackFlag.Name),
-		DisableStorage:   ctx.Bool(TraceDisableStorageFlag.Name),
-		EnableReturnData: !ctx.Bool(TraceDisableReturnDataFlag.Name),
-		Debug:            ctx.Bool(DebugFlag.Name),
-	}
 
 	var (
 		tracer      *tracing.Hooks
@@ -215,12 +208,7 @@ func runCmd(ctx *cli.Context) error {
 		blobHashes  []common.Hash  // TODO (MariusVanDerWijden) implement blob hashes in state tests
 		blobBaseFee = new(big.Int) // TODO (MariusVanDerWijden) implement blob fee in state tests
 	)
-	if ctx.Bool(MachineFlag.Name) {
-		tracer = logger.NewJSONLogger(logconfig, os.Stdout)
-	} else if ctx.Bool(DebugFlag.Name) {
-		tracer = logger.NewStreamingStructLogger(logconfig, os.Stderr).Hooks()
-	}
-
+	tracer = tracerFromFlags(ctx)
 	initialGas := ctx.Uint64(GasFlag.Name)
 	genesisConfig := new(core.Genesis)
 	genesisConfig.GasLimit = initialGas
diff --git a/eth/tracers/api.go b/eth/tracers/api.go
index c15c5c4eb2..c9bf5a4223 100644
--- a/eth/tracers/api.go
+++ b/eth/tracers/api.go
@@ -758,7 +758,6 @@ func (api *API) standardTraceBlockToFile(ctx context.Context, block *types.Block
 		logConfig = config.Config
 		txHash = config.TxHash
 	}
-	logConfig.Debug = true
 
 	// Execute transaction, either tracing all or just the requested one
 	var (
diff --git a/eth/tracers/logger/logger.go b/eth/tracers/logger/logger.go
index 51b1512d03..dc9e6e62b7 100644
--- a/eth/tracers/logger/logger.go
+++ b/eth/tracers/logger/logger.go
@@ -45,9 +45,7 @@ type Config struct {
 	DisableStack     bool // disable stack capture
 	DisableStorage   bool // disable storage capture
 	EnableReturnData bool // enable return data capture
-	Debug            bool // print output during capture end
 	Limit            int  // maximum size of output, but zero means unlimited
-
 	// Chain overrides, can be used to execute a trace using future fork rules
 	Overrides *params.ChainConfig `json:"overrides,omitempty"`
 }
@@ -324,12 +322,13 @@ func (l *StructLogger) OnExit(depth int, output []byte, gasUsed uint64, err erro
 	}
 	l.output = output
 	l.err = err
-	if l.cfg.Debug {
-		fmt.Printf("%#x\n", output)
-		if err != nil {
-			fmt.Printf(" error: %v\n", err)
-		}
-	}
+	// TODO @holiman, should we output the per-scope output?
+	//if l.cfg.Debug {
+	//	fmt.Printf("%#x\n", output)
+	//	if err != nil {
+	//		fmt.Printf(" error: %v\n", err)
+	//	}
+	//}
 }
 
 func (l *StructLogger) GetResult() (json.RawMessage, error) {