@lodestar/fork-choice 1.41.0-dev.afd446235e → 1.41.0-dev.b90dff673d

package/lib/forkChoice/forkChoice.js

@@ -1,22 +1,23 @@
-import { SLOTS_PER_EPOCH, SLOTS_PER_HISTORICAL_ROOT } from "@lodestar/params";
+import { ForkSeq, SLOTS_PER_EPOCH, SLOTS_PER_HISTORICAL_ROOT } from "@lodestar/params";
 import { DataAvailabilityStatus, ZERO_HASH, computeEpochAtSlot, computeSlotsSinceEpochStart, computeStartSlotAtEpoch, getAttesterSlashableIndices, isExecutionBlockBodyType, isExecutionEnabled, isExecutionStateType, } from "@lodestar/state-transition";
 import { computeUnrealizedCheckpoints } from "@lodestar/state-transition/epoch";
 import { isGloasBeaconBlock, ssz, } from "@lodestar/types";
 import { MapDef, fromHex, toRootHex } from "@lodestar/utils";
 import { computeDeltas } from "../protoArray/computeDeltas.js";
 import { ProtoArrayError, ProtoArrayErrorCode } from "../protoArray/errors.js";
-import { ExecutionStatus, HEX_ZERO_HASH, NULL_VOTE_INDEX, } from "../protoArray/interface.js";
+import { ExecutionStatus, HEX_ZERO_HASH, NULL_VOTE_INDEX, PayloadStatus, isGloasBlock, } from "../protoArray/interface.js";
 import { ForkChoiceError, ForkChoiceErrorCode, InvalidAttestationCode, InvalidBlockCode } from "./errors.js";
 import { AncestorStatus, NotReorgedReason, } from "./interface.js";
-import { toCheckpointWithHex } from "./store.js";
-export var UpdateHeadOpt;
+import { toCheckpointWithPayload } from "./store.js";
+export { UpdateHeadOpt };
+var UpdateHeadOpt;
 (function (UpdateHeadOpt) {
     UpdateHeadOpt["GetCanonicalHead"] = "getCanonicalHead";
     UpdateHeadOpt["GetProposerHead"] = "getProposerHead";
     UpdateHeadOpt["GetPredictedProposerHead"] = "getPredictedProposerHead";
 })(UpdateHeadOpt || (UpdateHeadOpt = {}));
 // the initial vote epoch for all validators
-const INIT_VOTE_EPOCH = 0;
+const INIT_VOTE_SLOT = 0;
 /**
  * Provides an implementation of "Ethereum Consensus -- Beacon Chain Fork Choice":
  *
@@ -44,16 +45,26 @@ export class ForkChoice {
     irrecoverableError;
     /**
      * Votes currently tracked in the protoArray. Instead of tracking a VoteTracker of currentIndex, nextIndex and epoch,
-     * we decompose the struct and track them in 3 separate arrays for performance reason.
+     * we decompose the struct and track them in separate arrays for performance reason.
+     *
+     * For Gloas (ePBS), LatestMessage tracks slot instead of epoch and includes payload_present flag.
+     * Spec: gloas/fork-choice.md#modified-latestmessage
+     *
+     * IMPORTANT: voteCurrentIndices and voteNextIndices point to the EXACT variant node index.
+     * The payload status is encoded in the node index itself (different variants have different indices).
+     * For example, if a validator votes for the EMPTY variant, voteNextIndices[i] points to that specific EMPTY node.
      */
     voteCurrentIndices;
     voteNextIndices;
-    voteNextEpochs;
+    voteNextSlots;
     /**
      * Attestations that arrived at the current slot and must be queued for later processing.
      * NOT currently tracked in the protoArray
+     *
+     * Modified for Gloas to track PayloadStatus per validator.
+     * Maps: Slot -> BlockRoot -> ValidatorIndex -> PayloadStatus
      */
-    queuedAttestations = new MapDef(() => new MapDef(() => new Set()));
+    queuedAttestations = new MapDef(() => new MapDef(() => new Map()));
     /**
      * It's inconsistent to count number of queued attestations at different intervals of slot.
      * Instead of that, we count number of queued attestations at the previous slot.
@@ -93,11 +104,11 @@ export class ForkChoice {
         this.voteCurrentIndices = new Array(validatorCount).fill(NULL_VOTE_INDEX);
         this.voteNextIndices = new Array(validatorCount).fill(NULL_VOTE_INDEX);
         // when compute deltas, we ignore epoch if voteNextIndex is NULL_VOTE_INDEX anyway
-        this.voteNextEpochs = new Array(validatorCount).fill(INIT_VOTE_EPOCH);
+        this.voteNextSlots = new Array(validatorCount).fill(0);
         this.head = this.updateHead();
         this.balances = this.fcStore.justified.balances;
         metrics?.forkChoice.votes.addCollect(() => {
-            metrics.forkChoice.votes.set(this.voteNextEpochs.length);
+            metrics.forkChoice.votes.set(this.voteNextSlots.length);
             metrics.forkChoice.queuedAttestations.set(this.queuedAttestationsPreviousSlot);
             metrics.forkChoice.validatedAttestationDatas.set(this.validatedAttestationDatas.size);
             metrics.forkChoice.balancesLength.set(this.balances.length);
@@ -163,8 +174,7 @@ export class ForkChoice {
     // Return true if the given block passes all criteria to be re-orged out
     // Return false otherwise.
     // Note when proposer boost reorg is disabled, it always returns false
-    shouldOverrideForkChoiceUpdate(blockRoot, secFromSlot, currentSlot) {
-        const headBlock = this.getBlockHex(blockRoot);
+    shouldOverrideForkChoiceUpdate(headBlock, secFromSlot, currentSlot) {
         if (headBlock === null) {
             // should not happen because this block just got imported. Fall back to no-reorg.
             return { shouldOverrideFcu: false, reason: NotReorgedReason.HeadBlockNotAvailable };
@@ -179,7 +189,7 @@ export class ForkChoice {
             });
             return { shouldOverrideFcu: false, reason: NotReorgedReason.ProposerBoostReorgDisabled };
         }
-        const parentBlock = this.protoArray.getBlock(headBlock.parentRoot);
+        const parentBlock = this.protoArray.getBlock(headBlock.parentRoot, this.protoArray.getParentPayloadStatus(headBlock));
         const proposalSlot = headBlock.slot + 1;
         // No reorg if parentBlock isn't available
         if (parentBlock === undefined) {
@@ -194,7 +204,10 @@ export class ForkChoice {
         if (!currentTimeOk) {
             return { shouldOverrideFcu: false, reason: NotReorgedReason.ReorgMoreThanOneSlot };
         }
-        this.logger?.verbose("Block is weak. Should override forkchoice update", { blockRoot, slot: currentSlot });
+        this.logger?.verbose("Block is weak. Should override forkchoice update", {
+            blockRoot: headBlock.blockRoot,
+            slot: currentSlot,
+        });
         return { shouldOverrideFcu: true, parentBlock };
     }
     /**
@@ -225,7 +238,7 @@ export class ForkChoice {
             return headBlock;
         }
         const blockRoot = headBlock.blockRoot;
-        const result = this.shouldOverrideForkChoiceUpdate(blockRoot, secFromSlot, currentSlot);
+        const result = this.shouldOverrideForkChoiceUpdate(headBlock, secFromSlot, currentSlot);
         if (result.shouldOverrideFcu) {
             this.logger?.verbose("Current head is weak. Predicting next block to be built on parent of head.", {
                 slot: currentSlot,
@@ -262,7 +275,7 @@ export class ForkChoice {
             });
             return { proposerHead, isHeadTimely, notReorgedReason: NotReorgedReason.ProposerBoostReorgDisabled };
         }
-        const parentBlock = this.protoArray.getBlock(headBlock.parentRoot);
+        const parentBlock = this.protoArray.getBlock(headBlock.parentRoot, this.protoArray.getParentPayloadStatus(headBlock));
         // No reorg if parentBlock isn't available
         if (parentBlock === undefined) {
             return { proposerHead, isHeadTimely, notReorgedReason: NotReorgedReason.ParentBlockNotAvailable };
@@ -292,7 +305,7 @@ export class ForkChoice {
             slotsPerEpoch: SLOTS_PER_EPOCH,
             committeePercent: this.config.REORG_HEAD_WEIGHT_THRESHOLD,
         });
-        const headNode = this.protoArray.getNode(headBlock.blockRoot);
+        const headNode = this.protoArray.getNode(headBlock.blockRoot, headBlock.payloadStatus);
         // If headNode is unavailable, give up reorg
         if (headNode === undefined || headNode.weight >= reorgThreshold) {
             return { proposerHead, isHeadTimely, notReorgedReason: NotReorgedReason.HeadBlockNotWeak };
@@ -303,7 +316,7 @@ export class ForkChoice {
             slotsPerEpoch: SLOTS_PER_EPOCH,
             committeePercent: this.config.REORG_PARENT_WEIGHT_THRESHOLD,
         });
-        const parentNode = this.protoArray.getNode(parentBlock.blockRoot);
+        const parentNode = this.protoArray.getNode(parentBlock.blockRoot, parentBlock.payloadStatus);
         // If parentNode is unavailable, give up reorg
         if (parentNode === undefined || parentNode.weight <= parentThreshold) {
             return { proposerHead, isHeadTimely, notReorgedReason: NotReorgedReason.ParentBlockNotStrong };
@@ -375,22 +388,9 @@ export class ForkChoice {
             finalizedRoot: this.fcStore.finalizedCheckpoint.rootHex,
             currentSlot,
         });
-        const headRoot = this.protoArray.findHead(this.fcStore.justified.checkpoint.rootHex, currentSlot);
-        const headIndex = this.protoArray.indices.get(headRoot);
-        if (headIndex === undefined) {
-            throw new ForkChoiceError({
-                code: ForkChoiceErrorCode.MISSING_PROTO_ARRAY_BLOCK,
-                root: headRoot,
-            });
-        }
-        const headNode = this.protoArray.nodes[headIndex];
-        if (headNode === undefined) {
-            throw new ForkChoiceError({
-                code: ForkChoiceErrorCode.MISSING_PROTO_ARRAY_BLOCK,
-                root: headRoot,
-            });
-        }
-        this.head = headNode;
+        // findHead returns the ProtoNode representing the head
+        const head = this.protoArray.findHead(this.fcStore.justified.checkpoint.rootHex, currentSlot);
+        this.head = head;
         return this.head;
     }
     /**
@@ -437,14 +437,18 @@ export class ForkChoice {
     onBlock(block, state, blockDelaySec, currentSlot, executionStatus, dataAvailabilityStatus) {
         const { parentRoot, slot } = block;
         const parentRootHex = toRootHex(parentRoot);
-        // Parent block must be known
-        const parentBlock = this.protoArray.getBlock(parentRootHex);
+        // Parent block must be known because state_transition would have failed otherwise.
+        const parentHashHex = isGloasBeaconBlock(block)
+            ? toRootHex(block.body.signedExecutionPayloadBid.message.parentBlockHash)
+            : null;
+        const parentBlock = this.protoArray.getParent(parentRootHex, parentHashHex);
         if (!parentBlock) {
             throw new ForkChoiceError({
                 code: ForkChoiceErrorCode.INVALID_BLOCK,
                 err: {
                     code: InvalidBlockCode.UNKNOWN_PARENT,
                     root: parentRootHex,
+                    hash: parentHashHex,
                 },
             });
         }
@@ -476,15 +480,16 @@ export class ForkChoice {
             });
         }
         // Check block is a descendant of the finalized block at the checkpoint finalized slot.
-        const blockAncestorRoot = this.getAncestor(parentRootHex, finalizedSlot);
-        const finalizedRoot = this.fcStore.finalizedCheckpoint.rootHex;
-        if (blockAncestorRoot !== finalizedRoot) {
+        const blockAncestorNode = this.getAncestor(parentRootHex, finalizedSlot);
+        const fcStoreFinalized = this.fcStore.finalizedCheckpoint;
+        if (blockAncestorNode.blockRoot !== fcStoreFinalized.rootHex ||
+            blockAncestorNode.payloadStatus !== fcStoreFinalized.payloadStatus) {
             throw new ForkChoiceError({
                 code: ForkChoiceErrorCode.INVALID_BLOCK,
                 err: {
                     code: InvalidBlockCode.NOT_FINALIZED_DESCENDANT,
-                    finalizedRoot,
-                    blockAncestor: blockAncestorRoot,
+                    finalizedRoot: fcStoreFinalized.rootHex,
+                    blockAncestor: blockAncestorNode.blockRoot,
                 },
             });
         }
@@ -499,9 +504,13 @@ export class ForkChoice {
             this.proposerBoostRoot === null) {
             this.proposerBoostRoot = blockRootHex;
         }
-        const justifiedCheckpoint = toCheckpointWithHex(state.currentJustifiedCheckpoint);
-        const finalizedCheckpoint = toCheckpointWithHex(state.finalizedCheckpoint);
+        // Get justified checkpoint with payload status for Gloas
+        const justifiedPayloadStatus = getCheckpointPayloadStatus(state, state.currentJustifiedCheckpoint.epoch);
+        const justifiedCheckpoint = toCheckpointWithPayload(state.currentJustifiedCheckpoint, justifiedPayloadStatus);
         const stateJustifiedEpoch = justifiedCheckpoint.epoch;
+        // Get finalized checkpoint with payload status for Gloas
+        const finalizedPayloadStatus = getCheckpointPayloadStatus(state, state.finalizedCheckpoint.epoch);
+        const finalizedCheckpoint = toCheckpointWithPayload(state.finalizedCheckpoint, finalizedPayloadStatus);
         // Justified balances for `justifiedCheckpoint` are new to the fork-choice. Compute them on demand only if
         // the justified checkpoint changes
         this.updateCheckpoints(justifiedCheckpoint, finalizedCheckpoint, () => this.fcStore.justifiedBalancesGetter(justifiedCheckpoint, state));
@@ -524,22 +533,32 @@ export class ForkChoice {
             if (parentBlock.unrealizedJustifiedEpoch === blockEpoch &&
                 parentBlock.unrealizedFinalizedEpoch + 1 >= blockEpoch) {
                 // reuse from parent, happens at 1/3 last blocks of epoch as monitored in mainnet
+                // Get payload status for unrealized justified checkpoint
+                const unrealizedJustifiedPayloadStatus = getCheckpointPayloadStatus(state, parentBlock.unrealizedJustifiedEpoch);
                 unrealizedJustifiedCheckpoint = {
                     epoch: parentBlock.unrealizedJustifiedEpoch,
                     root: fromHex(parentBlock.unrealizedJustifiedRoot),
                     rootHex: parentBlock.unrealizedJustifiedRoot,
+                    payloadStatus: unrealizedJustifiedPayloadStatus,
                 };
+                // Get payload status for unrealized finalized checkpoint
+                const unrealizedFinalizedPayloadStatus = getCheckpointPayloadStatus(state, parentBlock.unrealizedFinalizedEpoch);
                 unrealizedFinalizedCheckpoint = {
                     epoch: parentBlock.unrealizedFinalizedEpoch,
                     root: fromHex(parentBlock.unrealizedFinalizedRoot),
                     rootHex: parentBlock.unrealizedFinalizedRoot,
+                    payloadStatus: unrealizedFinalizedPayloadStatus,
                 };
             }
             else {
                 // compute new, happens 2/3 first blocks of epoch as monitored in mainnet
                 const unrealized = computeUnrealizedCheckpoints(state);
-                unrealizedJustifiedCheckpoint = toCheckpointWithHex(unrealized.justifiedCheckpoint);
-                unrealizedFinalizedCheckpoint = toCheckpointWithHex(unrealized.finalizedCheckpoint);
+                // Get payload status for unrealized justified checkpoint
+                const unrealizedJustifiedPayloadStatus = getCheckpointPayloadStatus(state, unrealized.justifiedCheckpoint.epoch);
+                unrealizedJustifiedCheckpoint = toCheckpointWithPayload(unrealized.justifiedCheckpoint, unrealizedJustifiedPayloadStatus);
+                // Get payload status for unrealized finalized checkpoint
+                const unrealizedFinalizedPayloadStatus = getCheckpointPayloadStatus(state, unrealized.finalizedCheckpoint.epoch);
+                unrealizedFinalizedCheckpoint = toCheckpointWithPayload(unrealized.finalizedCheckpoint, unrealizedFinalizedPayloadStatus);
             }
         }
         else {
@@ -572,29 +591,51 @@ export class ForkChoice {
             unrealizedJustifiedRoot: unrealizedJustifiedCheckpoint.rootHex,
             unrealizedFinalizedEpoch: unrealizedFinalizedCheckpoint.epoch,
             unrealizedFinalizedRoot: unrealizedFinalizedCheckpoint.rootHex,
-            ...(isExecutionBlockBodyType(block.body) && isExecutionStateType(state) && isExecutionEnabled(state, block)
-                ? {
-                    executionPayloadBlockHash: toRootHex(block.body.executionPayload.blockHash),
-                    executionPayloadNumber: block.body.executionPayload.blockNumber,
-                    executionStatus: this.getPostMergeExecStatus(executionStatus),
-                    dataAvailabilityStatus,
-                }
-                : {
-                    executionPayloadBlockHash: null,
-                    executionStatus: this.getPreMergeExecStatus(executionStatus),
-                    dataAvailabilityStatus: this.getPreMergeDataStatus(dataAvailabilityStatus),
-                }),
             ...(isGloasBeaconBlock(block)
                 ? {
-                    builderIndex: block.body.signedExecutionPayloadBid.message.builderIndex,
-                    blockHashHex: toRootHex(block.body.signedExecutionPayloadBid.message.blockHash),
+                    executionPayloadBlockHash: toRootHex(block.body.signedExecutionPayloadBid.message.parentBlockHash), // post-gloas, we don't know payload hash until we import execution payload. Set to parent payload hash for now
+                    executionPayloadNumber: (() => {
+                        // Determine parent's execution payload number based on which variant the block extends
+                        const parentBlockHashFromBid = toRootHex(block.body.signedExecutionPayloadBid.message.parentBlockHash);
+                        // If parent is pre-merge, return 0
+                        if (parentBlock.executionPayloadBlockHash === null) {
+                            return 0;
+                        }
+                        // If parent is pre-Gloas, it only has FULL variant
+                        if (parentBlock.parentBlockHash === null) {
+                            return parentBlock.executionPayloadNumber;
+                        }
+                        // Parent is Gloas: get the variant that matches the parentBlockHash from bid
+                        const parentVariant = this.getBlockHexAndBlockHash(parentRootHex, parentBlockHashFromBid);
+                        if (parentVariant && parentVariant.executionPayloadBlockHash !== null) {
+                            return parentVariant.executionPayloadNumber;
+                        }
+                        // Fallback to parent block's number (we know it's post-merge from check above)
+                        return parentBlock.executionPayloadNumber;
+                    })(),
+                    executionStatus: this.getPostGloasExecStatus(executionStatus),
+                    dataAvailabilityStatus,
                 }
-                : {
-                    builderIndex: undefined,
-                    blockHashHex: undefined,
-                }),
+                : isExecutionBlockBodyType(block.body) && isExecutionStateType(state) && isExecutionEnabled(state, block)
+                    ? {
+                        executionPayloadBlockHash: toRootHex(block.body.executionPayload.blockHash),
+                        executionPayloadNumber: block.body.executionPayload.blockNumber,
+                        executionStatus: this.getPreGloasExecStatus(executionStatus),
+                        dataAvailabilityStatus,
+                    }
+                    : {
+                        executionPayloadBlockHash: null,
+                        executionStatus: this.getPreMergeExecStatus(executionStatus),
+                        dataAvailabilityStatus: this.getPreMergeDataStatus(dataAvailabilityStatus),
+                    }),
+            payloadStatus: isGloasBeaconBlock(block) ? PayloadStatus.PENDING : PayloadStatus.FULL,
+            builderIndex: isGloasBeaconBlock(block) ? block.body.signedExecutionPayloadBid.message.builderIndex : null,
+            blockHashFromBid: isGloasBeaconBlock(block)
+                ? toRootHex(block.body.signedExecutionPayloadBid.message.blockHash)
+                : null,
+            parentBlockHash: parentHashHex,
         };
-        this.protoArray.onBlock(protoBlock, currentSlot);
+        this.protoArray.onBlock(protoBlock, currentSlot, this.proposerBoostRoot);
         return protoBlock;
     }
     /**
@@ -637,10 +678,46 @@ export class ForkChoice {
             return;
         }
         this.validateOnAttestation(attestation, slot, blockRootHex, targetEpoch, attDataRoot, forceImport);
+        // Pre-gloas: payload is always present
+        // Post-gloas:
+        // - always add weight to PENDING
+        // - if message.slot > block.slot, it also add weights to FULL or EMPTY
+        let payloadStatus;
+        // We need to retrieve block to check if it's Gloas and to compare slot
+        // https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/fork-choice.md#new-is_supporting_vote
+        const block = this.getBlockHexDefaultStatus(blockRootHex);
+        if (block && isGloasBlock(block)) {
+            // Post-Gloas block: determine FULL/EMPTY/PENDING based on slot and committee index
+            // If slot > block.slot, we can determine FULL or EMPTY. Else always PENDING
+            if (slot > block.slot) {
+                if (attestationData.index === 1) {
+                    payloadStatus = PayloadStatus.FULL;
+                }
+                else if (attestationData.index === 0) {
+                    payloadStatus = PayloadStatus.EMPTY;
+                }
+                else {
+                    throw new ForkChoiceError({
+                        code: ForkChoiceErrorCode.INVALID_ATTESTATION,
+                        err: {
+                            code: InvalidAttestationCode.INVALID_DATA_INDEX,
+                            index: attestationData.index,
+                        },
+                    });
+                }
+            }
+            else {
+                payloadStatus = PayloadStatus.PENDING;
+            }
+        }
+        else {
+            // Pre-Gloas block or block not found: always FULL
+            payloadStatus = PayloadStatus.FULL;
+        }
         if (slot < this.fcStore.currentSlot) {
             for (const validatorIndex of attestation.attestingIndices) {
                 if (!this.fcStore.equivocatingIndices.has(validatorIndex)) {
-                    this.addLatestMessage(validatorIndex, targetEpoch, blockRootHex);
+                    this.addLatestMessage(validatorIndex, slot, blockRootHex, payloadStatus);
                 }
             }
         }
@@ -652,10 +729,10 @@ export class ForkChoice {
             // Delay consideration in the fork choice until their slot is in the past.
             // ```
             const byRoot = this.queuedAttestations.getOrDefault(slot);
-            const validatorIndices = byRoot.getOrDefault(blockRootHex);
+            const validatorVotes = byRoot.getOrDefault(blockRootHex);
             for (const validatorIndex of attestation.attestingIndices) {
                 if (!this.fcStore.equivocatingIndices.has(validatorIndex)) {
-                    validatorIndices.add(validatorIndex);
+                    validatorVotes.set(validatorIndex, payloadStatus);
                 }
             }
         }
@@ -672,6 +749,22 @@ export class ForkChoice {
             this.fcStore.equivocatingIndices.add(validatorIndex);
         }
     }
+    /**
+     * Process a PTC (Payload Timeliness Committee) message
+     * Updates the PTC votes for multiple validators attesting to a block
+     * Spec: gloas/fork-choice.md#new-on_payload_attestation_message
+     */
+    notifyPtcMessages(blockRoot, ptcIndices, payloadPresent) {
+        this.protoArray.notifyPtcMessages(blockRoot, ptcIndices, payloadPresent);
+    }
+    /**
+     * Notify fork choice that an execution payload has arrived (Gloas fork)
+     * Creates the FULL variant of a Gloas block when the payload becomes available
+     * Spec: gloas/fork-choice.md#new-on_execution_payload
+     */
+    onExecutionPayload(blockRoot, executionPayloadBlockHash, executionPayloadNumber, executionPayloadStateRoot) {
+        this.protoArray.onExecutionPayload(blockRoot, this.fcStore.currentSlot, executionPayloadBlockHash, executionPayloadNumber, executionPayloadStateRoot, this.proposerBoostRoot);
+    }
     /**
      * Call `onTick` for all slots between `fcStore.getCurrentSlot()` and the provided `currentSlot`.
      * This should only be called once per slot because:
@@ -701,14 +794,19 @@ export class ForkChoice {
         return this.hasBlockHex(toRootHex(blockRoot));
     }
     /** Returns a `ProtoBlock` if the block is known **and** a descendant of the finalized root. */
-    getBlock(blockRoot) {
-        return this.getBlockHex(toRootHex(blockRoot));
+    getBlock(blockRoot, payloadStatus) {
+        return this.getBlockHex(toRootHex(blockRoot), payloadStatus);
+    }
+    getBlockDefaultStatus(blockRoot) {
+        return this.getBlockHexDefaultStatus(toRootHex(blockRoot));
     }
     /**
      * Returns `true` if the block is known **and** a descendant of the finalized root.
+     * Uses default variant (PENDING for Gloas, FULL for pre-Gloas).
      */
     hasBlockHex(blockRoot) {
-        const node = this.protoArray.getNode(blockRoot);
+        const defaultStatus = this.protoArray.getDefaultVariant(blockRoot);
+        const node = defaultStatus !== undefined ? this.protoArray.getNode(blockRoot, defaultStatus) : undefined;
         if (node === undefined) {
             return false;
         }
@@ -729,8 +827,8 @@ export class ForkChoice {
     /**
      * Returns a MUTABLE `ProtoBlock` if the block is known **and** a descendant of the finalized root.
      */
-    getBlockHex(blockRoot) {
-        const node = this.protoArray.getNode(blockRoot);
+    getBlockHex(blockRoot, payloadStatus) {
+        const node = this.protoArray.getNode(blockRoot, payloadStatus);
         if (!node) {
             return null;
         }
@@ -741,22 +839,45 @@ export class ForkChoice {
             ...node,
         };
     }
+    /**
+     * Returns a `ProtoBlock` with the default variant for the given block root
+     * - Pre-Gloas blocks: returns FULL variant (only variant)
+     * - Gloas blocks: returns PENDING variant
+     *
+     * Use this when you need the canonical block reference regardless of payload status.
+     * For searching by execution payload hash and variant-specific info, use `getBlockHexAndBlockHash` instead.
+     */
+    getBlockHexDefaultStatus(blockRoot) {
+        const defaultStatus = this.protoArray.getDefaultVariant(blockRoot);
+        if (defaultStatus === undefined) {
+            return null;
+        }
+        return this.getBlockHex(blockRoot, defaultStatus);
+    }
+    /**
+     * Returns EMPTY or FULL `ProtoBlock` that has matching block root and block hash
+     */
+    getBlockHexAndBlockHash(blockRoot, blockHash) {
+        return this.protoArray.getBlockHexAndBlockHash(blockRoot, blockHash);
+    }
     getJustifiedBlock() {
-        const block = this.getBlockHex(this.fcStore.justified.checkpoint.rootHex);
+        const { rootHex, payloadStatus } = this.fcStore.justified.checkpoint;
+        const block = this.getBlockHex(rootHex, payloadStatus);
         if (!block) {
             throw new ForkChoiceError({
                 code: ForkChoiceErrorCode.MISSING_PROTO_ARRAY_BLOCK,
-                root: this.fcStore.justified.checkpoint.rootHex,
+                root: rootHex,
             });
         }
         return block;
     }
     getFinalizedBlock() {
-        const block = this.getBlockHex(this.fcStore.finalizedCheckpoint.rootHex);
+        const { rootHex, payloadStatus } = this.fcStore.finalizedCheckpoint;
+        const block = this.getBlockHex(rootHex, payloadStatus);
         if (!block) {
             throw new ForkChoiceError({
                 code: ForkChoiceErrorCode.MISSING_PROTO_ARRAY_BLOCK,
-                root: this.fcStore.finalizedCheckpoint.rootHex,
+                root: rootHex,
             });
         }
         return block;
@@ -771,8 +892,8 @@ export class ForkChoice {
      * Always returns `false` if either input roots are unknown.
      * Still returns `true` if `ancestorRoot===descendantRoot` (and the roots are known)
      */
-    isDescendant(ancestorRoot, descendantRoot) {
-        return this.protoArray.isDescendant(ancestorRoot, descendantRoot);
+    isDescendant(ancestorRoot, ancestorPayloadStatus, descendantRoot, descendantPayloadStatus) {
+        return this.protoArray.isDescendant(ancestorRoot, ancestorPayloadStatus, descendantRoot, descendantPayloadStatus);
     }
     /**
      * All indices in votes are relative to proto array so always keep it up to date
@@ -780,7 +901,7 @@ export class ForkChoice {
     prune(finalizedRoot) {
         const prunedNodes = this.protoArray.maybePrune(finalizedRoot);
         const prunedCount = prunedNodes.length;
-        for (let i = 0; i < this.voteNextEpochs.length; i++) {
+        for (let i = 0; i < this.voteNextSlots.length; i++) {
             const currentIndex = this.voteCurrentIndices[i];
             if (currentIndex !== NULL_VOTE_INDEX) {
                 if (currentIndex >= prunedCount) {
@@ -811,35 +932,47 @@ export class ForkChoice {
      * Iterates backwards through block summaries, starting from a block root.
      * Return only the non-finalized blocks.
      */
-    iterateAncestorBlocks(blockRoot) {
-        return this.protoArray.iterateAncestorNodes(blockRoot);
+    iterateAncestorBlocks(blockRoot, payloadStatus) {
+        return this.protoArray.iterateAncestorNodes(blockRoot, payloadStatus);
     }
     /**
      * Returns all blocks backwards starting from a block root.
      * Return only the non-finalized blocks.
      */
-    getAllAncestorBlocks(blockRoot) {
-        const blocks = this.protoArray.getAllAncestorNodes(blockRoot);
+    getAllAncestorBlocks(blockRoot, payloadStatus) {
+        const blocks = this.protoArray.getAllAncestorNodes(blockRoot, payloadStatus);
         // the last node is the previous finalized one, it's there to check onBlock finalized checkpoint only.
         return blocks.slice(0, blocks.length - 1);
     }
     /**
      * The same to iterateAncestorBlocks but this gets non-ancestor nodes instead of ancestor nodes.
      */
-    getAllNonAncestorBlocks(blockRoot) {
-        return this.protoArray.getAllNonAncestorNodes(blockRoot);
+    getAllNonAncestorBlocks(blockRoot, payloadStatus) {
+        return this.protoArray.getAllNonAncestorNodes(blockRoot, payloadStatus);
     }
     /**
      * Returns both ancestor and non-ancestor blocks in a single traversal.
      */
-    getAllAncestorAndNonAncestorBlocks(blockRoot) {
-        const { ancestors, nonAncestors } = this.protoArray.getAllAncestorAndNonAncestorNodes(blockRoot);
+    getAllAncestorAndNonAncestorBlocks(blockRoot, payloadStatus) {
+        const { ancestors, nonAncestors } = this.protoArray.getAllAncestorAndNonAncestorNodes(blockRoot, payloadStatus);
         return {
             // the last node is the previous finalized one, it's there to check onBlock finalized checkpoint only.
             ancestors: ancestors.slice(0, ancestors.length - 1),
             nonAncestors,
         };
     }
+    getCanonicalBlockByRoot(blockRoot) {
+        const blockRootHex = toRootHex(blockRoot);
+        if (blockRootHex === this.head.blockRoot) {
+            return this.head;
+        }
+        for (const block of this.protoArray.iterateAncestorNodes(this.head.blockRoot, this.head.payloadStatus)) {
+            if (block.blockRoot === blockRootHex) {
+                return block;
+            }
+        }
+        return null;
+    }
     getCanonicalBlockAtSlot(slot) {
         if (slot > this.head.slot) {
             return null;
@@ -847,7 +980,7 @@ export class ForkChoice {
         if (slot === this.head.slot) {
             return this.head;
         }
-        for (const block of this.protoArray.iterateAncestorNodes(this.head.blockRoot)) {
+        for (const block of this.protoArray.iterateAncestorNodes(this.head.blockRoot, this.head.payloadStatus)) {
             if (block.slot === slot) {
                 return block;
             }
@@ -858,7 +991,7 @@ export class ForkChoice {
         if (slot >= this.head.slot) {
             return this.head;
         }
-        for (const block of this.protoArray.iterateAncestorNodes(this.head.blockRoot)) {
+        for (const block of this.protoArray.iterateAncestorNodes(this.head.blockRoot, this.head.payloadStatus)) {
             if (slot >= block.slot) {
                 return block;
             }
@@ -869,9 +1002,9 @@ export class ForkChoice {
     forwarditerateAncestorBlocks() {
         return this.protoArray.nodes;
     }
-    *forwardIterateDescendants(blockRoot) {
+    *forwardIterateDescendants(blockRoot, payloadStatus) {
         const rootsInChain = new Set([blockRoot]);
-        const blockIndex = this.protoArray.indices.get(blockRoot);
+        const blockIndex = this.protoArray.getNodeIndexByRootAndStatus(blockRoot, payloadStatus);
         if (blockIndex === undefined) {
             throw new ForkChoiceError({
                 code: ForkChoiceErrorCode.MISSING_PROTO_ARRAY_BLOCK,
@@ -904,8 +1037,8 @@ export class ForkChoice {
     }
     /** Returns the distance of common ancestor of nodes to the max of the newNode and the prevNode. */
     getCommonAncestorDepth(prevBlock, newBlock) {
-        const prevNode = this.protoArray.getNode(prevBlock.blockRoot);
-        const newNode = this.protoArray.getNode(newBlock.blockRoot);
+        const prevNode = this.protoArray.getNode(prevBlock.blockRoot, prevBlock.payloadStatus);
+        const newNode = this.protoArray.getNode(newBlock.blockRoot, newBlock.payloadStatus);
         if (!prevNode || !newNode) {
             return { code: AncestorStatus.BlockUnknown };
         }
@@ -977,12 +1110,17 @@ export class ForkChoice {
             if (block.slot === beforeSlot) {
                 return block.parentRoot;
             }
-            block =
-                block.blockRoot === block.targetRoot
-                    ? // For the first slot of the epoch, a block is it's own target
-                        this.protoArray.getBlockReadonly(block.parentRoot)
-                    : // else we can navigate much faster jumping to the target block
-                        this.protoArray.getBlockReadonly(block.targetRoot);
+            // For the first slot of the epoch, a block is it's own target
+            const nextRoot = block.blockRoot === block.targetRoot ? block.parentRoot : block.targetRoot;
+            // Use default variant (PENDING for Gloas, FULL for pre-Gloas)
+            // For Gloas: we search for PENDING blocks because dependent root is determined by the block itself,
+            // not the payload. In state-transition, block parentage is independent of payload status,
+            // so linking by PENDING block in fork-choice is correct.
+            const defaultStatus = this.protoArray.getDefaultVariant(nextRoot);
+            if (defaultStatus === undefined) {
+                throw Error(`No block for root ${nextRoot}`);
+            }
+            block = this.protoArray.getBlockReadonly(nextRoot, defaultStatus);
         }
         throw Error(`Not found dependent root for block slot ${block.slot}, epoch difference ${epochDifference}`);
     }
@@ -1013,9 +1151,14 @@ export class ForkChoice {
             throw Error(`Invalid pre-merge data status: expected: ${DataAvailabilityStatus.PreData}, got ${dataAvailabilityStatus}`);
         return dataAvailabilityStatus;
     }
-    getPostMergeExecStatus(executionStatus) {
-        if (executionStatus === ExecutionStatus.PreMerge)
-            throw Error(`Invalid post-merge execution status: expected: ${ExecutionStatus.Syncing} or ${ExecutionStatus.Valid} , got ${executionStatus}`);
+    getPreGloasExecStatus(executionStatus) {
+        if (executionStatus === ExecutionStatus.PreMerge || executionStatus === ExecutionStatus.PayloadSeparated)
+            throw Error(`Invalid post-merge execution status: expected: ${ExecutionStatus.Syncing} or ${ExecutionStatus.Valid}, got ${executionStatus}`);
+        return executionStatus;
+    }
+    getPostGloasExecStatus(executionStatus) {
+        if (executionStatus !== ExecutionStatus.PayloadSeparated)
+            throw Error(`Invalid post-gloas execution status: expected: ${ExecutionStatus.PayloadSeparated}, got ${executionStatus}`);
         return executionStatus;
     }
     /**
@@ -1035,7 +1178,7 @@ export class ForkChoice {
      *
      * **`on_tick`**
      * May need the justified balances of:
-     * - unrealizedJustified: Already available in `CheckpointHexWithBalance`
+     * - unrealizedJustified: Already available in `CheckpointWithPayloadAndBalance`
      * Since this balances are already available the getter is just `() => balances`, without cache interaction
      */
     updateCheckpoints(justifiedCheckpoint, finalizedCheckpoint, getJustifiedBalances) {
@@ -1150,7 +1293,9 @@ export class ForkChoice {
         //
         // Attestations must be for a known block. If the block is unknown, we simply drop the
         // attestation and do not delay consideration for later.
-        const block = this.protoArray.getBlock(beaconBlockRootHex);
+        // We don't care which variant it is, just need to find the block
+        const defaultStatus = this.protoArray.getDefaultVariant(beaconBlockRootHex);
+        const block = defaultStatus !== undefined ? this.protoArray.getBlock(beaconBlockRootHex, defaultStatus) : undefined;
         if (!block) {
             throw new ForkChoiceError({
                 code: ForkChoiceErrorCode.INVALID_ATTESTATION,
@@ -1187,30 +1332,48 @@ export class ForkChoice {
                 },
             });
         }
+        // For Gloas blocks, attestation index must be 0 or 1
+        if (isGloasBlock(block) && attestationData.index !== 0 && attestationData.index !== 1) {
+            throw new ForkChoiceError({
+                code: ForkChoiceErrorCode.INVALID_ATTESTATION,
+                err: {
+                    code: InvalidAttestationCode.INVALID_DATA_INDEX,
+                    index: attestationData.index,
+                },
+            });
+        }
         this.validatedAttestationDatas.add(attDataRoot);
     }
     /**
      * Add a validator's latest message to the tracked votes.
      * Always sync voteCurrentIndices and voteNextIndices so that it'll not throw in computeDeltas()
+     *
+     * Modified for Gloas to accept slot and payloadPresent.
+     * Spec: gloas/fork-choice.md#modified-update_latest_messages
+     *
+     * For backward compatibility with Fulu (pre-Gloas):
+     * - Accepts both epoch-derived and slot parameters
+     * - payloadPresent defaults to true for Fulu (payloads embedded in blocks)
      */
-    addLatestMessage(validatorIndex, nextEpoch, nextRoot) {
+    addLatestMessage(validatorIndex, nextSlot, nextRoot, nextPayloadStatus) {
         // should not happen, attestation is validated before this step
-        const nextIndex = this.protoArray.indices.get(nextRoot);
+        // Get the node index for the voted block
+        const nextIndex = this.protoArray.getNodeIndexByRootAndStatus(nextRoot, nextPayloadStatus);
         if (nextIndex === undefined) {
-            throw new Error(`Could not find proto index for nextRoot ${nextRoot}`);
+            throw new Error(`Could not find proto index for nextRoot ${nextRoot} with payloadStatus ${nextPayloadStatus}`);
         }
         // ensure there is no undefined entries in Votes arrays
-        if (this.voteNextEpochs.length < validatorIndex + 1) {
-            for (let i = this.voteNextEpochs.length; i < validatorIndex + 1; i++) {
-                this.voteNextEpochs[i] = INIT_VOTE_EPOCH;
+        if (this.voteNextSlots.length < validatorIndex + 1) {
+            for (let i = this.voteNextSlots.length; i < validatorIndex + 1; i++) {
+                this.voteNextSlots[i] = INIT_VOTE_SLOT;
                 this.voteCurrentIndices[i] = this.voteNextIndices[i] = NULL_VOTE_INDEX;
             }
         }
-        const existingNextEpoch = this.voteNextEpochs[validatorIndex];
-        if (existingNextEpoch === INIT_VOTE_EPOCH || nextEpoch > existingNextEpoch) {
+        const existingNextSlot = this.voteNextSlots[validatorIndex];
+        if (existingNextSlot === INIT_VOTE_SLOT || computeEpochAtSlot(nextSlot) > computeEpochAtSlot(existingNextSlot)) {
             // nextIndex is transfered to currentIndex in computeDeltas()
             this.voteNextIndices[validatorIndex] = nextIndex;
-            this.voteNextEpochs[validatorIndex] = nextEpoch;
+            this.voteNextSlots[validatorIndex] = nextSlot;
         }
         // else its an old vote, don't count it
     }
@@ -1221,17 +1384,16 @@ export class ForkChoice {
     processAttestationQueue() {
         const currentSlot = this.fcStore.currentSlot;
         for (const [slot, byRoot] of this.queuedAttestations.entries()) {
-            const targetEpoch = computeEpochAtSlot(slot);
             if (slot < currentSlot) {
                 this.queuedAttestations.delete(slot);
-                for (const [blockRoot, validatorIndices] of byRoot.entries()) {
+                for (const [blockRoot, validatorVotes] of byRoot.entries()) {
                     const blockRootHex = blockRoot;
-                    for (const validatorIndex of validatorIndices) {
+                    for (const [validatorIndex, payloadStatus] of validatorVotes.entries()) {
                         // equivocatingIndices was checked in onAttestation
-                        this.addLatestMessage(validatorIndex, targetEpoch, blockRootHex);
+                        this.addLatestMessage(validatorIndex, slot, blockRootHex, payloadStatus);
                     }
                     if (slot === currentSlot - 1) {
-                        this.queuedAttestationsPreviousSlot += validatorIndices.size;
+                        this.queuedAttestationsPreviousSlot += validatorVotes.size;
                     }
                 }
             }
@@ -1322,4 +1484,28 @@ export function getCommitteeFraction(justifiedTotalActiveBalanceByIncrement, con
     const committeeWeight = Math.floor(justifiedTotalActiveBalanceByIncrement / config.slotsPerEpoch);
     return Math.floor((committeeWeight * config.committeePercent) / 100);
 }
+/**
+ * Get the payload status for a checkpoint.
+ *
+ * Pre-Gloas: always FULL (payload embedded in block)
+ * Gloas: determined by state.execution_payload_availability
+ *
+ * @param state - The state to check execution_payload_availability
+ * @param checkpointEpoch - The epoch of the checkpoint
+ */
+export function getCheckpointPayloadStatus(state, checkpointEpoch) {
+    // Compute checkpoint slot first to determine the correct fork
+    const checkpointSlot = computeStartSlotAtEpoch(checkpointEpoch);
+    const fork = state.config.getForkSeq(checkpointSlot);
+    // Pre-Gloas: always FULL
+    if (fork < ForkSeq.gloas) {
+        return PayloadStatus.FULL;
+    }
+    // For Gloas, check state.execution_payload_availability
+    // - For non-skipped slots at checkpoint: returns false (EMPTY) since payload hasn't arrived yet
+    // - For skipped slots at checkpoint: returns the actual availability status from state
+    const gloasState = state;
+    const payloadAvailable = gloasState.executionPayloadAvailability.get(checkpointSlot % SLOTS_PER_HISTORICAL_ROOT);
+    return payloadAvailable ? PayloadStatus.FULL : PayloadStatus.EMPTY;
+}
 //# sourceMappingURL=forkChoice.js.map