@lodestar/beacon-node 1.32.0-peerDAS.5dbbaa420c → 1.32.0-peerDAS.82b142fc90

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 (61) hide show
  1. package/lib/chain/chain.d.ts +2 -5
  2. package/lib/chain/chain.js +3 -18
  3. package/lib/chain/chain.js.map +1 -1
  4. package/lib/chain/emitter.d.ts +1 -6
  5. package/lib/chain/emitter.js +0 -4
  6. package/lib/chain/emitter.js.map +1 -1
  7. package/lib/chain/interface.d.ts +2 -2
  8. package/lib/chain/interface.js.map +1 -1
  9. package/lib/network/core/networkCore.d.ts +3 -3
  10. package/lib/network/core/networkCore.js +2 -2
  11. package/lib/network/core/networkCore.js.map +1 -1
  12. package/lib/network/core/networkCoreWorkerHandler.d.ts +3 -3
  13. package/lib/network/core/networkCoreWorkerHandler.js.map +1 -1
  14. package/lib/network/core/types.d.ts +4 -4
  15. package/lib/network/events.d.ts +2 -2
  16. package/lib/network/interface.d.ts +2 -2
  17. package/lib/network/network.d.ts +4 -4
  18. package/lib/network/network.js +23 -26
  19. package/lib/network/network.js.map +1 -1
  20. package/lib/network/peers/peerManager.d.ts +2 -2
  21. package/lib/network/peers/peerManager.js +1 -4
  22. package/lib/network/peers/peerManager.js.map +1 -1
  23. package/lib/network/peers/peersData.d.ts +2 -9
  24. package/lib/network/peers/peersData.js.map +1 -1
  25. package/lib/network/peers/utils/assertPeerRelevance.d.ts +3 -7
  26. package/lib/network/peers/utils/assertPeerRelevance.js +1 -10
  27. package/lib/network/peers/utils/assertPeerRelevance.js.map +1 -1
  28. package/lib/network/peers/utils/prioritizePeers.d.ts +3 -3
  29. package/lib/network/peers/utils/prioritizePeers.js.map +1 -1
  30. package/lib/network/reqresp/ReqRespBeaconNode.d.ts +2 -2
  31. package/lib/network/reqresp/ReqRespBeaconNode.js +8 -12
  32. package/lib/network/reqresp/ReqRespBeaconNode.js.map +1 -1
  33. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.d.ts +1 -2
  34. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js +2 -6
  35. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js.map +1 -1
  36. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js +2 -2
  37. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js.map +1 -1
  38. package/lib/network/reqresp/handlers/status.js +2 -3
  39. package/lib/network/reqresp/handlers/status.js.map +1 -1
  40. package/lib/network/reqresp/protocols.d.ts +0 -1
  41. package/lib/network/reqresp/protocols.js +0 -5
  42. package/lib/network/reqresp/protocols.js.map +1 -1
  43. package/lib/network/reqresp/types.d.ts +3 -3
  44. package/lib/network/reqresp/types.js +3 -3
  45. package/lib/network/reqresp/types.js.map +1 -1
  46. package/lib/network/statusCache.d.ts +5 -5
  47. package/lib/network/statusCache.js.map +1 -1
  48. package/lib/sync/range/chain.d.ts +3 -6
  49. package/lib/sync/range/chain.js +14 -14
  50. package/lib/sync/range/chain.js.map +1 -1
  51. package/lib/sync/range/range.d.ts +2 -3
  52. package/lib/sync/range/range.js +3 -8
  53. package/lib/sync/range/range.js.map +1 -1
  54. package/lib/sync/range/utils/peerBalancer.d.ts +7 -4
  55. package/lib/sync/range/utils/peerBalancer.js +8 -13
  56. package/lib/sync/range/utils/peerBalancer.js.map +1 -1
  57. package/lib/sync/unknownBlock.js +14 -12
  58. package/lib/sync/unknownBlock.js.map +1 -1
  59. package/lib/sync/utils/remoteSyncType.d.ts +4 -4
  60. package/lib/sync/utils/remoteSyncType.js.map +1 -1
  61. package/package.json +14 -14
package/lib/sync/range/chain.js CHANGED
@@ -33,6 +33,8 @@ export class SyncChain {
33
33
  /** Sorted map of batches undergoing some kind of processing. */
34
34
  this.batches = new Map();
35
35
  this.peerset = new Map();
36
+ // TODO: @matthewkeil check if this needs to be updated for custody groups
37
+ this.peersetCustody = new Map();
36
38
  this.firstBatchEpoch = initialBatchEpoch;
37
39
  this.lastEpochWithProcessBlocks = initialBatchEpoch;
38
40
  this.target = initialTarget;
@@ -40,7 +42,6 @@ export class SyncChain {
40
42
  this.processChainSegment = fns.processChainSegment;
41
43
  this.downloadBeaconBlocksByRange = fns.downloadBeaconBlocksByRange;
42
44
  this.reportPeer = fns.reportPeer;
43
- this.getConnectedPeerSyncMeta = fns.getConnectedPeerSyncMeta;
44
45
  this.config = modules.config;
45
46
  this.logger = modules.logger;
46
47
  this.logId = `${syncType}`;
@@ -91,8 +92,10 @@ export class SyncChain {
91
92
  /**
92
93
  * Add peer to the chain and request batches if active
93
94
  */
94
- addPeer(peer, target) {
95
+ // TODO: @matthewkeil check if this needs to be updated for custody groups
96
+ addPeer(peer, target, custodyColumns, clientAgent) {
95
97
  this.peerset.set(peer, target);
98
+ this.peersetCustody.set(peer, { custodyColumns, clientAgent });
96
99
  this.computeTarget();
97
100
  this.triggerBatchDownloader();
98
101
  }
@@ -201,7 +204,7 @@ export class SyncChain {
201
204
  */
202
205
  triggerBatchDownloader() {
203
206
  try {
204
- this.requestBatches();
207
+ this.requestBatches(Array.from(this.peerset.keys()));
205
208
  }
206
209
  catch (e) {
207
210
  // bubble the error up to the main async iterable loop
@@ -212,15 +215,11 @@ export class SyncChain {
212
215
  * Attempts to request the next required batches from the peer pool if the chain is syncing.
213
216
  * It will exhaust the peer pool and left over batches until the batch buffer is reached.
214
217
  */
215
- requestBatches() {
218
+ requestBatches(peers) {
216
219
  if (this.status !== SyncChainStatus.Syncing) {
217
220
  return;
218
221
  }
219
- const peersSyncMeta = [];
220
- for (const peerId of this.peerset.keys()) {
221
- peersSyncMeta.push(this.getConnectedPeerSyncMeta(peerId));
222
- }
223
- const peerBalancer = new ChainPeersBalancer(peersSyncMeta, toArr(this.batches));
222
+ const peerBalancer = new ChainPeersBalancer(peers, this.peersetCustody, toArr(this.batches));
224
223
  // Retry download of existing batches
225
224
  for (const batch of this.batches.values()) {
226
225
  if (batch.state.status !== BatchStatus.AwaitingDownload) {
@@ -273,9 +272,10 @@ export class SyncChain {
273
272
  */
274
273
  async sendBatch(batch, peer) {
275
274
  try {
276
- const partialDownload = batch.startDownloading(peer.peerId);
275
+ const partialDownload = batch.startDownloading(peer);
276
+ const peerClient = this.peersetCustody.get(peer)?.clientAgent ?? "unknown";
277
277
  // wrapError ensures to never call both batch success() and batch error()
278
- const res = await wrapError(this.downloadBeaconBlocksByRange(peer, batch.request, partialDownload));
278
+ const res = await wrapError(this.downloadBeaconBlocksByRange(peer, batch.request, partialDownload, peerClient));
279
279
  if (!res.err) {
280
280
  const blocks = batch.downloadingSuccess(res.result);
281
281
  if (blocks !== null) {
@@ -307,16 +307,16 @@ export class SyncChain {
307
307
  id: this.logId,
308
308
  ...batch.getMetadata(),
309
309
  ...downloadInfo,
310
- peer: prettyPrintPeerIdStr(peer.peerId),
310
+ peer: prettyPrintPeerIdStr(peer),
311
311
  });
312
312
  }
313
313
  else {
314
- this.logger.debug("Partially downloaded batch", { id: this.logId, ...batch.getMetadata(), peer: peer.peerId });
314
+ this.logger.debug("Partially downloaded batch", { id: this.logId, ...batch.getMetadata(), peer });
315
315
  }
316
316
  this.triggerBatchProcessor();
317
317
  }
318
318
  else {
319
- this.logger.verbose("Batch download error", { id: this.logId, ...batch.getMetadata(), peer: prettyPrintPeerIdStr(peer.peerId) }, res.err);
319
+ this.logger.verbose("Batch download error", { id: this.logId, ...batch.getMetadata(), peer: prettyPrintPeerIdStr(peer) }, res.err);
320
320
  batch.downloadingError(); // Throws after MAX_DOWNLOAD_ATTEMPTS
321
321
  }
322
322
  // Preemptively request more blocks from peers whilst we process current blocks
package/lib/sync/range/chain.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"chain.js","sourceRoot":"","sources":["../../../src/sync/range/chain.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAC,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAC,YAAY,EAAU,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAoC,cAAc,EAAC,MAAM,6BAA6B,CAAC;AAC9F,OAAO,EAAC,UAAU,EAAE,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAGxE,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAElD,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAC,iBAAiB,EAAE,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AAEpE,OAAO,EAAC,KAAK,EAAE,UAAU,EAAE,cAAc,EAAiB,WAAW,EAAC,MAAM,YAAY,CAAC;AACzF,OAAO,EACL,kBAAkB,EAClB,0BAA0B,EAC1B,uBAAuB,EACvB,iBAAiB,EACjB,qBAAqB,EACrB,eAAe,EACf,KAAK,EACL,wBAAwB,EACxB,qBAAqB,GACtB,MAAM,kBAAkB,CAAC;AAoC1B,MAAM,OAAO,mBAAoB,SAAQ,KAAK;CAAG;AAYjD,MAAM,CAAN,IAAY,eAKX;AALD,WAAY,eAAe;IACzB,sCAAmB,CAAA;IACnB,sCAAmB,CAAA;IACnB,gCAAa,CAAA;IACb,kCAAe,CAAA;AACjB,CAAC,EALW,eAAe,KAAf,eAAe,QAK1B;AAED;;;;;;GAMG;AACH,MAAM,OAAO,SAAS;IAmCpB,YACE,iBAAwB,EACxB,aAA0B,EAC1B,QAAuB,EACvB,GAAiB,EACjB,OAAyB;QA9B3B,yFAAyF;QACzF,oBAAe,GAAG,CAAC,CAAC;QASZ,WAAM,GAAG,eAAe,CAAC,OAAO,CAAC;QAMzC,uFAAuF;QACtE,mBAAc,GAAG,IAAI,SAAS,EAAE,CAAC;QAClD,gEAAgE;QAC/C,YAAO,GAAG,IAAI,GAAG,EAAgB,CAAC;QAClC,YAAO,GAAG,IAAI,GAAG,EAA0B,CAAC;QAY3D,IAAI,CAAC,eAAe,GAAG,iBAAiB,CAAC;QACzC,IAAI,CAAC,0BAA0B,GAAG,iBAAiB,CAAC;QACpD,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,mBAAmB,GAAG,GAAG,CAAC,mBAAmB,CAAC;QACnD,IAAI,CAAC,2BAA2B,GAAG,GAAG,CAAC,2BAA2B,CAAC;QACnE,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;QACjC,IAAI,CAAC,wBAAwB,GAAG,GAAG,CAAC,wBAAwB,CAAC;QAC7D,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,GAAG,QAAQ,EAAE,CAAC;QAE3B,gCAAgC;QAChC,IAAI,CAAC,IAAI,EAAE,CAAC,IAAI,CACd,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,EAClC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAC1B,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,YAAY,CAAC,mBAA0B;QACrC,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;YACpB,KAAK,eAAe,CAAC,OAAO;gBAC1B,MAAM,CAAC,eAAe;YACxB,KAAK,eAAe,CAAC,OAAO;gBAC1B,OAAO,CAAC,wBAAwB;YAClC,KAAK,eAAe,CAAC,KAAK,CAAC;YAC3B,KAAK,eAAe,CAAC,IAAI;gBACvB,MAAM,IAAI,mBAAmB,CAAC,yCAAyC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1F,CAAC;QAED,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC;QAEtC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE;YAC1C,mBAAmB;YACnB,0BAA0B,EAAE,IAAI,CAAC,0BAA0B;YAC3D,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;SAC7B,CAAC,CAAC;QAEH,oFAAoF;QACpF,mFAAmF;QACnF,MAAM,iCAAiC,GACrC,IAAI,CAAC,0BAA0B;YAC/B,IAAI,CAAC,KAAK,CAAC,CAAC,mBAAmB,GAAG,IAAI,CAAC,0BAA0B,CAAC,GAAG,gBAAgB,CAAC,GAAG,gBAAgB,CAAC;QAC5G,IAAI,CAAC,YAAY,CAAC,iCAAiC,CAAC,CAAC;QAErD,uDAAuD;QACvD,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAC9B,IAAI,CAAC,qBAAqB,EAAE,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,WAAW;QACT,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC;IACxC,CAAC;IAED;;OAEG;IACH,MAAM;QACJ,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC;IACzD,CAAC;IAED;;OAEG;IACH,OAAO,CAAC,IAAe,EAAE,MAAmB;QAC1C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC/B,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAChC,CAAC;IAED;;;OAGG;IACH,UAAU,CAAC,MAAiB;QAC1B,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,aAAa,EAAE,CAAC;QACrB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,eAAe;QACb,OAAO,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,iBAAiB;QACnB,uDAAuD;QACvD,OAAO,iBAAiB,CAAC,IAAI,CAAC,0BAA0B,GAAG,gBAAgB,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC;IAC7F,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,MAAM,KAAK,eAAe,CAAC,OAAO,CAAC;IACjD,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,MAAM,KAAK,eAAe,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,KAAK,eAAe,CAAC,IAAI,CAAC;IACvF,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,QAAQ;QACN,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,wCAAwC;IACxC,aAAa;QACX,OAAO;YACL,UAAU,EAAE,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;YACvC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI;YAC5B,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,UAAU,EAAE,IAAI,CAAC,0BAA0B;YAC3C,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE;SAChC,CAAC;IACJ,CAAC;IAEO,aAAa;QACnB,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;YAClD,IAAI,CAAC,MAAM,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,IAAI;QAChB,IAAI,CAAC;YACH,wDAAwD;YACxD,IAAI,KAAK,EAAE,MAAM,CAAC,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBAC1C,IAAI,IAAI,CAAC,MAAM,KAAK,eAAe,CAAC,OAAO,EAAE,CAAC;oBAC5C,SAAS;gBACX,CAAC;gBAED,6EAA6E;gBAC7E,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;gBAE3C,uFAAuF;gBACvF,IAAI,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC5F,MAAM;gBACR,CAAC;gBAED,oCAAoC;gBACpC,MAAM,KAAK,GAAG,qBAAqB,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;gBACzD,IAAI,KAAK;oBAAE,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YAC5C,CAAC;YAED,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,IAAI,CAAC;YACnC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAC,CAAC,CAAC;QAC1D,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,YAAY,YAAY,EAAE,CAAC;gBAC9B,OAAO,CAAC,SAAS;YACnB,CAAC;YAED,IAAI,CAAC,MAAM,GAAG,eAAe,CAAC,KAAK,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAC,EAAE,CAAU,CAAC,CAAC;YAErE,8DAA8D;YAC9D,8FAA8F;YAC9F,IAAI,CAAC,YAAY,UAAU,EAAE,CAAC;gBAC5B,MAAM,gBAAgB,GAAG,4BAA4B,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnE,IAAI,gBAAgB,EAAE,CAAC;oBACrB,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;wBACvC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;oBAC1E,CAAC;gBACH,CAAC;YACH,CAAC;YAED,MAAM,CAAC,CAAC;QACV,CAAC;IACH,CAAC;IAED;;OAEG;IACK,qBAAqB;QAC3B,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;IAChC,CAAC;IAED;;;OAGG;IACK,sBAAsB;QAC5B,IAAI,CAAC;YACH,IAAI,CAAC,cAAc,EAAE,CAAC;QACxB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,sDAAsD;YACtD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAU,CAAC,CAAC;QACtC,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,cAAc;QACpB,IAAI,IAAI,CAAC,MAAM,KAAK,eAAe,CAAC,OAAO,EAAE,CAAC;YAC5C,OAAO;QACT,CAAC;QAED,MAAM,aAAa,GAAmB,EAAE,CAAC;QACzC,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;YACzC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,kBAAkB,CAAC,aAAa,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAEhF,qCAAqC;QACrC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YAC1C,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,gBAAgB,EAAE,CAAC;gBACxD,SAAS;YACX,CAAC;YAED,MAAM,IAAI,GAAG,YAAY,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACtD,IAAI,IAAI,EAAE,CAAC;gBACT,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;QAED,2DAA2D;QAC3D,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,SAAS,EAAE,EAAE,CAAC;YAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM;YACR,CAAC;YACD,KAAK,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED;;OAEG;IACK,gBAAgB;QACtB,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAEpC,mDAAmD;QACnD,sFAAsF;QACtF,+EAA+E;QAC/E,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;YAC/C,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,WAAW,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,kBAAkB,CAAC;QACjH,CAAC,CAAC,CAAC;QACH,IAAI,eAAe,CAAC,MAAM,GAAG,iBAAiB,EAAE,CAAC;YAC/C,OAAO,IAAI,CAAC;QACd,CAAC;QAED,iHAAiH;QACjH,MAAM,UAAU,GAAG,wBAAwB,CAAC,OAAO,EAAE,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAEtF,mHAAmH;QACnH,IAAI,0BAA0B,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7D,OAAO,IAAI,CAAC;QACd,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,+CAA+C,EAAE,EAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,UAAU,EAAC,CAAC,CAAC;YACjG,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QACjD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACpC,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,SAAS,CAAC,KAAY,EAAE,IAAkB;QACtD,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,KAAK,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAE5D,yEAAyE;YACzE,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,2BAA2B,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC;YAEpG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;gBACb,MAAM,MAAM,GAAG,KAAK,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACpD,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;oBACpB,IAAI,kBAAkB,GAAG,KAAK,CAAC;oBAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;wBAC9C,kBAAkB,KAAK,UAAU,CAAC,IAAI,KAAK,cAAc,CAAC,aAAa,CAAC;wBACxE,OAAO,kBAAkB;4BACvB,CAAC,CAAC,GAAG;gCACD,CAAC,UAAU,CAAC,IAAI,KAAK,cAAc,CAAC,aAAa;oCACjD,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,KAAK,QAAQ,CAAC,KAAK,IAAI,UAAU,CAAC,SAAS,CAAC,IAAI,KAAK,QAAQ,CAAC,OAAO,CAAC;oCAC9F,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM;oCACnC,CAAC,CAAC,CAAC,CAAC;4BACV,CAAC,CAAC,CAAC,CAAC;oBACR,CAAC,EAAE,CAAC,CAAC,CAAC;oBACN,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;wBACpD,kBAAkB,KAAK,UAAU,CAAC,IAAI,KAAK,cAAc,CAAC,aAAa,CAAC;wBACxE,OAAO,kBAAkB;4BACvB,CAAC,CAAC,GAAG;gCACD,CAAC,UAAU,CAAC,IAAI,KAAK,cAAc,CAAC,aAAa,IAAI,UAAU,CAAC,SAAS,CAAC,IAAI,KAAK,QAAQ,CAAC,IAAI;oCAC9F,CAAC,CAAE,UAAU,CAAC,SAAmC,CAAC,WAAW,CAAC,MAAM;oCACpE,CAAC,CAAC,CAAC,CAAC;4BACV,CAAC,CAAC,CAAC,CAAC;oBACR,CAAC,EAAE,CAAC,CAAC,CAAC;oBAEN,MAAM,YAAY,GAAG,EAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAC,CAAC;oBAC7C,IAAI,kBAAkB,EAAE,CAAC;wBACvB,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,EAAC,KAAK,EAAE,WAAW,EAAC,CAAC,CAAC;oBACpD,CAAC;oBACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE;wBACpC,EAAE,EAAE,IAAI,CAAC,KAAK;wBACd,GAAG,KAAK,CAAC,WAAW,EAAE;wBACtB,GAAG,YAAY;wBACf,IAAI,EAAE,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC;qBACxC,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE,EAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAC,CAAC,CAAC;gBAC/G,CAAC;gBACD,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,OAAO,CACjB,sBAAsB,EACtB,EAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAC,EACjF,GAAG,CAAC,GAAG,CACR,CAAC;gBACF,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC,qCAAqC;YACjE,CAAC;YAED,+EAA+E;YAC/E,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAChC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,sDAAsD;YACtD,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAU,CAAC,CAAC;QACtC,CAAC;QAED,+EAA+E;QAC/E,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAChC,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,YAAY,CAAC,KAAY;QACrC,MAAM,MAAM,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC;QAEvC,yEAAyE;QACzE,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE7E,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;YACb,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAE1B,oFAAoF;YACpF,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACtB,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACtC,CAAC;YAED,oDAAoD;YACpD,IAAI,CAAC,qBAAqB,EAAE,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,qBAAqB,EAAE,EAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,KAAK,CAAC,WAAW,EAAE,EAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;YAC9F,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,6CAA6C;YAE7E,mFAAmF;YACnF,oFAAoF;YACpF,yBAAyB;YACzB,4EAA4E;YAC5E,yCAAyC;YACzC,IAAI;YAEJ,4FAA4F;YAC5F,yFAAyF;YACzF,kDAAkD;YAClD,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;gBACjD,IAAI,YAAY,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC;oBAC/C,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,wBAAwB,EAAE,EAAC,EAAE,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,YAAY,CAAC,WAAW,EAAE,EAAC,CAAC,CAAC;oBAC/F,YAAY,CAAC,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,6CAA6C;gBACtF,CAAC;YACH,CAAC;QACH,CAAC;QAED,4FAA4F;QAC5F,IAAI,CAAC,sBAAsB,EAAE,CAAC;IAChC,CAAC;IAED;;OAEG;IACK,YAAY,CAAC,6BAAoC;QACvD,+CAA+C;QAC/C,IAAI,6BAA6B,IAAI,IAAI,CAAC,0BAA0B,EAAE,CAAC;YACrE,OAAO;QACT,CAAC;QAED,KAAK,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;YACvD,IAAI,KAAK,CAAC,UAAU,GAAG,6BAA6B,EAAE,CAAC;gBACrD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAC9B,IAAI,CAAC,eAAe,IAAI,gBAAgB,CAAC;gBAEzC,8EAA8E;gBAC9E,MAAM,SAAS,GAAG,KAAK,CAAC,iBAAiB,EAAE,CAAC;gBAC5C,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,wBAAwB,EAAE,CAAC;oBACrD,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;wBACpC,IAAI,SAAS,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;4BAC/C,+CAA+C;4BAC/C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,iBAAiB,EAAE,2BAA2B,CAAC,CAAC;wBAC3F,CAAC;6BAAM,CAAC;4BACN,qCAAqC;4BACrC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,iBAAiB,EAAE,4BAA4B,CAAC,CAAC;wBAC5F,CAAC;oBACH,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,CAAC,0BAA0B,GAAG,6BAA6B,CAAC;IAClE,CAAC;CACF;AAED;;;GAGG;AACH,MAAM,UAAU,4BAA4B,CAC1C,IAAoB;IAEpB,QAAQ,IAAI,EAAE,CAAC;QACb,mFAAmF;QACnF,0FAA0F;QAC1F,0CAA0C;QAC1C,2FAA2F;QAC3F,KAAK,cAAc,CAAC,uBAAuB;YACzC,OAAO,EAAC,MAAM,EAAE,UAAU,CAAC,iBAAiB,EAAE,MAAM,EAAE,gCAAgC,EAAC,CAAC;QAE1F,4DAA4D;QAC5D,KAAK,cAAc,CAAC,YAAY,CAAC;QACjC,KAAK,cAAc,CAAC,qBAAqB,CAAC;QAC1C,KAAK,cAAc,CAAC,mCAAmC;YACrD,OAAO,IAAI,CAAC;IAChB,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"chain.js","sourceRoot":"","sources":["../../../src/sync/range/chain.ts"],"names":[],"mappings":"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"}
package/lib/sync/range/range.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { EventEmitter } from "node:events";
2
2
  import { BeaconConfig } from "@lodestar/config";
3
- import { Status } from "@lodestar/types";
3
+ import { phase0 } from "@lodestar/types";
4
4
  import { Logger } from "@lodestar/utils";
5
5
  import { StrictEventEmitter } from "strict-event-emitter-types";
6
6
  import { IBeaconChain } from "../../chain/index.js";
@@ -85,7 +85,7 @@ export declare class RangeSync extends RangeSync_base {
85
85
  * A peer with a relevant STATUS message has been found, which also is advanced from us.
86
86
  * Add this peer to an existing chain or create a new one. The update the chains status.
87
87
  */
88
- addPeer(peerId: PeerIdStr, localStatus: Status, peerStatus: Status): void;
88
+ addPeer(peerId: PeerIdStr, localStatus: phase0.Status, peerStatus: phase0.Status): void;
89
89
  /**
90
90
  * Remove this peer from all head and finalized chains. A chain may become peer-empty and be dropped
91
91
  */
@@ -102,7 +102,6 @@ export declare class RangeSync extends RangeSync_base {
102
102
  private downloadBeaconBlocksByRange;
103
103
  /** Convenience method for `SyncChain` */
104
104
  private reportPeer;
105
- private getConnectedPeerSyncMeta;
106
105
  /** Convenience method for `SyncChain` */
107
106
  private onSyncChainEnd;
108
107
  private addPeerOrCreateChain;
package/lib/sync/range/range.js CHANGED
@@ -79,16 +79,13 @@ export class RangeSync extends EventEmitter {
79
79
  }
80
80
  };
81
81
  /** Convenience method for `SyncChain` */
82
- this.downloadBeaconBlocksByRange = async (peer, request, partialDownload) => {
83
- return beaconBlocksMaybeBlobsByRange(this.config, this.network, peer, request, this.chain.clock.currentEpoch, partialDownload, this.logger);
82
+ this.downloadBeaconBlocksByRange = async (peerId, request, partialDownload, peerClient) => {
83
+ return beaconBlocksMaybeBlobsByRange(this.config, this.network, peerId, request, this.chain.clock.currentEpoch, partialDownload, peerClient, this.logger);
84
84
  };
85
85
  /** Convenience method for `SyncChain` */
86
86
  this.reportPeer = (peer, action, actionName) => {
87
87
  this.network.reportPeer(peer, action, actionName);
88
88
  };
89
- this.getConnectedPeerSyncMeta = (peerId) => {
90
- return this.network.getConnectedPeerSyncMeta(peerId);
91
- };
92
89
  /** Convenience method for `SyncChain` */
93
90
  this.onSyncChainEnd = (err, target) => {
94
91
  this.update(this.chain.forkChoice.getFinalizedCheckpoint().epoch);
@@ -127,7 +124,6 @@ export class RangeSync extends EventEmitter {
127
124
  startEpoch,
128
125
  targetSlot: target.slot,
129
126
  targetRoot: toRootHex(target.root),
130
- earliestAvailableSlot: peerStatus.earliestAvailableSlot ?? Infinity,
131
127
  });
132
128
  // If the peer existed in any other chain, remove it.
133
129
  // re-status'd peers can exist in multiple finalized chains, only one sync at a time
@@ -176,7 +172,6 @@ export class RangeSync extends EventEmitter {
176
172
  processChainSegment: this.processChainSegment,
177
173
  downloadBeaconBlocksByRange: this.downloadBeaconBlocksByRange,
178
174
  reportPeer: this.reportPeer,
179
- getConnectedPeerSyncMeta: this.getConnectedPeerSyncMeta,
180
175
  onEnd: this.onSyncChainEnd,
181
176
  }, { config: this.config, logger: this.logger });
182
177
  this.chains.set(syncType, syncChain);
@@ -188,7 +183,7 @@ export class RangeSync extends EventEmitter {
188
183
  targetRoot: toRootHex(syncChain.target.root),
189
184
  });
190
185
  }
191
- syncChain.addPeer(peer, target);
186
+ syncChain.addPeer(peer, target, this.network.getConnectedPeerCustody(peer), this.network.getConnectedPeerClientAgent(peer));
192
187
  }
193
188
  update(localFinalizedEpoch) {
194
189
  const localFinalizedSlot = computeStartSlotAtEpoch(localFinalizedEpoch);
package/lib/sync/range/range.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"range.js","sourceRoot":"","sources":["../../../src/sync/range/range.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"range.js","sourceRoot":"","sources":["../../../src/sync/range/range.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAC,uBAAuB,EAAC,MAAM,4BAA4B,CAAC;AAEnE,OAAO,EAAS,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAElD,OAAO,EAAC,oBAAoB,EAAkB,MAAM,6BAA6B,CAAC;AAIlF,OAAO,EAAC,6BAA6B,EAAC,MAAM,wDAAwD,CAAC;AAErG,OAAO,EAAC,aAAa,EAAE,kBAAkB,EAAE,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAC7F,OAAO,EAAc,SAAS,EAAoC,MAAM,YAAY,CAAC;AACrF,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAE9C,MAAM,CAAN,IAAY,cAEX;AAFD,WAAY,cAAc;IACxB,6DAA2C,CAAA;AAC7C,CAAC,EAFW,cAAc,KAAd,cAAc,QAEzB;AAQD,MAAM,CAAN,IAAY,eAOX;AAPD,WAAY,eAAe;IACzB,wCAAwC;IACxC,+DAAS,CAAA;IACT,4EAA4E;IAC5E,qDAAI,CAAA;IACJ,kFAAkF;IAClF,qDAAI,CAAA;AACN,CAAC,EAPW,eAAe,KAAf,eAAe,QAO1B;AAmBD;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,MAAM,OAAO,SAAU,SAAS,YAA2C;IAWzE,YAAY,OAAyB,EAAE,IAAoB;QACzD,KAAK,EAAE,CAAC;QANV,sEAAsE;QACrD,WAAM,GAAG,IAAI,GAAG,EAA4B,CAAC;QAuF9D,yCAAyC;QACjC,wBAAmB,GAAwC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE;YAC5F,iCAAiC;YACjC,MAAM,KAAK,GAAoB;gBAC7B,+FAA+F;gBAC/F,4GAA4G;gBAC5G,uFAAuF;gBACvF,kBAAkB,EAAE,QAAQ,KAAK,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;gBAChG,oGAAoG;gBACpG,aAAa,EAAE,IAAI;gBACnB,0FAA0F;gBAC1F,iBAAiB,EAAE,IAAI;gBACvB,8FAA8F;gBAC9F,aAAa,EAAE,IAAI;gBACnB,sFAAsF;gBACtF,wDAAwD;gBACxD,qBAAqB,EAAE,KAAK;gBAC5B,0GAA0G;gBAC1G,mBAAmB;gBACnB,iBAAiB,EAAE,KAAK;aACzB,CAAC;YAEF,IAAI,IAAI,CAAC,IAAI,EAAE,4BAA4B,EAAE,CAAC;gBAC5C,+CAA+C;gBAC/C,KAAK,MAAM,KAAK,IAAI,MAAM;oBAAE,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YAC1E,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACtD,CAAC;QACH,CAAC,CAAC;QAEF,yCAAyC;QACjC,gCAA2B,GAAgD,KAAK,EACtF,MAAM,EACN,OAAO,EACP,eAAe,EACf,UAAU,EACV,EAAE;YACF,OAAO,6BAA6B,CAClC,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,OAAO,EACZ,MAAM,EACN,OAAO,EACP,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,YAAY,EAC7B,eAAe,EACf,UAAU,EACV,IAAI,CAAC,MAAM,CACZ,CAAC;QACJ,CAAC,CAAC;QAEF,yCAAyC;QACjC,eAAU,GAA+B,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE;YAC5E,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;QACpD,CAAC,CAAC;QAEF,yCAAyC;QACjC,mBAAc,GAA0B,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;YAC9D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,sBAAsB,EAAE,CAAC,KAAK,CAAC,CAAC;YAClE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;YAEzC,IAAI,GAAG,KAAK,IAAI,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,mCAAmC,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC/E,CAAC;QACH,CAAC,CAAC;QA/IA,MAAM,EAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAC,GAAG,OAAO,CAAC;QAC1D,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAEjB,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IAED,yEAAyE;IACzE,KAAK;QACH,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YACzC,KAAK,CAAC,MAAM,EAAE,CAAC;QACjB,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,OAAO,CAAC,MAAiB,EAAE,WAA0B,EAAE,UAAyB;QAC9E,kEAAkE;QAClE,MAAM,EAAC,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAC,GAAG,kBAAkB,CAAC,WAAW,EAAE,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC1G,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE;YACpC,IAAI,EAAE,MAAM;YACZ,QAAQ;YACR,UAAU;YACV,UAAU,EAAE,MAAM,CAAC,IAAI;YACvB,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC;SACnC,CAAC,CAAC;QAEH,qDAAqD;QACrD,oFAAoF;QACpF,IAAI,QAAQ,KAAK,aAAa,CAAC,IAAI,EAAE,CAAC;YACpC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC1B,CAAC;QAED,IAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,UAAU,CAAC,MAAiB;QAC1B,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YAC7C,SAAS,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED;;OAEG;IACH,IAAI,KAAK;QACP,MAAM,kBAAkB,GAAkB,EAAE,CAAC;QAC7C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YACzC,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;gBACpB,IAAI,KAAK,CAAC,QAAQ,KAAK,aAAa,CAAC,SAAS,EAAE,CAAC;oBAC/C,OAAO,EAAC,MAAM,EAAE,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAC,CAAC;gBACnE,CAAC;gBACD,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACxC,CAAC;QACH,CAAC;QAED,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,OAAO,EAAC,MAAM,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,kBAAkB,EAAC,CAAC;QACrE,CAAC;QACD,OAAO,EAAC,MAAM,EAAE,eAAe,CAAC,IAAI,EAAC,CAAC;IACxC,CAAC;IAED,wCAAwC;IACxC,uBAAuB;QACrB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;aACpC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC;aAC7C,OAAO,EAAE,CAAC,CAAC,yBAAyB;IACzC,CAAC;IAkEO,oBAAoB,CAAC,UAAiB,EAAE,MAAmB,EAAE,IAAe,EAAE,QAAuB;QAC3G,IAAI,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC1C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,SAAS,GAAG,IAAI,SAAS,CACvB,UAAU,EACV,MAAM,EACN,QAAQ,EACR;gBACE,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;gBAC7C,2BAA2B,EAAE,IAAI,CAAC,2BAA2B;gBAC7D,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,IAAI,CAAC,cAAc;aAC3B,EACD,EAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAC,CAC3C,CAAC;YACF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YAErC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAC,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC;YAC3F,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE;gBACnC,QAAQ;gBACR,UAAU,EAAE,SAAS,CAAC,eAAe;gBACrC,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,IAAI;gBACjC,UAAU,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC;aAC7C,CAAC,CAAC;QACL,CAAC;QAED,SAAS,CAAC,OAAO,CACf,IAAI,EACJ,MAAM,EACN,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAC1C,IAAI,CAAC,OAAO,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAC/C,CAAC;IACJ,CAAC;IAEO,MAAM,CAAC,mBAA0B;QACvC,MAAM,kBAAkB,GAAG,uBAAuB,CAAC,mBAAmB,CAAC,CAAC;QAExE,oEAAoE;QACpE,KAAK,MAAM,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACpD,wDAAwD;YACxD;YACE,2DAA2D;YAC3D,SAAS,CAAC,WAAW;gBACrB,gDAAgD;gBAChD,SAAS,CAAC,KAAK,KAAK,CAAC;gBACrB,4DAA4D;gBAC5D,SAAS,CAAC,MAAM,CAAC,IAAI,GAAG,kBAAkB;gBAC1C,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EACrD,CAAC;gBACD,SAAS,CAAC,MAAM,EAAE,CAAC;gBACnB,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAEvB,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAC,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAC,CAAC,CAAC;gBAC9F,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE;oBACrC,EAAE,EAAE,SAAS,CAAC,KAAK;oBACnB,kBAAkB;oBAClB,iBAAiB,EAAE,SAAS,CAAC,iBAAiB;oBAC9C,UAAU,EAAE,SAAS,CAAC,eAAe;oBACrC,UAAU,EAAE,SAAS,CAAC,MAAM,CAAC,IAAI;oBACjC,UAAU,EAAE,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC;oBAC5C,eAAe,EAAE,SAAS,CAAC,eAAe;iBAC3C,CAAC,CAAC;gBAEH,yEAAyE;gBACzE,IAAI,CAAC,OAAO;qBACT,aAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;qBACnC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;QAED,MAAM,EAAC,MAAM,EAAE,OAAO,EAAC,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAEzE,KAAK,MAAM,SAAS,IAAI,MAAM,EAAE,CAAC;YAC/B,SAAS,CAAC,WAAW,EAAE,CAAC;YACxB,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;gBACxB,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAC,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAC,CAAC,CAAC;YAC9F,CAAC;QACH,CAAC;QAED,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE,CAAC;YAChC,SAAS,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;YAC5C,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;gBACzB,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAC,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAC,CAAC,CAAC;YAC/F,CAAC;QACH,CAAC;IACH,CAAC;IAEO,aAAa,CAAC,OAAgB;QACpC,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;QAC1C,MAAM,gBAAgB,GAAkC;YACtD,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5B,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;SACxB,CAAC;QAEF,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YACzC,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,OAAO,CAAC,EAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;YACnF,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrC,CAAC;QAED,KAAK,MAAM,QAAQ,IAAI,cAAc,EAAE,CAAC;YACtC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,EAAC,QAAQ,EAAC,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;CACF"}
package/lib/sync/range/utils/peerBalancer.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { PeerSyncMeta } from "../../../network/peers/peersData.js";
1
+ import { PeerIdStr } from "../../../util/peerId.js";
2
2
  import { Batch } from "../batch.js";
3
3
  /**
4
4
  * Balance and organize peers to perform requests with a SyncChain
@@ -6,16 +6,19 @@ import { Batch } from "../batch.js";
6
6
  */
7
7
  export declare class ChainPeersBalancer {
8
8
  private peers;
9
+ private peerset;
9
10
  private activeRequestsByPeer;
10
- constructor(peers: PeerSyncMeta[], batches: Batch[]);
11
+ constructor(peers: PeerIdStr[], peerset: Map<PeerIdStr, {
12
+ custodyColumns: number[];
13
+ }>, batches: Batch[]);
11
14
  /**
12
15
  * Return the most suitable peer to retry
13
16
  * Sort peers by (1) no failed request (2) less active requests, then pick first
14
17
  */
15
- bestPeerToRetryBatch(batch: Batch): PeerSyncMeta | undefined;
18
+ bestPeerToRetryBatch(batch: Batch): PeerIdStr | undefined;
16
19
  /**
17
20
  * Return peers with 0 or no active requests
18
21
  */
19
- idlePeers(): PeerSyncMeta[];
22
+ idlePeers(): PeerIdStr[];
20
23
  }
21
24
  //# sourceMappingURL=peerBalancer.d.ts.map
package/lib/sync/range/utils/peerBalancer.js CHANGED
@@ -7,9 +7,10 @@ import { BatchStatus } from "../batch.js";
7
7
  */
8
8
  export class ChainPeersBalancer {
9
9
  // TODO: @matthewkeil check if this needs to be updated for custody groups
10
- constructor(peers, batches) {
10
+ constructor(peers, peerset, batches) {
11
11
  this.activeRequestsByPeer = new Map();
12
12
  this.peers = shuffle(peers);
13
+ this.peerset = peerset;
13
14
  // Compute activeRequestsByPeer from all batches internal states
14
15
  for (const batch of batches) {
15
16
  if (batch.state.status === BatchStatus.Downloading) {
@@ -27,17 +28,11 @@ export class ChainPeersBalancer {
27
28
  }
28
29
  const { partialDownload } = batch.state;
29
30
  const failedPeers = new Set(batch.getFailedPeers());
30
- const sortedBestPeers = sortBy(this.peers.filter(({ earliestAvailableSlot, custodyGroups }) => {
31
- // TODO(fulu): this is a bug and is prioritizing peers that do not announce
32
- // an earliestAvailableSlot. Need to refactor this logic
33
- const earliestSlot = earliestAvailableSlot ?? 0;
34
- const peerColumns = custodyGroups ?? [];
35
- if (earliestSlot > batch.request.startSlot) {
36
- return false;
37
- }
31
+ const sortedBestPeers = sortBy(this.peers.filter((peerId) => {
38
32
  if (partialDownload === null) {
39
33
  return true;
40
34
  }
35
+ const peerColumns = this.peerset.get(peerId)?.custodyColumns ?? [];
41
36
  const columns = peerColumns.reduce((acc, elem) => {
42
37
  if (partialDownload.pendingDataColumns.includes(elem)) {
43
38
  acc.push(elem);
@@ -45,8 +40,8 @@ export class ChainPeersBalancer {
45
40
  return acc;
46
41
  }, []);
47
42
  return columns.length > 0;
48
- }), ({ peerId }) => (failedPeers.has(peerId) ? 1 : 0), // Sort by no failed first = 0
49
- ({ peerId }) => this.activeRequestsByPeer.get(peerId) ?? 0 // Sort by least active req
43
+ }), (peer) => (failedPeers.has(peer) ? 1 : 0), // Sort by no failed first = 0
44
+ (peer) => this.activeRequestsByPeer.get(peer) ?? 0 // Sort by least active req
50
45
  );
51
46
  return sortedBestPeers[0];
52
47
  }
@@ -54,8 +49,8 @@ export class ChainPeersBalancer {
54
49
  * Return peers with 0 or no active requests
55
50
  */
56
51
  idlePeers() {
57
- return this.peers.filter(({ peerId }) => {
58
- const activeRequests = this.activeRequestsByPeer.get(peerId);
52
+ return this.peers.filter((peer) => {
53
+ const activeRequests = this.activeRequestsByPeer.get(peer);
59
54
  return activeRequests === undefined || activeRequests === 0;
60
55
  });
61
56
  }
package/lib/sync/range/utils/peerBalancer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"peerBalancer.js","sourceRoot":"","sources":["../../../../src/sync/range/utils/peerBalancer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"peerBalancer.js","sourceRoot":"","sources":["../../../../src/sync/range/utils/peerBalancer.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAC,MAAM,EAAC,MAAM,yBAAyB,CAAC;AAC/C,OAAO,EAAQ,WAAW,EAAC,MAAM,aAAa,CAAC;AAE/C;;;GAGG;AACH,MAAM,OAAO,kBAAkB;IAK7B,0EAA0E;IAC1E,YAAY,KAAkB,EAAE,OAAmD,EAAE,OAAgB;QAH7F,yBAAoB,GAAG,IAAI,GAAG,EAAqB,CAAC;QAI1D,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QAC5B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAEvB,gEAAgE;QAChE,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,WAAW,EAAE,CAAC;gBACnD,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YAC9G,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;OAGG;IACH,oBAAoB,CAAC,KAAY;QAC/B,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,gBAAgB,EAAE,CAAC;YACxD,OAAO;QACT,CAAC;QACD,MAAM,EAAC,eAAe,EAAC,GAAG,KAAK,CAAC,KAAK,CAAC;QAEtC,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;QACpD,MAAM,eAAe,GAAG,MAAM,CAC5B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;YAC3B,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,cAAc,IAAI,EAAE,CAAC;YACnE,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;gBAC/C,IAAI,eAAe,CAAC,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;oBACtD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjB,CAAC;gBACD,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAc,CAAC,CAAC;YAEnB,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;QAC5B,CAAC,CAAC,EACF,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,8BAA8B;QACzE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,2BAA2B;SAC/E,CAAC;QACF,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC;IAED;;OAEG;IACH,SAAS;QACP,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;YAChC,MAAM,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC3D,OAAO,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
package/lib/sync/unknownBlock.js CHANGED
@@ -266,7 +266,7 @@ export class UnknownBlockSync {
266
266
  neededColumns.length <= 0
267
267
  ? allPeers
268
268
  : allPeers.filter((peer) => {
269
- const { custodyGroups: peerColumns } = this.network.getConnectedPeerSyncMeta(peer);
269
+ const peerColumns = this.network.getConnectedPeerCustody(peer);
270
270
  const columns = peerColumns.reduce((acc, elem) => {
271
271
  if (neededColumns.includes(elem)) {
272
272
  acc.push(elem);
@@ -491,8 +491,7 @@ export class UnknownBlockSync {
491
491
  let partialDownload = null;
492
492
  let fetchedPeerId = null;
493
493
  for (let i = 0; i < MAX_ATTEMPTS_PER_BLOCK; i++) {
494
- const peerId = shuffledPeers[i % shuffledPeers.length];
495
- const { custodyGroups: peerColumns, client: peerClient } = this.network.getConnectedPeerSyncMeta(peerId);
494
+ const peer = shuffledPeers[i % shuffledPeers.length];
496
495
  if (partialDownload !== null) {
497
496
  const [prevBlockInput] = partialDownload.blocks;
498
497
  if (prevBlockInput === undefined || prevBlockInput.type !== BlockInputType.dataPromise) {
@@ -508,6 +507,7 @@ export class UnknownBlockSync {
508
507
  }
509
508
  return acc;
510
509
  }, []);
510
+ const peerColumns = this.network.getConnectedPeerCustody(peer);
511
511
  const columns = peerColumns.reduce((acc, elem) => {
512
512
  if (neededColumns.includes(elem)) {
513
513
  acc.push(elem);
@@ -520,14 +520,15 @@ export class UnknownBlockSync {
520
520
  }
521
521
  }
522
522
  try {
523
- const { blocks: [blockInput], pendingDataColumns, } = await beaconBlocksMaybeBlobsByRoot(this.config, this.network, peerId, [blockRoot], partialDownload, peerClient, this.logger);
523
+ const peerClient = this.network.getConnectedPeerClientAgent(peer);
524
+ const { blocks: [blockInput], pendingDataColumns, } = await beaconBlocksMaybeBlobsByRoot(this.config, this.network, peer, [blockRoot], partialDownload, peerClient, this.logger);
524
525
  // Peer does not have the block, try with next peer
525
526
  if (blockInput === undefined) {
526
527
  continue;
527
528
  }
528
529
  if (pendingDataColumns !== null) {
529
530
  partialDownload = { blocks: [blockInput], pendingDataColumns };
530
- fetchedPeerId = peerId;
531
+ fetchedPeerId = peer;
531
532
  continue;
532
533
  }
533
534
  // Verify block root is correct
@@ -536,10 +537,10 @@ export class UnknownBlockSync {
536
537
  if (!byteArrayEquals(receivedBlockRoot, blockRoot)) {
537
538
  throw Error(`Wrong block received by peer, got ${toRootHex(receivedBlockRoot)} expected ${blockRootHex}`);
538
539
  }
539
- return { blockInput, peerIdStr: peerId };
540
+ return { blockInput, peerIdStr: peer };
540
541
  }
541
542
  catch (e) {
542
- this.logger.debug("Error fetching UnknownBlockRoot", { attempt: i, blockRootHex, peer: peerId }, e);
543
+ this.logger.debug("Error fetching UnknownBlockRoot", { attempt: i, blockRootHex, peer }, e);
543
544
  lastError = e;
544
545
  }
545
546
  }
@@ -593,8 +594,7 @@ export class UnknownBlockSync {
593
594
  }
594
595
  let lastError = null;
595
596
  for (let i = 0; i < MAX_ATTEMPTS_PER_BLOCK; i++) {
596
- const peerId = shuffledPeers[i % shuffledPeers.length];
597
- const { custodyGroups: peerColumns, client: peerClient } = this.network.getConnectedPeerSyncMeta(peerId);
597
+ const peer = shuffledPeers[i % shuffledPeers.length];
598
598
  if (unavailableBlockInput.block !== null) {
599
599
  const { cachedData } = unavailableBlockInput;
600
600
  if (cachedData.fork === ForkName.fulu) {
@@ -605,6 +605,7 @@ export class UnknownBlockSync {
605
605
  }
606
606
  return acc;
607
607
  }, []);
608
+ const peerColumns = this.network.getConnectedPeerCustody(peer);
608
609
  const columns = peerColumns.reduce((acc, elem) => {
609
610
  if (neededColumns.includes(elem)) {
610
611
  acc.push(elem);
@@ -617,7 +618,8 @@ export class UnknownBlockSync {
617
618
  }
618
619
  }
619
620
  try {
620
- const blockInput = await unavailableBeaconBlobsByRoot(this.config, this.network, peerId, peerClient, unavailableBlockInput, {
621
+ const peerClient = this.network.getConnectedPeerClientAgent(peer);
622
+ const blockInput = await unavailableBeaconBlobsByRoot(this.config, this.network, peer, peerClient, unavailableBlockInput, {
621
623
  metrics: this.metrics,
622
624
  logger: this.logger,
623
625
  executionEngine: this.chain.executionEngine,
@@ -646,10 +648,10 @@ export class UnknownBlockSync {
646
648
  else {
647
649
  this.logger.debug("Fetched UnavailableBlockInput", { attempts: i, ...dataMeta, blobKzgCommitmentsLen });
648
650
  }
649
- return { blockInput, peerIdStr: peerId };
651
+ return { blockInput, peerIdStr: peer };
650
652
  }
651
653
  catch (e) {
652
- this.logger.debug("Error fetching UnavailableBlockInput", { attempt: i, blockRootHex, peer: peerId }, e);
654
+ this.logger.debug("Error fetching UnavailableBlockInput", { attempt: i, blockRootHex, peer }, e);
653
655
  lastError = e;
654
656
  }
655
657
  }
package/lib/sync/unknownBlock.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"unknownBlock.js","sourceRoot":"","sources":["../../src/sync/unknownBlock.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"unknownBlock.js","sourceRoot":"","sources":["../../src/sync/unknownBlock.ts"],"names":[],"mappings":"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"}
package/lib/sync/utils/remoteSyncType.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { IForkChoice } from "@lodestar/fork-choice";
2
- import { Slot, Status } from "@lodestar/types";
2
+ import { Slot, phase0 } from "@lodestar/types";
3
3
  import { ChainTarget } from "../range/utils/index.js";
4
4
  /** The type of peer relative to our current state */
5
5
  export declare enum PeerSyncType {
@@ -11,7 +11,7 @@ export declare enum PeerSyncType {
11
11
  Behind = "Behind"
12
12
  }
13
13
  export declare const peerSyncTypes: PeerSyncType[];
14
- export declare function getPeerSyncType(local: Status, remote: Status, forkChoice: IForkChoice, slotImportTolerance: number): PeerSyncType;
14
+ export declare function getPeerSyncType(local: phase0.Status, remote: phase0.Status, forkChoice: IForkChoice, slotImportTolerance: number): PeerSyncType;
15
15
  export declare enum RangeSyncType {
16
16
  /** A finalized chain sync should be started with this peer */
17
17
  Finalized = "Finalized",
@@ -24,8 +24,8 @@ export declare const rangeSyncTypes: RangeSyncType[];
24
24
  * - The remotes finalized epoch is greater than our current finalized epoch and we have
25
25
  * not seen the finalized hash before
26
26
  */
27
- export declare function getRangeSyncType(local: Status, remote: Status, forkChoice: IForkChoice): RangeSyncType;
28
- export declare function getRangeSyncTarget(local: Status, remote: Status, forkChoice: IForkChoice): {
27
+ export declare function getRangeSyncType(local: phase0.Status, remote: phase0.Status, forkChoice: IForkChoice): RangeSyncType;
28
+ export declare function getRangeSyncTarget(local: phase0.Status, remote: phase0.Status, forkChoice: IForkChoice): {
29
29
  syncType: RangeSyncType;
30
30
  startEpoch: Slot;
31
31
  target: ChainTarget;
package/lib/sync/utils/remoteSyncType.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"remoteSyncType.js","sourceRoot":"","sources":["../../../src/sync/utils/remoteSyncType.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"remoteSyncType.js","sourceRoot":"","sources":["../../../src/sync/utils/remoteSyncType.ts"],"names":[],"mappings":"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"}