@lodestar/fork-choice 1.46.0-dev.20101a8cc1 → 1.46.0-dev.20c6ad786e

package/src/forkChoice/safeBlocks.ts

@@ -1,35 +1,67 @@
-import {ZERO_HASH_HEX} from "@lodestar/params";
-import {Root, RootHex} from "@lodestar/types";
-import {fromHex} from "@lodestar/utils";
+import {GENESIS_SLOT} from "@lodestar/params";
+import {RootHex} from "@lodestar/types";
+import {LogLevel, Logger} from "@lodestar/utils";
+import {ExecutionStatus, HEX_ZERO_HASH, ProtoBlock, isGloasBlock} from "../protoArray/interface.js";
+import {ForkChoiceError, ForkChoiceErrorCode} from "./errors.js";
 import {IForkChoice} from "./interface.js";
 
 /**
- * Under honest majority and certain network synchronicity assumptions there exists a block
- * 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.
+ * Get execution payload hash to report as `safeBlockHash` in `engine_forkchoiceUpdated`.
  *
- * @deprecated The merged fast-confirmation spec only defines `get_safe_execution_block_hash`.
+ * Pre-Gloas: the confirmed block's own payload hash.
+ * Post-Gloas: the confirmed block's bid `parent_block_hash` — under ePBS the block's own
+ * payload may not yet be confirmed canonical, so we report the parent EL block which has
+ * been (the bid commits to extending it).
+ *
+ * https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.13/specs/bellatrix/fast-confirmation.md#new-get_safe_execution_block_hash
  */
-export function getSafeBeaconBlockRoot(fc: IForkChoice): Root {
-  const confirmedRoot = fc.getConfirmedRoot();
-  if (confirmedRoot && fc.hasBlockHex(confirmedRoot)) {
-    return fromHex(confirmedRoot);
+export function getSafeExecutionBlockHash(forkChoice: IForkChoice, logger?: Pick<Logger, LogLevel.debug>): RootHex {
+  const confirmedRoot = forkChoice.getConfirmedRoot();
+  const confirmedBlock = forkChoice.getConfirmedBlock();
+  if (confirmedBlock === null) {
+    throw new ForkChoiceError({code: ForkChoiceErrorCode.MISSING_PROTO_ARRAY_BLOCK, root: confirmedRoot});
+  }
+
+  if (confirmedBlock.blockRoot === forkChoice.getFinalizedBlock().blockRoot) {
+    logger?.debug("Confirmed block is the finalized block", {
+      blockRoot: confirmedBlock.blockRoot,
+      slot: confirmedBlock.slot,
+    });
   }
-  return fc.getJustifiedCheckpoint().root;
+
+  return getExecutionBlockHash(confirmedBlock);
 }
 
 /**
- * Get execution payload hash for the safe block
+ * Get execution payload hash to report as `finalizedBlockHash` in `engine_forkchoiceUpdated`.
+ * Mirrors `getSafeExecutionBlockHash`: post-Gloas returns the bid `parent_block_hash`.
  *
- * https://github.com/ethereum/consensus-specs/blob/master/fork_choice/safe-block.md#get_safe_execution_block_hash
+ * https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.13/specs/gloas/fork-choice.md#notify_forkchoice_updated
  */
-export function getSafeExecutionBlockHash(forkChoice: IForkChoice): RootHex {
-  const confirmedRoot = forkChoice.getConfirmedRoot();
-  if (confirmedRoot) {
-    const confirmedBlock = forkChoice.getBlockHexDefaultStatus(confirmedRoot);
-    if (confirmedBlock?.executionPayloadBlockHash) {
-      return confirmedBlock.executionPayloadBlockHash;
-    }
+export function getFinalizedExecutionBlockHash(forkChoice: IForkChoice): RootHex {
+  return getExecutionBlockHash(forkChoice.getFinalizedBlock());
+}
+
+function getExecutionBlockHash(block: ProtoBlock): RootHex {
+  if (isGloasBlock(block)) {
+    return block.parentBlockHash;
+  }
+
+  // The genesis block body carries a default execution payload, so it is not an execution block
+  // per the spec (`is_execution_block`); its proto-array payload hash comes from the anchor
+  // state header instead of a block body and must not be reported as safe.
+  if (block.slot === GENESIS_SLOT) {
+    return HEX_ZERO_HASH;
   }
-  return ZERO_HASH_HEX;
+
+  const {blockRoot, slot} = block;
+  if (block.executionPayloadBlockHash === null && block.executionStatus !== ExecutionStatus.PreMerge) {
+    throw new ForkChoiceError({
+      code: ForkChoiceErrorCode.MISSING_EXECUTION_PAYLOAD_BLOCK_HASH,
+      root: blockRoot,
+      slot,
+    });
+  }
+
+  return block.executionPayloadBlockHash ?? HEX_ZERO_HASH;
 }

package/src/forkChoice/store.ts

@@ -1,7 +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 {ForkChoiceStateGetter, IFastConfirmationStore} from "./fastConfirmation/types.js";
 import {CheckpointWithBalance, CheckpointWithTotalBalance} from "./interface.js";
 
 /**

package/src/index.ts

@@ -16,7 +16,7 @@ export {
   type IFastConfirmationRule,
   type IFastConfirmationStore,
   getFastConfirmationMetrics,
-} from "./forkChoice/fastConfirmation/fastConfirmationRule.ts";
+} from "./forkChoice/fastConfirmation/fastConfirmationRule.js";
 export {ForkChoice, type ForkChoiceOpts, UpdateHeadOpt, getCommitteeFraction} from "./forkChoice/forkChoice.js";
 export {
   type AncestorResult,

package/src/metrics.ts

@@ -1,5 +1,5 @@
 import {MetricsRegisterExtra} from "@lodestar/utils";
-import {FastConfirmationMetrics, getFastConfirmationMetrics} from "./forkChoice/fastConfirmation/metrics.ts";
+import {FastConfirmationMetrics, getFastConfirmationMetrics} from "./forkChoice/fastConfirmation/metrics.js";
 import {UpdateHeadOpt} from "./forkChoice/forkChoice.js";
 import {NotReorgedReason} from "./forkChoice/interface.js";
 

package/src/protoArray/interface.ts

@@ -48,7 +48,7 @@ export enum PayloadStatus {
 /**
  * Check if a block is in the Gloas fork (ePBS enabled)
  */
-export function isGloasBlock(block: ProtoBlock): boolean {
+export function isGloasBlock(block: ProtoBlock): block is ProtoBlock & {parentBlockHash: RootHex} {
   return block.parentBlockHash !== null;
 }
 

package/src/protoArray/protoArray.ts

@@ -855,7 +855,7 @@ export class ProtoArray {
   }
 
   /**
-   * Spec: should_build_on_full(store, head)
+   * Spec: should_build_on_full(store, head, slot)
    *
    * The proposer is forced to build on the EMPTY variant (effectively reorging)
    * when the PTC majority voted that the blob data is not available or that the