@lodestar/beacon-node 1.44.0-dev.552cdce8d0 → 1.44.0-dev.5a822af737

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 (220) hide show
  1. package/lib/api/impl/beacon/blocks/index.d.ts.map +1 -1
  2. package/lib/api/impl/beacon/blocks/index.js +50 -29
  3. package/lib/api/impl/beacon/blocks/index.js.map +1 -1
  4. package/lib/api/impl/beacon/pool/index.d.ts.map +1 -1
  5. package/lib/api/impl/beacon/pool/index.js +1 -26
  6. package/lib/api/impl/beacon/pool/index.js.map +1 -1
  7. package/lib/api/impl/config/constants.d.ts +1 -0
  8. package/lib/api/impl/config/constants.d.ts.map +1 -1
  9. package/lib/api/impl/config/constants.js +2 -1
  10. package/lib/api/impl/config/constants.js.map +1 -1
  11. package/lib/api/impl/debug/index.d.ts.map +1 -1
  12. package/lib/api/impl/debug/index.js +69 -12
  13. package/lib/api/impl/debug/index.js.map +1 -1
  14. package/lib/api/impl/lodestar/index.d.ts.map +1 -1
  15. package/lib/api/impl/lodestar/index.js +28 -0
  16. package/lib/api/impl/lodestar/index.js.map +1 -1
  17. package/lib/api/impl/validator/index.d.ts.map +1 -1
  18. package/lib/api/impl/validator/index.js +121 -69
  19. package/lib/api/impl/validator/index.js.map +1 -1
  20. package/lib/chain/archiveStore/archiveStore.d.ts +0 -1
  21. package/lib/chain/archiveStore/archiveStore.d.ts.map +1 -1
  22. package/lib/chain/archiveStore/archiveStore.js +0 -4
  23. package/lib/chain/archiveStore/archiveStore.js.map +1 -1
  24. package/lib/chain/blocks/importBlock.d.ts.map +1 -1
  25. package/lib/chain/blocks/importBlock.js +5 -2
  26. package/lib/chain/blocks/importBlock.js.map +1 -1
  27. package/lib/chain/blocks/importExecutionPayload.d.ts.map +1 -1
  28. package/lib/chain/blocks/importExecutionPayload.js +5 -3
  29. package/lib/chain/blocks/importExecutionPayload.js.map +1 -1
  30. package/lib/chain/blocks/verifyExecutionPayloadEnvelope.d.ts.map +1 -1
  31. package/lib/chain/blocks/verifyExecutionPayloadEnvelope.js +2 -2
  32. package/lib/chain/blocks/verifyExecutionPayloadEnvelope.js.map +1 -1
  33. package/lib/chain/chain.d.ts +1 -1
  34. package/lib/chain/chain.d.ts.map +1 -1
  35. package/lib/chain/chain.js +10 -2
  36. package/lib/chain/chain.js.map +1 -1
  37. package/lib/chain/emitter.d.ts +2 -1
  38. package/lib/chain/emitter.d.ts.map +1 -1
  39. package/lib/chain/emitter.js.map +1 -1
  40. package/lib/chain/errors/blockError.d.ts +0 -7
  41. package/lib/chain/errors/blockError.d.ts.map +1 -1
  42. package/lib/chain/errors/blockError.js +0 -3
  43. package/lib/chain/errors/blockError.js.map +1 -1
  44. package/lib/chain/errors/executionPayloadBid.d.ts +17 -1
  45. package/lib/chain/errors/executionPayloadBid.d.ts.map +1 -1
  46. package/lib/chain/errors/executionPayloadBid.js +3 -0
  47. package/lib/chain/errors/executionPayloadBid.js.map +1 -1
  48. package/lib/chain/errors/payloadAttestation.d.ts +6 -0
  49. package/lib/chain/errors/payloadAttestation.d.ts.map +1 -1
  50. package/lib/chain/errors/payloadAttestation.js +1 -0
  51. package/lib/chain/errors/payloadAttestation.js.map +1 -1
  52. package/lib/chain/forkChoice/index.d.ts +4 -4
  53. package/lib/chain/forkChoice/index.d.ts.map +1 -1
  54. package/lib/chain/forkChoice/index.js +24 -11
  55. package/lib/chain/forkChoice/index.js.map +1 -1
  56. package/lib/chain/opPools/executionPayloadBidPool.d.ts +4 -4
  57. package/lib/chain/opPools/executionPayloadBidPool.d.ts.map +1 -1
  58. package/lib/chain/opPools/executionPayloadBidPool.js +6 -4
  59. package/lib/chain/opPools/executionPayloadBidPool.js.map +1 -1
  60. package/lib/chain/options.d.ts.map +1 -1
  61. package/lib/chain/options.js +1 -0
  62. package/lib/chain/options.js.map +1 -1
  63. package/lib/chain/prepareNextSlot.d.ts.map +1 -1
  64. package/lib/chain/prepareNextSlot.js +2 -1
  65. package/lib/chain/prepareNextSlot.js.map +1 -1
  66. package/lib/chain/produceBlock/produceBlockBody.d.ts +7 -1
  67. package/lib/chain/produceBlock/produceBlockBody.d.ts.map +1 -1
  68. package/lib/chain/produceBlock/produceBlockBody.js +108 -19
  69. package/lib/chain/produceBlock/produceBlockBody.js.map +1 -1
  70. package/lib/chain/regen/interface.d.ts +2 -1
  71. package/lib/chain/regen/interface.d.ts.map +1 -1
  72. package/lib/chain/regen/interface.js +2 -0
  73. package/lib/chain/regen/interface.js.map +1 -1
  74. package/lib/chain/regen/queued.d.ts +0 -1
  75. package/lib/chain/regen/queued.d.ts.map +1 -1
  76. package/lib/chain/regen/queued.js +0 -4
  77. package/lib/chain/regen/queued.js.map +1 -1
  78. package/lib/chain/stateCache/fifoBlockStateCache.d.ts +0 -5
  79. package/lib/chain/stateCache/fifoBlockStateCache.d.ts.map +1 -1
  80. package/lib/chain/stateCache/fifoBlockStateCache.js +0 -5
  81. package/lib/chain/stateCache/fifoBlockStateCache.js.map +1 -1
  82. package/lib/chain/stateCache/persistentCheckpointsCache.d.ts +1 -4
  83. package/lib/chain/stateCache/persistentCheckpointsCache.d.ts.map +1 -1
  84. package/lib/chain/stateCache/persistentCheckpointsCache.js +5 -2
  85. package/lib/chain/stateCache/persistentCheckpointsCache.js.map +1 -1
  86. package/lib/chain/stateCache/types.d.ts +0 -2
  87. package/lib/chain/stateCache/types.d.ts.map +1 -1
  88. package/lib/chain/stateCache/types.js.map +1 -1
  89. package/lib/chain/validation/block.d.ts +5 -1
  90. package/lib/chain/validation/block.d.ts.map +1 -1
  91. package/lib/chain/validation/block.js +4 -14
  92. package/lib/chain/validation/block.js.map +1 -1
  93. package/lib/chain/validation/executionPayloadBid.d.ts +7 -3
  94. package/lib/chain/validation/executionPayloadBid.d.ts.map +1 -1
  95. package/lib/chain/validation/executionPayloadBid.js +70 -16
  96. package/lib/chain/validation/executionPayloadBid.js.map +1 -1
  97. package/lib/chain/validation/executionPayloadEnvelope.js +0 -2
  98. package/lib/chain/validation/executionPayloadEnvelope.js.map +1 -1
  99. package/lib/chain/validation/payloadAttestationMessage.d.ts.map +1 -1
  100. package/lib/chain/validation/payloadAttestationMessage.js +24 -4
  101. package/lib/chain/validation/payloadAttestationMessage.js.map +1 -1
  102. package/lib/chain/validatorMonitor.d.ts +1 -0
  103. package/lib/chain/validatorMonitor.d.ts.map +1 -1
  104. package/lib/chain/validatorMonitor.js +16 -0
  105. package/lib/chain/validatorMonitor.js.map +1 -1
  106. package/lib/execution/builder/index.d.ts +1 -2
  107. package/lib/execution/builder/index.d.ts.map +1 -1
  108. package/lib/execution/builder/index.js +0 -1
  109. package/lib/execution/builder/index.js.map +1 -1
  110. package/lib/execution/engine/interface.d.ts +1 -0
  111. package/lib/execution/engine/interface.d.ts.map +1 -1
  112. package/lib/execution/engine/types.d.ts +2 -0
  113. package/lib/execution/engine/types.d.ts.map +1 -1
  114. package/lib/execution/engine/types.js +2 -0
  115. package/lib/execution/engine/types.js.map +1 -1
  116. package/lib/metrics/metrics/lodestar.d.ts +5 -1
  117. package/lib/metrics/metrics/lodestar.d.ts.map +1 -1
  118. package/lib/metrics/metrics/lodestar.js +14 -3
  119. package/lib/metrics/metrics/lodestar.js.map +1 -1
  120. package/lib/network/gossip/topic.d.ts +2 -2
  121. package/lib/network/interface.d.ts +1 -0
  122. package/lib/network/interface.d.ts.map +1 -1
  123. package/lib/network/network.d.ts +1 -0
  124. package/lib/network/network.d.ts.map +1 -1
  125. package/lib/network/network.js +5 -0
  126. package/lib/network/network.js.map +1 -1
  127. package/lib/network/processor/gossipHandlers.d.ts.map +1 -1
  128. package/lib/network/processor/gossipHandlers.js +21 -6
  129. package/lib/network/processor/gossipHandlers.js.map +1 -1
  130. package/lib/network/processor/index.d.ts +2 -2
  131. package/lib/network/processor/index.d.ts.map +1 -1
  132. package/lib/network/processor/index.js +25 -23
  133. package/lib/network/processor/index.js.map +1 -1
  134. package/lib/network/reqresp/handlers/beaconBlocksByRange.d.ts.map +1 -1
  135. package/lib/network/reqresp/handlers/beaconBlocksByRange.js +9 -5
  136. package/lib/network/reqresp/handlers/beaconBlocksByRange.js.map +1 -1
  137. package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.d.ts.map +1 -1
  138. package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.js +13 -3
  139. package/lib/network/reqresp/handlers/dataColumnSidecarsByRange.js.map +1 -1
  140. package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.js +1 -1
  141. package/lib/network/reqresp/handlers/dataColumnSidecarsByRoot.js.map +1 -1
  142. package/lib/network/reqresp/handlers/executionPayloadEnvelopesByRange.d.ts +2 -1
  143. package/lib/network/reqresp/handlers/executionPayloadEnvelopesByRange.d.ts.map +1 -1
  144. package/lib/network/reqresp/handlers/executionPayloadEnvelopesByRange.js +16 -6
  145. package/lib/network/reqresp/handlers/executionPayloadEnvelopesByRange.js.map +1 -1
  146. package/lib/network/reqresp/handlers/executionPayloadEnvelopesByRoot.d.ts +2 -1
  147. package/lib/network/reqresp/handlers/executionPayloadEnvelopesByRoot.d.ts.map +1 -1
  148. package/lib/network/reqresp/handlers/executionPayloadEnvelopesByRoot.js +15 -1
  149. package/lib/network/reqresp/handlers/executionPayloadEnvelopesByRoot.js.map +1 -1
  150. package/lib/network/reqresp/handlers/index.js +4 -4
  151. package/lib/network/reqresp/handlers/index.js.map +1 -1
  152. package/lib/network/reqresp/utils/dataColumnResponseValidation.d.ts.map +1 -1
  153. package/lib/network/reqresp/utils/dataColumnResponseValidation.js +22 -3
  154. package/lib/network/reqresp/utils/dataColumnResponseValidation.js.map +1 -1
  155. package/lib/sync/types.d.ts +9 -1
  156. package/lib/sync/types.d.ts.map +1 -1
  157. package/lib/sync/types.js +9 -2
  158. package/lib/sync/types.js.map +1 -1
  159. package/lib/sync/unknownBlock.d.ts.map +1 -1
  160. package/lib/sync/unknownBlock.js +64 -30
  161. package/lib/sync/unknownBlock.js.map +1 -1
  162. package/lib/util/dataColumns.d.ts.map +1 -1
  163. package/lib/util/dataColumns.js +16 -11
  164. package/lib/util/dataColumns.js.map +1 -1
  165. package/lib/util/sszBytes.js +1 -1
  166. package/package.json +15 -17
  167. package/src/api/impl/beacon/blocks/index.ts +60 -38
  168. package/src/api/impl/beacon/pool/index.ts +4 -42
  169. package/src/api/impl/config/constants.ts +2 -0
  170. package/src/api/impl/debug/index.ts +73 -12
  171. package/src/api/impl/lodestar/index.ts +30 -0
  172. package/src/api/impl/validator/index.ts +141 -82
  173. package/src/chain/archiveStore/archiveStore.ts +0 -5
  174. package/src/chain/blocks/importBlock.ts +10 -2
  175. package/src/chain/blocks/importExecutionPayload.ts +8 -2
  176. package/src/chain/blocks/verifyExecutionPayloadEnvelope.ts +2 -4
  177. package/src/chain/chain.ts +12 -1
  178. package/src/chain/emitter.ts +3 -2
  179. package/src/chain/errors/blockError.ts +0 -4
  180. package/src/chain/errors/executionPayloadBid.ts +13 -1
  181. package/src/chain/errors/payloadAttestation.ts +2 -0
  182. package/src/chain/forkChoice/index.ts +27 -4
  183. package/src/chain/opPools/executionPayloadBidPool.ts +10 -9
  184. package/src/chain/options.ts +1 -0
  185. package/src/chain/prepareNextSlot.ts +2 -1
  186. package/src/chain/produceBlock/produceBlockBody.ts +159 -26
  187. package/src/chain/regen/interface.ts +2 -1
  188. package/src/chain/regen/queued.ts +0 -5
  189. package/src/chain/stateCache/fifoBlockStateCache.ts +0 -6
  190. package/src/chain/stateCache/persistentCheckpointsCache.ts +6 -2
  191. package/src/chain/stateCache/types.ts +0 -2
  192. package/src/chain/validation/block.ts +12 -16
  193. package/src/chain/validation/executionPayloadBid.ts +78 -19
  194. package/src/chain/validation/executionPayloadEnvelope.ts +0 -2
  195. package/src/chain/validation/payloadAttestationMessage.ts +26 -4
  196. package/src/chain/validatorMonitor.ts +18 -0
  197. package/src/execution/builder/index.ts +1 -4
  198. package/src/execution/engine/interface.ts +1 -0
  199. package/src/execution/engine/types.ts +4 -0
  200. package/src/metrics/metrics/lodestar.ts +15 -3
  201. package/src/network/interface.ts +1 -0
  202. package/src/network/network.ts +11 -0
  203. package/src/network/processor/gossipHandlers.ts +26 -6
  204. package/src/network/processor/index.ts +27 -27
  205. package/src/network/reqresp/handlers/beaconBlocksByRange.ts +12 -5
  206. package/src/network/reqresp/handlers/dataColumnSidecarsByRange.ts +17 -3
  207. package/src/network/reqresp/handlers/dataColumnSidecarsByRoot.ts +1 -1
  208. package/src/network/reqresp/handlers/executionPayloadEnvelopesByRange.ts +22 -6
  209. package/src/network/reqresp/handlers/executionPayloadEnvelopesByRoot.ts +20 -1
  210. package/src/network/reqresp/handlers/index.ts +4 -4
  211. package/src/network/reqresp/utils/dataColumnResponseValidation.ts +21 -3
  212. package/src/sync/types.ts +11 -2
  213. package/src/sync/unknownBlock.ts +70 -31
  214. package/src/util/dataColumns.ts +17 -12
  215. package/src/util/sszBytes.ts +1 -1
  216. package/lib/execution/builder/utils.d.ts +0 -5
  217. package/lib/execution/builder/utils.d.ts.map +0 -1
  218. package/lib/execution/builder/utils.js +0 -17
  219. package/lib/execution/builder/utils.js.map +0 -1
  220. package/src/execution/builder/utils.ts +0 -19
@@ -12,13 +12,13 @@ type BlockRootHex = string;
12
12
  type BlockHashHex = string;
13
13
 
14
14
  /**
15
- * Store the best execution payload bid per slot / (parent block root, parent block hash).
15
+ * Store the best signed execution payload bid per slot / (parent block root, parent block hash).
16
16
  */
17
17
  export class ExecutionPayloadBidPool {
18
18
  private readonly bidByParentHashByParentRootBySlot = new MapDef<
19
19
  Slot,
20
- MapDef<BlockRootHex, Map<BlockHashHex, gloas.ExecutionPayloadBid>>
21
- >(() => new MapDef<BlockRootHex, Map<BlockHashHex, gloas.ExecutionPayloadBid>>(() => new Map()));
20
+ MapDef<BlockRootHex, Map<BlockHashHex, gloas.SignedExecutionPayloadBid>>
21
+ >(() => new MapDef<BlockRootHex, Map<BlockHashHex, gloas.SignedExecutionPayloadBid>>(() => new Map()));
22
22
  private lowestPermissibleSlot = 0;
23
23
 
24
24
  get size(): number {
@@ -31,8 +31,8 @@ export class ExecutionPayloadBidPool {
31
31
  return count;
32
32
  }
33
33
 
34
- add(bid: gloas.ExecutionPayloadBid): InsertOutcome {
35
- const {slot, parentBlockRoot, parentBlockHash, value} = bid;
34
+ add(bid: gloas.SignedExecutionPayloadBid): InsertOutcome {
35
+ const {slot, parentBlockRoot, parentBlockHash, value} = bid.message;
36
36
  const lowestPermissibleSlot = this.lowestPermissibleSlot;
37
37
 
38
38
  if (slot < lowestPermissibleSlot) {
@@ -45,7 +45,7 @@ export class ExecutionPayloadBidPool {
45
45
  const existing = bidByParentHash.get(parentHashHex);
46
46
 
47
47
  if (existing) {
48
- const existingValue = existing.value;
48
+ const existingValue = existing.message.value;
49
49
  const newValue = value;
50
50
  if (newValue > existingValue) {
51
51
  bidByParentHash.set(parentHashHex, bid);
@@ -59,14 +59,15 @@ export class ExecutionPayloadBidPool {
59
59
  }
60
60
 
61
61
  /**
62
- * Return the highest-value bid matching slot, parent block hash, and parent block root.
62
+ * Return the highest-value signed bid matching slot, parent block hash, and parent block root.
63
63
  * Used for gossip validation and block production.
64
64
  */
65
65
  getBestBid(
66
66
  slot: Slot,
67
- parentBlockHash: BlockHashHex,
67
+ parentBlockHash: BlockHashHex | null,
68
68
  parentBlockRoot: BlockRootHex
69
- ): gloas.ExecutionPayloadBid | null {
69
+ ): gloas.SignedExecutionPayloadBid | null {
70
+ if (parentBlockHash === null) return null;
70
71
  const bidByParentHash = this.bidByParentHashByParentRootBySlot.get(slot)?.get(parentBlockRoot);
71
72
  return bidByParentHash?.get(parentBlockHash) ?? null;
72
73
  }
@@ -105,6 +105,7 @@ export const defaultChainOptions: IChainOptions = {
105
105
  proposerBoost: true,
106
106
  proposerBoostReorg: true,
107
107
  computeUnrealized: true,
108
+ fastConfirmation: false,
108
109
  suggestedFeeRecipient: defaultValidatorOptions.suggestedFeeRecipient,
109
110
  serveHistoricalState: false,
110
111
  assertCorrectProgressiveBalances: false,
@@ -169,7 +169,8 @@ export class PrepareNextSlotScheduler {
169
169
  // Apply parent payload once here as it's reused by EL prep and SSE emit below
170
170
  let stateAfterParentPayload: IBeaconStateViewBellatrix = updatedPrepareState;
171
171
  if (isStatePostGloas(updatedPrepareState)) {
172
- if (this.chain.forkChoice.shouldExtendPayload(updatedHead.blockRoot)) {
172
+ // Spec: should_build_on_full(store, head) — see produceBlockBody.ts for context.
173
+ if (this.chain.forkChoice.shouldBuildOnFull(updatedHead, prepareSlot)) {
173
174
  parentBlockHash = updatedPrepareState.latestExecutionPayloadBid.blockHash;
174
175
  // Skip applying parent payload unless we're proposing the next slot or have to emit payload_attributes events
175
176
  if (feeRecipient !== undefined || this.chain.opts.emitPayloadAttributes === true) {
@@ -18,7 +18,9 @@ import {
18
18
  G2_POINT_AT_INFINITY,
19
19
  IBeaconStateView,
20
20
  type IBeaconStateViewBellatrix,
21
+ computeEpochAtSlot,
21
22
  computeTimeAtSlot,
23
+ getExpectedGasLimit,
22
24
  isStatePostBellatrix,
23
25
  isStatePostCapella,
24
26
  isStatePostGloas,
@@ -48,20 +50,16 @@ import {
48
50
  gloas,
49
51
  ssz,
50
52
  } from "@lodestar/types";
51
- import {Logger, byteArrayEquals, fromHex, sleep, toHex, toPubkeyHex, toRootHex} from "@lodestar/utils";
53
+ import {GWEI_TO_WEI, Logger, byteArrayEquals, fromHex, sleep, toHex, toPubkeyHex, toRootHex} from "@lodestar/utils";
52
54
  import {ZERO_HASH_HEX} from "../../constants/index.js";
53
55
  import {numToQuantity} from "../../execution/engine/utils.js";
54
- import {
55
- IExecutionBuilder,
56
- IExecutionEngine,
57
- PayloadAttributes,
58
- PayloadId,
59
- getExpectedGasLimit,
60
- } from "../../execution/index.js";
56
+ import {IExecutionBuilder, IExecutionEngine, PayloadAttributes, PayloadId} from "../../execution/index.js";
57
+ import {getShufflingDependentRoot} from "../../util/dependentRoot.js";
61
58
  import {fromGraffitiBytes} from "../../util/graffiti.js";
62
59
  import {kzg} from "../../util/kzg.js";
63
60
  import type {BeaconChain} from "../chain.js";
64
61
  import {CommonBlockBody} from "../interface.js";
62
+ import {ProposerPreferencesPool} from "../opPools/index.js";
65
63
  import {validateBlobsAndKzgCommitments, validateCellsAndKzgCommitments} from "./validateBlobsAndKzgCommitments.js";
66
64
 
67
65
  // Time to provide the EL to generate a payload from new payload id
@@ -93,6 +91,8 @@ export type BlockAttributes = {
93
91
  slot: Slot;
94
92
  parentBlock: ProtoBlock;
95
93
  feeRecipient?: string;
94
+ /** When provided, build block with this builder bid instead of a self-build bid */
95
+ builderBid?: gloas.SignedExecutionPayloadBid;
96
96
  };
97
97
 
98
98
  export enum BlockType {
@@ -152,6 +152,28 @@ export type ProduceResult =
152
152
  | ProduceFullPhase0
153
153
  | ProduceBlinded;
154
154
 
155
+ /**
156
+ * Drop voluntary exits that `parent_execution_requests` have invalidated (e.g. a withdrawal
157
+ * request initiating an exit on the same validator). Op pool selected against the unapplied
158
+ * state, so re-validate against the post-apply state to avoid producing an invalid block.
159
+ *
160
+ * `getStateAfterParentPayload` is a thunk so the post-apply state is only materialized when
161
+ * actually needed (i.e. when extending the parent payload and there are exits to filter).
162
+ */
163
+ function maybeFilterInvalidatedVoluntaryExits(
164
+ commonBlockBody: CommonBlockBody,
165
+ isExtendingPayload: boolean,
166
+ getStateAfterParentPayload: () => IBeaconStateViewBellatrix
167
+ ): CommonBlockBody["voluntaryExits"] {
168
+ if (!isExtendingPayload || commonBlockBody.voluntaryExits.length === 0) {
169
+ return commonBlockBody.voluntaryExits;
170
+ }
171
+ const state = getStateAfterParentPayload();
172
+ return commonBlockBody.voluntaryExits.filter((signedVoluntaryExit) =>
173
+ state.isValidVoluntaryExit(signedVoluntaryExit, false)
174
+ );
175
+ }
176
+
155
177
  export async function produceBlockBody<T extends BlockType>(
156
178
  this: BeaconChain,
157
179
  blockType: T,
@@ -174,6 +196,7 @@ export async function produceBlockBody<T extends BlockType>(
174
196
  proposerIndex,
175
197
  proposerPubKey,
176
198
  commonBlockBodyPromise,
199
+ builderBid,
177
200
  } = blockAttr;
178
201
  let executionPayloadValue: Wei;
179
202
  let blockBody: AssembledBodyType<T>;
@@ -194,7 +217,43 @@ export async function produceBlockBody<T extends BlockType>(
194
217
  };
195
218
  this.logger.verbose("Producing beacon block body", logMeta);
196
219
 
197
- if (isForkPostGloas(fork)) {
220
+ if (builderBid !== undefined) {
221
+ if (!isStatePostGloas(currentState)) {
222
+ throw new Error("Expected Gloas state for builder bid block production");
223
+ }
224
+
225
+ const isExtendingPayload = byteArrayEquals(
226
+ builderBid.message.parentBlockHash,
227
+ currentState.latestExecutionPayloadBid.blockHash
228
+ );
229
+ const parentExecutionRequests = isExtendingPayload
230
+ ? await this.getParentExecutionRequests(parentBlock.slot, parentBlock.blockRoot)
231
+ : ssz.electra.ExecutionRequests.defaultValue();
232
+ executionPayloadValue = BigInt(builderBid.message.value) * GWEI_TO_WEI;
233
+
234
+ const commonBlockBody = await commonBlockBodyPromise;
235
+ const gloasBody = Object.assign({}, commonBlockBody) as gloas.BeaconBlockBody;
236
+ gloasBody.signedExecutionPayloadBid = builderBid;
237
+ gloasBody.payloadAttestations = this.payloadAttestationPool.getPayloadAttestationsForBlock(
238
+ parentBlock.blockRoot,
239
+ blockSlot - 1
240
+ );
241
+ gloasBody.parentExecutionRequests = parentExecutionRequests;
242
+ gloasBody.voluntaryExits = maybeFilterInvalidatedVoluntaryExits(commonBlockBody, isExtendingPayload, () =>
243
+ currentState.withParentPayloadApplied(parentExecutionRequests)
244
+ );
245
+ blockBody = gloasBody as AssembledBodyType<T>;
246
+
247
+ this.logger.verbose("Produced block with builder bid", {
248
+ slot: blockSlot,
249
+ builderIndex: builderBid.message.builderIndex,
250
+ bidValue: builderBid.message.value,
251
+ parentBlockHash: toRootHex(builderBid.message.parentBlockHash),
252
+ parentBlockRoot: toRootHex(builderBid.message.parentBlockRoot),
253
+ blockHash: toRootHex(builderBid.message.blockHash),
254
+ isExtendingPayload,
255
+ });
256
+ } else if (isForkPostGloas(fork)) {
198
257
  if (!isStatePostGloas(currentState)) {
199
258
  throw new Error("Expected Gloas state for Gloas block production");
200
259
  }
@@ -204,23 +263,23 @@ export async function produceBlockBody<T extends BlockType>(
204
263
  // this into a completely separate function and have pre/post gloas more separated
205
264
  const safeBlockHash = getSafeExecutionBlockHash(this.forkChoice);
206
265
  const finalizedBlockHash = this.forkChoice.getFinalizedBlock().executionPayloadBlockHash ?? ZERO_HASH_HEX;
266
+ // TODO GLOAS: post-Gloas, proposer feeRecipient is also carried (signed) in
267
+ // ProposerPreferencesPool. Consider using this unified cache instead
268
+ // see https://github.com/ChainSafe/lodestar/issues/9379
207
269
  const feeRecipient = requestedFeeRecipient ?? this.beaconProposerCache.getOrDefault(proposerIndex);
208
270
 
209
271
  const endExecutionPayload = this.metrics?.executionBlockProductionTimeSteps.startTimer();
210
272
 
211
- this.logger.verbose("Preparing execution payload from engine", {
212
- slot: blockSlot,
213
- parentBlockRoot: toRootHex(parentBlockRoot),
214
- feeRecipient,
215
- });
216
-
217
273
  // Get execution payload from EL
218
274
  let parentBlockHash: Bytes32;
219
275
  let parentExecutionRequests: electra.ExecutionRequests;
220
276
  // Apply parent payload once here as it's reused by EL prep and voluntary exit filtering below
221
277
  let stateAfterParentPayload: IBeaconStateViewBellatrix = currentState;
222
- const isExtendingPayload = this.forkChoice.shouldExtendPayload(toRootHex(parentBlockRoot));
223
- if (isExtendingPayload) {
278
+ // Spec: should_build_on_full(store, head). `parentBlock` is the proposer's head
279
+ // (set by chain.getProposerHead(slot)). Returns false when the PTC majority signalled
280
+ // the blob data is not available or the payload was not timely, forcing a build on EMPTY (reorg).
281
+ const isBuildingOnFull = this.forkChoice.shouldBuildOnFull(parentBlock, blockSlot);
282
+ if (isBuildingOnFull) {
224
283
  parentBlockHash = currentState.latestExecutionPayloadBid.blockHash;
225
284
  parentExecutionRequests = await this.getParentExecutionRequests(parentBlock.slot, parentBlock.blockRoot);
226
285
  stateAfterParentPayload = currentState.withParentPayloadApplied(parentExecutionRequests);
@@ -243,6 +302,16 @@ export async function produceBlockBody<T extends BlockType>(
243
302
  const {prepType, payloadId} = prepareRes;
244
303
  Object.assign(logMeta, {executionPayloadPrepType: prepType});
245
304
 
305
+ this.logger.verbose("Prepared execution payload from engine", {
306
+ slot: blockSlot,
307
+ parentBlockRoot: toRootHex(parentBlockRoot),
308
+ parentBlockHash: toRootHex(parentBlockHash),
309
+ feeRecipient,
310
+ prepType,
311
+ payloadId,
312
+ isBuildingOnFull,
313
+ });
314
+
246
315
  if (prepType !== PayloadPreparationType.Cached) {
247
316
  await sleep(PAYLOAD_GENERATION_TIME_MS);
248
317
  }
@@ -275,7 +344,7 @@ export async function produceBlockBody<T extends BlockType>(
275
344
  blockHash: executionPayload.blockHash,
276
345
  prevRandao: currentState.getRandaoMix(currentState.epoch),
277
346
  feeRecipient: executionPayload.feeRecipient,
278
- gasLimit: BigInt(executionPayload.gasLimit),
347
+ gasLimit: executionPayload.gasLimit,
279
348
  builderIndex: BUILDER_INDEX_SELF_BUILD,
280
349
  slot: blockSlot,
281
350
  value: 0,
@@ -296,14 +365,11 @@ export async function produceBlockBody<T extends BlockType>(
296
365
  blockSlot - 1
297
366
  );
298
367
  gloasBody.parentExecutionRequests = parentExecutionRequests;
299
- // Drop voluntary exits that parent_execution_requests have invalidated (e.g. a withdrawal
300
- // request initiating an exit on the same validator). Op pool selected against the unapplied
301
- // state, so re-validate against the post-apply state to avoid producing an invalid block.
302
- if (isExtendingPayload && commonBlockBody.voluntaryExits.length > 0) {
303
- gloasBody.voluntaryExits = commonBlockBody.voluntaryExits.filter((signedVoluntaryExit) =>
304
- stateAfterParentPayload.isValidVoluntaryExit(signedVoluntaryExit, false)
305
- );
306
- }
368
+ gloasBody.voluntaryExits = maybeFilterInvalidatedVoluntaryExits(
369
+ commonBlockBody,
370
+ isBuildingOnFull,
371
+ () => stateAfterParentPayload
372
+ );
307
373
  blockBody = gloasBody as AssembledBodyType<T>;
308
374
 
309
375
  // Store execution payload data required to construct execution payload envelope later
@@ -324,6 +390,7 @@ export async function produceBlockBody<T extends BlockType>(
324
390
  fetchedTime,
325
391
  executionBlockHash: toRootHex(executionPayload.blockHash),
326
392
  blobs: blobsBundle.commitments.length,
393
+ gasLimit: executionPayload.gasLimit,
327
394
  });
328
395
 
329
396
  Object.assign(logMeta, {
@@ -633,6 +700,8 @@ export async function prepareExecutionPayload(
633
700
  chain: {
634
701
  executionEngine: IExecutionEngine;
635
702
  config: ChainForkConfig;
703
+ forkChoice: IForkChoice;
704
+ proposerPreferencesPool: ProposerPreferencesPool;
636
705
  },
637
706
  logger: Logger,
638
707
  fork: ForkPostBellatrix,
@@ -733,6 +802,7 @@ export function getPayloadAttributesForSSE(
733
802
  chain: {
734
803
  config: ChainForkConfig;
735
804
  forkChoice: IForkChoice;
805
+ proposerPreferencesPool: ProposerPreferencesPool;
736
806
  },
737
807
  {
738
808
  prepareState,
@@ -789,6 +859,8 @@ function preparePayloadAttributes(
789
859
  fork: ForkPostBellatrix,
790
860
  chain: {
791
861
  config: ChainForkConfig;
862
+ forkChoice: IForkChoice;
863
+ proposerPreferencesPool: ProposerPreferencesPool;
792
864
  },
793
865
  {
794
866
  prepareState,
@@ -851,12 +923,73 @@ function preparePayloadAttributes(
851
923
  }
852
924
 
853
925
  if (ForkSeq[fork] >= ForkSeq.gloas) {
926
+ if (!isStatePostGloas(prepareState)) {
927
+ throw new Error("Expected Gloas state for Gloas payload attributes");
928
+ }
854
929
  (payloadAttributes as gloas.SSEPayloadAttributes["payloadAttributes"]).slotNumber = prepareSlot;
930
+ (payloadAttributes as gloas.SSEPayloadAttributes["payloadAttributes"]).targetGasLimit = getProposerTargetGasLimit(
931
+ chain,
932
+ prepareSlot,
933
+ parentBlockRoot,
934
+ parentBlockHash
935
+ );
855
936
  }
856
937
 
857
938
  return payloadAttributes;
858
939
  }
859
940
 
941
+ /**
942
+ * Resolve the proposer's preferred (target) gas limit for the Gloas `PayloadAttributesV4`
943
+ * `targetGasLimit` field (consensus-specs#5235, execution-apis#796).
944
+ *
945
+ * Sourced from the `SignedProposerPreferences` the proposer's VC submitted to the pool
946
+ * (same `(slot, dependent_root)` lookup as gossip bid validation). When no matching
947
+ * preferences are pooled, target the parent payload's gas limit so the gas limit stays
948
+ * unchanged (`is_gas_limit_target_compatible` then requires `gas_limit == parent_gas_limit`).
949
+ *
950
+ * The parent payload's gas_limit is read from fork choice — the variant matching
951
+ * `(parentBlockRoot, parentBlockHash)` carries the correct value for both FULL parents
952
+ * (FULL.executionPayloadGasLimit = delivered payload's gas_limit) and EMPTY parents
953
+ * (EMPTY.executionPayloadGasLimit = inherited grandparent's gas_limit).
954
+ */
955
+ function getProposerTargetGasLimit(
956
+ chain: {forkChoice: IForkChoice; proposerPreferencesPool: ProposerPreferencesPool},
957
+ prepareSlot: Slot,
958
+ parentBlockRoot: Root,
959
+ parentBlockHash: Bytes32
960
+ ): number {
961
+ const parentBlockRootHex = toRootHex(parentBlockRoot);
962
+ const parentBlock = chain.forkChoice.getBlockHexDefaultStatus(parentBlockRootHex);
963
+ const dependentRootHex = (() => {
964
+ if (parentBlock === null) {
965
+ return null;
966
+ }
967
+ try {
968
+ return getShufflingDependentRoot(
969
+ chain.forkChoice,
970
+ computeEpochAtSlot(prepareSlot),
971
+ computeEpochAtSlot(parentBlock.slot),
972
+ parentBlock
973
+ );
974
+ } catch {
975
+ return null;
976
+ }
977
+ })();
978
+
979
+ const pref = dependentRootHex !== null ? chain.proposerPreferencesPool.get(prepareSlot, dependentRootHex) : null;
980
+ if (pref !== null) {
981
+ return pref.message.targetGasLimit;
982
+ }
983
+
984
+ const parentPayloadVariant = chain.forkChoice.getBlockHexAndBlockHash(parentBlockRootHex, toRootHex(parentBlockHash));
985
+ if (parentPayloadVariant === null || parentPayloadVariant.executionPayloadBlockHash === null) {
986
+ throw new Error(
987
+ `Cannot resolve parent payload gas_limit for proposer targetGasLimit fallback parentBlockRoot=${parentBlockRootHex} parentBlockHash=${toRootHex(parentBlockHash)}`
988
+ );
989
+ }
990
+ return parentPayloadVariant.executionPayloadGasLimit;
991
+ }
992
+
860
993
  export async function produceCommonBlockBody<T extends BlockType>(
861
994
  this: BeaconChain,
862
995
  blockType: T,
@@ -17,10 +17,12 @@ export enum RegenCaller {
17
17
  predictProposerHead = "predictProposerHead",
18
18
  produceAttestationData = "produceAttestationData",
19
19
  processBlocksInEpoch = "processBlocksInEpoch",
20
+ importExecutionPayload = "importExecutionPayload",
20
21
  validateGossipAggregateAndProof = "validateGossipAggregateAndProof",
21
22
  validateGossipAttestation = "validateGossipAttestation",
22
23
  validateGossipVoluntaryExit = "validateGossipVoluntaryExit",
23
24
  validateGossipExecutionPayloadBid = "validateGossipExecutionPayloadBid",
25
+ validateGossipPayloadAttestationMessage = "validateGossipPayloadAttestationMessage",
24
26
  validateGossipProposerPreferences = "validateGossipProposerPreferences",
25
27
  onForkChoiceFinalized = "onForkChoiceFinalized",
26
28
  restApi = "restApi",
@@ -45,7 +47,6 @@ export interface IStateRegenerator extends IStateRegeneratorInternal {
45
47
  getCheckpointStateSync(cp: CheckpointHex): IBeaconStateView | null;
46
48
  getClosestHeadState(head: ProtoBlock): IBeaconStateView | null;
47
49
  pruneOnCheckpoint(finalizedEpoch: Epoch, justifiedEpoch: Epoch, headStateRoot: RootHex): void;
48
- pruneOnFinalized(finalizedEpoch: Epoch): void;
49
50
  processState(blockRootHex: RootHex, postState: IBeaconStateView): void;
50
51
  addCheckpointState(cp: phase0.Checkpoint, item: IBeaconStateView): void;
51
52
  updateHeadState(newHead: ProtoBlock, maybeHeadState: IBeaconStateView): void;
@@ -143,11 +143,6 @@ export class QueuedStateRegenerator implements IStateRegenerator {
143
143
  this.blockStateCache.prune(headStateRoot);
144
144
  }
145
145
 
146
- pruneOnFinalized(finalizedEpoch: number): void {
147
- this.checkpointStateCache.pruneFinalized(finalizedEpoch);
148
- this.blockStateCache.deleteAllBeforeEpoch(finalizedEpoch);
149
- }
150
-
151
146
  processState(blockRootHex: RootHex, postState: IBeaconStateView): void {
152
147
  this.blockStateCache.add(postState);
153
148
  this.checkpointStateCache.processState(blockRootHex, postState).catch((e) => {
@@ -167,12 +167,6 @@ export class FIFOBlockStateCache implements BlockStateCache {
167
167
  }
168
168
  }
169
169
 
170
- /**
171
- * No need for this implementation
172
- * This is only to conform to the old api
173
- */
174
- deleteAllBeforeEpoch(): void {}
175
-
176
170
  /**
177
171
  * ONLY FOR DEBUGGING PURPOSES. For lodestar debug API.
178
172
  */
@@ -414,11 +414,12 @@ export class PersistentCheckpointStateCache implements CheckpointStateCache {
414
414
 
415
415
  /**
416
416
  * Prune all checkpoint states before the provided finalized epoch.
417
+ * Driven sequentially from processState() so it never interleaves with persist.
417
418
  */
418
- pruneFinalized(finalizedEpoch: Epoch): void {
419
+ private async pruneFinalized(finalizedEpoch: Epoch): Promise<void> {
419
420
  for (const epoch of this.epochIndex.keys()) {
420
421
  if (epoch < finalizedEpoch) {
421
- this.deleteAllEpochItems(epoch).catch((e) =>
422
+ await this.deleteAllEpochItems(epoch).catch((e) =>
422
423
  this.logger.debug("Error delete all epoch items", {epoch, finalizedEpoch}, e as Error)
423
424
  );
424
425
  }
@@ -476,6 +477,9 @@ export class PersistentCheckpointStateCache implements CheckpointStateCache {
476
477
  * As of Mar 2024, it takes <=350ms to persist a holesky state on fast server
477
478
  */
478
479
  async processState(blockRootHex: RootHex, state: IBeaconStateView): Promise<number> {
480
+ // prune finalized in the same flow so a finalized cp state is pruned, never persisted
481
+ await this.pruneFinalized(state.finalizedCheckpoint.epoch);
482
+
479
483
  let persistCount = 0;
480
484
  // it's important to sort the epochs in ascending order, in case of big reorg we always want to keep the most recent checkpoint states
481
485
  const sortedEpochs = Array.from(this.epochIndex.keys()).sort((a, b) => a - b);
@@ -30,7 +30,6 @@ export interface BlockStateCache {
30
30
  clear(): void;
31
31
  size: number;
32
32
  prune(headStateRootHex: RootHex): void;
33
- deleteAllBeforeEpoch(finalizedEpoch: Epoch): void;
34
33
  dumpSummary(): routes.lodestar.StateCacheItem[];
35
34
  /** Expose beacon states stored in cache. Use with caution */
36
35
  getStates(): IterableIterator<IBeaconStateView>;
@@ -67,7 +66,6 @@ export interface CheckpointStateCache {
67
66
  getOrReloadLatest(rootHex: RootHex, maxEpoch: Epoch): Promise<IBeaconStateView | null>;
68
67
  updatePreComputedCheckpoint(rootHex: RootHex, epoch: Epoch): number | null;
69
68
  prune(finalizedEpoch: Epoch, justifiedEpoch: Epoch): void;
70
- pruneFinalized(finalizedEpoch: Epoch): void;
71
69
  processState(blockRootHex: RootHex, state: IBeaconStateView): Promise<number>;
72
70
  clear(): void;
73
71
  dumpSummary(): routes.lodestar.StateCacheItem[];
@@ -15,12 +15,17 @@ import {BlockErrorCode, BlockGossipError, GossipAction} from "../errors/index.js
15
15
  import {IBeaconChain} from "../interface.js";
16
16
  import {RegenCaller} from "../regen/index.js";
17
17
 
18
+ export type GossipBlockValidationResult = {
19
+ /** Number of skipped slots between the block and its parent (blockSlot - parentSlot - 1) */
20
+ skippedSlots: number;
21
+ };
22
+
18
23
  export async function validateGossipBlock(
19
24
  config: ChainForkConfig,
20
25
  chain: IBeaconChain,
21
26
  signedBlock: SignedBeaconBlock,
22
27
  fork: ForkName
23
- ): Promise<void> {
28
+ ): Promise<GossipBlockValidationResult> {
24
29
  const block = signedBlock.message;
25
30
  const blockSlot = block.slot;
26
31
  const blockEpoch = computeEpochAtSlot(blockSlot);
@@ -109,21 +114,6 @@ export async function validateGossipBlock(
109
114
  }
110
115
  }
111
116
 
112
- // [IGNORE] The attestation head block is too far behind the attestation slot, causing many skip slots.
113
- // This is deemed a DoS risk because we need to get the proposerShuffling. To get the shuffling we have
114
- // to do a bunch of epoch transitions, the longer the distance between the parent and block,
115
- // the more we have to do. epochTransitions are expensive ~750ms, so we must limit how many a
116
- // single bad block can trigger
117
- // Note: Ensure this check is done before calling chain.regen.getBlockSlotStat as this is the function that does various epoch transitions.
118
- // Note: This validation check is not part of the spec.
119
- if (chain.opts.maxSkipSlots != null && parentBlock.slot + chain.opts.maxSkipSlots < blockSlot) {
120
- throw new BlockGossipError(GossipAction.IGNORE, {
121
- code: BlockErrorCode.TOO_MANY_SKIPPED_SLOTS,
122
- parentSlot: parentBlock.slot,
123
- blockSlot,
124
- });
125
- }
126
-
127
117
  // [REJECT] The block is from a higher slot than its parent.
128
118
  if (parentBlock.slot >= blockSlot) {
129
119
  throw new BlockGossipError(GossipAction.REJECT, {
@@ -133,6 +123,10 @@ export async function validateGossipBlock(
133
123
  });
134
124
  }
135
125
 
126
+ // Number of skipped slots between block and parent (non-spec). Previously this gated blocks via
127
+ // maxSkipSlots; now the caller only observes it so legitimate post-skip blocks are no longer ignored.
128
+ const skippedSlots = blockSlot - parentBlock.slot - 1;
129
+
136
130
  // [REJECT] The length of KZG commitments is less than or equal to the limitation defined in Consensus Layer -- i.e. validate that len(body.signed_beacon_block.message.blob_kzg_commitments) <= MAX_BLOBS_PER_BLOCK
137
131
  if (isForkPostDeneb(fork) && !isForkPostGloas(fork)) {
138
132
  const blobKzgCommitmentsLen = (block as deneb.BeaconBlock).body.blobKzgCommitments.length;
@@ -247,4 +241,6 @@ export async function validateGossipBlock(
247
241
  }
248
242
 
249
243
  chain.seenBlockProposers.add(blockSlot, proposerIndex);
244
+
245
+ return {skippedSlots};
250
246
  }