@lodestar/state-transition 1.43.0-dev.e341cdc614 → 1.43.0-dev.f758dd5f38

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 (69) hide show
  1. package/lib/block/index.d.ts +2 -2
  2. package/lib/block/index.d.ts.map +1 -1
  3. package/lib/block/index.js +11 -4
  4. package/lib/block/index.js.map +1 -1
  5. package/lib/block/processParentExecutionPayload.d.ts +20 -0
  6. package/lib/block/processParentExecutionPayload.d.ts.map +1 -0
  7. package/lib/block/processParentExecutionPayload.js +100 -0
  8. package/lib/block/processParentExecutionPayload.js.map +1 -0
  9. package/lib/block/processWithdrawals.d.ts.map +1 -1
  10. package/lib/block/processWithdrawals.js +12 -4
  11. package/lib/block/processWithdrawals.js.map +1 -1
  12. package/lib/cache/epochCache.d.ts +3 -1
  13. package/lib/cache/epochCache.d.ts.map +1 -1
  14. package/lib/cache/epochCache.js +31 -13
  15. package/lib/cache/epochCache.js.map +1 -1
  16. package/lib/cache/epochTransitionCache.d.ts +5 -0
  17. package/lib/cache/epochTransitionCache.d.ts.map +1 -1
  18. package/lib/cache/epochTransitionCache.js +1 -0
  19. package/lib/cache/epochTransitionCache.js.map +1 -1
  20. package/lib/epoch/index.d.ts +3 -1
  21. package/lib/epoch/index.d.ts.map +1 -1
  22. package/lib/epoch/index.js +8 -1
  23. package/lib/epoch/index.js.map +1 -1
  24. package/lib/epoch/processPtcWindow.d.ts +11 -0
  25. package/lib/epoch/processPtcWindow.d.ts.map +1 -0
  26. package/lib/epoch/processPtcWindow.js +28 -0
  27. package/lib/epoch/processPtcWindow.js.map +1 -0
  28. package/lib/signatureSets/executionPayloadEnvelope.js +1 -1
  29. package/lib/signatureSets/executionPayloadEnvelope.js.map +1 -1
  30. package/lib/slot/upgradeStateToGloas.d.ts.map +1 -1
  31. package/lib/slot/upgradeStateToGloas.js +3 -1
  32. package/lib/slot/upgradeStateToGloas.js.map +1 -1
  33. package/lib/stateTransition.js +1 -1
  34. package/lib/stateTransition.js.map +1 -1
  35. package/lib/stateView/beaconStateView.d.ts +8 -10
  36. package/lib/stateView/beaconStateView.d.ts.map +1 -1
  37. package/lib/stateView/beaconStateView.js +31 -36
  38. package/lib/stateView/beaconStateView.js.map +1 -1
  39. package/lib/stateView/interface.d.ts +19 -11
  40. package/lib/stateView/interface.d.ts.map +1 -1
  41. package/lib/stateView/interface.js.map +1 -1
  42. package/lib/util/computeAnchorCheckpoint.d.ts +1 -1
  43. package/lib/util/computeAnchorCheckpoint.d.ts.map +1 -1
  44. package/lib/util/computeAnchorCheckpoint.js +6 -19
  45. package/lib/util/computeAnchorCheckpoint.js.map +1 -1
  46. package/lib/util/gloas.d.ts +8 -3
  47. package/lib/util/gloas.d.ts.map +1 -1
  48. package/lib/util/gloas.js +27 -1
  49. package/lib/util/gloas.js.map +1 -1
  50. package/package.json +8 -8
  51. package/src/block/index.ts +12 -4
  52. package/src/block/processParentExecutionPayload.ts +116 -0
  53. package/src/block/processWithdrawals.ts +12 -4
  54. package/src/cache/epochCache.ts +32 -30
  55. package/src/cache/epochTransitionCache.ts +7 -0
  56. package/src/epoch/index.ts +9 -0
  57. package/src/epoch/processPtcWindow.ts +38 -0
  58. package/src/signatureSets/executionPayloadEnvelope.ts +1 -1
  59. package/src/slot/upgradeStateToGloas.ts +5 -1
  60. package/src/stateTransition.ts +1 -1
  61. package/src/stateView/beaconStateView.ts +36 -47
  62. package/src/stateView/interface.ts +26 -14
  63. package/src/util/computeAnchorCheckpoint.ts +6 -19
  64. package/src/util/gloas.ts +50 -3
  65. package/lib/block/processExecutionPayloadEnvelope.d.ts +0 -9
  66. package/lib/block/processExecutionPayloadEnvelope.d.ts.map +0 -1
  67. package/lib/block/processExecutionPayloadEnvelope.js +0 -106
  68. package/lib/block/processExecutionPayloadEnvelope.js.map +0 -1
  69. package/src/block/processExecutionPayloadEnvelope.ts +0 -175
@@ -32,10 +32,10 @@ import {
32
32
  calculateShufflingDecisionRoot,
33
33
  computeEpochShuffling,
34
34
  } from "../util/epochShuffling.js";
35
+ import {getPtcWindowEpochCacheData} from "../util/gloas.js";
35
36
  import {
36
37
  computeActivationExitEpoch,
37
38
  computeEpochAtSlot,
38
- computePayloadTimelinessCommitteesForEpoch,
39
39
  computeProposers,
40
40
  computeSyncPeriodAtEpoch,
41
41
  getActivationChurnLimit,
@@ -56,7 +56,7 @@ import {sumTargetUnslashedBalanceIncrements} from "../util/targetUnslashedBalanc
56
56
  import {EffectiveBalanceIncrements, getEffectiveBalanceIncrementsWithLen} from "./effectiveBalanceIncrements.js";
57
57
  import {EpochTransitionCache} from "./epochTransitionCache.js";
58
58
  import {PubkeyCache, createPubkeyCache, syncPubkeys} from "./pubkeyCache.js";
59
- import {CachedBeaconStateAllForks, CachedBeaconStateFulu} from "./stateCache.js";
59
+ import {CachedBeaconStateAllForks, CachedBeaconStateFulu, CachedBeaconStateGloas} from "./stateCache.js";
60
60
  import {
61
61
  SyncCommitteeCache,
62
62
  SyncCommitteeCacheEmpty,
@@ -226,11 +226,12 @@ export class EpochCache {
226
226
  /** TODO: Indexed SyncCommitteeCache */
227
227
  nextSyncCommitteeIndexed: SyncCommitteeCache;
228
228
 
229
- // TODO GLOAS: See if we need to cache PTC for next epoch
230
229
  // PTC for previous epoch, required for slot N block validating slot N-1 attestations
231
230
  previousPayloadTimelinessCommittees: Uint32Array[];
232
231
  // PTC for current epoch, computed eagerly at epoch transition
233
232
  payloadTimelinessCommittees: Uint32Array[];
233
+ // PTC for next epoch, precomputed from the ptc window for future duty serving
234
+ nextPayloadTimelinessCommittees: Uint32Array[];
234
235
 
235
236
  // TODO: Helper stats
236
237
  syncPeriod: SyncPeriod;
@@ -270,6 +271,7 @@ export class EpochCache {
270
271
  nextSyncCommitteeIndexed: SyncCommitteeCache;
271
272
  previousPayloadTimelinessCommittees: Uint32Array[];
272
273
  payloadTimelinessCommittees: Uint32Array[];
274
+ nextPayloadTimelinessCommittees: Uint32Array[];
273
275
  epoch: Epoch;
274
276
  syncPeriod: SyncPeriod;
275
277
  }) {
@@ -301,6 +303,7 @@ export class EpochCache {
301
303
  this.nextSyncCommitteeIndexed = data.nextSyncCommitteeIndexed;
302
304
  this.previousPayloadTimelinessCommittees = data.previousPayloadTimelinessCommittees;
303
305
  this.payloadTimelinessCommittees = data.payloadTimelinessCommittees;
306
+ this.nextPayloadTimelinessCommittees = data.nextPayloadTimelinessCommittees;
304
307
  this.epoch = data.epoch;
305
308
  this.syncPeriod = data.syncPeriod;
306
309
  }
@@ -451,25 +454,13 @@ export class EpochCache {
451
454
  nextSyncCommitteeIndexed = new SyncCommitteeCacheEmpty();
452
455
  }
453
456
 
454
- // Compute PTC for all slots in the prev/current epoch
457
+ // Copy previous/current epoch PTC slices from state.ptcWindow once, then serve hot-path lookups from epochCtx.
455
458
  let previousPayloadTimelinessCommittees: Uint32Array[] = [];
456
459
  let payloadTimelinessCommittees: Uint32Array[] = [];
460
+ let nextPayloadTimelinessCommittees: Uint32Array[] = [];
457
461
  if (currentEpoch >= config.GLOAS_FORK_EPOCH) {
458
- payloadTimelinessCommittees = computePayloadTimelinessCommitteesForEpoch(
459
- state,
460
- currentEpoch,
461
- currentShuffling.committees,
462
- effectiveBalanceIncrements
463
- );
464
-
465
- if (!isGenesis && previousEpoch >= config.GLOAS_FORK_EPOCH) {
466
- previousPayloadTimelinessCommittees = computePayloadTimelinessCommitteesForEpoch(
467
- state,
468
- previousEpoch,
469
- previousShuffling.committees,
470
- effectiveBalanceIncrements
471
- );
472
- }
462
+ ({previousPayloadTimelinessCommittees, payloadTimelinessCommittees, nextPayloadTimelinessCommittees} =
463
+ getPtcWindowEpochCacheData(state as CachedBeaconStateGloas));
473
464
  }
474
465
 
475
466
  // Precompute churnLimit for efficient initiateValidatorExit() during block proposing MUST be recompute everytime the
@@ -546,6 +537,7 @@ export class EpochCache {
546
537
  nextSyncCommitteeIndexed,
547
538
  previousPayloadTimelinessCommittees,
548
539
  payloadTimelinessCommittees,
540
+ nextPayloadTimelinessCommittees,
549
541
  epoch: currentEpoch,
550
542
  syncPeriod: computeSyncPeriodAtEpoch(currentEpoch),
551
543
  });
@@ -592,6 +584,7 @@ export class EpochCache {
592
584
  nextSyncCommitteeIndexed: this.nextSyncCommitteeIndexed,
593
585
  previousPayloadTimelinessCommittees: this.previousPayloadTimelinessCommittees,
594
586
  payloadTimelinessCommittees: this.payloadTimelinessCommittees,
587
+ nextPayloadTimelinessCommittees: this.nextPayloadTimelinessCommittees,
595
588
  epoch: this.epoch,
596
589
  syncPeriod: this.syncPeriod,
597
590
  });
@@ -695,21 +688,26 @@ export class EpochCache {
695
688
  /**
696
689
  * At fork boundary, this runs post-fork logic and it happens after `upgradeState*` is called.
697
690
  */
698
- finalProcessEpoch(state: CachedBeaconStateAllForks): void {
691
+ finalProcessEpoch(state: CachedBeaconStateAllForks, epochTransitionCache: EpochTransitionCache): void {
699
692
  // this.epoch was updated at the end of afterProcessEpoch()
700
693
  const upcomingEpoch = this.epoch;
701
694
  const epochAfterUpcoming = upcomingEpoch + 1;
702
695
 
703
696
  this.proposersPrevEpoch = this.proposers;
704
697
  if (upcomingEpoch >= this.config.GLOAS_FORK_EPOCH) {
705
- // Shift and compute current epoch PTC eagerly for all slots
706
- this.previousPayloadTimelinessCommittees = this.payloadTimelinessCommittees;
707
- this.payloadTimelinessCommittees = computePayloadTimelinessCommitteesForEpoch(
708
- state,
709
- upcomingEpoch,
710
- this.currentShuffling.committees,
711
- this.effectiveBalanceIncrements
712
- );
698
+ if (epochTransitionCache.nextEpochPayloadTimelinessCommittees) {
699
+ // shift arrays from transition cache
700
+ this.previousPayloadTimelinessCommittees = this.payloadTimelinessCommittees;
701
+ this.payloadTimelinessCommittees = this.nextPayloadTimelinessCommittees;
702
+ this.nextPayloadTimelinessCommittees = epochTransitionCache.nextEpochPayloadTimelinessCommittees;
703
+ } else {
704
+ // Fork boundary: processPtcWindow didn't run, read from freshly initialized state.ptcWindow
705
+ ({
706
+ previousPayloadTimelinessCommittees: this.previousPayloadTimelinessCommittees,
707
+ payloadTimelinessCommittees: this.payloadTimelinessCommittees,
708
+ nextPayloadTimelinessCommittees: this.nextPayloadTimelinessCommittees,
709
+ } = getPtcWindowEpochCacheData(state as CachedBeaconStateGloas));
710
+ }
713
711
  }
714
712
  if (upcomingEpoch >= this.config.FULU_FORK_EPOCH) {
715
713
  // Populate proposer cache with lookahead from state
@@ -1034,12 +1032,16 @@ export class EpochCache {
1034
1032
  throw new Error("Payload Timeliness Committee is not available before gloas fork");
1035
1033
  }
1036
1034
 
1035
+ if (epoch === this.epoch - 1) {
1036
+ return this.previousPayloadTimelinessCommittees[slot % SLOTS_PER_EPOCH];
1037
+ }
1038
+
1037
1039
  if (epoch === this.epoch) {
1038
1040
  return this.payloadTimelinessCommittees[slot % SLOTS_PER_EPOCH];
1039
1041
  }
1040
1042
 
1041
- if (epoch === this.epoch - 1 && this.previousPayloadTimelinessCommittees.length > 0) {
1042
- return this.previousPayloadTimelinessCommittees[slot % SLOTS_PER_EPOCH];
1043
+ if (epoch === this.epoch + 1) {
1044
+ return this.nextPayloadTimelinessCommittees[slot % SLOTS_PER_EPOCH];
1043
1045
  }
1044
1046
 
1045
1047
  throw new Error(`Payload Timeliness Committee is not available for slot=${slot}`);
@@ -158,6 +158,12 @@ export interface EpochTransitionCache {
158
158
  */
159
159
  nextShuffling: EpochShuffling | null;
160
160
 
161
+ /**
162
+ * Pre-computed PTC for epoch N + MIN_SEED_LOOKAHEAD + 1, populated by processPtcWindow (Gloas+).
163
+ * Used by finalProcessEpoch to shift PTC arrays in epoch cache without reading from state.
164
+ */
165
+ nextEpochPayloadTimelinessCommittees: Uint32Array[] | null;
166
+
161
167
  /**
162
168
  * Altair specific, this is total active balances for the next epoch.
163
169
  * This is only used in `afterProcessEpoch` to compute base reward and sync participant reward.
@@ -502,6 +508,7 @@ export function beforeProcessEpoch(
502
508
  indicesToEject,
503
509
  nextShufflingActiveIndices,
504
510
  nextShuffling: null,
511
+ nextEpochPayloadTimelinessCommittees: null,
505
512
  // to be updated in processEffectiveBalanceUpdates
506
513
  nextEpochTotalActiveBalanceByIncrement: 0,
507
514
  isActivePrevEpoch,
@@ -28,6 +28,7 @@ import {processParticipationRecordUpdates} from "./processParticipationRecordUpd
28
28
  import {processPendingConsolidations} from "./processPendingConsolidations.js";
29
29
  import {processPendingDeposits} from "./processPendingDeposits.js";
30
30
  import {processProposerLookahead} from "./processProposerLookahead.js";
31
+ import {processPtcWindow} from "./processPtcWindow.js";
31
32
  import {processRandaoMixesReset} from "./processRandaoMixesReset.js";
32
33
  import {processRegistryUpdates} from "./processRegistryUpdates.js";
33
34
  import {processRewardsAndPenalties} from "./processRewardsAndPenalties.js";
@@ -55,6 +56,7 @@ export {
55
56
  processPendingDeposits,
56
57
  processPendingConsolidations,
57
58
  processProposerLookahead,
59
+ processPtcWindow,
58
60
  processBuilderPendingPayments,
59
61
  };
60
62
 
@@ -81,6 +83,7 @@ export enum EpochTransitionStep {
81
83
  processPendingDeposits = "processPendingDeposits",
82
84
  processPendingConsolidations = "processPendingConsolidations",
83
85
  processProposerLookahead = "processProposerLookahead",
86
+ processPtcWindow = "processPtcWindow",
84
87
  processBuilderPendingPayments = "processBuilderPendingPayments",
85
88
  }
86
89
 
@@ -211,4 +214,10 @@ export function processEpoch(
211
214
  processProposerLookahead(fork, state as CachedBeaconStateFulu, cache);
212
215
  timer?.();
213
216
  }
217
+
218
+ if (fork >= ForkSeq.gloas) {
219
+ const timer = metrics?.epochTransitionStepTime.startTimer({step: EpochTransitionStep.processPtcWindow});
220
+ processPtcWindow(state as CachedBeaconStateGloas, cache);
221
+ timer?.();
222
+ }
214
223
  }
@@ -0,0 +1,38 @@
1
+ import {MIN_SEED_LOOKAHEAD} from "@lodestar/params";
2
+ import {ssz} from "@lodestar/types";
3
+ import {CachedBeaconStateGloas, EpochTransitionCache} from "../types.js";
4
+ import {computeEpochShuffling} from "../util/epochShuffling.js";
5
+ import {computePayloadTimelinessCommitteesForEpoch} from "../util/seed.js";
6
+
7
+ /**
8
+ * Update the `ptc_window` field in the beacon state by shifting out the oldest epoch's
9
+ * PTC entries and appending newly computed entries for the next lookahead epoch.
10
+ * Stashes the computed PTCs in the transition cache for finalProcessEpoch to shift
11
+ * into the epoch cache without reading from state.
12
+ *
13
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.4/specs/gloas/beacon-chain.md#new-process_ptc_window
14
+ */
15
+ export function processPtcWindow(state: CachedBeaconStateGloas, cache: EpochTransitionCache): void {
16
+ const nextEpoch = state.epochCtx.epoch + MIN_SEED_LOOKAHEAD + 1;
17
+ const nextEpochShuffling =
18
+ cache.nextShuffling ?? computeEpochShuffling(state, cache.nextShufflingActiveIndices, nextEpoch);
19
+ cache.nextShuffling = nextEpochShuffling;
20
+
21
+ const newNextPayloadTimelinessCommittees = computePayloadTimelinessCommitteesForEpoch(
22
+ state,
23
+ nextEpoch,
24
+ nextEpochShuffling.committees,
25
+ state.epochCtx.effectiveBalanceIncrements
26
+ );
27
+
28
+ // Stash for finalProcessEpoch to shift into epoch cache
29
+ cache.nextEpochPayloadTimelinessCommittees = newNextPayloadTimelinessCommittees;
30
+
31
+ // Write shifted window to state: current(N) + next(N+1) + newlyComputed(N+2)
32
+ // From the perspective of upcoming epoch N+1, this is previous + current + next
33
+ state.ptcWindow = ssz.gloas.PtcWindow.toViewDU([
34
+ ...state.epochCtx.payloadTimelinessCommittees,
35
+ ...state.epochCtx.nextPayloadTimelinessCommittees,
36
+ ...newNextPayloadTimelinessCommittees,
37
+ ]);
38
+ }
@@ -11,7 +11,7 @@ export function getExecutionPayloadEnvelopeSigningRoot(
11
11
  config: BeaconConfig,
12
12
  envelope: gloas.ExecutionPayloadEnvelope
13
13
  ): Uint8Array {
14
- const domain = config.getDomain(envelope.slot, DOMAIN_BEACON_BUILDER);
14
+ const domain = config.getDomain(envelope.payload.slotNumber, DOMAIN_BEACON_BUILDER);
15
15
 
16
16
  return computeSigningRoot(ssz.gloas.ExecutionPayloadEnvelope, envelope, domain);
17
17
  }
@@ -5,7 +5,7 @@ import {isValidDepositSignature} from "../block/processDeposit.js";
5
5
  import {applyDepositForBuilder} from "../block/processDepositRequest.js";
6
6
  import {getCachedBeaconState} from "../cache/stateCache.js";
7
7
  import {CachedBeaconStateFulu, CachedBeaconStateGloas} from "../types.js";
8
- import {isBuilderWithdrawalCredential} from "../util/gloas.js";
8
+ import {initializePtcWindow, isBuilderWithdrawalCredential} from "../util/gloas.js";
9
9
  import {isValidatorKnown} from "../util/index.js";
10
10
 
11
11
  /**
@@ -48,6 +48,9 @@ export function upgradeStateToGloas(stateFulu: CachedBeaconStateFulu): CachedBea
48
48
  stateGloasView.currentSyncCommittee = stateGloasCloned.currentSyncCommittee;
49
49
  stateGloasView.nextSyncCommittee = stateGloasCloned.nextSyncCommittee;
50
50
  stateGloasView.latestExecutionPayloadBid.blockHash = stateFulu.latestExecutionPayloadHeader.blockHash;
51
+ stateGloasView.latestExecutionPayloadBid.executionRequestsRoot = ssz.electra.ExecutionRequests.hashTreeRoot(
52
+ ssz.electra.ExecutionRequests.defaultValue()
53
+ );
51
54
  stateGloasView.nextWithdrawalIndex = stateGloasCloned.nextWithdrawalIndex;
52
55
  stateGloasView.nextWithdrawalValidatorIndex = stateGloasCloned.nextWithdrawalValidatorIndex;
53
56
  stateGloasView.historicalSummaries = stateGloasCloned.historicalSummaries;
@@ -61,6 +64,7 @@ export function upgradeStateToGloas(stateFulu: CachedBeaconStateFulu): CachedBea
61
64
  stateGloasView.pendingPartialWithdrawals = stateGloasCloned.pendingPartialWithdrawals;
62
65
  stateGloasView.pendingConsolidations = stateGloasCloned.pendingConsolidations;
63
66
  stateGloasView.proposerLookahead = stateGloasCloned.proposerLookahead;
67
+ stateGloasView.ptcWindow = ssz.gloas.PtcWindow.toViewDU(initializePtcWindow(stateFulu));
64
68
 
65
69
  for (let i = 0; i < SLOTS_PER_HISTORICAL_ROOT; i++) {
66
70
  stateGloasView.executionPayloadAvailability.set(i, true);
@@ -282,7 +282,7 @@ function processSlotsWithTransientCache(
282
282
  {
283
283
  const timer = metrics?.epochTransitionStepTime.startTimer({step: EpochTransitionStep.finalProcessEpoch});
284
284
  // last step to prepare epoch data that depends on the upgraded state, for example proposerLookahead of BeaconStateFulu
285
- postState.epochCtx.finalProcessEpoch(postState);
285
+ postState.epochCtx.finalProcessEpoch(postState, epochTransitionCache);
286
286
  timer?.();
287
287
  }
288
288
 
@@ -1,7 +1,7 @@
1
1
  import {CompactMultiProof, ProofType, Tree, createProof} from "@chainsafe/persistent-merkle-tree";
2
2
  import {BitArray, ByteViews} from "@chainsafe/ssz";
3
3
  import {BeaconConfig} from "@lodestar/config";
4
- import {ForkName, ForkSeq, SLOTS_PER_HISTORICAL_ROOT, isForkPostGloas} from "@lodestar/params";
4
+ import {ForkName, ForkSeq, SLOTS_PER_HISTORICAL_ROOT} from "@lodestar/params";
5
5
  import {
6
6
  BeaconBlock,
7
7
  BeaconState,
@@ -28,8 +28,7 @@ import {
28
28
  rewards,
29
29
  } from "@lodestar/types";
30
30
  import {Checkpoint, Fork} from "@lodestar/types/phase0";
31
- import {processExecutionPayloadEnvelope} from "../block/index.js";
32
- import {ProcessExecutionPayloadEnvelopeOpts} from "../block/processExecutionPayloadEnvelope.js";
31
+ import {applyParentExecutionPayload} from "../block/processParentExecutionPayload.js";
33
32
  import {VoluntaryExitValidity, getVoluntaryExitValidity} from "../block/processVoluntaryExit.js";
34
33
  import {getExpectedWithdrawals} from "../block/processWithdrawals.js";
35
34
  import {EffectiveBalanceIncrements} from "../cache/effectiveBalanceIncrements.js";
@@ -84,8 +83,6 @@ export class BeaconStateView implements IBeaconStateViewLatestFork {
84
83
  private _currentEpochParticipation: Uint8Array | null = null;
85
84
  // bellatrix
86
85
  private _latestExecutionPayloadHeader: ExecutionPayloadHeader | null = null;
87
- // Caches the cross-fork latestBlockHash value
88
- private _latestBlockHash: Bytes32 | null = null;
89
86
  // capella
90
87
  private _historicalSummaries: capella.HistoricalSummaries | null = null;
91
88
  // electra
@@ -218,9 +215,13 @@ export class BeaconStateView implements IBeaconStateViewLatestFork {
218
215
  // bellatrix
219
216
 
220
217
  get latestExecutionPayloadHeader(): ExecutionPayloadHeader {
221
- if (this.config.getForkSeq(this.cachedState.slot) < ForkSeq.bellatrix) {
218
+ const forkSeq = this.config.getForkSeq(this.cachedState.slot);
219
+ if (forkSeq < ForkSeq.bellatrix) {
222
220
  throw new Error("latestExecutionPayloadHeader is not available before Bellatrix");
223
221
  }
222
+ if (forkSeq >= ForkSeq.gloas) {
223
+ throw new Error("latestExecutionPayloadHeader is not available after Gloas");
224
+ }
224
225
 
225
226
  if (this._latestExecutionPayloadHeader === null) {
226
227
  this._latestExecutionPayloadHeader = (
@@ -231,30 +232,6 @@ export class BeaconStateView implements IBeaconStateViewLatestFork {
231
232
  return this._latestExecutionPayloadHeader;
232
233
  }
233
234
 
234
- /**
235
- * Cross-fork accessor for the execution block hash of the most recently included payload.
236
- * Pre-gloas: reads from latestExecutionPayloadHeader.blockHash.
237
- * Gloas+: reads the dedicated latestBlockHash field (EIP-7732).
238
- */
239
- get latestBlockHash(): Bytes32 {
240
- const forkSeq = this.config.getForkSeq(this.cachedState.slot);
241
- if (forkSeq < ForkSeq.bellatrix) {
242
- throw new Error("latestBlockHash is not available before Bellatrix");
243
- }
244
-
245
- if (this._latestBlockHash === null) {
246
- if (forkSeq >= ForkSeq.gloas) {
247
- this._latestBlockHash = (this.cachedState as CachedBeaconStateGloas).latestBlockHash;
248
- } else {
249
- this._latestBlockHash = (
250
- this.cachedState as CachedBeaconStateExecutions
251
- ).latestExecutionPayloadHeader.blockHash;
252
- }
253
- }
254
-
255
- return this._latestBlockHash;
256
- }
257
-
258
235
  /**
259
236
  * The execution block number of the most recently included payload.
260
237
  * Named payloadBlockNumber (not latestBlockNumber) to mirror ExecutionPayloadHeader.blockNumber pre-gloas.
@@ -365,6 +342,13 @@ export class BeaconStateView implements IBeaconStateViewLatestFork {
365
342
 
366
343
  // gloas
367
344
 
345
+ get latestBlockHash(): Bytes32 {
346
+ if (this.config.getForkSeq(this.cachedState.slot) < ForkSeq.gloas) {
347
+ throw new Error("latestBlockHash is not available before Gloas");
348
+ }
349
+ return (this.cachedState as CachedBeaconStateGloas).latestBlockHash;
350
+ }
351
+
368
352
  get executionPayloadAvailability(): BitArray {
369
353
  if (this.config.getForkSeq(this.cachedState.slot) < ForkSeq.gloas) {
370
354
  throw new Error("executionPayloadAvailability is not available before Gloas");
@@ -719,7 +703,11 @@ export class BeaconStateView implements IBeaconStateViewLatestFork {
719
703
 
720
704
  // Serialization
721
705
 
722
- loadOtherState(stateBytes: Uint8Array, seedValidatorsBytes?: Uint8Array): IBeaconStateView {
706
+ loadOtherState(
707
+ stateBytes: Uint8Array,
708
+ seedValidatorsBytes?: Uint8Array,
709
+ opts?: {preloadValidatorsAndBalances?: boolean}
710
+ ): IBeaconStateView {
723
711
  const {state} = loadState(this.config, this.cachedState, stateBytes, seedValidatorsBytes);
724
712
 
725
713
  const cachedState = createCachedBeaconState(
@@ -734,9 +722,10 @@ export class BeaconStateView implements IBeaconStateViewLatestFork {
734
722
  }
735
723
  );
736
724
 
737
- // load all cache in order for consumers (usually regen.getState()) to process blocks faster
738
- cachedState.validators.getAllReadonlyValues();
739
- cachedState.balances.getAll();
725
+ if (opts?.preloadValidatorsAndBalances) {
726
+ cachedState.validators.getAllReadonlyValues();
727
+ cachedState.balances.getAll();
728
+ }
740
729
 
741
730
  return new BeaconStateView(cachedState);
742
731
  }
@@ -794,19 +783,19 @@ export class BeaconStateView implements IBeaconStateViewLatestFork {
794
783
  return new BeaconStateView(newState);
795
784
  }
796
785
 
797
- processExecutionPayloadEnvelope(
798
- signedEnvelope: gloas.SignedExecutionPayloadEnvelope,
799
- opts?: ProcessExecutionPayloadEnvelopeOpts
800
- ): BeaconStateView {
801
- const fork = this.config.getForkName(this.cachedState.slot);
802
- if (!isForkPostGloas(fork)) {
803
- throw Error(`processExecutionPayloadEnvelope is only available for gloas+ forks, got fork=${fork}`);
786
+ /**
787
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.5/specs/gloas/validator.md#executionpayload
788
+ */
789
+ getExpectedWithdrawalsForFullParent(executionRequests: electra.ExecutionRequests): capella.Withdrawal[] {
790
+ const fork = this.config.getForkSeq(this.cachedState.slot);
791
+ if (fork < ForkSeq.gloas) {
792
+ throw new Error("getExpectedWithdrawalsForFullParent is not available before Gloas");
804
793
  }
805
- const postPayloadState = processExecutionPayloadEnvelope(
806
- this.cachedState as CachedBeaconStateGloas,
807
- signedEnvelope,
808
- opts
809
- );
810
- return new BeaconStateView(postPayloadState);
794
+ // Make a copy of the state to avoid mutability issues
795
+ const stateCopy = this.cachedState.clone(true) as CachedBeaconStateGloas;
796
+ // Apply parent payload before computing withdrawals
797
+ applyParentExecutionPayload(stateCopy, executionRequests);
798
+
799
+ return getExpectedWithdrawals(fork, stateCopy).expectedWithdrawals;
811
800
  }
812
801
  }
@@ -41,7 +41,6 @@ import {
41
41
  rewards,
42
42
  } from "@lodestar/types";
43
43
  import {Checkpoint, Fork} from "@lodestar/types/phase0";
44
- import {ProcessExecutionPayloadEnvelopeOpts} from "../block/processExecutionPayloadEnvelope.js";
45
44
  import {VoluntaryExitValidity} from "../block/processVoluntaryExit.js";
46
45
  import {EffectiveBalanceIncrements} from "../cache/effectiveBalanceIncrements.js";
47
46
  import {EpochTransitionCacheOpts} from "../cache/epochTransitionCache.js";
@@ -138,7 +137,13 @@ export interface IBeaconStateView {
138
137
  isStateValidatorsNodesPopulated(): boolean;
139
138
 
140
139
  // Serialization
141
- loadOtherState(stateBytes: Uint8Array, seedValidatorsBytes?: Uint8Array): IBeaconStateView;
140
+ /** Set `preloadValidatorsAndBalances` only when the whole state will be consumed
141
+ * immediately (e.g. CP reload before block replay). */
142
+ loadOtherState(
143
+ stateBytes: Uint8Array,
144
+ seedValidatorsBytes?: Uint8Array,
145
+ opts?: {preloadValidatorsAndBalances?: boolean}
146
+ ): IBeaconStateView;
142
147
  toValue(): BeaconState;
143
148
  serialize(): Uint8Array;
144
149
  serializedSize(): number;
@@ -187,13 +192,6 @@ export interface IBeaconStateViewAltair extends IBeaconStateView {
187
192
  export interface IBeaconStateViewBellatrix extends IBeaconStateViewAltair {
188
193
  forkName: ForkPostBellatrix;
189
194
  latestExecutionPayloadHeader: ExecutionPayloadHeader;
190
- /**
191
- * Cross-fork accessor for the execution block hash of the most recently included payload.
192
- * Pre-gloas: returns latestExecutionPayloadHeader.blockHash (bellatrix–fulu).
193
- * Gloas+: returns the dedicated latestBlockHash state field (EIP-7732).
194
- * Throws before bellatrix.
195
- */
196
- latestBlockHash: Bytes32;
197
195
  /**
198
196
  * The execution block number of the most recently included payload.
199
197
  * Named payloadBlockNumber (not latestBlockNumber) to mirror ExecutionPayloadHeader.blockNumber pre-gloas.
@@ -244,16 +242,23 @@ export interface IBeaconStateViewFulu extends IBeaconStateViewElectra {
244
242
  /** Gloas+ state fields — use isStatePostGloas() guard */
245
243
  export interface IBeaconStateViewGloas extends IBeaconStateViewFulu {
246
244
  forkName: ForkPostGloas;
245
+ /** Removed from BeaconState in gloas. Use `latestBlockHash` instead. */
246
+ latestExecutionPayloadHeader: never;
247
+ /** Removed from BeaconState in gloas. */
248
+ payloadBlockNumber: never;
249
+ latestBlockHash: Bytes32;
247
250
  executionPayloadAvailability: BitArray;
248
251
  latestExecutionPayloadBid: ExecutionPayloadBid;
249
252
  payloadExpectedWithdrawals: capella.Withdrawal[];
250
253
  getBuilder(index: BuilderIndex): gloas.Builder;
251
254
  canBuilderCoverBid(builderIndex: BuilderIndex, bidAmount: number): boolean;
252
255
  getIndexInPayloadTimelinessCommittee(validatorIndex: ValidatorIndex, slot: Slot): number;
253
- processExecutionPayloadEnvelope(
254
- signedEnvelope: gloas.SignedExecutionPayloadEnvelope,
255
- opts?: ProcessExecutionPayloadEnvelopeOpts
256
- ): IBeaconStateView;
256
+ /**
257
+ * Compute expected withdrawals as if the parent was FULL.
258
+ * Clones the state, applies parent payload effects, then computes withdrawals.
259
+ * Used by prepare_execution_payload when building on FULL parent.
260
+ */
261
+ getExpectedWithdrawalsForFullParent(executionRequests: electra.ExecutionRequests): capella.Withdrawal[];
257
262
  }
258
263
 
259
264
  /**
@@ -262,7 +267,14 @@ export interface IBeaconStateViewGloas extends IBeaconStateViewFulu {
262
267
  * forkName as ForkName since the class wraps any fork's state.
263
268
  * Sub-interfaces retain their narrowed forkName discriminants for caller-side type guards.
264
269
  */
265
- export type IBeaconStateViewLatestFork = Omit<IBeaconStateViewGloas, "forkName"> & {forkName: ForkName};
270
+ export type IBeaconStateViewLatestFork = Omit<
271
+ IBeaconStateViewGloas,
272
+ "forkName" | "latestExecutionPayloadHeader" | "payloadBlockNumber"
273
+ > & {
274
+ forkName: ForkName;
275
+ latestExecutionPayloadHeader: ExecutionPayloadHeader;
276
+ payloadBlockNumber: number;
277
+ };
266
278
  export function isStatePostAltair(state: IBeaconStateView): state is IBeaconStateViewAltair {
267
279
  return isForkPostAltair(state.forkName);
268
280
  }
@@ -1,34 +1,21 @@
1
1
  import {ChainForkConfig} from "@lodestar/config";
2
- import {GENESIS_SLOT, ZERO_HASH} from "@lodestar/params";
2
+ import {ZERO_HASH} from "@lodestar/params";
3
3
  import {phase0, ssz} from "@lodestar/types";
4
4
  import {BeaconStateAllForks} from "../types.js";
5
- import {blockToHeader} from "./blockRoot.js";
6
5
  import {computeCheckpointEpochAtStateSlot} from "./epoch.js";
7
6
 
8
7
  export function computeAnchorCheckpoint(
9
- config: ChainForkConfig,
8
+ _config: ChainForkConfig,
10
9
  anchorState: BeaconStateAllForks
11
10
  ): {checkpoint: phase0.Checkpoint; blockHeader: phase0.BeaconBlockHeader} {
12
- let blockHeader: phase0.BeaconBlockHeader;
13
- let root: Uint8Array;
14
- const blockTypes = config.getForkTypes(anchorState.latestBlockHeader.slot);
15
-
16
- if (anchorState.latestBlockHeader.slot === GENESIS_SLOT) {
17
- const block = blockTypes.BeaconBlock.defaultValue();
18
- block.stateRoot = anchorState.hashTreeRoot();
19
- blockHeader = blockToHeader(config, block);
20
- root = ssz.phase0.BeaconBlockHeader.hashTreeRoot(blockHeader);
21
- } else {
22
- blockHeader = ssz.phase0.BeaconBlockHeader.clone(anchorState.latestBlockHeader);
23
- if (ssz.Root.equals(blockHeader.stateRoot, ZERO_HASH)) {
24
- blockHeader.stateRoot = anchorState.hashTreeRoot();
25
- }
26
- root = ssz.phase0.BeaconBlockHeader.hashTreeRoot(blockHeader);
11
+ const blockHeader = ssz.phase0.BeaconBlockHeader.clone(anchorState.latestBlockHeader);
12
+ if (ssz.Root.equals(blockHeader.stateRoot, ZERO_HASH)) {
13
+ blockHeader.stateRoot = anchorState.hashTreeRoot();
27
14
  }
28
15
 
29
16
  return {
30
17
  checkpoint: {
31
- root,
18
+ root: ssz.phase0.BeaconBlockHeader.hashTreeRoot(blockHeader),
32
19
  // the checkpoint epoch = computeEpochAtSlot(anchorState.slot) + 1 if slot is not at epoch boundary
33
20
  // this is similar to a process_slots() call
34
21
  epoch: computeCheckpointEpochAtStateSlot(anchorState.slot),
package/src/util/gloas.ts CHANGED
@@ -6,16 +6,20 @@ import {
6
6
  EFFECTIVE_BALANCE_INCREMENT,
7
7
  FAR_FUTURE_EPOCH,
8
8
  MIN_DEPOSIT_AMOUNT,
9
+ MIN_SEED_LOOKAHEAD,
10
+ PTC_SIZE,
9
11
  SLOTS_PER_EPOCH,
10
12
  } from "@lodestar/params";
11
13
  import {BuilderIndex, Epoch, ValidatorIndex, gloas} from "@lodestar/types";
12
14
  import {AttestationData} from "@lodestar/types/phase0";
13
15
  import {byteArrayEquals} from "@lodestar/utils";
14
- import {IBeaconStateViewGloas} from "../stateView/interface.js";
15
- import {CachedBeaconStateGloas} from "../types.js";
16
+ import {CachedBeaconStateFulu, CachedBeaconStateGloas} from "../types.js";
16
17
  import {getBlockRootAtSlot} from "./blockRoot.js";
17
18
  import {computeEpochAtSlot} from "./epoch.js";
19
+ import {computeEpochShuffling} from "./epochShuffling.js";
18
20
  import {RootCache} from "./rootCache.js";
21
+ import {computePayloadTimelinessCommitteesForEpoch} from "./seed.js";
22
+ import {getActiveValidatorIndices} from "./validator.js";
19
23
 
20
24
  export function isBuilderWithdrawalCredential(withdrawalCredentials: Uint8Array): boolean {
21
25
  return withdrawalCredentials[0] === BUILDER_WITHDRAWAL_PREFIX;
@@ -168,6 +172,49 @@ export function isAttestationSameSlotRootCache(rootCache: RootCache, data: Attes
168
172
  return isMatchingBlockRoot && isCurrentBlockRoot;
169
173
  }
170
174
 
171
- export function isParentBlockFull(state: CachedBeaconStateGloas | IBeaconStateViewGloas): boolean {
175
+ // TODO GLOAS: This function no longer exists in v1.7.0-alpha.5 specs. Remove it when appropriate to do so
176
+ export function isParentBlockFull(state: CachedBeaconStateGloas): boolean {
172
177
  return byteArrayEquals(state.latestExecutionPayloadBid.blockHash, state.latestBlockHash);
173
178
  }
179
+
180
+ export function initializePtcWindow(state: CachedBeaconStateFulu): Uint32Array[] {
181
+ const ptcWindow: Uint32Array[] = Array.from({length: SLOTS_PER_EPOCH}, () => new Uint32Array(PTC_SIZE));
182
+ const currentEpoch = state.epochCtx.epoch;
183
+
184
+ for (let epochOffset = 0; epochOffset <= MIN_SEED_LOOKAHEAD; epochOffset++) {
185
+ const epoch = currentEpoch + epochOffset;
186
+ const shuffling =
187
+ state.epochCtx.getShufflingAtEpochOrNull(epoch) ??
188
+ computeEpochShuffling(state, getActiveValidatorIndices(state, epoch), epoch);
189
+
190
+ ptcWindow.push(
191
+ ...computePayloadTimelinessCommitteesForEpoch(
192
+ state,
193
+ epoch,
194
+ shuffling.committees,
195
+ state.epochCtx.effectiveBalanceIncrements
196
+ )
197
+ );
198
+ }
199
+
200
+ return ptcWindow;
201
+ }
202
+
203
+ export function getPtcWindowEpochCacheData(state: CachedBeaconStateGloas): {
204
+ previousPayloadTimelinessCommittees: Uint32Array[];
205
+ payloadTimelinessCommittees: Uint32Array[];
206
+ nextPayloadTimelinessCommittees: Uint32Array[];
207
+ } {
208
+ const toUint32Arrays = (views: ReturnType<typeof state.ptcWindow.getReadonlyByRange>) =>
209
+ views.map((v) => Uint32Array.from(v.getAll()));
210
+
211
+ const previousPtcWindow = state.ptcWindow.getReadonlyByRange(0, SLOTS_PER_EPOCH);
212
+ const currentPtcWindow = state.ptcWindow.getReadonlyByRange(SLOTS_PER_EPOCH, SLOTS_PER_EPOCH);
213
+ const nextPtcWindow = state.ptcWindow.getReadonlyByRange(2 * SLOTS_PER_EPOCH, SLOTS_PER_EPOCH);
214
+
215
+ return {
216
+ previousPayloadTimelinessCommittees: toUint32Arrays(previousPtcWindow),
217
+ payloadTimelinessCommittees: toUint32Arrays(currentPtcWindow),
218
+ nextPayloadTimelinessCommittees: toUint32Arrays(nextPtcWindow),
219
+ };
220
+ }
@@ -1,9 +0,0 @@
1
- import { gloas } from "@lodestar/types";
2
- import { CachedBeaconStateGloas } from "../types.js";
3
- export type ProcessExecutionPayloadEnvelopeOpts = {
4
- verifySignature?: boolean;
5
- verifyStateRoot?: boolean;
6
- dontTransferCache?: boolean;
7
- };
8
- export declare function processExecutionPayloadEnvelope(state: CachedBeaconStateGloas, signedEnvelope: gloas.SignedExecutionPayloadEnvelope, opts?: ProcessExecutionPayloadEnvelopeOpts): CachedBeaconStateGloas;
9
- //# sourceMappingURL=processExecutionPayloadEnvelope.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"processExecutionPayloadEnvelope.d.ts","sourceRoot":"","sources":["../../src/block/processExecutionPayloadEnvelope.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,KAAK,EAAM,MAAM,iBAAiB,CAAC;AAI3C,OAAO,EAAC,sBAAsB,EAAC,MAAM,aAAa,CAAC;AAOnD,MAAM,MAAM,mCAAmC,GAAG;IAChD,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAKF,wBAAgB,+BAA+B,CAC7C,KAAK,EAAE,sBAAsB,EAC7B,cAAc,EAAE,KAAK,CAAC,8BAA8B,EACpD,IAAI,CAAC,EAAE,mCAAmC,GACzC,sBAAsB,CA0DxB"}