@lodestar/fork-choice 1.45.0-dev.0cff4e6916 → 1.45.0-dev.17a48050e6

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.45.0-dev.0cff4e6916",
+  "version": "1.45.0-dev.17a48050e6",
   "type": "module",
   "exports": {
     ".": {
@@ -39,12 +39,12 @@
     "check-readme": "pnpm exec ts-node ../../scripts/check_readme.ts"
   },
   "dependencies": {
-    "@chainsafe/ssz": "^1.4.0",
-    "@lodestar/config": "^1.45.0-dev.0cff4e6916",
-    "@lodestar/params": "^1.45.0-dev.0cff4e6916",
-    "@lodestar/state-transition": "^1.45.0-dev.0cff4e6916",
-    "@lodestar/types": "^1.45.0-dev.0cff4e6916",
-    "@lodestar/utils": "^1.45.0-dev.0cff4e6916"
+    "@chainsafe/ssz": "^1.6.2",
+    "@lodestar/config": "^1.45.0-dev.17a48050e6",
+    "@lodestar/params": "^1.45.0-dev.17a48050e6",
+    "@lodestar/state-transition": "^1.45.0-dev.17a48050e6",
+    "@lodestar/types": "^1.45.0-dev.17a48050e6",
+    "@lodestar/utils": "^1.45.0-dev.17a48050e6"
   },
   "keywords": [
     "ethereum",
@@ -52,5 +52,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "0253da9815d85802e62b773620a00b9585c96af1"
+  "gitHead": "740e743dd01a58366a3bce4bc843678fd447a6f0"
 }

package/src/forkChoice/fastConfirmation/data.ts

@@ -14,6 +14,7 @@ export function createFastConfirmationCache(): FastConfirmationCache {
     committeeBySlot: new Map(),
     isDescendantByRootPair: new Map(),
     voteWeightBySource: new Map(),
+    totalActiveBalanceByKey: new Map(),
     checkpointStateByKey: new Map(),
   };
 }

package/src/forkChoice/fastConfirmation/types.ts

@@ -9,6 +9,8 @@ export type FastConfirmationBalanceSource = {
   balances: EffectiveBalanceIncrements;
 };
 
+export type TotalActiveBalanceCacheKey = IBeaconStateView | EffectiveBalanceIncrements;
+
 export type ForkChoiceStateGetter = (
   opts: {stateRoot: RootHex; checkpoint?: never} | {stateRoot?: never; checkpoint: CheckpointWithHex}
 ) => IBeaconStateView | null;
@@ -109,6 +111,8 @@ export type FastConfirmationCache = {
   isDescendantByRootPair: Map<string, boolean>;
   /** voteRoot -> totalWeight, keyed by sourceKey */
   voteWeightBySource: Map<BalanceSourceKey, Map<RootHex, number>>;
+  /** total active balance, keyed by the balance source's state or balances reference */
+  totalActiveBalanceByKey: Map<TotalActiveBalanceCacheKey, number>;
   headState?: IBeaconStateView;
   pulledUpHeadState?: IBeaconStateView;
   checkpointStateByKey: Map<string, IBeaconStateView | null>;

package/src/forkChoice/fastConfirmation/utils.ts

@@ -18,6 +18,7 @@ import {
   FastConfirmationContext,
   FastConfirmationSnapshot,
   IFastConfirmationStore,
+  type TotalActiveBalanceCacheKey,
 } from "./types.ts";
 
 // Spec: adjust_committee_weight_estimate_to_ensure_safety
@@ -266,22 +267,34 @@ export function getPreviousBalanceSource(
   return getBalanceSource(store, cache, "previous");
 }
 
-export function getTotalActiveBalance(balanceSource: FastConfirmationBalanceSource): number {
-  if (balanceSource.state) {
-    return computeTotalBalance(balanceSource.state.getEffectiveBalanceIncrementsZeroInactive());
-  }
-  // Fallback balances come from the justified-balance path and already zero inactive
-  // validators, so summing them gives the active justified total for this balance source.
-  return computeTotalBalance(balanceSource.balances);
+export function getTotalActiveBalance(
+  balanceSource: FastConfirmationBalanceSource,
+  cache: FastConfirmationCache
+): number {
+  // Invariant per balance source within a run, but read many times per is_one_confirmed evaluation
+  // across the epoch-boundary chain walk; memoize so the full validator-set scan runs once per run.
+  const key: TotalActiveBalanceCacheKey = balanceSource.state ?? balanceSource.balances;
+  const cached = cache.totalActiveBalanceByKey.get(key);
+  if (cached !== undefined) return cached;
+
+  const total = balanceSource.state
+    ? computeTotalBalance(balanceSource.state.getEffectiveBalanceIncrementsZeroInactive())
+    : // Fallback balances come from the justified-balance path and already zero inactive
+      // validators, so summing them gives the active justified total for this balance source.
+      computeTotalBalance(balanceSource.balances);
+
+  cache.totalActiveBalanceByKey.set(key, total);
+  return total;
 }
 
 export function estimateCommitteeWeightBetweenSlots(
   balanceSource: FastConfirmationBalanceSource,
+  cache: FastConfirmationCache,
   startSlot: Slot,
   endSlot: Slot
 ): number {
   if (startSlot > endSlot) return 0;
-  const totalActiveBalance = getTotalActiveBalance(balanceSource);
+  const totalActiveBalance = getTotalActiveBalance(balanceSource, cache);
   const startEpoch = computeEpochAtSlot(startSlot);
   const endEpoch = computeEpochAtSlot(endSlot);
 
@@ -334,9 +347,10 @@ export function isFullValidatorSetCovered(startSlot: Slot, endSlot: Slot): boole
 
 export function computeProposerScore(
   ctx: FastConfirmationContext,
-  balanceSource: FastConfirmationBalanceSource
+  balanceSource: FastConfirmationBalanceSource,
+  cache: FastConfirmationCache
 ): number {
-  const totalActiveBalance = getTotalActiveBalance(balanceSource);
+  const totalActiveBalance = getTotalActiveBalance(balanceSource, cache);
   const committeeWeight = Math.floor(totalActiveBalance / SLOTS_PER_EPOCH);
   return Math.floor((committeeWeight * ctx.config.PROPOSER_SCORE_BOOST) / 100);
 }
@@ -469,7 +483,7 @@ export function computeAdversarialWeight(
   startSlot: Slot,
   endSlot: Slot
 ): number {
-  const maximumWeight = estimateCommitteeWeightBetweenSlots(balanceSource, startSlot, endSlot);
+  const maximumWeight = estimateCommitteeWeightBetweenSlots(balanceSource, cache, startSlot, endSlot);
   // The spec uses raw Gwei and computes `maximum_weight // 100 * threshold`.
   // Lodestar carries effective-balance increments instead, so divide after multiplying to avoid
   // dropping the adversarial budget to zero for small validator sets/minimal presets.
@@ -564,9 +578,10 @@ export function computeSafetyThreshold(
   // Spec: compute_safety_threshold(store, block_root, balance_source)
   // Build the threshold from the same terms used in the paper/spec:
   // max possible committee support, proposer boost, empty-slot discount, and adversarial budget.
-  const proposerScore = computeProposerScore(ctx, balanceSource);
+  const proposerScore = computeProposerScore(ctx, balanceSource, cache);
   const maximumSupport = estimateCommitteeWeightBetweenSlots(
     balanceSource,
+    cache,
     (parentBlock.slot + 1) as Slot,
     (currentSlot - 1) as Slot
   );
@@ -711,10 +726,12 @@ export function computeHonestFfgSupportForCurrentTarget(
   const currentEpoch = computeEpochAtSlot(currentSlot);
   const targetState = getCurrentEpochState(ctx, store, cache);
   if (!targetState) return 0;
-  const totalActiveBalance = computeTotalBalance(targetState.getEffectiveBalanceIncrementsZeroInactive());
+  const targetBalanceSource = {state: targetState, balances: targetState.effectiveBalanceIncrements};
+  const totalActiveBalance = getTotalActiveBalance(targetBalanceSource, cache);
   const ffgSupport = getCurrentTargetScore(ctx, store, cache);
   const tillNowFFGWeight = estimateCommitteeWeightBetweenSlots(
-    {state: targetState, balances: targetState.effectiveBalanceIncrements},
+    targetBalanceSource,
+    cache,
     computeStartSlotAtEpoch(currentEpoch),
     (currentSlot - 1) as Slot
   );
@@ -747,7 +764,10 @@ export function willNoConflictingCheckpointBeJustified(
   }
   const targetState = getCurrentEpochState(ctx, store, cache);
   if (!targetState) return false;
-  const totalActiveBalance = computeTotalBalance(targetState.getEffectiveBalanceIncrementsZeroInactive());
+  const totalActiveBalance = getTotalActiveBalance(
+    {state: targetState, balances: targetState.effectiveBalanceIncrements},
+    cache
+  );
   const honestSupport = computeHonestFfgSupportForCurrentTarget(ctx, store, cache);
   return 3 * honestSupport > 1 * totalActiveBalance;
 }
@@ -759,7 +779,10 @@ export function willCurrentTargetBeJustified(
 ): boolean {
   const targetState = getCurrentEpochState(ctx, store, cache);
   if (!targetState) return false;
-  const totalActiveBalance = computeTotalBalance(targetState.getEffectiveBalanceIncrementsZeroInactive());
+  const totalActiveBalance = getTotalActiveBalance(
+    {state: targetState, balances: targetState.effectiveBalanceIncrements},
+    cache
+  );
   const honestSupport = computeHonestFfgSupportForCurrentTarget(ctx, store, cache);
   return 3 * honestSupport >= 2 * totalActiveBalance;
 }

package/src/forkChoice/forkChoice.ts

@@ -589,6 +589,10 @@ export class ForkChoice implements IForkChoice {
     return this.protoArray.nodes.filter((node) => node.slot > windowStart).length;
   }
 
+  getPayloadRevealCounts(fromSlot: Slot, toSlot: Slot): {blocksPresent: number; payloadsRevealed: number} {
+    return this.protoArray.getPayloadRevealCounts(fromSlot, toSlot);
+  }
+
   /** Very expensive function, iterates the entire ProtoArray. Called only in debug API */
   getHeads(): ProtoBlock[] {
     return this.protoArray.nodes.filter((node) => node.bestChild === undefined);
@@ -632,11 +636,7 @@ export class ForkChoice implements IForkChoice {
     blockDelaySec: number,
     currentSlot: Slot,
     executionStatus: BlockExecutionStatus,
-    dataAvailabilityStatus: DataAvailabilityStatus,
-    // The expected proposer index on the canonical chain we are following.
-    // Calculated by our head state. We use it as part of the proposer
-    // boost decision making. No boost will be set if this is null.
-    expectedProposerIndex: ValidatorIndex | null
+    dataAvailabilityStatus: DataAvailabilityStatus
   ): ProtoBlock {
     const {parentRoot, slot} = block;
     const parentRootHex = toRootHex(parentRoot);
@@ -711,8 +711,6 @@ export class ForkChoice implements IForkChoice {
       isTimely &&
       // only boost the first block we see
       this.proposerBoostRoot === null &&
-      expectedProposerIndex !== null &&
-      block.proposerIndex === expectedProposerIndex &&
       this.isProposerBoostSameDependentRoot(this.head.blockRoot, parentRootHex);
     // Candidate boost root used for protoArray.onBlock's best-child weighting. Committed to the
     // store only after the insertion succeeds.
@@ -1505,11 +1503,11 @@ export class ForkChoice implements IForkChoice {
   }
 
   /**
-   * Spec: phase0/fork-choice.md#update_proposer_boost_root (`is_same_dependent_root` condition,
-   * consensus-specs #5306). Proposer boost is only granted when the imported block shares the same
-   * proposer-shuffling dependent root for the current epoch as the canonical head computed before
-   * the block was imported. This withholds the boost from a block built on a different shuffling
-   * branch than the head.
+   * Spec: phase0/fork-choice.md#update_proposer_boost_root (`is_same_dependent_root` condition, added in
+   * https://github.com/ethereum/consensus-specs/pull/5306). Proposer boost is only granted when the imported
+   * block shares the same proposer-shuffling dependent root for the current epoch as the canonical head
+   * computed before the block was imported. This withholds the boost from a block built on a different
+   * shuffling branch than the head.
    *
    * The block is not yet in the proto-array when this runs, so its dependent root is traced from
    * its parent

package/src/forkChoice/interface.ts

@@ -1,14 +1,5 @@
 import {DataAvailabilityStatus, EffectiveBalanceIncrements, IBeaconStateView} from "@lodestar/state-transition";
-import {
-  AttesterSlashing,
-  BeaconBlock,
-  Epoch,
-  IndexedAttestation,
-  Root,
-  RootHex,
-  Slot,
-  ValidatorIndex,
-} from "@lodestar/types";
+import {AttesterSlashing, BeaconBlock, Epoch, IndexedAttestation, Root, RootHex, Slot} from "@lodestar/types";
 import {
   BlockExecutionStatus,
   LVHExecResponse,
@@ -160,8 +151,7 @@ export interface IForkChoice {
     blockDelaySec: number,
     currentSlot: Slot,
     executionStatus: BlockExecutionStatus,
-    dataAvailabilityStatus: DataAvailabilityStatus,
-    expectedProposerIndex: ValidatorIndex | null
+    dataAvailabilityStatus: DataAvailabilityStatus
   ): ProtoBlock;
   /**
    * Register `attestation` with the fork choice DAG so that it may influence future calls to `getHead`.
@@ -252,6 +242,11 @@ export interface IForkChoice {
   hasPayloadUnsafe(blockRoot: Root): boolean;
   hasPayloadHexUnsafe(blockRoot: RootHex): boolean;
   getSlotsPresent(windowStart: number): number;
+  /**
+   * Count gloas blocks with fromSlot <= slot <= toSlot and how many of them have a revealed
+   * payload (FULL variant exists). Used by the builder circuit breaker.
+   */
+  getPayloadRevealCounts(fromSlot: Slot, toSlot: Slot): {blocksPresent: number; payloadsRevealed: 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): {

package/src/protoArray/protoArray.ts

@@ -672,6 +672,35 @@ export class ProtoArray {
     this.maybeUpdateBestChildAndDescendant(pendingIndex, fullIndex, currentSlot, proposerBoostRoot);
   }
 
+  /**
+   * Count gloas blocks with fromSlot <= slot <= toSlot and how many of them have a revealed
+   * payload (FULL variant exists). Used by the builder circuit breaker.
+   */
+  getPayloadRevealCounts(fromSlot: Slot, toSlot: Slot): {blocksPresent: number; payloadsRevealed: number} {
+    let blocksPresent = 0;
+    let payloadsRevealed = 0;
+    // Iterate backward as recent blocks are at the end of the nodes array. Only break on block
+    // nodes below the window since FULL variants are appended late when the envelope is imported
+    for (let i = this.nodes.length - 1; i >= 0; i--) {
+      const node = this.nodes[i];
+      if (node.slot < fromSlot) {
+        if (isGloasBlock(node) && node.payloadStatus === PayloadStatus.FULL) {
+          continue;
+        }
+        break;
+      }
+      // Count each gloas block once via its PENDING variant, pre-gloas nodes are FULL only
+      if (node.slot > toSlot || node.payloadStatus !== PayloadStatus.PENDING) {
+        continue;
+      }
+      blocksPresent++;
+      if (this.hasPayload(node.blockRoot)) {
+        payloadsRevealed++;
+      }
+    }
+    return {blocksPresent, payloadsRevealed};
+  }
+
   /**
    * Update PTC votes for multiple validators attesting to a block
    * Spec: gloas/fork-choice.md#new-notify_ptc_messages