@lodestar/beacon-node 1.50.0-dev.040a952dd7 → 1.50.0-dev.199b9d3a1f

package/src/node/nodejs.ts

@@ -1,12 +1,6 @@
 import {setMaxListeners} from "node:events";
 import {PrivateKey} from "@libp2p/interface";
 import {Registry} from "prom-client";
-import {
-  init as initNativeMetrics,
-  registerLocalValidator as registerNativeLocalValidator,
-  scrapeMetrics as scrapeNativeMetrics,
-  unregisterLocalValidator as unregisterNativeLocalValidator,
-} from "@chainsafe/lodestar-z/metrics";
 import {type PubkeyCache} from "@chainsafe/lodestar-z/pubkeys";
 import {hasher} from "@chainsafe/persistent-merkle-tree";
 import {BeaconApiMethods} from "@lodestar/api/beacon/server";
@@ -177,13 +171,7 @@ export class BeaconNode {
       // monitoring relies on metrics data
       opts.monitoring.endpoint
     ) {
-      if (opts.chain.nativeStateTransition) {
-        initNativeMetrics();
-      }
-
-      metrics = createMetrics(opts.metrics, anchorState.genesisTime, metricsRegistries, {
-        includeStateTransitionMetrics: !opts.chain.nativeStateTransition,
-      });
+      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, metrics.flatFileStore);
@@ -197,13 +185,7 @@ export class BeaconNode {
             config,
             anchorState.genesisTime,
             logger.child({module: LoggerModule.vmon}),
-            opts.validatorMonitor,
-            opts.chain.nativeStateTransition
-              ? {
-                  registerLocalValidator: registerNativeLocalValidator,
-                  unregisterLocalValidator: unregisterNativeLocalValidator,
-                }
-              : null
+            opts.validatorMonitor
           )
         : null;
 
@@ -321,17 +303,7 @@ export class BeaconNode {
     const metricsServer = opts.metrics.enabled
       ? await getHttpMetricsServer(opts.metrics, {
           register: (metrics as Metrics).register,
-          getOtherMetrics: async () => {
-            const otherMetrics = await Promise.all([network.scrapeMetrics(), chain.archiveStore.scrapeMetrics()]);
-            if (opts.chain.nativeStateTransition) {
-              try {
-                otherMetrics.push(scrapeNativeMetrics());
-              } catch (e) {
-                logger.warn("Failed to scrape native state-transition metrics", {}, e as Error);
-              }
-            }
-            return otherMetrics;
-          },
+          getOtherMetrics: async () => Promise.all([network.scrapeMetrics(), chain.archiveStore.scrapeMetrics()]),
           logger: logger.child({module: LoggerModule.metrics}),
         })
       : null;