@lodestar/beacon-node 1.50.0-dev.c04a499311 → 1.50.0-dev.c24762bc60

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 (228) hide show
  1. package/lib/api/impl/beacon/index.d.ts.map +1 -1
  2. package/lib/api/impl/beacon/index.js +13 -0
  3. package/lib/api/impl/beacon/index.js.map +1 -1
  4. package/lib/api/impl/beacon/state/index.d.ts.map +1 -1
  5. package/lib/api/impl/beacon/state/index.js +28 -6
  6. package/lib/api/impl/beacon/state/index.js.map +1 -1
  7. package/lib/api/impl/debug/index.d.ts.map +1 -1
  8. package/lib/api/impl/debug/index.js +26 -18
  9. package/lib/api/impl/debug/index.js.map +1 -1
  10. package/lib/api/impl/validator/index.d.ts.map +1 -1
  11. package/lib/api/impl/validator/index.js +32 -0
  12. package/lib/api/impl/validator/index.js.map +1 -1
  13. package/lib/chain/archiveStore/archiveStore.d.ts +5 -0
  14. package/lib/chain/archiveStore/archiveStore.d.ts.map +1 -1
  15. package/lib/chain/archiveStore/archiveStore.js +13 -23
  16. package/lib/chain/archiveStore/archiveStore.js.map +1 -1
  17. package/lib/chain/archiveStore/utils/pruneHistory.d.ts +1 -1
  18. package/lib/chain/archiveStore/utils/pruneHistory.d.ts.map +1 -1
  19. package/lib/chain/archiveStore/utils/pruneHistory.js +2 -1
  20. package/lib/chain/archiveStore/utils/pruneHistory.js.map +1 -1
  21. package/lib/chain/beaconProposerCache.d.ts +6 -0
  22. package/lib/chain/beaconProposerCache.d.ts.map +1 -1
  23. package/lib/chain/beaconProposerCache.js +16 -0
  24. package/lib/chain/beaconProposerCache.js.map +1 -1
  25. package/lib/chain/blocks/importBlock.d.ts.map +1 -1
  26. package/lib/chain/blocks/importBlock.js +14 -8
  27. package/lib/chain/blocks/importBlock.js.map +1 -1
  28. package/lib/chain/blocks/verifyBlock.d.ts.map +1 -1
  29. package/lib/chain/blocks/verifyBlock.js +6 -6
  30. package/lib/chain/blocks/verifyBlock.js.map +1 -1
  31. package/lib/chain/chain.d.ts +5 -1
  32. package/lib/chain/chain.d.ts.map +1 -1
  33. package/lib/chain/chain.js +73 -20
  34. package/lib/chain/chain.js.map +1 -1
  35. package/lib/chain/interface.d.ts +3 -0
  36. package/lib/chain/interface.d.ts.map +1 -1
  37. package/lib/chain/opPools/aggregatedAttestationPool.d.ts +4 -2
  38. package/lib/chain/opPools/aggregatedAttestationPool.d.ts.map +1 -1
  39. package/lib/chain/opPools/aggregatedAttestationPool.js +30 -8
  40. package/lib/chain/opPools/aggregatedAttestationPool.js.map +1 -1
  41. package/lib/chain/opPools/opPool.d.ts.map +1 -1
  42. package/lib/chain/opPools/opPool.js +1 -23
  43. package/lib/chain/opPools/opPool.js.map +1 -1
  44. package/lib/chain/opPools/proposerPreferencesPool.d.ts +8 -4
  45. package/lib/chain/opPools/proposerPreferencesPool.d.ts.map +1 -1
  46. package/lib/chain/opPools/proposerPreferencesPool.js +27 -12
  47. package/lib/chain/opPools/proposerPreferencesPool.js.map +1 -1
  48. package/lib/chain/opPools/utils.d.ts +11 -0
  49. package/lib/chain/opPools/utils.d.ts.map +1 -1
  50. package/lib/chain/opPools/utils.js +22 -0
  51. package/lib/chain/opPools/utils.js.map +1 -1
  52. package/lib/chain/options.d.ts +1 -0
  53. package/lib/chain/options.d.ts.map +1 -1
  54. package/lib/chain/prepareNextSlot.d.ts.map +1 -1
  55. package/lib/chain/prepareNextSlot.js +11 -3
  56. package/lib/chain/prepareNextSlot.js.map +1 -1
  57. package/lib/chain/produceBlock/produceBlockBody.d.ts +8 -0
  58. package/lib/chain/produceBlock/produceBlockBody.d.ts.map +1 -1
  59. package/lib/chain/produceBlock/produceBlockBody.js +40 -28
  60. package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
  61. package/lib/chain/seenCache/seenGossipBlockInput.d.ts +7 -0
  62. package/lib/chain/seenCache/seenGossipBlockInput.d.ts.map +1 -1
  63. package/lib/chain/seenCache/seenGossipBlockInput.js +21 -0
  64. package/lib/chain/seenCache/seenGossipBlockInput.js.map +1 -1
  65. package/lib/chain/shufflingCache.d.ts +18 -8
  66. package/lib/chain/shufflingCache.d.ts.map +1 -1
  67. package/lib/chain/shufflingCache.js +72 -18
  68. package/lib/chain/shufflingCache.js.map +1 -1
  69. package/lib/db/beacon.d.ts +4 -1
  70. package/lib/db/beacon.d.ts.map +1 -1
  71. package/lib/db/beacon.js +6 -1
  72. package/lib/db/beacon.js.map +1 -1
  73. package/lib/db/buckets.d.ts +3 -1
  74. package/lib/db/buckets.d.ts.map +1 -1
  75. package/lib/db/buckets.js +2 -0
  76. package/lib/db/buckets.js.map +1 -1
  77. package/lib/db/interface.d.ts +4 -1
  78. package/lib/db/interface.d.ts.map +1 -1
  79. package/lib/db/repositories/blockArchiveIndex.d.ts +2 -2
  80. package/lib/db/repositories/blockArchiveIndex.d.ts.map +1 -1
  81. package/lib/db/repositories/earliestAvailableSlot.d.ts +11 -0
  82. package/lib/db/repositories/earliestAvailableSlot.d.ts.map +1 -0
  83. package/lib/db/repositories/earliestAvailableSlot.js +19 -0
  84. package/lib/db/repositories/earliestAvailableSlot.js.map +1 -0
  85. package/lib/db/repositories/index.d.ts +1 -0
  86. package/lib/db/repositories/index.d.ts.map +1 -1
  87. package/lib/db/repositories/index.js +1 -0
  88. package/lib/db/repositories/index.js.map +1 -1
  89. package/lib/db/repositories/proposerPreferences.d.ts +14 -0
  90. package/lib/db/repositories/proposerPreferences.d.ts.map +1 -0
  91. package/lib/db/repositories/proposerPreferences.js +21 -0
  92. package/lib/db/repositories/proposerPreferences.js.map +1 -0
  93. package/lib/execution/engine/blobVersionedHashes.d.ts +9 -0
  94. package/lib/execution/engine/blobVersionedHashes.d.ts.map +1 -0
  95. package/lib/execution/engine/blobVersionedHashes.js +74 -0
  96. package/lib/execution/engine/blobVersionedHashes.js.map +1 -0
  97. package/lib/execution/engine/http.d.ts +45 -13
  98. package/lib/execution/engine/http.d.ts.map +1 -1
  99. package/lib/execution/engine/http.js +236 -198
  100. package/lib/execution/engine/http.js.map +1 -1
  101. package/lib/execution/engine/index.d.ts +3 -2
  102. package/lib/execution/engine/index.d.ts.map +1 -1
  103. package/lib/execution/engine/index.js +33 -8
  104. package/lib/execution/engine/index.js.map +1 -1
  105. package/lib/execution/engine/interface.d.ts +1 -1
  106. package/lib/execution/engine/interface.d.ts.map +1 -1
  107. package/lib/execution/engine/jsonRpcTransport.d.ts +25 -0
  108. package/lib/execution/engine/jsonRpcTransport.d.ts.map +1 -0
  109. package/lib/execution/engine/jsonRpcTransport.js +158 -0
  110. package/lib/execution/engine/jsonRpcTransport.js.map +1 -0
  111. package/lib/execution/engine/restHttpClient.d.ts +71 -0
  112. package/lib/execution/engine/restHttpClient.d.ts.map +1 -0
  113. package/lib/execution/engine/restHttpClient.js +201 -0
  114. package/lib/execution/engine/restHttpClient.js.map +1 -0
  115. package/lib/execution/engine/restTransport.d.ts +46 -0
  116. package/lib/execution/engine/restTransport.d.ts.map +1 -0
  117. package/lib/execution/engine/restTransport.js +399 -0
  118. package/lib/execution/engine/restTransport.js.map +1 -0
  119. package/lib/execution/engine/sszTypes.d.ts +1261 -0
  120. package/lib/execution/engine/sszTypes.d.ts.map +1 -0
  121. package/lib/execution/engine/sszTypes.js +216 -0
  122. package/lib/execution/engine/sszTypes.js.map +1 -0
  123. package/lib/execution/engine/transport.d.ts +39 -0
  124. package/lib/execution/engine/transport.d.ts.map +1 -0
  125. package/lib/execution/engine/transport.js +2 -0
  126. package/lib/execution/engine/transport.js.map +1 -0
  127. package/lib/execution/engine/types.d.ts +2 -0
  128. package/lib/execution/engine/types.d.ts.map +1 -1
  129. package/lib/execution/engine/types.js +24 -57
  130. package/lib/execution/engine/types.js.map +1 -1
  131. package/lib/execution/engine/utils.d.ts.map +1 -1
  132. package/lib/execution/engine/utils.js +9 -2
  133. package/lib/execution/engine/utils.js.map +1 -1
  134. package/lib/metrics/metrics/lodestar.d.ts +10 -0
  135. package/lib/metrics/metrics/lodestar.d.ts.map +1 -1
  136. package/lib/metrics/metrics/lodestar.js +22 -0
  137. package/lib/metrics/metrics/lodestar.js.map +1 -1
  138. package/lib/network/core/events.d.ts +5 -1
  139. package/lib/network/core/events.d.ts.map +1 -1
  140. package/lib/network/core/events.js +8 -0
  141. package/lib/network/core/events.js.map +1 -1
  142. package/lib/network/processor/gossipHandlers.d.ts.map +1 -1
  143. package/lib/network/processor/gossipHandlers.js +60 -64
  144. package/lib/network/processor/gossipHandlers.js.map +1 -1
  145. package/lib/node/nodejs.d.ts +3 -1
  146. package/lib/node/nodejs.d.ts.map +1 -1
  147. package/lib/node/nodejs.js +2 -1
  148. package/lib/node/nodejs.js.map +1 -1
  149. package/lib/node/options.d.ts +3 -2
  150. package/lib/node/options.d.ts.map +1 -1
  151. package/lib/node/options.js +2 -2
  152. package/lib/node/options.js.map +1 -1
  153. package/lib/sync/range/batch.d.ts +5 -5
  154. package/lib/sync/range/batch.d.ts.map +1 -1
  155. package/lib/sync/range/batch.js +11 -17
  156. package/lib/sync/range/batch.js.map +1 -1
  157. package/lib/sync/range/chain.d.ts +4 -4
  158. package/lib/sync/range/chain.d.ts.map +1 -1
  159. package/lib/sync/range/chain.js +9 -5
  160. package/lib/sync/range/chain.js.map +1 -1
  161. package/lib/sync/range/range.d.ts.map +1 -1
  162. package/lib/sync/range/range.js +25 -11
  163. package/lib/sync/range/range.js.map +1 -1
  164. package/lib/sync/unknownBlock.d.ts +5 -2
  165. package/lib/sync/unknownBlock.d.ts.map +1 -1
  166. package/lib/sync/unknownBlock.js +44 -20
  167. package/lib/sync/unknownBlock.js.map +1 -1
  168. package/lib/sync/utils/downloadByRange.d.ts +38 -14
  169. package/lib/sync/utils/downloadByRange.d.ts.map +1 -1
  170. package/lib/sync/utils/downloadByRange.js +84 -39
  171. package/lib/sync/utils/downloadByRange.js.map +1 -1
  172. package/lib/util/asyncIterableToEvents.d.ts +10 -2
  173. package/lib/util/asyncIterableToEvents.d.ts.map +1 -1
  174. package/lib/util/asyncIterableToEvents.js +29 -3
  175. package/lib/util/asyncIterableToEvents.js.map +1 -1
  176. package/lib/util/metadata.d.ts.map +1 -1
  177. package/lib/util/metadata.js +2 -1
  178. package/lib/util/metadata.js.map +1 -1
  179. package/package.json +17 -16
  180. package/src/api/impl/beacon/index.ts +15 -0
  181. package/src/api/impl/beacon/state/index.ts +43 -6
  182. package/src/api/impl/debug/index.ts +28 -19
  183. package/src/api/impl/validator/index.ts +45 -0
  184. package/src/chain/archiveStore/archiveStore.ts +18 -24
  185. package/src/chain/archiveStore/utils/pruneHistory.ts +4 -1
  186. package/src/chain/beaconProposerCache.ts +19 -1
  187. package/src/chain/blocks/importBlock.ts +17 -7
  188. package/src/chain/blocks/verifyBlock.ts +7 -6
  189. package/src/chain/chain.ts +97 -19
  190. package/src/chain/interface.ts +3 -0
  191. package/src/chain/opPools/aggregatedAttestationPool.ts +34 -10
  192. package/src/chain/opPools/opPool.ts +1 -31
  193. package/src/chain/opPools/proposerPreferencesPool.ts +34 -11
  194. package/src/chain/opPools/utils.ts +31 -0
  195. package/src/chain/options.ts +1 -1
  196. package/src/chain/prepareNextSlot.ts +15 -3
  197. package/src/chain/produceBlock/produceBlockBody.ts +68 -34
  198. package/src/chain/seenCache/seenGossipBlockInput.ts +23 -0
  199. package/src/chain/shufflingCache.ts +84 -22
  200. package/src/db/beacon.ts +6 -0
  201. package/src/db/buckets.ts +2 -0
  202. package/src/db/interface.ts +4 -0
  203. package/src/db/repositories/earliestAvailableSlot.ts +19 -0
  204. package/src/db/repositories/index.ts +1 -0
  205. package/src/db/repositories/proposerPreferences.ts +23 -0
  206. package/src/execution/engine/blobVersionedHashes.ts +72 -0
  207. package/src/execution/engine/http.ts +304 -271
  208. package/src/execution/engine/index.ts +41 -7
  209. package/src/execution/engine/interface.ts +1 -1
  210. package/src/execution/engine/jsonRpcTransport.ts +247 -0
  211. package/src/execution/engine/restHttpClient.ts +269 -0
  212. package/src/execution/engine/restTransport.ts +544 -0
  213. package/src/execution/engine/sszTypes.ts +354 -0
  214. package/src/execution/engine/transport.ts +61 -0
  215. package/src/execution/engine/types.ts +34 -74
  216. package/src/execution/engine/utils.ts +12 -2
  217. package/src/metrics/metrics/lodestar.ts +23 -0
  218. package/src/network/core/events.ts +16 -1
  219. package/src/network/processor/gossipHandlers.ts +91 -77
  220. package/src/node/nodejs.ts +4 -0
  221. package/src/node/options.ts +10 -1
  222. package/src/sync/range/batch.ts +14 -19
  223. package/src/sync/range/chain.ts +12 -7
  224. package/src/sync/range/range.ts +26 -12
  225. package/src/sync/unknownBlock.ts +57 -21
  226. package/src/sync/utils/downloadByRange.ts +123 -58
  227. package/src/util/asyncIterableToEvents.ts +44 -5
  228. package/src/util/metadata.ts +2 -1
@@ -77,6 +77,7 @@ import {IExecutionBuilder, IExecutionEngine, PayloadAttributes, PayloadId} from
77
77
  import {getShufflingDependentRoot} from "../../util/dependentRoot.js";
78
78
  import {fromGraffitiBytes} from "../../util/graffiti.js";
79
79
  import {kzg} from "../../util/kzg.js";
80
+ import {BeaconProposerCache} from "../beaconProposerCache.js";
80
81
  import type {BeaconChain} from "../chain.js";
81
82
  import {CommonBlockBody} from "../interface.js";
82
83
  import {ProposerPreferencesPool} from "../opPools/index.js";
@@ -286,10 +287,13 @@ export async function produceBlockBody<T extends BlockType>(
286
287
  // this into a completely separate function and have pre/post gloas more separated
287
288
  const safeBlockHash = getSafeExecutionBlockHash(this.forkChoice, this.logger);
288
289
  const finalizedBlockHash = getFinalizedExecutionBlockHash(this.forkChoice);
289
- // TODO GLOAS: post-Gloas, proposer feeRecipient is also carried (signed) in
290
- // ProposerPreferencesPool. Consider using this unified cache instead
291
- // see https://github.com/ChainSafe/lodestar/issues/9379
292
- const feeRecipient = requestedFeeRecipient ?? this.beaconProposerCache.getOrDefault(proposerIndex);
290
+ const {feeRecipient, feeRecipientType} = getProposerFeeRecipient(
291
+ requestedFeeRecipient,
292
+ getPooledProposerPreferences(this, blockSlot, parentBlock.blockRoot),
293
+ this.beaconProposerCache,
294
+ proposerIndex
295
+ );
296
+ Object.assign(logMeta, {feeRecipientType, feeRecipient});
293
297
 
294
298
  const endExecutionPayload = this.metrics?.executionBlockProductionTimeSteps.startTimer();
295
299
 
@@ -442,13 +446,12 @@ export async function produceBlockBody<T extends BlockType>(
442
446
 
443
447
  const safeBlockHash = getSafeExecutionBlockHash(this.forkChoice, this.logger);
444
448
  const finalizedBlockHash = getFinalizedExecutionBlockHash(this.forkChoice);
445
- const feeRecipient = requestedFeeRecipient ?? this.beaconProposerCache.getOrDefault(proposerIndex);
446
- const feeRecipientType = requestedFeeRecipient
447
- ? "requested"
448
- : this.beaconProposerCache.get(proposerIndex)
449
- ? "cached"
450
- : "default";
451
-
449
+ const {feeRecipient, feeRecipientType} = getProposerFeeRecipient(
450
+ requestedFeeRecipient,
451
+ null,
452
+ this.beaconProposerCache,
453
+ proposerIndex
454
+ );
452
455
  Object.assign(logMeta, {feeRecipientType, feeRecipient});
453
456
 
454
457
  if (blockType === BlockType.Blinded) {
@@ -974,9 +977,8 @@ function preparePayloadAttributes(
974
977
  * Resolve the proposer's preferred (target) gas limit for the Gloas `PayloadAttributesV4`
975
978
  * `targetGasLimit` field (consensus-specs#5235, execution-apis#796).
976
979
  *
977
- * Sourced from the `SignedProposerPreferences` the proposer's VC submitted to the pool
978
- * (same `(slot, dependent_root)` lookup as gossip bid validation). When no matching
979
- * preferences are pooled, target the parent payload's gas limit so the gas limit stays
980
+ * Sourced from the `SignedProposerPreferences` the proposer's VC submitted to the pool. When no
981
+ * matching preferences are pooled, target the parent payload's gas limit so the gas limit stays
980
982
  * unchanged (`is_gas_limit_target_compatible` then requires `gas_limit == parent_gas_limit`).
981
983
  *
982
984
  * The parent payload's gas_limit is read from fork choice — the variant matching
@@ -991,26 +993,9 @@ function getProposerTargetGasLimit(
991
993
  parentBlockHash: Bytes32
992
994
  ): bigint {
993
995
  const parentBlockRootHex = toRootHex(parentBlockRoot);
994
- const parentBlock = chain.forkChoice.getBlockHexDefaultStatus(parentBlockRootHex);
995
- const dependentRootHex = (() => {
996
- if (parentBlock === null) {
997
- return null;
998
- }
999
- try {
1000
- return getShufflingDependentRoot(
1001
- chain.forkChoice,
1002
- computeEpochAtSlot(prepareSlot),
1003
- computeEpochAtSlot(parentBlock.slot),
1004
- parentBlock
1005
- );
1006
- } catch {
1007
- return null;
1008
- }
1009
- })();
1010
-
1011
- const pref = dependentRootHex !== null ? chain.proposerPreferencesPool.get(prepareSlot, dependentRootHex) : null;
1012
- if (pref !== null) {
1013
- return pref.message.targetGasLimit;
996
+ const preferences = getPooledProposerPreferences(chain, prepareSlot, parentBlockRootHex);
997
+ if (preferences !== null) {
998
+ return preferences.targetGasLimit;
1014
999
  }
1015
1000
 
1016
1001
  const parentPayloadVariant = chain.forkChoice.getBlockHexAndBlockHash(parentBlockRootHex, toRootHex(parentBlockHash));
@@ -1022,6 +1007,55 @@ function getProposerTargetGasLimit(
1022
1007
  return BigInt(parentPayloadVariant.executionPayloadGasLimit);
1023
1008
  }
1024
1009
 
1010
+ /** The proposer's request wins over its signed preferences, which win over its registered proposer data */
1011
+ function getProposerFeeRecipient(
1012
+ requestedFeeRecipient: string | undefined,
1013
+ pooledPreferences: gloas.ProposerPreferences | null,
1014
+ beaconProposerCache: BeaconProposerCache,
1015
+ proposerIndex: ValidatorIndex
1016
+ ): {feeRecipient: string; feeRecipientType: "requested" | "preferences" | "cached" | "default"} {
1017
+ if (requestedFeeRecipient !== undefined) {
1018
+ return {feeRecipient: requestedFeeRecipient, feeRecipientType: "requested"};
1019
+ }
1020
+ if (pooledPreferences !== null) {
1021
+ return {feeRecipient: toHex(pooledPreferences.feeRecipient), feeRecipientType: "preferences"};
1022
+ }
1023
+ const cachedFeeRecipient = beaconProposerCache.get(proposerIndex);
1024
+ if (cachedFeeRecipient !== undefined) {
1025
+ return {feeRecipient: cachedFeeRecipient, feeRecipientType: "cached"};
1026
+ }
1027
+ return {feeRecipient: beaconProposerCache.getOrDefault(proposerIndex), feeRecipientType: "default"};
1028
+ }
1029
+
1030
+ /**
1031
+ * The preferences the proposer of `slot` signed for the branch of `parentBlockRoot`, the same
1032
+ * `(slot, dependent_root)` lookup as gossip bid validation. Null if none are pooled.
1033
+ */
1034
+ export function getPooledProposerPreferences(
1035
+ chain: {forkChoice: IForkChoice; proposerPreferencesPool: ProposerPreferencesPool},
1036
+ slot: Slot,
1037
+ parentBlockRootHex: RootHex
1038
+ ): gloas.ProposerPreferences | null {
1039
+ const parentBlock = chain.forkChoice.getBlockHexDefaultStatus(parentBlockRootHex);
1040
+ if (parentBlock === null) {
1041
+ return null;
1042
+ }
1043
+
1044
+ let dependentRootHex: RootHex;
1045
+ try {
1046
+ dependentRootHex = getShufflingDependentRoot(
1047
+ chain.forkChoice,
1048
+ computeEpochAtSlot(slot),
1049
+ computeEpochAtSlot(parentBlock.slot),
1050
+ parentBlock
1051
+ );
1052
+ } catch {
1053
+ return null;
1054
+ }
1055
+
1056
+ return chain.proposerPreferencesPool.get(slot, dependentRootHex)?.message ?? null;
1057
+ }
1058
+
1025
1059
  export async function produceCommonBlockBody<T extends BlockType>(
1026
1060
  this: BeaconChain,
1027
1061
  blockType: T,
@@ -111,6 +111,9 @@ export class SeenBlockInput {
111
111
  // there should only 1 block root per slot but we need to always compare against rootHex
112
112
  // and the signature to ensure we only skip verification if both match
113
113
  private verifiedProposerSignatures = new Map<Slot, Map<RootHex, BLSSignature>>();
114
+ // Roots of gossip blocks under validation, counted because blocks with the same root but different signatures
115
+ // can be validated concurrently
116
+ private validatingBlockRoots = new Map<RootHex, number>();
114
117
 
115
118
  constructor({
116
119
  config,
@@ -153,6 +156,26 @@ export class SeenBlockInput {
153
156
  return this.blockInputs.get(rootHex)?.hasBlock() ?? false;
154
157
  }
155
158
 
159
+ /**
160
+ * Mark a gossip block root as under validation, every call MUST be paired with `unmarkValidatingBlock()`
161
+ */
162
+ markValidatingBlock(rootHex: RootHex): void {
163
+ this.validatingBlockRoots.set(rootHex, (this.validatingBlockRoots.get(rootHex) ?? 0) + 1);
164
+ }
165
+
166
+ unmarkValidatingBlock(rootHex: RootHex): void {
167
+ const count = this.validatingBlockRoots.get(rootHex) ?? 0;
168
+ if (count <= 1) {
169
+ this.validatingBlockRoots.delete(rootHex);
170
+ } else {
171
+ this.validatingBlockRoots.set(rootHex, count - 1);
172
+ }
173
+ }
174
+
175
+ isValidatingBlock(rootHex: RootHex): boolean {
176
+ return this.validatingBlockRoots.has(rootHex);
177
+ }
178
+
156
179
  get(rootHex: RootHex): IBlockInput | undefined {
157
180
  return this.blockInputs.get(rootHex);
158
181
  }
@@ -7,14 +7,12 @@ import {
7
7
  getIndexedAttestation,
8
8
  } from "@lodestar/state-transition";
9
9
  import {Attestation, CommitteeIndex, Epoch, IndexedAttestation, RootHex, Slot} from "@lodestar/types";
10
- import {LodestarError, Logger, MapDef, pruneSetToMax} from "@lodestar/utils";
10
+ import {LodestarError, Logger, MapDef} from "@lodestar/utils";
11
11
  import {Metrics} from "../metrics/metrics.js";
12
12
 
13
13
  /**
14
- * Same value to CheckpointBalancesCache, with the assumption that we don't have to use it for old epochs. In the worse case:
15
- * - when loading state bytes from disk, we need to compute shuffling for all epochs (~1s as of Sep 2023)
16
- * - don't have shuffling to verify attestations, need to do 1 epoch transition to add shuffling to this cache. This never happens
17
- * with default chain option of maxSkipSlots = 32
14
+ * Lookahead duties, gossip validation, and block production need epochs n-1, n, and n+1 for current epoch n.
15
+ * Keep the 4 highest epochs so that it works for epoch rotation.
18
16
  **/
19
17
  const MAX_EPOCHS = 4;
20
18
 
@@ -37,24 +35,29 @@ type ShufflingCacheItem = {
37
35
  type PromiseCacheItem = {
38
36
  type: CacheItemType.promise;
39
37
  timeInsertedMs: number;
40
- promise: Promise<EpochShuffling>;
41
- resolveFn: (shuffling: EpochShuffling) => void;
38
+ /** Resolves to null if the promise is cancelled */
39
+ promise: Promise<EpochShuffling | null>;
40
+ resolveFn: (shuffling: EpochShuffling | null) => void;
42
41
  };
43
42
 
44
43
  type CacheItem = ShufflingCacheItem | PromiseCacheItem;
45
44
 
45
+ export enum ShufflingPromiseCancelReason {
46
+ regenError = "regen_error",
47
+ decisionRootMismatch = "decision_root_mismatch",
48
+ pruned = "pruned",
49
+ }
50
+
46
51
  export type ShufflingCacheOpts = {
47
52
  maxShufflingCacheEpochs?: number;
48
53
  };
49
54
 
50
55
  /**
51
- * A shuffling cache to help:
52
- * - get committee quickly for attestation verification
53
- * - if a shuffling is not available (which does not happen with default chain option of maxSkipSlots = 32), track a promise to make sure we don't compute the same shuffling twice
54
- * - skip computing shuffling when loading state bytes from disk
56
+ * Cache recent epoch shufflings for lookahead duties, gossip validation, and block production.
57
+ * Pending promises deduplicate computation of missing shufflings.
55
58
  */
56
59
  export class ShufflingCache {
57
- /** LRU cache implemented as a map, pruned every time we add an item */
60
+ /** Pruned to the `maxEpochs` highest epochs every time we add a shuffling */
58
61
  private readonly itemsByDecisionRootByEpoch: MapDef<Epoch, Map<RootHex, CacheItem>> = new MapDef(
59
62
  () => new Map<RootHex, CacheItem>()
60
63
  );
@@ -73,6 +76,9 @@ export class ShufflingCache {
73
76
  Array.from(this.itemsByDecisionRootByEpoch.values()).reduce((total, innerMap) => total + innerMap.size, 0)
74
77
  )
75
78
  );
79
+ metrics.shufflingCache.epochs.addCollect(() =>
80
+ metrics.shufflingCache.epochs.set(this.itemsByDecisionRootByEpoch.size)
81
+ );
76
82
  }
77
83
 
78
84
  this.maxEpochs = opts.maxShufflingCacheEpochs ?? MAX_EPOCHS;
@@ -97,8 +103,8 @@ export class ShufflingCache {
97
103
  `Too many shuffling promises: ${promiseCount}, shufflingEpoch: ${epoch}, decisionRootHex: ${decisionRoot}`
98
104
  );
99
105
  }
100
- let resolveFn: ((shuffling: EpochShuffling) => void) | null = null;
101
- const promise = new Promise<EpochShuffling>((resolve) => {
106
+ let resolveFn: ((shuffling: EpochShuffling | null) => void) | null = null;
107
+ const promise = new Promise<EpochShuffling | null>((resolve) => {
102
108
  resolveFn = resolve;
103
109
  });
104
110
  if (resolveFn === null) {
@@ -121,7 +127,7 @@ export class ShufflingCache {
121
127
  * Return null if we don't have a shuffling for this epoch and dependentRootHex.
122
128
  */
123
129
  async get(epoch: Epoch, decisionRoot: RootHex): Promise<EpochShuffling | null> {
124
- const cacheItem = this.itemsByDecisionRootByEpoch.getOrDefault(epoch).get(decisionRoot);
130
+ const cacheItem = this.itemsByDecisionRootByEpoch.get(epoch)?.get(decisionRoot);
125
131
  if (cacheItem === undefined) {
126
132
  this.metrics?.shufflingCache.miss.inc();
127
133
  return null;
@@ -136,12 +142,10 @@ export class ShufflingCache {
136
142
  }
137
143
 
138
144
  /**
139
- * Get a shuffling synchronously, return null if not present.
140
- * The only time we have a promise cache item is when we regen shuffling for attestation, which never happens
141
- * with default chain option.
145
+ * Get a shuffling synchronously, return null if not present or if it's still being computed.
142
146
  */
143
147
  getSync(epoch: Epoch, decisionRoot: RootHex): EpochShuffling | null {
144
- const cacheItem = this.itemsByDecisionRootByEpoch.getOrDefault(epoch).get(decisionRoot);
148
+ const cacheItem = this.itemsByDecisionRootByEpoch.get(epoch)?.get(decisionRoot);
145
149
  if (cacheItem === undefined) {
146
150
  this.metrics?.shufflingCache.miss.inc();
147
151
  return null;
@@ -161,7 +165,7 @@ export class ShufflingCache {
161
165
  * `NativeBeaconStateView`.
162
166
  */
163
167
  has(epoch: Epoch, decisionRoot: RootHex): boolean {
164
- const cacheItem = this.itemsByDecisionRootByEpoch.getOrDefault(epoch).get(decisionRoot);
168
+ const cacheItem = this.itemsByDecisionRootByEpoch.get(epoch)?.get(decisionRoot);
165
169
  return cacheItem !== undefined && isShufflingCacheItem(cacheItem);
166
170
  }
167
171
 
@@ -186,6 +190,25 @@ export class ShufflingCache {
186
190
  }
187
191
  }
188
192
 
193
+ /**
194
+ * Resolve a pending promise with null so that waiters don't hang, then remove it.
195
+ */
196
+ cancelPromise(epoch: Epoch, decisionRoot: RootHex, reason: ShufflingPromiseCancelReason): void {
197
+ const itemsByDecisionRoot = this.itemsByDecisionRootByEpoch.get(epoch);
198
+ const cacheItem = itemsByDecisionRoot?.get(decisionRoot);
199
+ if (itemsByDecisionRoot === undefined || cacheItem === undefined || !isPromiseCacheItem(cacheItem)) {
200
+ return;
201
+ }
202
+
203
+ cacheItem.resolveFn(null);
204
+ itemsByDecisionRoot.delete(decisionRoot);
205
+ if (itemsByDecisionRoot.size === 0) {
206
+ this.itemsByDecisionRootByEpoch.delete(epoch);
207
+ }
208
+ this.metrics?.shufflingCache.cancelledPromises.inc({reason});
209
+ this.logger?.debug("Cancelled shuffling promise", {epoch, decisionRoot, reason});
210
+ }
211
+
189
212
  getIndexedAttestation(
190
213
  epoch: number,
191
214
  decisionRoot: string,
@@ -205,6 +228,11 @@ export class ShufflingCache {
205
228
  return this.getBeaconCommittees(epoch, decisionRoot, slot, [index])[0];
206
229
  }
207
230
 
231
+ getBeaconCommitteeOrNull(epoch: number, decisionRoot: string, slot: Slot, index: CommitteeIndex): Uint32Array | null {
232
+ const shuffling = this.getSync(epoch, decisionRoot);
233
+ return shuffling === null ? null : getBeaconCommittees(shuffling, slot, [index])[0];
234
+ }
235
+
208
236
  getBeaconCommittees(epoch: number, decisionRoot: string, slot: Slot, indices: CommitteeIndex[]): Uint32Array[] {
209
237
  const shuffling = this.getShufflingOrThrow(epoch, decisionRoot);
210
238
  return getBeaconCommittees(shuffling, slot, indices);
@@ -243,8 +271,42 @@ export class ShufflingCache {
243
271
  }
244
272
  // set the shuffling
245
273
  shufflingAtEpoch.set(decisionRoot, {type: CacheItemType.shuffling, shuffling});
246
- // prune the cache
247
- pruneSetToMax(this.itemsByDecisionRootByEpoch, this.maxEpochs);
274
+ this.prune();
275
+ }
276
+
277
+ /**
278
+ * Keep the `maxEpochs` highest epochs, regardless of insertion order.
279
+ */
280
+ private prune(): void {
281
+ const toDelete = this.itemsByDecisionRootByEpoch.size - this.maxEpochs;
282
+ if (toDelete <= 0) {
283
+ return;
284
+ }
285
+
286
+ const prunedEpochs = Array.from(this.itemsByDecisionRootByEpoch.keys())
287
+ .sort((a, b) => a - b)
288
+ .slice(0, toDelete);
289
+ let prunedShufflings = 0;
290
+ for (const epoch of prunedEpochs) {
291
+ for (const cacheItem of this.itemsByDecisionRootByEpoch.get(epoch)?.values() ?? []) {
292
+ if (isPromiseCacheItem(cacheItem)) {
293
+ cacheItem.resolveFn(null);
294
+ this.metrics?.shufflingCache.cancelledPromises.inc({reason: ShufflingPromiseCancelReason.pruned});
295
+ } else {
296
+ prunedShufflings++;
297
+ }
298
+ }
299
+ this.itemsByDecisionRootByEpoch.delete(epoch);
300
+ }
301
+ this.metrics?.shufflingCache.prunedShufflings.inc(prunedShufflings);
302
+
303
+ this.logger?.verbose("Pruned shuffling cache", {
304
+ prunedEpochs: prunedEpochs.join(","),
305
+ prunedShufflings,
306
+ cachedEpochs: Array.from(this.itemsByDecisionRootByEpoch.keys())
307
+ .sort((a, b) => a - b)
308
+ .join(","),
309
+ });
248
310
  }
249
311
  }
250
312
 
package/src/db/beacon.ts CHANGED
@@ -8,6 +8,7 @@ import {FlatFileStore} from "./flatFileStore/flatFileStore.js";
8
8
  import type {FlatFileStoreMetrics} from "./flatFileStore/metrics.js";
9
9
  import {IBeaconDb} from "./interface.js";
10
10
  import {CheckpointStateRepository} from "./repositories/checkpointState.js";
11
+ import {EarliestAvailableSlotRepository} from "./repositories/earliestAvailableSlot.js";
11
12
  import {
12
13
  AttesterSlashingRepository,
13
14
  BLSToExecutionChangeRepository,
@@ -21,6 +22,7 @@ import {
21
22
  DataColumnSidecarRepository,
22
23
  ExecutionPayloadEnvelopeArchiveRepository,
23
24
  ExecutionPayloadEnvelopeRepository,
25
+ ProposerPreferencesRepository,
24
26
  ProposerSlashingRepository,
25
27
  StateArchiveRepository,
26
28
  SyncCommitteeRepository,
@@ -48,9 +50,11 @@ export class BeaconDb implements IBeaconDb {
48
50
 
49
51
  stateArchive: StateArchiveRepository;
50
52
  checkpointState: CheckpointStateRepository;
53
+ earliestAvailableSlot: EarliestAvailableSlotRepository;
51
54
 
52
55
  voluntaryExit: VoluntaryExitRepository;
53
56
  proposerSlashing: ProposerSlashingRepository;
57
+ proposerPreferences: ProposerPreferencesRepository;
54
58
  attesterSlashing: AttesterSlashingRepository;
55
59
  blsToExecutionChange: BLSToExecutionChangeRepository;
56
60
 
@@ -83,9 +87,11 @@ export class BeaconDb implements IBeaconDb {
83
87
 
84
88
  this.stateArchive = new StateArchiveRepository(config, db);
85
89
  this.checkpointState = new CheckpointStateRepository(config, db);
90
+ this.earliestAvailableSlot = new EarliestAvailableSlotRepository(db);
86
91
  this.voluntaryExit = new VoluntaryExitRepository(config, db);
87
92
  this.blsToExecutionChange = new BLSToExecutionChangeRepository(config, db);
88
93
  this.proposerSlashing = new ProposerSlashingRepository(config, db);
94
+ this.proposerPreferences = new ProposerPreferencesRepository(config, db);
89
95
  this.attesterSlashing = new AttesterSlashingRepository(config, db);
90
96
 
91
97
  // lightclient
package/src/db/buckets.ts CHANGED
@@ -72,6 +72,8 @@ export enum Bucket {
72
72
 
73
73
  gloas_executionPayloadEnvelope = 59, // GLOAS BeaconBlockRoot -> SignedExecutionPayloadEnvelope
74
74
  gloas_executionPayloadEnvelopeArchive = 60, // GLOAS Slot -> SignedExecutionPayloadEnvelope, or 0x00 + SignedExecutionPayloadHeaderEnvelope
75
+ earliestAvailableSlot = 61, // singleton -> Slot
76
+ gloas_proposerPreferences = 62, // Slot || DependentRoot -> SignedProposerPreferences
75
77
  }
76
78
 
77
79
  export function getBucketNameByValue<T extends Bucket>(enumValue: T): keyof typeof Bucket {
@@ -3,6 +3,7 @@ import {Slot} from "@lodestar/types";
3
3
  import type {IDataColumnStore} from "./dataColumnStore.js";
4
4
  import type {FlatFileStoreMetrics} from "./flatFileStore/metrics.js";
5
5
  import {CheckpointStateRepository} from "./repositories/checkpointState.js";
6
+ import {EarliestAvailableSlotRepository} from "./repositories/earliestAvailableSlot.js";
6
7
  import {
7
8
  AttesterSlashingRepository,
8
9
  BLSToExecutionChangeRepository,
@@ -16,6 +17,7 @@ import {
16
17
  DataColumnSidecarRepository,
17
18
  ExecutionPayloadEnvelopeArchiveRepository,
18
19
  ExecutionPayloadEnvelopeRepository,
20
+ ProposerPreferencesRepository,
19
21
  ProposerSlashingRepository,
20
22
  StateArchiveRepository,
21
23
  SyncCommitteeRepository,
@@ -46,10 +48,12 @@ export interface IBeaconDb {
46
48
  stateArchive: StateArchiveRepository;
47
49
  // checkpoint states
48
50
  checkpointState: CheckpointStateRepository;
51
+ earliestAvailableSlot: EarliestAvailableSlotRepository;
49
52
 
50
53
  // op pool
51
54
  voluntaryExit: VoluntaryExitRepository;
52
55
  proposerSlashing: ProposerSlashingRepository;
56
+ proposerPreferences: ProposerPreferencesRepository;
53
57
  attesterSlashing: AttesterSlashingRepository;
54
58
  blsToExecutionChange: BLSToExecutionChangeRepository;
55
59
 
@@ -0,0 +1,19 @@
1
+ import {Db, encodeKey} from "@lodestar/db";
2
+ import {Slot, ssz} from "@lodestar/types";
3
+ import {Bucket, getBucketNameByValue} from "../buckets.js";
4
+
5
+ export class EarliestAvailableSlotRepository {
6
+ private readonly key = encodeKey(Bucket.earliestAvailableSlot, 0);
7
+ private readonly opts = {bucketId: getBucketNameByValue(Bucket.earliestAvailableSlot)};
8
+
9
+ constructor(private readonly db: Db) {}
10
+
11
+ async get(): Promise<Slot | null> {
12
+ const bytes = await this.db.get(this.key, this.opts);
13
+ return bytes === null ? null : ssz.Slot.deserialize(bytes);
14
+ }
15
+
16
+ async set(slot: Slot): Promise<void> {
17
+ await this.db.put(this.key, ssz.Slot.serialize(slot), this.opts);
18
+ }
19
+ }
@@ -18,6 +18,7 @@ export {BestLightClientUpdateRepository} from "./lightclientBestUpdate.js";
18
18
  export {CheckpointHeaderRepository} from "./lightclientCheckpointHeader.js";
19
19
  export {SyncCommitteeRepository} from "./lightclientSyncCommittee.js";
20
20
  export {SyncCommitteeWitnessRepository} from "./lightclientSyncCommitteeWitness.js";
21
+ export {ProposerPreferencesRepository} from "./proposerPreferences.js";
21
22
  export {ProposerSlashingRepository} from "./proposerSlashing.js";
22
23
  export {StateArchiveRepository} from "./stateArchive.js";
23
24
  export {VoluntaryExitRepository} from "./voluntaryExit.js";
@@ -0,0 +1,23 @@
1
+ import {ChainForkConfig} from "@lodestar/config";
2
+ import {Db, Repository} from "@lodestar/db";
3
+ import {gloas, ssz} from "@lodestar/types";
4
+ import {intToBytes} from "@lodestar/utils";
5
+ import {Bucket, getBucketNameByValue} from "../buckets.js";
6
+
7
+ /**
8
+ * SignedProposerPreferences indexed by proposal slot and dependent root
9
+ *
10
+ * Added via gossip or api
11
+ * Removed once the proposal slot has passed
12
+ */
13
+ export class ProposerPreferencesRepository extends Repository<Uint8Array, gloas.SignedProposerPreferences> {
14
+ constructor(config: ChainForkConfig, db: Db) {
15
+ const bucket = Bucket.gloas_proposerPreferences;
16
+ super(config, db, bucket, ssz.gloas.SignedProposerPreferences, getBucketNameByValue(bucket));
17
+ }
18
+
19
+ getId(value: gloas.SignedProposerPreferences): Uint8Array {
20
+ const {proposalSlot, dependentRoot} = value.message;
21
+ return Buffer.concat([intToBytes(proposalSlot, 8, "be"), dependentRoot]);
22
+ }
23
+ }
@@ -0,0 +1,72 @@
1
+ import {byteArrayEquals} from "@lodestar/utils";
2
+ import {VersionedHashes} from "./interface.js";
3
+
4
+ /**
5
+ * Preserve Deneb's is_valid_versioned_hashes check when the REST envelope omits expected hashes.
6
+ * EIP-4844 encodes blob_versioned_hashes at index 10 of the signed type-3 transaction's RLP list.
7
+ * Skip unrelated fields without decoding or copying them, including untrusted nested access lists.
8
+ * The EL remains responsible for the other transaction validity checks.
9
+ */
10
+ export function isValidBlobVersionedHashes(transactions: Uint8Array[], expected: VersionedHashes): boolean {
11
+ let index = 0;
12
+ for (const transaction of transactions) {
13
+ if (transaction.length === 0) return false;
14
+ if (transaction[0] !== 0x03) continue;
15
+
16
+ const outer = readRlpItem(transaction, 1, transaction.length);
17
+ if (!outer?.isList || outer.end !== transaction.length) return false;
18
+
19
+ let offset = outer.start;
20
+ for (let fieldIndex = 0; fieldIndex < 14; fieldIndex++) {
21
+ const field = readRlpItem(transaction, offset, outer.end);
22
+ if (field === null) return false;
23
+ if (fieldIndex === 10) {
24
+ if (!field.isList) return false;
25
+ // A canonical RLP-encoded Bytes32 is exactly the 0xa0 prefix followed by 32 bytes.
26
+ const count = (field.end - field.start) / 33;
27
+ if (!Number.isInteger(count) || index + count > expected.length) return false;
28
+ for (let hashOffset = field.start; hashOffset < field.end; hashOffset += 33) {
29
+ if (
30
+ transaction[hashOffset] !== 0xa0 ||
31
+ !byteArrayEquals(transaction.subarray(hashOffset + 1, hashOffset + 33), expected[index])
32
+ ) {
33
+ return false;
34
+ }
35
+ index++;
36
+ }
37
+ }
38
+ offset = field.end;
39
+ }
40
+ if (offset !== outer.end) return false;
41
+ }
42
+ return index === expected.length;
43
+ }
44
+
45
+ /** Read one RLP item's boundaries without descending into lists. */
46
+ function readRlpItem(
47
+ bytes: Uint8Array,
48
+ offset: number,
49
+ limit: number
50
+ ): {start: number; end: number; isList: boolean} | null {
51
+ if (offset >= limit) return null;
52
+ const prefix = bytes[offset];
53
+ if (prefix < 0x80) return {start: offset, end: offset + 1, isList: false};
54
+
55
+ const isList = prefix >= 0xc0;
56
+ const lengthCode = prefix - (isList ? 0xc0 : 0x80);
57
+ let start = offset + 1;
58
+ let length = lengthCode;
59
+ if (lengthCode > 55) {
60
+ const lengthBytes = lengthCode - 55;
61
+ start += lengthBytes;
62
+ if (start > limit || bytes[offset + 1] === 0) return null;
63
+ length = 0;
64
+ for (let i = offset + 1; i < start; i++) {
65
+ length = length * 256 + bytes[i];
66
+ }
67
+ if (length <= 55) return null;
68
+ }
69
+ if (length > limit - start) return null;
70
+ if (!isList && length === 1 && bytes[start] < 0x80) return null;
71
+ return {start, end: start + length, isList};
72
+ }