@chainsafe/lodestar 1.9.0-dev.5b5530b393 → 1.9.0-dev.5d9d86d100

package/lib/options/beaconNodeOptions/sync.js

@@ -1,9 +1,10 @@
 import { defaultOptions } from "@lodestar/beacon-node";
 export function parseArgs(args) {
+    var _a;
     return {
         isSingleNode: args["sync.isSingleNode"],
         disableProcessAsChainSegment: args["sync.disableProcessAsChainSegment"],
-        backfillBatchSize: args["sync.backfillBatchSize"],
+        backfillBatchSize: (_a = args["sync.backfillBatchSize"]) !== null && _a !== void 0 ? _a : defaultOptions.sync.backfillBatchSize,
         disableRangeSync: args["sync.disableRangeSync"],
     };
 }

package/lib/options/beaconNodeOptions/sync.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAqB,MAAM,uBAAuB,CAAC;AAUzE,MAAM,UAAU,SAAS,CAAC,IAAc;IACtC,OAAO;QACL,YAAY,EAAE,IAAI,CAAC,mBAAmB,CAAC;QACvC,4BAA4B,EAAE,IAAI,CAAC,mCAAmC,CAAC;QACvE,iBAAiB,EAAE,IAAI,CAAC,wBAAwB,CAAC;QACjD,gBAAgB,EAAE,IAAI,CAAC,uBAAuB,CAAC;KAChD,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAgC;IAClD,mBAAmB,EAAE;QACnB,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,SAAS;QACf,WAAW,EACT;sFACgF;QAClF,kBAAkB,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC;QAC5D,KAAK,EAAE,MAAM;KACd;IAED,uBAAuB,EAAE;QACvB,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,8EAA8E;QAC3F,kBAAkB,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC;QAChE,KAAK,EAAE,MAAM;KACd;IAED,mCAAmC,EAAE;QACnC,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,SAAS;QACf,WAAW,EACT,2GAA2G;QAC7G,kBAAkB,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,4BAA4B,CAAC;QAC5E,KAAK,EAAE,MAAM;KACd;IAED,wBAAwB,EAAE;QACxB,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,2FAA2F;QACxG,kBAAkB,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,iBAAiB,CAAC;QACjE,KAAK,EAAE,MAAM;KACd;CACF,CAAC"}
+{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/options/beaconNodeOptions/sync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAqB,MAAM,uBAAuB,CAAC;AAUzE,MAAM,UAAU,SAAS,CAAC,IAAc;;IACtC,OAAO;QACL,YAAY,EAAE,IAAI,CAAC,mBAAmB,CAAC;QACvC,4BAA4B,EAAE,IAAI,CAAC,mCAAmC,CAAC;QACvE,iBAAiB,EAAE,MAAA,IAAI,CAAC,wBAAwB,CAAC,mCAAI,cAAc,CAAC,IAAI,CAAC,iBAAiB;QAC1F,gBAAgB,EAAE,IAAI,CAAC,uBAAuB,CAAC;KAChD,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAgC;IAClD,mBAAmB,EAAE;QACnB,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,SAAS;QACf,WAAW,EACT;sFACgF;QAClF,kBAAkB,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC;QAC5D,KAAK,EAAE,MAAM;KACd;IAED,uBAAuB,EAAE;QACvB,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,SAAS;QACf,WAAW,EAAE,8EAA8E;QAC3F,kBAAkB,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,CAAC;QAChE,KAAK,EAAE,MAAM;KACd;IAED,mCAAmC,EAAE;QACnC,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,SAAS;QACf,WAAW,EACT,2GAA2G;QAC7G,kBAAkB,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,4BAA4B,CAAC;QAC5E,KAAK,EAAE,MAAM;KACd;IAED,wBAAwB,EAAE;QACxB,MAAM,EAAE,IAAI;QACZ,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,2FAA2F;QACxG,kBAAkB,EAAE,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,iBAAiB,CAAC;QACjE,KAAK,EAAE,MAAM;KACd;CACF,CAAC"}

package/lib/options/globalOptions.d.ts

@@ -4,7 +4,7 @@ import { IParamsArgs } from "./paramsOptions.js";
 type GlobalSingleArgs = {
     dataDir?: string;
     network?: NetworkName;
-    paramsFile: string;
+    paramsFile?: string;
     preset: string;
     presetFile?: string;
 };
@@ -18,7 +18,7 @@ export declare const globalOptions: {
     dataDir: import("yargs").Options;
     network: import("yargs").Options;
     paramsFile: import("yargs").Options;
-    preset: import("yargs").Options;
+    preset: import("yargs").Options & Required<Pick<import("yargs").Options, "default">>;
     presetFile: import("yargs").Options;
 };
 export {};

package/lib/options/logOptions.d.ts

@@ -1,4 +1,14 @@
+import { LogLevel } from "@lodestar/logger";
 import { CliCommandOptions } from "../util/command.js";
-import { LogArgs } from "../util/logger.js";
+export type LogArgs = {
+    logLevel: LogLevel;
+    logFile?: string;
+    logFileLevel: LogLevel;
+    logFileDailyRotate: number;
+    logFormatGenesisTime?: number;
+    logPrefix?: string;
+    logFormat?: string;
+    logLevelModule?: string[];
+};
 export declare const logOptions: CliCommandOptions<LogArgs>;
 //# sourceMappingURL=logOptions.d.ts.map

package/lib/options/logOptions.js

@@ -1,10 +1,11 @@
-import { logFormats, LogLevels } from "@lodestar/utils";
-import { LOG_DAILY_ROTATE_DEFAULT, LOG_FILE_DISABLE_KEYWORD, LOG_FILE_LEVEL_DEFAULT, LOG_LEVEL_DEFAULT, } from "../util/logger.js";
+import { LogLevels } from "@lodestar/utils";
+import { LogLevel, logFormats } from "@lodestar/logger";
+import { LOG_FILE_DISABLE_KEYWORD } from "../util/logger.js";
 export const logOptions = {
     logLevel: {
         choices: LogLevels,
         description: "Logging verbosity level for emittings logs to terminal",
-        default: LOG_LEVEL_DEFAULT,
+        default: LogLevel.info,
         type: "string",
     },
     logFile: {
@@ -14,12 +15,12 @@ export const logOptions = {
     logFileLevel: {
         choices: LogLevels,
         description: "Logging verbosity level for emittings logs to file",
-        default: LOG_FILE_LEVEL_DEFAULT,
+        default: LogLevel.debug,
         type: "string",
     },
     logFileDailyRotate: {
-        description: "Daily rotate log files, set to an integer to limit the file count, set to 0(zero) to disable rotation",
-        default: LOG_DAILY_ROTATE_DEFAULT,
+        description: "Daily rotate log files, set to an integer to limit the file count, set to 0 (zero) to disable rotation",
+        default: 5,
         type: "number",
     },
     logFormatGenesisTime: {

package/lib/options/logOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"logOptions.js","sourceRoot":"","sources":["../../src/options/logOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAEtD,OAAO,EAEL,wBAAwB,EACxB,wBAAwB,EACxB,sBAAsB,EACtB,iBAAiB,GAClB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,CAAC,MAAM,UAAU,GAA+B;IACpD,QAAQ,EAAE;QACR,OAAO,EAAE,SAAS;QAClB,WAAW,EAAE,wDAAwD;QACrE,OAAO,EAAE,iBAAiB;QAC1B,IAAI,EAAE,QAAQ;KACf;IAED,OAAO,EAAE;QACP,WAAW,EAAE,0DAA0D,wBAAwB,cAAc;QAC7G,IAAI,EAAE,QAAQ;KACf;IAED,YAAY,EAAE;QACZ,OAAO,EAAE,SAAS;QAClB,WAAW,EAAE,oDAAoD;QACjE,OAAO,EAAE,sBAAsB;QAC/B,IAAI,EAAE,QAAQ;KACf;IAED,kBAAkB,EAAE;QAClB,WAAW,EACT,uGAAuG;QACzG,OAAO,EAAE,wBAAwB;QACjC,IAAI,EAAE,QAAQ;KACf;IAED,oBAAoB,EAAE;QACpB,MAAM,EAAE,IAAI;QACZ,WAAW,EACT,kHAAkH;QACpH,IAAI,EAAE,QAAQ;KACf;IAED,SAAS,EAAE;QACT,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,6CAA6C;QAC1D,IAAI,EAAE,QAAQ;KACf;IAED,SAAS,EAAE;QACT,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,kEAAkE;QAC/E,OAAO,EAAE,UAAU;QACnB,IAAI,EAAE,QAAQ;KACf;IAED,cAAc,EAAE;QACd,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,2FAA2F;QACxG,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,CAAC,IAAc,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;KACxE;CACF,CAAC"}
+{"version":3,"file":"logOptions.js","sourceRoot":"","sources":["../../src/options/logOptions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,QAAQ,EAAE,UAAU,EAAC,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAC,wBAAwB,EAAC,MAAM,mBAAmB,CAAC;AAa3D,MAAM,CAAC,MAAM,UAAU,GAA+B;IACpD,QAAQ,EAAE;QACR,OAAO,EAAE,SAAS;QAClB,WAAW,EAAE,wDAAwD;QACrE,OAAO,EAAE,QAAQ,CAAC,IAAI;QACtB,IAAI,EAAE,QAAQ;KACf;IAED,OAAO,EAAE;QACP,WAAW,EAAE,0DAA0D,wBAAwB,cAAc;QAC7G,IAAI,EAAE,QAAQ;KACf;IAED,YAAY,EAAE;QACZ,OAAO,EAAE,SAAS;QAClB,WAAW,EAAE,oDAAoD;QACjE,OAAO,EAAE,QAAQ,CAAC,KAAK;QACvB,IAAI,EAAE,QAAQ;KACf;IAED,kBAAkB,EAAE;QAClB,WAAW,EACT,wGAAwG;QAC1G,OAAO,EAAE,CAAC;QACV,IAAI,EAAE,QAAQ;KACf;IAED,oBAAoB,EAAE;QACpB,MAAM,EAAE,IAAI;QACZ,WAAW,EACT,kHAAkH;QACpH,IAAI,EAAE,QAAQ;KACf;IAED,SAAS,EAAE;QACT,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,6CAA6C;QAC1D,IAAI,EAAE,QAAQ;KACf;IAED,SAAS,EAAE;QACT,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,kEAAkE;QAC/E,OAAO,EAAE,UAAU;QACnB,IAAI,EAAE,QAAQ;KACf;IAED,cAAc,EAAE;QACd,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,2FAA2F;QACxG,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,IAAI;QACZ,MAAM,EAAE,CAAC,IAAc,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;KACxE;CACF,CAAC"}

package/lib/util/command.d.ts

@@ -1,6 +1,7 @@
 import { Options, Argv } from "yargs";
 export type CliCommandOptions<OwnArgs> = Required<{
-    [key in keyof OwnArgs]: Options;
+    [K in keyof OwnArgs]: undefined extends OwnArgs[K] ? Options : // If arg cannot be undefined it must specify a default value
+    Options & Required<Pick<Options, "default">>;
 }>;
 export interface CliCommand<OwnArgs = Record<never, never>, ParentArgs = Record<never, never>, R = any> {
     command: string;

package/lib/util/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/util/command.ts"],"names":[],"mappings":"AAiBA;;;;GAIG;AACH,8DAA8D;AAC9D,MAAM,UAAU,sBAAsB,CAAC,KAAW,EAAE,UAAgC;IAClF,KAAK,CAAC,OAAO,CAAC;QACZ,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,OAAO,EAAE,CAAC,YAAY,EAAE,EAAE;YACxB,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;YAC/C,KAAK,MAAM,UAAU,IAAI,UAAU,CAAC,WAAW,IAAI,EAAE,EAAE;gBACrD,sBAAsB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;aAClD;YACD,IAAI,UAAU,CAAC,QAAQ,EAAE;gBACvB,KAAK,MAAM,OAAO,IAAI,UAAU,CAAC,QAAQ,EAAE;oBACzC,YAAY,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;iBACpE;aACF;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,gEAAgE;QAChE,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,SAAS,YAAY,KAAU,CAAC;KAChE,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../src/util/command.ts"],"names":[],"mappings":"AAsBA;;;;GAIG;AACH,8DAA8D;AAC9D,MAAM,UAAU,sBAAsB,CAAC,KAAW,EAAE,UAAgC;IAClF,KAAK,CAAC,OAAO,CAAC;QACZ,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,OAAO,EAAE,CAAC,YAAY,EAAE,EAAE;YACxB,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;YAC/C,KAAK,MAAM,UAAU,IAAI,UAAU,CAAC,WAAW,IAAI,EAAE,EAAE;gBACrD,sBAAsB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;aAClD;YACD,IAAI,UAAU,CAAC,QAAQ,EAAE;gBACvB,KAAK,MAAM,OAAO,IAAI,UAAU,CAAC,QAAQ,EAAE;oBACzC,YAAY,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;iBACpE;aACF;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,gEAAgE;QAChE,OAAO,EAAE,UAAU,CAAC,OAAO,IAAI,SAAS,YAAY,KAAU,CAAC;KAChE,CAAC,CAAC;AACL,CAAC"}

package/lib/util/file.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/util/file.ts"],"names":[],"mappings":"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"}

package/lib/util/index.d.ts

@@ -10,6 +10,7 @@ export * from "./logger.js";
 export * from "./object.js";
 export * from "./passphrase.js";
 export * from "./process.js";
+export * from "./pruneOldFilesInDir.js";
 export * from "./sleep.js";
 export * from "./stripOffNewlines.js";
 export * from "./types.js";

package/lib/util/index.js

@@ -10,6 +10,7 @@ export * from "./logger.js";
 export * from "./object.js";
 export * from "./passphrase.js";
 export * from "./process.js";
+export * from "./pruneOldFilesInDir.js";
 export * from "./sleep.js";
 export * from "./stripOffNewlines.js";
 export * from "./types.js";

package/lib/util/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/util/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,yBAAyB,CAAC;AACxC,cAAc,YAAY,CAAC;AAC3B,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,mBAAmB,CAAC;AAClC,cAAc,qBAAqB,CAAC"}

package/lib/util/logger.d.ts

@@ -1,39 +1,23 @@
 import { ChainForkConfig } from "@lodestar/config";
-import { Logger, LogLevel } from "@lodestar/utils";
+import { LoggerNodeOpts } from "@lodestar/logger/node";
+import { LogArgs } from "../options/logOptions.js";
 import { GlobalArgs } from "../options/globalOptions.js";
 export declare const LOG_FILE_DISABLE_KEYWORD = "none";
-export declare const LOG_LEVEL_DEFAULT = LogLevel.info;
-export declare const LOG_FILE_LEVEL_DEFAULT = LogLevel.debug;
-export declare const LOG_DAILY_ROTATE_DEFAULT = 5;
-export type LogArgs = {
-    logLevel?: LogLevel;
-    logFile?: string;
-    logFileLevel?: LogLevel;
-    logFileDailyRotate?: number;
-    logFormatGenesisTime?: number;
-    logPrefix?: string;
-    logFormat?: string;
-    logLevelModule?: string[];
-};
 /**
  * Setup a CLI logger, common for beacon, validator and dev commands
  */
-export declare function getCliLogger(args: LogArgs & Pick<GlobalArgs, "dataDir">, paths: {
+export declare function parseLoggerArgs(args: LogArgs & Pick<GlobalArgs, "dataDir">, paths: {
     defaultLogFilepath: string;
 }, config: ChainForkConfig, opts?: {
     hideTimestamp?: boolean;
-}): {
-    logger: Logger;
-    logParams: {
-        filename: string;
-        rotateMaxFiles: number;
-    };
-};
+}): LoggerNodeOpts;
 /**
  * Winston is not able to clean old log files if server is offline for a while
  * so we have to do this manually when starting the node.
  * See https://github.com/ChainSafe/lodestar/issues/4419
  */
-export declare function cleanOldLogFiles(filePath: string, maxFiles: number): void;
+export declare function cleanOldLogFiles(args: LogArgs, paths: {
+    defaultLogFilepath: string;
+}): void;
 export declare function shouldDeleteLogFile(prefix: string, extension: string, logFileName: string, maxFiles: number): boolean;
 //# sourceMappingURL=logger.d.ts.map

package/lib/util/logger.js

@@ -1,91 +1,70 @@
 import path from "node:path";
 import fs from "node:fs";
-import DailyRotateFile from "winston-daily-rotate-file";
-import winston from "winston";
 import { SLOTS_PER_EPOCH } from "@lodestar/params";
-import { LogLevel, createWinstonLogger, TimestampFormatCode, logFormats, } from "@lodestar/utils";
-import { ConsoleDynamicLevel } from "./loggerConsoleTransport.js";
+import { TimestampFormatCode, logFormats } from "@lodestar/logger";
+import { LogLevel } from "@lodestar/utils";
 export const LOG_FILE_DISABLE_KEYWORD = "none";
-export const LOG_LEVEL_DEFAULT = LogLevel.info;
-export const LOG_FILE_LEVEL_DEFAULT = LogLevel.debug;
-export const LOG_DAILY_ROTATE_DEFAULT = 5;
-const DATE_PATTERN = "YYYY-MM-DD";
 /**
  * Setup a CLI logger, common for beacon, validator and dev commands
  */
-export function getCliLogger(args, paths, config, opts) {
-    var _a, _b, _c, _d, _e;
-    const consoleTransport = new ConsoleDynamicLevel({
-        // Set defaultLevel, not level for dynamic level setting of ConsoleDynamicLvevel
-        defaultLevel: (_a = args.logLevel) !== null && _a !== void 0 ? _a : LOG_LEVEL_DEFAULT,
-        debugStdout: true,
-        handleExceptions: true,
-    });
-    if (args.logLevelModule) {
-        for (const logLevelModule of (_b = args.logLevelModule) !== null && _b !== void 0 ? _b : []) {
-            const [module, levelStr] = logLevelModule.split("=");
-            const level = levelStr;
-            if (LogLevel[level] === undefined) {
-                throw Error(`Unknown level in logLevelModule '${logLevelModule}'`);
-            }
-            consoleTransport.setModuleLevel(module, level);
-        }
+export function parseLoggerArgs(args, paths, config, opts) {
+    var _a;
+    return {
+        level: parseLogLevel(args.logLevel),
+        file: args.logFile === LOG_FILE_DISABLE_KEYWORD
+            ? undefined
+            : {
+                filepath: (_a = args.logFile) !== null && _a !== void 0 ? _a : paths.defaultLogFilepath,
+                level: parseLogLevel(args.logFileLevel),
+                dailyRotate: args.logFileDailyRotate,
+            },
+        module: args.logPrefix,
+        format: args.logFormat ? parseLogFormat(args.logFormat) : undefined,
+        levelModule: args.logLevelModule && parseLogLevelModule(args.logLevelModule),
+        timestampFormat: (opts === null || opts === void 0 ? void 0 : opts.hideTimestamp)
+            ? { format: TimestampFormatCode.Hidden }
+            : args.logFormatGenesisTime !== undefined
+                ? {
+                    format: TimestampFormatCode.EpochSlot,
+                    genesisTime: args.logFormatGenesisTime,
+                    secondsPerSlot: config.SECONDS_PER_SLOT,
+                    slotsPerEpoch: SLOTS_PER_EPOCH,
+                }
+                : {
+                    format: TimestampFormatCode.DateRegular,
+                },
+    };
+}
+function parseLogFormat(format) {
+    if (!logFormats.includes(format)) {
+        throw Error(`Unknown log format ${format}`);
     }
-    const transports = [consoleTransport];
-    // yargs populates with undefined if just set but with no arg
-    // $ ./bin/lodestar.js beacon --logFileDailyRotate
-    // args = {
-    //   logFileDailyRotate: undefined,
-    // }
-    // `lodestar --logFileDailyRotate` -> enabled daily rotate with default value
-    // `lodestar --logFileDailyRotate 10` -> set daily rotate to custom value 10
-    // `lodestar --logFileDailyRotate 0` -> disable daily rotate and accumulate in same file
-    const rotateMaxFiles = (_c = args.logFileDailyRotate) !== null && _c !== void 0 ? _c : LOG_DAILY_ROTATE_DEFAULT;
-    const filename = (_d = args.logFile) !== null && _d !== void 0 ? _d : paths.defaultLogFilepath;
-    if (args.logFile !== LOG_FILE_DISABLE_KEYWORD) {
-        const logFileLevel = (_e = args.logFileLevel) !== null && _e !== void 0 ? _e : LOG_FILE_LEVEL_DEFAULT;
-        transports.push(rotateMaxFiles > 0
-            ? new DailyRotateFile({
-                level: logFileLevel,
-                //insert the date pattern in filename before the file extension.
-                filename: filename.replace(/\.(?=[^.]*$)|$/, "-%DATE%$&"),
-                datePattern: DATE_PATTERN,
-                handleExceptions: true,
-                maxFiles: rotateMaxFiles,
-                auditFile: path.join(path.dirname(filename), ".log_rotate_audit.json"),
-            })
-            : new winston.transports.File({
-                level: logFileLevel,
-                filename: filename,
-                handleExceptions: true,
-            }));
+    return format;
+}
+function parseLogLevel(level) {
+    if (LogLevel[level] === undefined) {
+        throw Error(`Unknown log level '${level}'`);
     }
-    const timestampFormat = args.logFormatGenesisTime !== undefined
-        ? {
-            format: TimestampFormatCode.EpochSlot,
-            genesisTime: args.logFormatGenesisTime,
-            secondsPerSlot: config.SECONDS_PER_SLOT,
-            slotsPerEpoch: SLOTS_PER_EPOCH,
-        }
-        : {
-            format: TimestampFormatCode.DateRegular,
-        };
-    const logger = createWinstonLogger({
-        module: args.logPrefix,
-        format: args.logFormat ? parseLogFormat(args.logFormat) : "human",
-        timestampFormat,
-        hideTimestamp: opts === null || opts === void 0 ? void 0 : opts.hideTimestamp,
-    }, transports);
-    return { logger, logParams: { filename, rotateMaxFiles } };
+    return level;
+}
+function parseLogLevelModule(logLevelModuleArr) {
+    const levelModule = {};
+    for (const logLevelModule of logLevelModuleArr) {
+        const [module, levelStr] = logLevelModule.split("=");
+        levelModule[module] = parseLogLevel(levelStr);
+    }
+    return levelModule;
 }
 /**
  * Winston is not able to clean old log files if server is offline for a while
  * so we have to do this manually when starting the node.
  * See https://github.com/ChainSafe/lodestar/issues/4419
  */
-export function cleanOldLogFiles(filePath, maxFiles) {
-    const folder = path.dirname(filePath);
-    const filename = path.basename(filePath);
+export function cleanOldLogFiles(args, paths) {
+    var _a;
+    const filepath = (_a = args.logFile) !== null && _a !== void 0 ? _a : paths.defaultLogFilepath;
+    const folder = path.dirname(filepath);
+    const filename = path.basename(filepath);
     const lastIndexDot = filename.lastIndexOf(".");
     const prefix = filename.substring(0, lastIndexDot);
     const extension = filename.substring(lastIndexDot + 1, filename.length);
@@ -93,7 +72,7 @@ export function cleanOldLogFiles(filePath, maxFiles) {
         .readdirSync(folder, { withFileTypes: true })
         .filter((de) => de.isFile())
         .map((de) => de.name)
-        .filter((logFileName) => shouldDeleteLogFile(prefix, extension, logFileName, maxFiles))
+        .filter((logFileName) => shouldDeleteLogFile(prefix, extension, logFileName, args.logFileDailyRotate))
         .map((logFileName) => path.join(folder, logFileName));
     // delete files
     toDelete.forEach((filename) => fs.unlinkSync(filename));
@@ -107,10 +86,4 @@ export function shouldDeleteLogFile(prefix, extension, logFileName, maxFiles) {
     }
     return false;
 }
-function parseLogFormat(format) {
-    if (!logFormats.includes(format)) {
-        throw Error(`Invalid log format '${format}'`);
-    }
-    return format;
-}
 //# sourceMappingURL=logger.js.map

package/lib/util/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/util/logger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/util/logger.ts"],"names":[],"mappings":"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"}

package/lib/util/pruneOldFilesInDir.d.ts

@@ -0,0 +1,2 @@
+export declare function pruneOldFilesInDir(dirpath: string, maxAgeMs: number): void;
+//# sourceMappingURL=pruneOldFilesInDir.d.ts.map

package/lib/util/pruneOldFilesInDir.js

@@ -0,0 +1,17 @@
+import fs from "node:fs";
+import path from "node:path";
+export function pruneOldFilesInDir(dirpath, maxAgeMs) {
+    for (const entryName of fs.readdirSync(dirpath)) {
+        const entryPath = path.join(dirpath, entryName);
+        const stat = fs.statSync(entryPath);
+        if (stat.isDirectory()) {
+            pruneOldFilesInDir(entryPath, maxAgeMs);
+        }
+        else if (stat.isFile()) {
+            if (Date.now() - stat.mtimeMs > maxAgeMs) {
+                fs.unlinkSync(entryPath);
+            }
+        }
+    }
+}
+//# sourceMappingURL=pruneOldFilesInDir.js.map

package/lib/util/pruneOldFilesInDir.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pruneOldFilesInDir.js","sourceRoot":"","sources":["../../src/util/pruneOldFilesInDir.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,MAAM,UAAU,kBAAkB,CAAC,OAAe,EAAE,QAAgB;IAClE,KAAK,MAAM,SAAS,IAAI,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;QAC/C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAEhD,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QACpC,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE;YACtB,kBAAkB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;SACzC;aAAM,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE;YACxB,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,OAAO,GAAG,QAAQ,EAAE;gBACxC,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;aAC1B;SACF;KACF;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chainsafe/lodestar",
-  "version": "1.9.0-dev.5b5530b393",
+  "version": "1.9.0-dev.5d9d86d100",
   "description": "Command line interface for lodestar",
   "author": "ChainSafe Systems",
   "license": "LGPL-3.0",
@@ -23,8 +23,7 @@
     "clean": "rm -rf lib && rm -f *.tsbuildinfo",
     "build": "tsc -p tsconfig.build.json && yarn write-git-data",
     "build:release": "yarn clean && yarn run build",
-    "build:lib:watch": "yarn run build:lib --watch",
-    "build:types:watch": "yarn run build:types --watch",
+    "build:watch": "tsc -p tsconfig.build.json --watch",
     "build:refdocs": "ts-node --esm ./docsgen/index.ts docs/cli.md",
     "write-git-data": "node lib/util/gitData/writeGitData.js",
     "check-build": "node -e \"(async function() { await import('./lib/index.js') })()\" lodestar --help",
@@ -57,20 +56,21 @@
     "@chainsafe/bls": "7.1.1",
     "@chainsafe/bls-keygen": "^0.3.0",
     "@chainsafe/bls-keystore": "^2.0.0",
-    "@chainsafe/blst": "^0.2.8",
+    "@chainsafe/blst": "^0.2.9",
     "@chainsafe/discv5": "^3.0.0",
     "@chainsafe/ssz": "^0.10.2",
     "@libp2p/peer-id-factory": "^2.0.3",
-    "@lodestar/api": "1.9.0-dev.5b5530b393",
-    "@lodestar/beacon-node": "1.9.0-dev.5b5530b393",
-    "@lodestar/config": "1.9.0-dev.5b5530b393",
-    "@lodestar/db": "1.9.0-dev.5b5530b393",
-    "@lodestar/light-client": "1.9.0-dev.5b5530b393",
-    "@lodestar/params": "1.9.0-dev.5b5530b393",
-    "@lodestar/state-transition": "1.9.0-dev.5b5530b393",
-    "@lodestar/types": "1.9.0-dev.5b5530b393",
-    "@lodestar/utils": "1.9.0-dev.5b5530b393",
-    "@lodestar/validator": "1.9.0-dev.5b5530b393",
+    "@lodestar/api": "1.9.0-dev.5d9d86d100",
+    "@lodestar/beacon-node": "1.9.0-dev.5d9d86d100",
+    "@lodestar/config": "1.9.0-dev.5d9d86d100",
+    "@lodestar/db": "1.9.0-dev.5d9d86d100",
+    "@lodestar/light-client": "1.9.0-dev.5d9d86d100",
+    "@lodestar/logger": "1.9.0-dev.5d9d86d100",
+    "@lodestar/params": "1.9.0-dev.5d9d86d100",
+    "@lodestar/state-transition": "1.9.0-dev.5d9d86d100",
+    "@lodestar/types": "1.9.0-dev.5d9d86d100",
+    "@lodestar/utils": "1.9.0-dev.5d9d86d100",
+    "@lodestar/validator": "1.9.0-dev.5d9d86d100",
     "@multiformats/multiaddr": "^11.0.0",
     "@types/lockfile": "^1.0.2",
     "bip39": "^3.1.0",
@@ -94,11 +94,12 @@
     "yargs": "^17.7.1"
   },
   "devDependencies": {
+    "@types/debug": "^4.1.7",
     "@types/expand-tilde": "^2.0.0",
     "@types/got": "^9.6.12",
     "@types/inquirer": "^9.0.3",
     "@types/lodash": "^4.14.192",
     "@types/yargs": "^17.0.24"
   },
-  "gitHead": "00c52cd0e4467f4b72982ce7cd06ff0bf81a641b"
+  "gitHead": "9361af0d564d888c7bfda131201414c0610e6719"
 }

package/lib/cmds/validator/keymanager/decryptKeystoreDefinitions/index.d.ts

@@ -1,8 +0,0 @@
-import { SignerLocal } from "@lodestar/validator";
-import { LocalKeystoreDefinition } from "../interface.js";
-import { KeystoreDecryptOptions } from "./types.js";
-/**
- * Decrypt keystore definitions using a threadpool
- */
-export declare function decryptKeystoreDefinitions(keystoreDefinitions: LocalKeystoreDefinition[], opts: KeystoreDecryptOptions): Promise<SignerLocal[]>;
-//# sourceMappingURL=index.d.ts.map

package/lib/cmds/validator/keymanager/decryptKeystoreDefinitions/index.js

@@ -1,92 +0,0 @@
-import { spawn, Pool, Worker } from "@chainsafe/threads";
-import { SignerType } from "@lodestar/validator";
-import bls from "@chainsafe/bls";
-import { clearKeystoreCache, loadKeystoreCache, writeKeystoreCache } from "../keystoreCache.js";
-import { lockFilepath, unlockFilepath } from "../../../../util/lockfile.js";
-import { defaultPoolSize } from "./poolSize.js";
-/**
- * Decrypt keystore definitions using a threadpool
- */
-export async function decryptKeystoreDefinitions(keystoreDefinitions, opts) {
-    if (opts.cacheFilePath) {
-        try {
-            const signers = await loadKeystoreCache(opts.cacheFilePath, keystoreDefinitions);
-            if (opts === null || opts === void 0 ? void 0 : opts.onDecrypt) {
-                opts === null || opts === void 0 ? void 0 : opts.onDecrypt(signers.length - 1);
-            }
-            opts.logger.debug("Loaded keystores via keystore cache");
-            return signers;
-        }
-        catch {
-            // Some error loading the cache, ignore and invalidate cache
-            await clearKeystoreCache(opts.cacheFilePath);
-        }
-    }
-    const signers = new Array(keystoreDefinitions.length);
-    const passwords = new Array(keystoreDefinitions.length);
-    const tasks = [];
-    const errors = [];
-    const pool = Pool(() => spawn(new Worker("./worker.js"), {
-        // The number below is big enough to almost disable the timeout which helps during tests run on unpredictablely slow hosts
-        timeout: 5 * 60 * 1000,
-    }), defaultPoolSize);
-    for (const [index, definition] of keystoreDefinitions.entries()) {
-        try {
-            lockFilepath(definition.keystorePath);
-        }
-        catch (e) {
-            if (opts.ignoreLockFile) {
-                opts.logger.warn("Keystore forcefully loaded even though lockfile exists", {
-                    path: definition.keystorePath,
-                });
-            }
-            else {
-                throw e;
-            }
-        }
-        const task = pool.queue((thread) => thread.decryptKeystoreDefinition(definition));
-        tasks.push(task);
-        task
-            .then((secretKeyBytes) => {
-            const signer = {
-                type: SignerType.Local,
-                secretKey: bls.SecretKey.fromBytes(secretKeyBytes),
-            };
-            signers[index] = signer;
-            passwords[index] = definition.password;
-            if (opts === null || opts === void 0 ? void 0 : opts.onDecrypt) {
-                opts === null || opts === void 0 ? void 0 : opts.onDecrypt(index);
-            }
-        })
-            .catch((e) => {
-            // In-progress tasks can't be canceled, so there's a chance that multiple errors may be caught
-            // add to the list of errors
-            errors.push(e);
-            // cancel all pending tasks, no need to continue decrypting after we hit one error
-            for (const task of tasks) {
-                task.cancel();
-            }
-        });
-    }
-    try {
-        // only resolves if there are no errored tasks
-        await pool.completed(true);
-    }
-    catch (e) {
-        // If an error occurs, the program isn't going to be running,
-        // so we should unlock all lockfiles we created
-        for (const { keystorePath } of keystoreDefinitions) {
-            unlockFilepath(keystorePath);
-        }
-        throw new AggregateError(errors);
-    }
-    finally {
-        await pool.terminate();
-    }
-    if (opts.cacheFilePath) {
-        await writeKeystoreCache(opts.cacheFilePath, signers, passwords);
-        opts.logger.debug("Written keystores to keystore cache");
-    }
-    return signers;
-}
-//# sourceMappingURL=index.js.map

package/lib/cmds/validator/keymanager/decryptKeystoreDefinitions/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/cmds/validator/keymanager/decryptKeystoreDefinitions/index.ts"],"names":[],"mappings":"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"}

package/lib/cmds/validator/keymanager/decryptKeystoreDefinitions/poolSize.d.ts

@@ -1,6 +0,0 @@
-declare let defaultPoolSize: number;
-/**
- * Cross-platform aprox number of logical cores
- */
-export { defaultPoolSize };
-//# sourceMappingURL=poolSize.d.ts.map