@lodestar/beacon-node 1.35.0-dev.47c570ab76 → 1.35.0-dev.56313c7299

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 (500) hide show
  1. package/lib/api/impl/beacon/blocks/index.js +46 -58
  2. package/lib/api/impl/beacon/blocks/index.js.map +1 -1
  3. package/lib/api/impl/config/constants.d.ts +0 -5
  4. package/lib/api/impl/config/constants.js +1 -6
  5. package/lib/api/impl/config/constants.js.map +1 -1
  6. package/lib/api/impl/debug/index.js +1 -1
  7. package/lib/api/impl/debug/index.js.map +1 -1
  8. package/lib/api/impl/errors.js +0 -2
  9. package/lib/api/impl/errors.js.map +1 -1
  10. package/lib/api/impl/index.d.ts +3 -3
  11. package/lib/api/impl/index.js +3 -3
  12. package/lib/api/impl/index.js.map +1 -1
  13. package/lib/api/impl/lodestar/index.js +1 -1
  14. package/lib/api/impl/lodestar/index.js.map +1 -1
  15. package/lib/api/impl/validator/index.js +1 -2
  16. package/lib/api/impl/validator/index.js.map +1 -1
  17. package/lib/api/rest/activeSockets.js +2 -3
  18. package/lib/api/rest/activeSockets.js.map +1 -1
  19. package/lib/api/rest/base.d.ts +1 -1
  20. package/lib/api/rest/base.js +2 -6
  21. package/lib/api/rest/base.js.map +1 -1
  22. package/lib/api/rest/index.js +0 -2
  23. package/lib/api/rest/index.js.map +1 -1
  24. package/lib/api/rest/swaggerUI.js +2 -4
  25. package/lib/api/rest/swaggerUI.js.map +1 -1
  26. package/lib/chain/archiveStore/archiveStore.js +38 -49
  27. package/lib/chain/archiveStore/archiveStore.js.map +1 -1
  28. package/lib/chain/archiveStore/historicalState/historicalStateRegen.js +0 -3
  29. package/lib/chain/archiveStore/historicalState/historicalStateRegen.js.map +1 -1
  30. package/lib/chain/archiveStore/index.d.ts +1 -1
  31. package/lib/chain/archiveStore/index.js +1 -1
  32. package/lib/chain/archiveStore/strategies/frequencyStateArchiveStrategy.js +0 -5
  33. package/lib/chain/archiveStore/strategies/frequencyStateArchiveStrategy.js.map +1 -1
  34. package/lib/chain/balancesCache.js +3 -1
  35. package/lib/chain/balancesCache.js.map +1 -1
  36. package/lib/chain/beaconProposerCache.js +0 -1
  37. package/lib/chain/beaconProposerCache.js.map +1 -1
  38. package/lib/chain/blocks/blockInput/blockInput.d.ts +7 -19
  39. package/lib/chain/blocks/blockInput/blockInput.js +88 -132
  40. package/lib/chain/blocks/blockInput/blockInput.js.map +1 -1
  41. package/lib/chain/blocks/blockInput/index.d.ts +1 -1
  42. package/lib/chain/blocks/blockInput/index.js +1 -1
  43. package/lib/chain/blocks/blockInput/types.d.ts +10 -19
  44. package/lib/chain/blocks/blockInput/types.js +0 -1
  45. package/lib/chain/blocks/blockInput/types.js.map +1 -1
  46. package/lib/chain/blocks/blockInput/utils.d.ts +4 -0
  47. package/lib/chain/blocks/blockInput/utils.js +29 -6
  48. package/lib/chain/blocks/blockInput/utils.js.map +1 -1
  49. package/lib/chain/blocks/importBlock.js +12 -16
  50. package/lib/chain/blocks/importBlock.js.map +1 -1
  51. package/lib/chain/blocks/index.d.ts +5 -6
  52. package/lib/chain/blocks/index.js +4 -5
  53. package/lib/chain/blocks/index.js.map +1 -1
  54. package/lib/chain/blocks/types.d.ts +106 -3
  55. package/lib/chain/blocks/types.js +119 -0
  56. package/lib/chain/blocks/types.js.map +1 -1
  57. package/lib/chain/blocks/utils/chainSegment.d.ts +2 -2
  58. package/lib/chain/blocks/utils/chainSegment.js +2 -2
  59. package/lib/chain/blocks/utils/chainSegment.js.map +1 -1
  60. package/lib/chain/blocks/verifyBlock.d.ts +3 -3
  61. package/lib/chain/blocks/verifyBlock.js +14 -15
  62. package/lib/chain/blocks/verifyBlock.js.map +1 -1
  63. package/lib/chain/blocks/verifyBlocksDataAvailability.d.ts +22 -7
  64. package/lib/chain/blocks/verifyBlocksDataAvailability.js +110 -18
  65. package/lib/chain/blocks/verifyBlocksDataAvailability.js.map +1 -1
  66. package/lib/chain/blocks/verifyBlocksExecutionPayloads.d.ts +3 -4
  67. package/lib/chain/blocks/verifyBlocksExecutionPayloads.js +22 -24
  68. package/lib/chain/blocks/verifyBlocksExecutionPayloads.js.map +1 -1
  69. package/lib/chain/blocks/verifyBlocksSanityChecks.d.ts +3 -4
  70. package/lib/chain/blocks/verifyBlocksSanityChecks.js +2 -2
  71. package/lib/chain/blocks/verifyBlocksSanityChecks.js.map +1 -1
  72. package/lib/chain/blocks/verifyBlocksStateTransitionOnly.d.ts +2 -3
  73. package/lib/chain/blocks/verifyBlocksStateTransitionOnly.js +2 -2
  74. package/lib/chain/blocks/verifyBlocksStateTransitionOnly.js.map +1 -1
  75. package/lib/chain/blocks/writeBlockInputToDb.d.ts +3 -3
  76. package/lib/chain/blocks/writeBlockInputToDb.js +66 -61
  77. package/lib/chain/blocks/writeBlockInputToDb.js.map +1 -1
  78. package/lib/chain/bls/multithread/index.js +163 -168
  79. package/lib/chain/bls/multithread/index.js.map +1 -1
  80. package/lib/chain/bls/singleThread.js +0 -1
  81. package/lib/chain/bls/singleThread.js.map +1 -1
  82. package/lib/chain/chain.d.ts +11 -13
  83. package/lib/chain/chain.js +20 -79
  84. package/lib/chain/chain.js.map +1 -1
  85. package/lib/chain/emitter.d.ts +2 -43
  86. package/lib/chain/emitter.js +0 -18
  87. package/lib/chain/emitter.js.map +1 -1
  88. package/lib/chain/errors/blobSidecarError.d.ts +0 -24
  89. package/lib/chain/errors/blobSidecarError.js +0 -10
  90. package/lib/chain/errors/blobSidecarError.js.map +1 -1
  91. package/lib/chain/errors/blockError.js +0 -1
  92. package/lib/chain/errors/blockError.js.map +1 -1
  93. package/lib/chain/errors/dataColumnSidecarError.d.ts +0 -42
  94. package/lib/chain/errors/dataColumnSidecarError.js +0 -14
  95. package/lib/chain/errors/dataColumnSidecarError.js.map +1 -1
  96. package/lib/chain/errors/gossipValidation.js +0 -1
  97. package/lib/chain/errors/gossipValidation.js.map +1 -1
  98. package/lib/chain/errors/index.d.ts +2 -2
  99. package/lib/chain/errors/index.js +2 -2
  100. package/lib/chain/errors/index.js.map +1 -1
  101. package/lib/chain/forkChoice/index.js.map +1 -1
  102. package/lib/chain/genesis/genesis.js +5 -16
  103. package/lib/chain/genesis/genesis.js.map +1 -1
  104. package/lib/chain/index.d.ts +2 -2
  105. package/lib/chain/index.js +2 -2
  106. package/lib/chain/index.js.map +1 -1
  107. package/lib/chain/interface.d.ts +9 -12
  108. package/lib/chain/interface.js.map +1 -1
  109. package/lib/chain/lightClient/index.js +9 -16
  110. package/lib/chain/lightClient/index.js.map +1 -1
  111. package/lib/chain/lightClient/proofs.js.map +1 -1
  112. package/lib/chain/opPools/aggregatedAttestationPool.js +9 -14
  113. package/lib/chain/opPools/aggregatedAttestationPool.js.map +1 -1
  114. package/lib/chain/opPools/attestationPool.js +3 -8
  115. package/lib/chain/opPools/attestationPool.js.map +1 -1
  116. package/lib/chain/opPools/index.d.ts +1 -1
  117. package/lib/chain/opPools/index.js +1 -1
  118. package/lib/chain/opPools/index.js.map +1 -1
  119. package/lib/chain/opPools/opPool.js +12 -10
  120. package/lib/chain/opPools/opPool.js.map +1 -1
  121. package/lib/chain/opPools/syncCommitteeMessagePool.js +6 -9
  122. package/lib/chain/opPools/syncCommitteeMessagePool.js.map +1 -1
  123. package/lib/chain/opPools/syncContributionAndProofPool.js +2 -5
  124. package/lib/chain/opPools/syncContributionAndProofPool.js.map +1 -1
  125. package/lib/chain/options.js +1 -1
  126. package/lib/chain/options.js.map +1 -1
  127. package/lib/chain/prepareNextSlot.js +136 -141
  128. package/lib/chain/prepareNextSlot.js.map +1 -1
  129. package/lib/chain/produceBlock/produceBlockBody.d.ts +1 -1
  130. package/lib/chain/produceBlock/produceBlockBody.js +10 -3
  131. package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
  132. package/lib/chain/regen/errors.js +0 -1
  133. package/lib/chain/regen/errors.js.map +1 -1
  134. package/lib/chain/regen/index.d.ts +1 -1
  135. package/lib/chain/regen/index.js +1 -1
  136. package/lib/chain/regen/index.js.map +1 -1
  137. package/lib/chain/regen/queued.js +28 -35
  138. package/lib/chain/regen/queued.js.map +1 -1
  139. package/lib/chain/regen/regen.js +0 -1
  140. package/lib/chain/regen/regen.js.map +1 -1
  141. package/lib/chain/reprocess.js +1 -3
  142. package/lib/chain/reprocess.js.map +1 -1
  143. package/lib/chain/seenCache/index.d.ts +1 -1
  144. package/lib/chain/seenCache/index.js +1 -1
  145. package/lib/chain/seenCache/index.js.map +1 -1
  146. package/lib/chain/seenCache/seenAggregateAndProof.js +6 -7
  147. package/lib/chain/seenCache/seenAggregateAndProof.js.map +1 -1
  148. package/lib/chain/seenCache/seenAttestationData.js +2 -5
  149. package/lib/chain/seenCache/seenAttestationData.js.map +1 -1
  150. package/lib/chain/seenCache/seenAttesters.js +4 -2
  151. package/lib/chain/seenCache/seenAttesters.js.map +1 -1
  152. package/lib/chain/seenCache/seenBlockInput.d.ts +84 -0
  153. package/lib/chain/seenCache/seenBlockInput.js +225 -0
  154. package/lib/chain/seenCache/seenBlockInput.js.map +1 -0
  155. package/lib/chain/seenCache/seenBlockProposers.js +4 -2
  156. package/lib/chain/seenCache/seenBlockProposers.js.map +1 -1
  157. package/lib/chain/seenCache/seenCommittee.js +3 -1
  158. package/lib/chain/seenCache/seenCommittee.js.map +1 -1
  159. package/lib/chain/seenCache/seenCommitteeContribution.js +2 -3
  160. package/lib/chain/seenCache/seenCommitteeContribution.js.map +1 -1
  161. package/lib/chain/seenCache/seenGossipBlockInput.d.ts +78 -74
  162. package/lib/chain/seenCache/seenGossipBlockInput.js +369 -235
  163. package/lib/chain/seenCache/seenGossipBlockInput.js.map +1 -1
  164. package/lib/chain/shufflingCache.js +2 -5
  165. package/lib/chain/shufflingCache.js.map +1 -1
  166. package/lib/chain/stateCache/blockStateCacheImpl.js +7 -13
  167. package/lib/chain/stateCache/blockStateCacheImpl.js.map +1 -1
  168. package/lib/chain/stateCache/datastore/db.js +0 -1
  169. package/lib/chain/stateCache/datastore/db.js.map +1 -1
  170. package/lib/chain/stateCache/datastore/file.js +0 -1
  171. package/lib/chain/stateCache/datastore/file.js.map +1 -1
  172. package/lib/chain/stateCache/datastore/index.d.ts +1 -1
  173. package/lib/chain/stateCache/datastore/index.js +1 -1
  174. package/lib/chain/stateCache/datastore/index.js.map +1 -1
  175. package/lib/chain/stateCache/fifoBlockStateCache.js +0 -10
  176. package/lib/chain/stateCache/fifoBlockStateCache.js.map +1 -1
  177. package/lib/chain/stateCache/inMemoryCheckpointsCache.js +4 -10
  178. package/lib/chain/stateCache/inMemoryCheckpointsCache.js.map +1 -1
  179. package/lib/chain/stateCache/index.d.ts +1 -1
  180. package/lib/chain/stateCache/index.js +1 -1
  181. package/lib/chain/stateCache/index.js.map +1 -1
  182. package/lib/chain/stateCache/mapMetrics.js +4 -4
  183. package/lib/chain/stateCache/mapMetrics.js.map +1 -1
  184. package/lib/chain/stateCache/persistentCheckpointsCache.js +6 -14
  185. package/lib/chain/stateCache/persistentCheckpointsCache.js.map +1 -1
  186. package/lib/chain/validation/blobSidecar.d.ts +3 -8
  187. package/lib/chain/validation/blobSidecar.js +31 -73
  188. package/lib/chain/validation/blobSidecar.js.map +1 -1
  189. package/lib/chain/validation/dataColumnSidecar.d.ts +9 -7
  190. package/lib/chain/validation/dataColumnSidecar.js +57 -95
  191. package/lib/chain/validation/dataColumnSidecar.js.map +1 -1
  192. package/lib/chain/validation/index.d.ts +1 -1
  193. package/lib/chain/validation/index.js +1 -1
  194. package/lib/chain/validation/index.js.map +1 -1
  195. package/lib/chain/validation/signatureSets/aggregateAndProof.d.ts +2 -1
  196. package/lib/chain/validation/signatureSets/aggregateAndProof.js.map +1 -1
  197. package/lib/chain/validatorMonitor.d.ts +3 -1
  198. package/lib/chain/validatorMonitor.js +1 -2
  199. package/lib/chain/validatorMonitor.js.map +1 -1
  200. package/lib/db/beacon.js +0 -24
  201. package/lib/db/beacon.js.map +1 -1
  202. package/lib/db/index.d.ts +1 -1
  203. package/lib/db/index.js.map +1 -1
  204. package/lib/db/repositories/blobSidecars.js.map +1 -1
  205. package/lib/db/repositories/blockArchive.js +3 -2
  206. package/lib/db/repositories/blockArchive.js.map +1 -1
  207. package/lib/db/repositories/dataColumnSidecar.js +1 -1
  208. package/lib/db/repositories/dataColumnSidecar.js.map +1 -1
  209. package/lib/db/repositories/dataColumnSidecarArchive.js +1 -1
  210. package/lib/db/repositories/dataColumnSidecarArchive.js.map +1 -1
  211. package/lib/db/repositories/depositDataRoot.js +0 -1
  212. package/lib/db/repositories/depositDataRoot.js.map +1 -1
  213. package/lib/db/repositories/index.d.ts +10 -10
  214. package/lib/db/repositories/index.js +9 -9
  215. package/lib/db/repositories/index.js.map +1 -1
  216. package/lib/db/single/preGenesisState.js +0 -6
  217. package/lib/db/single/preGenesisState.js.map +1 -1
  218. package/lib/db/single/preGenesisStateLastProcessedBlock.js +0 -5
  219. package/lib/db/single/preGenesisStateLastProcessedBlock.js.map +1 -1
  220. package/lib/eth1/eth1DataCache.js +0 -2
  221. package/lib/eth1/eth1DataCache.js.map +1 -1
  222. package/lib/eth1/eth1DepositDataTracker.js +5 -18
  223. package/lib/eth1/eth1DepositDataTracker.js.map +1 -1
  224. package/lib/eth1/eth1DepositsCache.js +0 -3
  225. package/lib/eth1/eth1DepositsCache.js.map +1 -1
  226. package/lib/eth1/eth1MergeBlockTracker.js +4 -10
  227. package/lib/eth1/eth1MergeBlockTracker.js.map +1 -1
  228. package/lib/eth1/index.js +0 -2
  229. package/lib/eth1/index.js.map +1 -1
  230. package/lib/eth1/provider/eth1Provider.d.ts +2 -1
  231. package/lib/eth1/provider/eth1Provider.js +2 -6
  232. package/lib/eth1/provider/eth1Provider.js.map +1 -1
  233. package/lib/eth1/provider/jsonRpcHttpClient.d.ts +1 -1
  234. package/lib/eth1/provider/jsonRpcHttpClient.js +2 -16
  235. package/lib/eth1/provider/jsonRpcHttpClient.js.map +1 -1
  236. package/lib/eth1/provider/jwt.js.map +1 -1
  237. package/lib/eth1/provider/utils.d.ts +0 -5
  238. package/lib/eth1/provider/utils.js +1 -9
  239. package/lib/eth1/provider/utils.js.map +1 -1
  240. package/lib/eth1/utils/deposits.js.map +1 -1
  241. package/lib/execution/builder/cache.js +0 -6
  242. package/lib/execution/builder/cache.js.map +1 -1
  243. package/lib/execution/builder/http.js +8 -14
  244. package/lib/execution/builder/http.js.map +1 -1
  245. package/lib/execution/builder/index.js.map +1 -1
  246. package/lib/execution/engine/disabled.js +4 -2
  247. package/lib/execution/engine/disabled.js.map +1 -1
  248. package/lib/execution/engine/http.d.ts +2 -2
  249. package/lib/execution/engine/http.js +11 -43
  250. package/lib/execution/engine/http.js.map +1 -1
  251. package/lib/execution/engine/interface.d.ts +2 -2
  252. package/lib/execution/engine/interface.js.map +1 -1
  253. package/lib/execution/engine/mock.d.ts +0 -1
  254. package/lib/execution/engine/mock.js +12 -16
  255. package/lib/execution/engine/mock.js.map +1 -1
  256. package/lib/execution/engine/payloadIdCache.js +3 -1
  257. package/lib/execution/engine/payloadIdCache.js.map +1 -1
  258. package/lib/execution/engine/types.d.ts +1 -5
  259. package/lib/execution/engine/types.js +8 -37
  260. package/lib/execution/engine/types.js.map +1 -1
  261. package/lib/execution/engine/utils.js +3 -3
  262. package/lib/execution/engine/utils.js.map +1 -1
  263. package/lib/execution/index.d.ts +2 -2
  264. package/lib/execution/index.js +2 -2
  265. package/lib/execution/index.js.map +1 -1
  266. package/lib/index.d.ts +6 -6
  267. package/lib/index.js +5 -5
  268. package/lib/index.js.map +1 -1
  269. package/lib/metrics/index.d.ts +1 -1
  270. package/lib/metrics/index.js +1 -1
  271. package/lib/metrics/index.js.map +1 -1
  272. package/lib/metrics/metrics/beacon.d.ts +5 -11
  273. package/lib/metrics/metrics/beacon.js +20 -40
  274. package/lib/metrics/metrics/beacon.js.map +1 -1
  275. package/lib/metrics/metrics/lodestar.d.ts +13 -55
  276. package/lib/metrics/metrics/lodestar.js +7 -84
  277. package/lib/metrics/metrics/lodestar.js.map +1 -1
  278. package/lib/metrics/metrics.d.ts +1 -1
  279. package/lib/metrics/metrics.js.map +1 -1
  280. package/lib/metrics/nodeJsMetrics.js +1 -1
  281. package/lib/metrics/nodeJsMetrics.js.map +1 -1
  282. package/lib/metrics/server/http.d.ts +1 -1
  283. package/lib/metrics/utils/avgMinMax.d.ts +1 -1
  284. package/lib/metrics/utils/avgMinMax.js +6 -10
  285. package/lib/metrics/utils/avgMinMax.js.map +1 -1
  286. package/lib/metrics/utils/gauge.d.ts +1 -1
  287. package/lib/metrics/utils/gauge.js +4 -1
  288. package/lib/metrics/utils/gauge.js.map +1 -1
  289. package/lib/metrics/utils/registryMetricCreator.d.ts +1 -1
  290. package/lib/metrics/utils/registryMetricCreator.js.map +1 -1
  291. package/lib/monitoring/properties.js +0 -4
  292. package/lib/monitoring/properties.js.map +1 -1
  293. package/lib/monitoring/service.js +1 -13
  294. package/lib/monitoring/service.js.map +1 -1
  295. package/lib/monitoring/system.js +27 -25
  296. package/lib/monitoring/system.js.map +1 -1
  297. package/lib/network/core/networkCore.d.ts +2 -2
  298. package/lib/network/core/networkCore.js +50 -67
  299. package/lib/network/core/networkCore.js.map +1 -1
  300. package/lib/network/core/networkCoreWorker.js +1 -1
  301. package/lib/network/core/networkCoreWorker.js.map +1 -1
  302. package/lib/network/core/networkCoreWorkerHandler.d.ts +2 -2
  303. package/lib/network/core/networkCoreWorkerHandler.js +5 -14
  304. package/lib/network/core/networkCoreWorkerHandler.js.map +1 -1
  305. package/lib/network/discv5/index.d.ts +2 -2
  306. package/lib/network/discv5/index.js +3 -9
  307. package/lib/network/discv5/index.js.map +1 -1
  308. package/lib/network/discv5/worker.js +3 -3
  309. package/lib/network/discv5/worker.js.map +1 -1
  310. package/lib/network/events.d.ts +18 -2
  311. package/lib/network/events.js +7 -0
  312. package/lib/network/events.js.map +1 -1
  313. package/lib/network/gossip/encoding.d.ts +1 -1
  314. package/lib/network/gossip/encoding.js +2 -4
  315. package/lib/network/gossip/encoding.js.map +1 -1
  316. package/lib/network/gossip/errors.js +0 -1
  317. package/lib/network/gossip/errors.js.map +1 -1
  318. package/lib/network/gossip/gossipsub.d.ts +1 -2
  319. package/lib/network/gossip/gossipsub.js +17 -43
  320. package/lib/network/gossip/gossipsub.js.map +1 -1
  321. package/lib/network/gossip/index.d.ts +2 -2
  322. package/lib/network/gossip/index.js +2 -2
  323. package/lib/network/gossip/index.js.map +1 -1
  324. package/lib/network/gossip/interface.d.ts +2 -2
  325. package/lib/network/gossip/metrics.d.ts +7 -15
  326. package/lib/network/gossip/metrics.js +6 -16
  327. package/lib/network/gossip/metrics.js.map +1 -1
  328. package/lib/network/gossip/topic.d.ts +105 -125
  329. package/lib/network/gossip/topic.js +1 -2
  330. package/lib/network/gossip/topic.js.map +1 -1
  331. package/lib/network/index.d.ts +3 -3
  332. package/lib/network/index.js +3 -3
  333. package/lib/network/index.js.map +1 -1
  334. package/lib/network/interface.d.ts +2 -3
  335. package/lib/network/libp2p/index.js +3 -11
  336. package/lib/network/libp2p/index.js.map +1 -1
  337. package/lib/network/metadata.js +1 -6
  338. package/lib/network/metadata.js.map +1 -1
  339. package/lib/network/network.d.ts +2 -4
  340. package/lib/network/network.js +71 -89
  341. package/lib/network/network.js.map +1 -1
  342. package/lib/network/options.js +1 -1
  343. package/lib/network/options.js.map +1 -1
  344. package/lib/network/peers/datastore.d.ts +2 -2
  345. package/lib/network/peers/datastore.js +4 -10
  346. package/lib/network/peers/datastore.js.map +1 -1
  347. package/lib/network/peers/discover.js +66 -75
  348. package/lib/network/peers/discover.js.map +1 -1
  349. package/lib/network/peers/peerManager.js +130 -154
  350. package/lib/network/peers/peerManager.js.map +1 -1
  351. package/lib/network/peers/peersData.d.ts +1 -1
  352. package/lib/network/peers/peersData.js +3 -1
  353. package/lib/network/peers/peersData.js.map +1 -1
  354. package/lib/network/peers/score/index.d.ts +1 -1
  355. package/lib/network/peers/score/index.js +1 -1
  356. package/lib/network/peers/score/index.js.map +1 -1
  357. package/lib/network/peers/score/score.js +0 -6
  358. package/lib/network/peers/score/score.js.map +1 -1
  359. package/lib/network/peers/score/store.js +0 -3
  360. package/lib/network/peers/score/store.js.map +1 -1
  361. package/lib/network/peers/utils/prioritizePeers.js.map +1 -1
  362. package/lib/network/peers/utils/subnetMap.js +4 -2
  363. package/lib/network/peers/utils/subnetMap.js.map +1 -1
  364. package/lib/network/processor/aggregatorTracker.js +3 -1
  365. package/lib/network/processor/aggregatorTracker.js.map +1 -1
  366. package/lib/network/processor/gossipHandlers.js +164 -145
  367. package/lib/network/processor/gossipHandlers.js.map +1 -1
  368. package/lib/network/processor/gossipQueues/indexed.js +9 -11
  369. package/lib/network/processor/gossipQueues/indexed.js.map +1 -1
  370. package/lib/network/processor/gossipQueues/linear.js +8 -9
  371. package/lib/network/processor/gossipQueues/linear.js.map +1 -1
  372. package/lib/network/processor/index.d.ts +1 -2
  373. package/lib/network/processor/index.js +8 -22
  374. package/lib/network/processor/index.js.map +1 -1
  375. package/lib/network/reqresp/ReqRespBeaconNode.d.ts +1 -1
  376. package/lib/network/reqresp/ReqRespBeaconNode.js +2 -11
  377. package/lib/network/reqresp/ReqRespBeaconNode.js.map +1 -1
  378. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.d.ts +28 -0
  379. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js +328 -0
  380. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js.map +1 -0
  381. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.d.ts +49 -0
  382. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js +499 -0
  383. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js.map +1 -0
  384. package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.js.map +1 -1
  385. package/lib/network/reqresp/index.d.ts +3 -1
  386. package/lib/network/reqresp/index.js +3 -1
  387. package/lib/network/reqresp/index.js.map +1 -1
  388. package/lib/network/reqresp/rateLimit.js +2 -2
  389. package/lib/network/reqresp/rateLimit.js.map +1 -1
  390. package/lib/network/reqresp/utils/dataColumnResponseValidation.js.map +1 -1
  391. package/lib/network/statusCache.js +0 -1
  392. package/lib/network/statusCache.js.map +1 -1
  393. package/lib/network/subnets/attnetsService.js +65 -73
  394. package/lib/network/subnets/attnetsService.js.map +1 -1
  395. package/lib/network/subnets/interface.js +1 -1
  396. package/lib/network/subnets/interface.js.map +1 -1
  397. package/lib/network/subnets/syncnetsService.js +22 -29
  398. package/lib/network/subnets/syncnetsService.js.map +1 -1
  399. package/lib/network/subnets/util.js +2 -1
  400. package/lib/network/subnets/util.js.map +1 -1
  401. package/lib/node/nodejs.d.ts +1 -1
  402. package/lib/node/nodejs.js +0 -15
  403. package/lib/node/nodejs.js.map +1 -1
  404. package/lib/node/notifier.js +2 -1
  405. package/lib/node/notifier.js.map +1 -1
  406. package/lib/node/options.js.map +1 -1
  407. package/lib/node/utils/interop/state.js +2 -1
  408. package/lib/node/utils/interop/state.js.map +1 -1
  409. package/lib/sync/backfill/backfill.d.ts +1 -1
  410. package/lib/sync/backfill/backfill.js +16 -58
  411. package/lib/sync/backfill/backfill.js.map +1 -1
  412. package/lib/sync/constants.d.ts +1 -2
  413. package/lib/sync/constants.js +1 -2
  414. package/lib/sync/constants.js.map +1 -1
  415. package/lib/sync/interface.d.ts +59 -1
  416. package/lib/sync/interface.js +20 -0
  417. package/lib/sync/interface.js.map +1 -1
  418. package/lib/sync/options.d.ts +1 -1
  419. package/lib/sync/range/batch.d.ts +32 -48
  420. package/lib/sync/range/batch.js +55 -201
  421. package/lib/sync/range/batch.js.map +1 -1
  422. package/lib/sync/range/chain.d.ts +10 -15
  423. package/lib/sync/range/chain.js +70 -141
  424. package/lib/sync/range/chain.js.map +1 -1
  425. package/lib/sync/range/range.d.ts +3 -3
  426. package/lib/sync/range/range.js +54 -86
  427. package/lib/sync/range/range.js.map +1 -1
  428. package/lib/sync/range/utils/hashBlocks.d.ts +2 -2
  429. package/lib/sync/range/utils/hashBlocks.js +4 -6
  430. package/lib/sync/range/utils/hashBlocks.js.map +1 -1
  431. package/lib/sync/range/utils/peerBalancer.js +13 -18
  432. package/lib/sync/range/utils/peerBalancer.js.map +1 -1
  433. package/lib/sync/sync.d.ts +2 -1
  434. package/lib/sync/sync.js +87 -95
  435. package/lib/sync/sync.js.map +1 -1
  436. package/lib/sync/unknownBlock.d.ts +28 -42
  437. package/lib/sync/unknownBlock.js +458 -405
  438. package/lib/sync/unknownBlock.js.map +1 -1
  439. package/lib/sync/utils/pendingBlocksTree.d.ts +6 -14
  440. package/lib/sync/utils/pendingBlocksTree.js +18 -24
  441. package/lib/sync/utils/pendingBlocksTree.js.map +1 -1
  442. package/lib/util/array.js +3 -7
  443. package/lib/util/array.js.map +1 -1
  444. package/lib/util/asyncIterableToEvents.js +3 -6
  445. package/lib/util/asyncIterableToEvents.js.map +1 -1
  446. package/lib/util/binarySearch.js +0 -2
  447. package/lib/util/binarySearch.js.map +1 -1
  448. package/lib/util/blobs.d.ts +2 -2
  449. package/lib/util/blobs.js +4 -4
  450. package/lib/util/blobs.js.map +1 -1
  451. package/lib/util/bufferPool.js +2 -7
  452. package/lib/util/bufferPool.js.map +1 -1
  453. package/lib/util/clock.d.ts +1 -1
  454. package/lib/util/clock.js +18 -23
  455. package/lib/util/clock.js.map +1 -1
  456. package/lib/util/dataColumns.d.ts +10 -13
  457. package/lib/util/dataColumns.js +132 -90
  458. package/lib/util/dataColumns.js.map +1 -1
  459. package/lib/util/itTrigger.js +4 -4
  460. package/lib/util/itTrigger.js.map +1 -1
  461. package/lib/util/map.js +0 -2
  462. package/lib/util/map.js.map +1 -1
  463. package/lib/util/queue/index.d.ts +1 -1
  464. package/lib/util/queue/index.js +1 -1
  465. package/lib/util/queue/index.js.map +1 -1
  466. package/lib/util/queue/itemQueue.js +49 -52
  467. package/lib/util/queue/itemQueue.js.map +1 -1
  468. package/lib/util/serializedCache.js +3 -1
  469. package/lib/util/serializedCache.js.map +1 -1
  470. package/lib/util/set.js +0 -2
  471. package/lib/util/set.js.map +1 -1
  472. package/lib/util/sszBytes.d.ts +0 -1
  473. package/lib/util/sszBytes.js +1 -1
  474. package/lib/util/sszBytes.js.map +1 -1
  475. package/lib/util/timeSeries.js +1 -3
  476. package/lib/util/timeSeries.js.map +1 -1
  477. package/lib/util/types.d.ts +1 -1
  478. package/lib/util/wrapError.d.ts +0 -7
  479. package/package.json +18 -36
  480. package/lib/bun-wrappers/prometheus-gc-stats.d.ts +0 -2
  481. package/lib/bun-wrappers/prometheus-gc-stats.js +0 -8
  482. package/lib/bun-wrappers/prometheus-gc-stats.js.map +0 -1
  483. package/lib/chain/ColumnReconstructionTracker.d.ts +0 -32
  484. package/lib/chain/ColumnReconstructionTracker.js +0 -71
  485. package/lib/chain/ColumnReconstructionTracker.js.map +0 -1
  486. package/lib/chain/GetBlobsTracker.d.ts +0 -31
  487. package/lib/chain/GetBlobsTracker.js +0 -82
  488. package/lib/chain/GetBlobsTracker.js.map +0 -1
  489. package/lib/sync/types.d.ts +0 -44
  490. package/lib/sync/types.js +0 -34
  491. package/lib/sync/types.js.map +0 -1
  492. package/lib/sync/utils/downloadByRange.d.ts +0 -186
  493. package/lib/sync/utils/downloadByRange.js +0 -457
  494. package/lib/sync/utils/downloadByRange.js.map +0 -1
  495. package/lib/sync/utils/downloadByRoot.d.ts +0 -121
  496. package/lib/sync/utils/downloadByRoot.js +0 -346
  497. package/lib/sync/utils/downloadByRoot.js.map +0 -1
  498. package/lib/util/execution.d.ts +0 -20
  499. package/lib/util/execution.js +0 -165
  500. package/lib/util/execution.js.map +0 -1
@@ -1,10 +1,13 @@
1
1
  import { ChainForkConfig } from "@lodestar/config";
2
2
  import { ForkName, ForkPostFulu } from "@lodestar/params";
3
3
  import { BeaconBlockBody, ColumnIndex, CustodyIndex, SignedBeaconBlock, SignedBeaconBlockHeader, deneb, fulu } from "@lodestar/types";
4
- import { BlockInputColumns } from "../chain/blocks/blockInput/blockInput.js";
4
+ import { DataColumnsCacheMap } from "../chain/blocks/types.js";
5
5
  import { ChainEventEmitter } from "../chain/emitter.js";
6
+ import { BlockInputCacheType } from "../chain/seenCache/seenGossipBlockInput.js";
7
+ import { IExecutionEngine } from "../execution/engine/interface.js";
6
8
  import { Metrics } from "../metrics/metrics.js";
7
9
  import { NodeId } from "../network/subnets/index.js";
10
+ import { IClock } from "./clock.js";
8
11
  export declare enum RecoverResult {
9
12
  NotAttemptedLessThanHalf = "not_attempted_less_than_half",
10
13
  NotAttemptedFull = "not_attempted_full",
@@ -79,7 +82,7 @@ export declare function computeColumnsForCustodyGroup(config: ChainForkConfig, c
79
82
  * https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.4/specs/fulu/das-core.md#get_custody_groups
80
83
  */
81
84
  export declare function getCustodyGroups(config: ChainForkConfig, nodeId: NodeId, custodyGroupCount: number): CustodyIndex[];
82
- export declare function computePostFuluKzgCommitmentsInclusionProof(fork: ForkName, body: BeaconBlockBody): fulu.KzgCommitmentsInclusionProof;
85
+ export declare function computeKzgCommitmentsInclusionProof(fork: ForkName, body: BeaconBlockBody): fulu.KzgCommitmentsInclusionProof;
83
86
  export declare function getDataColumns(config: ChainForkConfig, nodeId: NodeId, custodyGroupCount: number): ColumnIndex[];
84
87
  /**
85
88
  * Computes the cells for each blob and combines them with cell proofs.
@@ -88,10 +91,10 @@ export declare function getDataColumns(config: ChainForkConfig, nodeId: NodeId,
88
91
  * SPEC FUNCTION (note: spec currently computes proofs, but we already have them)
89
92
  * https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.4/specs/fulu/das-core.md#compute_matrix
90
93
  */
91
- export declare function getCellsAndProofs(blobBundles: fulu.BlobAndProofV2[]): Promise<{
94
+ export declare function getCellsAndProofs(blobBundles: fulu.BlobAndProofV2[]): {
92
95
  cells: Uint8Array[];
93
96
  proofs: Uint8Array[];
94
- }[]>;
97
+ }[];
95
98
  /**
96
99
  * Given a signed block header and the commitments, inclusion proof, cells/proofs associated with
97
100
  * each blob in the block, assemble the sidecars which can be distributed to peers.
@@ -128,13 +131,7 @@ export declare function getDataColumnSidecarsFromColumnSidecar(sidecar: fulu.Dat
128
131
  /**
129
132
  * If we receive more than half of NUMBER_OF_COLUMNS (64) we should recover all remaining columns
130
133
  */
131
- export declare function recoverDataColumnSidecars(blockInput: BlockInputColumns, emitter: ChainEventEmitter, metrics: Metrics | null): Promise<DataColumnReconstructionCode>;
132
- export declare enum DataColumnReconstructionCode {
133
- NotAttemptedAlreadyFull = "not_attempted_full",
134
- NotAttemptedHaveLessThanHalf = "not_attempted_less_than_half",
135
- NullReturned = "null_returned",
136
- SuccessLate = "success_late",
137
- SuccessResolved = "success_resolved",
138
- Failed = "failed"
139
- }
134
+ export declare function recoverDataColumnSidecars(dataColumnCache: DataColumnsCacheMap, clock: IClock, metrics: Metrics | null): Promise<RecoverResult>;
135
+ export declare function hasSampledDataColumns(custodyConfig: CustodyConfig, dataColumnCache: DataColumnsCacheMap): boolean;
136
+ export declare function getDataColumnsFromExecution(config: ChainForkConfig, custodyConfig: CustodyConfig, executionEngine: IExecutionEngine, emitter: ChainEventEmitter, blockCache: BlockInputCacheType, metrics: Metrics | null): Promise<boolean>;
140
137
  //# sourceMappingURL=dataColumns.d.ts.map
@@ -1,12 +1,12 @@
1
1
  import { digest } from "@chainsafe/as-sha256";
2
2
  import { Tree } from "@chainsafe/persistent-merkle-tree";
3
- import { KZG_COMMITMENTS_GINDEX, NUMBER_OF_COLUMNS } from "@lodestar/params";
3
+ import { ForkName, KZG_COMMITMENTS_GINDEX, NUMBER_OF_COLUMNS } from "@lodestar/params";
4
4
  import { signedBlockToSignedHeader } from "@lodestar/state-transition";
5
- import { ssz, } from "@lodestar/types";
5
+ import { ssz } from "@lodestar/types";
6
6
  import { bytesToBigInt } from "@lodestar/utils";
7
- import { BlockInputSource } from "../chain/blocks/blockInput/types.js";
7
+ import { BlockSource, DataColumnsSource, getBlockInput, getBlockInputDataColumns, } from "../chain/blocks/types.js";
8
8
  import { ChainEvent } from "../chain/emitter.js";
9
- import { dataColumnMatrixRecovery } from "./blobs.js";
9
+ import { kzgCommitmentToVersionedHash, recoverDataColumnSidecars as recover } from "./blobs.js";
10
10
  import { kzg } from "./kzg.js";
11
11
  export var RecoverResult;
12
12
  (function (RecoverResult) {
@@ -22,40 +22,6 @@ export var RecoverResult;
22
22
  RecoverResult["Failed"] = "failed";
23
23
  })(RecoverResult || (RecoverResult = {}));
24
24
  export class CustodyConfig {
25
- /**
26
- * The number of custody groups the node should subscribe to
27
- */
28
- targetCustodyGroupCount;
29
- /**
30
- * The custody columns the node should subscribe to
31
- */
32
- custodyColumns;
33
- /**
34
- * Custody columns map which column maps to which index in the array of columns custodied
35
- * with zero representing it is not custodied
36
- */
37
- custodyColumnsIndex;
38
- /**
39
- * The number of custody groups the node will sample
40
- */
41
- sampledGroupCount;
42
- /**
43
- * Custody groups sampled by the node as part of custody sampling
44
- */
45
- sampleGroups;
46
- /**
47
- * Data columns sampled by the node as part of custody sampling
48
- * https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.4/specs/fulu/das-core.md#custody-sampling
49
- *
50
- * TODO: Consider race conditions if this updates during sync/backfill
51
- */
52
- sampledColumns;
53
- /**
54
- * Subnets sampled by the node as part of custody sampling
55
- */
56
- sampledSubnets;
57
- config;
58
- nodeId;
59
25
  constructor(opts) {
60
26
  this.config = opts.config;
61
27
  this.nodeId = opts.nodeId;
@@ -169,7 +135,7 @@ export function getCustodyGroups(config, nodeId, custodyGroupCount) {
169
135
  custodyGroups.sort((a, b) => a - b);
170
136
  return custodyGroups;
171
137
  }
172
- export function computePostFuluKzgCommitmentsInclusionProof(fork, body) {
138
+ export function computeKzgCommitmentsInclusionProof(fork, body) {
173
139
  const bodyView = ssz[fork].BeaconBlockBody.toView(body);
174
140
  return new Tree(bodyView.node).getSingleProof(BigInt(KZG_COMMITMENTS_GINDEX));
175
141
  }
@@ -185,13 +151,11 @@ export function getDataColumns(config, nodeId, custodyGroupCount) {
185
151
  * SPEC FUNCTION (note: spec currently computes proofs, but we already have them)
186
152
  * https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.4/specs/fulu/das-core.md#compute_matrix
187
153
  */
188
- export async function getCellsAndProofs(blobBundles) {
189
- const blobsAndProofs = [];
190
- for (const { blob, proofs } of blobBundles) {
191
- const cells = await kzg.asyncComputeCells(blob);
192
- blobsAndProofs.push({ cells, proofs });
193
- }
194
- return blobsAndProofs;
154
+ export function getCellsAndProofs(blobBundles) {
155
+ return blobBundles.map(({ blob, proofs }) => {
156
+ const cells = kzg.computeCells(blob);
157
+ return { cells, proofs };
158
+ });
195
159
  }
196
160
  /**
197
161
  * Given a signed block header and the commitments, inclusion proof, cells/proofs associated with
@@ -238,7 +202,7 @@ export function getDataColumnSidecarsFromBlock(config, signedBlock, cellsAndKzgP
238
202
  }
239
203
  const fork = config.getForkName(signedBlock.message.slot);
240
204
  const signedBlockHeader = signedBlockToSignedHeader(config, signedBlock);
241
- const kzgCommitmentsInclusionProof = computePostFuluKzgCommitmentsInclusionProof(fork, signedBlock.message.body);
205
+ const kzgCommitmentsInclusionProof = computeKzgCommitmentsInclusionProof(fork, signedBlock.message.body);
242
206
  return getDataColumnSidecars(signedBlockHeader, blobKzgCommitments, kzgCommitmentsInclusionProof, cellsAndKzgProofs);
243
207
  }
244
208
  /**
@@ -254,67 +218,145 @@ export function getDataColumnSidecarsFromColumnSidecar(sidecar, cellsAndKzgProof
254
218
  /**
255
219
  * If we receive more than half of NUMBER_OF_COLUMNS (64) we should recover all remaining columns
256
220
  */
257
- export async function recoverDataColumnSidecars(blockInput, emitter, metrics) {
258
- const existingColumns = blockInput.getAllColumns();
259
- const columnCount = existingColumns.length;
221
+ export async function recoverDataColumnSidecars(dataColumnCache, clock, metrics) {
222
+ const columnCount = dataColumnCache.size;
260
223
  if (columnCount >= NUMBER_OF_COLUMNS) {
261
224
  // We have all columns
262
- return DataColumnReconstructionCode.NotAttemptedAlreadyFull;
225
+ return RecoverResult.NotAttemptedFull;
263
226
  }
264
227
  if (columnCount < NUMBER_OF_COLUMNS / 2) {
265
228
  // We don't have enough columns to recover
266
- return DataColumnReconstructionCode.NotAttemptedHaveLessThanHalf;
229
+ return RecoverResult.NotAttemptedLessThanHalf;
267
230
  }
268
- metrics?.recoverDataColumnSidecars.custodyBeforeReconstruction.set(columnCount);
231
+ const partialColumns = dataColumnCache.size;
232
+ metrics?.recoverDataColumnSidecars.custodyBeforeReconstruction.set(partialColumns);
269
233
  const partialSidecars = new Map();
270
- for (const columnSidecar of existingColumns) {
234
+ for (const [columnIndex, { dataColumn }] of dataColumnCache.entries()) {
271
235
  // the more columns we put, the slower the recover
272
236
  if (partialSidecars.size >= NUMBER_OF_COLUMNS / 2) {
273
237
  break;
274
238
  }
275
- partialSidecars.set(columnSidecar.index, columnSidecar);
239
+ partialSidecars.set(columnIndex, dataColumn);
276
240
  }
277
- const timer = metrics?.recoverDataColumnSidecars.recoverTime.startTimer();
241
+ const timer = metrics?.peerDas.dataColumnsReconstructionTime.startTimer();
278
242
  // if this function throws, we catch at the consumer side
279
- const fullSidecars = await dataColumnMatrixRecovery(partialSidecars).catch(() => null);
243
+ const fullSidecars = await recover(partialSidecars);
280
244
  timer?.();
281
245
  if (fullSidecars == null) {
282
- return DataColumnReconstructionCode.NullReturned;
246
+ return RecoverResult.Failed;
247
+ }
248
+ const firstDataColumn = dataColumnCache.values().next().value?.dataColumn;
249
+ if (firstDataColumn == null) {
250
+ // should not happen because we checked the size of the cache before this
251
+ throw new Error("No data column found in cache to recover from");
283
252
  }
284
- if (blockInput.getAllColumns().length === NUMBER_OF_COLUMNS) {
253
+ const slot = firstDataColumn.signedBlockHeader.message.slot;
254
+ const secFromSlot = clock.secFromSlot(slot);
255
+ metrics?.recoverDataColumnSidecars.elapsedTimeTillReconstructed.observe(secFromSlot);
256
+ if (dataColumnCache.size === NUMBER_OF_COLUMNS) {
285
257
  // either gossip or getBlobsV2 resolved availability while we were recovering
286
- return DataColumnReconstructionCode.SuccessLate;
287
- }
288
- // Once the node obtains a column through reconstruction,
289
- // the node MUST expose the new column as if it had received it over the network.
290
- // If the node is subscribed to the subnet corresponding to the column,
291
- // it MUST send the reconstructed DataColumnSidecar to its topic mesh neighbors.
292
- // If instead the node is not subscribed to the corresponding subnet,
293
- // it SHOULD still expose the availability of the DataColumnSidecar as part of the gossip emission process.
294
- // After exposing the reconstructed DataColumnSidecar to the network,
295
- // the node MAY delete the DataColumnSidecar if it is not part of the node's custody requirement.
296
- const sidecarsToPublish = [];
297
- for (const columnSidecar of fullSidecars) {
298
- if (!blockInput.hasColumn(columnSidecar.index)) {
299
- blockInput.addColumn({
300
- blockRootHex: blockInput.blockRootHex,
301
- columnSidecar,
302
- seenTimestampSec: Date.now() / 1000,
303
- source: BlockInputSource.recovery,
304
- });
305
- sidecarsToPublish.push(columnSidecar);
258
+ return RecoverResult.SuccessLate;
259
+ }
260
+ // We successfully recovered the data columns, update the cache
261
+ for (let columnIndex = 0; columnIndex < NUMBER_OF_COLUMNS; columnIndex++) {
262
+ if (dataColumnCache.has(columnIndex)) {
263
+ // We already have this column
264
+ continue;
265
+ }
266
+ const sidecar = fullSidecars[columnIndex];
267
+ if (sidecar === undefined) {
268
+ throw new Error(`full sidecars is undefined at index ${columnIndex}`);
306
269
  }
270
+ dataColumnCache.set(columnIndex, { dataColumn: sidecar, dataColumnBytes: null });
271
+ metrics?.peerDas.reconstructedColumns.inc(NUMBER_OF_COLUMNS - partialColumns);
272
+ }
273
+ return RecoverResult.SuccessResolved;
274
+ }
275
+ export function hasSampledDataColumns(custodyConfig, dataColumnCache) {
276
+ return (dataColumnCache.size >= custodyConfig.sampledColumns.length &&
277
+ custodyConfig.sampledColumns.reduce((acc, columnIndex) => acc && dataColumnCache.has(columnIndex), true));
278
+ }
279
+ export async function getDataColumnsFromExecution(config, custodyConfig, executionEngine, emitter, blockCache, metrics) {
280
+ if (blockCache.fork !== ForkName.fulu) {
281
+ return false;
282
+ }
283
+ if (!blockCache.cachedData) {
284
+ // this condition should never get hit... just a sanity check
285
+ throw new Error("invalid blockCache");
286
+ }
287
+ if (blockCache.cachedData.fork !== ForkName.fulu) {
288
+ return false;
289
+ }
290
+ // If already have all columns, exit
291
+ if (hasSampledDataColumns(custodyConfig, blockCache.cachedData.dataColumnsCache)) {
292
+ return true;
293
+ }
294
+ let commitments;
295
+ if (blockCache.block) {
296
+ const block = blockCache.block;
297
+ commitments = block.message.body.blobKzgCommitments;
298
+ }
299
+ else {
300
+ const firstSidecar = blockCache.cachedData.dataColumnsCache.values().next().value;
301
+ commitments = firstSidecar?.dataColumn.kzgCommitments;
302
+ }
303
+ if (!commitments) {
304
+ throw new Error("blockInputCache missing both block and cachedData");
305
+ }
306
+ // Return if block has no blobs
307
+ if (commitments.length === 0) {
308
+ return true;
309
+ }
310
+ // Process KZG commitments into versioned hashes
311
+ const versionedHashes = commitments.map(kzgCommitmentToVersionedHash);
312
+ // Get blobs from execution engine
313
+ metrics?.peerDas.getBlobsV2Requests.inc();
314
+ const timer = metrics?.peerDas.getBlobsV2RequestDuration.startTimer();
315
+ const blobs = await executionEngine.getBlobs(blockCache.fork, versionedHashes);
316
+ timer?.();
317
+ // Execution engine was unable to find one or more blobs
318
+ if (blobs === null) {
319
+ return false;
320
+ }
321
+ metrics?.peerDas.getBlobsV2Responses.inc();
322
+ // Return if we received all data columns while waiting for getBlobs
323
+ if (hasSampledDataColumns(custodyConfig, blockCache.cachedData.dataColumnsCache)) {
324
+ return true;
325
+ }
326
+ let dataColumnSidecars;
327
+ const cellsAndProofs = getCellsAndProofs(blobs);
328
+ if (blockCache.block) {
329
+ dataColumnSidecars = getDataColumnSidecarsFromBlock(config, blockCache.block, cellsAndProofs);
330
+ }
331
+ else {
332
+ const firstSidecar = blockCache.cachedData.dataColumnsCache.values().next().value;
333
+ if (!firstSidecar) {
334
+ throw new Error("blockInputCache missing both block and data column sidecar");
335
+ }
336
+ dataColumnSidecars = getDataColumnSidecarsFromColumnSidecar(firstSidecar.dataColumn, cellsAndProofs);
337
+ }
338
+ // Publish columns if and only if subscribed to them
339
+ const sampledColumns = custodyConfig.sampledColumns.map((columnIndex) => dataColumnSidecars[columnIndex]);
340
+ // for columns that we already seen, it will be ignored through `ignoreDuplicatePublishError` gossip option
341
+ emitter.emit(ChainEvent.publishDataColumns, sampledColumns);
342
+ for (const column of sampledColumns) {
343
+ blockCache.cachedData.dataColumnsCache.set(column.index, { dataColumn: column, dataColumnBytes: null });
344
+ }
345
+ const allDataColumns = getBlockInputDataColumns(blockCache.cachedData.dataColumnsCache, custodyConfig.sampledColumns);
346
+ // TODO: Add metrics
347
+ // metrics?.syncUnknownBlock.resolveAvailabilitySource.inc({source: BlockInputAvailabilitySource.GOSSIP});
348
+ const blockData = {
349
+ fork: blockCache.cachedData.fork,
350
+ ...allDataColumns,
351
+ dataColumnsSource: DataColumnsSource.engine,
352
+ };
353
+ const partialColumns = blockCache.cachedData.dataColumnsCache.size;
354
+ blockCache.cachedData.resolveAvailability(blockData);
355
+ metrics?.dataColumns.bySource.inc({ source: DataColumnsSource.engine }, NUMBER_OF_COLUMNS - partialColumns);
356
+ if (blockCache.block !== undefined) {
357
+ const blockInput = getBlockInput.availableData(config, blockCache.block, BlockSource.gossip, blockData);
358
+ blockCache.resolveBlockInput(blockInput);
307
359
  }
308
- emitter.emit(ChainEvent.publishDataColumns, sidecarsToPublish);
309
- return DataColumnReconstructionCode.SuccessResolved;
360
+ return true;
310
361
  }
311
- export var DataColumnReconstructionCode;
312
- (function (DataColumnReconstructionCode) {
313
- DataColumnReconstructionCode["NotAttemptedAlreadyFull"] = "not_attempted_full";
314
- DataColumnReconstructionCode["NotAttemptedHaveLessThanHalf"] = "not_attempted_less_than_half";
315
- DataColumnReconstructionCode["NullReturned"] = "null_returned";
316
- DataColumnReconstructionCode["SuccessLate"] = "success_late";
317
- DataColumnReconstructionCode["SuccessResolved"] = "success_resolved";
318
- DataColumnReconstructionCode["Failed"] = "failed";
319
- })(DataColumnReconstructionCode || (DataColumnReconstructionCode = {}));
320
362
  //# sourceMappingURL=dataColumns.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"dataColumns.js","sourceRoot":"","sources":["../../src/util/dataColumns.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dataColumns.js","sourceRoot":"","sources":["../../src/util/dataColumns.ts"],"names":[],"mappings":"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"}
@@ -3,10 +3,10 @@
3
3
  * but it does not buffer values, and this.end() stops the AsyncGenerator immediately
4
4
  */
5
5
  export class ItTrigger {
6
- triggered = false;
7
- ended = false;
8
- error;
9
- onNext;
6
+ constructor() {
7
+ this.triggered = false;
8
+ this.ended = false;
9
+ }
10
10
  trigger() {
11
11
  this.triggered = true;
12
12
  if (this.onNext)
@@ -1 +1 @@
1
- {"version":3,"file":"itTrigger.js","sourceRoot":"","sources":["../../src/util/itTrigger.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,OAAO,SAAS;IACZ,SAAS,GAAG,KAAK,CAAC;IAClB,KAAK,GAAG,KAAK,CAAC;IACd,KAAK,CAAS;IACd,MAAM,CAAc;IAE5B,OAAO;QACL,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,IAAI,CAAC,MAAM;YAAE,IAAI,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IACD,GAAG,CAAC,GAAW;QACb,IAAI,GAAG;YAAE,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC;;YACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACvB,IAAI,IAAI,CAAC,MAAM;YAAE,IAAI,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAED,qBAAqB;IAErB,CAAC,MAAM,CAAC,aAAa,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,IAAI;QACR,IAAI,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,CAAC,KAAK,CAAC;QACjC,IAAI,IAAI,CAAC,KAAK;YAAE,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAC,CAAC;QACtD,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAC,CAAC;QACzC,CAAC;QAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE;gBACjB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;gBACxB,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACvB,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,MAAM;QACV,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAC,CAAC;IACxC,CAAC;IACD,KAAK,CAAC,KAAK,CAAC,GAAU;QACpB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAC,CAAC;IACxC,CAAC;CACF"}
1
+ {"version":3,"file":"itTrigger.js","sourceRoot":"","sources":["../../src/util/itTrigger.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,OAAO,SAAS;IAAtB;QACU,cAAS,GAAG,KAAK,CAAC;QAClB,UAAK,GAAG,KAAK,CAAC;IA0CxB,CAAC;IAtCC,OAAO;QACL,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,IAAI,CAAC,MAAM;YAAE,IAAI,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IACD,GAAG,CAAC,GAAW;QACb,IAAI,GAAG;YAAE,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC;;YACrB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QACvB,IAAI,IAAI,CAAC,MAAM;YAAE,IAAI,CAAC,MAAM,EAAE,CAAC;IACjC,CAAC;IAED,qBAAqB;IAErB,CAAC,MAAM,CAAC,aAAa,CAAC;QACpB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,KAAK,CAAC,IAAI;QACR,IAAI,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,CAAC,KAAK,CAAC;QACjC,IAAI,IAAI,CAAC,KAAK;YAAE,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAC,CAAC;QACtD,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;YACvB,OAAO,EAAC,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAC,CAAC;QACzC,CAAC;QAED,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE;gBACjB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;gBACxB,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YACvB,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,MAAM;QACV,IAAI,CAAC,GAAG,EAAE,CAAC;QACX,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAC,CAAC;IACxC,CAAC;IACD,KAAK,CAAC,KAAK,CAAC,GAAU;QACpB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACd,OAAO,EAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAC,CAAC;IACxC,CAAC;CACF"}
package/lib/util/map.js CHANGED
@@ -3,8 +3,6 @@ import { OrderedSet } from "./set.js";
3
3
  * An implementation of Map that support getting first/last key and value.
4
4
  */
5
5
  export class OrderedMap {
6
- _set;
7
- map;
8
6
  constructor() {
9
7
  this._set = new OrderedSet();
10
8
  this.map = new Map();
@@ -1 +1 @@
1
- {"version":3,"file":"map.js","sourceRoot":"","sources":["../../src/util/map.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC;;GAEG;AACH,MAAM,OAAO,UAAU;IACb,IAAI,CAAgB;IACpB,GAAG,CAAY;IAEvB;QACE,IAAI,CAAC,IAAI,GAAG,IAAI,UAAU,EAAK,CAAC;QAChC,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,EAAQ,CAAC;IAC7B,CAAC;IAED,GAAG,CAAC,GAAM;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED,GAAG,CAAC,GAAM,EAAE,KAAQ;QAClB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,GAAM,EAAE,cAAuB;QACpC,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;YACtC,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAC1B,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAED,MAAM;QACJ,MAAM,KAAK,GAAG,IAAI,CAAC;QACnB,OAAO,CAAC,QAAQ,CAAC,CAAC,cAAc;YAC9B,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC/B,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,CAAM,CAAC;YAC5B,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;IACP,CAAC;IAED,SAAS;QACP,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACjC,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAM,CAAC;IAChC,CAAC;IAED,UAAU;QACR,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACnC,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAM,CAAC;IACjC,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IACxB,CAAC;IAED,GAAG,CAAC,GAAM;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;CACF"}
1
+ {"version":3,"file":"map.js","sourceRoot":"","sources":["../../src/util/map.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC;;GAEG;AACH,MAAM,OAAO,UAAU;IAIrB;QACE,IAAI,CAAC,IAAI,GAAG,IAAI,UAAU,EAAK,CAAC;QAChC,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,EAAQ,CAAC;IAC7B,CAAC;IAED,GAAG,CAAC,GAAM;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED,GAAG,CAAC,GAAM,EAAE,KAAQ;QAClB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,CAAC,GAAM,EAAE,cAAuB;QACpC,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;YACtC,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC;IAED,OAAO;QACL,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAC1B,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAED,MAAM;QACJ,MAAM,KAAK,GAAG,IAAI,CAAC;QACnB,OAAO,CAAC,QAAQ,CAAC,CAAC,cAAc;YAC9B,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC/B,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,CAAM,CAAC;YAC5B,CAAC;QACH,CAAC,CAAC,EAAE,CAAC;IACP,CAAC;IAED,SAAS;QACP,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACjC,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAM,CAAC;IAChC,CAAC;IAED,UAAU;QACR,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACnC,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAM,CAAC;IACjC,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IACxB,CAAC;IAED,GAAG,CAAC,GAAM;QACR,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;CACF"}
@@ -1,5 +1,5 @@
1
- export { QueueError, QueueErrorCode, isQueueErrorAborted } from "./errors.js";
2
1
  export * from "./fnQueue.js";
3
2
  export * from "./itemQueue.js";
4
3
  export * from "./options.js";
4
+ export { QueueError, QueueErrorCode, isQueueErrorAborted } from "./errors.js";
5
5
  //# sourceMappingURL=index.d.ts.map
@@ -1,5 +1,5 @@
1
- export { QueueError, QueueErrorCode, isQueueErrorAborted } from "./errors.js";
2
1
  export * from "./fnQueue.js";
3
2
  export * from "./itemQueue.js";
4
3
  export * from "./options.js";
4
+ export { QueueError, QueueErrorCode, isQueueErrorAborted } from "./errors.js";
5
5
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/queue/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,cAAc,EAAE,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAC5E,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/queue/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAC,UAAU,EAAE,cAAc,EAAE,mBAAmB,EAAC,MAAM,aAAa,CAAC"}
@@ -8,18 +8,57 @@ import { QueueType, defaultQueueOpts } from "./options.js";
8
8
  */
9
9
  // biome-ignore lint/suspicious/noExplicitAny: We need to use `any` type here
10
10
  export class JobItemQueue {
11
- itemProcessor;
12
- opts;
13
- /**
14
- * We choose to use LinkedList instead of regular array to improve shift() / push() / pop() performance.
15
- * See the LinkedList benchmark for more details.
16
- * */
17
- jobs = new LinkedList();
18
- metrics;
19
- runningJobs = 0;
20
- lastYield = 0;
21
11
  constructor(itemProcessor, opts, metrics) {
22
12
  this.itemProcessor = itemProcessor;
13
+ /**
14
+ * We choose to use LinkedList instead of regular array to improve shift() / push() / pop() performance.
15
+ * See the LinkedList benchmark for more details.
16
+ * */
17
+ this.jobs = new LinkedList();
18
+ this.runningJobs = 0;
19
+ this.lastYield = 0;
20
+ this.dropAllJobs = () => {
21
+ this.jobs.clear();
22
+ };
23
+ this.runJob = async () => {
24
+ if (this.opts.signal.aborted || this.runningJobs >= this.opts.maxConcurrency) {
25
+ return;
26
+ }
27
+ // Default to FIFO. LIFO -> pop() remove last item, FIFO -> shift() remove first item
28
+ const job = this.opts.type === QueueType.LIFO ? this.jobs.pop() : this.jobs.shift();
29
+ if (!job) {
30
+ return;
31
+ }
32
+ this.runningJobs++;
33
+ // If the job, metrics or any code below throws: the job will reject never going stale.
34
+ // Only downside is the job promise may be resolved twice, but that's not an issue
35
+ try {
36
+ const timer = this.metrics?.jobTime.startTimer();
37
+ this.metrics?.jobWaitTime.observe((Date.now() - job.addedTimeMs) / 1000);
38
+ const result = await this.itemProcessor(...job.args);
39
+ job.resolve(result);
40
+ if (timer)
41
+ timer();
42
+ // Yield to the macro queue
43
+ if (Date.now() - this.lastYield > this.opts.yieldEveryMs) {
44
+ this.lastYield = Date.now();
45
+ await nextEventLoop();
46
+ }
47
+ }
48
+ catch (e) {
49
+ job.reject(e);
50
+ }
51
+ this.runningJobs = Math.max(0, this.runningJobs - 1);
52
+ // Potentially run a new job
53
+ void this.runJob();
54
+ };
55
+ this.abortAllJobs = () => {
56
+ while (this.jobs.length > 0) {
57
+ const job = this.jobs.pop();
58
+ if (job)
59
+ job.reject(new QueueError({ code: QueueErrorCode.QUEUE_ABORTED }));
60
+ }
61
+ };
23
62
  this.opts = { ...defaultQueueOpts, ...opts };
24
63
  this.opts.signal.addEventListener("abort", this.abortAllJobs, { once: true });
25
64
  if (metrics) {
@@ -61,47 +100,5 @@ export class JobItemQueue {
61
100
  getItems() {
62
101
  return this.jobs.map((job) => ({ args: job.args, addedTimeMs: job.addedTimeMs }));
63
102
  }
64
- dropAllJobs = () => {
65
- this.jobs.clear();
66
- };
67
- runJob = async () => {
68
- if (this.opts.signal.aborted || this.runningJobs >= this.opts.maxConcurrency) {
69
- return;
70
- }
71
- // Default to FIFO. LIFO -> pop() remove last item, FIFO -> shift() remove first item
72
- const job = this.opts.type === QueueType.LIFO ? this.jobs.pop() : this.jobs.shift();
73
- if (!job) {
74
- return;
75
- }
76
- this.runningJobs++;
77
- // If the job, metrics or any code below throws: the job will reject never going stale.
78
- // Only downside is the job promise may be resolved twice, but that's not an issue
79
- try {
80
- const timer = this.metrics?.jobTime.startTimer();
81
- this.metrics?.jobWaitTime.observe((Date.now() - job.addedTimeMs) / 1000);
82
- const result = await this.itemProcessor(...job.args);
83
- job.resolve(result);
84
- if (timer)
85
- timer();
86
- // Yield to the macro queue
87
- if (Date.now() - this.lastYield > this.opts.yieldEveryMs) {
88
- this.lastYield = Date.now();
89
- await nextEventLoop();
90
- }
91
- }
92
- catch (e) {
93
- job.reject(e);
94
- }
95
- this.runningJobs = Math.max(0, this.runningJobs - 1);
96
- // Potentially run a new job
97
- void this.runJob();
98
- };
99
- abortAllJobs = () => {
100
- while (this.jobs.length > 0) {
101
- const job = this.jobs.pop();
102
- if (job)
103
- job.reject(new QueueError({ code: QueueErrorCode.QUEUE_ABORTED }));
104
- }
105
- };
106
103
  }
107
104
  //# sourceMappingURL=itemQueue.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"itemQueue.js","sourceRoot":"","sources":["../../../src/util/queue/itemQueue.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"itemQueue.js","sourceRoot":"","sources":["../../../src/util/queue/itemQueue.ts"],"names":[],"mappings":"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"}
@@ -4,7 +4,9 @@
4
4
  * This is a thin wrapper around WeakMap
5
5
  */
6
6
  export class SerializedCache {
7
- map = new WeakMap();
7
+ constructor() {
8
+ this.map = new WeakMap();
9
+ }
8
10
  get(obj) {
9
11
  return this.map.get(obj);
10
12
  }
@@ -1 +1 @@
1
- {"version":3,"file":"serializedCache.js","sourceRoot":"","sources":["../../src/util/serializedCache.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,OAAO,eAAe;IAC1B,GAAG,GAAgC,IAAI,OAAO,EAAE,CAAC;IAEjD,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,UAAsB;QACrC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAChC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,GAAG,GAAG,IAAI,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF"}
1
+ {"version":3,"file":"serializedCache.js","sourceRoot":"","sources":["../../src/util/serializedCache.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,OAAO,eAAe;IAA5B;QACE,QAAG,GAAgC,IAAI,OAAO,EAAE,CAAC;IAanD,CAAC;IAXC,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,UAAsB;QACrC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAChC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,GAAG,GAAG,IAAI,OAAO,EAAE,CAAC;IAC3B,CAAC;CACF"}