@lodestar/beacon-node 1.34.1 → 1.35.0-dev.092cc3954a

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 (512) hide show
  1. package/lib/api/impl/beacon/blocks/index.js +71 -53
  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/debug/index.js +20 -9
  6. package/lib/api/impl/debug/index.js.map +1 -1
  7. package/lib/api/impl/errors.js +2 -0
  8. package/lib/api/impl/errors.js.map +1 -1
  9. package/lib/api/impl/index.d.ts +3 -3
  10. package/lib/api/impl/index.js +3 -3
  11. package/lib/api/impl/index.js.map +1 -1
  12. package/lib/api/impl/lodestar/index.js +1 -1
  13. package/lib/api/impl/lodestar/index.js.map +1 -1
  14. package/lib/api/impl/validator/index.js +2 -1
  15. package/lib/api/impl/validator/index.js.map +1 -1
  16. package/lib/api/rest/activeSockets.js +3 -2
  17. package/lib/api/rest/activeSockets.js.map +1 -1
  18. package/lib/api/rest/base.d.ts +1 -1
  19. package/lib/api/rest/base.js +6 -2
  20. package/lib/api/rest/base.js.map +1 -1
  21. package/lib/api/rest/index.js +2 -0
  22. package/lib/api/rest/index.js.map +1 -1
  23. package/lib/api/rest/swaggerUI.js +4 -2
  24. package/lib/api/rest/swaggerUI.js.map +1 -1
  25. package/lib/bun-wrappers/prometheus-gc-stats.d.ts +2 -0
  26. package/lib/bun-wrappers/prometheus-gc-stats.js +8 -0
  27. package/lib/bun-wrappers/prometheus-gc-stats.js.map +1 -0
  28. package/lib/chain/ColumnReconstructionTracker.d.ts +32 -0
  29. package/lib/chain/ColumnReconstructionTracker.js +71 -0
  30. package/lib/chain/ColumnReconstructionTracker.js.map +1 -0
  31. package/lib/chain/GetBlobsTracker.d.ts +31 -0
  32. package/lib/chain/GetBlobsTracker.js +82 -0
  33. package/lib/chain/GetBlobsTracker.js.map +1 -0
  34. package/lib/chain/archiveStore/archiveStore.js +49 -38
  35. package/lib/chain/archiveStore/archiveStore.js.map +1 -1
  36. package/lib/chain/archiveStore/historicalState/historicalStateRegen.js +2 -0
  37. package/lib/chain/archiveStore/historicalState/historicalStateRegen.js.map +1 -1
  38. package/lib/chain/archiveStore/index.d.ts +1 -1
  39. package/lib/chain/archiveStore/index.js +1 -1
  40. package/lib/chain/archiveStore/strategies/frequencyStateArchiveStrategy.js +5 -0
  41. package/lib/chain/archiveStore/strategies/frequencyStateArchiveStrategy.js.map +1 -1
  42. package/lib/chain/archiveStore/utils/archiveBlocks.js +14 -7
  43. package/lib/chain/archiveStore/utils/archiveBlocks.js.map +1 -1
  44. package/lib/chain/balancesCache.js +1 -3
  45. package/lib/chain/balancesCache.js.map +1 -1
  46. package/lib/chain/beaconProposerCache.js +1 -0
  47. package/lib/chain/beaconProposerCache.js.map +1 -1
  48. package/lib/chain/blocks/blockInput/blockInput.d.ts +19 -7
  49. package/lib/chain/blocks/blockInput/blockInput.js +132 -88
  50. package/lib/chain/blocks/blockInput/blockInput.js.map +1 -1
  51. package/lib/chain/blocks/blockInput/index.d.ts +1 -1
  52. package/lib/chain/blocks/blockInput/index.js +1 -1
  53. package/lib/chain/blocks/blockInput/types.d.ts +19 -10
  54. package/lib/chain/blocks/blockInput/types.js +1 -0
  55. package/lib/chain/blocks/blockInput/types.js.map +1 -1
  56. package/lib/chain/blocks/blockInput/utils.d.ts +0 -4
  57. package/lib/chain/blocks/blockInput/utils.js +6 -29
  58. package/lib/chain/blocks/blockInput/utils.js.map +1 -1
  59. package/lib/chain/blocks/importBlock.js +36 -32
  60. package/lib/chain/blocks/importBlock.js.map +1 -1
  61. package/lib/chain/blocks/index.d.ts +6 -5
  62. package/lib/chain/blocks/index.js +5 -4
  63. package/lib/chain/blocks/index.js.map +1 -1
  64. package/lib/chain/blocks/types.d.ts +3 -108
  65. package/lib/chain/blocks/types.js +0 -119
  66. package/lib/chain/blocks/types.js.map +1 -1
  67. package/lib/chain/blocks/utils/chainSegment.d.ts +2 -2
  68. package/lib/chain/blocks/utils/chainSegment.js +2 -2
  69. package/lib/chain/blocks/utils/chainSegment.js.map +1 -1
  70. package/lib/chain/blocks/verifyBlock.d.ts +3 -3
  71. package/lib/chain/blocks/verifyBlock.js +15 -14
  72. package/lib/chain/blocks/verifyBlock.js.map +1 -1
  73. package/lib/chain/blocks/verifyBlocksDataAvailability.d.ts +7 -22
  74. package/lib/chain/blocks/verifyBlocksDataAvailability.js +18 -110
  75. package/lib/chain/blocks/verifyBlocksDataAvailability.js.map +1 -1
  76. package/lib/chain/blocks/verifyBlocksExecutionPayloads.d.ts +4 -3
  77. package/lib/chain/blocks/verifyBlocksExecutionPayloads.js +24 -22
  78. package/lib/chain/blocks/verifyBlocksExecutionPayloads.js.map +1 -1
  79. package/lib/chain/blocks/verifyBlocksSanityChecks.d.ts +4 -3
  80. package/lib/chain/blocks/verifyBlocksSanityChecks.js +2 -2
  81. package/lib/chain/blocks/verifyBlocksSanityChecks.js.map +1 -1
  82. package/lib/chain/blocks/verifyBlocksStateTransitionOnly.d.ts +3 -2
  83. package/lib/chain/blocks/verifyBlocksStateTransitionOnly.js +2 -2
  84. package/lib/chain/blocks/verifyBlocksStateTransitionOnly.js.map +1 -1
  85. package/lib/chain/blocks/writeBlockInputToDb.d.ts +3 -3
  86. package/lib/chain/blocks/writeBlockInputToDb.js +61 -63
  87. package/lib/chain/blocks/writeBlockInputToDb.js.map +1 -1
  88. package/lib/chain/bls/multithread/index.js +167 -163
  89. package/lib/chain/bls/multithread/index.js.map +1 -1
  90. package/lib/chain/bls/singleThread.js +1 -0
  91. package/lib/chain/bls/singleThread.js.map +1 -1
  92. package/lib/chain/chain.d.ts +13 -11
  93. package/lib/chain/chain.js +79 -20
  94. package/lib/chain/chain.js.map +1 -1
  95. package/lib/chain/emitter.d.ts +43 -2
  96. package/lib/chain/emitter.js +18 -0
  97. package/lib/chain/emitter.js.map +1 -1
  98. package/lib/chain/errors/blobSidecarError.d.ts +24 -0
  99. package/lib/chain/errors/blobSidecarError.js +10 -0
  100. package/lib/chain/errors/blobSidecarError.js.map +1 -1
  101. package/lib/chain/errors/blockError.js +1 -0
  102. package/lib/chain/errors/blockError.js.map +1 -1
  103. package/lib/chain/errors/dataColumnSidecarError.d.ts +42 -0
  104. package/lib/chain/errors/dataColumnSidecarError.js +14 -0
  105. package/lib/chain/errors/dataColumnSidecarError.js.map +1 -1
  106. package/lib/chain/errors/gossipValidation.js +1 -0
  107. package/lib/chain/errors/gossipValidation.js.map +1 -1
  108. package/lib/chain/errors/index.d.ts +2 -2
  109. package/lib/chain/errors/index.js +2 -2
  110. package/lib/chain/errors/index.js.map +1 -1
  111. package/lib/chain/forkChoice/index.js.map +1 -1
  112. package/lib/chain/genesis/genesis.js +16 -5
  113. package/lib/chain/genesis/genesis.js.map +1 -1
  114. package/lib/chain/index.d.ts +2 -2
  115. package/lib/chain/index.js +2 -2
  116. package/lib/chain/index.js.map +1 -1
  117. package/lib/chain/interface.d.ts +13 -9
  118. package/lib/chain/interface.js.map +1 -1
  119. package/lib/chain/lightClient/index.js +16 -9
  120. package/lib/chain/lightClient/index.js.map +1 -1
  121. package/lib/chain/lightClient/proofs.js.map +1 -1
  122. package/lib/chain/opPools/aggregatedAttestationPool.js +14 -9
  123. package/lib/chain/opPools/aggregatedAttestationPool.js.map +1 -1
  124. package/lib/chain/opPools/attestationPool.js +8 -3
  125. package/lib/chain/opPools/attestationPool.js.map +1 -1
  126. package/lib/chain/opPools/index.d.ts +1 -1
  127. package/lib/chain/opPools/index.js +1 -1
  128. package/lib/chain/opPools/index.js.map +1 -1
  129. package/lib/chain/opPools/opPool.js +10 -12
  130. package/lib/chain/opPools/opPool.js.map +1 -1
  131. package/lib/chain/opPools/syncCommitteeMessagePool.js +9 -6
  132. package/lib/chain/opPools/syncCommitteeMessagePool.js.map +1 -1
  133. package/lib/chain/opPools/syncContributionAndProofPool.js +5 -2
  134. package/lib/chain/opPools/syncContributionAndProofPool.js.map +1 -1
  135. package/lib/chain/options.js +1 -1
  136. package/lib/chain/options.js.map +1 -1
  137. package/lib/chain/prepareNextSlot.js +141 -134
  138. package/lib/chain/prepareNextSlot.js.map +1 -1
  139. package/lib/chain/produceBlock/produceBlockBody.d.ts +1 -1
  140. package/lib/chain/produceBlock/produceBlockBody.js +3 -10
  141. package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
  142. package/lib/chain/regen/errors.js +1 -0
  143. package/lib/chain/regen/errors.js.map +1 -1
  144. package/lib/chain/regen/index.d.ts +1 -1
  145. package/lib/chain/regen/index.js +1 -1
  146. package/lib/chain/regen/index.js.map +1 -1
  147. package/lib/chain/regen/queued.js +35 -28
  148. package/lib/chain/regen/queued.js.map +1 -1
  149. package/lib/chain/regen/regen.js +1 -0
  150. package/lib/chain/regen/regen.js.map +1 -1
  151. package/lib/chain/reprocess.js +3 -1
  152. package/lib/chain/reprocess.js.map +1 -1
  153. package/lib/chain/seenCache/index.d.ts +1 -1
  154. package/lib/chain/seenCache/index.js +1 -1
  155. package/lib/chain/seenCache/index.js.map +1 -1
  156. package/lib/chain/seenCache/seenAggregateAndProof.js +7 -6
  157. package/lib/chain/seenCache/seenAggregateAndProof.js.map +1 -1
  158. package/lib/chain/seenCache/seenAttestationData.js +5 -2
  159. package/lib/chain/seenCache/seenAttestationData.js.map +1 -1
  160. package/lib/chain/seenCache/seenAttesters.js +2 -4
  161. package/lib/chain/seenCache/seenAttesters.js.map +1 -1
  162. package/lib/chain/seenCache/seenBlockProposers.js +2 -4
  163. package/lib/chain/seenCache/seenBlockProposers.js.map +1 -1
  164. package/lib/chain/seenCache/seenCommittee.js +1 -3
  165. package/lib/chain/seenCache/seenCommittee.js.map +1 -1
  166. package/lib/chain/seenCache/seenCommitteeContribution.js +3 -2
  167. package/lib/chain/seenCache/seenCommitteeContribution.js.map +1 -1
  168. package/lib/chain/seenCache/seenGossipBlockInput.d.ts +74 -78
  169. package/lib/chain/seenCache/seenGossipBlockInput.js +235 -369
  170. package/lib/chain/seenCache/seenGossipBlockInput.js.map +1 -1
  171. package/lib/chain/shufflingCache.js +5 -2
  172. package/lib/chain/shufflingCache.js.map +1 -1
  173. package/lib/chain/stateCache/blockStateCacheImpl.js +13 -7
  174. package/lib/chain/stateCache/blockStateCacheImpl.js.map +1 -1
  175. package/lib/chain/stateCache/datastore/db.js +1 -0
  176. package/lib/chain/stateCache/datastore/db.js.map +1 -1
  177. package/lib/chain/stateCache/datastore/file.js +1 -0
  178. package/lib/chain/stateCache/datastore/file.js.map +1 -1
  179. package/lib/chain/stateCache/datastore/index.d.ts +1 -1
  180. package/lib/chain/stateCache/datastore/index.js +1 -1
  181. package/lib/chain/stateCache/datastore/index.js.map +1 -1
  182. package/lib/chain/stateCache/fifoBlockStateCache.js +10 -0
  183. package/lib/chain/stateCache/fifoBlockStateCache.js.map +1 -1
  184. package/lib/chain/stateCache/inMemoryCheckpointsCache.js +10 -4
  185. package/lib/chain/stateCache/inMemoryCheckpointsCache.js.map +1 -1
  186. package/lib/chain/stateCache/index.d.ts +1 -1
  187. package/lib/chain/stateCache/index.js +1 -1
  188. package/lib/chain/stateCache/index.js.map +1 -1
  189. package/lib/chain/stateCache/mapMetrics.js +4 -4
  190. package/lib/chain/stateCache/mapMetrics.js.map +1 -1
  191. package/lib/chain/stateCache/persistentCheckpointsCache.js +14 -6
  192. package/lib/chain/stateCache/persistentCheckpointsCache.js.map +1 -1
  193. package/lib/chain/validation/blobSidecar.d.ts +8 -3
  194. package/lib/chain/validation/blobSidecar.js +73 -31
  195. package/lib/chain/validation/blobSidecar.js.map +1 -1
  196. package/lib/chain/validation/dataColumnSidecar.d.ts +7 -9
  197. package/lib/chain/validation/dataColumnSidecar.js +95 -57
  198. package/lib/chain/validation/dataColumnSidecar.js.map +1 -1
  199. package/lib/chain/validation/index.d.ts +1 -1
  200. package/lib/chain/validation/index.js +1 -1
  201. package/lib/chain/validation/index.js.map +1 -1
  202. package/lib/chain/validation/signatureSets/aggregateAndProof.d.ts +1 -2
  203. package/lib/chain/validation/signatureSets/aggregateAndProof.js.map +1 -1
  204. package/lib/chain/validatorMonitor.d.ts +1 -3
  205. package/lib/chain/validatorMonitor.js +2 -1
  206. package/lib/chain/validatorMonitor.js.map +1 -1
  207. package/lib/db/beacon.js +24 -0
  208. package/lib/db/beacon.js.map +1 -1
  209. package/lib/db/index.d.ts +1 -1
  210. package/lib/db/index.js.map +1 -1
  211. package/lib/db/repositories/blobSidecars.js.map +1 -1
  212. package/lib/db/repositories/blockArchive.js +4 -5
  213. package/lib/db/repositories/blockArchive.js.map +1 -1
  214. package/lib/db/repositories/blockArchiveIndex.d.ts +4 -0
  215. package/lib/db/repositories/blockArchiveIndex.js +13 -5
  216. package/lib/db/repositories/blockArchiveIndex.js.map +1 -1
  217. package/lib/db/repositories/dataColumnSidecar.js +8 -7
  218. package/lib/db/repositories/dataColumnSidecar.js.map +1 -1
  219. package/lib/db/repositories/dataColumnSidecarArchive.js +17 -7
  220. package/lib/db/repositories/dataColumnSidecarArchive.js.map +1 -1
  221. package/lib/db/repositories/depositDataRoot.js +1 -0
  222. package/lib/db/repositories/depositDataRoot.js.map +1 -1
  223. package/lib/db/repositories/index.d.ts +10 -10
  224. package/lib/db/repositories/index.js +9 -9
  225. package/lib/db/repositories/index.js.map +1 -1
  226. package/lib/db/repositories/stateArchive.js +3 -2
  227. package/lib/db/repositories/stateArchive.js.map +1 -1
  228. package/lib/db/repositories/stateArchiveIndex.d.ts +1 -0
  229. package/lib/db/repositories/stateArchiveIndex.js +6 -2
  230. package/lib/db/repositories/stateArchiveIndex.js.map +1 -1
  231. package/lib/db/single/preGenesisState.d.ts +1 -0
  232. package/lib/db/single/preGenesisState.js +11 -4
  233. package/lib/db/single/preGenesisState.js.map +1 -1
  234. package/lib/db/single/preGenesisStateLastProcessedBlock.d.ts +1 -0
  235. package/lib/db/single/preGenesisStateLastProcessedBlock.js +10 -4
  236. package/lib/db/single/preGenesisStateLastProcessedBlock.js.map +1 -1
  237. package/lib/eth1/eth1DataCache.js +2 -0
  238. package/lib/eth1/eth1DataCache.js.map +1 -1
  239. package/lib/eth1/eth1DepositDataTracker.js +18 -5
  240. package/lib/eth1/eth1DepositDataTracker.js.map +1 -1
  241. package/lib/eth1/eth1DepositsCache.js +3 -0
  242. package/lib/eth1/eth1DepositsCache.js.map +1 -1
  243. package/lib/eth1/eth1MergeBlockTracker.js +10 -4
  244. package/lib/eth1/eth1MergeBlockTracker.js.map +1 -1
  245. package/lib/eth1/index.js +2 -0
  246. package/lib/eth1/index.js.map +1 -1
  247. package/lib/eth1/provider/eth1Provider.d.ts +1 -2
  248. package/lib/eth1/provider/eth1Provider.js +6 -2
  249. package/lib/eth1/provider/eth1Provider.js.map +1 -1
  250. package/lib/eth1/provider/jsonRpcHttpClient.d.ts +1 -1
  251. package/lib/eth1/provider/jsonRpcHttpClient.js +16 -2
  252. package/lib/eth1/provider/jsonRpcHttpClient.js.map +1 -1
  253. package/lib/eth1/provider/jwt.js.map +1 -1
  254. package/lib/eth1/provider/utils.d.ts +5 -0
  255. package/lib/eth1/provider/utils.js +9 -1
  256. package/lib/eth1/provider/utils.js.map +1 -1
  257. package/lib/eth1/utils/deposits.js.map +1 -1
  258. package/lib/execution/builder/cache.js +6 -0
  259. package/lib/execution/builder/cache.js.map +1 -1
  260. package/lib/execution/builder/http.js +14 -8
  261. package/lib/execution/builder/http.js.map +1 -1
  262. package/lib/execution/builder/index.js.map +1 -1
  263. package/lib/execution/engine/disabled.js +2 -4
  264. package/lib/execution/engine/disabled.js.map +1 -1
  265. package/lib/execution/engine/http.d.ts +2 -2
  266. package/lib/execution/engine/http.js +43 -11
  267. package/lib/execution/engine/http.js.map +1 -1
  268. package/lib/execution/engine/interface.d.ts +2 -2
  269. package/lib/execution/engine/interface.js.map +1 -1
  270. package/lib/execution/engine/mock.d.ts +1 -0
  271. package/lib/execution/engine/mock.js +16 -12
  272. package/lib/execution/engine/mock.js.map +1 -1
  273. package/lib/execution/engine/payloadIdCache.js +1 -3
  274. package/lib/execution/engine/payloadIdCache.js.map +1 -1
  275. package/lib/execution/engine/types.d.ts +5 -1
  276. package/lib/execution/engine/types.js +37 -8
  277. package/lib/execution/engine/types.js.map +1 -1
  278. package/lib/execution/engine/utils.js +3 -3
  279. package/lib/execution/engine/utils.js.map +1 -1
  280. package/lib/execution/index.d.ts +2 -2
  281. package/lib/execution/index.js +2 -2
  282. package/lib/execution/index.js.map +1 -1
  283. package/lib/index.d.ts +6 -6
  284. package/lib/index.js +5 -5
  285. package/lib/index.js.map +1 -1
  286. package/lib/metrics/index.d.ts +1 -1
  287. package/lib/metrics/index.js +1 -1
  288. package/lib/metrics/index.js.map +1 -1
  289. package/lib/metrics/metrics/beacon.d.ts +11 -5
  290. package/lib/metrics/metrics/beacon.js +40 -20
  291. package/lib/metrics/metrics/beacon.js.map +1 -1
  292. package/lib/metrics/metrics/lodestar.d.ts +55 -13
  293. package/lib/metrics/metrics/lodestar.js +85 -8
  294. package/lib/metrics/metrics/lodestar.js.map +1 -1
  295. package/lib/metrics/metrics.d.ts +1 -1
  296. package/lib/metrics/metrics.js.map +1 -1
  297. package/lib/metrics/nodeJsMetrics.js +1 -1
  298. package/lib/metrics/nodeJsMetrics.js.map +1 -1
  299. package/lib/metrics/server/http.d.ts +1 -1
  300. package/lib/metrics/utils/avgMinMax.d.ts +1 -1
  301. package/lib/metrics/utils/avgMinMax.js +10 -6
  302. package/lib/metrics/utils/avgMinMax.js.map +1 -1
  303. package/lib/metrics/utils/gauge.d.ts +1 -1
  304. package/lib/metrics/utils/gauge.js +1 -4
  305. package/lib/metrics/utils/gauge.js.map +1 -1
  306. package/lib/metrics/utils/registryMetricCreator.d.ts +1 -1
  307. package/lib/metrics/utils/registryMetricCreator.js.map +1 -1
  308. package/lib/monitoring/properties.js +4 -0
  309. package/lib/monitoring/properties.js.map +1 -1
  310. package/lib/monitoring/service.js +13 -1
  311. package/lib/monitoring/service.js.map +1 -1
  312. package/lib/monitoring/system.js +25 -27
  313. package/lib/monitoring/system.js.map +1 -1
  314. package/lib/network/core/networkCore.d.ts +2 -2
  315. package/lib/network/core/networkCore.js +67 -50
  316. package/lib/network/core/networkCore.js.map +1 -1
  317. package/lib/network/core/networkCoreWorker.js +1 -1
  318. package/lib/network/core/networkCoreWorker.js.map +1 -1
  319. package/lib/network/core/networkCoreWorkerHandler.d.ts +2 -2
  320. package/lib/network/core/networkCoreWorkerHandler.js +5 -2
  321. package/lib/network/core/networkCoreWorkerHandler.js.map +1 -1
  322. package/lib/network/discv5/index.d.ts +2 -2
  323. package/lib/network/discv5/index.js +5 -2
  324. package/lib/network/discv5/index.js.map +1 -1
  325. package/lib/network/discv5/worker.js +3 -3
  326. package/lib/network/discv5/worker.js.map +1 -1
  327. package/lib/network/events.d.ts +2 -18
  328. package/lib/network/events.js +0 -7
  329. package/lib/network/events.js.map +1 -1
  330. package/lib/network/gossip/encoding.d.ts +1 -1
  331. package/lib/network/gossip/encoding.js +4 -2
  332. package/lib/network/gossip/encoding.js.map +1 -1
  333. package/lib/network/gossip/errors.js +1 -0
  334. package/lib/network/gossip/errors.js.map +1 -1
  335. package/lib/network/gossip/gossipsub.d.ts +1 -1
  336. package/lib/network/gossip/gossipsub.js +8 -1
  337. package/lib/network/gossip/gossipsub.js.map +1 -1
  338. package/lib/network/gossip/index.d.ts +2 -2
  339. package/lib/network/gossip/index.js +2 -2
  340. package/lib/network/gossip/index.js.map +1 -1
  341. package/lib/network/gossip/interface.d.ts +2 -2
  342. package/lib/network/gossip/topic.d.ts +125 -105
  343. package/lib/network/gossip/topic.js +2 -1
  344. package/lib/network/gossip/topic.js.map +1 -1
  345. package/lib/network/index.d.ts +3 -3
  346. package/lib/network/index.js +3 -3
  347. package/lib/network/index.js.map +1 -1
  348. package/lib/network/interface.d.ts +3 -2
  349. package/lib/network/libp2p/index.js +2 -2
  350. package/lib/network/libp2p/index.js.map +1 -1
  351. package/lib/network/metadata.js +4 -0
  352. package/lib/network/metadata.js.map +1 -1
  353. package/lib/network/network.d.ts +4 -2
  354. package/lib/network/network.js +89 -71
  355. package/lib/network/network.js.map +1 -1
  356. package/lib/network/options.js +1 -1
  357. package/lib/network/options.js.map +1 -1
  358. package/lib/network/peers/datastore.js +8 -2
  359. package/lib/network/peers/datastore.js.map +1 -1
  360. package/lib/network/peers/discover.js +75 -66
  361. package/lib/network/peers/discover.js.map +1 -1
  362. package/lib/network/peers/peerManager.js +154 -130
  363. package/lib/network/peers/peerManager.js.map +1 -1
  364. package/lib/network/peers/peersData.d.ts +1 -1
  365. package/lib/network/peers/peersData.js +1 -3
  366. package/lib/network/peers/peersData.js.map +1 -1
  367. package/lib/network/peers/score/index.d.ts +1 -1
  368. package/lib/network/peers/score/index.js +1 -1
  369. package/lib/network/peers/score/index.js.map +1 -1
  370. package/lib/network/peers/score/score.js +6 -0
  371. package/lib/network/peers/score/score.js.map +1 -1
  372. package/lib/network/peers/score/store.js +3 -0
  373. package/lib/network/peers/score/store.js.map +1 -1
  374. package/lib/network/peers/utils/prioritizePeers.js.map +1 -1
  375. package/lib/network/peers/utils/subnetMap.js +2 -4
  376. package/lib/network/peers/utils/subnetMap.js.map +1 -1
  377. package/lib/network/processor/aggregatorTracker.js +1 -3
  378. package/lib/network/processor/aggregatorTracker.js.map +1 -1
  379. package/lib/network/processor/gossipHandlers.js +145 -165
  380. package/lib/network/processor/gossipHandlers.js.map +1 -1
  381. package/lib/network/processor/gossipQueues/indexed.js +11 -9
  382. package/lib/network/processor/gossipQueues/indexed.js.map +1 -1
  383. package/lib/network/processor/gossipQueues/linear.js +9 -8
  384. package/lib/network/processor/gossipQueues/linear.js.map +1 -1
  385. package/lib/network/processor/index.d.ts +2 -1
  386. package/lib/network/processor/index.js +22 -8
  387. package/lib/network/processor/index.js.map +1 -1
  388. package/lib/network/reqresp/ReqRespBeaconNode.d.ts +1 -1
  389. package/lib/network/reqresp/ReqRespBeaconNode.js +11 -2
  390. package/lib/network/reqresp/ReqRespBeaconNode.js.map +1 -1
  391. package/lib/network/reqresp/handlers/beaconBlocksByRange.js +1 -2
  392. package/lib/network/reqresp/handlers/beaconBlocksByRange.js.map +1 -1
  393. package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.js.map +1 -1
  394. package/lib/network/reqresp/index.d.ts +1 -3
  395. package/lib/network/reqresp/index.js +1 -3
  396. package/lib/network/reqresp/index.js.map +1 -1
  397. package/lib/network/reqresp/rateLimit.js +11 -5
  398. package/lib/network/reqresp/rateLimit.js.map +1 -1
  399. package/lib/network/reqresp/utils/dataColumnResponseValidation.js +8 -4
  400. package/lib/network/reqresp/utils/dataColumnResponseValidation.js.map +1 -1
  401. package/lib/network/statusCache.js +1 -0
  402. package/lib/network/statusCache.js.map +1 -1
  403. package/lib/network/subnets/attnetsService.js +73 -65
  404. package/lib/network/subnets/attnetsService.js.map +1 -1
  405. package/lib/network/subnets/interface.js +1 -1
  406. package/lib/network/subnets/interface.js.map +1 -1
  407. package/lib/network/subnets/syncnetsService.js +29 -22
  408. package/lib/network/subnets/syncnetsService.js.map +1 -1
  409. package/lib/network/subnets/util.js +1 -2
  410. package/lib/network/subnets/util.js.map +1 -1
  411. package/lib/node/nodejs.d.ts +1 -1
  412. package/lib/node/nodejs.js +15 -0
  413. package/lib/node/nodejs.js.map +1 -1
  414. package/lib/node/notifier.js +1 -2
  415. package/lib/node/notifier.js.map +1 -1
  416. package/lib/node/options.js.map +1 -1
  417. package/lib/node/utils/interop/state.js +1 -2
  418. package/lib/node/utils/interop/state.js.map +1 -1
  419. package/lib/sync/backfill/backfill.d.ts +1 -1
  420. package/lib/sync/backfill/backfill.js +58 -16
  421. package/lib/sync/backfill/backfill.js.map +1 -1
  422. package/lib/sync/constants.d.ts +2 -1
  423. package/lib/sync/constants.js +2 -1
  424. package/lib/sync/constants.js.map +1 -1
  425. package/lib/sync/interface.d.ts +1 -59
  426. package/lib/sync/interface.js +0 -20
  427. package/lib/sync/interface.js.map +1 -1
  428. package/lib/sync/options.d.ts +1 -1
  429. package/lib/sync/range/batch.d.ts +48 -32
  430. package/lib/sync/range/batch.js +201 -55
  431. package/lib/sync/range/batch.js.map +1 -1
  432. package/lib/sync/range/chain.d.ts +15 -10
  433. package/lib/sync/range/chain.js +141 -70
  434. package/lib/sync/range/chain.js.map +1 -1
  435. package/lib/sync/range/range.d.ts +3 -3
  436. package/lib/sync/range/range.js +86 -54
  437. package/lib/sync/range/range.js.map +1 -1
  438. package/lib/sync/range/utils/hashBlocks.d.ts +2 -2
  439. package/lib/sync/range/utils/hashBlocks.js +6 -4
  440. package/lib/sync/range/utils/hashBlocks.js.map +1 -1
  441. package/lib/sync/range/utils/peerBalancer.js +18 -13
  442. package/lib/sync/range/utils/peerBalancer.js.map +1 -1
  443. package/lib/sync/sync.d.ts +1 -2
  444. package/lib/sync/sync.js +95 -87
  445. package/lib/sync/sync.js.map +1 -1
  446. package/lib/sync/types.d.ts +44 -0
  447. package/lib/sync/types.js +34 -0
  448. package/lib/sync/types.js.map +1 -0
  449. package/lib/sync/unknownBlock.d.ts +42 -28
  450. package/lib/sync/unknownBlock.js +404 -458
  451. package/lib/sync/unknownBlock.js.map +1 -1
  452. package/lib/sync/utils/downloadByRange.d.ts +186 -0
  453. package/lib/sync/utils/downloadByRange.js +457 -0
  454. package/lib/sync/utils/downloadByRange.js.map +1 -0
  455. package/lib/sync/utils/downloadByRoot.d.ts +119 -0
  456. package/lib/sync/utils/downloadByRoot.js +319 -0
  457. package/lib/sync/utils/downloadByRoot.js.map +1 -0
  458. package/lib/sync/utils/pendingBlocksTree.d.ts +14 -6
  459. package/lib/sync/utils/pendingBlocksTree.js +24 -18
  460. package/lib/sync/utils/pendingBlocksTree.js.map +1 -1
  461. package/lib/util/array.js +7 -3
  462. package/lib/util/array.js.map +1 -1
  463. package/lib/util/asyncIterableToEvents.js +6 -3
  464. package/lib/util/asyncIterableToEvents.js.map +1 -1
  465. package/lib/util/binarySearch.js +2 -0
  466. package/lib/util/binarySearch.js.map +1 -1
  467. package/lib/util/blobs.d.ts +2 -2
  468. package/lib/util/blobs.js +4 -4
  469. package/lib/util/blobs.js.map +1 -1
  470. package/lib/util/bufferPool.js +7 -2
  471. package/lib/util/bufferPool.js.map +1 -1
  472. package/lib/util/clock.d.ts +1 -1
  473. package/lib/util/clock.js +23 -18
  474. package/lib/util/clock.js.map +1 -1
  475. package/lib/util/dataColumns.d.ts +13 -10
  476. package/lib/util/dataColumns.js +92 -134
  477. package/lib/util/dataColumns.js.map +1 -1
  478. package/lib/util/execution.d.ts +20 -0
  479. package/lib/util/execution.js +148 -0
  480. package/lib/util/execution.js.map +1 -0
  481. package/lib/util/itTrigger.js +4 -4
  482. package/lib/util/itTrigger.js.map +1 -1
  483. package/lib/util/map.js +2 -0
  484. package/lib/util/map.js.map +1 -1
  485. package/lib/util/queue/index.d.ts +1 -1
  486. package/lib/util/queue/index.js +1 -1
  487. package/lib/util/queue/index.js.map +1 -1
  488. package/lib/util/queue/itemQueue.js +52 -49
  489. package/lib/util/queue/itemQueue.js.map +1 -1
  490. package/lib/util/serializedCache.js +1 -3
  491. package/lib/util/serializedCache.js.map +1 -1
  492. package/lib/util/set.js +2 -0
  493. package/lib/util/set.js.map +1 -1
  494. package/lib/util/sszBytes.d.ts +1 -0
  495. package/lib/util/sszBytes.js +1 -1
  496. package/lib/util/sszBytes.js.map +1 -1
  497. package/lib/util/timeSeries.js +3 -1
  498. package/lib/util/timeSeries.js.map +1 -1
  499. package/lib/util/types.d.ts +1 -1
  500. package/lib/util/types.js +2 -2
  501. package/lib/util/types.js.map +1 -1
  502. package/lib/util/wrapError.d.ts +7 -0
  503. package/package.json +22 -16
  504. package/lib/chain/seenCache/seenBlockInput.d.ts +0 -84
  505. package/lib/chain/seenCache/seenBlockInput.js +0 -225
  506. package/lib/chain/seenCache/seenBlockInput.js.map +0 -1
  507. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.d.ts +0 -28
  508. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js +0 -328
  509. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRange.js.map +0 -1
  510. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.d.ts +0 -49
  511. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js +0 -499
  512. package/lib/network/reqresp/beaconBlocksMaybeBlobsByRoot.js.map +0 -1
@@ -21,7 +21,7 @@ export function verifyBlocksSanityChecks(chain, blocks, opts) {
21
21
  const parentSlots = [];
22
22
  let parentBlock = null;
23
23
  for (const blockInput of blocks) {
24
- const { block } = blockInput;
24
+ const block = blockInput.getBlock();
25
25
  const blockSlot = block.message.slot;
26
26
  const blockHash = toRootHex(chain.config.getForkTypes(block.message.slot).BeaconBlock.hashTreeRoot(block.message));
27
27
  if (chain.blacklistedBlocks.has(blockHash)) {
@@ -56,7 +56,7 @@ export function verifyBlocksSanityChecks(chain, blocks, opts) {
56
56
  const relevantLastBlock = relevantBlocks.at(-1);
57
57
  let parentBlockSlot;
58
58
  if (relevantLastBlock) {
59
- parentBlockSlot = relevantLastBlock.block.message.slot;
59
+ parentBlockSlot = relevantLastBlock.getBlock().message.slot;
60
60
  }
61
61
  else {
62
62
  // When importing a block segment, only the first NON-IGNORED block must be known to the fork-choice.
@@ -1 +1 @@
1
- {"version":3,"file":"verifyBlocksSanityChecks.js","sourceRoot":"","sources":["../../../src/chain/blocks/verifyBlocksSanityChecks.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"verifyBlocksSanityChecks.js","sourceRoot":"","sources":["../../../src/chain/blocks/verifyBlocksSanityChecks.ts"],"names":[],"mappings":"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"}
@@ -3,7 +3,8 @@ import { Logger } from "@lodestar/utils";
3
3
  import { Metrics } from "../../metrics/index.js";
4
4
  import { BlockProcessOpts } from "../options.js";
5
5
  import { ValidatorMonitor } from "../validatorMonitor.js";
6
- import { BlockInput, ImportBlockOpts } from "./types.js";
6
+ import { IBlockInput } from "./blockInput/index.js";
7
+ import { ImportBlockOpts } from "./types.js";
7
8
  /**
8
9
  * Verifies 1 or more blocks are fully valid running the full state transition; from a linear sequence of blocks.
9
10
  *
@@ -12,7 +13,7 @@ import { BlockInput, ImportBlockOpts } from "./types.js";
12
13
  * - STFN - per_block_processing()
13
14
  * - Check state root matches
14
15
  */
15
- export declare function verifyBlocksStateTransitionOnly(preState0: CachedBeaconStateAllForks, blocks: BlockInput[], dataAvailabilityStatuses: DataAvailabilityStatus[], logger: Logger, metrics: Metrics | null, validatorMonitor: ValidatorMonitor | null, signal: AbortSignal, opts: BlockProcessOpts & ImportBlockOpts): Promise<{
16
+ export declare function verifyBlocksStateTransitionOnly(preState0: CachedBeaconStateAllForks, blocks: IBlockInput[], dataAvailabilityStatuses: DataAvailabilityStatus[], logger: Logger, metrics: Metrics | null, validatorMonitor: ValidatorMonitor | null, signal: AbortSignal, opts: BlockProcessOpts & ImportBlockOpts): Promise<{
16
17
  postStates: CachedBeaconStateAllForks[];
17
18
  proposerBalanceDeltas: number[];
18
19
  verifyStateTime: number;
@@ -17,7 +17,7 @@ export async function verifyBlocksStateTransitionOnly(preState0, blocks, dataAva
17
17
  const recvToValLatency = Date.now() / 1000 - (opts.seenTimestampSec ?? Date.now() / 1000);
18
18
  for (let i = 0; i < blocks.length; i++) {
19
19
  const { validProposerSignature, validSignatures } = opts;
20
- const { block } = blocks[i];
20
+ const block = blocks[i].getBlock();
21
21
  const preState = i === 0 ? preState0 : postStates[i - 1];
22
22
  const dataAvailabilityStatus = dataAvailabilityStatuses[i];
23
23
  // STFN - per_slot_processing() + per_block_processing()
@@ -65,7 +65,7 @@ export async function verifyBlocksStateTransitionOnly(preState0, blocks, dataAva
65
65
  }
66
66
  const verifyStateTime = Date.now();
67
67
  if (blocks.length === 1 && opts.seenTimestampSec !== undefined) {
68
- const slot = blocks[0].block.message.slot;
68
+ const slot = blocks[0].getBlock().message.slot;
69
69
  const recvToValidation = verifyStateTime / 1000 - opts.seenTimestampSec;
70
70
  const validationTime = recvToValidation - recvToValLatency;
71
71
  metrics?.gossipBlock.stateTransition.recvToValidation.observe(recvToValidation);
@@ -1 +1 @@
1
- {"version":3,"file":"verifyBlocksStateTransitionOnly.js","sourceRoot":"","sources":["../../../src/chain/blocks/verifyBlocksStateTransitionOnly.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"verifyBlocksStateTransitionOnly.js","sourceRoot":"","sources":["../../../src/chain/blocks/verifyBlocksStateTransitionOnly.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,5 @@
1
1
  import { BeaconChain } from "../chain.js";
2
- import { BlockInput } from "./types.js";
2
+ import { IBlockInput } from "./blockInput/index.js";
3
3
  /**
4
4
  * Persists block input data to DB. This operation must be eventually completed if a block is imported to the fork-choice.
5
5
  * Else the node will be in an inconsistent state that can lead to being stuck.
@@ -7,9 +7,9 @@ import { BlockInput } from "./types.js";
7
7
  * This operation may be performed before, during or after importing to the fork-choice. As long as errors
8
8
  * are handled properly for eventual consistency.
9
9
  */
10
- export declare function writeBlockInputToDb(this: BeaconChain, blocksInput: BlockInput[]): Promise<void>;
10
+ export declare function writeBlockInputToDb(this: BeaconChain, blocksInputs: IBlockInput[]): Promise<void>;
11
11
  /**
12
12
  * Prunes eagerly persisted block inputs only if not known to the fork-choice
13
13
  */
14
- export declare function removeEagerlyPersistedBlockInputs(this: BeaconChain, blockInputs: BlockInput[]): Promise<void>;
14
+ export declare function removeEagerlyPersistedBlockInputs(this: BeaconChain, blockInputs: IBlockInput[]): Promise<void>;
15
15
  //# sourceMappingURL=writeBlockInputToDb.d.ts.map
@@ -1,6 +1,6 @@
1
- import { ForkName, isForkPostDeneb, isForkPostFulu } from "@lodestar/params";
2
- import { prettyPrintIndices, toHex, toRootHex } from "@lodestar/utils";
3
- import { BlockInputType } from "./types.js";
1
+ import { prettyPrintIndices, toRootHex } from "@lodestar/utils";
2
+ import { isBlockInputBlobs, isBlockInputColumns } from "./blockInput/index.js";
3
+ import { BLOB_AVAILABILITY_TIMEOUT } from "./verifyBlocksDataAvailability.js";
4
4
  /**
5
5
  * Persists block input data to DB. This operation must be eventually completed if a block is imported to the fork-choice.
6
6
  * Else the node will be in an inconsistent state that can lead to being stuck.
@@ -8,10 +8,14 @@ import { BlockInputType } from "./types.js";
8
8
  * This operation may be performed before, during or after importing to the fork-choice. As long as errors
9
9
  * are handled properly for eventual consistency.
10
10
  */
11
- export async function writeBlockInputToDb(blocksInput) {
11
+ export async function writeBlockInputToDb(blocksInputs) {
12
12
  const fnPromises = [];
13
- for (const blockInput of blocksInput) {
14
- const { block } = blockInput;
13
+ // track slots for logging
14
+ const slots = [];
15
+ for (const blockInput of blocksInputs) {
16
+ const block = blockInput.getBlock();
17
+ const slot = block.message.slot;
18
+ slots.push(slot);
15
19
  const blockRoot = this.config.getForkTypes(block.message.slot).BeaconBlock.hashTreeRoot(block.message);
16
20
  const blockRootHex = toRootHex(blockRoot);
17
21
  const blockBytes = this.serializedCache.get(block);
@@ -29,50 +33,48 @@ export async function writeBlockInputToDb(blocksInput) {
29
33
  root: blockRootHex,
30
34
  inputType: blockInput.type,
31
35
  });
32
- if (blockInput.type === BlockInputType.availableData || blockInput.type === BlockInputType.dataPromise) {
33
- const blockData = blockInput.type === BlockInputType.availableData
34
- ? blockInput.blockData
35
- : await blockInput.cachedData.availabilityPromise;
36
- // NOTE: Old data is pruned on archive
37
- if (isForkPostFulu(blockData.fork)) {
38
- const { custodyConfig } = this;
39
- const { custodyColumns } = custodyConfig;
40
- const blobsLen = block.message.body.blobKzgCommitments.length;
41
- let dataColumnsLen;
42
- if (blobsLen === 0) {
43
- dataColumnsLen = 0;
44
- }
45
- else {
46
- dataColumnsLen = custodyColumns.length;
47
- }
48
- const blockDataColumns = blockData.dataColumns;
49
- const dataColumnSidecars = blockDataColumns.filter((dataColumnSidecar) => custodyColumns.includes(dataColumnSidecar.index));
50
- if (dataColumnSidecars.length !== dataColumnsLen) {
51
- throw Error(`Invalid dataColumnSidecars=${dataColumnSidecars.length} for custody expected custodyColumnsLen=${dataColumnsLen}`);
52
- }
53
- fnPromises.push(this.db.dataColumnSidecar.putMany(blockRoot, dataColumnSidecars));
54
- this.logger.debug("Persisted dataColumnSidecars to hot DB", {
55
- dataColumnSidecars: dataColumnSidecars.length,
56
- slot: block.message.slot,
57
- root: blockRootHex,
58
- });
36
+ if (!blockInput.hasAllData()) {
37
+ await blockInput.waitForAllData(BLOB_AVAILABILITY_TIMEOUT);
38
+ }
39
+ // NOTE: Old data is pruned on archive
40
+ if (isBlockInputColumns(blockInput)) {
41
+ const { custodyColumns } = this.custodyConfig;
42
+ const blobsLen = block.message.body.blobKzgCommitments.length;
43
+ let dataColumnsLen;
44
+ if (blobsLen === 0) {
45
+ dataColumnsLen = 0;
46
+ }
47
+ else {
48
+ dataColumnsLen = custodyColumns.length;
59
49
  }
60
- else if (isForkPostDeneb(blockData.fork)) {
61
- const blobSidecars = blockData.blobs;
62
- fnPromises.push(this.db.blobSidecars.add({ blockRoot, slot: block.message.slot, blobSidecars }));
63
- this.logger.debug("Persisted blobSidecars to hot DB", {
64
- blobsLen: blobSidecars.length,
65
- slot: block.message.slot,
66
- root: blockRootHex,
67
- });
50
+ const dataColumnSidecars = blockInput.getCustodyColumns();
51
+ if (dataColumnSidecars.length !== dataColumnsLen) {
52
+ this.logger.debug(`Invalid dataColumnSidecars=${dataColumnSidecars.length} for custody expected custodyColumnsLen=${dataColumnsLen}`);
68
53
  }
54
+ fnPromises.push(this.db.dataColumnSidecar.putMany(blockRoot, dataColumnSidecars));
55
+ this.logger.debug("Persisted dataColumnSidecars to hot DB", {
56
+ slot: block.message.slot,
57
+ root: blockRootHex,
58
+ dataColumnSidecars: dataColumnSidecars.length,
59
+ numBlobs: blobsLen,
60
+ custodyColumns: custodyColumns.length,
61
+ });
69
62
  }
63
+ else if (isBlockInputBlobs(blockInput)) {
64
+ const blobSidecars = blockInput.getBlobs();
65
+ fnPromises.push(this.db.blobSidecars.add({ blockRoot, slot: block.message.slot, blobSidecars }));
66
+ this.logger.debug("Persisted blobSidecars to hot DB", {
67
+ blobsLen: blobSidecars.length,
68
+ slot: block.message.slot,
69
+ root: blockRootHex,
70
+ });
71
+ }
72
+ await Promise.all(fnPromises);
73
+ this.logger.debug("Persisted blocksInput to db", {
74
+ blocksInput: blocksInputs.length,
75
+ slots: prettyPrintIndices(slots),
76
+ });
70
77
  }
71
- await Promise.all(fnPromises);
72
- this.logger.debug("Persisted blocksInput to db", {
73
- blocksInput: blocksInput.length,
74
- slots: prettyPrintIndices(blocksInput.map((blockInput) => blockInput.block.message.slot)),
75
- });
76
78
  }
77
79
  /**
78
80
  * Prunes eagerly persisted block inputs only if not known to the fork-choice
@@ -82,28 +84,24 @@ export async function removeEagerlyPersistedBlockInputs(blockInputs) {
82
84
  const blobsToRemove = [];
83
85
  const dataColumnsToRemove = [];
84
86
  for (const blockInput of blockInputs) {
85
- const { block, type } = blockInput;
87
+ const block = blockInput.getBlock();
86
88
  const slot = block.message.slot;
87
89
  const blockRoot = this.config.getForkTypes(slot).BeaconBlock.hashTreeRoot(block.message);
88
- const blockRootHex = toHex(blockRoot);
90
+ const blockRootHex = toRootHex(blockRoot);
89
91
  if (!this.forkChoice.hasBlockHex(blockRootHex)) {
90
92
  blockToRemove.push(block);
91
- if (type === BlockInputType.availableData) {
92
- const { blockData } = blockInput;
93
- if (blockData.fork === ForkName.deneb || blockData.fork === ForkName.electra) {
94
- const blobSidecars = blockData.blobs;
95
- blobsToRemove.push({ blockRoot, slot, blobSidecars });
96
- }
97
- else {
98
- const { custodyConfig } = this;
99
- const { custodyColumns } = custodyConfig;
100
- const dataColumnsLen = custodyColumns.length;
101
- const dataColumnSidecars = blockData.dataColumns.filter((dataColumnSidecar) => custodyColumns.includes(dataColumnSidecar.index));
102
- if (dataColumnSidecars.length !== dataColumnsLen) {
103
- throw Error(`Invalid dataColumnSidecars=${dataColumnSidecars.length} for custody expected custodyColumnsLen=${dataColumnsLen}`);
104
- }
105
- dataColumnsToRemove.push(blockRoot);
93
+ if (isBlockInputColumns(blockInput)) {
94
+ const { custodyColumns } = this.custodyConfig;
95
+ const dataColumnsLen = custodyColumns.length;
96
+ const dataColumnSidecars = blockInput.getCustodyColumns();
97
+ if (dataColumnSidecars.length !== dataColumnsLen) {
98
+ throw Error(`Invalid dataColumnSidecars=${dataColumnSidecars.length} for custody expected custodyColumnsLen=${dataColumnsLen}`);
106
99
  }
100
+ dataColumnsToRemove.push(blockRoot);
101
+ }
102
+ else if (isBlockInputBlobs(blockInput)) {
103
+ const blobSidecars = blockInput.getBlobs();
104
+ blobsToRemove.push({ blockRoot, slot, blobSidecars });
107
105
  }
108
106
  }
109
107
  }
@@ -1 +1 @@
1
- {"version":3,"file":"writeBlockInputToDb.js","sourceRoot":"","sources":["../../../src/chain/blocks/writeBlockInputToDb.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"writeBlockInputToDb.js","sourceRoot":"","sources":["../../../src/chain/blocks/writeBlockInputToDb.ts"],"names":[],"mappings":"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"}