@lodestar/beacon-node 1.32.0-peerDAS.fbabed864b → 1.32.0-rc.0

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/lib/api/impl/beacon/blocks/index.js +33 -42
  2. package/lib/api/impl/beacon/blocks/index.js.map +1 -1
  3. package/lib/api/impl/beacon/state/index.js +13 -1
  4. package/lib/api/impl/beacon/state/index.js.map +1 -1
  5. package/lib/api/impl/validator/index.js +43 -29
  6. package/lib/api/impl/validator/index.js.map +1 -1
  7. package/lib/chain/archiveStore/archiveStore.d.ts +1 -1
  8. package/lib/chain/archiveStore/archiveStore.js +2 -2
  9. package/lib/chain/archiveStore/archiveStore.js.map +1 -1
  10. package/lib/chain/archiveStore/historicalState/metrics.js +13 -0
  11. package/lib/chain/archiveStore/historicalState/metrics.js.map +1 -1
  12. package/lib/chain/archiveStore/interface.d.ts +1 -1
  13. package/lib/chain/archiveStore/utils/archiveBlocks.d.ts +1 -1
  14. package/lib/chain/archiveStore/utils/archiveBlocks.js +51 -88
  15. package/lib/chain/archiveStore/utils/archiveBlocks.js.map +1 -1
  16. package/lib/chain/beaconProposerCache.d.ts +0 -1
  17. package/lib/chain/beaconProposerCache.js +0 -3
  18. package/lib/chain/beaconProposerCache.js.map +1 -1
  19. package/lib/chain/blocks/importBlock.js +4 -60
  20. package/lib/chain/blocks/importBlock.js.map +1 -1
  21. package/lib/chain/blocks/types.d.ts +24 -65
  22. package/lib/chain/blocks/types.js +6 -39
  23. package/lib/chain/blocks/types.js.map +1 -1
  24. package/lib/chain/blocks/verifyBlocksDataAvailability.js +10 -21
  25. package/lib/chain/blocks/verifyBlocksDataAvailability.js.map +1 -1
  26. package/lib/chain/blocks/writeBlockInputToDb.js +15 -89
  27. package/lib/chain/blocks/writeBlockInputToDb.js.map +1 -1
  28. package/lib/chain/chain.d.ts +8 -16
  29. package/lib/chain/chain.js +14 -23
  30. package/lib/chain/chain.js.map +1 -1
  31. package/lib/chain/emitter.d.ts +2 -18
  32. package/lib/chain/emitter.js +0 -13
  33. package/lib/chain/emitter.js.map +1 -1
  34. package/lib/chain/errors/index.d.ts +0 -1
  35. package/lib/chain/errors/index.js +0 -1
  36. package/lib/chain/errors/index.js.map +1 -1
  37. package/lib/chain/interface.d.ts +5 -11
  38. package/lib/chain/interface.js.map +1 -1
  39. package/lib/chain/options.d.ts +3 -6
  40. package/lib/chain/options.js +0 -4
  41. package/lib/chain/options.js.map +1 -1
  42. package/lib/chain/produceBlock/produceBlockBody.d.ts +3 -5
  43. package/lib/chain/produceBlock/produceBlockBody.js +141 -117
  44. package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
  45. package/lib/chain/produceBlock/validateBlobsAndKzgCommitments.d.ts +2 -3
  46. package/lib/chain/produceBlock/validateBlobsAndKzgCommitments.js +2 -25
  47. package/lib/chain/produceBlock/validateBlobsAndKzgCommitments.js.map +1 -1
  48. package/lib/chain/seenCache/seenGossipBlockInput.d.ts +18 -61
  49. package/lib/chain/seenCache/seenGossipBlockInput.js +53 -254
  50. package/lib/chain/seenCache/seenGossipBlockInput.js.map +1 -1
  51. package/lib/chain/validation/block.js +1 -1
  52. package/lib/chain/validation/block.js.map +1 -1
  53. package/lib/db/beacon.d.ts +1 -3
  54. package/lib/db/beacon.js +1 -3
  55. package/lib/db/beacon.js.map +1 -1
  56. package/lib/db/buckets.d.ts +1 -3
  57. package/lib/db/buckets.js +0 -2
  58. package/lib/db/buckets.js.map +1 -1
  59. package/lib/db/interface.d.ts +1 -3
  60. package/lib/db/repositories/index.d.ts +0 -2
  61. package/lib/db/repositories/index.js +0 -2
  62. package/lib/db/repositories/index.js.map +1 -1
  63. package/lib/execution/engine/http.d.ts +3 -5
  64. package/lib/execution/engine/http.js +31 -70
  65. package/lib/execution/engine/http.js.map +1 -1
  66. package/lib/execution/engine/interface.d.ts +2 -4
  67. package/lib/execution/engine/interface.js +1 -1
  68. package/lib/execution/engine/interface.js.map +1 -1
  69. package/lib/execution/engine/mock.d.ts +0 -1
  70. package/lib/execution/engine/mock.js +0 -5
  71. package/lib/execution/engine/mock.js.map +1 -1
  72. package/lib/execution/engine/types.d.ts +0 -10
  73. package/lib/execution/engine/types.js +0 -6
  74. package/lib/execution/engine/types.js.map +1 -1
  75. package/lib/metrics/metrics/beacon.d.ts +3 -12
  76. package/lib/metrics/metrics/beacon.js +13 -44
  77. package/lib/metrics/metrics/beacon.js.map +1 -1
  78. package/lib/network/core/metrics.d.ts +3 -10
  79. package/lib/network/core/metrics.js +4 -22
  80. package/lib/network/core/metrics.js.map +1 -1
  81. package/lib/network/core/networkCore.d.ts +4 -10
  82. package/lib/network/core/networkCore.js +55 -67
  83. package/lib/network/core/networkCore.js.map +1 -1
  84. package/lib/network/core/networkCoreWorker.js +0 -2
  85. package/lib/network/core/networkCoreWorker.js.map +1 -1
  86. package/lib/network/core/networkCoreWorkerHandler.d.ts +0 -2
  87. package/lib/network/core/networkCoreWorkerHandler.js +0 -7
  88. package/lib/network/core/networkCoreWorkerHandler.js.map +1 -1
  89. package/lib/network/core/types.d.ts +0 -4
  90. package/lib/network/discv5/index.d.ts +1 -0
  91. package/lib/network/discv5/index.js +1 -0
  92. package/lib/network/discv5/index.js.map +1 -1
  93. package/lib/network/discv5/types.d.ts +1 -0
  94. package/lib/network/discv5/utils.d.ts +3 -1
  95. package/lib/network/discv5/utils.js +14 -4
  96. package/lib/network/discv5/utils.js.map +1 -1
  97. package/lib/network/discv5/worker.js +5 -1
  98. package/lib/network/discv5/worker.js.map +1 -1
  99. package/lib/network/events.d.ts +1 -3
  100. package/lib/network/events.js.map +1 -1
  101. package/lib/network/forks.d.ts +8 -9
  102. package/lib/network/forks.js +35 -33
  103. package/lib/network/forks.js.map +1 -1
  104. package/lib/network/gossip/encoding.js +1 -1
  105. package/lib/network/gossip/encoding.js.map +1 -1
  106. package/lib/network/gossip/gossipsub.js +15 -6
  107. package/lib/network/gossip/gossipsub.js.map +1 -1
  108. package/lib/network/gossip/interface.d.ts +3 -11
  109. package/lib/network/gossip/interface.js +0 -1
  110. package/lib/network/gossip/interface.js.map +1 -1
  111. package/lib/network/gossip/scoringParameters.js +10 -10
  112. package/lib/network/gossip/scoringParameters.js.map +1 -1
  113. package/lib/network/gossip/topic.d.ts +1497 -1513
  114. package/lib/network/gossip/topic.js +15 -33
  115. package/lib/network/gossip/topic.js.map +1 -1
  116. package/lib/network/interface.d.ts +1 -13
  117. package/lib/network/metadata.d.ts +6 -10
  118. package/lib/network/metadata.js +13 -30
  119. package/lib/network/metadata.js.map +1 -1
  120. package/lib/network/network.d.ts +1 -12
  121. package/lib/network/network.js +43 -85
  122. package/lib/network/network.js.map +1 -1
  123. package/lib/network/options.js +0 -2
  124. package/lib/network/options.js.map +1 -1
  125. package/lib/network/peers/discover.d.ts +3 -14
  126. package/lib/network/peers/discover.js +14 -139
  127. package/lib/network/peers/discover.js.map +1 -1
  128. package/lib/network/peers/peerManager.d.ts +2 -10
  129. package/lib/network/peers/peerManager.js +10 -96
  130. package/lib/network/peers/peerManager.js.map +1 -1
  131. package/lib/network/peers/peersData.d.ts +2 -8
  132. package/lib/network/peers/peersData.js.map +1 -1
  133. package/lib/network/peers/score/interface.d.ts +1 -1
  134. package/lib/network/peers/score/score.d.ts +2 -2
  135. package/lib/network/peers/score/score.js +1 -4
  136. package/lib/network/peers/score/score.js.map +1 -1
  137. package/lib/network/peers/score/store.d.ts +1 -3
  138. package/lib/network/peers/score/store.js +2 -6
  139. package/lib/network/peers/score/store.js.map +1 -1
  140. package/lib/network/peers/utils/prioritizePeers.d.ts +4 -15
  141. package/lib/network/peers/utils/prioritizePeers.js +5 -30
  142. package/lib/network/peers/utils/prioritizePeers.js.map +1 -1
  143. package/lib/network/processor/extractSlotRootFns.js +1 -8
  144. package/lib/network/processor/extractSlotRootFns.js.map +1 -1
  145. package/lib/network/processor/gossipHandlers.js +30 -164
  146. package/lib/network/processor/gossipHandlers.js.map +1 -1
  147. package/lib/network/processor/gossipQueues/index.js +1 -6
  148. package/lib/network/processor/gossipQueues/index.js.map +1 -1
  149. package/lib/network/processor/index.js +2 -3
  150. package/lib/network/processor/index.js.map +1 -1
  151. package/lib/network/reqresp/ReqRespBeaconNode.d.ts +3 -4
  152. package/lib/network/reqresp/ReqRespBeaconNode.js +14 -30
  153. package/lib/network/reqresp/ReqRespBeaconNode.js.map +1 -1
  154. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.d.ts +5 -14
  155. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js +14 -199
  156. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js.map +1 -1
  157. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.d.ts +6 -31
  158. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js +48 -282
  159. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js.map +1 -1
  160. package/lib/network/reqresp/handlers/beaconBlocksByRange.d.ts +1 -1
  161. package/lib/network/reqresp/handlers/beaconBlocksByRange.js +3 -2
  162. package/lib/network/reqresp/handlers/beaconBlocksByRange.js.map +1 -1
  163. package/lib/network/reqresp/handlers/beaconBlocksByRoot.js +2 -1
  164. package/lib/network/reqresp/handlers/beaconBlocksByRoot.js.map +1 -1
  165. package/lib/network/reqresp/handlers/blobSidecarsByRange.js +2 -1
  166. package/lib/network/reqresp/handlers/blobSidecarsByRange.js.map +1 -1
  167. package/lib/network/reqresp/handlers/blobSidecarsByRoot.js +2 -1
  168. package/lib/network/reqresp/handlers/blobSidecarsByRoot.js.map +1 -1
  169. package/lib/network/reqresp/handlers/index.js +0 -10
  170. package/lib/network/reqresp/handlers/index.js.map +1 -1
  171. package/lib/network/reqresp/handlers/lightClientBootstrap.js +4 -3
  172. package/lib/network/reqresp/handlers/lightClientBootstrap.js.map +1 -1
  173. package/lib/network/reqresp/handlers/lightClientFinalityUpdate.js +4 -3
  174. package/lib/network/reqresp/handlers/lightClientFinalityUpdate.js.map +1 -1
  175. package/lib/network/reqresp/handlers/lightClientOptimisticUpdate.js +4 -3
  176. package/lib/network/reqresp/handlers/lightClientOptimisticUpdate.js.map +1 -1
  177. package/lib/network/reqresp/handlers/lightClientUpdatesByRange.js +4 -3
  178. package/lib/network/reqresp/handlers/lightClientUpdatesByRange.js.map +1 -1
  179. package/lib/network/reqresp/handlers/status.js +2 -2
  180. package/lib/network/reqresp/handlers/status.js.map +1 -1
  181. package/lib/network/reqresp/protocols.d.ts +0 -3
  182. package/lib/network/reqresp/protocols.js +1 -16
  183. package/lib/network/reqresp/protocols.js.map +1 -1
  184. package/lib/network/reqresp/rateLimit.js +1 -11
  185. package/lib/network/reqresp/rateLimit.js.map +1 -1
  186. package/lib/network/reqresp/types.d.ts +6 -13
  187. package/lib/network/reqresp/types.js +2 -9
  188. package/lib/network/reqresp/types.js.map +1 -1
  189. package/lib/network/subnets/attnetsService.d.ts +3 -4
  190. package/lib/network/subnets/attnetsService.js +18 -17
  191. package/lib/network/subnets/attnetsService.js.map +1 -1
  192. package/lib/network/subnets/interface.d.ts +3 -6
  193. package/lib/network/subnets/interface.js +1 -14
  194. package/lib/network/subnets/interface.js.map +1 -1
  195. package/lib/network/subnets/syncnetsService.d.ts +3 -4
  196. package/lib/network/subnets/syncnetsService.js +14 -13
  197. package/lib/network/subnets/syncnetsService.js.map +1 -1
  198. package/lib/node/nodejs.js +0 -1
  199. package/lib/node/nodejs.js.map +1 -1
  200. package/lib/sync/interface.d.ts +2 -2
  201. package/lib/sync/interface.js +1 -1
  202. package/lib/sync/interface.js.map +1 -1
  203. package/lib/sync/range/batch.d.ts +2 -8
  204. package/lib/sync/range/batch.js +7 -19
  205. package/lib/sync/range/batch.js.map +1 -1
  206. package/lib/sync/range/chain.d.ts +2 -7
  207. package/lib/sync/range/chain.js +21 -45
  208. package/lib/sync/range/chain.js.map +1 -1
  209. package/lib/sync/range/range.js +3 -3
  210. package/lib/sync/range/range.js.map +1 -1
  211. package/lib/sync/range/utils/peerBalancer.d.ts +1 -4
  212. package/lib/sync/range/utils/peerBalancer.js +2 -20
  213. package/lib/sync/range/utils/peerBalancer.js.map +1 -1
  214. package/lib/sync/unknownBlock.d.ts +1 -8
  215. package/lib/sync/unknownBlock.js +63 -222
  216. package/lib/sync/unknownBlock.js.map +1 -1
  217. package/lib/util/blobs.d.ts +1 -13
  218. package/lib/util/blobs.js +1 -44
  219. package/lib/util/blobs.js.map +1 -1
  220. package/lib/util/metadata.d.ts +0 -4
  221. package/lib/util/metadata.js +0 -7
  222. package/lib/util/metadata.js.map +1 -1
  223. package/lib/util/sszBytes.d.ts +0 -1
  224. package/lib/util/sszBytes.js +0 -17
  225. package/lib/util/sszBytes.js.map +1 -1
  226. package/package.json +14 -14
  227. package/lib/chain/errors/dataColumnSidecarError.d.ts +0 -69
  228. package/lib/chain/errors/dataColumnSidecarError.js +0 -21
  229. package/lib/chain/errors/dataColumnSidecarError.js.map +0 -1
  230. package/lib/chain/validation/dataColumnSidecar.d.ts +0 -28
  231. package/lib/chain/validation/dataColumnSidecar.js +0 -245
  232. package/lib/chain/validation/dataColumnSidecar.js.map +0 -1
  233. package/lib/db/repositories/dataColumnSidecars.d.ts +0 -47
  234. package/lib/db/repositories/dataColumnSidecars.js +0 -40
  235. package/lib/db/repositories/dataColumnSidecars.js.map +0 -1
  236. package/lib/db/repositories/dataColumnSidecarsArchive.d.ts +0 -15
  237. package/lib/db/repositories/dataColumnSidecarsArchive.js +0 -23
  238. package/lib/db/repositories/dataColumnSidecarsArchive.js.map +0 -1
  239. package/lib/network/networkConfig.d.ts +0 -23
  240. package/lib/network/networkConfig.js +0 -32
  241. package/lib/network/networkConfig.js.map +0 -1
  242. package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.d.ts +0 -8
  243. package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.js +0 -106
  244. package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.js.map +0 -1
  245. package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.d.ts +0 -6
  246. package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.js +0 -57
  247. package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.js.map +0 -1
  248. package/lib/util/dataColumns.d.ts +0 -125
  249. package/lib/util/dataColumns.js +0 -284
  250. package/lib/util/dataColumns.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"chain.js","sourceRoot":"","sources":["../../../src/sync/range/chain.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"chain.js","sourceRoot":"","sources":["../../../src/sync/range/chain.ts"],"names":[],"mappings":"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"}
@@ -79,8 +79,8 @@ export class RangeSync extends EventEmitter {
79
79
  }
80
80
  };
81
81
  /** Convenience method for `SyncChain` */
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);
82
+ this.downloadBeaconBlocksByRange = async (peerId, request) => {
83
+ return beaconBlocksMaybeBlobsByRange(this.config, this.network, peerId, request, this.chain.clock.currentEpoch);
84
84
  };
85
85
  /** Convenience method for `SyncChain` */
86
86
  this.reportPeer = (peer, action, actionName) => {
@@ -183,7 +183,7 @@ export class RangeSync extends EventEmitter {
183
183
  targetRoot: toRootHex(syncChain.target.root),
184
184
  });
185
185
  }
186
- syncChain.addPeer(peer, target, this.network.getConnectedPeerCustody(peer), this.network.getConnectedPeerClientAgent(peer));
186
+ syncChain.addPeer(peer, target);
187
187
  }
188
188
  update(localFinalizedEpoch) {
189
189
  const localFinalizedSlot = computeStartSlotAtEpoch(localFinalizedEpoch);
@@ -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":"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"}
@@ -6,11 +6,8 @@ import { Batch } from "../batch.js";
6
6
  */
7
7
  export declare class ChainPeersBalancer {
8
8
  private peers;
9
- private peerset;
10
9
  private activeRequestsByPeer;
11
- constructor(peers: PeerIdStr[], peerset: Map<PeerIdStr, {
12
- custodyColumns: number[];
13
- }>, batches: Batch[]);
10
+ constructor(peers: PeerIdStr[], batches: Batch[]);
14
11
  /**
15
12
  * Return the most suitable peer to retry
16
13
  * Sort peers by (1) no failed request (2) less active requests, then pick first
@@ -6,11 +6,9 @@ import { BatchStatus } from "../batch.js";
6
6
  * Shuffles peers only once on instantiation
7
7
  */
8
8
  export class ChainPeersBalancer {
9
- // TODO: @matthewkeil check if this needs to be updated for custody groups
10
- constructor(peers, peerset, batches) {
9
+ constructor(peers, batches) {
11
10
  this.activeRequestsByPeer = new Map();
12
11
  this.peers = shuffle(peers);
13
- this.peerset = peerset;
14
12
  // Compute activeRequestsByPeer from all batches internal states
15
13
  for (const batch of batches) {
16
14
  if (batch.state.status === BatchStatus.Downloading) {
@@ -23,24 +21,8 @@ export class ChainPeersBalancer {
23
21
  * Sort peers by (1) no failed request (2) less active requests, then pick first
24
22
  */
25
23
  bestPeerToRetryBatch(batch) {
26
- if (batch.state.status !== BatchStatus.AwaitingDownload) {
27
- return;
28
- }
29
- const { partialDownload } = batch.state;
30
24
  const failedPeers = new Set(batch.getFailedPeers());
31
- const sortedBestPeers = sortBy(this.peers.filter((peerId) => {
32
- if (partialDownload === null) {
33
- return true;
34
- }
35
- const peerColumns = this.peerset.get(peerId)?.custodyColumns ?? [];
36
- const columns = peerColumns.reduce((acc, elem) => {
37
- if (partialDownload.pendingDataColumns.includes(elem)) {
38
- acc.push(elem);
39
- }
40
- return acc;
41
- }, []);
42
- return columns.length > 0;
43
- }), (peer) => (failedPeers.has(peer) ? 1 : 0), // Sort by no failed first = 0
25
+ const sortedBestPeers = sortBy(this.peers, (peer) => (failedPeers.has(peer) ? 1 : 0), // Sort by no failed first = 0
44
26
  (peer) => this.activeRequestsByPeer.get(peer) ?? 0 // Sort by least active req
45
27
  );
46
28
  return sortedBestPeers[0];
@@ -1 +1 @@
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"}
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;IAI7B,YAAY,KAAkB,EAAE,OAAgB;QAFxC,yBAAoB,GAAG,IAAI,GAAG,EAAqB,CAAC;QAG1D,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;QAE5B,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,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;QACpD,MAAM,eAAe,GAAG,MAAM,CAC5B,IAAI,CAAC,KAAK,EACV,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"}
@@ -58,19 +58,12 @@ export declare class UnknownBlockSync {
58
58
  */
59
59
  private processBlock;
60
60
  /**
61
- * From a set of shuffled peers:
62
- * - fetch the block
63
- * - from deneb, fetch all missing blobs
64
- * - from peerDAS, fetch sampled colmns
65
- * TODO: this means we only have block root, and nothing else. Consider to reflect this in the function name
61
+ * Fetches the parent of a block by root from a set of shuffled peers.
66
62
  * Will attempt a max of `MAX_ATTEMPTS_PER_BLOCK` on different peers if connectPeers.length > MAX_ATTEMPTS_PER_BLOCK.
67
63
  * Also verifies the received block root + returns the peer that provided the block for future downscoring.
68
64
  */
69
65
  private fetchUnknownBlockRoot;
70
66
  /**
71
- * We have partial block input:
72
- * - we have block but not have all blobs (deneb) or needed columns (fulu)
73
- * - we don't have block and have some blobs (deneb) or some columns (fulu)
74
67
  * Fetches missing blobs for the blockinput, in future can also pull block is thats also missing
75
68
  * along with the blobs (i.e. only some blobs are available)
76
69
  */
@@ -1,10 +1,9 @@
1
- import { fromHexString, toHexString } from "@chainsafe/ssz";
2
- import { ForkName, INTERVALS_PER_SLOT, NUMBER_OF_COLUMNS } from "@lodestar/params";
1
+ import { INTERVALS_PER_SLOT } from "@lodestar/params";
3
2
  import { fromHex, pruneSetToMax, toRootHex } from "@lodestar/utils";
4
3
  import { sleep } from "@lodestar/utils";
5
4
  import { BlockInputType } from "../chain/blocks/types.js";
6
5
  import { BlockError, BlockErrorCode } from "../chain/errors/index.js";
7
- import { NetworkEvent } from "../network/index.js";
6
+ import { NetworkEvent, PeerAction } from "../network/index.js";
8
7
  import { beaconBlocksMaybeBlobsByRoot, unavailableBeaconBlobsByRoot, } from "../network/reqresp/beaconBlocksMaybeBlobsByRoot.js";
9
8
  import { byteArrayEquals } from "../util/bytes.js";
10
9
  import { shuffle } from "../util/shuffle.js";
@@ -194,8 +193,8 @@ export class UnknownBlockSync {
194
193
  else {
195
194
  if (blockInputOrRootHex.block !== null) {
196
195
  const { block } = blockInputOrRootHex;
197
- blockRootHex = toHexString(this.config.getForkTypes(block.message.slot).BeaconBlock.hashTreeRoot(block.message));
198
- unknownBlockType = PendingBlockType.UNKNOWN_DATA;
196
+ blockRootHex = toRootHex(this.config.getForkTypes(block.message.slot).BeaconBlock.hashTreeRoot(block.message));
197
+ unknownBlockType = PendingBlockType.UNKNOWN_BLOBS;
199
198
  }
200
199
  else {
201
200
  unknownBlockType = PendingBlockType.UNKNOWN_BLOCKINPUT;
@@ -231,70 +230,23 @@ export class UnknownBlockSync {
231
230
  }
232
231
  return unknownBlockType;
233
232
  }
234
- async downloadBlock(block, allPeers) {
233
+ async downloadBlock(block, connectedPeers) {
235
234
  if (block.status !== PendingBlockStatus.pending) {
236
235
  return;
237
236
  }
238
237
  const unknownBlockType = block.unknownBlockType;
239
- const logCtx = {
238
+ this.logger.verbose("Downloading unknown block", {
240
239
  root: block.blockRootHex,
241
240
  pendingBlocks: this.pendingBlocks.size,
242
241
  slot: block.blockInput?.block?.message.slot ?? "unknown",
243
242
  unknownBlockType,
244
- };
245
- this.logger.verbose("Downloading unknown block", logCtx);
243
+ });
246
244
  block.status = PendingBlockStatus.fetching;
247
245
  let res;
248
- let connectedPeers;
249
246
  if (block.blockInput === null) {
250
- connectedPeers = allPeers;
251
- // we only have block root, and nothing else
252
- res = await wrapError(this.fetchUnknownBlockRoot(fromHexString(block.blockRootHex), connectedPeers));
247
+ res = await wrapError(this.fetchUnknownBlockRoot(fromHex(block.blockRootHex), connectedPeers));
253
248
  }
254
249
  else {
255
- const { cachedData } = block.blockInput;
256
- if (cachedData.fork === ForkName.fulu) {
257
- const { dataColumnsCache } = cachedData;
258
- const sampledColumns = this.network.custodyConfig.sampledColumns;
259
- const neededColumns = sampledColumns.reduce((acc, elem) => {
260
- if (dataColumnsCache.get(elem) === undefined) {
261
- acc.push(elem);
262
- }
263
- return acc;
264
- }, []);
265
- connectedPeers =
266
- neededColumns.length <= 0
267
- ? allPeers
268
- : allPeers.filter((peer) => {
269
- const peerColumns = this.network.getConnectedPeerCustody(peer);
270
- const columns = peerColumns.reduce((acc, elem) => {
271
- if (neededColumns.includes(elem)) {
272
- acc.push(elem);
273
- }
274
- return acc;
275
- }, []);
276
- return columns.length > 0;
277
- });
278
- if (connectedPeers.length > 0) {
279
- this.logger.debug("Filtered peers to those having relevant columns for downloading data", {
280
- ...logCtx,
281
- allPeers: allPeers.length,
282
- connectedPeers: connectedPeers.length,
283
- });
284
- }
285
- else {
286
- this.logger.debug("Skipping download as no filtered peers having relevant data", {
287
- ...logCtx,
288
- allPeers: allPeers.length,
289
- connectedPeers: connectedPeers.length,
290
- neededColumns: neededColumns.join(" "),
291
- });
292
- return;
293
- }
294
- }
295
- else {
296
- connectedPeers = allPeers;
297
- }
298
250
  res = await wrapError(this.fetchUnavailableBlockInput(block.blockInput, connectedPeers));
299
251
  }
300
252
  if (res.err)
@@ -303,73 +255,48 @@ export class UnknownBlockSync {
303
255
  this.metrics?.syncUnknownBlock.downloadedBlocksSuccess.inc();
304
256
  if (!res.err) {
305
257
  const { blockInput, peerIdStr } = res.result;
306
- if (blockInput.type === BlockInputType.dataPromise) {
307
- // if there were any peers who would have had the missing datacolumns, it would have resulted in err
308
- block = {
309
- ...block,
310
- blockInput,
311
- unknownBlockType: PendingBlockType.UNKNOWN_DATA,
312
- };
313
- block.blockInput = blockInput;
314
- this.pendingBlocks.set(block.blockRootHex, block);
315
- block.status = PendingBlockStatus.pending;
316
- // parentSlot > finalizedSlot, continue downloading parent of parent
317
- block.downloadAttempts += this.config.CUSTODY_REQUIREMENT / NUMBER_OF_COLUMNS;
318
- const errorData = { root: block.blockRootHex, attempts: block.downloadAttempts, unknownBlockType };
319
- if (block.downloadAttempts > MAX_ATTEMPTS_PER_BLOCK) {
320
- // Give up on this block and assume it does not exist, penalizing all peers as if it was a bad block
321
- this.logger.debug("Ignoring unknown block after many failed downloads", errorData);
322
- this.removeAndDownscoreAllDescendants(block);
323
- }
324
- else {
325
- // Try again when a new peer connects, its status changes, or a new unknownBlockParent event happens
326
- this.logger.debug("Error downloading full unknown block", errorData);
327
- }
258
+ block = {
259
+ ...block,
260
+ status: PendingBlockStatus.downloaded,
261
+ blockInput,
262
+ parentBlockRootHex: toRootHex(blockInput.block.message.parentRoot),
263
+ };
264
+ this.pendingBlocks.set(block.blockRootHex, block);
265
+ const blockSlot = blockInput.block.message.slot;
266
+ const finalizedSlot = this.chain.forkChoice.getFinalizedBlock().slot;
267
+ const delaySec = Date.now() / 1000 - (this.chain.genesisTime + blockSlot * this.config.SECONDS_PER_SLOT);
268
+ this.metrics?.syncUnknownBlock.elapsedTimeTillReceived.observe(delaySec);
269
+ const parentInForkchoice = this.chain.forkChoice.hasBlock(blockInput.block.message.parentRoot);
270
+ this.logger.verbose("Downloaded unknown block", {
271
+ root: block.blockRootHex,
272
+ pendingBlocks: this.pendingBlocks.size,
273
+ parentInForkchoice,
274
+ blockInputType: blockInput.type,
275
+ unknownBlockType,
276
+ });
277
+ if (parentInForkchoice) {
278
+ // Bingo! Process block. Add to pending blocks anyway for recycle the cache that prevents duplicate processing
279
+ this.processBlock(block).catch((e) => {
280
+ this.logger.debug("Unexpected error - process newly downloaded block", {}, e);
281
+ });
328
282
  }
329
- else {
330
- block = {
331
- ...block,
332
- status: PendingBlockStatus.downloaded,
333
- blockInput,
334
- parentBlockRootHex: toHexString(blockInput.block.message.parentRoot),
335
- };
336
- this.pendingBlocks.set(block.blockRootHex, block);
337
- const blockSlot = blockInput.block.message.slot;
338
- const finalizedSlot = this.chain.forkChoice.getFinalizedBlock().slot;
339
- const delaySec = Date.now() / 1000 - (this.chain.genesisTime + blockSlot * this.config.SECONDS_PER_SLOT);
340
- this.metrics?.syncUnknownBlock.elapsedTimeTillReceived.observe(delaySec);
341
- const parentInForkchoice = this.chain.forkChoice.hasBlock(blockInput.block.message.parentRoot);
342
- this.logger.verbose("Downloaded unknown block", {
343
- root: block.blockRootHex,
344
- pendingBlocks: this.pendingBlocks.size,
345
- parentInForkchoice,
346
- blockInputType: blockInput.type,
283
+ else if (blockSlot <= finalizedSlot) {
284
+ // the common ancestor of the downloading chain and canonical chain should be at least the finalized slot and
285
+ // we should found it through forkchoice. If not, we should penalize all peers sending us this block chain
286
+ // 0 - 1 - ... - n - finalizedSlot
287
+ // \
288
+ // parent 1 - parent 2 - ... - unknownParent block
289
+ const blockRoot = this.config.getForkTypes(blockSlot).BeaconBlock.hashTreeRoot(blockInput.block.message);
290
+ this.logger.debug("Downloaded block is before finalized slot", {
291
+ finalizedSlot,
292
+ blockSlot,
293
+ parentRoot: toRootHex(blockRoot),
347
294
  unknownBlockType,
348
295
  });
349
- if (parentInForkchoice) {
350
- // Bingo! Process block. Add to pending blocks anyway for recycle the cache that prevents duplicate processing
351
- this.processBlock(block).catch((e) => {
352
- this.logger.debug("Unexpected error - process newly downloaded block", {}, e);
353
- });
354
- }
355
- else if (blockSlot <= finalizedSlot) {
356
- // the common ancestor of the downloading chain and canonical chain should be at least the finalized slot and
357
- // we should found it through forkchoice. If not, we should penalize all peers sending us this block chain
358
- // 0 - 1 - ... - n - finalizedSlot
359
- // \
360
- // parent 1 - parent 2 - ... - unknownParent block
361
- const blockRoot = this.config.getForkTypes(blockSlot).BeaconBlock.hashTreeRoot(blockInput.block.message);
362
- this.logger.debug("Downloaded block is before finalized slot", {
363
- finalizedSlot,
364
- blockSlot,
365
- parentRoot: toHexString(blockRoot),
366
- unknownBlockType,
367
- });
368
- this.removeAndDownscoreAllDescendants(block);
369
- }
370
- else {
371
- this.onUnknownParent({ blockInput, peer: peerIdStr });
372
- }
296
+ this.removeAndDownscoreAllDescendants(block);
297
+ }
298
+ else {
299
+ this.onUnknownParent({ blockInput, peer: peerIdStr });
373
300
  }
374
301
  }
375
302
  else {
@@ -476,11 +403,7 @@ export class UnknownBlockSync {
476
403
  }
477
404
  }
478
405
  /**
479
- * From a set of shuffled peers:
480
- * - fetch the block
481
- * - from deneb, fetch all missing blobs
482
- * - from peerDAS, fetch sampled colmns
483
- * TODO: this means we only have block root, and nothing else. Consider to reflect this in the function name
406
+ * Fetches the parent of a block by root from a set of shuffled peers.
484
407
  * Will attempt a max of `MAX_ATTEMPTS_PER_BLOCK` on different peers if connectPeers.length > MAX_ATTEMPTS_PER_BLOCK.
485
408
  * Also verifies the received block root + returns the peer that provided the block for future downscoring.
486
409
  */
@@ -488,49 +411,14 @@ export class UnknownBlockSync {
488
411
  const shuffledPeers = shuffle(connectedPeers);
489
412
  const blockRootHex = toRootHex(blockRoot);
490
413
  let lastError = null;
491
- let partialDownload = null;
492
- let fetchedPeerId = null;
493
414
  for (let i = 0; i < MAX_ATTEMPTS_PER_BLOCK; i++) {
494
415
  const peer = shuffledPeers[i % shuffledPeers.length];
495
- if (partialDownload !== null) {
496
- const [prevBlockInput] = partialDownload.blocks;
497
- if (prevBlockInput === undefined || prevBlockInput.type !== BlockInputType.dataPromise) {
498
- throw Error(`prevBlockInput=${prevBlockInput?.type} in partialDownload`);
499
- }
500
- const { cachedData } = prevBlockInput;
501
- if (cachedData.fork === ForkName.fulu) {
502
- const { dataColumnsCache } = cachedData;
503
- const sampledColumns = this.network.custodyConfig.sampledColumns;
504
- const neededColumns = sampledColumns.reduce((acc, elem) => {
505
- if (dataColumnsCache.get(elem) === undefined) {
506
- acc.push(elem);
507
- }
508
- return acc;
509
- }, []);
510
- const peerColumns = this.network.getConnectedPeerCustody(peer);
511
- const columns = peerColumns.reduce((acc, elem) => {
512
- if (neededColumns.includes(elem)) {
513
- acc.push(elem);
514
- }
515
- return acc;
516
- }, []);
517
- if (columns.length === 0) {
518
- continue;
519
- }
520
- }
521
- }
522
416
  try {
523
- const peerClient = this.network.getConnectedPeerClientAgent(peer);
524
- const { blocks: [blockInput], pendingDataColumns, } = await beaconBlocksMaybeBlobsByRoot(this.config, this.network, peer, [blockRoot], partialDownload, peerClient, this.logger);
417
+ const [blockInput] = await beaconBlocksMaybeBlobsByRoot(this.config, this.network, peer, [blockRoot]);
525
418
  // Peer does not have the block, try with next peer
526
419
  if (blockInput === undefined) {
527
420
  continue;
528
421
  }
529
- if (pendingDataColumns !== null) {
530
- partialDownload = { blocks: [blockInput], pendingDataColumns };
531
- fetchedPeerId = peer;
532
- continue;
533
- }
534
422
  // Verify block root is correct
535
423
  const block = blockInput.block.message;
536
424
  const receivedBlockRoot = this.config.getForkTypes(block.slot).BeaconBlock.hashTreeRoot(block);
@@ -548,16 +436,9 @@ export class UnknownBlockSync {
548
436
  lastError.message = `Error fetching UnknownBlockRoot after ${MAX_ATTEMPTS_PER_BLOCK} attempts: ${lastError.message}`;
549
437
  throw lastError;
550
438
  }
551
- if (partialDownload !== null && fetchedPeerId !== null) {
552
- const { blocks: [blockInput], } = partialDownload;
553
- return { blockInput, peerIdStr: fetchedPeerId };
554
- }
555
- throw Error(`Error fetching UnknownBlockRoot after ${MAX_ATTEMPTS_PER_BLOCK}: unknown error because either partialDownload is null=${partialDownload === null} or fetchedPeerId is null=${fetchedPeerId === null} `);
439
+ throw Error(`Error fetching UnknownBlockRoot after ${MAX_ATTEMPTS_PER_BLOCK}: unknown error`);
556
440
  }
557
441
  /**
558
- * We have partial block input:
559
- * - we have block but not have all blobs (deneb) or needed columns (fulu)
560
- * - we don't have block and have some blobs (deneb) or some columns (fulu)
561
442
  * Fetches missing blobs for the blockinput, in future can also pull block is thats also missing
562
443
  * along with the blobs (i.e. only some blobs are available)
563
444
  */
@@ -567,75 +448,37 @@ export class UnknownBlockSync {
567
448
  }
568
449
  const shuffledPeers = shuffle(connectedPeers);
569
450
  let blockRootHex;
451
+ let pendingBlobs;
570
452
  let blobKzgCommitmentsLen;
571
453
  let blockRoot;
572
- const dataMeta = {};
573
- let sampledColumns = [];
574
454
  if (unavailableBlockInput.block === null) {
575
455
  blockRootHex = unavailableBlockInput.blockRootHex;
576
456
  blockRoot = fromHex(blockRootHex);
577
457
  }
578
458
  else {
579
- const { cachedData, block: unavailableBlock } = unavailableBlockInput;
459
+ const unavailableBlock = unavailableBlockInput.block;
580
460
  blockRoot = this.config
581
461
  .getForkTypes(unavailableBlock.message.slot)
582
462
  .BeaconBlock.hashTreeRoot(unavailableBlock.message);
583
463
  blockRootHex = toRootHex(blockRoot);
584
464
  blobKzgCommitmentsLen = unavailableBlock.message.body.blobKzgCommitments.length;
585
- if (cachedData.fork === ForkName.deneb || cachedData.fork === ForkName.electra) {
586
- const pendingBlobs = blobKzgCommitmentsLen - cachedData.blobsCache.size;
587
- Object.assign(dataMeta, { pendingBlobs });
588
- }
589
- else if (cachedData.fork === ForkName.fulu) {
590
- sampledColumns = this.network.custodyConfig.sampledColumns;
591
- const pendingColumns = sampledColumns.length - cachedData.dataColumnsCache.size;
592
- Object.assign(dataMeta, { pendingColumns });
593
- }
465
+ pendingBlobs = blobKzgCommitmentsLen - unavailableBlockInput.cachedData.blobsCache.size;
594
466
  }
595
467
  let lastError = null;
596
468
  for (let i = 0; i < MAX_ATTEMPTS_PER_BLOCK; i++) {
597
469
  const peer = shuffledPeers[i % shuffledPeers.length];
598
- if (unavailableBlockInput.block !== null) {
599
- const { cachedData } = unavailableBlockInput;
600
- if (cachedData.fork === ForkName.fulu) {
601
- const { dataColumnsCache } = cachedData;
602
- const neededColumns = sampledColumns.reduce((acc, elem) => {
603
- if (dataColumnsCache.get(elem) === undefined) {
604
- acc.push(elem);
605
- }
606
- return acc;
607
- }, []);
608
- const peerColumns = this.network.getConnectedPeerCustody(peer);
609
- const columns = peerColumns.reduce((acc, elem) => {
610
- if (neededColumns.includes(elem)) {
611
- acc.push(elem);
612
- }
613
- return acc;
614
- }, []);
615
- if (columns.length === 0) {
616
- continue;
617
- }
618
- }
619
- }
620
470
  try {
621
- const peerClient = this.network.getConnectedPeerClientAgent(peer);
622
- const blockInput = await unavailableBeaconBlobsByRoot(this.config, this.network, peer, peerClient, unavailableBlockInput, {
471
+ const blockInput = await unavailableBeaconBlobsByRoot(this.config, this.network, peer, unavailableBlockInput, {
623
472
  metrics: this.metrics,
624
- logger: this.logger,
625
- executionEngine: this.chain.executionEngine,
626
473
  emitter: this.chain.emitter,
627
- blockInputsRetryTrackerCache: this.blockInputsRetryTrackerCache,
474
+ executionEngine: this.chain.executionEngine,
628
475
  engineGetBlobsCache: this.engineGetBlobsCache,
476
+ blockInputsRetryTrackerCache: this.blockInputsRetryTrackerCache,
629
477
  });
630
478
  // Peer does not have the block, try with next peer
631
479
  if (blockInput === undefined) {
632
480
  continue;
633
481
  }
634
- if (unavailableBlockInput.block !== null && blockInput.type === BlockInputType.dataPromise) {
635
- // all datacolumns were not downloaded we can continue with other peers
636
- // as unavailableBlockInput.block's dataColumnsCache would be updated
637
- continue;
638
- }
639
482
  // Verify block root is correct
640
483
  const block = blockInput.block.message;
641
484
  const receivedBlockRoot = this.config.getForkTypes(block.slot).BeaconBlock.hashTreeRoot(block);
@@ -646,7 +489,7 @@ export class UnknownBlockSync {
646
489
  this.logger.debug("Fetched NullBlockInput", { attempts: i, blockRootHex });
647
490
  }
648
491
  else {
649
- this.logger.debug("Fetched UnavailableBlockInput", { attempts: i, ...dataMeta, blobKzgCommitmentsLen });
492
+ this.logger.debug("Fetched UnavailableBlockInput", { attempts: i, pendingBlobs, blobKzgCommitmentsLen });
650
493
  }
651
494
  return { blockInput, peerIdStr: peer };
652
495
  }
@@ -670,15 +513,13 @@ export class UnknownBlockSync {
670
513
  removeAndDownscoreAllDescendants(block) {
671
514
  // Get all blocks that are a descendant of this one
672
515
  const badPendingBlocks = this.removeAllDescendants(block);
673
- // just console log and do not penalize on pending/bad blocks for debugging
674
- // console.log("removeAndDownscoreAllDescendants", {block});
675
516
  for (const block of badPendingBlocks) {
676
- // this.knownBadBlocks.add(block.blockRootHex);
677
- // for (const peerIdStr of block.peerIdStrs) {
678
- // // TODO: Refactor peerRpcScores to work with peerIdStr only
679
- // this.network.reportPeer(peerIdStr, PeerAction.LowToleranceError, "BadBlockByRoot");
680
- // }
681
- this.logger.debug("ignored Banning unknown block", {
517
+ this.knownBadBlocks.add(block.blockRootHex);
518
+ for (const peerIdStr of block.peerIdStrs) {
519
+ // TODO: Refactor peerRpcScores to work with peerIdStr only
520
+ this.network.reportPeer(peerIdStr, PeerAction.LowToleranceError, "BadBlockByRoot");
521
+ }
522
+ this.logger.debug("Banning unknown block", {
682
523
  root: block.blockRootHex,
683
524
  peerIdStrs: Array.from(block.peerIdStrs).join(","),
684
525
  });