@lodestar/state-transition 1.50.0 → 1.51.0-dev.02c5a19f35

package/src/epoch/getRewardsAndPenalties.ts

@@ -1,6 +1,7 @@
 import {
   EFFECTIVE_BALANCE_INCREMENT,
   ForkSeq,
+  GENESIS_EPOCH,
   INACTIVITY_PENALTY_QUOTIENT_ALTAIR,
   INACTIVITY_PENALTY_QUOTIENT_BELLATRIX,
   PARTICIPATION_FLAG_WEIGHTS,
@@ -18,6 +19,7 @@ import {
   hasMarkers,
 } from "../util/attesterStatus.js";
 import {isInInactivityLeak} from "../util/index.js";
+import {getSlotDurationMsAtEpoch} from "../util/slot.js";
 
 type RewardPenaltyItem = {
   baseReward: number;
@@ -67,7 +69,15 @@ export function getRewardsAndPenaltiesAltair(
 
   const inactivityPenalityMultiplier =
     fork === ForkSeq.altair ? INACTIVITY_PENALTY_QUOTIENT_ALTAIR : INACTIVITY_PENALTY_QUOTIENT_BELLATRIX;
-  const penaltyDenominator = config.INACTIVITY_SCORE_BIAS * inactivityPenalityMultiplier;
+  let penaltyDenominator = config.INACTIVITY_SCORE_BIAS * inactivityPenalityMultiplier;
+  // The penalty pays for the previous epoch and scales with the square of its slot duration
+  const genesisSlotDurationMs = getSlotDurationMsAtEpoch(config, GENESIS_EPOCH);
+  const prevEpochSlotDurationMs = getSlotDurationMsAtEpoch(config, Math.max(epochCtx.epoch - 1, GENESIS_EPOCH));
+  if (prevEpochSlotDurationMs !== genesisSlotDurationMs) {
+    penaltyDenominator = Number(
+      (BigInt(penaltyDenominator) * BigInt(genesisSlotDurationMs) ** 2n) / BigInt(prevEpochSlotDurationMs) ** 2n
+    );
+  }
 
   const {flags} = cache;
   for (let i = 0; i < flags.length; i++) {

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/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/metrics.ts

@@ -156,19 +156,20 @@ export function getMetrics(register: MetricsRegister) {
 }
 
 export function onStateCloneMetrics(
-  state: CachedBeaconStateAllForks,
+  clonedState: CachedBeaconStateAllForks,
+  clonedCount: number,
   metrics: BeaconStateTransitionMetrics,
   source: StateCloneSource
 ): void {
-  metrics.preStateClonedCount.observe(state.clonedCount);
+  metrics.preStateClonedCount.observe(clonedCount);
 
-  if (isBalancesNodesPopulated(state)) {
+  if (isBalancesNodesPopulated(clonedState)) {
     metrics.preStateBalancesNodesPopulatedHit.inc({source});
   } else {
     metrics.preStateBalancesNodesPopulatedMiss.inc({source});
   }
 
-  if (isValidatorsNodesPopulated(state)) {
+  if (isValidatorsNodesPopulated(clonedState)) {
     metrics.preStateValidatorsNodesPopulatedHit.inc({source});
   } else {
     metrics.preStateValidatorsNodesPopulatedMiss.inc({source});

package/src/rewards/attestationsRewards.ts

@@ -4,6 +4,7 @@ import {
   EFFECTIVE_BALANCE_INCREMENT,
   ForkName,
   ForkSeq,
+  GENESIS_EPOCH,
   INACTIVITY_PENALTY_QUOTIENT_ALTAIR,
   INACTIVITY_PENALTY_QUOTIENT_BELLATRIX,
   MAX_EFFECTIVE_BALANCE,
@@ -26,6 +27,7 @@ import {
   FLAG_PREV_HEAD_ATTESTER_UNSLASHED,
   FLAG_PREV_SOURCE_ATTESTER_UNSLASHED,
   FLAG_PREV_TARGET_ATTESTER_UNSLASHED,
+  getSlotDurationMsAtEpoch,
   hasMarkers,
   isInInactivityLeak,
 } from "../util/index.js";
@@ -168,7 +170,16 @@ function computeTotalAttestationsRewardsAltair(
     config.getForkSeq(state.slot) === ForkSeq.altair
       ? INACTIVITY_PENALTY_QUOTIENT_ALTAIR
       : INACTIVITY_PENALTY_QUOTIENT_BELLATRIX;
-  const inactivityPenaltyDenominator = config.INACTIVITY_SCORE_BIAS * inactivityPenaltyQuotient;
+  let inactivityPenaltyDenominator = config.INACTIVITY_SCORE_BIAS * inactivityPenaltyQuotient;
+  // The penalty pays for the previous epoch and scales with the square of its slot duration
+  const genesisSlotDurationMs = getSlotDurationMsAtEpoch(config, GENESIS_EPOCH);
+  const prevEpochSlotDurationMs = getSlotDurationMsAtEpoch(config, Math.max(epochCtx.epoch - 1, GENESIS_EPOCH));
+  if (prevEpochSlotDurationMs !== genesisSlotDurationMs) {
+    inactivityPenaltyDenominator = Number(
+      (BigInt(inactivityPenaltyDenominator) * BigInt(genesisSlotDurationMs) ** 2n) /
+        BigInt(prevEpochSlotDurationMs) ** 2n
+    );
+  }
 
   for (let i = 0; i < flags.length; i++) {
     if (validatorIndices.length && !validatorIndices.includes(i)) {

package/src/signatureSets/inclusionList.ts

@@ -0,0 +1,20 @@
+import {BeaconConfig} from "@lodestar/config";
+import {DOMAIN_INCLUSION_LIST_COMMITTEE} from "@lodestar/params";
+import {Slot, heze, ssz} from "@lodestar/types";
+import {ISignatureSet, SignatureSetType, computeSigningRoot} from "../util/index.js";
+
+export function getInclusionListSignatureSet(
+  config: BeaconConfig,
+  stateSlot: Slot,
+  signedInclusionList: heze.SignedInclusionList
+): ISignatureSet {
+  const message = signedInclusionList.message;
+  const domain = config.getDomain(stateSlot, DOMAIN_INCLUSION_LIST_COMMITTEE, message.slot);
+
+  return {
+    type: SignatureSetType.indexed,
+    index: message.validatorIndex,
+    signingRoot: computeSigningRoot(ssz.heze.InclusionList, message, domain),
+    signature: signedInclusionList.signature,
+  };
+}

package/src/signatureSets/index.ts

@@ -18,6 +18,7 @@ export * from "./attesterSlashings.js";
 export * from "./blsToExecutionChange.js";
 export * from "./executionPayloadBid.js";
 export * from "./executionPayloadEnvelope.js";
+export * from "./inclusionList.js";
 export * from "./indexedAttestation.js";
 export * from "./indexedPayloadAttestation.js";
 export * from "./proposer.js";

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/stateTransition.ts

@@ -101,7 +101,7 @@ export function stateTransition(
   let postState = state.clone(options.dontTransferCache);
 
   if (metrics) {
-    onStateCloneMetrics(postState, metrics, StateCloneSource.stateTransition);
+    onStateCloneMetrics(postState, state.clonedCount, metrics, StateCloneSource.stateTransition);
   }
 
   // State is already a ViewDU, which won't commit changes. Equivalent to .setStateCachesAsTransient()
@@ -168,7 +168,7 @@ export function processSlots(
   let postState = state.clone(opts?.dontTransferCache);
 
   if (metrics) {
-    onStateCloneMetrics(postState, metrics, StateCloneSource.processSlots);
+    onStateCloneMetrics(postState, state.clonedCount, metrics, StateCloneSource.processSlots);
   }
 
   // State is already a ViewDU, which won't commit changes. Equivalent to .setStateCachesAsTransient()

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/altair.ts

@@ -1,13 +1,24 @@
-import {BASE_REWARD_FACTOR, EFFECTIVE_BALANCE_INCREMENT} from "@lodestar/params";
+import {ChainConfig} from "@lodestar/config";
+import {BASE_REWARD_FACTOR, EFFECTIVE_BALANCE_INCREMENT, GENESIS_EPOCH} from "@lodestar/params";
+import {Epoch} from "@lodestar/types";
 import {bigIntSqrt, bnToNum} from "@lodestar/utils";
+import {getSlotDurationMsAtEpoch} from "./slot.js";
 
 /**
  * Before we manage bigIntSqrt(totalActiveStake) as BigInt and return BigInt.
  * bigIntSqrt(totalActiveStake) should fit a number (2 ** 53 -1 max)
  **/
-export function computeBaseRewardPerIncrement(totalActiveStakeByIncrement: number): number {
+export function computeBaseRewardPerIncrement(
+  config: ChainConfig,
+  epoch: Epoch,
+  totalActiveStakeByIncrement: number
+): number {
+  // Divide last so the exact slot duration ratio applies
+  const numerator = Math.floor(
+    (EFFECTIVE_BALANCE_INCREMENT * BASE_REWARD_FACTOR * getSlotDurationMsAtEpoch(config, epoch)) /
+      getSlotDurationMsAtEpoch(config, GENESIS_EPOCH)
+  );
   return Math.floor(
-    (EFFECTIVE_BALANCE_INCREMENT * BASE_REWARD_FACTOR) /
-      bnToNum(bigIntSqrt(BigInt(totalActiveStakeByIncrement) * BigInt(EFFECTIVE_BALANCE_INCREMENT)))
+    numerator / bnToNum(bigIntSqrt(BigInt(totalActiveStakeByIncrement) * BigInt(EFFECTIVE_BALANCE_INCREMENT)))
   );
 }

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>};
 }

package/src/util/clock.ts

@@ -1,9 +1,9 @@
 import {ChainForkConfig} from "@lodestar/config";
-import {GENESIS_SLOT, SLOTS_PER_EPOCH} from "@lodestar/params";
+import {SLOTS_PER_EPOCH} from "@lodestar/params";
 import {Epoch, Slot, TimeSeconds} from "@lodestar/types";
 import {ErrorAborted, Logger, isErrorAborted, sleep} from "@lodestar/utils";
 import {computeEpochAtSlot} from "./epoch.js";
-import {computeTimeAtSlot, getCurrentSlot} from "./slot.js";
+import {computeTimeAtSlot, getCurrentSlot, getSlotDurationMs} from "./slot.js";
 
 type RunEveryFn = (slot: Slot, signal: AbortSignal) => Promise<void>;
 
@@ -13,6 +13,7 @@ export type ClockOptions = {
 
 export interface IClock {
   readonly genesisTime: number;
+  /** @deprecated Use getSlotDurationMs(slot) instead */
   readonly secondsPerSlot: number;
 
   readonly currentEpoch: number;
@@ -25,6 +26,8 @@ export interface IClock {
   secFromSlot(slot: Slot): number;
   getCurrentSlot(): Slot;
   getCurrentEpoch(): Epoch;
+  /** Slot duration in ms for a given slot */
+  getSlotDurationMs(slot: Slot): number;
 }
 
 export enum TimeItem {
@@ -95,6 +98,11 @@ export class Clock implements IClock {
     return Date.now() / 1000 - computeTimeAtSlot(this.config, slot, this.genesisTime);
   }
 
+  /** Slot duration in ms for a given slot */
+  getSlotDurationMs(slot: Slot): number {
+    return getSlotDurationMs(this.config, slot);
+  }
+
   /**
    * If a task happens to take more than one slot to run, we might skip a slot. This is unfortunate,
    * however the alternative is to *always* process every slot, which has the chance of creating a
@@ -125,7 +133,7 @@ export class Clock implements IClock {
         if (timeItem === TimeItem.Slot) {
           if (nextSlot > slot + 1) {
             // It's not very likely that we skip more than one slot as HTTP timeout is set
-            // to SLOT_DURATION_MS so we will fail task before skipping another slot.
+            // to at most one slot duration so we will fail task before skipping another slot.
             this.logger.warn("Skipped slot due to task taking more than one slot to run", {
               skippedSlot: slot + 1,
             });
@@ -145,20 +153,17 @@ export class Clock implements IClock {
   }
 
   private timeUntilNext(timeItem: TimeItem): number {
-    const milliSecondsPerSlot = this.config.SLOT_DURATION_MS;
-    const msFromGenesis = Date.now() - this.genesisTime * 1000;
+    const currentSlot = getCurrentSlot(this.config, this.genesisTime);
 
     if (timeItem === TimeItem.Slot) {
-      if (msFromGenesis >= 0) {
-        return milliSecondsPerSlot - (msFromGenesis % milliSecondsPerSlot);
-      }
-      return Math.abs(msFromGenesis) % milliSecondsPerSlot;
+      const nextSlotTimeSec = computeTimeAtSlot(this.config, currentSlot + 1, this.genesisTime);
+      return Math.max(0, nextSlotTimeSec * 1000 - Date.now());
     }
-    const milliSecondsPerEpoch = SLOTS_PER_EPOCH * milliSecondsPerSlot;
-    if (msFromGenesis >= 0) {
-      return milliSecondsPerEpoch - (msFromGenesis % milliSecondsPerEpoch);
-    }
-    return Math.abs(msFromGenesis) % milliSecondsPerEpoch;
+
+    const currentEpoch = computeEpochAtSlot(currentSlot);
+    const nextEpochSlot = (currentEpoch + 1) * SLOTS_PER_EPOCH;
+    const nextEpochTimeSec = computeTimeAtSlot(this.config, nextEpochSlot, this.genesisTime);
+    return Math.max(0, nextEpochTimeSec * 1000 - Date.now());
   }
 }
 
@@ -166,9 +171,13 @@ export class Clock implements IClock {
  * Same to the spec but we use Math.round instead of Math.floor.
  */
 export function getCurrentSlotAround(config: ChainForkConfig, genesisTime: TimeSeconds): Slot {
-  const diffInSeconds = Date.now() / 1000 - genesisTime;
-  const slotsSinceGenesis = Math.round((diffInSeconds * 1000) / config.SLOT_DURATION_MS);
-  return GENESIS_SLOT + slotsSinceGenesis;
+  const floorSlot = getCurrentSlot(config, genesisTime);
+  const slotStartSec = computeTimeAtSlot(config, floorSlot, genesisTime);
+  const slotDurationMs = getSlotDurationMs(config, floorSlot);
+  const slotDurationSec = slotDurationMs / 1000;
+  const elapsed = Date.now() / 1000 - slotStartSec;
+
+  return elapsed >= slotDurationSec / 2 ? floorSlot + 1 : floorSlot;
 }
 
 // function useEventStream() {

package/src/util/deposit.ts

@@ -1,8 +1,8 @@
 import {ForkSeq, MAX_DEPOSITS} from "@lodestar/params";
 import {UintNum64, phase0} from "@lodestar/types";
-import {CachedBeaconStateAllForks, CachedBeaconStateElectra} from "../types.js";
+import {CachedBeaconStateElectra, CachedBeaconStatePreHeze} from "../types.js";
 
-export function getEth1DepositCount(state: CachedBeaconStateAllForks, eth1Data?: phase0.Eth1Data): UintNum64 {
+export function getEth1DepositCount(state: CachedBeaconStatePreHeze, eth1Data?: phase0.Eth1Data): UintNum64 {
   const eth1DataToUse = eth1Data ?? state.eth1Data;
   // Proposer can set any value, use in bigint until the result is bounded by MAX_DEPOSITS
   const depositCount = eth1DataToUse.depositCount;

package/src/util/genesis.ts

@@ -11,11 +11,18 @@ import {
   UNSET_DEPOSIT_REQUESTS_START_INDEX,
 } from "@lodestar/params";
 import {Bytes32, Root, TimeSeconds, phase0, ssz} from "@lodestar/types";
-import {processDeposit} from "../block/processDeposit.js";
+import {applyDeposit, processDeposit} from "../block/processDeposit.js";
 import {EpochCacheImmutableData} from "../cache/epochCache.js";
 import {createCachedBeaconState} from "../cache/stateCache.js";
 import {increaseBalance} from "../index.js";
-import {BeaconStateAllForks, CachedBeaconStateAllForks, CachedBeaconStateElectra} from "../types.js";
+import {
+  BeaconStateAllForks,
+  BeaconStatePreHeze,
+  CachedBeaconStateAllForks,
+  CachedBeaconStateElectra,
+  CachedBeaconStateGloas,
+  CachedBeaconStatePreHeze,
+} from "../types.js";
 import {newFilledArray} from "./array.js";
 import {getTemporaryBlockHeader} from "./blockRoot.js";
 import {computeEpochAtSlot} from "./epoch.js";
@@ -87,7 +94,9 @@ export function getGenesisBeaconState(
   state.latestBlockHeader = ssz.phase0.BeaconBlockHeader.toViewDU(latestBlockHeader);
 
   // Ethereum 1.0 chain data
-  state.eth1Data = ssz.phase0.Eth1Data.toViewDU(genesisEth1Data);
+  if (config.getForkSeq(GENESIS_SLOT) < ForkSeq.heze) {
+    (state as BeaconStatePreHeze).eth1Data = ssz.phase0.Eth1Data.toViewDU(genesisEth1Data);
+  }
   state.randaoMixes = ssz.phase0.RandaoMixes.toViewDU(randaoMixes);
 
   return state;
@@ -100,7 +109,9 @@ export function getGenesisBeaconState(
  * @param eth1BlockHash eth1 block hash
  */
 export function applyEth1BlockHash(state: CachedBeaconStateAllForks, eth1BlockHash: Bytes32): void {
-  state.eth1Data.blockHash = eth1BlockHash;
+  if (state.config.getForkSeq(state.slot) < ForkSeq.heze) {
+    (state as CachedBeaconStatePreHeze).eth1Data.blockHash = eth1BlockHash;
+  }
   state.randaoMixes = ssz.phase0.RandaoMixes.toViewDU(newFilledArray(EPOCHS_PER_HISTORICAL_VECTOR, eth1BlockHash));
 }
 
@@ -134,36 +145,41 @@ export function applyDeposits(
   fullDepositDataRootList?: DepositDataRootViewDU
 ): {activatedValidatorCount: number} {
   const fork = config.getForkSeq(state.slot);
-  const depositDataRootList: Root[] = [];
-
-  const fullDepositDataRootArr = fullDepositDataRootList ? fullDepositDataRootList.getAllReadonlyValues() : null;
-
-  if (fullDepositDataRootArr) {
-    const depositCount = Number(state.eth1Data.depositCount);
-    for (let index = 0; index < depositCount; index++) {
-      depositDataRootList.push(fullDepositDataRootArr[index]);
+  if (fork >= ForkSeq.heze) {
+    // Genesis deposits do not use the removed legacy deposit tree.
+    for (const deposit of newDeposits) {
+      applyDeposit(fork, state, deposit.data);
     }
-  }
+  } else {
+    const statePreHeze = state as CachedBeaconStatePreHeze;
+    const depositDataRootList: Root[] = [];
+    const fullDepositDataRootArr = fullDepositDataRootList ? fullDepositDataRootList.getAllReadonlyValues() : null;
 
-  const initDepositCount = depositDataRootList.length;
-  const depositDatas = fullDepositDataRootList ? null : newDeposits.map((deposit) => deposit.data);
-  const {DepositData, DepositDataRootList} = ssz.phase0;
-
-  for (const [index, deposit] of newDeposits.entries()) {
     if (fullDepositDataRootArr) {
-      depositDataRootList.push(fullDepositDataRootArr[index + initDepositCount]);
-      state.eth1Data.depositRoot = DepositDataRootList.hashTreeRoot(depositDataRootList);
-    } else if (depositDatas) {
-      const depositDataList = depositDatas.slice(0, index + 1);
-      state.eth1Data.depositRoot = DepositDataRootList.hashTreeRoot(
-        depositDataList.map((d) => DepositData.hashTreeRoot(d))
-      );
+      const depositCount = Number(statePreHeze.eth1Data.depositCount);
+      for (let index = 0; index < depositCount; index++) {
+        depositDataRootList.push(fullDepositDataRootArr[index]);
+      }
     }
 
-    state.eth1Data.depositCount += 1n;
+    const initDepositCount = depositDataRootList.length;
+    const depositDatas = fullDepositDataRootList ? null : newDeposits.map((deposit) => deposit.data);
+    const {DepositData, DepositDataRootList} = ssz.phase0;
+
+    for (const [index, deposit] of newDeposits.entries()) {
+      if (fullDepositDataRootArr) {
+        depositDataRootList.push(fullDepositDataRootArr[index + initDepositCount]);
+        statePreHeze.eth1Data.depositRoot = DepositDataRootList.hashTreeRoot(depositDataRootList);
+      } else if (depositDatas) {
+        const depositDataList = depositDatas.slice(0, index + 1);
+        statePreHeze.eth1Data.depositRoot = DepositDataRootList.hashTreeRoot(
+          depositDataList.map((d) => DepositData.hashTreeRoot(d))
+        );
+      }
 
-    const fork = config.getForkSeq(GENESIS_SLOT);
-    processDeposit(fork, state, deposit);
+      statePreHeze.eth1Data.depositCount += 1n;
+      processDeposit(fork, statePreHeze, deposit);
+    }
   }
 
   // Process deposit balance updates
@@ -178,7 +194,11 @@ export function applyDeposits(
       }
       increaseBalance(state, validatorIndex, amount);
     }
-    stateElectra.pendingDeposits = ssz.electra.PendingDeposits.defaultViewDU();
+    if (fork >= ForkSeq.gloas) {
+      (state as CachedBeaconStateGloas).pendingDeposits = ssz.gloas.PendingDeposits.defaultViewDU();
+    } else {
+      stateElectra.pendingDeposits = ssz.electra.PendingDeposits.defaultViewDU();
+    }
   }
 
   // Process activations
@@ -316,7 +336,9 @@ export function initializeBeaconStateFromEth1(
     stateElectra.latestExecutionPayloadHeader =
       (executionPayloadHeader as CompositeViewDU<typeof ssz.electra.ExecutionPayloadHeader>) ??
       ssz.electra.ExecutionPayloadHeader.defaultViewDU();
-    stateElectra.depositRequestsStartIndex = UNSET_DEPOSIT_REQUESTS_START_INDEX;
+    if (fork < ForkSeq.heze) {
+      stateElectra.depositRequestsStartIndex = UNSET_DEPOSIT_REQUESTS_START_INDEX;
+    }
   }
 
   if (fork >= ForkSeq.fulu) {
@@ -326,6 +348,10 @@ export function initializeBeaconStateFromEth1(
     stateFulu.latestExecutionPayloadHeader =
       (executionPayloadHeader as CompositeViewDU<typeof ssz.fulu.ExecutionPayloadHeader>) ??
       ssz.fulu.ExecutionPayloadHeader.defaultViewDU();
+    if (fork < ForkSeq.heze) {
+      // Fulu retires the legacy bridge after the genesis deposits.
+      stateFulu.depositRequestsStartIndex = BigInt(stateFulu.eth1DepositIndex);
+    }
   }
 
   if (fork >= ForkSeq.gloas) {