@lodestar/beacon-node 1.30.0-dev.fa898bb319 → 1.30.0-peerDAS.490e786a03

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 (250) hide show
  1. package/README.md +1 -1
  2. package/lib/api/impl/beacon/blocks/index.d.ts +1 -1
  3. package/lib/api/impl/beacon/blocks/index.js +44 -16
  4. package/lib/api/impl/beacon/blocks/index.js.map +1 -1
  5. package/lib/api/impl/beacon/pool/index.js +1 -1
  6. package/lib/api/impl/beacon/pool/index.js.map +1 -1
  7. package/lib/api/impl/beacon/state/index.js +14 -9
  8. package/lib/api/impl/beacon/state/index.js.map +1 -1
  9. package/lib/api/impl/lodestar/index.js.map +1 -1
  10. package/lib/api/impl/proof/index.js +4 -2
  11. package/lib/api/impl/proof/index.js.map +1 -1
  12. package/lib/api/impl/validator/index.js.map +1 -1
  13. package/lib/chain/archiveStore/archiveStore.d.ts +1 -2
  14. package/lib/chain/archiveStore/archiveStore.js +16 -15
  15. package/lib/chain/archiveStore/archiveStore.js.map +1 -1
  16. package/lib/chain/archiveStore/historicalState/worker.js +0 -2
  17. package/lib/chain/archiveStore/historicalState/worker.js.map +1 -1
  18. package/lib/chain/archiveStore/interface.d.ts +2 -1
  19. package/lib/chain/archiveStore/utils/archiveBlocks.d.ts +1 -1
  20. package/lib/chain/archiveStore/utils/archiveBlocks.js +88 -23
  21. package/lib/chain/archiveStore/utils/archiveBlocks.js.map +1 -1
  22. package/lib/chain/beaconProposerCache.d.ts +2 -3
  23. package/lib/chain/beaconProposerCache.js +4 -2
  24. package/lib/chain/beaconProposerCache.js.map +1 -1
  25. package/lib/chain/blocks/blockInput/blockInput.d.ts +164 -0
  26. package/lib/chain/blocks/blockInput/blockInput.js +522 -0
  27. package/lib/chain/blocks/blockInput/blockInput.js.map +1 -0
  28. package/lib/chain/blocks/blockInput/errors.d.ts +38 -0
  29. package/lib/chain/blocks/blockInput/errors.js +17 -0
  30. package/lib/chain/blocks/blockInput/errors.js.map +1 -0
  31. package/lib/chain/blocks/blockInput/index.d.ts +4 -0
  32. package/lib/chain/blocks/blockInput/index.js +4 -0
  33. package/lib/chain/blocks/blockInput/index.js.map +1 -0
  34. package/lib/chain/blocks/blockInput/types.d.ts +116 -0
  35. package/lib/chain/blocks/blockInput/types.js +19 -0
  36. package/lib/chain/blocks/blockInput/types.js.map +1 -0
  37. package/lib/chain/blocks/importBlock.js +56 -14
  38. package/lib/chain/blocks/importBlock.js.map +1 -1
  39. package/lib/chain/blocks/types.d.ts +65 -24
  40. package/lib/chain/blocks/types.js +39 -6
  41. package/lib/chain/blocks/types.js.map +1 -1
  42. package/lib/chain/blocks/verifyBlocksDataAvailability.js +21 -10
  43. package/lib/chain/blocks/verifyBlocksDataAvailability.js.map +1 -1
  44. package/lib/chain/blocks/writeBlockInputToDb.js +89 -15
  45. package/lib/chain/blocks/writeBlockInputToDb.js.map +1 -1
  46. package/lib/chain/bls/multithread/index.d.ts +1 -1
  47. package/lib/chain/bls/multithread/index.js +1 -1
  48. package/lib/chain/bls/multithread/index.js.map +1 -1
  49. package/lib/chain/bls/multithread/jobItem.d.ts +1 -1
  50. package/lib/chain/bls/multithread/jobItem.js +4 -12
  51. package/lib/chain/bls/multithread/jobItem.js.map +1 -1
  52. package/lib/chain/chain.d.ts +12 -4
  53. package/lib/chain/chain.js +24 -8
  54. package/lib/chain/chain.js.map +1 -1
  55. package/lib/chain/emitter.d.ts +18 -2
  56. package/lib/chain/emitter.js +13 -0
  57. package/lib/chain/emitter.js.map +1 -1
  58. package/lib/chain/errors/dataColumnSidecarError.d.ts +69 -0
  59. package/lib/chain/errors/dataColumnSidecarError.js +21 -0
  60. package/lib/chain/errors/dataColumnSidecarError.js.map +1 -0
  61. package/lib/chain/errors/index.d.ts +1 -0
  62. package/lib/chain/errors/index.js +1 -0
  63. package/lib/chain/errors/index.js.map +1 -1
  64. package/lib/chain/interface.d.ts +9 -3
  65. package/lib/chain/interface.js.map +1 -1
  66. package/lib/chain/options.d.ts +4 -1
  67. package/lib/chain/options.js +5 -0
  68. package/lib/chain/options.js.map +1 -1
  69. package/lib/chain/produceBlock/produceBlockBody.d.ts +4 -2
  70. package/lib/chain/produceBlock/produceBlockBody.js +11 -2
  71. package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
  72. package/lib/chain/produceBlock/validateBlobsAndKzgCommitments.d.ts +3 -2
  73. package/lib/chain/produceBlock/validateBlobsAndKzgCommitments.js +31 -2
  74. package/lib/chain/produceBlock/validateBlobsAndKzgCommitments.js.map +1 -1
  75. package/lib/chain/regen/queued.d.ts +0 -1
  76. package/lib/chain/regen/queued.js +0 -1
  77. package/lib/chain/regen/queued.js.map +1 -1
  78. package/lib/chain/seenCache/seenAttestationData.js.map +1 -1
  79. package/lib/chain/seenCache/seenGossipBlockInput.d.ts +61 -18
  80. package/lib/chain/seenCache/seenGossipBlockInput.js +254 -53
  81. package/lib/chain/seenCache/seenGossipBlockInput.js.map +1 -1
  82. package/lib/chain/validation/dataColumnSidecar.d.ts +28 -0
  83. package/lib/chain/validation/dataColumnSidecar.js +245 -0
  84. package/lib/chain/validation/dataColumnSidecar.js.map +1 -0
  85. package/lib/chain/validatorMonitor.d.ts +3 -3
  86. package/lib/chain/validatorMonitor.js +273 -56
  87. package/lib/chain/validatorMonitor.js.map +1 -1
  88. package/lib/db/beacon.d.ts +3 -1
  89. package/lib/db/beacon.js +3 -1
  90. package/lib/db/beacon.js.map +1 -1
  91. package/lib/db/buckets.d.ts +3 -1
  92. package/lib/db/buckets.js +2 -0
  93. package/lib/db/buckets.js.map +1 -1
  94. package/lib/db/interface.d.ts +3 -1
  95. package/lib/db/repositories/dataColumnSidecars.d.ts +47 -0
  96. package/lib/db/repositories/dataColumnSidecars.js +40 -0
  97. package/lib/db/repositories/dataColumnSidecars.js.map +1 -0
  98. package/lib/db/repositories/dataColumnSidecarsArchive.d.ts +15 -0
  99. package/lib/db/repositories/dataColumnSidecarsArchive.js +23 -0
  100. package/lib/db/repositories/dataColumnSidecarsArchive.js.map +1 -0
  101. package/lib/db/repositories/index.d.ts +2 -0
  102. package/lib/db/repositories/index.js +2 -0
  103. package/lib/db/repositories/index.js.map +1 -1
  104. package/lib/execution/engine/http.d.ts +5 -3
  105. package/lib/execution/engine/http.js +68 -31
  106. package/lib/execution/engine/http.js.map +1 -1
  107. package/lib/execution/engine/interface.d.ts +4 -2
  108. package/lib/execution/engine/interface.js +1 -1
  109. package/lib/execution/engine/interface.js.map +1 -1
  110. package/lib/execution/engine/mock.d.ts +1 -0
  111. package/lib/execution/engine/mock.js +5 -0
  112. package/lib/execution/engine/mock.js.map +1 -1
  113. package/lib/execution/engine/payloadIdCache.d.ts +0 -3
  114. package/lib/execution/engine/payloadIdCache.js +1 -2
  115. package/lib/execution/engine/payloadIdCache.js.map +1 -1
  116. package/lib/execution/engine/types.d.ts +10 -0
  117. package/lib/execution/engine/types.js +6 -0
  118. package/lib/execution/engine/types.js.map +1 -1
  119. package/lib/metrics/metrics/beacon.d.ts +8 -0
  120. package/lib/metrics/metrics/beacon.js +27 -0
  121. package/lib/metrics/metrics/beacon.js.map +1 -1
  122. package/lib/metrics/metrics/lodestar.d.ts +4 -68
  123. package/lib/metrics/metrics/lodestar.js +5 -215
  124. package/lib/metrics/metrics/lodestar.js.map +1 -1
  125. package/lib/network/core/metrics.d.ts +10 -3
  126. package/lib/network/core/metrics.js +22 -4
  127. package/lib/network/core/metrics.js.map +1 -1
  128. package/lib/network/core/networkCore.d.ts +8 -1
  129. package/lib/network/core/networkCore.js +23 -24
  130. package/lib/network/core/networkCore.js.map +1 -1
  131. package/lib/network/core/networkCoreWorker.js +2 -0
  132. package/lib/network/core/networkCoreWorker.js.map +1 -1
  133. package/lib/network/core/networkCoreWorkerHandler.d.ts +8 -4
  134. package/lib/network/core/networkCoreWorkerHandler.js +7 -0
  135. package/lib/network/core/networkCoreWorkerHandler.js.map +1 -1
  136. package/lib/network/core/types.d.ts +5 -1
  137. package/lib/network/events.d.ts +3 -1
  138. package/lib/network/events.js.map +1 -1
  139. package/lib/network/gossip/interface.d.ts +8 -1
  140. package/lib/network/gossip/interface.js +1 -0
  141. package/lib/network/gossip/interface.js.map +1 -1
  142. package/lib/network/gossip/topic.d.ts +1047 -1031
  143. package/lib/network/gossip/topic.js +20 -1
  144. package/lib/network/gossip/topic.js.map +1 -1
  145. package/lib/network/interface.d.ts +13 -1
  146. package/lib/network/metadata.d.ts +10 -6
  147. package/lib/network/metadata.js +23 -4
  148. package/lib/network/metadata.js.map +1 -1
  149. package/lib/network/network.d.ts +12 -2
  150. package/lib/network/network.js +57 -5
  151. package/lib/network/network.js.map +1 -1
  152. package/lib/network/networkConfig.d.ts +23 -0
  153. package/lib/network/networkConfig.js +32 -0
  154. package/lib/network/networkConfig.js.map +1 -0
  155. package/lib/network/options.js +2 -0
  156. package/lib/network/options.js.map +1 -1
  157. package/lib/network/peers/discover.d.ts +15 -6
  158. package/lib/network/peers/discover.js +139 -15
  159. package/lib/network/peers/discover.js.map +1 -1
  160. package/lib/network/peers/peerManager.d.ts +10 -2
  161. package/lib/network/peers/peerManager.js +96 -11
  162. package/lib/network/peers/peerManager.js.map +1 -1
  163. package/lib/network/peers/peersData.d.ts +8 -2
  164. package/lib/network/peers/peersData.js.map +1 -1
  165. package/lib/network/peers/score/interface.d.ts +2 -2
  166. package/lib/network/peers/score/interface.js.map +1 -1
  167. package/lib/network/peers/score/score.d.ts +2 -2
  168. package/lib/network/peers/score/score.js +4 -1
  169. package/lib/network/peers/score/score.js.map +1 -1
  170. package/lib/network/peers/score/store.d.ts +5 -2
  171. package/lib/network/peers/score/store.js +7 -3
  172. package/lib/network/peers/score/store.js.map +1 -1
  173. package/lib/network/peers/utils/prioritizePeers.d.ts +15 -4
  174. package/lib/network/peers/utils/prioritizePeers.js +30 -5
  175. package/lib/network/peers/utils/prioritizePeers.js.map +1 -1
  176. package/lib/network/processor/extractSlotRootFns.js +8 -1
  177. package/lib/network/processor/extractSlotRootFns.js.map +1 -1
  178. package/lib/network/processor/gossipHandlers.js +157 -9
  179. package/lib/network/processor/gossipHandlers.js.map +1 -1
  180. package/lib/network/processor/gossipQueues/index.js +5 -0
  181. package/lib/network/processor/gossipQueues/index.js.map +1 -1
  182. package/lib/network/processor/index.d.ts +1 -1
  183. package/lib/network/processor/index.js +5 -1
  184. package/lib/network/processor/index.js.map +1 -1
  185. package/lib/network/reqresp/ReqRespBeaconNode.js +21 -3
  186. package/lib/network/reqresp/ReqRespBeaconNode.js.map +1 -1
  187. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.d.ts +14 -5
  188. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js +199 -14
  189. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js.map +1 -1
  190. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.d.ts +32 -5
  191. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js +280 -26
  192. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js.map +1 -1
  193. package/lib/network/reqresp/handlers/beaconBlocksByRange.d.ts +1 -1
  194. package/lib/network/reqresp/handlers/beaconBlocksByRange.js.map +1 -1
  195. package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.d.ts +8 -0
  196. package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.js +106 -0
  197. package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.js.map +1 -0
  198. package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.d.ts +6 -0
  199. package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.js +57 -0
  200. package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.js.map +1 -0
  201. package/lib/network/reqresp/handlers/index.js +10 -0
  202. package/lib/network/reqresp/handlers/index.js.map +1 -1
  203. package/lib/network/reqresp/protocols.d.ts +3 -0
  204. package/lib/network/reqresp/protocols.js +15 -0
  205. package/lib/network/reqresp/protocols.js.map +1 -1
  206. package/lib/network/reqresp/rateLimit.js +11 -1
  207. package/lib/network/reqresp/rateLimit.js.map +1 -1
  208. package/lib/network/reqresp/types.d.ts +13 -6
  209. package/lib/network/reqresp/types.js +9 -2
  210. package/lib/network/reqresp/types.js.map +1 -1
  211. package/lib/network/subnets/interface.d.ts +3 -0
  212. package/lib/network/subnets/interface.js +14 -1
  213. package/lib/network/subnets/interface.js.map +1 -1
  214. package/lib/network/subnets/syncnetsService.js +4 -5
  215. package/lib/network/subnets/syncnetsService.js.map +1 -1
  216. package/lib/node/nodejs.js +4 -3
  217. package/lib/node/nodejs.js.map +1 -1
  218. package/lib/sync/interface.d.ts +2 -2
  219. package/lib/sync/interface.js +1 -1
  220. package/lib/sync/interface.js.map +1 -1
  221. package/lib/sync/range/batch.d.ts +8 -2
  222. package/lib/sync/range/batch.js +19 -7
  223. package/lib/sync/range/batch.js.map +1 -1
  224. package/lib/sync/range/chain.d.ts +7 -2
  225. package/lib/sync/range/chain.js +45 -21
  226. package/lib/sync/range/chain.js.map +1 -1
  227. package/lib/sync/range/range.js +3 -3
  228. package/lib/sync/range/range.js.map +1 -1
  229. package/lib/sync/range/utils/peerBalancer.d.ts +4 -1
  230. package/lib/sync/range/utils/peerBalancer.js +20 -2
  231. package/lib/sync/range/utils/peerBalancer.js.map +1 -1
  232. package/lib/sync/unknownBlock.d.ts +8 -1
  233. package/lib/sync/unknownBlock.js +222 -62
  234. package/lib/sync/unknownBlock.js.map +1 -1
  235. package/lib/util/blobs.d.ts +13 -1
  236. package/lib/util/blobs.js +44 -1
  237. package/lib/util/blobs.js.map +1 -1
  238. package/lib/util/dataColumns.d.ts +111 -0
  239. package/lib/util/dataColumns.js +277 -0
  240. package/lib/util/dataColumns.js.map +1 -0
  241. package/lib/util/kzg.d.ts +9 -21
  242. package/lib/util/kzg.js +12 -88
  243. package/lib/util/kzg.js.map +1 -1
  244. package/lib/util/metadata.d.ts +4 -0
  245. package/lib/util/metadata.js +7 -0
  246. package/lib/util/metadata.js.map +1 -1
  247. package/lib/util/sszBytes.d.ts +1 -0
  248. package/lib/util/sszBytes.js +17 -0
  249. package/lib/util/sszBytes.js.map +1 -1
  250. package/package.json +16 -16
@@ -1 +1 @@
1
- {"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/network/options.ts"],"names":[],"mappings":"AA8CA,MAAM,CAAC,MAAM,qBAAqB,GAAmB;IACnD,QAAQ,EAAE,GAAG,EAAE,0DAA0D;IACzE,WAAW,EAAE,GAAG;IAChB,eAAe,EAAE,CAAC,uBAAuB,CAAC;IAC1C,cAAc,EAAE,EAAE;IAClB,0BAA0B;IAC1B,MAAM,EAAE,IAAI;IACZ,mBAAmB,EAAE,CAAC;IACtB,SAAS,EAAE,IAAI;IACf,yFAAyF;IACzF,mBAAmB,EAAE,IAAI;IACzB,gFAAgF;IAChF,wBAAwB,EAAE,GAAG;IAC7B,kGAAkG;IAClG,oCAAoC,EAAE,CAAC;IACvC,sDAAsD;IACtD,wBAAwB,EAAE,KAAK;CAChC,CAAC"}
1
+ {"version":3,"file":"options.js","sourceRoot":"","sources":["../../src/network/options.ts"],"names":[],"mappings":"AA8CA,MAAM,CAAC,MAAM,qBAAqB,GAAmB;IACnD,QAAQ,EAAE,GAAG,EAAE,0DAA0D;IACzE,WAAW,EAAE,GAAG;IAChB,eAAe,EAAE,CAAC,uBAAuB,CAAC;IAC1C,cAAc,EAAE,EAAE;IAClB,0BAA0B;IAC1B,MAAM,EAAE,IAAI;IACZ,mBAAmB,EAAE,CAAC;IACtB,SAAS,EAAE,IAAI;IACf,yFAAyF;IACzF,mBAAmB,EAAE,IAAI;IACzB,gFAAgF;IAChF,wBAAwB,EAAE,GAAG;IAC7B,kGAAkG;IAClG,oCAAoC,EAAE,CAAC;IACvC,sDAAsD;IACtD,wBAAwB,EAAE,KAAK;IAC/B,wFAAwF;IACxF,gBAAgB,EAAE,CAAC;CACpB,CAAC"}
@@ -1,26 +1,30 @@
1
1
  import type { PrivateKey } from "@libp2p/interface";
2
- import { BeaconConfig } from "@lodestar/config";
3
2
  import { LoggerNode } from "@lodestar/logger/node";
4
3
  import { SubnetID } from "@lodestar/types";
4
+ import { IClock } from "../../util/clock.js";
5
5
  import { NetworkCoreMetrics } from "../core/metrics.js";
6
6
  import { Discv5Worker } from "../discv5/index.js";
7
7
  import { LodestarDiscv5Opts } from "../discv5/types.js";
8
8
  import { Libp2p } from "../interface.js";
9
9
  import { SubnetType } from "../metadata.js";
10
+ import { NetworkConfig } from "../networkConfig.js";
10
11
  import { IPeerRpcScoreStore } from "./score/index.js";
12
+ import { type GroupQueries } from "./utils/prioritizePeers.js";
11
13
  export type PeerDiscoveryOpts = {
12
- maxPeers: number;
13
14
  discv5FirstQueryDelayMs: number;
14
15
  discv5: LodestarDiscv5Opts;
15
16
  connectToDiscv5Bootnodes?: boolean;
17
+ onlyConnectToBiggerDataNodes?: boolean;
18
+ onlyConnectToMinimalCustodyOverlapNodes?: boolean;
16
19
  };
17
20
  export type PeerDiscoveryModules = {
18
21
  privateKey: PrivateKey;
22
+ networkConfig: NetworkConfig;
19
23
  libp2p: Libp2p;
24
+ clock: IClock;
20
25
  peerRpcScores: IPeerRpcScoreStore;
21
26
  metrics: NetworkCoreMetrics | null;
22
27
  logger: LoggerNode;
23
- config: BeaconConfig;
24
28
  };
25
29
  export declare enum DiscoveredPeerStatus {
26
30
  bad_score = "bad_score",
@@ -51,26 +55,31 @@ export type SubnetDiscvQueryMs = {
51
55
  export declare class PeerDiscovery {
52
56
  readonly discv5: Discv5Worker;
53
57
  private libp2p;
58
+ private readonly clock;
59
+ private nodeId;
54
60
  private peerRpcScores;
55
61
  private metrics;
56
62
  private logger;
63
+ private networkConfig;
57
64
  private config;
58
65
  private cachedENRs;
59
66
  private randomNodeQuery;
60
67
  private peersToConnect;
61
68
  private subnetRequests;
62
- /** The maximum number of peers we allow (exceptions for subnet peers) */
63
- private maxPeers;
69
+ private groupRequests;
64
70
  private discv5StartMs;
65
71
  private discv5FirstQueryDelayMs;
66
72
  private connectToDiscv5BootnodesOnStart;
73
+ private onlyConnectToBiggerDataNodes;
74
+ private onlyConnectToMinimalCustodyOverlapNodes;
67
75
  constructor(modules: PeerDiscoveryModules, opts: PeerDiscoveryOpts, discv5: Discv5Worker);
68
76
  static init(modules: PeerDiscoveryModules, opts: PeerDiscoveryOpts): Promise<PeerDiscovery>;
69
77
  stop(): Promise<void>;
70
78
  /**
71
79
  * Request to find peers, both on specific subnets and in general
80
+ * pre-fulu groupRequests is empty
72
81
  */
73
- discoverPeers(peersToConnect: number, subnetRequests?: SubnetDiscvQueryMs[]): void;
82
+ discoverPeers(peersToConnect: number, groupRequests: GroupQueries, subnetRequests?: SubnetDiscvQueryMs[]): void;
74
83
  /**
75
84
  * Request discv5 to find peers if there is no query in progress
76
85
  */
@@ -1,9 +1,13 @@
1
1
  import { ENR } from "@chainsafe/enr";
2
- import { ATTESTATION_SUBNET_COUNT, SYNC_COMMITTEE_SUBNET_COUNT } from "@lodestar/params";
2
+ import { toHexString } from "@chainsafe/ssz";
3
+ import { ATTESTATION_SUBNET_COUNT, ForkSeq, SYNC_COMMITTEE_SUBNET_COUNT } from "@lodestar/params";
3
4
  import { pruneSetToMax, sleep } from "@lodestar/utils";
5
+ import { bytesToInt } from "@lodestar/utils";
6
+ import { getCustodyGroups, getDataColumns } from "../../util/dataColumns.js";
4
7
  import { Discv5Worker } from "../discv5/index.js";
5
8
  import { getLibp2pError } from "../libp2p/error.js";
6
9
  import { ENRKey, SubnetType } from "../metadata.js";
10
+ import { computeNodeId } from "../subnets/interface.js";
7
11
  import { getConnectionsMap, prettyPrintPeerId } from "../util.js";
8
12
  import { ScoreState } from "./score/index.js";
9
13
  import { deserializeEnrSubnets, zeroAttnets, zeroSyncnets } from "./utils/enrSubnetsDeserialize.js";
@@ -47,6 +51,9 @@ export class PeerDiscovery {
47
51
  syncnets: new Map(),
48
52
  };
49
53
  this.connectToDiscv5BootnodesOnStart = false;
54
+ // TODO-das: remove the below 2 flags
55
+ this.onlyConnectToBiggerDataNodes = false;
56
+ this.onlyConnectToMinimalCustodyOverlapNodes = false;
50
57
  /**
51
58
  * Progressively called by libp2p as a result of peer discovery or updates to its peer store
52
59
  */
@@ -59,7 +66,7 @@ export class PeerDiscovery {
59
66
  }
60
67
  const attnets = zeroAttnets;
61
68
  const syncnets = zeroSyncnets;
62
- const status = this.handleDiscoveredPeer(id, multiaddrs[0], attnets, syncnets);
69
+ const status = this.handleDiscoveredPeer(id, multiaddrs[0], attnets, syncnets, undefined);
63
70
  this.logger.debug("Discovered peer via libp2p", { peer: prettyPrintPeerId(id), status });
64
71
  this.metrics?.discovery.discoveredStatus.inc({ status });
65
72
  };
@@ -81,28 +88,43 @@ export class PeerDiscovery {
81
88
  // Are this fields mandatory?
82
89
  const attnetsBytes = enr.kvs.get(ENRKey.attnets); // 64 bits
83
90
  const syncnetsBytes = enr.kvs.get(ENRKey.syncnets); // 4 bits
91
+ const custodyGroupCountBytes = enr.kvs.get(ENRKey.cgc); // 64 bits
92
+ if (custodyGroupCountBytes === undefined) {
93
+ this.logger.warn("peer discovered with no cgc assuming 4", exportENRToJSON(enr));
94
+ }
84
95
  // Use faster version than ssz's implementation that leverages pre-cached.
85
96
  // Some nodes don't serialize the bitfields properly, encoding the syncnets as attnets,
86
97
  // which cause the ssz implementation to throw on validation. deserializeEnrSubnets() will
87
98
  // never throw and treat too long or too short bitfields as zero-ed
88
99
  const attnets = attnetsBytes ? deserializeEnrSubnets(attnetsBytes, ATTESTATION_SUBNET_COUNT) : zeroAttnets;
89
100
  const syncnets = syncnetsBytes ? deserializeEnrSubnets(syncnetsBytes, SYNC_COMMITTEE_SUBNET_COUNT) : zeroSyncnets;
90
- const status = this.handleDiscoveredPeer(peerId, multiaddrTCP, attnets, syncnets);
91
- this.logger.debug("Discovered peer via discv5", { peer: prettyPrintPeerId(peerId), status });
101
+ const custodyGroupCount = custodyGroupCountBytes ? bytesToInt(custodyGroupCountBytes, "be") : undefined;
102
+ const status = this.handleDiscoveredPeer(peerId, multiaddrTCP, attnets, syncnets, custodyGroupCount);
103
+ this.logger.debug("Discovered peer via discv5", {
104
+ peer: prettyPrintPeerId(peerId),
105
+ status,
106
+ custodySubnetCount: custodyGroupCount,
107
+ });
92
108
  this.metrics?.discovery.discoveredStatus.inc({ status });
93
109
  };
94
- const { libp2p, peerRpcScores, metrics, logger, config } = modules;
110
+ const { libp2p, clock, peerRpcScores, metrics, logger, networkConfig } = modules;
95
111
  this.libp2p = libp2p;
112
+ this.clock = clock;
96
113
  this.peerRpcScores = peerRpcScores;
97
114
  this.metrics = metrics;
98
115
  this.logger = logger;
99
- this.config = config;
116
+ this.networkConfig = networkConfig;
117
+ this.config = networkConfig.getConfig();
100
118
  this.discv5 = discv5;
101
- this.maxPeers = opts.maxPeers;
119
+ // TODO-das: remove
120
+ this.nodeId = networkConfig.getNodeId();
121
+ this.groupRequests = new Map();
102
122
  this.discv5StartMs = 0;
103
123
  this.discv5StartMs = Date.now();
104
124
  this.discv5FirstQueryDelayMs = opts.discv5FirstQueryDelayMs;
105
125
  this.connectToDiscv5BootnodesOnStart = opts.connectToDiscv5Bootnodes;
126
+ this.onlyConnectToBiggerDataNodes = opts.onlyConnectToBiggerDataNodes;
127
+ this.onlyConnectToMinimalCustodyOverlapNodes = opts.onlyConnectToMinimalCustodyOverlapNodes;
106
128
  this.libp2p.addEventListener("peer:discovery", this.onDiscoveredPeer);
107
129
  this.discv5.on("discovered", this.onDiscoveredENR);
108
130
  const numBootEnrs = opts.discv5.bootEnrs.length;
@@ -124,6 +146,11 @@ export class PeerDiscovery {
124
146
  metrics.discovery.cachedENRsSize.addCollect(() => {
125
147
  metrics.discovery.cachedENRsSize.set(this.cachedENRs.size);
126
148
  metrics.discovery.peersToConnect.set(this.peersToConnect);
149
+ // PeerDAS metrics
150
+ const groupsToConnect = Array.from(this.groupRequests.values());
151
+ const groupPeersToConnect = groupsToConnect.reduce((acc, elem) => acc + elem, 0);
152
+ metrics.discovery.groupPeersToConnect.set(groupPeersToConnect);
153
+ metrics.discovery.groupsToConnect.set(groupsToConnect.filter((elem) => elem > 0).length);
127
154
  for (const type of [SubnetType.attnets, SubnetType.syncnets]) {
128
155
  const subnetPeersToConnect = Array.from(this.subnetRequests[type].values()).reduce((acc, { peersToConnect }) => acc + peersToConnect, 0);
129
156
  metrics.discovery.subnetPeersToConnect.set({ type }, subnetPeersToConnect);
@@ -138,7 +165,7 @@ export class PeerDiscovery {
138
165
  privateKey: modules.privateKey,
139
166
  metrics: modules.metrics ?? undefined,
140
167
  logger: modules.logger,
141
- config: modules.config,
168
+ config: modules.networkConfig.getConfig(),
142
169
  });
143
170
  return new PeerDiscovery(modules, opts, discv5);
144
171
  }
@@ -149,8 +176,9 @@ export class PeerDiscovery {
149
176
  }
150
177
  /**
151
178
  * Request to find peers, both on specific subnets and in general
179
+ * pre-fulu groupRequests is empty
152
180
  */
153
- discoverPeers(peersToConnect, subnetRequests = []) {
181
+ discoverPeers(peersToConnect, groupRequests, subnetRequests = []) {
154
182
  const subnetsToDiscoverPeers = [];
155
183
  const cachedENRsToDial = new Map();
156
184
  // Iterate in reverse to consider first the most recent ENRs
@@ -172,14 +200,38 @@ export class PeerDiscovery {
172
200
  }
173
201
  cachedENRsReverse.reverse();
174
202
  this.peersToConnect += peersToConnect;
203
+ // starting from PeerDAS, we need to prioritize column subnet peers first in order to have stable subnet sampling
204
+ const groupsToDiscover = new Set();
205
+ let groupPeersToDiscover = 0;
206
+ const forkSeq = this.config.getForkSeq(this.clock.currentSlot);
207
+ if (forkSeq >= ForkSeq.fulu) {
208
+ group: for (const [group, maxPeersToConnect] of groupRequests) {
209
+ let cachedENRsInGroup = 0;
210
+ for (const cachedENR of cachedENRsReverse) {
211
+ if (cachedENR.peerCustodyGroups?.includes(group)) {
212
+ cachedENRsToDial.set(cachedENR.peerId.toString(), cachedENR);
213
+ if (++cachedENRsInGroup >= maxPeersToConnect) {
214
+ continue group;
215
+ }
216
+ }
217
+ const groupPeersToConnect = Math.max(maxPeersToConnect - cachedENRsInGroup, 0);
218
+ this.groupRequests.set(group, groupPeersToConnect);
219
+ groupsToDiscover.add(group);
220
+ groupPeersToDiscover += groupPeersToConnect;
221
+ }
222
+ }
223
+ }
175
224
  subnet: for (const subnetRequest of subnetRequests) {
176
225
  // Get cached ENRs from the discovery service that are in the requested `subnetId`, but not connected yet
177
226
  let cachedENRsInSubnet = 0;
178
- for (const cachedENR of cachedENRsReverse) {
179
- if (cachedENR.subnets[subnetRequest.type][subnetRequest.subnet]) {
180
- cachedENRsToDial.set(cachedENR.peerId.toString(), cachedENR);
181
- if (++cachedENRsInSubnet >= subnetRequest.maxPeersToDiscover) {
182
- continue subnet;
227
+ // only dial attnet/syncnet peers if subnet sampling peers are stable
228
+ if (groupPeersToDiscover === 0) {
229
+ for (const cachedENR of cachedENRsReverse) {
230
+ if (cachedENR.subnets[subnetRequest.type][subnetRequest.subnet]) {
231
+ cachedENRsToDial.set(cachedENR.peerId.toString(), cachedENR);
232
+ if (++cachedENRsInSubnet >= subnetRequest.maxPeersToDiscover) {
233
+ continue subnet;
234
+ }
183
235
  }
184
236
  }
185
237
  }
@@ -219,6 +271,8 @@ export class PeerDiscovery {
219
271
  peersToConnect,
220
272
  peersAvailableToDial: cachedENRsToDial.size,
221
273
  subnetsToDiscover: subnetsToDiscoverPeers.length,
274
+ groupsToDiscover: Array.from(groupsToDiscover).join(","),
275
+ groupPeersToDiscover,
222
276
  shouldRunFindRandomNodeQuery,
223
277
  });
224
278
  }
@@ -257,7 +311,9 @@ export class PeerDiscovery {
257
311
  /**
258
312
  * Progressively called by peer discovery as a result of any query.
259
313
  */
260
- handleDiscoveredPeer(peerId, multiaddrTCP, attnets, syncnets) {
314
+ handleDiscoveredPeer(peerId, multiaddrTCP, attnets, syncnets, custodySubnetCount) {
315
+ const nodeId = computeNodeId(peerId);
316
+ this.logger.warn("handleDiscoveredPeer", { nodeId: toHexString(nodeId), peerId: peerId.toString() });
261
317
  try {
262
318
  // Check if peer is not banned or disconnected
263
319
  if (this.peerRpcScores.getScoreState(peerId) !== ScoreState.Healthy) {
@@ -273,12 +329,17 @@ export class PeerDiscovery {
273
329
  .find((pendingDial) => pendingDial.peerId?.equals(peerId))) {
274
330
  return DiscoveredPeerStatus.already_dialing;
275
331
  }
332
+ const forkSeq = this.config.getForkSeq(this.clock.currentSlot);
276
333
  // Should dial peer?
277
334
  const cachedPeer = {
278
335
  peerId,
279
336
  multiaddrTCP,
280
337
  subnets: { attnets, syncnets },
281
338
  addedUnixMs: Date.now(),
339
+ // for pre-fulu, peerCustodyGroups is null
340
+ peerCustodyGroups: forkSeq >= ForkSeq.fulu
341
+ ? getCustodyGroups(nodeId, custodySubnetCount ?? this.config.CUSTODY_REQUIREMENT)
342
+ : null,
282
343
  };
283
344
  // Only dial peer if necessary
284
345
  if (this.shouldDialPeer(cachedPeer)) {
@@ -297,6 +358,58 @@ export class PeerDiscovery {
297
358
  }
298
359
  }
299
360
  shouldDialPeer(peer) {
361
+ const forkSeq = this.config.getForkSeq(this.clock.currentSlot);
362
+ if (forkSeq >= ForkSeq.fulu && peer.peerCustodyGroups !== null) {
363
+ // begin onlyConnect* experimental logic
364
+ // TODO-das: remove
365
+ const nodeId = computeNodeId(peer.peerId);
366
+ const peerCustodyGroupCount = peer.peerCustodyGroups.length;
367
+ const peerCustodyColumns = getDataColumns(nodeId, peerCustodyGroupCount);
368
+ const sampleSubnets = this.networkConfig.getCustodyConfig().sampledSubnets;
369
+ const matchingSubnetsNum = sampleSubnets.reduce((acc, elem) => acc + (peerCustodyColumns.includes(elem) ? 1 : 0), 0);
370
+ const hasAllColumns = matchingSubnetsNum === sampleSubnets.length;
371
+ const hasMinCustodyMatchingColumns = matchingSubnetsNum >= Math.max(this.config.CUSTODY_REQUIREMENT);
372
+ this.logger.warn("peerCustodyColumns", {
373
+ peerId: peer.peerId.toString(),
374
+ peerNodeId: toHexString(nodeId),
375
+ hasAllColumns,
376
+ peerCustodyGroupCount,
377
+ peerCustodyColumns: peerCustodyColumns.join(" "),
378
+ sampleSubnets: sampleSubnets.join(" "),
379
+ nodeId: `${toHexString(this.nodeId)}`,
380
+ });
381
+ if (this.onlyConnectToBiggerDataNodes && !hasAllColumns) {
382
+ return false;
383
+ }
384
+ if (this.onlyConnectToMinimalCustodyOverlapNodes && !hasMinCustodyMatchingColumns) {
385
+ return false;
386
+ }
387
+ // end onlyConnect* experimental logic
388
+ // pre-fulu `this.groupRequests` is empty
389
+ // starting from fulu, we need to make sure we have stable subnet sampling peers first
390
+ // given CUSTODY_REQUIREMENT = 4 and 100 peers, we have 400 custody columns from peers
391
+ // with NUMBER_OF_CUSTODY_GROUPS = 128, we have 400 / 128 = 3.125 peers per column in average
392
+ // it would not be hard to find TARGET_SUBNET_PEERS(6) peers per SAMPLES_PER_SLOT(8) columns
393
+ // after some first heartbeats, we should have no more column requested, then go with conditions of prior forks
394
+ let hasMatchingGroup = false;
395
+ let groupRequestCount = 0;
396
+ for (const [group, peersToConnect] of this.groupRequests.entries()) {
397
+ if (peersToConnect <= 0) {
398
+ this.groupRequests.delete(group);
399
+ }
400
+ else if (peer.peerCustodyGroups.includes(group)) {
401
+ this.groupRequests.set(group, Math.max(0, peersToConnect - 1));
402
+ hasMatchingGroup = true;
403
+ groupRequestCount += peersToConnect;
404
+ }
405
+ }
406
+ // if subnet sampling peers are not stable and this peer is not in the requested columns, ignore it
407
+ if (groupRequestCount > 0 && !hasMatchingGroup) {
408
+ this.metrics?.discovery.notDialReason.inc({ reason: NotDialReason.not_contain_requested_sampling_groups });
409
+ return false;
410
+ }
411
+ }
412
+ // logics up to Deneb fork
300
413
  for (const type of [SubnetType.attnets, SubnetType.syncnets]) {
301
414
  for (const [subnet, { toUnixMs, peersToConnect }] of this.subnetRequests[type].entries()) {
302
415
  if (toUnixMs < Date.now() || peersToConnect === 0) {
@@ -321,6 +434,7 @@ export class PeerDiscovery {
321
434
  if (this.peersToConnect > 0) {
322
435
  return true;
323
436
  }
437
+ this.metrics?.discovery.notDialReason.inc({ reason: NotDialReason.not_contain_requested_attnet_syncnet_subnets });
324
438
  return false;
325
439
  }
326
440
  /**
@@ -406,4 +520,14 @@ function formatLibp2pDialError(e) {
406
520
  e.stack = undefined;
407
521
  }
408
522
  }
523
+ function exportENRToJSON(enr) {
524
+ if (enr === undefined) {
525
+ return undefined;
526
+ }
527
+ return {
528
+ ip4: enr.kvs.get("ip")?.toString(),
529
+ cgc: enr.kvs.get("cgc")?.toString(),
530
+ nodeId: enr.nodeId,
531
+ };
532
+ }
409
533
  //# sourceMappingURL=discover.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"discover.js","sourceRoot":"","sources":["../../../src/network/peers/discover.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"discover.js","sourceRoot":"","sources":["../../../src/network/peers/discover.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,4 @@
1
1
  import { PeerId, PrivateKey } from "@libp2p/interface";
2
- import { BeaconConfig } from "@lodestar/config";
3
2
  import { LoggerNode } from "@lodestar/logger/node";
4
3
  import { Metadata, phase0 } from "@lodestar/types";
5
4
  import { IClock } from "../../util/clock.js";
@@ -8,6 +7,8 @@ import { LodestarDiscv5Opts } from "../discv5/types.js";
8
7
  import { INetworkEventBus } from "../events.js";
9
8
  import { Eth2Gossipsub } from "../gossip/gossipsub.js";
10
9
  import { Libp2p } from "../interface.js";
10
+ import { SubnetType } from "../metadata.js";
11
+ import { NetworkConfig } from "../networkConfig.js";
11
12
  import { StatusCache } from "../statusCache.js";
12
13
  import { SubnetsService } from "../subnets/index.js";
13
14
  import { PeerDiscovery } from "./discover.js";
@@ -18,6 +19,8 @@ export type PeerManagerOpts = {
18
19
  targetPeers: number;
19
20
  /** The maximum number of peers we allow (exceptions for subnet peers) */
20
21
  maxPeers: number;
22
+ /** Target peer per PeerDAS group */
23
+ targetGroupPeers: number;
21
24
  /**
22
25
  * Delay the 1st query after starting discv5
23
26
  * See https://github.com/ChainSafe/lodestar/issues/3423
@@ -31,6 +34,8 @@ export type PeerManagerOpts = {
31
34
  * If set to true, connect to Discv5 bootnodes. If not set or false, do not connect
32
35
  */
33
36
  connectToDiscv5Bootnodes?: boolean;
37
+ onlyConnectToBiggerDataNodes?: boolean;
38
+ onlyConnectToMinimalCustodyOverlapNodes?: boolean;
34
39
  };
35
40
  /**
36
41
  * ReqResp methods used only be PeerManager, so the main thread never has to call them
@@ -51,12 +56,13 @@ export type PeerManagerModules = {
51
56
  attnetsService: SubnetsService;
52
57
  syncnetsService: SubnetsService;
53
58
  clock: IClock;
54
- config: BeaconConfig;
55
59
  peerRpcScores: IPeerRpcScoreStore;
56
60
  events: INetworkEventBus;
61
+ networkConfig: NetworkConfig;
57
62
  peersData: PeersData;
58
63
  statusCache: StatusCache;
59
64
  };
65
+ export type PeerRequestedSubnetType = SubnetType | "column";
60
66
  type PeerIdStr = string;
61
67
  /**
62
68
  * Performs all peer management functionality in a single grouped class:
@@ -67,6 +73,7 @@ type PeerIdStr = string;
67
73
  * - Disconnect peers if over target peers
68
74
  */
69
75
  export declare class PeerManager {
76
+ private nodeId;
70
77
  private readonly libp2p;
71
78
  private readonly logger;
72
79
  private readonly metrics;
@@ -75,6 +82,7 @@ export declare class PeerManager {
75
82
  private readonly attnetsService;
76
83
  private readonly syncnetsService;
77
84
  private readonly clock;
85
+ private readonly networkConfig;
78
86
  private readonly config;
79
87
  private readonly peerRpcScores;
80
88
  /** If null, discovery is disabled */