From 06b7c4bb3ae78b53a069bb57f2714125a2b06e6f Mon Sep 17 00:00:00 2001 From: Matthieu Vachon Date: Tue, 25 Feb 2025 15:17:47 -0500 Subject: [PATCH] Make `firehose` the default value for `vmtrace` in our fork --- cmd/utils/flags.go | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index f079df83b9..6c0fd8b7a4 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -520,6 +520,7 @@ var ( Name: "vmtrace", Usage: "Name of tracer which should record internal VM operations (costly)", Category: flags.VMCategory, + Value: "firehose", } VMTraceJsonConfigFlag = &cli.StringFlag{ Name: "vmtrace.jsonconfig", @@ -1828,11 +1829,9 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) { Fatalf("Failed to set KZG library implementation to %s: %v", ctx.String(CryptoKZGFlag.Name), err) } // VM tracing config. - if ctx.IsSet(VMTraceFlag.Name) { - if name := ctx.String(VMTraceFlag.Name); name != "" { - cfg.VMTrace = name - cfg.VMTraceJsonConfig = ctx.String(VMTraceJsonConfigFlag.Name) - } + if name := ctx.String(VMTraceFlag.Name); name != "" { + cfg.VMTrace = name + cfg.VMTraceJsonConfig = ctx.String(VMTraceJsonConfigFlag.Name) } } @@ -2174,15 +2173,13 @@ func MakeChain(ctx *cli.Context, stack *node.Node, readonly bool) (*core.BlockCh vmcfg := vm.Config{ EnablePreimageRecording: ctx.Bool(VMEnableDebugFlag.Name), } - if ctx.IsSet(VMTraceFlag.Name) { - if name := ctx.String(VMTraceFlag.Name); name != "" { - config := json.RawMessage(ctx.String(VMTraceJsonConfigFlag.Name)) - t, err := tracers.LiveDirectory.New(name, config) - if err != nil { - Fatalf("Failed to create tracer %q: %v", name, err) - } - vmcfg.Tracer = t + if name := ctx.String(VMTraceFlag.Name); name != "" { + config := json.RawMessage(ctx.String(VMTraceJsonConfigFlag.Name)) + t, err := tracers.LiveDirectory.New(name, config) + if err != nil { + Fatalf("Failed to create tracer %q: %v", name, err) } + vmcfg.Tracer = t } // Disable transaction indexing/unindexing by default. chain, err := core.NewBlockChain(chainDb, cache, gspec, nil, engine, vmcfg, nil)