@lodestar/state-transition 1.50.0-dev.335476095e → 1.50.0-dev.3430a7cf04

package/src/block/index.ts

@@ -1,4 +1,4 @@
-import {ForkPostGloas, ForkSeq} from "@lodestar/params";
+import {ForkPostGloas, ForkPreHeze, ForkSeq} from "@lodestar/params";
 import {BeaconBlock, BlindedBeaconBlock, Slot, altair, capella} from "@lodestar/types";
 import {BeaconStateTransitionMetrics} from "../metrics.js";
 import {
@@ -6,6 +6,7 @@ import {
   CachedBeaconStateBellatrix,
   CachedBeaconStateCapella,
   CachedBeaconStateGloas,
+  CachedBeaconStatePreHeze,
 } from "../types.js";
 import {getFullOrBlindedPayload, isExecutionEnabled} from "../util/execution.js";
 import {BlockExternalData, DataAvailabilityStatus} from "./externalData.js";
@@ -117,9 +118,9 @@ export function processBlock(
     timer?.();
   }
 
-  {
+  if (fork < ForkSeq.heze) {
     const timer = metrics?.processBlockStepTime.startTimer({step: BlockProcessStep.processEth1Data});
-    processEth1Data(state, block.body.eth1Data);
+    processEth1Data(state as CachedBeaconStatePreHeze, (block as BeaconBlock<ForkPreHeze>).body.eth1Data);
     timer?.();
   }
 

package/src/block/processDeposit.ts

@@ -17,7 +17,12 @@ import {
 import {BLSPubkey, Bytes32, UintNum64, electra, phase0, ssz} from "@lodestar/types";
 import {verifyMerkleBranch} from "@lodestar/utils";
 import {ZERO_HASH} from "../constants/index.js";
-import {CachedBeaconStateAllForks, CachedBeaconStateAltair, CachedBeaconStateElectra} from "../types.js";
+import {
+  CachedBeaconStateAllForks,
+  CachedBeaconStateAltair,
+  CachedBeaconStateElectra,
+  CachedBeaconStatePreHeze,
+} from "../types.js";
 import {
   computeDomain,
   computeSigningRoot,
@@ -33,7 +38,7 @@ import {
  *
  * PERF: Work depends on number of Deposit per block. On regular networks the average is 0 / block.
  */
-export function processDeposit(fork: ForkSeq, state: CachedBeaconStateAllForks, deposit: phase0.Deposit): void {
+export function processDeposit(fork: ForkSeq, state: CachedBeaconStatePreHeze, deposit: phase0.Deposit): void {
   // verify the merkle branch
   if (
     !verifyMerkleBranch(

package/src/block/processEth1Data.ts

@@ -2,7 +2,7 @@ import {Node} from "@chainsafe/persistent-merkle-tree";
 import {CompositeViewDU} from "@chainsafe/ssz";
 import {EPOCHS_PER_ETH1_VOTING_PERIOD, SLOTS_PER_EPOCH} from "@lodestar/params";
 import {phase0, ssz} from "@lodestar/types";
-import {BeaconStateAllForks, CachedBeaconStateAllForks} from "../types.js";
+import {BeaconStatePreHeze, CachedBeaconStatePreHeze} from "../types.js";
 
 /**
  * Store vote counts for every eth-execution block that has votes; if any eth-execution block wins majority support within a 1024-slot
@@ -12,7 +12,7 @@ import {BeaconStateAllForks, CachedBeaconStateAllForks} from "../types.js";
  * - Best case: Vote is already decided, zero work. See becomesNewEth1Data conditions
  * - Worst case: 1023 votes and no majority vote yet.
  */
-export function processEth1Data(state: CachedBeaconStateAllForks, eth1Data: phase0.Eth1Data): void {
+export function processEth1Data(state: CachedBeaconStatePreHeze, eth1Data: phase0.Eth1Data): void {
   // Convert to view first to hash once and compare hashes
   const eth1DataView = ssz.phase0.Eth1Data.toViewDU(eth1Data);
 
@@ -28,7 +28,7 @@ export function processEth1Data(state: CachedBeaconStateAllForks, eth1Data: phas
  * result in a change to `state.eth1Data`.
  */
 export function becomesNewEth1Data(
-  state: BeaconStateAllForks,
+  state: BeaconStatePreHeze,
   newEth1Data: CompositeViewDU<typeof ssz.phase0.Eth1Data>
 ): boolean {
   const SLOTS_PER_ETH1_VOTING_PERIOD = EPOCHS_PER_ETH1_VOTING_PERIOD * SLOTS_PER_EPOCH;

package/src/block/processOperations.ts

@@ -1,4 +1,4 @@
-import {ForkSeq} from "@lodestar/params";
+import {ForkPreHeze, ForkSeq} from "@lodestar/params";
 import {BeaconBlockBody, Slot, capella, electra, gloas} from "@lodestar/types";
 import {BeaconStateTransitionMetrics} from "../metrics.js";
 import {
@@ -6,6 +6,7 @@ import {
   CachedBeaconStateCapella,
   CachedBeaconStateElectra,
   CachedBeaconStateGloas,
+  CachedBeaconStatePreHeze,
 } from "../types.js";
 import {getEth1DepositCount} from "../util/deposit.js";
 import {processAttestations} from "./processAttestations.js";
@@ -40,13 +41,15 @@ export function processOperations(
   opts: ProcessBlockOpts = {verifySignatures: true},
   metrics?: BeaconStateTransitionMetrics | null
 ): void {
-  // verify that outstanding deposits are processed up to the maximum number of deposits.
-  // From Fulu the eth1 bridge deposit mechanism was removed, so blocks must not contain any deposits.
-  const maxDeposits = fork >= ForkSeq.fulu ? 0 : getEth1DepositCount(state);
-  if (body.deposits.length !== maxDeposits) {
-    throw new Error(
-      `Block contains incorrect number of deposits: depositCount=${body.deposits.length} expected=${maxDeposits}`
-    );
+  if (fork < ForkSeq.heze) {
+    // From Fulu the eth1 bridge deposit mechanism was removed, so blocks must not contain any deposits.
+    const deposits = (body as BeaconBlockBody<ForkPreHeze>).deposits;
+    const maxDeposits = fork >= ForkSeq.fulu ? 0 : getEth1DepositCount(state as CachedBeaconStatePreHeze);
+    if (deposits.length !== maxDeposits) {
+      throw new Error(
+        `Block contains incorrect number of deposits: depositCount=${deposits.length} expected=${maxDeposits}`
+      );
+    }
   }
 
   {
@@ -71,10 +74,10 @@ export function processOperations(
     timer?.();
   }
 
-  {
+  if (fork < ForkSeq.heze) {
     const timer = metrics?.processOperationsStepTime.startTimer({step: ProcessOperationsStep.processDeposit});
-    for (const deposit of body.deposits) {
-      processDeposit(fork, state, deposit);
+    for (const deposit of (body as BeaconBlockBody<ForkPreHeze>).deposits) {
+      processDeposit(fork, state as CachedBeaconStatePreHeze, deposit);
     }
     timer?.();
   }

package/src/block/processProposerSlashing.ts

@@ -1,9 +1,9 @@
 import {BeaconConfig} from "@lodestar/config";
-import {ForkSeq, SLOTS_PER_EPOCH} from "@lodestar/params";
+import {ForkSeq} from "@lodestar/params";
 import {Slot, phase0, ssz} from "@lodestar/types";
 import {Validator} from "@lodestar/types/phase0";
 import {getProposerSlashingSignatureSets} from "../signatureSets/index.js";
-import {CachedBeaconStateAllForks, CachedBeaconStateGloas} from "../types.js";
+import {CachedBeaconStateAllForks} from "../types.js";
 import {computeEpochAtSlot, isSlashableValidator} from "../util/index.js";
 import {verifySignatureSet} from "../util/signatureSets.js";
 import {slashValidator} from "./slashValidator.js";
@@ -23,32 +23,6 @@ export function processProposerSlashing(
   const proposer = state.validators.getReadonly(proposerSlashing.signedHeader1.message.proposerIndex);
   assertValidProposerSlashing(state.config, state.slot, proposerSlashing, proposer, verifySignatures);
 
-  if (fork >= ForkSeq.gloas) {
-    // Remove the BuilderPendingPayment corresponding to this proposal if it is still in the
-    // 2-epoch window. Only clear it when the slashed validator is the proposer associated with
-    // the payment; otherwise an unrelated same-slot equivocation could grief an honest proposer's
-    // payment.
-    const slot = Number(proposerSlashing.signedHeader1.message.slot);
-    const proposalEpoch = computeEpochAtSlot(slot);
-    const currentEpoch = state.epochCtx.epoch;
-    const previousEpoch = currentEpoch - 1;
-
-    const paymentIndex =
-      proposalEpoch === currentEpoch
-        ? SLOTS_PER_EPOCH + (slot % SLOTS_PER_EPOCH)
-        : proposalEpoch === previousEpoch
-          ? slot % SLOTS_PER_EPOCH
-          : undefined;
-
-    if (paymentIndex !== undefined) {
-      const builderPendingPayments = (state as CachedBeaconStateGloas).builderPendingPayments;
-      const payment = builderPendingPayments.get(paymentIndex);
-      if (payment.proposerIndex === proposerSlashing.signedHeader1.message.proposerIndex) {
-        builderPendingPayments.set(paymentIndex, ssz.gloas.BuilderPendingPayment.defaultViewDU());
-      }
-    }
-  }
-
   slashValidator(fork, state, proposerSlashing.signedHeader1.message.proposerIndex);
 }
 

package/src/block/slashValidator.ts

@@ -13,8 +13,8 @@ import {
   WHISTLEBLOWER_REWARD_QUOTIENT,
   WHISTLEBLOWER_REWARD_QUOTIENT_ELECTRA,
 } from "@lodestar/params";
-import {ValidatorIndex} from "@lodestar/types";
-import {CachedBeaconStateAllForks, CachedBeaconStateAltair} from "../types.js";
+import {ValidatorIndex, ssz} from "@lodestar/types";
+import {CachedBeaconStateAllForks, CachedBeaconStateAltair, CachedBeaconStateGloas} from "../types.js";
 import {decreaseBalance, increaseBalance} from "../util/index.js";
 import {initiateValidatorExit} from "./initiateValidatorExit.js";
 
@@ -95,4 +95,15 @@ export function slashValidator(
       );
     }
   }
+
+  if (fork >= ForkSeq.gloas) {
+    // Cleared on every slashing, not only proposer slashings: a proposer slashed via an attester slashing
+    // first would otherwise keep the builder paying for a block it equivocated on
+    const {builderPendingPayments} = state as CachedBeaconStateGloas;
+    for (let i = 0; i < builderPendingPayments.length; i++) {
+      if (builderPendingPayments.getReadonly(i).proposerIndex === slashedIndex) {
+        builderPendingPayments.set(i, ssz.gloas.BuilderPendingPayment.defaultViewDU());
+      }
+    }
+  }
 }

package/src/cache/stateCache.ts

@@ -15,6 +15,7 @@ import {
   BeaconStateGloas,
   BeaconStateHeze,
   BeaconStatePhase0,
+  BeaconStatePreHeze,
 } from "./types.js";
 
 export type BeaconStateCache = {
@@ -142,6 +143,7 @@ export type CachedBeaconStateHeze = CachedBeaconState<BeaconStateHeze>;
 
 export type CachedBeaconStateAllForks = CachedBeaconState<BeaconStateAllForks>;
 export type CachedBeaconStateExecutions = CachedBeaconState<BeaconStateExecutions>;
+export type CachedBeaconStatePreHeze = CachedBeaconState<BeaconStatePreHeze>;
 /**
  * Create CachedBeaconState computing a new EpochCache instance
  * TODO ELECTRA: rename this to createFinalizedCachedBeaconState() as it's intended for finalized state only

package/src/cache/types.ts

@@ -1,5 +1,5 @@
 import {CompositeViewDU} from "@chainsafe/ssz";
-import {ForkAll, ForkName, ForkPostBellatrix, ForkPreGloas} from "@lodestar/params";
+import {ForkAll, ForkName, ForkPostBellatrix, ForkPreGloas, ForkPreHeze} from "@lodestar/params";
 import {Epoch, RootHex, SSZTypesFor} from "@lodestar/types";
 import {EpochShuffling} from "../util/epochShuffling.js";
 
@@ -15,5 +15,6 @@ export type BeaconStateHeze = CompositeViewDU<SSZTypesFor<ForkName.heze, "Beacon
 
 export type BeaconStateAllForks = CompositeViewDU<SSZTypesFor<ForkAll, "BeaconState">>;
 export type BeaconStateExecutions = CompositeViewDU<SSZTypesFor<ForkPostBellatrix & ForkPreGloas, "BeaconState">>;
+export type BeaconStatePreHeze = CompositeViewDU<SSZTypesFor<ForkPreHeze, "BeaconState">>;
 
 export type ShufflingGetter = (shufflingEpoch: Epoch, dependentRoot: RootHex) => EpochShuffling | null;

package/src/epoch/index.ts

@@ -14,6 +14,7 @@ import {
   CachedBeaconStateFulu,
   CachedBeaconStateGloas,
   CachedBeaconStatePhase0,
+  CachedBeaconStatePreHeze,
   EpochTransitionCache,
 } from "../types.js";
 import {processBuilderPendingPayments} from "./processBuilderPendingPayments.js";
@@ -140,7 +141,9 @@ export function processEpoch(
     timer?.();
   }
 
-  processEth1DataReset(state, cache);
+  if (fork < ForkSeq.heze) {
+    processEth1DataReset(state as CachedBeaconStatePreHeze, cache);
+  }
 
   if (fork >= ForkSeq.electra) {
     const stateElectra = state as CachedBeaconStateElectra;

package/src/epoch/processEth1DataReset.ts

@@ -1,13 +1,13 @@
 import {EPOCHS_PER_ETH1_VOTING_PERIOD} from "@lodestar/params";
 import {ssz} from "@lodestar/types";
-import {CachedBeaconStateAllForks, EpochTransitionCache} from "../types.js";
+import {CachedBeaconStatePreHeze, EpochTransitionCache} from "../types.js";
 
 /**
  * Reset eth1DataVotes tree every `EPOCHS_PER_ETH1_VOTING_PERIOD`.
  *
  * PERF: Almost no (constant) cost
  */
-export function processEth1DataReset(state: CachedBeaconStateAllForks, cache: EpochTransitionCache): void {
+export function processEth1DataReset(state: CachedBeaconStatePreHeze, cache: EpochTransitionCache): void {
   const nextEpoch = cache.currentEpoch + 1;
 
   // reset eth1 data votes

package/src/epoch/processPendingDeposits.ts

@@ -1,4 +1,10 @@
-import {FAR_FUTURE_EPOCH, ForkSeq, GENESIS_SLOT, MAX_PENDING_DEPOSITS_PER_EPOCH} from "@lodestar/params";
+import {
+  BLS_WITHDRAWAL_PREFIX,
+  FAR_FUTURE_EPOCH,
+  ForkSeq,
+  GENESIS_SLOT,
+  MAX_PENDING_DEPOSITS_PER_EPOCH,
+} from "@lodestar/params";
 import {electra} from "@lodestar/types";
 import {addValidatorToRegistry, isValidDepositSignature} from "../block/processDeposit.js";
 import {CachedBeaconStateElectra, EpochTransitionCache} from "../types.js";
@@ -71,7 +77,7 @@ export function processPendingDeposits(state: CachedBeaconStateElectra, cache: E
 
       if (isValidatorWithdrawn) {
         // Deposited balance will never become active. Increase balance but do not consume churn
-        applyPendingDeposit(state, deposit, cache);
+        applyPendingDeposit(fork, state, deposit, cache);
       } else if (isValidatorExited) {
         // Validator is exiting, postpone the deposit until after withdrawable epoch
         depositsToPostpone.push(deposit);
@@ -83,7 +89,7 @@ export function processPendingDeposits(state: CachedBeaconStateElectra, cache: E
         }
         // Consume churn and apply deposit.
         processedAmount += deposit.amount;
-        applyPendingDeposit(state, deposit, cache);
+        applyPendingDeposit(fork, state, deposit, cache);
       }
 
       // Regardless of how the deposit was handled, we move on in the queue.
@@ -110,6 +116,7 @@ export function processPendingDeposits(state: CachedBeaconStateElectra, cache: E
 }
 
 function applyPendingDeposit(
+  fork: ForkSeq,
   state: CachedBeaconStateElectra,
   deposit: electra.PendingDeposit,
   cache: EpochTransitionCache
@@ -119,6 +126,10 @@ function applyPendingDeposit(
   const cachedBalances = cache.balances;
 
   if (!isValidatorKnown(state, validatorIndex)) {
+    // Do not create validators with BLS withdrawal credentials, the deposit is skipped without a refund
+    if (fork >= ForkSeq.heze && withdrawalCredentials[0] === BLS_WITHDRAWAL_PREFIX) {
+      return;
+    }
     // Verify the deposit signature (proof of possession) which is not checked by the deposit contract
     if (isValidDepositSignature(state.config, pubkey, withdrawalCredentials, amount, signature)) {
       addValidatorToRegistry(ForkSeq.electra, state, pubkey, withdrawalCredentials, amount);

package/src/index.ts

@@ -80,6 +80,7 @@ export type {
   BeaconStateHeze,
   // Non-cached states
   BeaconStatePhase0,
+  BeaconStatePreHeze,
   CachedBeaconStateAllForks,
   CachedBeaconStateAltair,
   CachedBeaconStateBellatrix,
@@ -91,5 +92,6 @@ export type {
   CachedBeaconStateGloas,
   CachedBeaconStateHeze,
   CachedBeaconStatePhase0,
+  CachedBeaconStatePreHeze,
 } from "./types.js";
 export * from "./util/index.js";

package/src/signatureSets/index.ts

@@ -12,7 +12,7 @@ import {getPayloadAttestationDataSigningRoot} from "./indexedPayloadAttestation.
 import {getBlockProposerSignatureSet} from "./proposer.js";
 import {getProposerSlashingsSignatureSets} from "./proposerSlashings.js";
 import {getRandaoRevealSignatureSet} from "./randao.js";
-import {getVoluntaryExitsSignatureSets} from "./voluntaryExits.js";
+import {getVoluntaryExitSignatureSet} from "./voluntaryExits.js";
 
 export * from "./attesterSlashings.js";
 export * from "./blsToExecutionChange.js";
@@ -49,7 +49,9 @@ export function getBlockSignatureSets(
     ...getProposerSlashingsSignatureSets(config, signedBlock),
     ...getAttesterSlashingsSignatureSets(config, signedBlock),
     ...getAttestationsSignatureSets(config, signedBlock, indexedAttestations),
-    ...getVoluntaryExitsSignatureSets(config, state, signedBlock),
+    ...signedBlock.message.body.voluntaryExits.map((voluntaryExit) =>
+      getVoluntaryExitSignatureSet(config, state, voluntaryExit)
+    ),
   ];
 
   if (!opts?.skipProposerSignature) {

package/src/signatureSets/voluntaryExits.ts

@@ -1,14 +1,11 @@
 import {BeaconConfig} from "@lodestar/config";
-import {ForkSeq} from "@lodestar/params";
-import {SignedBeaconBlock, Slot, phase0, ssz} from "@lodestar/types";
-import {IBeaconStateView, IBeaconStateViewGloas, isStatePostGloas} from "../stateView/interface.js";
+import {phase0, ssz} from "@lodestar/types";
+import {IBeaconStateView} from "../stateView/interface.js";
 import {
   ISignatureSet,
   SignatureSetType,
   computeSigningRoot,
   computeStartSlotAtEpoch,
-  convertValidatorIndexToBuilderIndex,
-  isBuilderIndex,
   verifySignatureSet,
 } from "../util/index.js";
 
@@ -27,36 +24,9 @@ export function getVoluntaryExitSignatureSet(
   config: BeaconConfig,
   state: IBeaconStateView,
   signedVoluntaryExit: phase0.SignedVoluntaryExit
-): ISignatureSet {
-  const fork = config.getForkSeq(state.slot);
-
-  if (fork >= ForkSeq.gloas && isBuilderVoluntaryExit(signedVoluntaryExit)) {
-    if (!isStatePostGloas(state)) {
-      throw new Error(`Expected gloas+ state for builder voluntary exit signature, got fork=${state.forkName}`);
-    }
-    return getBuilderVoluntaryExitSignatureSet(config, state, signedVoluntaryExit);
-  }
-
-  return getValidatorVoluntaryExitSignatureSet(config, state.slot, signedVoluntaryExit);
-}
-
-export function getVoluntaryExitsSignatureSets(
-  config: BeaconConfig,
-  state: IBeaconStateView,
-  signedBlock: SignedBeaconBlock
-): ISignatureSet[] {
-  return signedBlock.message.body.voluntaryExits.map((voluntaryExit) =>
-    getVoluntaryExitSignatureSet(config, state, voluntaryExit)
-  );
-}
-
-export function getValidatorVoluntaryExitSignatureSet(
-  config: BeaconConfig,
-  stateSlot: Slot,
-  signedVoluntaryExit: phase0.SignedVoluntaryExit
 ): ISignatureSet {
   const messageSlot = computeStartSlotAtEpoch(signedVoluntaryExit.message.epoch);
-  const domain = config.getDomainForVoluntaryExit(stateSlot, messageSlot);
+  const domain = config.getDomainForVoluntaryExit(state.slot, messageSlot);
 
   return {
     type: SignatureSetType.indexed,
@@ -65,25 +35,3 @@ export function getValidatorVoluntaryExitSignatureSet(
     signature: signedVoluntaryExit.signature,
   };
 }
-
-export function getBuilderVoluntaryExitSignatureSet(
-  config: BeaconConfig,
-  state: IBeaconStateViewGloas,
-  signedVoluntaryExit: phase0.SignedVoluntaryExit
-): ISignatureSet {
-  const messageSlot = computeStartSlotAtEpoch(signedVoluntaryExit.message.epoch);
-  const domain = config.getDomainForVoluntaryExit(state.slot, messageSlot);
-  const builderIndex = convertValidatorIndexToBuilderIndex(signedVoluntaryExit.message.validatorIndex);
-  const builder = state.getBuilder(builderIndex);
-
-  return {
-    type: SignatureSetType.single,
-    pubkey: builder.pubkey,
-    signingRoot: computeSigningRoot(ssz.phase0.VoluntaryExit, signedVoluntaryExit.message, domain),
-    signature: signedVoluntaryExit.signature,
-  };
-}
-
-export function isBuilderVoluntaryExit(signedVoluntaryExit: phase0.SignedVoluntaryExit): boolean {
-  return isBuilderIndex(signedVoluntaryExit.message.validatorIndex);
-}

package/src/slot/upgradeStateToHeze.ts

@@ -7,6 +7,12 @@ import {CachedBeaconStateGloas, CachedBeaconStateHeze} from "../types.js";
  * Spec: heze/fork.md `upgrade_to_heze`.
  */
 export function upgradeStateToHeze(stateGloas: CachedBeaconStateGloas): CachedBeaconStateHeze {
+  // In Heze, the old deposit mechanism must be fully drained before the fork
+  if (BigInt(stateGloas.eth1DepositIndex) !== stateGloas.depositRequestsStartIndex) {
+    throw new Error(
+      `Cannot upgrade to Heze: legacy deposit mechanism still active eth1DepositIndex=${stateGloas.eth1DepositIndex} depositRequestsStartIndex=${stateGloas.depositRequestsStartIndex}`
+    );
+  }
   const {config} = stateGloas;
 
   ssz.gloas.BeaconState.commitViewDU(stateGloas);
@@ -26,9 +32,6 @@ export function upgradeStateToHeze(stateGloas: CachedBeaconStateGloas): CachedBe
   stateHezeView.blockRoots = stateHezeCloned.blockRoots;
   stateHezeView.stateRoots = stateHezeCloned.stateRoots;
   stateHezeView.historicalRoots = stateHezeCloned.historicalRoots;
-  stateHezeView.eth1Data = stateHezeCloned.eth1Data;
-  stateHezeView.eth1DataVotes = stateHezeCloned.eth1DataVotes;
-  stateHezeView.eth1DepositIndex = stateHezeCloned.eth1DepositIndex;
   stateHezeView.validators = stateHezeCloned.validators;
   stateHezeView.balances = stateHezeCloned.balances;
   stateHezeView.randaoMixes = stateHezeCloned.randaoMixes;
@@ -46,7 +49,6 @@ export function upgradeStateToHeze(stateGloas: CachedBeaconStateGloas): CachedBe
   stateHezeView.nextWithdrawalIndex = stateHezeCloned.nextWithdrawalIndex;
   stateHezeView.nextWithdrawalValidatorIndex = stateHezeCloned.nextWithdrawalValidatorIndex;
   stateHezeView.historicalSummaries = stateHezeCloned.historicalSummaries;
-  stateHezeView.depositRequestsStartIndex = stateHezeCloned.depositRequestsStartIndex;
   stateHezeView.depositBalanceToConsume = stateHezeCloned.depositBalanceToConsume;
   stateHezeView.exitBalanceToConsume = stateHezeCloned.exitBalanceToConsume;
   stateHezeView.earliestExitEpoch = stateHezeCloned.earliestExitEpoch;

package/src/stateView/beaconStateView.ts

@@ -40,6 +40,7 @@ import {
   CachedBeaconStateExecutions,
   CachedBeaconStateFulu,
   CachedBeaconStateGloas,
+  CachedBeaconStatePreHeze,
   createCachedBeaconState,
   isStateValidatorsNodesPopulated,
 } from "../cache/stateCache.js";
@@ -145,7 +146,10 @@ export class BeaconStateView implements IBeaconStateViewLatestFork {
   }
 
   get eth1Data(): phase0.Eth1Data {
-    return this.cachedState.eth1Data;
+    if (this.forkSeq >= ForkSeq.heze) {
+      throw new Error("eth1Data was removed from the beacon state in Heze");
+    }
+    return (this.cachedState as CachedBeaconStatePreHeze).eth1Data;
   }
 
   get latestBlockHeader(): phase0.BeaconBlockHeader {
@@ -611,6 +615,10 @@ export class BeaconStateView implements IBeaconStateViewLatestFork {
     return this.cachedState.epochCtx.currentSyncCommitteeIndexed;
   }
 
+  get currentSyncCommitteeValidatorIndices(): Uint32Array {
+    return this.cachedState.epochCtx.currentSyncCommitteeIndexed.validatorIndices;
+  }
+
   get syncProposerReward(): number {
     return this.cachedState.epochCtx.syncProposerReward;
   }

package/src/stateView/interface.ts

@@ -207,6 +207,7 @@ export interface IBeaconStateViewAltair extends IBeaconStateView {
   currentSyncCommittee: altair.SyncCommittee;
   nextSyncCommittee: altair.SyncCommittee;
   currentSyncCommitteeIndexed: SyncCommitteeCache;
+  readonly currentSyncCommitteeValidatorIndices: Uint32Array;
   syncProposerReward: number;
   getIndexedSyncCommitteeAtEpoch(epoch: Epoch): SyncCommitteeCache;
   /** Get indexed sync committee with slot+1 offset for duty lookups */
@@ -341,6 +342,7 @@ export type IBeaconStateViewNative = Omit<
   | "computeBlockRewards"
   | "computeNewStateRoot"
   | "computeSyncCommitteeRewards"
+  | "currentSyncCommitteeValidatorIndices"
   | "eth1Data"
   | "executionPayloadAvailability"
   | "getBeaconCommittee"
@@ -358,6 +360,8 @@ export type IBeaconStateViewNative = Omit<
   | "withParentPayloadApplied"
 > & {
   pendingDeposits: Uint8Array;
+  /** Older native addons expose indices only through currentSyncCommitteeIndexed. */
+  readonly currentSyncCommitteeValidatorIndices?: Uint32Array;
   pendingPartialWithdrawals: Uint8Array;
   pendingConsolidations: Uint8Array;
   proposerLookahead: Uint32Array;

package/src/stateView/nativeBeaconStateView.ts

@@ -97,6 +97,7 @@ export class NativeBeaconStateView implements IBeaconStateViewLatestFork {
   private cachedPreviousEpochParticipation: Uint8Array | null = null;
   private cachedCurrentEpochParticipation: Uint8Array | null = null;
   private cachedCurrentSyncCommitteeIndexed: SyncCommitteeCache | null = null;
+  private cachedCurrentSyncCommitteeValidatorIndices: Uint32Array | null = null;
   private cachedSyncProposerReward: number | null = null;
   // bellatrix
   private cachedLatestExecutionPayloadHeader: ExecutionPayloadHeader | null = null;
@@ -228,6 +229,9 @@ export class NativeBeaconStateView implements IBeaconStateViewLatestFork {
   }
 
   get eth1Data(): phase0.Eth1Data {
+    if (this.forkSeq >= ForkSeq.heze) {
+      throw new Error("eth1Data was removed from the beacon state in Heze");
+    }
     if (this.cachedEth1Data === null) {
       this.cachedEth1Data = this.binding.eth1Data;
     }
@@ -719,6 +723,16 @@ export class NativeBeaconStateView implements IBeaconStateViewLatestFork {
     return this.cachedCurrentSyncCommitteeIndexed;
   }
 
+  get currentSyncCommitteeValidatorIndices(): Uint32Array {
+    if (this.cachedCurrentSyncCommitteeValidatorIndices === null) {
+      this.cachedCurrentSyncCommitteeValidatorIndices =
+        this.cachedCurrentSyncCommitteeIndexed?.validatorIndices ??
+        this.binding.currentSyncCommitteeValidatorIndices ??
+        this.currentSyncCommitteeIndexed.validatorIndices;
+    }
+    return this.cachedCurrentSyncCommitteeValidatorIndices;
+  }
+
   get syncProposerReward(): number {
     if (this.cachedSyncProposerReward === null) {
       this.cachedSyncProposerReward = this.binding.syncProposerReward;

package/src/types.ts

@@ -12,6 +12,7 @@ export type {
   CachedBeaconStateGloas,
   CachedBeaconStateHeze,
   CachedBeaconStatePhase0,
+  CachedBeaconStatePreHeze,
 } from "./cache/stateCache.js";
 export type {
   BeaconStateAllForks,
@@ -25,5 +26,6 @@ export type {
   BeaconStateGloas,
   BeaconStateHeze,
   BeaconStatePhase0,
+  BeaconStatePreHeze,
   ShufflingGetter,
 } from "./cache/types.js";

package/src/util/blindedBlock.ts

@@ -3,10 +3,12 @@ import {
   ForkName,
   ForkPostBellatrix,
   ForkPostDeneb,
+  ForkPreDeneb,
   ForkPreGloas,
   ForkSeq,
   isForkPostBellatrix,
   isForkPostDeneb,
+  isForkPostGloas,
 } from "@lodestar/params";
 import {
   BeaconBlock,
@@ -128,7 +130,10 @@ export function reconstructSignedBlockContents(
   signedBlindedBlock: SignedBlindedBeaconBlock,
   executionPayload: ExecutionPayload | null,
   blobsBundle: BlobsBundle | null
-): SignedBlockContents {
+): SignedBlockContents<ForkPreGloas> {
+  if (isForkPostGloas(fork)) {
+    throw Error("Blinded block reconstruction is not supported after Gloas");
+  }
   const signedBlock = signedBlindedBlockToFull(fork, signedBlindedBlock, executionPayload);
 
   if (isForkPostDeneb(fork)) {
@@ -136,10 +141,10 @@ export function reconstructSignedBlockContents(
       throw Error("Missing blobs bundle to reconstruct post-deneb block contents");
     }
     return {
-      signedBlock: signedBlock as SignedBeaconBlock<ForkPostDeneb>,
+      signedBlock: signedBlock as SignedBeaconBlock<ForkPostDeneb & ForkPreGloas>,
       kzgProofs: blobsBundle.proofs,
       blobs: blobsBundle.blobs,
     };
   }
-  return {signedBlock};
+  return {signedBlock: signedBlock as SignedBeaconBlock<ForkPreDeneb>};
 }