@lodestar/beacon-node 1.32.0-dev.42e678f502 → 1.32.0-dev.48f2ff71ae

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (103) hide show
  1. package/lib/api/impl/beacon/blocks/index.js +22 -5
  2. package/lib/api/impl/beacon/blocks/index.js.map +1 -1
  3. package/lib/api/impl/validator/index.js +43 -29
  4. package/lib/api/impl/validator/index.js.map +1 -1
  5. package/lib/chain/archiveStore/archiveStore.js +1 -1
  6. package/lib/chain/archiveStore/archiveStore.js.map +1 -1
  7. package/lib/chain/archiveStore/historicalState/metrics.js +13 -0
  8. package/lib/chain/archiveStore/historicalState/metrics.js.map +1 -1
  9. package/lib/chain/archiveStore/utils/archiveBlocks.d.ts +1 -1
  10. package/lib/chain/archiveStore/utils/archiveBlocks.js +29 -1
  11. package/lib/chain/archiveStore/utils/archiveBlocks.js.map +1 -1
  12. package/lib/chain/blocks/importBlock.js +1 -16
  13. package/lib/chain/blocks/importBlock.js.map +1 -1
  14. package/lib/chain/blocks/verifyBlocksDataAvailability.js +1 -1
  15. package/lib/chain/blocks/verifyBlocksDataAvailability.js.map +1 -1
  16. package/lib/chain/chain.d.ts +4 -4
  17. package/lib/chain/chain.js +12 -3
  18. package/lib/chain/chain.js.map +1 -1
  19. package/lib/chain/interface.d.ts +2 -2
  20. package/lib/chain/options.d.ts +2 -2
  21. package/lib/chain/produceBlock/produceBlockBody.d.ts +1 -1
  22. package/lib/chain/produceBlock/produceBlockBody.js +141 -108
  23. package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
  24. package/lib/chain/validation/blobSidecar.d.ts +1 -1
  25. package/lib/chain/validation/blobSidecar.js +6 -6
  26. package/lib/chain/validation/blobSidecar.js.map +1 -1
  27. package/lib/chain/validation/block.js +1 -1
  28. package/lib/chain/validation/block.js.map +1 -1
  29. package/lib/execution/engine/mock.js +3 -3
  30. package/lib/execution/engine/mock.js.map +1 -1
  31. package/lib/metrics/metrics/beacon.d.ts +3 -0
  32. package/lib/metrics/metrics/beacon.js +13 -0
  33. package/lib/metrics/metrics/beacon.js.map +1 -1
  34. package/lib/network/core/networkCore.d.ts +2 -2
  35. package/lib/network/core/networkCore.js +31 -33
  36. package/lib/network/core/networkCore.js.map +1 -1
  37. package/lib/network/core/types.d.ts +0 -4
  38. package/lib/network/discv5/utils.js +2 -2
  39. package/lib/network/discv5/utils.js.map +1 -1
  40. package/lib/network/forks.d.ts +8 -11
  41. package/lib/network/forks.js +35 -37
  42. package/lib/network/forks.js.map +1 -1
  43. package/lib/network/gossip/encoding.js +1 -1
  44. package/lib/network/gossip/encoding.js.map +1 -1
  45. package/lib/network/gossip/gossipsub.js +15 -6
  46. package/lib/network/gossip/gossipsub.js.map +1 -1
  47. package/lib/network/gossip/interface.d.ts +2 -3
  48. package/lib/network/gossip/interface.js.map +1 -1
  49. package/lib/network/gossip/scoringParameters.js +9 -10
  50. package/lib/network/gossip/scoringParameters.js.map +1 -1
  51. package/lib/network/gossip/topic.js +14 -13
  52. package/lib/network/gossip/topic.js.map +1 -1
  53. package/lib/network/metadata.js +9 -7
  54. package/lib/network/metadata.js.map +1 -1
  55. package/lib/network/network.js +37 -27
  56. package/lib/network/network.js.map +1 -1
  57. package/lib/network/processor/gossipHandlers.js +22 -10
  58. package/lib/network/processor/gossipHandlers.js.map +1 -1
  59. package/lib/network/processor/gossipQueues/index.js +1 -1
  60. package/lib/network/processor/gossipQueues/index.js.map +1 -1
  61. package/lib/network/processor/index.js +2 -2
  62. package/lib/network/processor/index.js.map +1 -1
  63. package/lib/network/reqresp/ReqRespBeaconNode.d.ts +2 -3
  64. package/lib/network/reqresp/ReqRespBeaconNode.js +7 -6
  65. package/lib/network/reqresp/ReqRespBeaconNode.js.map +1 -1
  66. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.d.ts +2 -0
  67. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js +23 -3
  68. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js.map +1 -1
  69. package/lib/network/reqresp/handlers/beaconBlocksByRange.js +3 -2
  70. package/lib/network/reqresp/handlers/beaconBlocksByRange.js.map +1 -1
  71. package/lib/network/reqresp/handlers/beaconBlocksByRoot.js +2 -1
  72. package/lib/network/reqresp/handlers/beaconBlocksByRoot.js.map +1 -1
  73. package/lib/network/reqresp/handlers/blobSidecarsByRange.js +2 -1
  74. package/lib/network/reqresp/handlers/blobSidecarsByRange.js.map +1 -1
  75. package/lib/network/reqresp/handlers/blobSidecarsByRoot.js +2 -1
  76. package/lib/network/reqresp/handlers/blobSidecarsByRoot.js.map +1 -1
  77. package/lib/network/reqresp/handlers/lightClientBootstrap.js +4 -3
  78. package/lib/network/reqresp/handlers/lightClientBootstrap.js.map +1 -1
  79. package/lib/network/reqresp/handlers/lightClientFinalityUpdate.js +4 -3
  80. package/lib/network/reqresp/handlers/lightClientFinalityUpdate.js.map +1 -1
  81. package/lib/network/reqresp/handlers/lightClientOptimisticUpdate.js +4 -3
  82. package/lib/network/reqresp/handlers/lightClientOptimisticUpdate.js.map +1 -1
  83. package/lib/network/reqresp/handlers/lightClientUpdatesByRange.js +4 -3
  84. package/lib/network/reqresp/handlers/lightClientUpdatesByRange.js.map +1 -1
  85. package/lib/network/reqresp/handlers/status.js +2 -2
  86. package/lib/network/reqresp/handlers/status.js.map +1 -1
  87. package/lib/network/reqresp/protocols.js +1 -1
  88. package/lib/network/reqresp/protocols.js.map +1 -1
  89. package/lib/network/subnets/attnetsService.d.ts +3 -4
  90. package/lib/network/subnets/attnetsService.js +14 -13
  91. package/lib/network/subnets/attnetsService.js.map +1 -1
  92. package/lib/network/subnets/interface.d.ts +3 -3
  93. package/lib/network/subnets/syncnetsService.d.ts +3 -4
  94. package/lib/network/subnets/syncnetsService.js +11 -11
  95. package/lib/network/subnets/syncnetsService.js.map +1 -1
  96. package/lib/node/nodejs.js +0 -6
  97. package/lib/node/nodejs.js.map +1 -1
  98. package/lib/sync/unknownBlock.js +1 -0
  99. package/lib/sync/unknownBlock.js.map +1 -1
  100. package/lib/util/kzg.d.ts +2 -34
  101. package/lib/util/kzg.js +2 -123
  102. package/lib/util/kzg.js.map +1 -1
  103. package/package.json +15 -15
package/lib/metrics/metrics/beacon.js CHANGED
@@ -43,6 +43,18 @@ export function createBeaconMetrics(register) {
43
43
  labelNames: ["status"],
44
44
  help: "number of validators in current epoch",
45
45
  }),
46
+ pendingDeposits: register.gauge({
47
+ name: "beacon_pending_deposits",
48
+ help: "Current number of pending deposits",
49
+ }),
50
+ pendingConsolidations: register.gauge({
51
+ name: "beacon_pending_consolidations",
52
+ help: "Current number of pending consolidations",
53
+ }),
54
+ pendingPartialWithdrawals: register.gauge({
55
+ name: "beacon_pending_partial_withdrawals",
56
+ help: "Current number of pending partial withdrawals",
57
+ }),
46
58
  // Non-spec'ed
47
59
  forkChoice: {
48
60
  findHead: register.histogram({
@@ -190,6 +202,7 @@ export function createBeaconMetrics(register) {
190
202
  name: "beacon_block_payload_fetched_time",
191
203
  help: "Time to fetch the payload from EL",
192
204
  labelNames: ["prepType"],
205
+ buckets: [0.1, 0.2, 0.3, 0.5, 0.7, 1, 2],
193
206
  }),
194
207
  emptyPayloads: register.gauge({
195
208
  name: "beacon_block_payload_empty_total",
package/lib/metrics/metrics/beacon.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"beacon.js","sourceRoot":"","sources":["../../../src/metrics/metrics/beacon.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"beacon.js","sourceRoot":"","sources":["../../../src/metrics/metrics/beacon.ts"],"names":[],"mappings":"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"}
package/lib/network/core/networkCore.d.ts CHANGED
@@ -84,7 +84,7 @@ export declare class NetworkCore implements INetworkCore {
84
84
  private readonly statusCache;
85
85
  private readonly metrics;
86
86
  private readonly opts;
87
- private readonly subscribedBoundariesByEpoch;
87
+ private readonly forkBoundariesByEpoch;
88
88
  private closed;
89
89
  constructor(modules: Mods);
90
90
  static init({ opts, config, privateKey, peerStoreDir, logger, metricsRegistry, events, clock, getReqRespHandler, activeValidatorCount, initialStatus, }: BaseNetworkInit): Promise<NetworkCore>;
@@ -128,7 +128,7 @@ export declare class NetworkCore implements INetworkCore {
128
128
  writeNetworkHeapSnapshot(): Promise<string>;
129
129
  writeDiscv5HeapSnapshot(prefix: string, dirpath: string): Promise<string>;
130
130
  /**
131
- * Handle subscriptions through subscribe boundary transitions, @see FORK_EPOCH_LOOKAHEAD
131
+ * Handle subscriptions through fork boundary transitions, @see FORK_EPOCH_LOOKAHEAD
132
132
  */
133
133
  private onEpoch;
134
134
  private subscribeCoreTopicsAtBoundary;
package/lib/network/core/networkCore.js CHANGED
@@ -5,7 +5,7 @@ import { multiaddr } from "@multiformats/multiaddr";
5
5
  import { formatNodePeer } from "../../api/impl/node/utils.js";
6
6
  import { ClockEvent } from "../../util/clock.js";
7
7
  import { peerIdFromString, peerIdToString } from "../../util/peerId.js";
8
- import { FORK_EPOCH_LOOKAHEAD, getActiveSubscribeBoundaries } from "../forks.js";
8
+ import { FORK_EPOCH_LOOKAHEAD, getActiveForkBoundaries } from "../forks.js";
9
9
  import { Eth2Gossipsub, getCoreTopicsAtFork } from "../gossip/index.js";
10
10
  import { createNodeJsLibp2p } from "../libp2p/index.js";
11
11
  import { MetadataController } from "../metadata.js";
@@ -37,46 +37,46 @@ import { createNetworkCoreMetrics } from "./metrics.js";
37
37
  export class NetworkCore {
38
38
  constructor(modules) {
39
39
  // Internal state
40
- this.subscribedBoundariesByEpoch = new Map();
40
+ this.forkBoundariesByEpoch = new Map();
41
41
  this.closed = false;
42
42
  /**
43
- * Handle subscriptions through subscribe boundary transitions, @see FORK_EPOCH_LOOKAHEAD
43
+ * Handle subscriptions through fork boundary transitions, @see FORK_EPOCH_LOOKAHEAD
44
44
  */
45
45
  this.onEpoch = async (epoch) => {
46
46
  try {
47
- // Compute prev and next fork shifted, so next fork is still next at forkEpoch + FORK_EPOCH_LOOKAHEAD
48
- const activeBoundaries = getActiveSubscribeBoundaries(this.config, epoch);
47
+ // Compute prev and next fork boundary shifted, so next boundary is still next at forkEpoch + FORK_EPOCH_LOOKAHEAD
48
+ const activeBoundaries = getActiveForkBoundaries(this.config, epoch);
49
49
  for (let i = 0; i < activeBoundaries.length; i++) {
50
- // Only when a new subscribe boundary is scheduled post this one
50
+ // Only when a new fork boundary is scheduled post this one
51
51
  if (activeBoundaries[i + 1] !== undefined) {
52
52
  const prevBoundary = activeBoundaries[i];
53
53
  const nextBoundary = activeBoundaries[i + 1];
54
- const nextBoundaryEpoch = this.config.forks[nextBoundary.fork].epoch;
55
- // Before subscribe boundary transition
54
+ const nextBoundaryEpoch = nextBoundary.epoch;
55
+ // Before fork boundary transition
56
56
  if (epoch === nextBoundaryEpoch - FORK_EPOCH_LOOKAHEAD) {
57
- // Don't subscribe to new boundary if the node is not subscribed to any topic
57
+ // Don't subscribe to new fork boundary if the node is not subscribed to any topic
58
58
  if (await this.isSubscribedToGossipCoreTopics()) {
59
59
  this.subscribeCoreTopicsAtBoundary(this.config, nextBoundary);
60
- this.logger.info("Subscribing gossip topics before boundary", nextBoundary);
60
+ this.logger.info("Subscribing gossip topics for next fork boundary", nextBoundary);
61
61
  }
62
62
  else {
63
- this.logger.info("Skipping subscribing gossip topics before boundary", nextBoundary);
63
+ this.logger.info("Skipping subscribing gossip topics for next fork boundary", nextBoundary);
64
64
  }
65
- this.attnetsService.subscribeSubnetsAfterBoundary(nextBoundary);
66
- this.syncnetsService.subscribeSubnetsAfterBoundary(nextBoundary);
65
+ this.attnetsService.subscribeSubnetsNextBoundary(nextBoundary);
66
+ this.syncnetsService.subscribeSubnetsNextBoundary(nextBoundary);
67
67
  }
68
- // On boundary transition
68
+ // On fork boundary transition
69
69
  if (epoch === nextBoundaryEpoch) {
70
70
  // updateEth2Field() MUST be called with clock epoch, onEpoch event is emitted in response to clock events
71
71
  this.metadata.updateEth2Field(epoch);
72
72
  this.reqResp.registerProtocolsAtBoundary(nextBoundary);
73
73
  }
74
- // After boundary transition
74
+ // After fork boundary transition
75
75
  if (epoch === nextBoundaryEpoch + FORK_EPOCH_LOOKAHEAD) {
76
- this.logger.info("Unsubscribing gossip topics before boundary", prevBoundary);
76
+ this.logger.info("Unsubscribing gossip topics of previous fork boundary", prevBoundary);
77
77
  this.unsubscribeCoreTopicsAtBoundary(this.config, prevBoundary);
78
- this.attnetsService.unsubscribeSubnetsBeforeBoundary(prevBoundary);
79
- this.syncnetsService.unsubscribeSubnetsBeforeBoundary(prevBoundary);
78
+ this.attnetsService.unsubscribeSubnetsPrevBoundary(prevBoundary);
79
+ this.syncnetsService.unsubscribeSubnetsPrevBoundary(prevBoundary);
80
80
  }
81
81
  }
82
82
  }
@@ -169,10 +169,10 @@ export class NetworkCore {
169
169
  peersData,
170
170
  statusCache,
171
171
  }, opts);
172
- // Network spec decides version changes based on clock fork, not head fork
173
- const forkCurrentSlot = config.getForkName(clock.currentSlot);
174
- // Register only ReqResp protocols relevant to clock's fork
175
- reqResp.registerProtocolsAtBoundary({ fork: forkCurrentSlot });
172
+ // Network spec decides version changes based on clock epoch, not head epoch
173
+ const boundary = config.getForkBoundaryAtEpoch(clock.currentEpoch);
174
+ // Register only ReqResp protocols relevant to clock's epoch
175
+ reqResp.registerProtocolsAtBoundary(boundary);
176
176
  // Bind discv5's ENR to local metadata
177
177
  // biome-ignore lint/complexity/useLiteralKeys: `discovery` is a private attribute
178
178
  discv5 = peerManager["discovery"]?.discv5;
@@ -254,7 +254,7 @@ export class NetworkCore {
254
254
  if (!(await this.isSubscribedToGossipCoreTopics())) {
255
255
  this.logger.info("Subscribed gossip core topics");
256
256
  }
257
- for (const boundary of getActiveSubscribeBoundaries(this.config, this.clock.currentEpoch)) {
257
+ for (const boundary of getActiveForkBoundaries(this.config, this.clock.currentEpoch)) {
258
258
  this.subscribeCoreTopicsAtBoundary(this.config, boundary);
259
259
  }
260
260
  }
@@ -262,12 +262,12 @@ export class NetworkCore {
262
262
  * Unsubscribe from all gossip events. Safe to call multiple times
263
263
  */
264
264
  async unsubscribeGossipCoreTopics() {
265
- for (const boundary of this.subscribedBoundariesByEpoch.values()) {
265
+ for (const boundary of this.forkBoundariesByEpoch.values()) {
266
266
  this.unsubscribeCoreTopicsAtBoundary(this.config, boundary);
267
267
  }
268
268
  }
269
269
  async isSubscribedToGossipCoreTopics() {
270
- return this.subscribedBoundariesByEpoch.size > 0;
270
+ return this.forkBoundariesByEpoch.size > 0;
271
271
  }
272
272
  sendReqRespRequest(data) {
273
273
  const peerId = peerIdFromString(data.peerId);
@@ -368,29 +368,27 @@ export class NetworkCore {
368
368
  return this.peerManager["discovery"]?.discv5.writeHeapSnapshot(prefix, dirpath) ?? Promise.resolve("no discv5");
369
369
  }
370
370
  subscribeCoreTopicsAtBoundary(config, boundary) {
371
- const epoch = config.forks[boundary.fork].epoch;
372
- if (this.subscribedBoundariesByEpoch.has(epoch))
371
+ if (this.forkBoundariesByEpoch.has(boundary.epoch))
373
372
  return;
374
- this.subscribedBoundariesByEpoch.set(epoch, boundary);
373
+ this.forkBoundariesByEpoch.set(boundary.epoch, boundary);
375
374
  const { subscribeAllSubnets, disableLightClientServer } = this.opts;
376
375
  for (const topic of getCoreTopicsAtFork(config, boundary.fork, {
377
376
  subscribeAllSubnets,
378
377
  disableLightClientServer,
379
378
  })) {
380
- this.gossip.subscribeTopic({ ...topic, fork: boundary.fork });
379
+ this.gossip.subscribeTopic({ ...topic, boundary });
381
380
  }
382
381
  }
383
382
  unsubscribeCoreTopicsAtBoundary(config, boundary) {
384
- const epoch = config.forks[boundary.fork].epoch;
385
- if (!this.subscribedBoundariesByEpoch.has(epoch))
383
+ if (!this.forkBoundariesByEpoch.has(boundary.epoch))
386
384
  return;
387
- this.subscribedBoundariesByEpoch.delete(epoch);
385
+ this.forkBoundariesByEpoch.delete(boundary.epoch);
388
386
  const { subscribeAllSubnets, disableLightClientServer } = this.opts;
389
387
  for (const topic of getCoreTopicsAtFork(config, boundary.fork, {
390
388
  subscribeAllSubnets,
391
389
  disableLightClientServer,
392
390
  })) {
393
- this.gossip.unsubscribeTopic({ ...topic, fork: boundary.fork });
391
+ this.gossip.unsubscribeTopic({ ...topic, boundary });
394
392
  }
395
393
  }
396
394
  }
package/lib/network/core/networkCore.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"networkCore.js","sourceRoot":"","sources":["../../../src/network/core/networkCore.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"networkCore.js","sourceRoot":"","sources":["../../../src/network/core/networkCore.ts"],"names":[],"mappings":"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"}
package/lib/network/core/types.d.ts CHANGED
@@ -3,7 +3,6 @@ import { PublishOpts } from "@chainsafe/libp2p-gossipsub/types";
3
3
  import { routes } from "@lodestar/api";
4
4
  import { SpecJson } from "@lodestar/config";
5
5
  import { LoggerNodeOpts } from "@lodestar/logger/node";
6
- import { ForkName } from "@lodestar/params";
7
6
  import { ResponseIncoming } from "@lodestar/reqresp";
8
7
  import { phase0 } from "@lodestar/types";
9
8
  import { PeerIdStr } from "../../util/peerId.js";
@@ -12,9 +11,6 @@ import { PeerAction, PeerScoreStats } from "../peers/index.js";
12
11
  import { OutgoingRequestArgs } from "../reqresp/types.js";
13
12
  import { CommitteeSubscription } from "../subnets/interface.js";
14
13
  export type MultiaddrStr = string;
15
- export type SubscribeBoundary = {
16
- fork: ForkName;
17
- };
18
14
  export interface INetworkCorePublic {
19
15
  prepareBeaconCommitteeSubnets(subscriptions: CommitteeSubscription[]): Promise<void>;
20
16
  prepareSyncCommitteeSubnets(subscriptions: CommitteeSubscription[]): Promise<void>;
package/lib/network/discv5/utils.js CHANGED
@@ -23,8 +23,8 @@ export function enrRelevance(enr, config, clock) {
23
23
  // Fast de-serialization without SSZ
24
24
  const forkDigest = eth2.slice(0, 4);
25
25
  // Check if forkDigest matches any of our known forks.
26
- const forkName = config.forkDigest2ForkNameOption(forkDigest);
27
- if (forkName == null) {
26
+ const { fork: forkName } = config.forkDigest2ForkBoundaryOption(forkDigest) ?? {};
27
+ if (forkName === undefined) {
28
28
  return ENRRelevance.unknown_forkDigest;
29
29
  }
30
30
  // Check if fork digest's fork matches ours
package/lib/network/discv5/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/network/discv5/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,8BAA8B,EAAC,MAAM,8BAA8B,CAAC;AAE5E,OAAO,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAEtC,MAAM,CAAN,IAAY,YAOX;AAPD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,mCAAmB,CAAA;IACnB,gGAAgG;IAChG,yDAAyC,CAAA;IACzC,+DAA+C,CAAA;IAC/C,qCAAqB,CAAA;AACvB,CAAC,EAPW,YAAY,KAAZ,YAAY,QAOvB;AAED,MAAM,UAAU,YAAY,CAAC,GAAQ,EAAE,MAAoB,EAAE,KAAa;IACxE,qEAAqE;IACrE,MAAM,YAAY,GAAG,GAAG,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1D,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,YAAY,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED,yDAAyD;IACzD,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,YAAY,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,oCAAoC;IACpC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpC,sDAAsD;IACtD,MAAM,QAAQ,GAAG,MAAM,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;IAC9D,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;QACrB,OAAO,YAAY,CAAC,kBAAkB,CAAC;IACzC,CAAC;IAED,2CAA2C;IAC3C,MAAM,WAAW,GAAG,KAAK,CAAC,uBAAuB,CAAC,8BAA8B,CAAC,CAAC;IAClF,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IACtD,8DAA8D;IAC9D,sFAAsF;IACtF,IAAI,QAAQ,KAAK,aAAa,CAAC,IAAI,IAAI,QAAQ,KAAK,aAAa,CAAC,YAAY,EAAE,CAAC;QAC/E,OAAO,YAAY,CAAC,qBAAqB,CAAC;IAC5C,CAAC;IAED,6EAA6E;IAC7E,4DAA4D;IAE5D,OAAO,YAAY,CAAC,QAAQ,CAAC;AAC/B,CAAC"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/network/discv5/utils.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,8BAA8B,EAAC,MAAM,8BAA8B,CAAC;AAE5E,OAAO,EAAC,MAAM,EAAC,MAAM,gBAAgB,CAAC;AAEtC,MAAM,CAAN,IAAY,YAOX;AAPD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,mCAAmB,CAAA;IACnB,gGAAgG;IAChG,yDAAyC,CAAA;IACzC,+DAA+C,CAAA;IAC/C,qCAAqB,CAAA;AACvB,CAAC,EAPW,YAAY,KAAZ,YAAY,QAOvB;AAED,MAAM,UAAU,YAAY,CAAC,GAAQ,EAAE,MAAoB,EAAE,KAAa;IACxE,qEAAqE;IACrE,MAAM,YAAY,GAAG,GAAG,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1D,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,YAAY,CAAC,MAAM,CAAC;IAC7B,CAAC;IAED,yDAAyD;IACzD,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,YAAY,CAAC,OAAO,CAAC;IAC9B,CAAC;IAED,oCAAoC;IACpC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpC,sDAAsD;IACtD,MAAM,EAAC,IAAI,EAAE,QAAQ,EAAC,GAAG,MAAM,CAAC,6BAA6B,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IAChF,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO,YAAY,CAAC,kBAAkB,CAAC;IACzC,CAAC;IAED,2CAA2C;IAC3C,MAAM,WAAW,GAAG,KAAK,CAAC,uBAAuB,CAAC,8BAA8B,CAAC,CAAC;IAClF,MAAM,aAAa,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IACtD,8DAA8D;IAC9D,sFAAsF;IACtF,IAAI,QAAQ,KAAK,aAAa,CAAC,IAAI,IAAI,QAAQ,KAAK,aAAa,CAAC,YAAY,EAAE,CAAC;QAC/E,OAAO,YAAY,CAAC,qBAAqB,CAAC;IAC5C,CAAC;IAED,6EAA6E;IAC7E,4DAA4D;IAE5D,OAAO,YAAY,CAAC,QAAQ,CAAC;AAC/B,CAAC"}
package/lib/network/forks.d.ts CHANGED
@@ -1,7 +1,5 @@
1
- import { ChainForkConfig, ForkInfo } from "@lodestar/config";
2
- import { ForkName } from "@lodestar/params";
1
+ import { ChainForkConfig, ForkBoundary } from "@lodestar/config";
3
2
  import { Epoch } from "@lodestar/types";
4
- import { SubscribeBoundary } from "./core/types.js";
5
3
  /**
6
4
  * Subscribe topics to the new fork N epochs before the fork. Remove all subscriptions N epochs after the fork
7
5
  *
@@ -29,16 +27,15 @@ import { SubscribeBoundary } from "./core/types.js";
29
27
  */
30
28
  export declare const FORK_EPOCH_LOOKAHEAD = 2;
31
29
  /**
32
- * Return the list of `ForkName`s meant to be active at `epoch`
33
- * @see FORK_EPOCH_LOOKAHEAD for details on when forks are considered 'active'
30
+ * Return the list of `ForkBoundary`s meant to be active at `epoch`
31
+ * @see FORK_EPOCH_LOOKAHEAD for details on when fork boundaries are considered 'active'
34
32
  */
35
- export declare function getActiveForks(config: ChainForkConfig, epoch: Epoch): ForkName[];
36
- export declare function getActiveSubscribeBoundaries(config: ChainForkConfig, epoch: Epoch): SubscribeBoundary[];
33
+ export declare function getActiveForkBoundaries(config: ChainForkConfig, epoch: Epoch): ForkBoundary[];
37
34
  /**
38
- * Return the currentFork and nextFork given a fork schedule and `epoch`
35
+ * Return the currentBoundary and nextBoundary given a fork/BPO schedule and `epoch`
39
36
  */
40
- export declare function getCurrentAndNextFork(config: ChainForkConfig, epoch: Epoch): {
41
- currentFork: ForkInfo;
42
- nextFork: ForkInfo | undefined;
37
+ export declare function getCurrentAndNextForkBoundary(config: ChainForkConfig, epoch: Epoch): {
38
+ currentBoundary: ForkBoundary;
39
+ nextBoundary: ForkBoundary | undefined;
43
40
  };
44
41
  //# sourceMappingURL=forks.d.ts.map
package/lib/network/forks.js CHANGED
@@ -25,59 +25,57 @@
25
25
  */
26
26
  export const FORK_EPOCH_LOOKAHEAD = 2;
27
27
  /**
28
- * Return the list of `ForkName`s meant to be active at `epoch`
29
- * @see FORK_EPOCH_LOOKAHEAD for details on when forks are considered 'active'
28
+ * Return the list of `ForkBoundary`s meant to be active at `epoch`
29
+ * @see FORK_EPOCH_LOOKAHEAD for details on when fork boundaries are considered 'active'
30
30
  */
31
- export function getActiveForks(config, epoch) {
32
- const activeForks = [];
33
- const forks = config.forksAscendingEpochOrder;
34
- for (let i = 0; i < forks.length; i++) {
35
- const currForkEpoch = forks[i].epoch;
36
- const nextForkEpoch = i >= forks.length - 1 ? Infinity : forks[i + 1].epoch;
37
- // Edge case: If multiple forks start at the same epoch, only consider the latest one
38
- if (currForkEpoch === nextForkEpoch) {
31
+ export function getActiveForkBoundaries(config, epoch) {
32
+ const activeBoundaries = [];
33
+ const { forkBoundariesAscendingEpochOrder } = config;
34
+ for (let i = 0; i < forkBoundariesAscendingEpochOrder.length; i++) {
35
+ const currentForkBoundary = forkBoundariesAscendingEpochOrder[i];
36
+ const nextForkBoundary = forkBoundariesAscendingEpochOrder[i + 1];
37
+ const currentEpoch = currentForkBoundary.epoch;
38
+ const nextEpoch = nextForkBoundary !== undefined ? nextForkBoundary.epoch : Infinity;
39
+ // Edge case: If multiple fork boundaries start at the same epoch, only consider the latest one
40
+ if (currentEpoch === nextEpoch) {
39
41
  continue;
40
42
  }
41
- if (epoch >= currForkEpoch - FORK_EPOCH_LOOKAHEAD && epoch <= nextForkEpoch + FORK_EPOCH_LOOKAHEAD) {
42
- activeForks.push(forks[i].name);
43
+ if (epoch >= currentEpoch - FORK_EPOCH_LOOKAHEAD && epoch <= nextEpoch + FORK_EPOCH_LOOKAHEAD) {
44
+ activeBoundaries.push(currentForkBoundary);
43
45
  }
44
46
  }
45
- return activeForks;
46
- }
47
- export function getActiveSubscribeBoundaries(config, epoch) {
48
- const activeForks = getActiveForks(config, epoch);
49
- return activeForks.map((fork) => ({ fork }));
47
+ return activeBoundaries;
50
48
  }
51
49
  /**
52
- * Return the currentFork and nextFork given a fork schedule and `epoch`
50
+ * Return the currentBoundary and nextBoundary given a fork/BPO schedule and `epoch`
53
51
  */
54
- export function getCurrentAndNextFork(config, epoch) {
52
+ export function getCurrentAndNextForkBoundary(config, epoch) {
55
53
  if (epoch < 0) {
56
54
  epoch = 0;
57
55
  }
58
- // NOTE: forks are sorted by ascending epoch, phase0 first
59
- const forks = config.forksAscendingEpochOrder;
60
- let currentForkIdx = -1;
56
+ // NOTE: fork boundaries are sorted by ascending epoch
57
+ const boundaries = config.forkBoundariesAscendingEpochOrder;
58
+ let currentBoundaryIdx = -1;
61
59
  // findLastIndex
62
- for (let i = 0; i < forks.length; i++) {
63
- if (epoch >= forks[i].epoch)
64
- currentForkIdx = i;
60
+ for (let i = 0; i < boundaries.length; i++) {
61
+ if (epoch >= boundaries[i].epoch)
62
+ currentBoundaryIdx = i;
65
63
  }
66
- let nextForkIdx = currentForkIdx + 1;
67
- const hasNextFork = forks[nextForkIdx] !== undefined && forks[nextForkIdx].epoch !== Infinity;
68
- // Keep moving the needle of nextForkIdx if there the higher fork also exists on same epoch
69
- // for e.g. altair and bellatrix are on same epoch 6, next fork should be bellatrix
70
- if (hasNextFork) {
71
- for (let i = nextForkIdx + 1; i < forks.length; i++) {
72
- // If the fork's epoch is same as nextForkIdx (which is not equal to infinity),
73
- // update nextForkIdx to the same
74
- if (forks[i].epoch === forks[nextForkIdx].epoch)
75
- nextForkIdx = i;
64
+ let nextBoundaryIdx = currentBoundaryIdx + 1;
65
+ const hasNextBoundary = boundaries[nextBoundaryIdx] !== undefined && boundaries[nextBoundaryIdx].epoch !== Infinity;
66
+ // Keep moving the needle of nextBoundaryIdx if there the higher boundary also exists on same epoch
67
+ // for e.g. altair and bellatrix are on same epoch 6, next boundary should be bellatrix
68
+ if (hasNextBoundary) {
69
+ for (let i = nextBoundaryIdx + 1; i < boundaries.length; i++) {
70
+ // If the boundary's epoch is same as nextBoundaryIdx (which is not equal to infinity),
71
+ // update nextBoundaryIdx to the same
72
+ if (boundaries[i].epoch === boundaries[nextBoundaryIdx].epoch)
73
+ nextBoundaryIdx = i;
76
74
  }
77
75
  }
78
76
  return {
79
- currentFork: forks[currentForkIdx] || forks[0],
80
- nextFork: hasNextFork ? forks[nextForkIdx] : undefined,
77
+ currentBoundary: boundaries[currentBoundaryIdx] || boundaries[0],
78
+ nextBoundary: hasNextBoundary ? boundaries[nextBoundaryIdx] : undefined,
81
79
  };
82
80
  }
83
81
  //# sourceMappingURL=forks.js.map
package/lib/network/forks.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"forks.js","sourceRoot":"","sources":["../../src/network/forks.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAEtC;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,MAAuB,EAAE,KAAY;IAClE,MAAM,WAAW,GAAe,EAAE,CAAC;IACnC,MAAM,KAAK,GAAG,MAAM,CAAC,wBAAwB,CAAC;IAE9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QACrC,MAAM,aAAa,GAAG,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;QAE5E,qFAAqF;QACrF,IAAI,aAAa,KAAK,aAAa,EAAE,CAAC;YACpC,SAAS;QACX,CAAC;QAED,IAAI,KAAK,IAAI,aAAa,GAAG,oBAAoB,IAAI,KAAK,IAAI,aAAa,GAAG,oBAAoB,EAAE,CAAC;YACnG,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,MAAuB,EAAE,KAAY;IAChF,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAElD,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAC,IAAI,EAAC,CAAC,CAAC,CAAC;AAC7C,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,qBAAqB,CACnC,MAAuB,EACvB,KAAY;IAEZ,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACd,KAAK,GAAG,CAAC,CAAC;IACZ,CAAC;IAED,0DAA0D;IAC1D,MAAM,KAAK,GAAG,MAAM,CAAC,wBAAwB,CAAC;IAC9C,IAAI,cAAc,GAAG,CAAC,CAAC,CAAC;IACxB,gBAAgB;IAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,IAAI,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK;YAAE,cAAc,GAAG,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,WAAW,GAAG,cAAc,GAAG,CAAC,CAAC;IACrC,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,SAAS,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC;IAC9F,2FAA2F;IAC3F,mFAAmF;IACnF,IAAI,WAAW,EAAE,CAAC;QAChB,KAAK,IAAI,CAAC,GAAG,WAAW,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACpD,+EAA+E;YAC/E,iCAAiC;YACjC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,WAAW,CAAC,CAAC,KAAK;gBAAE,WAAW,GAAG,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED,OAAO;QACL,WAAW,EAAE,KAAK,CAAC,cAAc,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;QAC9C,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;KACvD,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"forks.js","sourceRoot":"","sources":["../../src/network/forks.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAEtC;;;GAGG;AACH,MAAM,UAAU,uBAAuB,CAAC,MAAuB,EAAE,KAAY;IAC3E,MAAM,gBAAgB,GAAmB,EAAE,CAAC;IAC5C,MAAM,EAAC,iCAAiC,EAAC,GAAG,MAAM,CAAC;IAEnD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iCAAiC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClE,MAAM,mBAAmB,GAAG,iCAAiC,CAAC,CAAC,CAAC,CAAC;QACjE,MAAM,gBAAgB,GAAG,iCAAiC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAElE,MAAM,YAAY,GAAG,mBAAmB,CAAC,KAAK,CAAC;QAC/C,MAAM,SAAS,GAAG,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;QAErF,+FAA+F;QAC/F,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,SAAS;QACX,CAAC;QAED,IAAI,KAAK,IAAI,YAAY,GAAG,oBAAoB,IAAI,KAAK,IAAI,SAAS,GAAG,oBAAoB,EAAE,CAAC;YAC9F,gBAAgB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,6BAA6B,CAC3C,MAAuB,EACvB,KAAY;IAEZ,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACd,KAAK,GAAG,CAAC,CAAC;IACZ,CAAC;IAED,sDAAsD;IACtD,MAAM,UAAU,GAAG,MAAM,CAAC,iCAAiC,CAAC;IAC5D,IAAI,kBAAkB,GAAG,CAAC,CAAC,CAAC;IAC5B,gBAAgB;IAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3C,IAAI,KAAK,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK;YAAE,kBAAkB,GAAG,CAAC,CAAC;IAC3D,CAAC;IAED,IAAI,eAAe,GAAG,kBAAkB,GAAG,CAAC,CAAC;IAC7C,MAAM,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC,KAAK,SAAS,IAAI,UAAU,CAAC,eAAe,CAAC,CAAC,KAAK,KAAK,QAAQ,CAAC;IACpH,mGAAmG;IACnG,uFAAuF;IACvF,IAAI,eAAe,EAAE,CAAC;QACpB,KAAK,IAAI,CAAC,GAAG,eAAe,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC7D,uFAAuF;YACvF,qCAAqC;YACrC,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,UAAU,CAAC,eAAe,CAAC,CAAC,KAAK;gBAAE,eAAe,GAAG,CAAC,CAAC;QACrF,CAAC;IACH,CAAC;IAED,OAAO;QACL,eAAe,EAAE,UAAU,CAAC,kBAAkB,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC;QAChE,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,SAAS;KACxE,CAAC;AACJ,CAAC"}
package/lib/network/gossip/encoding.js CHANGED
@@ -32,7 +32,7 @@ export function msgIdToStrFn(msgId) {
32
32
  export function msgIdFn(gossipTopicCache, msg) {
33
33
  const topic = gossipTopicCache.getTopic(msg.topic);
34
34
  let vec;
35
- if (topic.fork === ForkName.phase0) {
35
+ if (topic.boundary.fork === ForkName.phase0) {
36
36
  // message id for phase0.
37
37
  // ```
38
38
  // SHA256(MESSAGE_DOMAIN_VALID_SNAPPY + snappy_decompress(message.data))[:20]
package/lib/network/gossip/encoding.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"encoding.js","sourceRoot":"","sources":["../../../src/network/gossip/encoding.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"encoding.js","sourceRoot":"","sources":["../../../src/network/gossip/encoding.ts"],"names":[],"mappings":"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"}
package/lib/network/gossip/gossipsub.js CHANGED
@@ -131,6 +131,7 @@ export class Eth2Gossipsub extends GossipSub {
131
131
  ]) {
132
132
  // Pre-aggregate results by fork so we can fill the remaining metrics with 0
133
133
  const peersByTypeByFork = new Map2d();
134
+ // TODO: This shouldnt be by fork, but by boundary
134
135
  const peersByBeaconAttSubnetByFork = new Map2dArr();
135
136
  const peersByBeaconSyncSubnetByFork = new Map2dArr();
136
137
  // loop through all mesh entries, count each set size
@@ -142,14 +143,15 @@ export class Eth2Gossipsub extends GossipSub {
142
143
  // for example in prater: /eth2/82f4a72b/optimistic_light_client_update_v0/ssz_snappy
143
144
  const topic = this.gossipTopicCache.getKnownTopic(topicString);
144
145
  if (topic !== undefined) {
146
+ const { fork } = topic.boundary;
145
147
  if (topic.type === GossipType.beacon_attestation) {
146
- peersByBeaconAttSubnetByFork.set(topic.fork, topic.subnet, peers.size);
148
+ peersByBeaconAttSubnetByFork.set(fork, topic.subnet, peers.size);
147
149
  }
148
150
  else if (topic.type === GossipType.sync_committee) {
149
- peersByBeaconSyncSubnetByFork.set(topic.fork, topic.subnet, peers.size);
151
+ peersByBeaconSyncSubnetByFork.set(fork, topic.subnet, peers.size);
150
152
  }
151
153
  else {
152
- peersByTypeByFork.set(topic.fork, topic.type, peers.size);
154
+ peersByTypeByFork.set(fork, topic.type, peers.size);
153
155
  }
154
156
  }
155
157
  if (type === "mesh") {
@@ -252,13 +254,20 @@ function attSubnetLabel(subnet) {
252
254
  }
253
255
  function getMetricsTopicStrToLabel(config, opts) {
254
256
  const metricsTopicStrToLabel = new Map();
255
- for (const { name: fork } of config.forksAscendingEpochOrder) {
256
- const topics = getCoreTopicsAtFork(config, fork, {
257
+ const { forkBoundariesAscendingEpochOrder } = config;
258
+ for (let i = 0; i < forkBoundariesAscendingEpochOrder.length; i++) {
259
+ const currentForkBoundary = forkBoundariesAscendingEpochOrder[i];
260
+ const nextForkBoundary = forkBoundariesAscendingEpochOrder[i + 1];
261
+ // Edge case: If multiple fork boundaries start at the same epoch, only consider the latest one
262
+ if (nextForkBoundary && currentForkBoundary.epoch === nextForkBoundary.epoch) {
263
+ continue;
264
+ }
265
+ const topics = getCoreTopicsAtFork(config, currentForkBoundary.fork, {
257
266
  subscribeAllSubnets: true,
258
267
  disableLightClientServer: opts.disableLightClientServer,
259
268
  });
260
269
  for (const topic of topics) {
261
- metricsTopicStrToLabel.set(stringifyGossipTopic(config, { ...topic, fork }), topic.type);
270
+ metricsTopicStrToLabel.set(stringifyGossipTopic(config, { ...topic, boundary: currentForkBoundary }), topic.type);
262
271
  }
263
272
  }
264
273
  return metricsTopicStrToLabel;