@lodestar/fork-choice 1.44.0-dev.9d8b487a59 → 1.44.0-dev.a879adb124

package/src/forkChoice/forkChoice.ts

@@ -25,7 +25,7 @@ import {
   phase0,
   ssz,
 } from "@lodestar/types";
-import {Logger, MapDef, fromHex, toRootHex} from "@lodestar/utils";
+import {Logger, MapDef, fromHex, toRootHex, withObservedDuration} from "@lodestar/utils";
 import {ForkChoiceMetrics} from "../metrics.js";
 import {computeDeltas} from "../protoArray/computeDeltas.js";
 import {ProtoArrayError, ProtoArrayErrorCode} from "../protoArray/errors.js";
@@ -44,6 +44,12 @@ import {
 } from "../protoArray/interface.js";
 import {ProtoArray} from "../protoArray/protoArray.js";
 import {ForkChoiceError, ForkChoiceErrorCode, InvalidAttestationCode, InvalidBlockCode} from "./errors.js";
+import {
+  type FastConfirmationContext,
+  FastConfirmationRule,
+  FastConfirmationSteps,
+  type IFastConfirmationRule,
+} from "./fastConfirmation/fastConfirmationRule.ts";
 import {
   AncestorResult,
   AncestorStatus,
@@ -58,6 +64,7 @@ export type ForkChoiceOpts = {
   proposerBoost?: boolean;
   proposerBoostReorg?: boolean;
   computeUnrealized?: boolean;
+  fastConfirmation?: boolean;
 };
 
 export enum UpdateHeadOpt {
@@ -142,6 +149,9 @@ export class ForkChoice implements IForkChoice {
   private justifiedProposerBoostScore: number | null = null;
   /** The current effective balances */
   private balances: EffectiveBalanceIncrements;
+  /** Optional fast confirmation rule implementation */
+  private readonly fastConfirmationRule?: IFastConfirmationRule;
+  private readonly fastConfirmationContext?: FastConfirmationContext;
   /**
    * Instantiates a Fork Choice from some existing components
    *
@@ -167,6 +177,11 @@ export class ForkChoice implements IForkChoice {
     this.head = this.updateHead();
     this.balances = this.fcStore.justified.balances;
 
+    if (this.opts?.fastConfirmation) {
+      this.fastConfirmationRule = new FastConfirmationRule(this.fcStore, metrics, this.logger);
+      this.fastConfirmationContext = this.createFastConfirmationContext();
+    }
+
     metrics?.forkChoice.votes.addCollect(() => {
       metrics.forkChoice.votes.set(this.voteNextSlots.length);
       metrics.forkChoice.queuedAttestations.set(this.queuedAttestationsPreviousSlot);
@@ -207,6 +222,14 @@ export class ForkChoice implements IForkChoice {
     return this.head;
   }
 
+  getConfirmedRoot(): RootHex {
+    return this.fastConfirmationRule?.getConfirmedRoot() ?? this.fcStore.justified.checkpoint.rootHex;
+  }
+
+  getConfirmedBlock(): ProtoBlock | null {
+    return this.getBlockHexDefaultStatus(this.getConfirmedRoot());
+  }
+
   /**
    *
    * A multiplexer to wrap around the traditional `updateHead()` according to the scenario
@@ -310,6 +333,10 @@ export class ForkChoice implements IForkChoice {
     return this.proposerBoostRoot ?? HEX_ZERO_HASH;
   }
 
+  getPreviousProposerBoostRoot(): RootHex {
+    return this.protoArray.getPreviousProposerBoostRoot();
+  }
+
   /**
    * Decides whether to extend an available payload from the previous slot,
    * corresponding to the beacon block `blockRoot`.
@@ -319,8 +346,8 @@ export class ForkChoice implements IForkChoice {
   }
 
   /** Spec: should_build_on_full(store, head) */
-  shouldBuildOnFull(head: ProtoBlock): boolean {
-    return this.protoArray.shouldBuildOnFull(head);
+  shouldBuildOnFull(head: ProtoBlock, slot: Slot): boolean {
+    return this.protoArray.shouldBuildOnFull(head, slot);
   }
 
   /**
@@ -947,11 +974,12 @@ export class ForkChoice implements IForkChoice {
    */
   notifyPtcMessages(
     blockRoot: RootHex,
+    slot: Slot,
     ptcIndices: number[],
     payloadPresent: boolean,
     blobDataAvailable: boolean
   ): void {
-    this.protoArray.notifyPtcMessages(blockRoot, ptcIndices, payloadPresent, blobDataAvailable);
+    this.protoArray.notifyPtcMessages(blockRoot, slot, ptcIndices, payloadPresent, blobDataAvailable);
   }
 
   /**
@@ -993,12 +1021,12 @@ export class ForkChoice implements IForkChoice {
       const previousSlot = this.fcStore.currentSlot;
       // Note: we are relying upon `onTick` to update `fcStore.time` to ensure we don't get stuck in a loop.
       this.onTick(previousSlot + 1);
+      this.queuedAttestationsPreviousSlot = 0;
+      // Process any attestations that might now be eligible before running FCR for this slot.
+      this.processAttestationQueue();
+      this.runFastConfirmation();
+      this.validatedAttestationDatas = new Set();
     }
-
-    this.queuedAttestationsPreviousSlot = 0;
-    // Process any attestations that might now be eligible.
-    this.processAttestationQueue();
-    this.validatedAttestationDatas = new Set();
   }
 
   getTime(): Slot {
@@ -1067,6 +1095,30 @@ export class ForkChoice implements IForkChoice {
     return votes.toBoolArray().map((v) => v ?? null);
   }
 
+  getPTCVoteCounts(blockRootHex: RootHex): {
+    attesterCount: number;
+    payloadPresentCount: number;
+    dataAvailableCount: number;
+  } | null {
+    return this.protoArray.getPTCVoteCounts(blockRootHex);
+  }
+
+  getPayloadTimelinessVotes(blockRootHex: RootHex): (boolean | null)[] | null {
+    return this.protoArray.getPayloadTimelinessVotes(blockRootHex);
+  }
+
+  getPayloadDataAvailabilityVotes(blockRootHex: RootHex): (boolean | null)[] | null {
+    return this.protoArray.getPayloadDataAvailabilityVotes(blockRootHex);
+  }
+
+  getUnrealizedJustifiedCheckpoint(): CheckpointWithHex {
+    return this.fcStore.unrealizedJustified.checkpoint;
+  }
+
+  getUnrealizedFinalizedCheckpoint(): CheckpointWithHex {
+    return this.fcStore.unrealizedFinalizedCheckpoint;
+  }
+
   /**
    * Returns a MUTABLE `ProtoBlock` if the block is known **and** a descendant of the finalized root.
    */
@@ -1892,6 +1944,78 @@ export class ForkChoice implements IForkChoice {
 
     return {prelimProposerHead};
   }
+
+  private runFastConfirmation(): void {
+    withObservedDuration(this.metrics?.fastConfirmation.totalDuration.startTimer(), () => {
+      if (!this.fastConfirmationRule || !this.fastConfirmationContext) return;
+
+      try {
+        withObservedDuration(
+          this.metrics?.fastConfirmation.stepsDuration.startTimer({
+            step: FastConfirmationSteps.updateHead,
+          }),
+          () => this.updateHead()
+        );
+
+        const result = this.fastConfirmationRule.onSlotStartAfterPastAttestationsApplied(this.fastConfirmationContext);
+        this.fcStore.confirmedRoot = result.confirmedRoot;
+      } catch (err) {
+        this.logger?.debug(
+          "Fast confirmation failed",
+          {slot: this.fcStore.currentSlot, head: this.head.blockRoot, confirmedRoot: this.fcStore.confirmedRoot},
+          err as Error
+        );
+      }
+    });
+  }
+
+  private createFastConfirmationContext(): FastConfirmationContext {
+    const confirmationByzantineThreshold = this.config.CONFIRMATION_BYZANTINE_THRESHOLD;
+    if (!confirmationByzantineThreshold) {
+      throw new Error("CONFIRMATION_BYZANTINE_THRESHOLD must be set to use fast confirmation");
+    }
+
+    return {
+      config: {
+        CONFIRMATION_BYZANTINE_THRESHOLD: confirmationByzantineThreshold,
+        PROPOSER_SCORE_BOOST: this.config.PROPOSER_SCORE_BOOST,
+      },
+      getCurrentSlot: () => this.fcStore.currentSlot,
+      getHead: () => this.head,
+      getBlock: (root: RootHex) => this.getBlockHexDefaultStatus(root),
+      getAncestor: (root: RootHex, slot: Slot) => this.getAncestor(root, slot).blockRoot,
+      isDescendant: (ancestor: RootHex, descendant: RootHex) => {
+        const ancestorStatus = this.protoArray.getDefaultVariant(ancestor);
+        const descendantStatus = this.protoArray.getDefaultVariant(descendant);
+        if (ancestorStatus === undefined || descendantStatus === undefined) return false;
+        return this.isDescendant(ancestor, ancestorStatus, descendant, descendantStatus);
+      },
+      getLatestMessage: (validatorIndex: ValidatorIndex) => {
+        const nextIndex = this.voteNextIndices[validatorIndex];
+        if (nextIndex === undefined || nextIndex === NULL_VOTE_INDEX) {
+          return null;
+        }
+        const node = this.protoArray.nodes[nextIndex];
+        if (!node) return null;
+        return {root: node.blockRoot, epoch: computeEpochAtSlot(this.voteNextSlots[validatorIndex])};
+      },
+      getUnrealizedJustified: () => ({
+        checkpoint: this.fcStore.unrealizedJustified.checkpoint,
+        balances: this.fcStore.unrealizedJustified.balances,
+      }),
+      getFinalizedCheckpoint: () => this.fcStore.finalizedCheckpoint,
+      getEquivocatingIndices: () => this.fcStore.equivocatingIndices,
+      getTrackedVotesCount: () => {
+        let count = 0;
+        for (let i = 0; i < this.voteNextIndices.length; i++) {
+          if (this.voteNextIndices[i] !== NULL_VOTE_INDEX) {
+            count++;
+          }
+        }
+        return count;
+      },
+    };
+  }
 }
 
 // Approximate https://github.com/ethereum/consensus-specs/blob/v1.6.1/specs/phase0/fork-choice.md#calculate_committee_fraction

package/src/forkChoice/interface.ts

@@ -107,6 +107,8 @@ export interface IForkChoice {
    */
   getHeadRoot(): RootHex;
   getHead(): ProtoBlock;
+  getConfirmedRoot(): RootHex;
+  getConfirmedBlock(): ProtoBlock | null;
   updateAndGetHead(mode: UpdateAndGetHeadOpt): {
     head: ProtoBlock;
     isHeadTimely?: boolean;
@@ -132,6 +134,10 @@ export interface IForkChoice {
   getAllNodes(): ProtoNode[];
   getFinalizedCheckpoint(): CheckpointWithHex;
   getJustifiedCheckpoint(): CheckpointWithHex;
+  getUnrealizedJustifiedCheckpoint(): CheckpointWithHex;
+  getUnrealizedFinalizedCheckpoint(): CheckpointWithHex;
+  getProposerBoostRoot(): RootHex;
+  getPreviousProposerBoostRoot(): RootHex;
   /**
    * Add `block` to the fork choice DAG.
    *
@@ -194,6 +200,7 @@ export interface IForkChoice {
    */
   notifyPtcMessages(
     blockRoot: RootHex,
+    slot: Slot,
     ptcIndices: number[],
     payloadPresent: boolean,
     blobDataAvailable: boolean
@@ -246,6 +253,15 @@ export interface IForkChoice {
   hasPayloadHexUnsafe(blockRoot: RootHex): boolean;
   getSlotsPresent(windowStart: number): number;
   getPTCVotes(blockRootHex: RootHex): (boolean | null)[] | null;
+  /** Raw PTC vote tallies for the debug fork choice endpoint; `null` for pre-Gloas roots. */
+  getPTCVoteCounts(blockRootHex: RootHex): {
+    attesterCount: number;
+    payloadPresentCount: number;
+    dataAvailableCount: number;
+  } | null;
+  getPayloadTimelinessVotes(blockRootHex: RootHex): (boolean | null)[] | null;
+  getPayloadDataAvailabilityVotes(blockRootHex: RootHex): (boolean | null)[] | null;
+
   /**
    * Returns a `ProtoBlock` if the block is known **and** a descendant of the finalized root.
    */
@@ -256,7 +272,7 @@ export interface IForkChoice {
   getBlockHexAndBlockHash(blockRoot: RootHex, blockHash: RootHex): ProtoBlock | null;
   shouldExtendPayload(blockRoot: RootHex): boolean;
   /** Spec: should_build_on_full(store, head) */
-  shouldBuildOnFull(head: ProtoBlock): boolean;
+  shouldBuildOnFull(head: ProtoBlock, slot: Slot): boolean;
   getFinalizedBlock(): ProtoBlock;
   getJustifiedBlock(): ProtoBlock;
   getFinalizedCheckpointSlot(): Slot;

package/src/forkChoice/safeBlocks.ts

@@ -1,5 +1,6 @@
 import {ZERO_HASH_HEX} from "@lodestar/params";
 import {Root, RootHex} from "@lodestar/types";
+import {fromHex} from "@lodestar/utils";
 import {IForkChoice} from "./interface.js";
 
 /**
@@ -7,21 +8,28 @@ import {IForkChoice} from "./interface.js";
  * that is safe from re-orgs. Normally this block is pretty close to the head of canonical
  * chain which makes it valuable to expose a safe block to users.
  *
- * https://github.com/ethereum/consensus-specs/blob/v1.6.0/fork_choice/safe-block.md#get_safe_beacon_block_root
+ * @deprecated The merged fast-confirmation spec only defines `get_safe_execution_block_hash`.
  */
 export function getSafeBeaconBlockRoot(fc: IForkChoice): Root {
+  const confirmedRoot = fc.getConfirmedRoot();
+  if (confirmedRoot && fc.hasBlockHex(confirmedRoot)) {
+    return fromHex(confirmedRoot);
+  }
   return fc.getJustifiedCheckpoint().root;
 }
 
 /**
  * Get execution payload hash for the safe block
- * This function assumes that safe block is post Bellatrix and function should not be called otherwise.
  *
- * As our existing usage is aligned with above condition so not adding fork-check inside this function
- *
- *
- * https://github.com/ethereum/consensus-specs/blob/v1.6.0/fork_choice/safe-block.md#get_safe_execution_block_hash
+ * https://github.com/ethereum/consensus-specs/blob/master/fork_choice/safe-block.md#get_safe_execution_block_hash
  */
 export function getSafeExecutionBlockHash(forkChoice: IForkChoice): RootHex {
-  return forkChoice.getJustifiedBlock().executionPayloadBlockHash ?? ZERO_HASH_HEX;
+  const confirmedRoot = forkChoice.getConfirmedRoot();
+  if (confirmedRoot) {
+    const confirmedBlock = forkChoice.getBlockHexDefaultStatus(confirmedRoot);
+    if (confirmedBlock?.executionPayloadBlockHash) {
+      return confirmedBlock.executionPayloadBlockHash;
+    }
+  }
+  return ZERO_HASH_HEX;
 }

package/src/forkChoice/store.ts

@@ -1,6 +1,7 @@
 import {EffectiveBalanceIncrements, IBeaconStateView} from "@lodestar/state-transition";
 import {RootHex, Slot, ValidatorIndex, phase0} from "@lodestar/types";
 import {toRootHex} from "@lodestar/utils";
+import {ForkChoiceStateGetter, IFastConfirmationStore} from "./fastConfirmation/types.ts";
 import {CheckpointWithBalance, CheckpointWithTotalBalance} from "./interface.js";
 
 /**
@@ -35,7 +36,7 @@ export type JustifiedBalancesGetter = (
  * - The actual block DAG in `ProtoArray`.
  * - `time` is represented using `Slot` instead of UNIX epoch `u64`.
  */
-export interface IForkChoiceStore {
+export interface IForkChoiceStore extends IFastConfirmationStore {
   currentSlot: Slot;
   get justified(): CheckpointWithTotalBalance;
   set justified(justified: CheckpointWithBalance);
@@ -58,12 +59,27 @@ export class ForkChoiceStore implements IForkChoiceStore {
   justifiedBalancesGetter: JustifiedBalancesGetter;
   currentSlot: Slot;
 
+  // Fast Confirmation Rule spec fields
+  confirmedRoot: RootHex;
+  previousEpochObservedJustifiedCheckpoint: CheckpointWithHex;
+  currentEpochObservedJustifiedCheckpoint: CheckpointWithHex;
+  previousEpochGreatestUnrealizedCheckpoint: CheckpointWithHex;
+  previousSlotHead: RootHex;
+  currentSlotHead: RootHex;
+
+  // Fast Confirmation Rule internal fields
+  previousEpochObservedJustifiedBalances: JustifiedBalances;
+  currentEpochObservedJustifiedBalances: JustifiedBalances;
+  previousEpochGreatestUnrealizedBalances: JustifiedBalances;
+  stateGetter: ForkChoiceStateGetter;
+
   constructor(
     currentSlot: Slot,
     justifiedCheckpoint: phase0.Checkpoint,
     finalizedCheckpoint: phase0.Checkpoint,
     justifiedBalances: EffectiveBalanceIncrements,
     justifiedBalancesGetter: JustifiedBalancesGetter,
+    stateGetter: ForkChoiceStateGetter,
     private readonly events?: {
       onJustified: (cp: CheckpointWithHex) => void;
       onFinalized: (cp: CheckpointWithHex) => void;
@@ -71,6 +87,7 @@ export class ForkChoiceStore implements IForkChoiceStore {
   ) {
     this.justifiedBalancesGetter = justifiedBalancesGetter;
     this.currentSlot = currentSlot;
+    this.stateGetter = stateGetter;
     const justified = {
       checkpoint: toCheckpointWithHex(justifiedCheckpoint),
       balances: justifiedBalances,
@@ -80,6 +97,22 @@ export class ForkChoiceStore implements IForkChoiceStore {
     this.unrealizedJustified = justified;
     this._finalizedCheckpoint = toCheckpointWithHex(finalizedCheckpoint);
     this.unrealizedFinalizedCheckpoint = this._finalizedCheckpoint;
+
+    // Initialize Fast Confirmation fields conservatively from finalized, matching
+    // the spec's get_fast_confirmation_store() behavior.
+    const finalizedCheckpointWithHex = toCheckpointWithHex(finalizedCheckpoint);
+    const finalizedState = stateGetter({checkpoint: finalizedCheckpointWithHex});
+    const finalizedBalances = finalizedState?.effectiveBalanceIncrements ?? justifiedBalances;
+    const anchorRoot = finalizedCheckpointWithHex.rootHex;
+    this.previousEpochObservedJustifiedCheckpoint = finalizedCheckpointWithHex;
+    this.currentEpochObservedJustifiedCheckpoint = finalizedCheckpointWithHex;
+    this.previousEpochGreatestUnrealizedCheckpoint = finalizedCheckpointWithHex;
+    this.confirmedRoot = anchorRoot;
+    this.previousEpochObservedJustifiedBalances = finalizedBalances;
+    this.currentEpochObservedJustifiedBalances = finalizedBalances;
+    this.previousEpochGreatestUnrealizedBalances = finalizedBalances;
+    this.previousSlotHead = anchorRoot;
+    this.currentSlotHead = anchorRoot;
   }
 
   get justified(): CheckpointWithTotalBalance {

package/src/index.ts

@@ -6,6 +6,17 @@ export {
   type InvalidBlock,
   InvalidBlockCode,
 } from "./forkChoice/errors.js";
+export {
+  type FastConfirmationBalanceSource,
+  type FastConfirmationContext,
+  type FastConfirmationMetrics,
+  type FastConfirmationResult,
+  FastConfirmationRule,
+  type ForkChoiceStateGetter,
+  type IFastConfirmationRule,
+  type IFastConfirmationStore,
+  getFastConfirmationMetrics,
+} from "./forkChoice/fastConfirmation/fastConfirmationRule.ts";
 export {ForkChoice, type ForkChoiceOpts, UpdateHeadOpt} from "./forkChoice/forkChoice.js";
 export {
   type AncestorResult,

package/src/metrics.ts

@@ -1,11 +1,13 @@
 import {MetricsRegisterExtra} from "@lodestar/utils";
+import {FastConfirmationMetrics, getFastConfirmationMetrics} from "./forkChoice/fastConfirmation/metrics.ts";
 import {UpdateHeadOpt} from "./forkChoice/forkChoice.js";
 import {NotReorgedReason} from "./forkChoice/interface.js";
 
-export type ForkChoiceMetrics = ReturnType<typeof getForkChoiceMetrics>;
+export type ForkChoiceMetrics = ReturnType<typeof getForkChoiceMetrics> & FastConfirmationMetrics;
 
 export function getForkChoiceMetrics(register: MetricsRegisterExtra) {
   return {
+    ...getFastConfirmationMetrics(register),
     forkChoice: {
       findHead: register.histogram<{caller: string}>({
         name: "beacon_fork_choice_find_head_seconds",

package/src/protoArray/protoArray.ts

@@ -91,14 +91,14 @@ export class ProtoArray {
    *
    * Bit i = PTC member i voted payloadPresent=true (timeliness YES vote)
    */
-  private ptcVotes = new Map<RootHex, BitArray>();
+  private payloadTimelinessVotes = new Map<RootHex, BitArray>();
   /**
    * Blob data availability votes per block.
    * Spec: gloas/fork-choice.md#modified-store (payload_data_availability_vote)
    *
    * Bit i = PTC member i voted blobDataAvailable=true (DA YES vote)
    */
-  private daVotes = new Map<RootHex, BitArray>();
+  private payloadDataAvailabilityVotes = new Map<RootHex, BitArray>();
   /**
    * Tracks which PTC members have attested at all (any payload_status).
    * Without this, we cannot tell "didn't vote" (None) from "voted false" —
@@ -552,9 +552,9 @@ export class ProtoArray {
 
       // Initialize PTC vote bitvectors for this block.
       // Spec: gloas/fork-choice.md#modified-on_block
-      this.ptcVotes.set(block.blockRoot, BitArray.fromBitLen(PTC_SIZE));
+      this.payloadTimelinessVotes.set(block.blockRoot, BitArray.fromBitLen(PTC_SIZE));
       this.ptcAttested.set(block.blockRoot, BitArray.fromBitLen(PTC_SIZE));
-      this.daVotes.set(block.blockRoot, BitArray.fromBitLen(PTC_SIZE));
+      this.payloadDataAvailabilityVotes.set(block.blockRoot, BitArray.fromBitLen(PTC_SIZE));
     } else {
       // Pre-Gloas: Only create FULL node (payload embedded in block)
       const node: ProtoNode = {
@@ -678,18 +678,26 @@ export class ProtoArray {
    */
   notifyPtcMessages(
     blockRoot: RootHex,
+    slot: Slot,
     ptcIndices: number[],
     payloadPresent: boolean,
     blobDataAvailable: boolean
   ): void {
-    const votes = this.ptcVotes.get(blockRoot);
+    const votes = this.payloadTimelinessVotes.get(blockRoot);
     const attended = this.ptcAttested.get(blockRoot);
-    const daVotes = this.daVotes.get(blockRoot);
+    const daVotes = this.payloadDataAvailabilityVotes.get(blockRoot);
     if (votes === undefined || attended === undefined || daVotes === undefined) {
       // Block not found or not a Gloas block, ignore
       return;
     }
 
+    // PTC votes can only change the vote for their assigned beacon block, return early otherwise
+    const nodeIndex = this.getDefaultNodeIndex(blockRoot);
+    const node = nodeIndex !== undefined ? this.getNodeByIndex(nodeIndex) : undefined;
+    if (node === undefined || node.slot !== slot) {
+      return;
+    }
+
     for (const ptcIndex of ptcIndices) {
       if (ptcIndex < 0 || ptcIndex >= PTC_SIZE) {
         throw new Error(`Invalid PTC index: ${ptcIndex}, must be 0..${PTC_SIZE - 1}`);
@@ -701,7 +709,7 @@ export class ProtoArray {
   }
 
   getPTCVotes(blockRootHex: RootHex): BitArray | null {
-    const votes = this.ptcVotes.get(blockRootHex);
+    const votes = this.payloadTimelinessVotes.get(blockRootHex);
     if (votes === undefined) {
       // Block not found or not a Gloas block
       return null;
@@ -710,11 +718,63 @@ export class ProtoArray {
     return votes;
   }
 
+  /**
+   * Raw PTC vote tallies for a block root, for the debug fork choice endpoint.
+   * Returns `null` for pre-Gloas (or pruned) roots, which have no vote maps.
+   */
+  getPTCVoteCounts(blockRootHex: RootHex): {
+    attesterCount: number;
+    payloadPresentCount: number;
+    dataAvailableCount: number;
+  } | null {
+    const attended = this.ptcAttested.get(blockRootHex);
+    const timelinessVotes = this.payloadTimelinessVotes.get(blockRootHex);
+    const daVotes = this.payloadDataAvailabilityVotes.get(blockRootHex);
+    // The three maps share a lifecycle (set together in onBlock, deleted together on prune)
+    if (attended === undefined || timelinessVotes === undefined || daVotes === undefined) {
+      return null;
+    }
+    return {
+      attesterCount: bitCount(attended.uint8Array),
+      payloadPresentCount: bitCount(timelinessVotes.uint8Array),
+      dataAvailableCount: bitCount(daVotes.uint8Array),
+    };
+  }
+
+  getPreviousProposerBoostRoot(): RootHex {
+    return this.previousProposerBoost?.root ?? HEX_ZERO_HASH;
+  }
+
+  /**
+   * Timeliness votes per PTC position, `null` where the member has not attested.
+   * Returns `null` if the block is unknown or not a Gloas block.
+   */
+  getPayloadTimelinessVotes(blockRootHex: RootHex): (boolean | null)[] | null {
+    return this.toAttendanceAwareVotes(this.payloadTimelinessVotes.get(blockRootHex), blockRootHex);
+  }
+
+  /**
+   * Data-availability votes per PTC position, `null` where the member has not attested.
+   * Returns `null` if the block is unknown or not a Gloas block.
+   */
+  getPayloadDataAvailabilityVotes(blockRootHex: RootHex): (boolean | null)[] | null {
+    return this.toAttendanceAwareVotes(this.payloadDataAvailabilityVotes.get(blockRootHex), blockRootHex);
+  }
+
+  private toAttendanceAwareVotes(votes: BitArray | undefined, blockRootHex: RootHex): (boolean | null)[] | null {
+    const attended = this.ptcAttested.get(blockRootHex);
+    if (votes === undefined || attended === undefined) {
+      return null;
+    }
+
+    return Array.from({length: PTC_SIZE}, (_, i) => (attended.get(i) ? votes.get(i) : null));
+  }
+
   /**
    * Spec: payload_timeliness(store, root, timely=True)
    */
   isPayloadTimely(blockRoot: RootHex): boolean {
-    const votes = this.ptcVotes.get(blockRoot);
+    const votes = this.payloadTimelinessVotes.get(blockRoot);
     if (votes === undefined) return false;
     if (!this.hasPayload(blockRoot)) return false;
     return bitCount(votes.uint8Array) > PAYLOAD_TIMELY_THRESHOLD;
@@ -724,7 +784,7 @@ export class ProtoArray {
    * Spec: payload_timeliness(store, root, timely=False)
    */
   isPayloadNotTimely(blockRoot: RootHex): boolean {
-    const votes = this.ptcVotes.get(blockRoot);
+    const votes = this.payloadTimelinessVotes.get(blockRoot);
     const attended = this.ptcAttested.get(blockRoot);
     if (votes === undefined || attended === undefined) return false;
     // Spec: not verified locally → returns `not False = True`
@@ -736,7 +796,7 @@ export class ProtoArray {
    * Spec: payload_data_availability(store, root, available=True)
    */
   isPayloadDataAvailable(blockRoot: RootHex): boolean {
-    const daVotes = this.daVotes.get(blockRoot);
+    const daVotes = this.payloadDataAvailabilityVotes.get(blockRoot);
     if (daVotes === undefined) return false;
     if (!this.hasPayload(blockRoot)) return false;
     return bitCount(daVotes.uint8Array) > DATA_AVAILABILITY_TIMELY_THRESHOLD;
@@ -746,7 +806,7 @@ export class ProtoArray {
    * Spec: payload_data_availability(store, root, available=False)
    */
   isPayloadDataNotAvailable(blockRoot: RootHex): boolean {
-    const daVotes = this.daVotes.get(blockRoot);
+    const daVotes = this.payloadDataAvailabilityVotes.get(blockRoot);
     const attended = this.ptcAttested.get(blockRoot);
     if (daVotes === undefined || attended === undefined) return false;
     // Spec: not verified locally → returns `not False = True`
@@ -758,14 +818,23 @@ export class ProtoArray {
    * Spec: should_build_on_full(store, head)
    *
    * The proposer is forced to build on the EMPTY variant (effectively reorging)
-   * when the PTC majority voted that the blob data is not available.
+   * when the PTC majority voted that the blob data is not available or that the
+   * payload was not timely.
    */
-  shouldBuildOnFull(head: ProtoBlock): boolean {
+  shouldBuildOnFull(head: ProtoBlock, slot: Slot): boolean {
     if (head.payloadStatus === PayloadStatus.PENDING) {
       throw new Error("shouldBuildOnFull called with PENDING head");
     }
     if (head.payloadStatus === PayloadStatus.EMPTY) return false;
-    return !this.isPayloadDataNotAvailable(head.blockRoot);
+
+    // The PTC data availability and timeliness views are only consulted for a head from the
+    // previous slot. For an earlier head the empty/full variant has already been resolved by
+    // weight in getHead.
+    if (head.slot + 1 !== slot) return true;
+
+    if (this.isPayloadDataNotAvailable(head.blockRoot)) return false;
+
+    return !this.isPayloadNotTimely(head.blockRoot);
   }
 
   /**
@@ -1205,9 +1274,9 @@ export class ProtoArray {
       this.indices.delete(root);
       // Prune PTC votes for this block to prevent memory leak
       // Spec: gloas/fork-choice.md (implicit - finalized blocks don't need PTC votes)
-      this.ptcVotes.delete(root);
+      this.payloadTimelinessVotes.delete(root);
       this.ptcAttested.delete(root);
-      this.daVotes.delete(root);
+      this.payloadDataAvailabilityVotes.delete(root);
     }
 
     // Store nodes prior to finalization