forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmd/evm: polishes re tracer flags

Browse source
This commit is contained in:
Martin Holst Swende 2023-12-18 10:44:42 +01:00
parent 2133961a84
commit dc79009925
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
2 changed files with 34 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmd/evm/internal/t8ntool/flags.go
View file

@ -28,15 +28,15 @@ import (
var ( var (
TraceFlag = &cli.BoolFlag{ TraceFlag = &cli.BoolFlag{
Name: "trace", Name: "trace",
Usage: "Output full trace logs to a file named: trace-<txIndex>-<txHash>.json or trace-<txIndex>-<txHash>.jsonl", Usage: "Configures the use of the JSON opcode tracer. This tracer emits traces to files as trace-<txIndex>-<txHash>.jsonl",
} }
TraceTracerFlag = &cli.StringFlag{ TraceTracerFlag = &cli.StringFlag{
Name: "trace.tracer", Name: "trace.tracer",
Usage: "The type of tracer. It could be native or js tracers, eg: callTracer,4byteTracer", Usage: "Configures the use of a custom tracer, e.g native or js tracers. Examples are callTracer and 4byteTracer. These tracers emit results into files as trace-<txIndex>-<txHash>.json",
} }
TraceTracerConfigFlag = &cli.StringFlag{ TraceTracerConfigFlag = &cli.StringFlag{
Name: "trace.jsonconfig", Name: "trace.jsonconfig",
Usage: "The configurations of --trace.tracer, in JSON encoded format", Usage: "The configurations for the custom tracer specified by --trace.tracer. If provided, must be in JSON format",
} }
TraceEnableMemoryFlag = &cli.BoolFlag{ TraceEnableMemoryFlag = &cli.BoolFlag{
Name: "trace.memory", Name: "trace.memory",

63
cmd/evm/internal/t8ntool/transition.go
View file

@ -93,39 +93,38 @@ func Transition(ctx *cli.Context) error {
return NewError(ErrorIO, fmt.Errorf("failed creating output basedir: %v", err)) return NewError(ErrorIO, fmt.Errorf("failed creating output basedir: %v", err))
} }
if ctx.Bool(TraceFlag.Name) { if ctx.Bool(TraceFlag.Name) { // JSON opcode tracing
if ctx.IsSet(TraceTracerFlag.Name) { // Configure the EVM logger
var config json.RawMessage logConfig := &logger.Config{
if ctx.IsSet(TraceTracerConfigFlag.Name) { DisableStack: ctx.Bool(TraceDisableStackFlag.Name),
config = []byte(ctx.String(TraceTracerConfigFlag.Name)) EnableMemory: ctx.Bool(TraceEnableMemoryFlag.Name),
} EnableReturnData: ctx.Bool(TraceEnableReturnDataFlag.Name),
getTracer = func(txIndex int, txHash common.Hash) (vm.EVMLogger, error) { Debug: true,
traceFile, err := os.Create(path.Join(baseDir, fmt.Sprintf("trace-%d-%v.json", txIndex, txHash.String())))
if err != nil {
return nil, NewError(ErrorIO, fmt.Errorf("failed creating trace-file: %v", err))
}
tracer, err := tracers.DefaultDirectory.New(ctx.String(TraceTracerFlag.Name), nil, config)
if err != nil {
return nil, NewError(ErrorConfig, fmt.Errorf("failed instantiating tracer: %w", err))
}
return &traceWriter{tracer, traceFile}, nil
}
} else {
// Configure the EVM logger
logConfig := &logger.Config{
DisableStack: ctx.Bool(TraceDisableStackFlag.Name),
EnableMemory: ctx.Bool(TraceEnableMemoryFlag.Name),
EnableReturnData: ctx.Bool(TraceEnableReturnDataFlag.Name),
Debug: true,
}
getTracer = func(txIndex int, txHash common.Hash) (vm.EVMLogger, error) {
traceFile, err := os.Create(path.Join(baseDir, fmt.Sprintf("trace-%d-%v.jsonl", txIndex, txHash.String())))
if err != nil {
return nil, NewError(ErrorIO, fmt.Errorf("failed creating trace-file: %v", err))
}
return &traceWriter{logger.NewJSONLogger(logConfig, traceFile), traceFile}, nil
}
} }
getTracer = func(txIndex int, txHash common.Hash) (vm.EVMLogger, error) {
traceFile, err := os.Create(path.Join(baseDir, fmt.Sprintf("trace-%d-%v.jsonl", txIndex, txHash.String())))
if err != nil {
return nil, NewError(ErrorIO, fmt.Errorf("failed creating trace-file: %v", err))
}
return &traceWriter{logger.NewJSONLogger(logConfig, traceFile), traceFile}, nil
}
} else if ctx.IsSet(TraceTracerFlag.Name) {
var config json.RawMessage
if ctx.IsSet(TraceTracerConfigFlag.Name) {
config = []byte(ctx.String(TraceTracerConfigFlag.Name))
}
getTracer = func(txIndex int, txHash common.Hash) (vm.EVMLogger, error) {
traceFile, err := os.Create(path.Join(baseDir, fmt.Sprintf("trace-%d-%v.json", txIndex, txHash.String())))
if err != nil {
return nil, NewError(ErrorIO, fmt.Errorf("failed creating trace-file: %v", err))
}
tracer, err := tracers.DefaultDirectory.New(ctx.String(TraceTracerFlag.Name), nil, config)
if err != nil {
return nil, NewError(ErrorConfig, fmt.Errorf("failed instantiating tracer: %w", err))
}
return &traceWriter{tracer, traceFile}, nil
}
} }
// We need to load three things: alloc, env and transactions. May be either in // We need to load three things: alloc, env and transactions. May be either in
// stdin input or in files. // stdin input or in files.