@lodestar/beacon-node 1.45.0-dev.9ed373bf56 → 1.45.0-dev.b620872107

package/src/network/discv5/utils.ts

@@ -13,17 +13,9 @@ export enum ENRRelevance {
 }
 
 export function enrRelevance(enr: ENR, config: BeaconConfig, clock: IClock): ENRRelevance {
-  // We are not interested in peers that don't advertise at least one transport (tcp or quic).
-  let multiaddrTCP: ReturnType<ENR["getLocationMultiaddr"]>;
-  let multiaddrQUIC: ReturnType<ENR["getLocationMultiaddr"]>;
-  // Malformed ENR endpoint fields can make multiaddr conversion throw.
-  // Treat endpoints that cannot be converted as unusable.
-  try {
-    multiaddrTCP = enr.getLocationMultiaddr(ENRKey.tcp);
-    multiaddrQUIC = enr.getLocationMultiaddr(ENRKey.quic);
-  } catch {
-    return ENRRelevance.no_transport;
-  }
+  // We are not interested in peers that don't advertise at least one transport (tcp or quic)
+  const multiaddrTCP = enr.getLocationMultiaddr(ENRKey.tcp);
+  const multiaddrQUIC = enr.getLocationMultiaddr(ENRKey.quic);
   if (!multiaddrTCP && !multiaddrQUIC) {
     return ENRRelevance.no_transport;
   }

package/src/network/gossip/encoding.ts

@@ -52,13 +52,6 @@ export function fastMsgIdFn(rpcMsg: RPC.Message): string {
 }
 
 export function msgIdToStrFn(msgId: Uint8Array): string {
-  // Spec mandates a 20-byte gossipsub message-id, but control-message IDs from peers
-  // can be any length. Reject non-20-byte IDs to avoid a Buffer.set() RangeError on
-  // longer IDs and stale shared-buffer bytes on shorter ones.
-  // Ref: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.10/specs/phase0/p2p-interface.md?plain=1#L486
-  if (msgId.length !== 20) {
-    throw Error(`Expect msgId to be 20 bytes, got ${msgId.length}`);
-  }
   // this is the same logic to `toHex(msgId)` with better performance
   sharedMsgIdBuf.set(msgId);
   return `0x${sharedMsgIdBuf.toString("hex")}`;

package/src/network/peers/peerManager.ts

@@ -415,10 +415,8 @@ export class PeerManager {
       );
       if (irrelevantReasonType === null) {
         isIrrelevant = false;
-        this.metrics?.peerManager.relevanceCheck.inc({result: "relevant"});
       } else {
         isIrrelevant = true;
-        this.metrics?.peerManager.relevanceCheck.inc({result: irrelevantReasonType.code});
         this.logger.debug("Irrelevant peer", {
           peer: prettyPrintPeerId(peer),
           reason: renderIrrelevantPeerType(irrelevantReasonType),
@@ -426,7 +424,6 @@ export class PeerManager {
       }
     } catch (e) {
       this.logger.error("Irrelevant peer - unexpected error", {peer: prettyPrintPeerId(peer)}, e as Error);
-      this.metrics?.peerManager.relevanceCheck.inc({result: "error"});
       isIrrelevant = true;
     }
 
@@ -555,18 +552,15 @@ export class PeerManager {
     for (const peer of connectedPeers) {
       switch (this.peerRpcScores.getScoreState(peer)) {
         case ScoreState.Banned:
-          this.metrics?.peerManager.peersPruned.inc({reason: "banned"});
           void this.goodbyeAndDisconnect(peer, GoodByeReasonCode.BANNED);
           break;
         case ScoreState.Disconnected:
-          this.metrics?.peerManager.peersPruned.inc({reason: "score_too_low"});
           void this.goodbyeAndDisconnect(peer, GoodByeReasonCode.SCORE_TOO_LOW);
           break;
         case ScoreState.Healthy:
           connectedHealthyPeers.push(peer);
       }
     }
-    this.metrics?.peerManager.peersEvaluated.observe(connectedHealthyPeers.length);
 
     const status = this.statusCache.get();
     const starved =
@@ -578,7 +572,6 @@ export class PeerManager {
     this.metrics?.peerManager.starved.set(starved ? 1 : 0);
     const forkSeq = this.config.getForkSeq(this.clock.currentSlot);
 
-    const prioritizeTimer = this.metrics?.peerManager.prioritizePeersDuration.startTimer();
     const {peersToDisconnect, peersToConnect, attnetQueries, syncnetQueries, custodyGroupQueries} = prioritizePeers(
       connectedHealthyPeers.map((peer) => {
         const peerData = this.connectedPeers.get(peer.toString());
@@ -608,7 +601,6 @@ export class PeerManager {
       this.config,
       this.metrics
     );
-    prioritizeTimer?.();
 
     const queriesMerged: SubnetDiscvQueryMs[] = [];
     for (const {type, queries} of [
@@ -640,7 +632,6 @@ export class PeerManager {
     // disconnect first to have more slots before we dial new peers
     for (const [reason, peers] of peersToDisconnect) {
       this.metrics?.peersRequestedToDisconnect.inc({reason}, peers.length);
-      this.metrics?.peerManager.peersPruned.inc({reason}, peers.length);
       for (const peer of peers) {
         void this.goodbyeAndDisconnect(peer, GoodByeReasonCode.TOO_MANY_PEERS);
       }
@@ -668,8 +659,6 @@ export class PeerManager {
       }
     }
 
-    this.metrics?.peerManager.connectedPeersMapSize.set(this.connectedPeers.size);
-
     timer?.();
 
     this.logger.debug("peerManager heartbeat result", {

package/src/network/peers/score/score.ts

@@ -1,5 +1,4 @@
 import {GoodByeReasonCode} from "../../../constants/network.js";
-import {NetworkCoreMetrics} from "../../core/metrics.js";
 import {
   COOL_DOWN_BEFORE_DECAY_MS,
   DEFAULT_SCORE,
@@ -24,15 +23,13 @@ export class RealScore implements IPeerScore {
   /** The final score, computed from the above */
   private score: number;
   private lastUpdate: number;
-  private readonly metrics: NetworkCoreMetrics | null;
 
-  constructor(metrics: NetworkCoreMetrics | null = null) {
+  constructor() {
     this.lodestarScore = DEFAULT_SCORE;
     this.gossipScore = DEFAULT_SCORE;
     this.score = DEFAULT_SCORE;
     this.ignoreNegativeGossipScore = false;
     this.lastUpdate = Date.now();
-    this.metrics = metrics;
   }
 
   isCoolingDown(): boolean {
@@ -139,10 +136,6 @@ export class RealScore implements IPeerScore {
     this.recomputeScore();
     const newState = scoreToState(this.score);
 
-    if (prevState !== newState) {
-      this.metrics?.peerManager.scoreStateTransitions.inc({from: prevState, to: newState});
-    }
-
     if (prevState !== ScoreState.Banned && newState === ScoreState.Banned) {
       // ban this peer for at least BANNED_BEFORE_DECAY_MS seconds
       this.lastUpdate = Date.now() + COOL_DOWN_BEFORE_DECAY_MS;

package/src/network/peers/score/store.ts

@@ -32,9 +32,7 @@ export class PeerRpcScoreStore implements IPeerRpcScoreStore {
   constructor(opts: PeerRpcScoreOpts = {}, metrics: NetworkCoreMetrics | null = null, logger: Logger | null = null) {
     this.metrics = metrics;
     this.logger = logger;
-    this.scores = opts.disablePeerScoring
-      ? new MapDef(() => new MaxScore())
-      : new MapDef(() => new RealScore(this.metrics));
+    this.scores = opts.disablePeerScoring ? new MapDef(() => new MaxScore()) : new MapDef(() => new RealScore());
   }
 
   getScore(peer: PeerId): number {
@@ -77,8 +75,6 @@ export class PeerRpcScoreStore implements IPeerRpcScoreStore {
   }
 
   update(): void {
-    const timer = this.metrics?.peerManager.scoreUpdateDuration.startTimer();
-
     // Bound size of data structures
     pruneSetToMax(this.scores, MAX_ENTRIES);
 
@@ -90,9 +86,6 @@ export class PeerRpcScoreStore implements IPeerRpcScoreStore {
         this.scores.delete(peerIdStr);
       }
     }
-
-    this.metrics?.peerManager.scoreMapSize.set(this.scores.size);
-    timer?.();
   }
 
   updateGossipsubScore(peerId: PeerIdStr, newScore: number, ignore: boolean): void {

package/src/network/peers/utils/prioritizePeers.ts

@@ -7,7 +7,6 @@ import {MapDef} from "@lodestar/utils";
 import {shuffle} from "../../../util/shuffle.js";
 import {sortBy} from "../../../util/sortBy.js";
 import {NetworkCoreMetrics} from "../../core/metrics.js";
-import {SubnetType} from "../../metadata.js";
 import {RequestedSubnet} from "./subnetMap.js";
 
 /** Target number of peers we'd like to have connected to a given long-lived subnet */
@@ -190,18 +189,6 @@ export function prioritizePeers(
 
   const connectedPeerCount = connectedPeers.length;
 
-  // Track the outbound peers invariant (we keep at least OUTBOUND_PEERS_RATIO outbound peers).
-  // Report 0 when there are no peers so the gauge doesn't go stale at its last value.
-  if (metrics) {
-    let outboundPeerCount = 0;
-    for (const peer of connectedPeers) {
-      if (peer.direction === "outbound") {
-        outboundPeerCount++;
-      }
-    }
-    metrics.peerManager.outboundPeersRatio.set(connectedPeerCount > 0 ? outboundPeerCount / connectedPeerCount : 0);
-  }
-
   if (connectedPeerCount < targetPeers) {
     // Need more peers.
     // Instead of attempting to connect the exact amount necessary this will overshoot a little since the success
@@ -269,7 +256,6 @@ function requestSubnetPeers(
 
     for (const {subnet, toSlot} of activeAttnets) {
       const peersInSubnet = peersPerSubnet.get(subnet) ?? 0;
-      metrics?.peerManager.peersPerActiveSubnet.observe({type: SubnetType.attnets}, peersInSubnet);
       if (peersInSubnet < targetSubnetPeers) {
         // We need more peers
         attnetQueries.push({subnet, toSlot, maxPeersToDiscover: targetSubnetPeers - peersInSubnet});
@@ -296,7 +282,6 @@ function requestSubnetPeers(
 
     for (const {subnet, toSlot} of activeSyncnets) {
       const peersInSubnet = peersPerSubnet.get(subnet) ?? 0;
-      metrics?.peerManager.peersPerActiveSubnet.observe({type: SubnetType.syncnets}, peersInSubnet);
       if (peersInSubnet < targetSubnetPeers) {
         // We need more peers
         syncnetQueries.push({subnet, toSlot, maxPeersToDiscover: targetSubnetPeers - peersInSubnet});