From 4320b66398b7b5c583c02637c83a191408f466f6 Mon Sep 17 00:00:00 2001 From: Valentin Staykov <79150443+V-Staykov@users.noreply.github.com> Date: Wed, 18 Dec 2024 10:35:04 +0200 Subject: [PATCH] fix: verbosity flag set (#1556) --- eth/ethconfig/config_zkevm.go | 4 ++-- eth/stagedsync/stage_execute_zkevm.go | 2 +- turbo/app/make_app_zkevm.go | 8 ++++---- turbo/cli/flags_zkevm.go | 15 ++++++++++++--- turbo/debug/flags.go | 1 - turbo/jsonrpc/eth_api.go | 8 ++++---- turbo/logging/logging.go | 20 ++++++++++---------- zk/stages/stage_sequence_execute.go | 2 +- zk/txpool/pool.go | 5 ++--- zk/txpool/pool_zk.go | 2 +- 10 files changed, 37 insertions(+), 30 deletions(-) diff --git a/eth/ethconfig/config_zkevm.go b/eth/ethconfig/config_zkevm.go index f6796a0c37a..4dde53db727 100644 --- a/eth/ethconfig/config_zkevm.go +++ b/eth/ethconfig/config_zkevm.go @@ -5,7 +5,7 @@ import ( "github.com/c2h5oh/datasize" "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/zk/utils" + "github.com/ledgerwatch/log/v3" ) type Zk struct { @@ -104,7 +104,7 @@ type Zk struct { WitnessContractInclusion []common.Address RejectLowGasPriceTransactions bool RejectLowGasPriceTolerance float64 - LogLevel utils.LogLevel + LogLevel log.Lvl } var DefaultZkConfig = &Zk{} diff --git a/eth/stagedsync/stage_execute_zkevm.go b/eth/stagedsync/stage_execute_zkevm.go index 617c12dec84..6994881c4ca 100644 --- a/eth/stagedsync/stage_execute_zkevm.go +++ b/eth/stagedsync/stage_execute_zkevm.go @@ -85,7 +85,7 @@ func SpawnExecuteBlocksStageZk(s *StageState, u Unwinder, tx kv.RwTx, toBlock ui batch.Close() }() - if err := utils.UpdateZkEVMBlockCfg(cfg.chainConfig, hermezDb, s.LogPrefix(), cfg.zk.LogLevel.IsTraceLogLevelSet()); err != nil { + if err := utils.UpdateZkEVMBlockCfg(cfg.chainConfig, hermezDb, s.LogPrefix(), cfg.zk.LogLevel == log.LvlTrace); err != nil { return fmt.Errorf("UpdateZkEVMBlockCfg: %w", err) } diff --git a/turbo/app/make_app_zkevm.go b/turbo/app/make_app_zkevm.go index 190b54b845f..383eb5b678e 100644 --- a/turbo/app/make_app_zkevm.go +++ b/turbo/app/make_app_zkevm.go @@ -42,15 +42,15 @@ func MakeApp_zkEvm(name string, action cli.ActionFunc, cliFlags []cli.Flag) *cli } } + if _, _, _, err := debug.Setup(context, true); err != nil { + return err + } + // run default action return action(context) } app.Flags = appFlags(cliFlags) - app.Before = func(ctx *cli.Context) error { - _, _, _, err := debug.Setup(ctx, true) - return err - } app.After = func(ctx *cli.Context) error { debug.Exit() return nil diff --git a/turbo/cli/flags_zkevm.go b/turbo/cli/flags_zkevm.go index 7bf8eb476ed..0d1f782ddfb 100644 --- a/turbo/cli/flags_zkevm.go +++ b/turbo/cli/flags_zkevm.go @@ -3,7 +3,6 @@ package cli import ( "fmt" "math" - "os" "strconv" "strings" "time" @@ -11,8 +10,11 @@ import ( libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/ledgerwatch/erigon/cmd/utils" "github.com/ledgerwatch/erigon/eth/ethconfig" + "github.com/ledgerwatch/erigon/turbo/logging" "github.com/ledgerwatch/erigon/zk/sequencer" utils2 "github.com/ledgerwatch/erigon/zk/utils" + "github.com/ledgerwatch/log/v3" + "github.com/urfave/cli/v2" ) @@ -156,7 +158,14 @@ func ApplyFlagsForZkConfig(ctx *cli.Context, cfg *ethconfig.Config) { witnessInclusion = append(witnessInclusion, libcommon.HexToAddress(s)) } - logLevel := os.Getenv("LOG_LEVEL") + logLevel, lErr := logging.TryGetLogLevel(ctx.String(logging.LogConsoleVerbosityFlag.Name)) + if lErr != nil { + // try verbosity flag + logLevel, lErr = logging.TryGetLogLevel(ctx.String(logging.LogVerbosityFlag.Name)) + if lErr != nil { + logLevel = log.LvlInfo + } + } cfg.Zk = ðconfig.Zk{ L2ChainId: ctx.Uint64(utils.L2ChainIdFlag.Name), @@ -245,7 +254,7 @@ func ApplyFlagsForZkConfig(ctx *cli.Context, cfg *ethconfig.Config) { GasPriceHistoryCount: ctx.Uint64(utils.GasPriceHistoryCount.Name), RejectLowGasPriceTransactions: ctx.Bool(utils.RejectLowGasPriceTransactions.Name), RejectLowGasPriceTolerance: ctx.Float64(utils.RejectLowGasPriceTolerance.Name), - LogLevel: utils2.LogLevel(logLevel), + LogLevel: logLevel, } utils2.EnableTimer(cfg.DebugTimers) diff --git a/turbo/debug/flags.go b/turbo/debug/flags.go index 0169e8a29d9..f52ffb684ea 100644 --- a/turbo/debug/flags.go +++ b/turbo/debug/flags.go @@ -193,7 +193,6 @@ func Setup(ctx *cli.Context, rootLogger bool) (log.Logger, *http.ServeMux, *http RaiseFdLimit() logger := logging.SetupLoggerCtx("cdk-erigon", ctx, log.LvlInfo, log.LvlInfo, rootLogger) - if traceFile := ctx.String(traceFlag.Name); traceFile != "" { if err := Handler.StartGoTrace(traceFile); err != nil { return logger, nil, nil, err diff --git a/turbo/jsonrpc/eth_api.go b/turbo/jsonrpc/eth_api.go index bf4015b423b..0e737197b74 100644 --- a/turbo/jsonrpc/eth_api.go +++ b/turbo/jsonrpc/eth_api.go @@ -131,7 +131,7 @@ type BaseAPI struct { dirs datadir.Dirs l2RpcUrl string gasless bool - logLevel utils.LogLevel + logLevel log.Lvl } func NewBaseApi(f *rpchelper.Filters, stateCache kvcache.Cache, blockReader services.FullBlockReader, agg *libstate.Aggregator, singleNodeMode bool, evmCallTimeout time.Duration, engine consensus.EngineReader, dirs datadir.Dirs) *BaseAPI { @@ -172,7 +172,7 @@ func (api *BaseAPI) chainConfig(ctx context.Context, tx kv.Tx) (*chain.Config, e //[zkevm] get dynamic fork config hermezDb := hermez_db.NewHermezDbReader(tx) - if err := utils.UpdateZkEVMBlockCfg(cfg, hermezDb, "", api.logLevel.IsTraceLogLevelSet()); err != nil { + if err := utils.UpdateZkEVMBlockCfg(cfg, hermezDb, "", api.logLevel == log.LvlTrace); err != nil { return cfg, err } @@ -379,8 +379,8 @@ type APIImpl struct { gasTracker RpcL1GasPriceTracker RejectLowGasPriceTransactions bool RejectLowGasPriceTolerance float64 - - logLevel utils.LogLevel + + logLevel utils.LogLevel } // NewEthAPI returns APIImpl instance diff --git a/turbo/logging/logging.go b/turbo/logging/logging.go index 879332018a8..b50c86b8992 100644 --- a/turbo/logging/logging.go +++ b/turbo/logging/logging.go @@ -44,16 +44,16 @@ func SetupLoggerCtx(filePrefix string, ctx *cli.Context, metrics.DelayLoggingEnabled = ctx.Bool(LogBlockDelayFlag.Name) - consoleLevel, lErr := tryGetLogLevel(ctx.String(LogConsoleVerbosityFlag.Name)) + consoleLevel, lErr := TryGetLogLevel(ctx.String(LogConsoleVerbosityFlag.Name)) if lErr != nil { // try verbosity flag - consoleLevel, lErr = tryGetLogLevel(ctx.String(LogVerbosityFlag.Name)) + consoleLevel, lErr = TryGetLogLevel(ctx.String(LogVerbosityFlag.Name)) if lErr != nil { consoleLevel = consoleDefaultLevel } } - dirLevel, dErr := tryGetLogLevel(ctx.String(LogDirVerbosityFlag.Name)) + dirLevel, dErr := TryGetLogLevel(ctx.String(LogDirVerbosityFlag.Name)) if dErr != nil { dirLevel = dirDefaultLevel } @@ -106,16 +106,16 @@ func SetupLoggerCmd(filePrefix string, cmd *cobra.Command) log.Logger { dirJson = false } - consoleLevel, lErr := tryGetLogLevel(cmd.Flags().Lookup(LogConsoleVerbosityFlag.Name).Value.String()) + consoleLevel, lErr := TryGetLogLevel(cmd.Flags().Lookup(LogConsoleVerbosityFlag.Name).Value.String()) if lErr != nil { // try verbosity flag - consoleLevel, lErr = tryGetLogLevel(cmd.Flags().Lookup(LogVerbosityFlag.Name).Value.String()) + consoleLevel, lErr = TryGetLogLevel(cmd.Flags().Lookup(LogVerbosityFlag.Name).Value.String()) if lErr != nil { consoleLevel = log.LvlInfo } } - dirLevel, dErr := tryGetLogLevel(cmd.Flags().Lookup(LogDirVerbosityFlag.Name).Value.String()) + dirLevel, dErr := TryGetLogLevel(cmd.Flags().Lookup(LogDirVerbosityFlag.Name).Value.String()) if dErr != nil { dirLevel = log.LvlInfo } @@ -161,16 +161,16 @@ func SetupLogger(filePrefix string) log.Logger { var consoleJson = *logJson || *logConsoleJson var dirJson = logDirJson - consoleLevel, lErr := tryGetLogLevel(*logConsoleVerbosity) + consoleLevel, lErr := TryGetLogLevel(*logConsoleVerbosity) if lErr != nil { // try verbosity flag - consoleLevel, lErr = tryGetLogLevel(*logVerbosity) + consoleLevel, lErr = TryGetLogLevel(*logVerbosity) if lErr != nil { consoleLevel = log.LvlInfo } } - dirLevel, dErr := tryGetLogLevel(*logDirVerbosity) + dirLevel, dErr := TryGetLogLevel(*logDirVerbosity) if dErr != nil { dirLevel = log.LvlInfo } @@ -233,7 +233,7 @@ func initSeparatedLogging( logger.Info("logging to file system", "log dir", dirPath, "file prefix", filePrefix, "log level", dirLevel, "json", dirJson) } -func tryGetLogLevel(s string) (log.Lvl, error) { +func TryGetLogLevel(s string) (log.Lvl, error) { lvl, err := log.LvlFromString(s) if err != nil { l, err := strconv.Atoi(s) diff --git a/zk/stages/stage_sequence_execute.go b/zk/stages/stage_sequence_execute.go index c993a0bb8e7..b4c95bf962e 100644 --- a/zk/stages/stage_sequence_execute.go +++ b/zk/stages/stage_sequence_execute.go @@ -167,7 +167,7 @@ func sequencingBatchStep( return err } - if err := utils.UpdateZkEVMBlockCfg(cfg.chainConfig, sdb.hermezDb, logPrefix, cfg.zk.LogLevel.IsTraceLogLevelSet()); err != nil { + if err := utils.UpdateZkEVMBlockCfg(cfg.chainConfig, sdb.hermezDb, logPrefix, cfg.zk.LogLevel == log.LvlTrace); err != nil { return err } diff --git a/zk/txpool/pool.go b/zk/txpool/pool.go index 751eeb7a180..25e3ab407d2 100644 --- a/zk/txpool/pool.go +++ b/zk/txpool/pool.go @@ -40,7 +40,6 @@ import ( "github.com/holiman/uint256" "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/zk/utils" "github.com/ledgerwatch/log/v3" "github.com/status-im/keycard-go/hexutils" @@ -337,7 +336,7 @@ type TxPool struct { // limbo specific fields where bad batch transactions identified by the executor go limbo *Limbo - logLevel utils.LogLevel + logLevel log.Lvl } func CreateTxPoolBuckets(tx kv.RwTx) error { @@ -368,7 +367,7 @@ func New(newTxs chan types.Announcements, coreDB kv.RoDB, cfg txpoolcfg.Config, tracedSenders[common.BytesToAddress([]byte(sender))] = struct{}{} } - logLevel := utils.LogLevel("") + logLevel := log.LvlInfo if ethCfg.Zk != nil { logLevel = ethCfg.Zk.LogLevel } diff --git a/zk/txpool/pool_zk.go b/zk/txpool/pool_zk.go index f943032ea80..f47a2ddd90f 100644 --- a/zk/txpool/pool_zk.go +++ b/zk/txpool/pool_zk.go @@ -32,7 +32,7 @@ func calcProtocolBaseFee(baseFee uint64) uint64 { } func (p *TxPool) Trace(msg string, ctx ...interface{}) { - if p.logLevel.IsTraceLogLevelSet() { + if p.logLevel == log.LvlTrace { log.Trace(msg, ctx...) } }