chore: address PR comments

ChainSafe · Jan 21, 2025 · e1e9a64 · e1e9a64
1 parent 6f82fe7
commit e1e9a64
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/packages/beacon-node/src/network/peers/discover.ts b/packages/beacon-node/src/network/peers/discover.ts
@@ -18,7 +18,7 @@ import {NodeId, computeNodeId} from "../subnets/interface.js";
 import {getDataColumnSubnets} from "../../util/dataColumns.js";
 import {deserializeEnrSubnets, zeroAttnets, zeroSyncnets} from "./utils/enrSubnetsDeserialize.js";
 import {IPeerRpcScoreStore, ScoreState} from "./score/index.js";
-import {ColumnSubnetId} from "./peersData.js";
+import {type ColumnSubnetQueries } from "./utils/prioritizePeers.js";
 
 /** Max number of cached ENRs after discovering a good peer */
 const MAX_CACHED_ENRS = 100;
@@ -87,11 +87,6 @@ export type SubnetDiscvQueryMs = {
   maxPeersToDiscover: number;
 };
 
-/**
- * A map of column subnet id to maxPeersToDiscover
- */
-type ColumnSubnetQueries = Map<ColumnSubnetId, number>;
-
 type CachedENR = {
   peerId: PeerId;
   multiaddrTCP: Multiaddr;

diff --git a/packages/beacon-node/src/network/peers/peerManager.ts b/packages/beacon-node/src/network/peers/peerManager.ts
@@ -334,7 +334,7 @@ export class PeerManager {
       const oldMetadata = peerData.metadata;
       const csc = (metadata as Partial<peerdas.Metadata>).csc ?? this.config.CUSTODY_REQUIREMENT;
       const nodeId = peerData?.nodeId ?? computeNodeId(peer);
-      const custodySubnets = (csc !== oldMetadata?.csc || oldMetadata?.custodySubnets == null)? getDataColumnSubnets(nodeId, csc) : oldMetadata?.custodySubnets;
+      const custodySubnets = (oldMetadata == null || oldMetadata.custodySubnets == null || csc !== oldMetadata.csc) ? getDataColumnSubnets(nodeId, csc) : oldMetadata.custodySubnets;
       peerData.metadata = {
         seqNumber: metadata.seqNumber,
         attnets: metadata.attnets,

diff --git a/packages/beacon-node/src/network/peers/utils/prioritizePeers.ts b/packages/beacon-node/src/network/peers/utils/prioritizePeers.ts
@@ -44,7 +44,7 @@ type SubnetDiscvQuery = {subnet: number; toSlot: number; maxPeersToDiscover: num
 /**
  * A map of column subnet id to maxPeersToDiscover
  */
-type ColumnSubnetQueries = Map<ColumnSubnetId, number>;
+export type ColumnSubnetQueries = Map<ColumnSubnetId, number>;
 
 type PeerInfo = {
   id: PeerId;