@lodestar/beacon-node 1.29.0-dev.706f45e815 → 1.29.0-dev.713062c107

package/lib/node/nodejs.d.ts

@@ -1,5 +1,5 @@
 import { Registry } from "prom-client";
-import { PeerId } from "@libp2p/interface";
+import { PrivateKey } from "@libp2p/interface";
 import { BeaconApiMethods } from "@lodestar/api/beacon/server";
 import { BeaconConfig } from "@lodestar/config";
 import type { LoggerNode } from "@lodestar/logger/node";
@@ -8,6 +8,7 @@ import { phase0 } from "@lodestar/types";
 import { ProcessShutdownCallback } from "@lodestar/validator";
 import { BeaconRestApiServer } from "../api/index.js";
 import { IBeaconChain } from "../chain/index.js";
+import { ValidatorMonitor } from "../chain/validatorMonitor.js";
 import { IBeaconDb } from "../db/index.js";
 import { HttpMetricsServer, Metrics } from "../metrics/index.js";
 import { MonitoringService } from "../monitoring/index.js";
@@ -21,6 +22,7 @@ export type BeaconNodeModules = {
     config: BeaconConfig;
     db: IBeaconDb;
     metrics: Metrics | null;
+    validatorMonitor: ValidatorMonitor | null;
     network: Network;
     chain: IBeaconChain;
     api: BeaconApiMethods;
@@ -37,7 +39,7 @@ export type BeaconNodeInitModules = {
     db: IBeaconDb;
     logger: LoggerNode;
     processShutdownCallback: ProcessShutdownCallback;
-    peerId: PeerId;
+    privateKey: PrivateKey;
     dataDir: string;
     peerStoreDir?: string;
     anchorState: BeaconStateAllForks;
@@ -60,6 +62,7 @@ export declare class BeaconNode {
     metrics: Metrics | null;
     metricsServer: HttpMetricsServer | null;
     monitoring: MonitoringService | null;
+    validatorMonitor: ValidatorMonitor | null;
     network: Network;
     chain: IBeaconChain;
     api: BeaconApiMethods;
@@ -68,12 +71,12 @@ export declare class BeaconNode {
     backfillSync: BackfillSync | null;
     status: BeaconNodeStatus;
     private controller?;
-    constructor({ opts, config, db, metrics, metricsServer, monitoring, network, chain, api, restApi, sync, backfillSync, controller, }: BeaconNodeModules);
+    constructor({ opts, config, db, metrics, metricsServer, monitoring, validatorMonitor, network, chain, api, restApi, sync, backfillSync, controller, }: BeaconNodeModules);
     /**
      * Initialize a beacon node.  Initializes and `start`s the varied sub-component services of the
      * beacon node
      */
-    static init<T extends BeaconNode = BeaconNode>({ opts, config, db, logger, processShutdownCallback, peerId, dataDir, peerStoreDir, anchorState, wsCheckpoint, metricsRegistries, }: BeaconNodeInitModules): Promise<T>;
+    static init<T extends BeaconNode = BeaconNode>({ opts, config, db, logger, processShutdownCallback, privateKey, dataDir, peerStoreDir, anchorState, wsCheckpoint, metricsRegistries, }: BeaconNodeInitModules): Promise<T>;
     /**
      * Stop beacon node and its sub-components.
      */

package/lib/node/nodejs.js

@@ -3,6 +3,7 @@ import { hasher } from "@chainsafe/persistent-merkle-tree";
 import { sleep } from "@lodestar/utils";
 import { BeaconRestApiServer, getApi } from "../api/index.js";
 import { BeaconChain, initBeaconMetrics } from "../chain/index.js";
+import { createValidatorMonitor } from "../chain/validatorMonitor.js";
 import { initializeEth1ForBlockProduction } from "../eth1/index.js";
 import { initializeExecutionBuilder, initializeExecutionEngine } from "../execution/index.js";
 import { createMetrics, getHttpMetricsServer } from "../metrics/index.js";
@@ -45,12 +46,13 @@ const DELAY_BEFORE_CLOSING_DB_MS = 500;
  * Ethereum Consensus ecosystem as well as systems for getting beacon node metadata.
  */
 export class BeaconNode {
-    constructor({ opts, config, db, metrics, metricsServer, monitoring, network, chain, api, restApi, sync, backfillSync, controller, }) {
+    constructor({ opts, config, db, metrics, metricsServer, monitoring, validatorMonitor, network, chain, api, restApi, sync, backfillSync, controller, }) {
         this.opts = opts;
         this.config = config;
         this.metrics = metrics;
         this.metricsServer = metricsServer;
         this.monitoring = monitoring;
+        this.validatorMonitor = validatorMonitor;
         this.db = db;
         this.chain = chain;
         this.api = api;
@@ -65,7 +67,7 @@ export class BeaconNode {
      * Initialize a beacon node.  Initializes and `start`s the varied sub-component services of the
      * beacon node
      */
-    static async init({ opts, config, db, logger, processShutdownCallback, peerId, dataDir, peerStoreDir, anchorState, wsCheckpoint, metricsRegistries = [], }) {
+    static async init({ opts, config, db, logger, processShutdownCallback, privateKey, dataDir, peerStoreDir, anchorState, wsCheckpoint, metricsRegistries = [], }) {
         if (hasher.name !== "hashtree") {
             throw Error(`Loaded incorrect hasher ${hasher.name}, expected hashtree`);
         }
@@ -83,12 +85,15 @@ export class BeaconNode {
         if (opts.metrics.enabled ||
             // monitoring relies on metrics data
             opts.monitoring.endpoint) {
-            metrics = createMetrics(opts.metrics, config, anchorState, logger.child({ module: LoggerModule.vmon }), metricsRegistries);
+            metrics = createMetrics(opts.metrics, anchorState.genesisTime, metricsRegistries);
             initBeaconMetrics(metrics, anchorState);
             // Since the db is instantiated before this, metrics must be injected manually afterwards
             db.setMetrics(metrics.db);
             signal.addEventListener("abort", metrics.close, { once: true });
         }
+        const validatorMonitor = opts.metrics.enabled || opts.validatorMonitor.validatorMonitorLogs
+            ? createValidatorMonitor(metrics, config, anchorState.genesisTime, logger.child({ module: LoggerModule.vmon }), opts.validatorMonitor)
+            : null;
         const clock = new Clock({ config, genesisTime: anchorState.genesisTime, signal });
         // Prune hot db repos
         // TODO: Should this call be awaited?
@@ -105,6 +110,7 @@ export class BeaconNode {
             logger: logger.child({ module: LoggerModule.chain }),
             processShutdownCallback,
             metrics,
+            validatorMonitor,
             anchorState,
             eth1: initializeEth1ForBlockProduction(opts.eth1, {
                 config,
@@ -133,7 +139,7 @@ export class BeaconNode {
             metrics,
             chain,
             db,
-            peerId,
+            privateKey,
             peerStoreDir,
             getReqRespHandler: getReqRespHandlers({ db, chain }),
         });
@@ -194,6 +200,7 @@ export class BeaconNode {
             metrics,
             metricsServer,
             monitoring,
+            validatorMonitor,
             network,
             chain,
             api,

package/lib/node/nodejs.js.map

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

package/lib/node/options.d.ts

@@ -1,5 +1,6 @@
 import { ApiOptions } from "../api/options.js";
 import { ArchiveMode, DEFAULT_ARCHIVE_MODE, IChainOptions } from "../chain/options.js";
+import { ValidatorMonitorOpts } from "../chain/validatorMonitor.js";
 import { DatabaseOptions } from "../db/options.js";
 import { Eth1Options } from "../eth1/options.js";
 import { ExecutionBuilderOpts, ExecutionEngineOpts, defaultExecutionBuilderHttpOpts, defaultExecutionEngineHttpOpts } from "../execution/index.js";
@@ -17,6 +18,7 @@ export interface IBeaconNodeOptions {
     executionEngine: ExecutionEngineOpts;
     executionBuilder: ExecutionBuilderOpts;
     metrics: MetricsOptions;
+    validatorMonitor: ValidatorMonitorOpts;
     monitoring: MonitoringOptions;
     network: NetworkOptions;
     sync: SyncOptions;

package/lib/node/options.js

@@ -1,5 +1,6 @@
 import { defaultApiOptions } from "../api/options.js";
 import { ArchiveMode, DEFAULT_ARCHIVE_MODE, defaultChainOptions } from "../chain/options.js";
+import { defaultValidatorMonitorOpts } from "../chain/validatorMonitor.js";
 import { defaultDbOptions } from "../db/options.js";
 import { defaultEth1Options } from "../eth1/options.js";
 import { defaultExecutionBuilderHttpOpts, defaultExecutionBuilderOpts, defaultExecutionEngineHttpOpts, defaultExecutionEngineOpts, } from "../execution/index.js";
@@ -19,6 +20,7 @@ export const defaultOptions = {
     executionEngine: defaultExecutionEngineOpts,
     executionBuilder: defaultExecutionBuilderOpts,
     metrics: defaultMetricsOptions,
+    validatorMonitor: defaultValidatorMonitorOpts,
     monitoring: defaultMonitoringOptions,
     network: defaultNetworkOptions,
     sync: defaultSyncOptions,

package/lib/node/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/node/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAC,WAAW,EAAE,oBAAoB,EAAiB,mBAAmB,EAAC,MAAM,qBAAqB,CAAC;AAC1G,OAAO,EAAkB,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAc,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAGL,+BAA+B,EAC/B,2BAA2B,EAC3B,8BAA8B,EAC9B,0BAA0B,GAC3B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAiB,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAoB,wBAAwB,EAAC,MAAM,0BAA0B,CAAC;AACrF,OAAO,EAAiB,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAc,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AACnE,8DAA8D;AAC9D,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAEnD,iDAAiD;AACjD,OAAO,EAAC,8BAA8B,EAAE,+BAA+B,EAAE,WAAW,EAAE,oBAAoB,EAAC,CAAC;AAe5G,MAAM,CAAC,MAAM,cAAc,GAAuB;IAChD,GAAG,EAAE,iBAAiB;IACtB,KAAK,EAAE,mBAAmB;IAC1B,EAAE,EAAE,gBAAgB;IACpB,IAAI,EAAE,kBAAkB;IACxB,eAAe,EAAE,0BAA0B;IAC3C,gBAAgB,EAAE,2BAA2B;IAC7C,OAAO,EAAE,qBAAqB;IAC9B,UAAU,EAAE,wBAAwB;IACpC,OAAO,EAAE,qBAAqB;IAC9B,IAAI,EAAE,kBAAkB;CACzB,CAAC"}
+{"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/node/options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,iBAAiB,EAAC,MAAM,mBAAmB,CAAC;AAChE,OAAO,EAAC,WAAW,EAAE,oBAAoB,EAAiB,mBAAmB,EAAC,MAAM,qBAAqB,CAAC;AAC1G,OAAO,EAAuB,2BAA2B,EAAC,MAAM,8BAA8B,CAAC;AAC/F,OAAO,EAAkB,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAc,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAGL,+BAA+B,EAC/B,2BAA2B,EAC3B,8BAA8B,EAC9B,0BAA0B,GAC3B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAiB,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAoB,wBAAwB,EAAC,MAAM,0BAA0B,CAAC;AACrF,OAAO,EAAiB,qBAAqB,EAAC,MAAM,uBAAuB,CAAC;AAC5E,OAAO,EAAc,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AACnE,8DAA8D;AAC9D,OAAO,EAAC,aAAa,EAAC,MAAM,sBAAsB,CAAC;AAEnD,iDAAiD;AACjD,OAAO,EAAC,8BAA8B,EAAE,+BAA+B,EAAE,WAAW,EAAE,oBAAoB,EAAC,CAAC;AAgB5G,MAAM,CAAC,MAAM,cAAc,GAAuB;IAChD,GAAG,EAAE,iBAAiB;IACtB,KAAK,EAAE,mBAAmB;IAC1B,EAAE,EAAE,gBAAgB;IACpB,IAAI,EAAE,kBAAkB;IACxB,eAAe,EAAE,0BAA0B;IAC3C,gBAAgB,EAAE,2BAA2B;IAC7C,OAAO,EAAE,qBAAqB;IAC9B,gBAAgB,EAAE,2BAA2B;IAC7C,UAAU,EAAE,wBAAwB;IACpC,OAAO,EAAE,qBAAqB;IAC9B,IAAI,EAAE,kBAAkB;CACzB,CAAC"}

package/lib/util/peerId.js

@@ -2,6 +2,6 @@ import { peerIdFromString } from "@libp2p/peer-id";
 import { base58btc } from "multiformats/bases/base58";
 export { peerIdFromString };
 export function peerIdToString(peerId) {
-    return base58btc.encode(peerId.multihash.bytes).slice(1);
+    return base58btc.encode(peerId.toMultihash().bytes).slice(1);
 }
 //# sourceMappingURL=peerId.js.map

package/lib/util/peerId.js.map

@@ -1 +1 @@
-{"version":3,"file":"peerId.js","sourceRoot":"","sources":["../../src/util/peerId.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AASpD,OAAO,EAAC,gBAAgB,EAAC,CAAC;AAE1B,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,OAAO,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAC3D,CAAC"}
+{"version":3,"file":"peerId.js","sourceRoot":"","sources":["../../src/util/peerId.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAC,SAAS,EAAC,MAAM,2BAA2B,CAAC;AASpD,OAAO,EAAC,gBAAgB,EAAC,CAAC;AAE1B,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,OAAO,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAC/D,CAAC"}

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.29.0-dev.706f45e815",
+  "version": "1.29.0-dev.713062c107",
   "type": "module",
   "exports": {
     ".": {
@@ -96,11 +96,10 @@
   "dependencies": {
     "@chainsafe/as-sha256": "^1.1.0",
     "@chainsafe/blst": "^2.1.0",
-    "@chainsafe/discv5": "^9.0.0",
-    "@chainsafe/enr": "^3.0.0",
-    "@chainsafe/libp2p-gossipsub": "^13.0.0",
-    "@chainsafe/libp2p-identify": "^1.0.0",
-    "@chainsafe/libp2p-noise": "^15.0.0",
+    "@chainsafe/discv5": "^11.0.0",
+    "@chainsafe/enr": "^5.0.0",
+    "@chainsafe/libp2p-gossipsub": "^14.1.1",
+    "@chainsafe/libp2p-noise": "^16.1.0",
     "@chainsafe/persistent-merkle-tree": "^1.1.0",
     "@chainsafe/prometheus-gc-stats": "^1.0.0",
     "@chainsafe/pubkey-index-map": "2.0.0",
@@ -111,38 +110,38 @@
     "@fastify/cors": "^10.0.1",
     "@fastify/swagger": "^9.0.0",
     "@fastify/swagger-ui": "^5.0.1",
-    "@libp2p/bootstrap": "^10.0.21",
-    "@libp2p/identify": "^1.0.20",
-    "@libp2p/interface": "^1.3.0",
-    "@libp2p/mdns": "^10.0.21",
-    "@libp2p/mplex": "^10.0.21",
-    "@libp2p/peer-id": "^4.1.0",
-    "@libp2p/peer-id-factory": "^4.1.0",
-    "@libp2p/prometheus-metrics": "^3.0.21",
-    "@libp2p/tcp": "9.0.23",
-    "@lodestar/api": "1.29.0-dev.706f45e815",
-    "@lodestar/config": "1.29.0-dev.706f45e815",
-    "@lodestar/db": "1.29.0-dev.706f45e815",
-    "@lodestar/fork-choice": "1.29.0-dev.706f45e815",
-    "@lodestar/light-client": "1.29.0-dev.706f45e815",
-    "@lodestar/logger": "1.29.0-dev.706f45e815",
-    "@lodestar/params": "1.29.0-dev.706f45e815",
-    "@lodestar/reqresp": "1.29.0-dev.706f45e815",
-    "@lodestar/state-transition": "1.29.0-dev.706f45e815",
-    "@lodestar/types": "1.29.0-dev.706f45e815",
-    "@lodestar/utils": "1.29.0-dev.706f45e815",
-    "@lodestar/validator": "1.29.0-dev.706f45e815",
+    "@libp2p/bootstrap": "^11.0.32",
+    "@libp2p/crypto": "^5.0.15",
+    "@libp2p/identify": "3.0.27",
+    "@libp2p/interface": "^2.7.0",
+    "@libp2p/mdns": "^11.0.32",
+    "@libp2p/mplex": "^11.0.32",
+    "@libp2p/peer-id": "^5.1.0",
+    "@libp2p/prometheus-metrics": "^4.3.15",
+    "@libp2p/tcp": "^10.1.8",
+    "@lodestar/api": "1.29.0-dev.713062c107",
+    "@lodestar/config": "1.29.0-dev.713062c107",
+    "@lodestar/db": "1.29.0-dev.713062c107",
+    "@lodestar/fork-choice": "1.29.0-dev.713062c107",
+    "@lodestar/light-client": "1.29.0-dev.713062c107",
+    "@lodestar/logger": "1.29.0-dev.713062c107",
+    "@lodestar/params": "1.29.0-dev.713062c107",
+    "@lodestar/reqresp": "1.29.0-dev.713062c107",
+    "@lodestar/state-transition": "1.29.0-dev.713062c107",
+    "@lodestar/types": "1.29.0-dev.713062c107",
+    "@lodestar/utils": "1.29.0-dev.713062c107",
+    "@lodestar/validator": "1.29.0-dev.713062c107",
     "@multiformats/multiaddr": "^12.1.3",
     "c-kzg": "^2.1.2",
-    "datastore-core": "^9.1.1",
-    "datastore-level": "^10.1.1",
+    "datastore-core": "^10.0.2",
+    "datastore-level": "^11.0.1",
     "deepmerge": "^4.3.1",
     "fastify": "^5.2.1",
-    "interface-datastore": "^8.2.7",
+    "interface-datastore": "^8.3.0",
     "it-all": "^3.0.4",
     "it-pipe": "^3.0.1",
     "jwt-simple": "0.5.6",
-    "libp2p": "1.4.3",
+    "libp2p": "2.8.2",
     "multiformats": "^11.0.1",
     "prom-client": "^15.1.0",
     "qs": "^6.11.1",
@@ -168,5 +167,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "cab3e4d64a10a76b744e9f687e702c23f516941f"
+  "gitHead": "647413d462e405d98fa6f76b83e73970078b8254"
 }

package/lib/metrics/validatorMonitor.js.map

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