feat: add heze fork definition and boilerplate

packages/beacon-node/src/api/impl/config/constants.ts

@@ -27,6 +27,7 @@ import {
   DOMAIN_BUILDER_DEPOSIT,
   DOMAIN_CONTRIBUTION_AND_PROOF,
   DOMAIN_DEPOSIT,
+  DOMAIN_INCLUSION_LIST_COMMITTEE,
   DOMAIN_PROPOSER_PREFERENCES,
   DOMAIN_PTC_ATTESTER,
   DOMAIN_RANDAO,
@@ -150,6 +151,9 @@ export const specConstants = {
   DOMAIN_BUILDER_DEPOSIT,
   BUILDER_DEPOSIT_REQUEST_TYPE: toHexByte(BUILDER_DEPOSIT_REQUEST_TYPE),
   BUILDER_EXIT_REQUEST_TYPE: toHexByte(BUILDER_EXIT_REQUEST_TYPE),
+
+  // heze
+  DOMAIN_INCLUSION_LIST_COMMITTEE,
 };
 
 /** Convert single-byte numbers to hex strings for API spec compliance */

packages/beacon-node/src/chain/produceBlock/produceBlockBody.ts

@@ -1,3 +1,4 @@
+import {BitArray} from "@chainsafe/ssz";
 import {ChainForkConfig} from "@lodestar/config";
 import {IForkChoice, ProtoBlock, getSafeExecutionBlockHash} from "@lodestar/fork-choice";
 import {
@@ -10,6 +11,7 @@ import {
   ForkPostGloas,
   ForkPreGloas,
   ForkSeq,
+  INCLUSION_LIST_COMMITTEE_SIZE,
   isForkPostAltair,
   isForkPostBellatrix,
   isForkPostGloas,
@@ -49,6 +51,7 @@ import {
   electra,
   fulu,
   gloas,
+  heze,
   ssz,
 } from "@lodestar/types";
 import {GWEI_TO_WEI, Logger, byteArrayEquals, fromHex, sleep, toHex, toPubkeyHex, toRootHex} from "@lodestar/utils";
@@ -353,6 +356,10 @@ export async function produceBlockBody<T extends BlockType>(
       blobKzgCommitments: blobsBundle.commitments,
       executionRequestsRoot: ssz.gloas.ExecutionRequests.hashTreeRoot(executionRequests as gloas.ExecutionRequests),
     };
+    if (ForkSeq[fork] >= ForkSeq.heze) {
+      // TODO HEZE: populate from inclusion list pool once IL aggregation is wired up.
+      (bid as heze.ExecutionPayloadBid).inclusionListBits = BitArray.fromBitLen(INCLUSION_LIST_COMMITTEE_SIZE);
+    }
     const signedBid: gloas.SignedExecutionPayloadBid = {
       message: bid,
       signature: G2_POINT_AT_INFINITY,
@@ -927,6 +934,11 @@ function preparePayloadAttributes(
     );
   }
 
+  if (ForkSeq[fork] >= ForkSeq.heze) {
+    // TODO HEZE: populate from inclusion list pool once IL aggregation is wired up.
+    (payloadAttributes as heze.SSEPayloadAttributes["payloadAttributes"]).inclusionListTransactions = [];
+  }
+
   return payloadAttributes;
 }
 

packages/beacon-node/src/chain/validation/executionPayloadBid.ts

@@ -346,7 +346,7 @@ async function validateExecutionPayloadBid(
   // [REJECT] `signed_execution_payload_bid.signature` is valid with respect to the `bid.builder_index`.
   const signatureSet = createSingleSignatureSetFromComponents(
     PublicKey.fromBytes(builder.pubkey),
-    getExecutionPayloadBidSigningRoot(chain.config, state.slot, bid),
+    getExecutionPayloadBidSigningRoot(chain.config, bid),
     signedExecutionPayloadBid.signature
   );
 

packages/beacon-node/src/network/gossip/topic.ts

@@ -8,11 +8,13 @@ import {
   MAX_DATA_COLUMN_SIDECAR_SIZE,
   MAX_SIGNED_AGGREGATE_AND_PROOF_SIZE,
   MAX_SIGNED_EXECUTION_PAYLOAD_BID_SIZE,
+  MAX_SIGNED_EXECUTION_PAYLOAD_BID_SIZE_HEZE,
   SYNC_COMMITTEE_SUBNET_COUNT,
   isForkPostAltair,
   isForkPostElectra,
   isForkPostFulu,
   isForkPostGloas,
+  isForkPostHeze,
 } from "@lodestar/params";
 import {Attestation, SingleAttestation, ssz, sszTypesFor} from "@lodestar/types";
 import {GossipAction, GossipActionError, GossipErrorCode} from "../../chain/errors/gossipValidation.js";
@@ -130,7 +132,7 @@ export function getGossipSSZType(topic: GossipTopic) {
     case GossipType.payload_attestation_message:
       return ssz.gloas.PayloadAttestationMessage;
     case GossipType.execution_payload_bid:
-      return ssz.gloas.SignedExecutionPayloadBid;
+      return isForkPostGloas(fork) ? sszTypesFor(fork).SignedExecutionPayloadBid : ssz.gloas.SignedExecutionPayloadBid;
     case GossipType.proposer_preferences:
       return ssz.gloas.SignedProposerPreferences;
   }
@@ -154,7 +156,7 @@ export function getGossipSSZMaxSize(topic: GossipTopic, maxPayloadSize: number,
     case GossipType.execution_payload:
       return maxPayloadSize;
     case GossipType.execution_payload_bid:
-      return MAX_SIGNED_EXECUTION_PAYLOAD_BID_SIZE;
+      return isForkPostHeze(fork) ? MAX_SIGNED_EXECUTION_PAYLOAD_BID_SIZE_HEZE : MAX_SIGNED_EXECUTION_PAYLOAD_BID_SIZE;
     default:
       return (sszType ?? getGossipSSZType(topic)).maxSize;
   }

packages/beacon-node/test/spec/presets/fork.test.ts

@@ -9,6 +9,7 @@ import {
   CachedBeaconStateDeneb,
   CachedBeaconStateElectra,
   CachedBeaconStateFulu,
+  CachedBeaconStateGloas,
   CachedBeaconStatePhase0,
 } from "@lodestar/state-transition";
 import * as slotFns from "@lodestar/state-transition/slot";
@@ -44,6 +45,8 @@ const fork: TestRunnerFn<ForkStateCase, BeaconStateAllForks> = (forkNext) => {
           return slotFns.upgradeStateToFulu(preState as CachedBeaconStateElectra);
         case ForkName.gloas:
           return slotFns.upgradeStateToGloas(preState as CachedBeaconStateFulu);
+        case ForkName.heze:
+          return slotFns.upgradeStateToHeze(preState as CachedBeaconStateGloas);
       }
     },
     options: {

packages/beacon-node/test/spec/presets/operations.test.ts

@@ -1,6 +1,6 @@
 import path from "node:path";
 import {getConfig} from "@lodestar/config/test-utils";
-import {ACTIVE_PRESET, ForkName, ForkSeq} from "@lodestar/params";
+import {ACTIVE_PRESET, ForkName, ForkSeq, isForkPostGloas} from "@lodestar/params";
 import {InputType} from "@lodestar/spec-test-util";
 import {
   BeaconStateAllForks,
@@ -192,7 +192,9 @@ const operations: TestRunnerFn<OperationsTestCase, BeaconStateAllForks> = (fork,
         deposit_request: ssz.electra.DepositRequest,
         consolidation_request: ssz.electra.ConsolidationRequest,
         payload_attestation: ssz.gloas.PayloadAttestation,
-        execution_payload_bid: ssz.gloas.SignedExecutionPayloadBid,
+        execution_payload_bid: isForkPostGloas(fork)
+          ? sszTypesFor(fork).SignedExecutionPayloadBid
+          : ssz.gloas.SignedExecutionPayloadBid,
         builder_deposit_request: ssz.gloas.BuilderDepositRequest,
         builder_exit_request: ssz.gloas.BuilderExitRequest,
       },

packages/beacon-node/test/spec/presets/transition.test.ts

@@ -127,6 +127,17 @@ function getTransitionConfig(fork: ForkName, forkEpoch: number): Partial<ChainCo
         FULU_FORK_EPOCH: 0,
         GLOAS_FORK_EPOCH: forkEpoch,
       };
+    case ForkName.heze:
+      return {
+        ALTAIR_FORK_EPOCH: 0,
+        BELLATRIX_FORK_EPOCH: 0,
+        CAPELLA_FORK_EPOCH: 0,
+        DENEB_FORK_EPOCH: 0,
+        ELECTRA_FORK_EPOCH: 0,
+        FULU_FORK_EPOCH: 0,
+        GLOAS_FORK_EPOCH: 0,
+        HEZE_FORK_EPOCH: forkEpoch,
+      };
   }
 }
 

packages/beacon-node/test/spec/utils/forkChoiceTestRunner.ts

@@ -888,7 +888,7 @@ export const forkChoiceTestRunner =
         shouldSkip: (_testcase, name, _index) =>
           name.includes("invalid_incorrect_proof") ||
           // TODO GLOAS: These tests will be unskipped by https://github.com/ChainSafe/lodestar/pull/9233
-          (name.includes("gloas") &&
+          ((name.includes("gloas") || name.includes("heze")) &&
             (name.includes("simple_attempted_reorg_without_enough_ffg_votes") ||
               name.includes("include_votes_another_empty_chain_with_enough_ffg_votes_current_epoch") ||
               name.includes("include_votes_another_empty_chain_with_enough_ffg_votes_previous_epoch") ||

packages/beacon-node/test/spec/utils/specTestIterator.ts

@@ -61,7 +61,7 @@ const coveredTestRunners = [
 // ],
 // ```
 export const defaultSkipOpts: SkipOpts = {
-  skippedForks: ["eip7805", "heze"],
+  skippedForks: ["eip8148"],
   skippedTestSuites: [
     // Merge transition tests are skipped because we no longer support performing the merge transition.
     // All networks have already completed the merge, so this code path is no longer needed.
@@ -78,27 +78,41 @@ export const defaultSkipOpts: SkipOpts = {
     // cell level DAS is ready
     /^fulu\/ssz_static\/PartialDataColumn(GroupID|Header|PartsMetadata|Sidecar)\/.*$/,
     /^gloas\/ssz_static\/PartialDataColumn(GroupID|PartsMetadata|Sidecar)\/.*$/,
+    /^heze\/ssz_static\/PartialDataColumn(GroupID|PartsMetadata|Sidecar)\/.*$/,
     // TODO-GLOAS: re-enable after Gloas light-client sync deserializes updates by fork digest.
     /^gloas\/light_client\/sync\/.*/,
+    /^heze\/light_client\/sync\/.*/,
     // TODO-GLOAS: re-enable after on_payload_attestation_message (PTC) fork choice is implemented.
     // New test suite added in v1.7.0-alpha.8 (consensus-specs #5206); gloas PTC fork choice
     // handling is not yet implemented in Lodestar.
     /^gloas\/fork_choice\/on_payload_attestation_message\/.*$/,
+    /^heze\/fork_choice\/on_payload_attestation_message\/.*$/,
     // TODO-GLOAS: re-enable after the gloas should_apply_proposer_boost rule is implemented.
     // New test suite added in v1.7.0-alpha.13 (consensus-specs #5441); Lodestar still applies
     // the pre-gloas proposer boost, so the head weight differs by the boost amount.
     /^gloas\/fork_choice\/should_apply_proposer_boost\/.*$/,
+    /^heze\/fork_choice\/should_apply_proposer_boost\/.*$/,
     // TODO GLOAS: enable this after gloas fork choice is ready
     /^gloas\/fork_choice_compliance\/.*/,
+    /^heze\/fork_choice_compliance\/.*/,
+    // TODO-HEZE: re-enable after on_inclusion_list (FOCIL) fork choice is implemented.
+    /^heze\/fork_choice\/on_inclusion_list\/.*$/,
   ],
   skippedTests: [
     // TODO-GLOAS: re-enable after gloas light client is implemented
     /\/gloas_fork$/,
+    /\/heze_fork$/,
     // TODO GLOAS: Proposer-boost dependent-root gate uses stale cached head across epoch-boundary ticks;
     // boost wrongly denied. Fails identically on every pre-gloas fork.
     // Enable this after https://github.com/ChainSafe/lodestar/issues/9666 is resolved
     // The case name embeds the generation seed, so it changes whenever comptests are regenerated.
     /fork_choice_compliance\/block_tree_test\/pyspec_tests\/block_tree_test_17_381675768_1$/,
+    // TODO GLOAS: gloas/heze take ~23-24s on the mainnet preset (~7.5x pre-gloas) because every
+    // post-gloas slot writes into the SLOTS_PER_HISTORICAL_ROOT-wide executionPayloadAvailability
+    // bitvector, and this suite steps 8192 slots. That is 76-81% of the 30s sanity/slots timeout,
+    // so skip rather than raise the timeout and hide the regression.
+    // Enable this after https://github.com/ChainSafe/lodestar/issues/9771 is resolved
+    /^(gloas|heze)\/sanity\/slots\/pyspec_tests\/historical_accumulator$/,
   ],
   // TODO GLOAS: Investigate why networking tests are failing since alpha.5
   skippedRunners: ["networking"],

packages/beacon-node/test/unit/chain/blocks/blockInput.test.ts

@@ -18,13 +18,15 @@ const DENEB_FORK_EPOCH = 1;
 const ELECTRA_FORK_EPOCH = 2;
 const FULU_FORK_EPOCH = 3;
 const GLOAS_FORK_EPOCH = 4;
+const HEZE_FORK_EPOCH = 5;
 const config = createChainForkConfig({
   ...defaultChainConfig,
   CAPELLA_FORK_EPOCH,
   DENEB_FORK_EPOCH,
   ELECTRA_FORK_EPOCH,
   FULU_FORK_EPOCH,
   GLOAS_FORK_EPOCH,
+  HEZE_FORK_EPOCH,
 });
 
 const slots: Record<ForkPostCapella, number> = {
@@ -33,6 +35,7 @@ const slots: Record<ForkPostCapella, number> = {
   electra: computeStartSlotAtEpoch(ELECTRA_FORK_EPOCH),
   fulu: computeStartSlotAtEpoch(FULU_FORK_EPOCH),
   gloas: computeStartSlotAtEpoch(GLOAS_FORK_EPOCH),
+  heze: computeStartSlotAtEpoch(HEZE_FORK_EPOCH),
 };
 
 type BlockTestSet<F extends ForkPostCapella> = {

packages/beacon-node/test/unit/chain/lightclient/upgradeLightClientHeader.test.ts

@@ -18,6 +18,7 @@ describe("UpgradeLightClientHeader", () => {
     ELECTRA_FORK_EPOCH: 5,
     FULU_FORK_EPOCH: 6,
     GLOAS_FORK_EPOCH: 7,
+    HEZE_FORK_EPOCH: 8,
   });
 
   const genesisValidatorsRoot = Buffer.alloc(32, 0xaa);
@@ -33,6 +34,7 @@ describe("UpgradeLightClientHeader", () => {
       electra: ssz.deneb.LightClientHeader.defaultValue(),
       fulu: ssz.deneb.LightClientHeader.defaultValue(),
       gloas: ssz.gloas.LightClientHeader.defaultValue(),
+      heze: ssz.gloas.LightClientHeader.defaultValue(),
     };
 
     testSlots = {
@@ -44,6 +46,7 @@ describe("UpgradeLightClientHeader", () => {
       electra: 164,
       fulu: 216,
       gloas: 235,
+      heze: 260,
     };
   });
 
@@ -57,7 +60,7 @@ describe("UpgradeLightClientHeader", () => {
         lcHeaderByFork[toFork].beacon.slot = testSlots[fromFork];
 
         const expectedHeader =
-          toFork === ForkName.gloas
+          ForkSeq[toFork] >= ForkSeq.gloas && ForkSeq[fromFork] < ForkSeq.gloas
             ? getExpectedGloasHeader(fromFork, lcHeaderByFork[fromFork])
             : lcHeaderByFork[toFork];
         const updatedHeader = upgradeLightClientHeader(config, toFork, lcHeaderByFork[fromFork]);

packages/beacon-node/test/unit/network/fork.test.ts

@@ -12,6 +12,7 @@ function getForkConfig({
   electra,
   fulu,
   gloas,
+  heze,
 }: {
   phase0: number;
   altair: number;
@@ -21,6 +22,7 @@ function getForkConfig({
   electra: number;
   fulu: number;
   gloas: number;
+  heze: number;
 }): BeaconConfig {
   const forks: Record<ForkName, ForkInfo> = {
     phase0: {
@@ -87,6 +89,14 @@ function getForkConfig({
       prevVersion: Buffer.from([0, 0, 0, 6]),
       prevForkName: ForkName.fulu,
     },
+    heze: {
+      name: ForkName.heze,
+      seq: ForkSeq.heze,
+      epoch: heze,
+      version: Buffer.from([0, 0, 0, 8]),
+      prevVersion: Buffer.from([0, 0, 0, 7]),
+      prevForkName: ForkName.gloas,
+    },
   };
   const forksAscendingEpochOrder = Object.values(forks);
   const forksDescendingEpochOrder = Object.values(forks).reverse();
@@ -171,9 +181,10 @@ for (const testScenario of testScenarios) {
   const electra = Infinity;
   const fulu = Infinity;
   const gloas = Infinity;
+  const heze = Infinity;
 
   describe(`network / fork: phase0: ${phase0}, altair: ${altair}, bellatrix: ${bellatrix} capella: ${capella}`, () => {
-    const forkConfig = getForkConfig({phase0, altair, bellatrix, capella, deneb, electra, fulu, gloas});
+    const forkConfig = getForkConfig({phase0, altair, bellatrix, capella, deneb, electra, fulu, gloas, heze});
     const forks = forkConfig.forks;
     for (const testCase of testCases) {
       const {epoch, currentFork, nextFork, activeForks} = testCase;

packages/beacon-node/test/unit/network/gossip/topic.test.ts

@@ -9,6 +9,7 @@ import {
   MAX_DATA_COLUMN_SIDECAR_SIZE,
   MAX_SIGNED_AGGREGATE_AND_PROOF_SIZE,
   MAX_SIGNED_EXECUTION_PAYLOAD_BID_SIZE,
+  MAX_SIGNED_EXECUTION_PAYLOAD_BID_SIZE_HEZE,
   ZERO_HASH,
 } from "@lodestar/params";
 import {DataTransformSnappy} from "../../../../src/network/gossip/encoding.js";
@@ -281,6 +282,14 @@ describe("network / gossip / topic", () => {
     });
   });
 
+  it("should use the Heze bid size limit post-Heze", () => {
+    const boundary = {fork: ForkName.heze, epoch: config.HEZE_FORK_EPOCH};
+
+    expect(
+      getGossipSSZMaxSize({type: GossipType.execution_payload_bid, boundary, encoding}, config.MAX_PAYLOAD_SIZE)
+    ).toBe(MAX_SIGNED_EXECUTION_PAYLOAD_BID_SIZE_HEZE);
+  });
+
   it("should cap Gloas progressive gossip objects below their theoretical SSZ max", () => {
     const boundary = {fork: ForkName.gloas, epoch: config.GLOAS_FORK_EPOCH};
 

packages/beacon-node/test/utils/blocksAndData.ts

@@ -17,7 +17,7 @@ import {
   isForkPostGloas,
 } from "@lodestar/params";
 import {computeStartSlotAtEpoch, signedBlockToSignedHeader} from "@lodestar/state-transition";
-import {BeaconBlockBody, SignedBeaconBlock, Slot, deneb, fulu, gloas, ssz} from "@lodestar/types";
+import {BeaconBlockBody, SignedBeaconBlock, Slot, deneb, fulu, gloas, ssz, sszTypesFor} from "@lodestar/types";
 import {toRootHex} from "@lodestar/utils";
 import {VersionedHashes} from "../../src/execution/index.js";
 import {computeNodeIdFromPrivateKey} from "../../src/network/subnets/index.js";
@@ -36,13 +36,15 @@ export const DENEB_FORK_EPOCH = 10;
 export const ELECTRA_FORK_EPOCH = 20;
 export const FULU_FORK_EPOCH = 30;
 export const GLOAS_FORK_EPOCH = 40;
+export const HEZE_FORK_EPOCH = 50;
 export const config = createChainForkConfig({
   ...defaultChainConfig,
   CAPELLA_FORK_EPOCH,
   DENEB_FORK_EPOCH,
   ELECTRA_FORK_EPOCH,
   FULU_FORK_EPOCH,
   GLOAS_FORK_EPOCH,
+  HEZE_FORK_EPOCH,
 });
 export const clock = new Clock({
   config,
@@ -60,6 +62,7 @@ export const slots: Record<ForkPostCapella, number> = {
   electra: computeStartSlotAtEpoch(ELECTRA_FORK_EPOCH),
   fulu: computeStartSlotAtEpoch(FULU_FORK_EPOCH),
   gloas: computeStartSlotAtEpoch(GLOAS_FORK_EPOCH),
+  heze: computeStartSlotAtEpoch(HEZE_FORK_EPOCH),
 };
 
 /**
@@ -183,7 +186,7 @@ function generateColumnSidecars<F extends ForkPostFulu>(
   if (isForkPostGloas(forkName)) {
     (block.message.body as gloas.BeaconBlockBody).signedExecutionPayloadBid.message.blobKzgCommitments = kzgCommitments;
 
-    const beaconBlockRoot = ssz[forkName as ForkPostGloas].BeaconBlock.hashTreeRoot(
+    const beaconBlockRoot = sszTypesFor(forkName as ForkPostGloas).BeaconBlock.hashTreeRoot(
       block.message as SignedBeaconBlock<ForkPostGloas>["message"]
     );
     columnSidecars = getGloasDataColumnSidecars(

packages/builder/src/services/builderSigner.ts

@@ -24,7 +24,7 @@ export class BuilderSigner {
   }
 
   signExecutionPayloadBid(bid: gloas.ExecutionPayloadBid): gloas.SignedExecutionPayloadBid {
-    const signingRoot = getExecutionPayloadBidSigningRoot(this.config, bid.slot, bid);
+    const signingRoot = getExecutionPayloadBidSigningRoot(this.config, bid);
 
     return {
       message: bid,