@lodestar/fork-choice 1.43.0-dev.2870b59b6a → 1.43.0-dev.2fba242f5d

package/lib/forkChoice/forkChoice.d.ts

@@ -6,7 +6,7 @@ import { ForkChoiceMetrics } from "../metrics.js";
 import { BlockExecutionStatus, LVHExecResponse, PayloadExecutionStatus, PayloadStatus, ProtoBlock, ProtoNode } from "../protoArray/interface.js";
 import { ProtoArray } from "../protoArray/protoArray.js";
 import { AncestorResult, EpochDifference, IForkChoice, NotReorgedReason, ShouldOverrideForkChoiceUpdateResult } from "./interface.js";
-import { CheckpointWithPayloadStatus, IForkChoiceStore } from "./store.js";
+import { CheckpointWithHex, IForkChoiceStore } from "./store.js";
 export type ForkChoiceOpts = {
     proposerBoost?: boolean;
     proposerBoostReorg?: boolean;
@@ -142,6 +142,11 @@ export declare class ForkChoice implements IForkChoice {
      * Get the proposer boost root
      */
     getProposerBoostRoot(): RootHex;
+    /**
+     * Decides whether to extend an available payload from the previous slot,
+     * corresponding to the beacon block `blockRoot`.
+     */
+    shouldExtendPayload(blockRoot: RootHex): boolean;
     /**
      * To predict the proposer head of the next slot. That is, to predict if proposer-boost-reorg could happen.
      * Reason why we can't be certain is because information of the head block is not fully available yet
@@ -189,8 +194,8 @@ export declare class ForkChoice implements IForkChoice {
     getHeads(): ProtoBlock[];
     /** This is for the debug API only */
     getAllNodes(): ProtoNode[];
-    getFinalizedCheckpoint(): CheckpointWithPayloadStatus;
-    getJustifiedCheckpoint(): CheckpointWithPayloadStatus;
+    getFinalizedCheckpoint(): CheckpointWithHex;
+    getJustifiedCheckpoint(): CheckpointWithHex;
     /**
      * Add `block` to the fork choice DAG.
      *
@@ -247,7 +252,7 @@ export declare class ForkChoice implements IForkChoice {
      * Creates the FULL variant of a Gloas block when the payload becomes available
      * Spec: gloas/fork-choice.md#new-on_execution_payload
      */
-    onExecutionPayload(blockRoot: RootHex, executionPayloadBlockHash: RootHex, executionPayloadNumber: number, executionPayloadStateRoot: RootHex, executionStatus: PayloadExecutionStatus): void;
+    onExecutionPayload(blockRoot: RootHex, executionPayloadBlockHash: RootHex, executionPayloadNumber: number, executionStatus: PayloadExecutionStatus, dataAvailabilityStatus: DataAvailabilityStatus): void;
     /**
      * Call `onTick` for all slots between `fcStore.getCurrentSlot()` and the provided `currentSlot`.
      * This should only be called once per slot because:
@@ -285,6 +290,7 @@ export declare class ForkChoice implements IForkChoice {
      * Same as hasPayloadUnsafe but accepts a hex-encoded block root.
      */
     hasPayloadHexUnsafe(blockRoot: RootHex): boolean;
+    getPTCVotes(blockRootHex: RootHex): (boolean | null)[] | null;
     /**
      * Returns a MUTABLE `ProtoBlock` if the block is known **and** a descendant of the finalized root.
      */
@@ -323,8 +329,9 @@ export declare class ForkChoice implements IForkChoice {
      */
     iterateAncestorBlocks(blockRoot: RootHex, payloadStatus: PayloadStatus): IterableIterator<ProtoBlock>;
     /**
-     * Returns all blocks backwards starting from a block root.
-     * Return only the non-finalized blocks.
+     * Raw ancestor walk from `blockRoot` back toward the previous finalized block. Includes both
+     * `blockRoot` and the previous-finalized boundary as last element. Mirrors the semantics of
+     * `getAllAncestorAndNonAncestorBlocks.ancestors`
      */
     getAllAncestorBlocks(blockRoot: RootHex, payloadStatus: PayloadStatus): ProtoBlock[];
     /**
@@ -333,17 +340,29 @@ export declare class ForkChoice implements IForkChoice {
     getAllNonAncestorBlocks(blockRoot: RootHex, payloadStatus: PayloadStatus): ProtoBlock[];
     /**
      * Returns both ancestor and non-ancestor blocks in a single traversal.
+     *
+     * `ancestors` is the raw walk and includes the previous finalized block as its last element —
+     * callers that don't want the boundary should slice it off themselves.
+     * Post-gloas for each block root, it returns exactly one variant of it.
      */
     getAllAncestorAndNonAncestorBlocks(blockRoot: RootHex, payloadStatus: PayloadStatus): {
         ancestors: ProtoBlock[];
         nonAncestors: ProtoBlock[];
     };
+    /**
+     * Same to getAllAncestorAndNonAncestorBlocks with default variant of ${blockRoot} to start with
+     */
+    getAllAncestorAndNonAncestorBlocksDefaultStatus(blockRoot: RootHex): {
+        ancestors: ProtoBlock[];
+        nonAncestors: ProtoBlock[];
+    };
     getCanonicalBlockByRoot(blockRoot: Root): ProtoBlock | null;
     getCanonicalBlockAtSlot(slot: Slot): ProtoBlock | null;
     getCanonicalBlockClosestLteSlot(slot: Slot): ProtoBlock | null;
     /** Very expensive function, iterates the entire ProtoArray. TODO: Is this function even necessary? */
     forwarditerateAncestorBlocks(): ProtoBlock[];
     forwardIterateDescendants(blockRoot: RootHex, payloadStatus: PayloadStatus): IterableIterator<ProtoBlock>;
+    forwardIterateDescendantsDefaultStatus(blockRoot: RootHex): IterableIterator<ProtoBlock>;
     /** Very expensive function, iterates the entire ProtoArray. TODO: Is this function even necessary? */
     getBlockSummariesByParentRoot(parentRoot: RootHex): ProtoBlock[];
     /** Very expensive function, iterates the entire ProtoArray. TODO: Is this function even necessary? */
@@ -386,8 +405,7 @@ export declare class ForkChoice implements IForkChoice {
     private isProposingOnTime;
     private getPreMergeExecStatus;
     private getPreMergeDataStatus;
-    private getPreGloasExecStatus;
-    private getPostGloasExecStatus;
+    private getPostMergeExecStatus;
     /**
      * Why `getJustifiedBalances` getter?
      * - updateCheckpoints() is called in both on_block and on_tick.
@@ -405,7 +423,7 @@ export declare class ForkChoice implements IForkChoice {
      *
      * **`on_tick`**
      * May need the justified balances of:
-     * - unrealizedJustified: Already available in `CheckpointWithPayloadAndBalance`
+     * - unrealizedJustified: Already available in `CheckpointWithBalance`
      * Since this balances are already available the getter is just `() => balances`, without cache interaction
      */
     private updateCheckpoints;
@@ -463,15 +481,4 @@ export declare function getCommitteeFraction(justifiedTotalActiveBalanceByIncrem
     slotsPerEpoch: number;
     committeePercent: number;
 }): number;
-/**
- * Get the payload status for a checkpoint.
- *
- * Pre-Gloas: always FULL (payload embedded in block)
- * Gloas: determined by state.execution_payload_availability
- *
- * @param config - The chain fork config to determine fork at checkpoint slot
- * @param state - The state to check execution_payload_availability
- * @param checkpointEpoch - The epoch of the checkpoint
- */
-export declare function getCheckpointPayloadStatus(config: ChainForkConfig, state: IBeaconStateView, checkpointEpoch: number): PayloadStatus;
 //# sourceMappingURL=forkChoice.d.ts.map

package/lib/forkChoice/forkChoice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"forkChoice.d.ts","sourceRoot":"","sources":["../../src/forkChoice/forkChoice.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"forkChoice.d.ts","sourceRoot":"","sources":["../../src/forkChoice/forkChoice.ts"],"names":[],"mappings":"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"}

package/lib/forkChoice/forkChoice.js

@@ -1,5 +1,5 @@
-import { ForkSeq, SLOTS_PER_EPOCH, SLOTS_PER_HISTORICAL_ROOT } from "@lodestar/params";
-import { DataAvailabilityStatus, ZERO_HASH, computeEpochAtSlot, computeSlotsSinceEpochStart, computeStartSlotAtEpoch, getAttesterSlashableIndices, isExecutionBlockBodyType, isStatePostBellatrix, isStatePostGloas, } from "@lodestar/state-transition";
+import { SLOTS_PER_EPOCH } from "@lodestar/params";
+import { DataAvailabilityStatus, ZERO_HASH, computeEpochAtSlot, computeSlotsSinceEpochStart, computeStartSlotAtEpoch, getAttesterSlashableIndices, isExecutionBlockBodyType, isStatePostBellatrix, } from "@lodestar/state-transition";
 import { isGloasBeaconBlock, ssz, } from "@lodestar/types";
 import { MapDef, fromHex, toRootHex } from "@lodestar/utils";
 import { computeDeltas } from "../protoArray/computeDeltas.js";
@@ -7,7 +7,7 @@ import { ProtoArrayError, ProtoArrayErrorCode } from "../protoArray/errors.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 { toCheckpointWithPayload } from "./store.js";
+import { toCheckpointWithHex } from "./store.js";
 export { UpdateHeadOpt };
 var UpdateHeadOpt;
 (function (UpdateHeadOpt) {
@@ -215,6 +215,13 @@ export class ForkChoice {
     getProposerBoostRoot() {
         return this.proposerBoostRoot ?? HEX_ZERO_HASH;
     }
+    /**
+     * Decides whether to extend an available payload from the previous slot,
+     * corresponding to the beacon block `blockRoot`.
+     */
+    shouldExtendPayload(blockRoot) {
+        return this.protoArray.shouldExtendPayload(blockRoot, this.proposerBoostRoot);
+    }
     /**
      * To predict the proposer head of the next slot. That is, to predict if proposer-boost-reorg could happen.
      * Reason why we can't be certain is because information of the head block is not fully available yet
@@ -481,8 +488,7 @@ export class ForkChoice {
         // Check block is a descendant of the finalized block at the checkpoint finalized slot.
         const blockAncestorNode = this.getAncestor(parentRootHex, finalizedSlot);
         const fcStoreFinalized = this.fcStore.finalizedCheckpoint;
-        if (blockAncestorNode.blockRoot !== fcStoreFinalized.rootHex ||
-            blockAncestorNode.payloadStatus !== fcStoreFinalized.payloadStatus) {
+        if (blockAncestorNode.blockRoot !== fcStoreFinalized.rootHex) {
             throw new ForkChoiceError({
                 code: ForkChoiceErrorCode.INVALID_BLOCK,
                 err: {
@@ -503,13 +509,9 @@ export class ForkChoice {
             this.proposerBoostRoot === null) {
             this.proposerBoostRoot = blockRootHex;
         }
-        // Get justified checkpoint with payload status for Gloas
-        const justifiedPayloadStatus = getCheckpointPayloadStatus(this.config, state, state.currentJustifiedCheckpoint.epoch);
-        const justifiedCheckpoint = toCheckpointWithPayload(state.currentJustifiedCheckpoint, justifiedPayloadStatus);
+        const justifiedCheckpoint = toCheckpointWithHex(state.currentJustifiedCheckpoint);
         const stateJustifiedEpoch = justifiedCheckpoint.epoch;
-        // Get finalized checkpoint with payload status for Gloas
-        const finalizedPayloadStatus = getCheckpointPayloadStatus(this.config, state, state.finalizedCheckpoint.epoch);
-        const finalizedCheckpoint = toCheckpointWithPayload(state.finalizedCheckpoint, finalizedPayloadStatus);
+        const finalizedCheckpoint = toCheckpointWithHex(state.finalizedCheckpoint);
         // 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));
@@ -532,32 +534,22 @@ 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(this.config, 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(this.config, 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 = state.computeUnrealizedCheckpoints();
-                // Get payload status for unrealized justified checkpoint
-                const unrealizedJustifiedPayloadStatus = getCheckpointPayloadStatus(this.config, state, unrealized.justifiedCheckpoint.epoch);
-                unrealizedJustifiedCheckpoint = toCheckpointWithPayload(unrealized.justifiedCheckpoint, unrealizedJustifiedPayloadStatus);
-                // Get payload status for unrealized finalized checkpoint
-                const unrealizedFinalizedPayloadStatus = getCheckpointPayloadStatus(this.config, state, unrealized.finalizedCheckpoint.epoch);
-                unrealizedFinalizedCheckpoint = toCheckpointWithPayload(unrealized.finalizedCheckpoint, unrealizedFinalizedPayloadStatus);
+                unrealizedJustifiedCheckpoint = toCheckpointWithHex(unrealized.justifiedCheckpoint);
+                unrealizedFinalizedCheckpoint = toCheckpointWithHex(unrealized.finalizedCheckpoint);
             }
         }
         else {
@@ -612,7 +604,7 @@ export class ForkChoice {
                         // Fallback to parent block's number (we know it's post-merge from check above)
                         return parentBlock.executionPayloadNumber;
                     })(),
-                    executionStatus: this.getPostGloasExecStatus(executionStatus),
+                    executionStatus: this.getPostMergeExecStatus(executionStatus),
                     dataAvailabilityStatus,
                 }
                 : isExecutionBlockBodyType(block.body) &&
@@ -622,7 +614,7 @@ export class ForkChoice {
                     ? {
                         executionPayloadBlockHash: toRootHex(block.body.executionPayload.blockHash),
                         executionPayloadNumber: block.body.executionPayload.blockNumber,
-                        executionStatus: this.getPreGloasExecStatus(executionStatus),
+                        executionStatus: this.getPostMergeExecStatus(executionStatus),
                         dataAvailabilityStatus,
                     }
                     : {
@@ -760,8 +752,8 @@ export class ForkChoice {
      * 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, executionStatus) {
-        this.protoArray.onExecutionPayload(blockRoot, this.fcStore.currentSlot, executionPayloadBlockHash, executionPayloadNumber, executionPayloadStateRoot, this.proposerBoostRoot, executionStatus);
+    onExecutionPayload(blockRoot, executionPayloadBlockHash, executionPayloadNumber, executionStatus, dataAvailabilityStatus) {
+        this.protoArray.onExecutionPayload(blockRoot, this.fcStore.currentSlot, executionPayloadBlockHash, executionPayloadNumber, this.proposerBoostRoot, executionStatus, dataAvailabilityStatus);
     }
     /**
      * Call `onTick` for all slots between `fcStore.getCurrentSlot()` and the provided `currentSlot`.
@@ -835,6 +827,12 @@ export class ForkChoice {
     hasPayloadHexUnsafe(blockRoot) {
         return this.protoArray.hasPayload(blockRoot);
     }
+    getPTCVotes(blockRootHex) {
+        const votes = this.protoArray.getPTCVotes(blockRootHex);
+        if (votes === null)
+            return null;
+        return votes.toBoolArray().map((v) => v ?? null);
+    }
     /**
      * Returns a MUTABLE `ProtoBlock` if the block is known **and** a descendant of the finalized root.
      */
@@ -872,8 +870,8 @@ export class ForkChoice {
         return this.protoArray.getBlockHexAndBlockHash(blockRoot, blockHash);
     }
     getJustifiedBlock() {
-        const { rootHex, payloadStatus } = this.fcStore.justified.checkpoint;
-        const block = this.getBlockHex(rootHex, payloadStatus);
+        const { rootHex } = this.fcStore.justified.checkpoint;
+        const block = this.getBlockHexDefaultStatus(rootHex);
         if (!block) {
             throw new ForkChoiceError({
                 code: ForkChoiceErrorCode.MISSING_PROTO_ARRAY_BLOCK,
@@ -883,8 +881,8 @@ export class ForkChoice {
         return block;
     }
     getFinalizedBlock() {
-        const { rootHex, payloadStatus } = this.fcStore.finalizedCheckpoint;
-        const block = this.getBlockHex(rootHex, payloadStatus);
+        const { rootHex } = this.fcStore.finalizedCheckpoint;
+        const block = this.getBlockHexDefaultStatus(rootHex);
         if (!block) {
             throw new ForkChoiceError({
                 code: ForkChoiceErrorCode.MISSING_PROTO_ARRAY_BLOCK,
@@ -947,13 +945,12 @@ export class ForkChoice {
         return this.protoArray.iterateAncestorNodes(blockRoot, payloadStatus);
     }
     /**
-     * Returns all blocks backwards starting from a block root.
-     * Return only the non-finalized blocks.
+     * Raw ancestor walk from `blockRoot` back toward the previous finalized block. Includes both
+     * `blockRoot` and the previous-finalized boundary as last element. Mirrors the semantics of
+     * `getAllAncestorAndNonAncestorBlocks.ancestors`
      */
     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);
+        return this.protoArray.getAllAncestorNodes(blockRoot, payloadStatus);
     }
     /**
      * The same to iterateAncestorBlocks but this gets non-ancestor nodes instead of ancestor nodes.
@@ -963,14 +960,26 @@ export class ForkChoice {
     }
     /**
      * Returns both ancestor and non-ancestor blocks in a single traversal.
+     *
+     * `ancestors` is the raw walk and includes the previous finalized block as its last element —
+     * callers that don't want the boundary should slice it off themselves.
+     * Post-gloas for each block root, it returns exactly one variant of it.
      */
     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,
-        };
+        return this.protoArray.getAllAncestorAndNonAncestorNodes(blockRoot, payloadStatus);
+    }
+    /**
+     * Same to getAllAncestorAndNonAncestorBlocks with default variant of ${blockRoot} to start with
+     */
+    getAllAncestorAndNonAncestorBlocksDefaultStatus(blockRoot) {
+        const defaultStatus = this.protoArray.getDefaultVariant(blockRoot);
+        if (defaultStatus === undefined) {
+            throw new ForkChoiceError({
+                code: ForkChoiceErrorCode.MISSING_PROTO_ARRAY_BLOCK,
+                root: blockRoot,
+            });
+        }
+        return this.getAllAncestorAndNonAncestorBlocks(blockRoot, defaultStatus);
     }
     getCanonicalBlockByRoot(blockRoot) {
         const blockRootHex = toRootHex(blockRoot);
@@ -1030,6 +1039,16 @@ export class ForkChoice {
             }
         }
     }
+    forwardIterateDescendantsDefaultStatus(blockRoot) {
+        const defaultStatus = this.protoArray.getDefaultVariant(blockRoot);
+        if (defaultStatus === undefined) {
+            throw new ForkChoiceError({
+                code: ForkChoiceErrorCode.MISSING_PROTO_ARRAY_BLOCK,
+                root: blockRoot,
+            });
+        }
+        return this.forwardIterateDescendants(blockRoot, defaultStatus);
+    }
     /** Very expensive function, iterates the entire ProtoArray. TODO: Is this function even necessary? */
     getBlockSummariesByParentRoot(parentRoot) {
         return this.protoArray.nodes.filter((node) => node.parentRoot === parentRoot);
@@ -1162,16 +1181,11 @@ export class ForkChoice {
             throw Error(`Invalid pre-merge data status: expected: ${DataAvailabilityStatus.PreData}, got ${dataAvailabilityStatus}`);
         return dataAvailabilityStatus;
     }
-    getPreGloasExecStatus(executionStatus) {
-        if (executionStatus === ExecutionStatus.PreMerge || executionStatus === ExecutionStatus.PayloadSeparated)
+    getPostMergeExecStatus(executionStatus) {
+        if (executionStatus === ExecutionStatus.PreMerge)
             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;
-    }
     /**
      * Why `getJustifiedBalances` getter?
      * - updateCheckpoints() is called in both on_block and on_tick.
@@ -1189,7 +1203,7 @@ export class ForkChoice {
      *
      * **`on_tick`**
      * May need the justified balances of:
-     * - unrealizedJustified: Already available in `CheckpointWithPayloadAndBalance`
+     * - unrealizedJustified: Already available in `CheckpointWithBalance`
      * Since this balances are already available the getter is just `() => balances`, without cache interaction
      */
     updateCheckpoints(justifiedCheckpoint, finalizedCheckpoint, getJustifiedBalances) {
@@ -1520,31 +1534,4 @@ 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 config - The chain fork config to determine fork at checkpoint slot
- * @param state - The state to check execution_payload_availability
- * @param checkpointEpoch - The epoch of the checkpoint
- */
-export function getCheckpointPayloadStatus(config, state, checkpointEpoch) {
-    // Compute checkpoint slot first to determine the correct fork
-    const checkpointSlot = computeStartSlotAtEpoch(checkpointEpoch);
-    const fork = config.getForkSeq(checkpointSlot);
-    // Pre-Gloas: always FULL
-    if (fork < ForkSeq.gloas) {
-        return PayloadStatus.FULL;
-    }
-    if (!isStatePostGloas(state)) {
-        throw new Error(`Expected gloas+ state for checkpoint payload status, got fork=${state.forkName}`);
-    }
-    // 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 payloadAvailable = state.executionPayloadAvailability.get(checkpointSlot % SLOTS_PER_HISTORICAL_ROOT);
-    return payloadAvailable ? PayloadStatus.FULL : PayloadStatus.EMPTY;
-}
 //# sourceMappingURL=forkChoice.js.map