@lodestar/beacon-node 1.34.0-dev.d5a4e7a09c → 1.34.0-dev.d9fc7bb103

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 (264) hide show
  1. package/lib/api/impl/beacon/blocks/index.js +162 -55
  2. package/lib/api/impl/beacon/blocks/index.js.map +1 -1
  3. package/lib/api/impl/beacon/pool/index.js +3 -3
  4. package/lib/api/impl/beacon/pool/index.js.map +1 -1
  5. package/lib/api/impl/beacon/state/index.js +15 -16
  6. package/lib/api/impl/beacon/state/index.js.map +1 -1
  7. package/lib/api/impl/debug/index.d.ts +1 -1
  8. package/lib/api/impl/debug/index.js +24 -1
  9. package/lib/api/impl/debug/index.js.map +1 -1
  10. package/lib/api/impl/validator/index.js +37 -26
  11. package/lib/api/impl/validator/index.js.map +1 -1
  12. package/lib/api/impl/validator/utils.d.ts +3 -3
  13. package/lib/api/impl/validator/utils.js +2 -2
  14. package/lib/api/impl/validator/utils.js.map +1 -1
  15. package/lib/chain/archiveStore/archiveStore.d.ts +1 -1
  16. package/lib/chain/archiveStore/archiveStore.js +2 -2
  17. package/lib/chain/archiveStore/interface.d.ts +1 -1
  18. package/lib/chain/archiveStore/utils/archiveBlocks.d.ts +1 -1
  19. package/lib/chain/archiveStore/utils/archiveBlocks.js +89 -22
  20. package/lib/chain/archiveStore/utils/archiveBlocks.js.map +1 -1
  21. package/lib/chain/beaconProposerCache.d.ts +1 -0
  22. package/lib/chain/beaconProposerCache.js +3 -0
  23. package/lib/chain/beaconProposerCache.js.map +1 -1
  24. package/lib/chain/blocks/importBlock.js +3 -2
  25. package/lib/chain/blocks/importBlock.js.map +1 -1
  26. package/lib/chain/blocks/types.d.ts +66 -23
  27. package/lib/chain/blocks/types.js +39 -5
  28. package/lib/chain/blocks/types.js.map +1 -1
  29. package/lib/chain/blocks/utils/zebraBanner.d.ts +2 -0
  30. package/lib/chain/blocks/utils/zebraBanner.js +45 -0
  31. package/lib/chain/blocks/utils/zebraBanner.js.map +1 -0
  32. package/lib/chain/blocks/verifyBlock.js +18 -5
  33. package/lib/chain/blocks/verifyBlock.js.map +1 -1
  34. package/lib/chain/blocks/verifyBlocksDataAvailability.js +21 -10
  35. package/lib/chain/blocks/verifyBlocksDataAvailability.js.map +1 -1
  36. package/lib/chain/blocks/writeBlockInputToDb.js +63 -16
  37. package/lib/chain/blocks/writeBlockInputToDb.js.map +1 -1
  38. package/lib/chain/chain.d.ts +18 -101
  39. package/lib/chain/chain.js +107 -68
  40. package/lib/chain/chain.js.map +1 -1
  41. package/lib/chain/emitter.d.ts +18 -2
  42. package/lib/chain/emitter.js +13 -0
  43. package/lib/chain/emitter.js.map +1 -1
  44. package/lib/chain/errors/dataColumnSidecarError.d.ts +69 -0
  45. package/lib/chain/errors/dataColumnSidecarError.js +21 -0
  46. package/lib/chain/errors/dataColumnSidecarError.js.map +1 -0
  47. package/lib/chain/errors/index.d.ts +1 -0
  48. package/lib/chain/errors/index.js +1 -0
  49. package/lib/chain/errors/index.js.map +1 -1
  50. package/lib/chain/interface.d.ts +6 -7
  51. package/lib/chain/interface.js.map +1 -1
  52. package/lib/chain/options.d.ts +4 -1
  53. package/lib/chain/options.js +1 -0
  54. package/lib/chain/options.js.map +1 -1
  55. package/lib/chain/prepareNextSlot.js +2 -1
  56. package/lib/chain/prepareNextSlot.js.map +1 -1
  57. package/lib/chain/produceBlock/produceBlockBody.d.ts +30 -16
  58. package/lib/chain/produceBlock/produceBlockBody.js +28 -28
  59. package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
  60. package/lib/chain/produceBlock/validateBlobsAndKzgCommitments.d.ts +6 -3
  61. package/lib/chain/produceBlock/validateBlobsAndKzgCommitments.js +28 -4
  62. package/lib/chain/produceBlock/validateBlobsAndKzgCommitments.js.map +1 -1
  63. package/lib/chain/seenCache/seenGossipBlockInput.d.ts +64 -18
  64. package/lib/chain/seenCache/seenGossipBlockInput.js +321 -53
  65. package/lib/chain/seenCache/seenGossipBlockInput.js.map +1 -1
  66. package/lib/chain/validation/dataColumnSidecar.d.ts +29 -0
  67. package/lib/chain/validation/dataColumnSidecar.js +248 -0
  68. package/lib/chain/validation/dataColumnSidecar.js.map +1 -0
  69. package/lib/db/beacon.d.ts +3 -1
  70. package/lib/db/beacon.js +3 -1
  71. package/lib/db/beacon.js.map +1 -1
  72. package/lib/db/buckets.d.ts +3 -1
  73. package/lib/db/buckets.js +2 -0
  74. package/lib/db/buckets.js.map +1 -1
  75. package/lib/db/interface.d.ts +3 -1
  76. package/lib/db/repositories/dataColumnSidecar.d.ts +26 -0
  77. package/lib/db/repositories/dataColumnSidecar.js +39 -0
  78. package/lib/db/repositories/dataColumnSidecar.js.map +1 -0
  79. package/lib/db/repositories/dataColumnSidecarArchive.d.ts +24 -0
  80. package/lib/db/repositories/dataColumnSidecarArchive.js +39 -0
  81. package/lib/db/repositories/dataColumnSidecarArchive.js.map +1 -0
  82. package/lib/db/repositories/index.d.ts +2 -0
  83. package/lib/db/repositories/index.js +2 -0
  84. package/lib/db/repositories/index.js.map +1 -1
  85. package/lib/execution/builder/http.d.ts +20 -4
  86. package/lib/execution/builder/http.js +30 -11
  87. package/lib/execution/builder/http.js.map +1 -1
  88. package/lib/execution/builder/interface.d.ts +5 -4
  89. package/lib/execution/engine/http.d.ts +8 -5
  90. package/lib/execution/engine/http.js +56 -42
  91. package/lib/execution/engine/http.js.map +1 -1
  92. package/lib/execution/engine/interface.d.ts +6 -13
  93. package/lib/execution/engine/interface.js +1 -1
  94. package/lib/execution/engine/interface.js.map +1 -1
  95. package/lib/execution/engine/mock.d.ts +1 -0
  96. package/lib/execution/engine/mock.js +5 -0
  97. package/lib/execution/engine/mock.js.map +1 -1
  98. package/lib/execution/engine/types.d.ts +12 -2
  99. package/lib/execution/engine/types.js +8 -2
  100. package/lib/execution/engine/types.js.map +1 -1
  101. package/lib/metrics/metrics/beacon.d.ts +15 -5
  102. package/lib/metrics/metrics/beacon.js +61 -14
  103. package/lib/metrics/metrics/beacon.js.map +1 -1
  104. package/lib/metrics/metrics/lodestar.d.ts +29 -1
  105. package/lib/metrics/metrics/lodestar.js +59 -0
  106. package/lib/metrics/metrics/lodestar.js.map +1 -1
  107. package/lib/network/core/metrics.d.ts +10 -3
  108. package/lib/network/core/metrics.js +22 -4
  109. package/lib/network/core/metrics.js.map +1 -1
  110. package/lib/network/core/networkCore.d.ts +15 -4
  111. package/lib/network/core/networkCore.js +73 -23
  112. package/lib/network/core/networkCore.js.map +1 -1
  113. package/lib/network/core/networkCoreWorker.js +2 -0
  114. package/lib/network/core/networkCoreWorker.js.map +1 -1
  115. package/lib/network/core/networkCoreWorkerHandler.d.ts +5 -3
  116. package/lib/network/core/networkCoreWorkerHandler.js +6 -1
  117. package/lib/network/core/networkCoreWorkerHandler.js.map +1 -1
  118. package/lib/network/core/types.d.ts +7 -4
  119. package/lib/network/events.d.ts +4 -2
  120. package/lib/network/events.js.map +1 -1
  121. package/lib/network/gossip/gossipsub.d.ts +2 -2
  122. package/lib/network/gossip/gossipsub.js +8 -6
  123. package/lib/network/gossip/gossipsub.js.map +1 -1
  124. package/lib/network/gossip/interface.d.ts +8 -1
  125. package/lib/network/gossip/interface.js +1 -0
  126. package/lib/network/gossip/interface.js.map +1 -1
  127. package/lib/network/gossip/scoringParameters.d.ts +6 -2
  128. package/lib/network/gossip/scoringParameters.js.map +1 -1
  129. package/lib/network/gossip/topic.d.ts +2033 -1484
  130. package/lib/network/gossip/topic.js +29 -1
  131. package/lib/network/gossip/topic.js.map +1 -1
  132. package/lib/network/interface.d.ts +11 -3
  133. package/lib/network/metadata.d.ts +9 -5
  134. package/lib/network/metadata.js +26 -5
  135. package/lib/network/metadata.js.map +1 -1
  136. package/lib/network/network.d.ts +14 -4
  137. package/lib/network/network.js +73 -11
  138. package/lib/network/network.js.map +1 -1
  139. package/lib/network/networkConfig.d.ts +12 -0
  140. package/lib/network/networkConfig.js +2 -0
  141. package/lib/network/networkConfig.js.map +1 -0
  142. package/lib/network/options.d.ts +1 -0
  143. package/lib/network/options.js +5 -0
  144. package/lib/network/options.js.map +1 -1
  145. package/lib/network/peers/discover.d.ts +8 -3
  146. package/lib/network/peers/discover.js +99 -14
  147. package/lib/network/peers/discover.js.map +1 -1
  148. package/lib/network/peers/peerManager.d.ts +10 -4
  149. package/lib/network/peers/peerManager.js +105 -19
  150. package/lib/network/peers/peerManager.js.map +1 -1
  151. package/lib/network/peers/peersData.d.ts +17 -3
  152. package/lib/network/peers/peersData.js.map +1 -1
  153. package/lib/network/peers/score/interface.d.ts +1 -1
  154. package/lib/network/peers/score/score.d.ts +2 -2
  155. package/lib/network/peers/score/score.js +4 -1
  156. package/lib/network/peers/score/score.js.map +1 -1
  157. package/lib/network/peers/score/store.d.ts +3 -1
  158. package/lib/network/peers/score/store.js +6 -2
  159. package/lib/network/peers/score/store.js.map +1 -1
  160. package/lib/network/peers/utils/assertPeerRelevance.d.ts +7 -3
  161. package/lib/network/peers/utils/assertPeerRelevance.js +10 -1
  162. package/lib/network/peers/utils/assertPeerRelevance.js.map +1 -1
  163. package/lib/network/peers/utils/prioritizePeers.d.ts +19 -7
  164. package/lib/network/peers/utils/prioritizePeers.js +42 -6
  165. package/lib/network/peers/utils/prioritizePeers.js.map +1 -1
  166. package/lib/network/processor/extractSlotRootFns.js +8 -1
  167. package/lib/network/processor/extractSlotRootFns.js.map +1 -1
  168. package/lib/network/processor/gossipHandlers.js +165 -16
  169. package/lib/network/processor/gossipHandlers.js.map +1 -1
  170. package/lib/network/processor/gossipQueues/index.js +5 -0
  171. package/lib/network/processor/gossipQueues/index.js.map +1 -1
  172. package/lib/network/processor/index.js +1 -0
  173. package/lib/network/processor/index.js.map +1 -1
  174. package/lib/network/reqresp/ReqRespBeaconNode.d.ts +2 -2
  175. package/lib/network/reqresp/ReqRespBeaconNode.js +36 -14
  176. package/lib/network/reqresp/ReqRespBeaconNode.js.map +1 -1
  177. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.d.ts +24 -4
  178. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js +259 -20
  179. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js.map +1 -1
  180. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.d.ts +37 -6
  181. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js +283 -28
  182. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js.map +1 -1
  183. package/lib/network/reqresp/handlers/beaconBlocksByRange.d.ts +1 -1
  184. package/lib/network/reqresp/handlers/beaconBlocksByRange.js +3 -3
  185. package/lib/network/reqresp/handlers/beaconBlocksByRange.js.map +1 -1
  186. package/lib/network/reqresp/handlers/beaconBlocksByRoot.d.ts +2 -2
  187. package/lib/network/reqresp/handlers/beaconBlocksByRoot.js.map +1 -1
  188. package/lib/network/reqresp/handlers/blobSidecarsByRange.d.ts +2 -2
  189. package/lib/network/reqresp/handlers/blobSidecarsByRange.js +2 -3
  190. package/lib/network/reqresp/handlers/blobSidecarsByRange.js.map +1 -1
  191. package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.d.ts +8 -0
  192. package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.js +73 -0
  193. package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.js.map +1 -0
  194. package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.d.ts +6 -0
  195. package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.js +36 -0
  196. package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.js.map +1 -0
  197. package/lib/network/reqresp/handlers/index.js +13 -2
  198. package/lib/network/reqresp/handlers/index.js.map +1 -1
  199. package/lib/network/reqresp/protocols.d.ts +4 -0
  200. package/lib/network/reqresp/protocols.js +20 -0
  201. package/lib/network/reqresp/protocols.js.map +1 -1
  202. package/lib/network/reqresp/rateLimit.js +19 -3
  203. package/lib/network/reqresp/rateLimit.js.map +1 -1
  204. package/lib/network/reqresp/score.js +3 -0
  205. package/lib/network/reqresp/score.js.map +1 -1
  206. package/lib/network/reqresp/types.d.ts +13 -6
  207. package/lib/network/reqresp/types.js +14 -5
  208. package/lib/network/reqresp/types.js.map +1 -1
  209. package/lib/network/statusCache.d.ts +5 -5
  210. package/lib/network/statusCache.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 +1 -0
  217. package/lib/node/nodejs.js.map +1 -1
  218. package/lib/sync/constants.d.ts +18 -3
  219. package/lib/sync/constants.js +21 -3
  220. package/lib/sync/constants.js.map +1 -1
  221. package/lib/sync/interface.d.ts +2 -2
  222. package/lib/sync/interface.js +1 -1
  223. package/lib/sync/interface.js.map +1 -1
  224. package/lib/sync/range/batch.d.ts +17 -2
  225. package/lib/sync/range/batch.js +39 -7
  226. package/lib/sync/range/batch.js.map +1 -1
  227. package/lib/sync/range/chain.d.ts +15 -1
  228. package/lib/sync/range/chain.js +124 -33
  229. package/lib/sync/range/chain.js.map +1 -1
  230. package/lib/sync/range/range.d.ts +3 -2
  231. package/lib/sync/range/range.js +9 -3
  232. package/lib/sync/range/range.js.map +1 -1
  233. package/lib/sync/range/utils/chainTarget.d.ts +5 -1
  234. package/lib/sync/range/utils/chainTarget.js +26 -1
  235. package/lib/sync/range/utils/chainTarget.js.map +1 -1
  236. package/lib/sync/range/utils/peerBalancer.d.ts +19 -5
  237. package/lib/sync/range/utils/peerBalancer.js +104 -10
  238. package/lib/sync/range/utils/peerBalancer.js.map +1 -1
  239. package/lib/sync/sync.js +1 -1
  240. package/lib/sync/sync.js.map +1 -1
  241. package/lib/sync/unknownBlock.d.ts +54 -5
  242. package/lib/sync/unknownBlock.js +321 -61
  243. package/lib/sync/unknownBlock.js.map +1 -1
  244. package/lib/sync/utils/remoteSyncType.d.ts +4 -4
  245. package/lib/sync/utils/remoteSyncType.js.map +1 -1
  246. package/lib/util/blobs.d.ts +16 -4
  247. package/lib/util/blobs.js +122 -5
  248. package/lib/util/blobs.js.map +1 -1
  249. package/lib/util/dataColumns.d.ts +137 -0
  250. package/lib/util/dataColumns.js +358 -0
  251. package/lib/util/dataColumns.js.map +1 -0
  252. package/lib/util/metadata.d.ts +5 -0
  253. package/lib/util/metadata.js +10 -0
  254. package/lib/util/metadata.js.map +1 -1
  255. package/lib/util/sszBytes.d.ts +1 -0
  256. package/lib/util/sszBytes.js +17 -0
  257. package/lib/util/sszBytes.js.map +1 -1
  258. package/lib/util/types.d.ts +7 -0
  259. package/lib/util/types.js +3 -0
  260. package/lib/util/types.js.map +1 -1
  261. package/package.json +18 -18
  262. package/lib/network/reqresp/handlers/status.d.ts +0 -4
  263. package/lib/network/reqresp/handlers/status.js +0 -11
  264. package/lib/network/reqresp/handlers/status.js.map +0 -1
@@ -1,12 +1,24 @@
1
- import { ForkSeq } from "@lodestar/params";
1
+ import { ForkName, ForkSeq } from "@lodestar/params";
2
2
  import { computeEpochAtSlot } from "@lodestar/state-transition";
3
- import { BlobsSource, BlockSource, getBlockInput } from "../../chain/blocks/types.js";
4
- export async function beaconBlocksMaybeBlobsByRange(config, network, peerId, request, currentEpoch) {
3
+ import { ssz, } from "@lodestar/types";
4
+ import { BlobsSource, BlockInputType, BlockSource, DataColumnsSource, getBlockInput, getBlockInputDataColumns, } from "../../chain/blocks/types.js";
5
+ import { getEmptyBlockInputCacheEntry } from "../../chain/seenCache/seenGossipBlockInput.js";
6
+ import { RangeSyncType } from "../../sync/utils/remoteSyncType.js";
7
+ import { PeerAction } from "../peers/score/interface.js";
8
+ export const SyncSourceByRoot = "ByRoot";
9
+ /**
10
+ * Download blocks and blobs (prefulu) or data columns (fulu) by range.
11
+ * returns:
12
+ * - array of blocks with blobs or data columns
13
+ * - pendingDataColumns: null if all data columns are present, or array of column indexes that are missing. Also null for prefulu
14
+ */
15
+ export async function beaconBlocksMaybeBlobsByRange(config, network, peer, request, currentEpoch, partialDownload, syncSource, metrics, logger) {
16
+ const { peerId, client: peerClient, custodyGroups: peerColumns, earliestAvailableSlot } = peer;
5
17
  // Code below assumes the request is in the same epoch
6
18
  // Range sync satisfies this condition, but double check here for sanity
7
19
  const { startSlot, count } = request;
8
20
  if (count < 1) {
9
- return [];
21
+ throw Error(`Invalid count=${count} in BeaconBlocksByRangeRequest`);
10
22
  }
11
23
  const endSlot = startSlot + count - 1;
12
24
  const startEpoch = computeEpochAtSlot(startSlot);
@@ -14,26 +26,100 @@ export async function beaconBlocksMaybeBlobsByRange(config, network, peerId, req
14
26
  if (startEpoch !== endEpoch) {
15
27
  throw Error(`BeaconBlocksByRangeRequest must be in the same epoch startEpoch=${startEpoch} != endEpoch=${endEpoch}`);
16
28
  }
29
+ const forkSeq = config.getForkSeq(startSlot);
17
30
  // Note: Assumes all blocks in the same epoch
18
- if (config.getForkSeq(startSlot) < ForkSeq.deneb) {
19
- const blocks = await network.sendBeaconBlocksByRange(peerId, request);
20
- return blocks.map((block) => getBlockInput.preData(config, block.data, BlockSource.byRange));
31
+ if (forkSeq < ForkSeq.deneb) {
32
+ const beaconBlocks = await network.sendBeaconBlocksByRange(peerId, request);
33
+ if (beaconBlocks.length === 0) {
34
+ throw Error(`peerId=${peerId} peerClient=${peerClient} returned no blocks for BeaconBlocksByRangeRequest ${JSON.stringify(request)}`);
35
+ }
36
+ const blocks = beaconBlocks.map((block) => getBlockInput.preData(config, block.data, BlockSource.byRange));
37
+ return { blocks, pendingDataColumns: null };
21
38
  }
22
39
  // From Deneb
23
40
  // Only request blobs if they are recent enough
24
41
  if (startEpoch >= currentEpoch - config.MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS) {
25
- const [allBlocks, allBlobSidecars] = await Promise.all([
26
- network.sendBeaconBlocksByRange(peerId, request),
27
- network.sendBlobSidecarsByRange(peerId, request),
42
+ if (forkSeq < ForkSeq.fulu) {
43
+ const [allBlocks, allBlobSidecars] = await Promise.all([
44
+ network.sendBeaconBlocksByRange(peerId, request),
45
+ network.sendBlobSidecarsByRange(peerId, request),
46
+ ]);
47
+ if (allBlocks.length === 0) {
48
+ throw Error(`peerId=${peerId} peerClient=${peerClient} returns no blocks allBlobSidecars=${allBlobSidecars.length} for BeaconBlocksByRangeRequest ${JSON.stringify(request)}`);
49
+ }
50
+ const blocks = matchBlockWithBlobs(config, allBlocks, allBlobSidecars, endSlot, BlockSource.byRange, BlobsSource.byRange, syncSource);
51
+ return { blocks, pendingDataColumns: null };
52
+ }
53
+ // From fulu, get columns
54
+ const sampledColumns = network.custodyConfig.sampledColumns;
55
+ const neededColumns = partialDownload ? partialDownload.pendingDataColumns : sampledColumns;
56
+ // This should never throw. Already checking for this in ChainPeerBalancer when selecting the peer
57
+ if ((earliestAvailableSlot ?? 0) > startSlot) {
58
+ throw new Error(`earliestAvailableSlot=${earliestAvailableSlot} not respected for ByRange startSlot=${startSlot}`);
59
+ }
60
+ // get match
61
+ const columns = peerColumns.reduce((acc, elem) => {
62
+ if (neededColumns.includes(elem)) {
63
+ acc.push(elem);
64
+ }
65
+ return acc;
66
+ }, []);
67
+ if (columns.length === 0 && partialDownload !== null) {
68
+ // this peer has nothing to offer and should not have been selected for batch download
69
+ // throw error?
70
+ return partialDownload;
71
+ }
72
+ const pendingDataColumns = neededColumns.reduce((acc, elem) => {
73
+ if (!columns.includes(elem)) {
74
+ acc.push(elem);
75
+ }
76
+ return acc;
77
+ }, []);
78
+ const dataColumnRequest = { ...request, columns };
79
+ const [allBlocks, allDataColumnSidecars] = await Promise.all([
80
+ // TODO-das: investigate why partialDownload blocks is empty here
81
+ partialDownload && partialDownload.blocks.length > 0
82
+ ? partialDownload.blocks.map((blockInput) => ({ data: blockInput.block }))
83
+ : network.sendBeaconBlocksByRange(peerId, request),
84
+ columns.length === 0 ? [] : network.sendDataColumnSidecarsByRange(peerId, dataColumnRequest),
28
85
  ]);
29
- return matchBlockWithBlobs(config, allBlocks, allBlobSidecars, endSlot, BlockSource.byRange, BlobsSource.byRange);
86
+ logger?.debug("ByRange requests", {
87
+ beaconBlocksRequest: JSON.stringify(ssz.phase0.BeaconBlocksByRangeRequest.toJson(request)),
88
+ dataColumnRequest: JSON.stringify(ssz.fulu.DataColumnSidecarsByRangeRequest.toJson(dataColumnRequest)),
89
+ [`allBlocks(${allBlocks.length})`]: allBlocks.map((blk) => blk.data.message.slot).join(" "),
90
+ [`allDataColumnSidecars(${allDataColumnSidecars.length})`]: allDataColumnSidecars
91
+ .map((dCol) => `${dCol.signedBlockHeader.message.slot}:${dCol.index}`)
92
+ .join(" "),
93
+ peerColumns: peerColumns.join(" "),
94
+ peerId,
95
+ peerClient,
96
+ prevPartialDownload: !!partialDownload,
97
+ });
98
+ if (allBlocks.length === 0) {
99
+ throw Error(`peerId=${peerId} peerClient=${peerClient} returns no blocks dataColumnSidecars=${allDataColumnSidecars.length} for BeaconBlocksByRangeRequest ${JSON.stringify(request)}`);
100
+ }
101
+ const blocks = matchBlockWithDataColumns(network, peerId, config, sampledColumns, columns, allBlocks, allDataColumnSidecars, endSlot, BlockSource.byRange, DataColumnsSource.byRange, partialDownload, peerClient, syncSource, metrics, logger);
102
+ return { blocks, pendingDataColumns: pendingDataColumns.length > 0 ? pendingDataColumns : null };
30
103
  }
104
+ logger?.verbose(`Download range is out of ${config.MIN_EPOCHS_FOR_BLOB_SIDECARS_REQUESTS} epochs, skip Blobs and DataColumnSidecars download`, {
105
+ startEpoch,
106
+ startSlot,
107
+ endSlot,
108
+ currentEpoch,
109
+ });
31
110
  // Data is out of range, only request blocks
32
111
  const blocks = await network.sendBeaconBlocksByRange(peerId, request);
33
- return blocks.map((block) => getBlockInput.outOfRangeData(config, block.data, BlockSource.byRange));
112
+ if (blocks.length === 0) {
113
+ throw Error(`peerId=${peerId} peerClient=${peerClient} returned no blocks for BeaconBlocksByRangeRequest ${JSON.stringify(request)}`);
114
+ }
115
+ return {
116
+ blocks: blocks.map((block) => getBlockInput.outOfRangeData(config, block.data, BlockSource.byRange)),
117
+ // null means all data columns are present
118
+ pendingDataColumns: null,
119
+ };
34
120
  }
35
121
  // Assumes that the blobs are in the same sequence as blocks, doesn't require block to be sorted
36
- export function matchBlockWithBlobs(config, allBlocks, allBlobSidecars, endSlot, blockSource, blobsSource) {
122
+ export function matchBlockWithBlobs(config, allBlocks, allBlobSidecars, endSlot, blockSource, blobsSource, syncSource) {
37
123
  const blockInputs = [];
38
124
  let blobSideCarIndex = 0;
39
125
  let lastMatchedSlot = -1;
@@ -50,11 +136,19 @@ export function matchBlockWithBlobs(config, allBlocks, allBlobSidecars, endSlot,
50
136
  }
51
137
  else {
52
138
  const blobSidecars = [];
53
- let blobSidecar;
54
- while (
55
- // biome-ignore lint/suspicious/noAssignInExpressions: <explanation>
56
- (blobSidecar = allBlobSidecars[blobSideCarIndex])?.signedBlockHeader.message.slot === block.data.message.slot) {
57
- blobSidecars.push(blobSidecar);
139
+ const blockRoot = config.getForkTypes(block.data.message.slot).BeaconBlock.hashTreeRoot(block.data.message);
140
+ const matchBlob = (blobSidecar) => {
141
+ if (blobSidecar === undefined) {
142
+ return false;
143
+ }
144
+ if (syncSource === RangeSyncType.Head || syncSource === SyncSourceByRoot) {
145
+ return (Buffer.compare(ssz.phase0.BeaconBlockHeader.hashTreeRoot(blobSidecar.signedBlockHeader.message), blockRoot) === 0);
146
+ }
147
+ // For finalized range sync, we can just match by slot
148
+ return blobSidecar.signedBlockHeader.message.slot === block.data.message.slot;
149
+ };
150
+ while (matchBlob(allBlobSidecars[blobSideCarIndex])) {
151
+ blobSidecars.push(allBlobSidecars[blobSideCarIndex]);
58
152
  lastMatchedSlot = block.data.message.slot;
59
153
  blobSideCarIndex++;
60
154
  }
@@ -68,7 +162,6 @@ export function matchBlockWithBlobs(config, allBlocks, allBlobSidecars, endSlot,
68
162
  blobs: blobSidecars,
69
163
  blobsSource,
70
164
  };
71
- // TODO DENEB: instead of null, pass payload in bytes
72
165
  blockInputs.push(getBlockInput.availableData(config, block.data, blockSource, blockData));
73
166
  }
74
167
  }
@@ -80,8 +173,154 @@ export function matchBlockWithBlobs(config, allBlocks, allBlobSidecars, endSlot,
80
173
  throw Error(`Unmatched blobSidecars, blocks=${allBlocks.length}, blobs=${allBlobSidecars.length} lastMatchedSlot=${lastMatchedSlot}, pending blobSidecars slots=${allBlobSidecars
81
174
  .slice(blobSideCarIndex)
82
175
  .map((blb) => blb.signedBlockHeader.message.slot)
83
- .join(",")}`);
176
+ .join(" ")}`);
177
+ }
178
+ return blockInputs;
179
+ }
180
+ export function matchBlockWithDataColumns(network, peerId, config, sampledColumns, requestedColumns, allBlocks, allDataColumnSidecars, endSlot, blockSource, dataColumnsSource, prevPartialDownload, peerClient, syncSource, metrics, logger) {
181
+ const blockInputs = [];
182
+ let dataColumnSideCarIndex = 0;
183
+ let lastMatchedSlot = -1;
184
+ const neededColumns = prevPartialDownload?.pendingDataColumns ?? sampledColumns;
185
+ const shouldHaveAllData = neededColumns.reduce((acc, elem) => acc && requestedColumns.includes(elem), true);
186
+ // Match dataColumnSideCar with the block as some blocks would have no dataColumns and hence
187
+ // would be omitted from the response. If there are any inconsitencies in the
188
+ // response, the validations during import will reject the block and hence this
189
+ // entire segment.
190
+ //
191
+ // Assuming that the blocks and blobs will come in same sorted order
192
+ for (let i = 0; i < allBlocks.length; i++) {
193
+ const block = allBlocks[i];
194
+ const forkSeq = config.getForkSeq(block.data.message.slot);
195
+ if (forkSeq < ForkSeq.fulu) {
196
+ throw Error(`Invalid block forkSeq=${forkSeq} < ForSeq.fulu for matchBlockWithDataColumns`);
197
+ }
198
+ const dataColumnSidecars = [];
199
+ const blockRoot = config.getForkTypes(block.data.message.slot).BeaconBlock.hashTreeRoot(block.data.message);
200
+ const matchDataColumnSidecar = (dataColumnSidecar) => {
201
+ if (dataColumnSidecar === undefined) {
202
+ return false;
203
+ }
204
+ if (syncSource === RangeSyncType.Head || syncSource === SyncSourceByRoot) {
205
+ return (Buffer.compare(ssz.phase0.BeaconBlockHeader.hashTreeRoot(dataColumnSidecar.signedBlockHeader.message), blockRoot) === 0);
206
+ }
207
+ // For finalized range sync, we can just match by slot
208
+ return dataColumnSidecar.signedBlockHeader.message.slot === block.data.message.slot;
209
+ };
210
+ while (matchDataColumnSidecar(allDataColumnSidecars[dataColumnSideCarIndex])) {
211
+ dataColumnSidecars.push(allDataColumnSidecars[dataColumnSideCarIndex]);
212
+ lastMatchedSlot = block.data.message.slot;
213
+ dataColumnSideCarIndex++;
214
+ }
215
+ metrics?.dataColumns.bySource.inc({ source: DataColumnsSource.byRange }, dataColumnSidecars.length);
216
+ const blobKzgCommitmentsLen = block.data.message.body.blobKzgCommitments.length;
217
+ logger?.debug("processing matchBlockWithDataColumns", {
218
+ blobKzgCommitmentsLen,
219
+ dataColumnSidecars: dataColumnSidecars.length,
220
+ shouldHaveAllData,
221
+ neededColumns: neededColumns.join(" "),
222
+ requestedColumns: requestedColumns.join(" "),
223
+ slot: block.data.message.slot,
224
+ dataColumnsSlots: dataColumnSidecars.map((dcm) => dcm.signedBlockHeader.message.slot).join(" "),
225
+ peerClient,
226
+ });
227
+ if (blobKzgCommitmentsLen === 0) {
228
+ if (dataColumnSidecars.length > 0) {
229
+ // only penalize peer with Finalized range sync or "ByRoot" sync source
230
+ if (syncSource !== RangeSyncType.Head) {
231
+ network.reportPeer(peerId, PeerAction.LowToleranceError, "Missing or mismatching dataColumnSidecars");
232
+ }
233
+ throw Error(`Missing or mismatching dataColumnSidecars from peerId=${peerId} for blockSlot=${block.data.message.slot} with blobKzgCommitmentsLen=0 dataColumnSidecars=${dataColumnSidecars.length}>0`);
234
+ }
235
+ const blockData = {
236
+ fork: config.getForkName(block.data.message.slot),
237
+ dataColumns: [],
238
+ dataColumnsBytes: [],
239
+ dataColumnsSource,
240
+ };
241
+ blockInputs.push(getBlockInput.availableData(config, block.data, blockSource, blockData));
242
+ }
243
+ else {
244
+ // Quick inspect how many blobSidecars was expected
245
+ const dataColumnIndexes = dataColumnSidecars.map((dataColumnSidecar) => dataColumnSidecar.index);
246
+ const requestedColumnsPresent = requestedColumns.reduce((acc, columnIndex) => acc && dataColumnIndexes.includes(columnIndex), true);
247
+ logger?.debug("matchBlockWithDataColumns2", {
248
+ dataColumnIndexes: dataColumnIndexes.join(" "),
249
+ requestedColumnsPresent,
250
+ slot: block.data.message.slot,
251
+ peerClient,
252
+ });
253
+ if (dataColumnSidecars.length !== requestedColumns.length || !requestedColumnsPresent) {
254
+ logger?.debug(`Missing or mismatching dataColumnSidecars from peerId=${peerId} for blockSlot=${block.data.message.slot} with numColumns=${sampledColumns.length} dataColumnSidecars=${dataColumnSidecars.length} requestedColumnsPresent=${requestedColumnsPresent} received dataColumnIndexes=${dataColumnIndexes.join(" ")} requested=${requestedColumns.join(" ")}`, {
255
+ allBlocks: allBlocks.length,
256
+ allDataColumnSidecars: allDataColumnSidecars.length,
257
+ peerId,
258
+ blobKzgCommitmentsLen,
259
+ peerClient,
260
+ });
261
+ // only penalize peer with Finalized range sync or "ByRoot" sync source
262
+ if (syncSource !== RangeSyncType.Head) {
263
+ network.reportPeer(peerId, PeerAction.LowToleranceError, "Missing or mismatching dataColumnSidecars");
264
+ }
265
+ throw Error(`Missing or mismatching dataColumnSidecars from peerId=${peerId} for blockSlot=${block.data.message.slot} blobKzgCommitmentsLen=${blobKzgCommitmentsLen} with numColumns=${sampledColumns.length} dataColumnSidecars=${dataColumnSidecars.length} requestedColumnsPresent=${requestedColumnsPresent} received dataColumnIndexes=${dataColumnIndexes.join(" ")} requested=${requestedColumns.join(" ")}`);
266
+ }
267
+ let cachedData;
268
+ // TODO-das: investigate why partialDownload blocks is empty here
269
+ if (prevPartialDownload !== null && prevPartialDownload.blocks.length > 0) {
270
+ const prevBlockInput = prevPartialDownload.blocks[i];
271
+ if (prevBlockInput.type !== BlockInputType.dataPromise) {
272
+ throw Error(`prevBlockInput.type=${prevBlockInput.type} in prevPartialDownload`);
273
+ }
274
+ cachedData = prevBlockInput.cachedData;
275
+ }
276
+ else {
277
+ // biome-ignore lint/style/noNonNullAssertion: checked below for validity
278
+ cachedData = getEmptyBlockInputCacheEntry(config.getForkName(block.data.message.slot), -1).cachedData;
279
+ if (cachedData === undefined) {
280
+ throw Error("Invalid cachedData=undefined from getEmptyBlockInputCacheEntry");
281
+ }
282
+ }
283
+ if (cachedData.fork !== ForkName.fulu) {
284
+ throw Error("Invalid fork for cachedData on dataColumns");
285
+ }
286
+ for (const dataColumnSidecar of dataColumnSidecars) {
287
+ cachedData.dataColumnsCache.set(dataColumnSidecar.index, {
288
+ dataColumn: dataColumnSidecar,
289
+ dataColumnBytes: null,
290
+ });
291
+ }
292
+ if (shouldHaveAllData) {
293
+ const { dataColumns, dataColumnsBytes } = getBlockInputDataColumns(cachedData.dataColumnsCache, sampledColumns);
294
+ const blockData = {
295
+ fork: config.getForkName(block.data.message.slot),
296
+ dataColumns,
297
+ dataColumnsBytes,
298
+ dataColumnsSource,
299
+ };
300
+ // TODO DENEB: instead of null, pass payload in bytes
301
+ blockInputs.push(getBlockInput.availableData(config, block.data, blockSource, blockData));
302
+ }
303
+ else {
304
+ blockInputs.push(getBlockInput.dataPromise(config, block.data, blockSource, cachedData));
305
+ }
306
+ }
307
+ }
308
+ // for head sync, there could be unconsumed data column sidecars because the retried peers may have higher head
309
+ if (allDataColumnSidecars[dataColumnSideCarIndex] !== undefined &&
310
+ // If there are no data columns, the data columns request can give 1 block outside the requested range
311
+ allDataColumnSidecars[dataColumnSideCarIndex].signedBlockHeader.message.slot <= endSlot &&
312
+ // only penalize peer with Finalized range sync or "ByRoot" sync source
313
+ syncSource !== RangeSyncType.Head) {
314
+ network.reportPeer(peerId, PeerAction.LowToleranceError, "Unmatched dataColumnSidecars");
315
+ throw Error(`Unmatched dataColumnSidecars, blocks=${allBlocks.length}, blobs=${allDataColumnSidecars.length} lastMatchedSlot=${lastMatchedSlot}, pending dataColumnSidecars slots=${allDataColumnSidecars
316
+ .slice(dataColumnSideCarIndex)
317
+ .map((blb) => blb.signedBlockHeader.message.slot)
318
+ .join(" ")} endSlot=${endSlot}, peerId=${peerId}, peerClient=${peerClient}`);
84
319
  }
320
+ logger?.debug("matched BlockWithDataColumns", {
321
+ peerClient,
322
+ blockInputs: blockInputs.map((bInpt) => `${bInpt.block.message.slot}=${bInpt.type}`).join(" "),
323
+ });
85
324
  return blockInputs;
86
325
  }
87
326
  //# sourceMappingURL=beaconBlocksMaybeBlobsByRange.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"beaconBlocksMaybeBlobsByRange.js","sourceRoot":"","sources":["../../../src/network/reqresp/beaconBlocksMaybeBlobsByRange.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"beaconBlocksMaybeBlobsByRange.js","sourceRoot":"","sources":["../../../src/network/reqresp/beaconBlocksMaybeBlobsByRange.ts"],"names":[],"mappings":"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"}
@@ -1,18 +1,49 @@
1
1
  import { ChainForkConfig } from "@lodestar/config";
2
- import { RootHex, phase0 } from "@lodestar/types";
2
+ import { RootHex, SignedBeaconBlock } from "@lodestar/types";
3
3
  import { BlobAndProof } from "@lodestar/types/deneb";
4
- import { BlockInput, NullBlockInput } from "../../chain/blocks/types.js";
4
+ import { Logger } from "@lodestar/utils";
5
+ import { BlockInput, CachedBlobs, NullBlockInput } from "../../chain/blocks/types.js";
5
6
  import { ChainEventEmitter } from "../../chain/emitter.js";
6
7
  import { IExecutionEngine } from "../../execution/index.js";
7
8
  import { Metrics } from "../../metrics/index.js";
8
9
  import { PeerIdStr } from "../../util/peerId.js";
10
+ import { BeaconBlocksByRootRequest } from "../../util/types.js";
9
11
  import { INetwork } from "../interface.js";
10
- export declare function beaconBlocksMaybeBlobsByRoot(config: ChainForkConfig, network: INetwork, peerId: PeerIdStr, request: phase0.BeaconBlocksByRootRequest): Promise<BlockInput[]>;
11
- export declare function unavailableBeaconBlobsByRoot(config: ChainForkConfig, network: INetwork, peerId: PeerIdStr, unavailableBlockInput: BlockInput | NullBlockInput, opts: {
12
- metrics: Metrics | null;
13
- emitter: ChainEventEmitter | null;
12
+ import { PartialDownload } from "./beaconBlocksMaybeBlobsByRange.js";
13
+ /**
14
+ * Request beacon blocks by root, and blobs or data columns if available.
15
+ * return BlockInput[] along with pendingDataColumns (null for prefulu forks for postfulu where data is available)
16
+ */
17
+ export declare function beaconBlocksMaybeBlobsByRoot(config: ChainForkConfig, network: INetwork, peerId: PeerIdStr, request: BeaconBlocksByRootRequest, partialDownload: null | PartialDownload, peerClient: string, metrics: Metrics | null, logger?: Logger): Promise<{
18
+ blocks: BlockInput[];
19
+ pendingDataColumns: null | number[];
20
+ }>;
21
+ export declare function unavailableBeaconBlobsByRoot(config: ChainForkConfig, network: INetwork, peerId: PeerIdStr, peerClient: string, unavailableBlockInput: BlockInput | NullBlockInput, opts: {
22
+ logger?: Logger;
23
+ metrics?: Metrics | null;
14
24
  executionEngine: IExecutionEngine;
25
+ emitter: ChainEventEmitter;
15
26
  engineGetBlobsCache?: Map<RootHex, BlobAndProof | null>;
16
27
  blockInputsRetryTrackerCache?: Set<RootHex>;
17
28
  }): Promise<BlockInput>;
29
+ export declare function unavailableBeaconBlobsByRootPreFulu(config: ChainForkConfig, network: INetwork, peerId: PeerIdStr, unavailableBlockInput: BlockInput | NullBlockInput, block: SignedBeaconBlock, cachedData: CachedBlobs, opts: {
30
+ metrics?: Metrics | null;
31
+ emitter: ChainEventEmitter;
32
+ executionEngine: IExecutionEngine;
33
+ engineGetBlobsCache?: Map<RootHex, BlobAndProof | null>;
34
+ blockInputsRetryTrackerCache?: Set<RootHex>;
35
+ }): Promise<BlockInput>;
36
+ /**
37
+ * Download more columns for a BlockInput
38
+ * - unavailableBlockInput should have block, but not enough blobs (deneb) or data columns (fulu)
39
+ *
40
+ * This function may return data promise, and consumer should continue with fetching more blobs or columns from other peers
41
+ * see UnknownBlockSync.fetchUnavailableBlockInput()
42
+ */
43
+ export declare function unavailableBeaconBlobsByRootPostFulu(config: ChainForkConfig, network: INetwork, peerId: PeerIdStr, peerClient: string, unavailableBlockInput: BlockInput, block: SignedBeaconBlock, cachedData: NullBlockInput["cachedData"], opts: {
44
+ metrics?: Metrics | null;
45
+ executionEngine: IExecutionEngine;
46
+ emitter: ChainEventEmitter;
47
+ logger?: Logger;
48
+ }): Promise<BlockInput>;
18
49
  //# sourceMappingURL=beaconBlocksMaybeBlobsByRoot.d.ts.map