@lodestar/fork-choice 1.46.0-dev.e6f04acd82 → 1.46.0-dev.f0f5d069e2

package/lib/forkChoice/safeBlocks.d.ts

@@ -1,4 +1,5 @@
 import { Root, RootHex } from "@lodestar/types";
+import { LogLevel, Logger } from "@lodestar/utils";
 import { IForkChoice } from "./interface.js";
 /**
  * Under honest majority and certain network synchronicity assumptions there exists a block
@@ -9,9 +10,21 @@ import { IForkChoice } from "./interface.js";
  */
 export declare function getSafeBeaconBlockRoot(fc: IForkChoice): Root;
 /**
- * Get execution payload hash for the safe block
+ * Get execution payload hash to report as `safeBlockHash` in `engine_forkchoiceUpdated`.
  *
- * https://github.com/ethereum/consensus-specs/blob/master/fork_choice/safe-block.md#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 declare function getSafeExecutionBlockHash(forkChoice: IForkChoice, logger?: Pick<Logger, LogLevel.warn>): RootHex;
+/**
+ * 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/v1.7.0-alpha.13/specs/gloas/fork-choice.md#notify_forkchoice_updated
  */
-export declare function getSafeExecutionBlockHash(forkChoice: IForkChoice): RootHex;
+export declare function getFinalizedExecutionBlockHash(forkChoice: IForkChoice, logger?: Pick<Logger, LogLevel.warn>): RootHex;
 //# sourceMappingURL=safeBlocks.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"safeBlocks.d.ts","sourceRoot":"","sources":["../../src/forkChoice/safeBlocks.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAE,OAAO,EAAC,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE3C;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,WAAW,GAAG,IAAI,CAM5D;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,WAAW,GAAG,OAAO,CAS1E"}
+{"version":3,"file":"safeBlocks.d.ts","sourceRoot":"","sources":["../../src/forkChoice/safeBlocks.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,IAAI,EAAE,OAAO,EAAC,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAU,MAAM,iBAAiB,CAAC;AAE1D,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAE3C;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,WAAW,GAAG,IAAI,CAM5D;AAED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAUhH;AAED;;;;;GAKG;AACH,wBAAgB,8BAA8B,CAAC,UAAU,EAAE,WAAW,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,OAAO,CAErH"}

package/lib/forkChoice/safeBlocks.js

@@ -1,5 +1,6 @@
-import { ZERO_HASH_HEX } from "@lodestar/params";
+import { GENESIS_SLOT, ZERO_HASH_HEX } from "@lodestar/params";
 import { fromHex } from "@lodestar/utils";
+import { HEX_ZERO_HASH, isGloasBlock } from "../protoArray/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
@@ -15,18 +16,51 @@ export function getSafeBeaconBlockRoot(fc) {
     return fc.getJustifiedCheckpoint().root;
 }
 /**
- * Get execution payload hash for the safe block
+ * Get execution payload hash to report as `safeBlockHash` in `engine_forkchoiceUpdated`.
  *
- * https://github.com/ethereum/consensus-specs/blob/master/fork_choice/safe-block.md#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 getSafeExecutionBlockHash(forkChoice) {
-    const confirmedRoot = forkChoice.getConfirmedRoot();
-    if (confirmedRoot) {
-        const confirmedBlock = forkChoice.getBlockHexDefaultStatus(confirmedRoot);
-        if (confirmedBlock?.executionPayloadBlockHash) {
-            return confirmedBlock.executionPayloadBlockHash;
-        }
+export function getSafeExecutionBlockHash(forkChoice, logger) {
+    const confirmedBlock = forkChoice.getConfirmedBlock();
+    if (confirmedBlock === null) {
+        logger?.warn("Confirmed block not found, using zero safe execution block hash", {
+            confirmedRoot: forkChoice.getConfirmedRoot(),
+        });
+        return ZERO_HASH_HEX;
+    }
+    return getExecutionBlockHash(confirmedBlock, logger);
+}
+/**
+ * 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/v1.7.0-alpha.13/specs/gloas/fork-choice.md#notify_forkchoice_updated
+ */
+export function getFinalizedExecutionBlockHash(forkChoice, logger) {
+    return getExecutionBlockHash(forkChoice.getFinalizedBlock(), logger);
+}
+function getExecutionBlockHash(block, logger) {
+    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;
+    }
+    if (block.executionPayloadBlockHash === null) {
+        logger?.warn("Execution payload block hash not found, using zero hash", {
+            blockRoot: block.blockRoot,
+            slot: block.slot,
+        });
+        return HEX_ZERO_HASH;
     }
-    return ZERO_HASH_HEX;
+    return block.executionPayloadBlockHash;
 }
 //# sourceMappingURL=safeBlocks.js.map

package/lib/forkChoice/safeBlocks.js.map

@@ -1 +1 @@
-{"version":3,"file":"safeBlocks.js","sourceRoot":"","sources":["../../src/forkChoice/safeBlocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAC,OAAO,EAAC,MAAM,iBAAiB,CAAC;AAGxC;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CAAC,EAAe;IACpD,MAAM,aAAa,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5C,IAAI,aAAa,IAAI,EAAE,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC;QACnD,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,EAAE,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC;AAC1C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CAAC,UAAuB;IAC/D,MAAM,aAAa,GAAG,UAAU,CAAC,gBAAgB,EAAE,CAAC;IACpD,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,cAAc,GAAG,UAAU,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC;QAC1E,IAAI,cAAc,EAAE,yBAAyB,EAAE,CAAC;YAC9C,OAAO,cAAc,CAAC,yBAAyB,CAAC;QAClD,CAAC;IACH,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC"}
+{"version":3,"file":"safeBlocks.js","sourceRoot":"","sources":["../../src/forkChoice/safeBlocks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAmB,OAAO,EAAC,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAc,YAAY,EAAC,MAAM,4BAA4B,CAAC;AAGnF;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CAAC,EAAe;IACpD,MAAM,aAAa,GAAG,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5C,IAAI,aAAa,IAAI,EAAE,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC;QACnD,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,EAAE,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC;AAC1C,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,yBAAyB,CAAC,UAAuB,EAAE,MAAoC;IACrG,MAAM,cAAc,GAAG,UAAU,CAAC,iBAAiB,EAAE,CAAC;IACtD,IAAI,cAAc,KAAK,IAAI,EAAE,CAAC;QAC5B,MAAM,EAAE,IAAI,CAAC,iEAAiE,EAAE;YAC9E,aAAa,EAAE,UAAU,CAAC,gBAAgB,EAAE;SAC7C,CAAC,CAAC;QACH,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,OAAO,qBAAqB,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;AACvD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,8BAA8B,CAAC,UAAuB,EAAE,MAAoC;IAC1G,OAAO,qBAAqB,CAAC,UAAU,CAAC,iBAAiB,EAAE,EAAE,MAAM,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAiB,EAAE,MAAoC;IACpF,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC,eAAe,CAAC;IAC/B,CAAC;IAED,8FAA8F;IAC9F,0FAA0F;IAC1F,yEAAyE;IACzE,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAChC,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,IAAI,KAAK,CAAC,yBAAyB,KAAK,IAAI,EAAE,CAAC;QAC7C,MAAM,EAAE,IAAI,CAAC,yDAAyD,EAAE;YACtE,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,IAAI,EAAE,KAAK,CAAC,IAAI;SACjB,CAAC,CAAC;QACH,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,OAAO,KAAK,CAAC,yBAAyB,CAAC;AACzC,CAAC"}

package/lib/protoArray/interface.d.ts

@@ -40,7 +40,9 @@ export declare enum PayloadStatus {
 /**
  * Check if a block is in the Gloas fork (ePBS enabled)
  */
-export declare function isGloasBlock(block: ProtoBlock): boolean;
+export declare function isGloasBlock(block: ProtoBlock): block is ProtoBlock & {
+    parentBlockHash: RootHex;
+};
 export type LVHValidResponse = {
     executionStatus: ExecutionStatus.Valid;
     latestValidExecHash: RootHex;

package/lib/protoArray/interface.d.ts.map

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

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.46.0-dev.e6f04acd82",
+  "version": "1.46.0-dev.f0f5d069e2",
   "type": "module",
   "exports": {
     ".": {
@@ -40,11 +40,11 @@
   },
   "dependencies": {
     "@chainsafe/ssz": "^1.6.2",
-    "@lodestar/config": "^1.46.0-dev.e6f04acd82",
-    "@lodestar/params": "^1.46.0-dev.e6f04acd82",
-    "@lodestar/state-transition": "^1.46.0-dev.e6f04acd82",
-    "@lodestar/types": "^1.46.0-dev.e6f04acd82",
-    "@lodestar/utils": "^1.46.0-dev.e6f04acd82"
+    "@lodestar/config": "^1.46.0-dev.f0f5d069e2",
+    "@lodestar/params": "^1.46.0-dev.f0f5d069e2",
+    "@lodestar/state-transition": "^1.46.0-dev.f0f5d069e2",
+    "@lodestar/types": "^1.46.0-dev.f0f5d069e2",
+    "@lodestar/utils": "^1.46.0-dev.f0f5d069e2"
   },
   "keywords": [
     "ethereum",
@@ -52,5 +52,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "402a1913262b99cdeb71922eb306786e1a590e5e"
+  "gitHead": "7b4da150e5f67b4863516f2155e131b99ad1c6c9"
 }

package/src/forkChoice/safeBlocks.ts

@@ -1,6 +1,7 @@
-import {ZERO_HASH_HEX} from "@lodestar/params";
+import {GENESIS_SLOT, ZERO_HASH_HEX} from "@lodestar/params";
 import {Root, RootHex} from "@lodestar/types";
-import {fromHex} from "@lodestar/utils";
+import {LogLevel, Logger, fromHex} from "@lodestar/utils";
+import {HEX_ZERO_HASH, ProtoBlock, isGloasBlock} from "../protoArray/interface.js";
 import {IForkChoice} from "./interface.js";
 
 /**
@@ -19,17 +20,56 @@ export function getSafeBeaconBlockRoot(fc: IForkChoice): Root {
 }
 
 /**
- * Get execution payload hash for the safe block
+ * Get execution payload hash to report as `safeBlockHash` in `engine_forkchoiceUpdated`.
  *
- * https://github.com/ethereum/consensus-specs/blob/master/fork_choice/safe-block.md#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 getSafeExecutionBlockHash(forkChoice: IForkChoice): RootHex {
-  const confirmedRoot = forkChoice.getConfirmedRoot();
-  if (confirmedRoot) {
-    const confirmedBlock = forkChoice.getBlockHexDefaultStatus(confirmedRoot);
-    if (confirmedBlock?.executionPayloadBlockHash) {
-      return confirmedBlock.executionPayloadBlockHash;
-    }
+export function getSafeExecutionBlockHash(forkChoice: IForkChoice, logger?: Pick<Logger, LogLevel.warn>): RootHex {
+  const confirmedBlock = forkChoice.getConfirmedBlock();
+  if (confirmedBlock === null) {
+    logger?.warn("Confirmed block not found, using zero safe execution block hash", {
+      confirmedRoot: forkChoice.getConfirmedRoot(),
+    });
+    return ZERO_HASH_HEX;
   }
-  return ZERO_HASH_HEX;
+
+  return getExecutionBlockHash(confirmedBlock, logger);
+}
+
+/**
+ * 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/v1.7.0-alpha.13/specs/gloas/fork-choice.md#notify_forkchoice_updated
+ */
+export function getFinalizedExecutionBlockHash(forkChoice: IForkChoice, logger?: Pick<Logger, LogLevel.warn>): RootHex {
+  return getExecutionBlockHash(forkChoice.getFinalizedBlock(), logger);
+}
+
+function getExecutionBlockHash(block: ProtoBlock, logger?: Pick<Logger, LogLevel.warn>): 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;
+  }
+
+  if (block.executionPayloadBlockHash === null) {
+    logger?.warn("Execution payload block hash not found, using zero hash", {
+      blockRoot: block.blockRoot,
+      slot: block.slot,
+    });
+    return HEX_ZERO_HASH;
+  }
+
+  return block.executionPayloadBlockHash;
 }

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;
 }