@lodestar/beacon-node 1.41.0-dev.9fa839a030 → 1.41.0-dev.a35cbde8b3

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.41.0-dev.9fa839a030",
+  "version": "1.41.0-dev.a35cbde8b3",
   "type": "module",
   "exports": {
     ".": {
@@ -134,18 +134,18 @@
     "@libp2p/peer-id": "^5.1.0",
     "@libp2p/prometheus-metrics": "^4.3.15",
     "@libp2p/tcp": "^10.1.8",
-    "@lodestar/api": "^1.41.0-dev.9fa839a030",
-    "@lodestar/config": "^1.41.0-dev.9fa839a030",
-    "@lodestar/db": "^1.41.0-dev.9fa839a030",
-    "@lodestar/fork-choice": "^1.41.0-dev.9fa839a030",
-    "@lodestar/light-client": "^1.41.0-dev.9fa839a030",
-    "@lodestar/logger": "^1.41.0-dev.9fa839a030",
-    "@lodestar/params": "^1.41.0-dev.9fa839a030",
-    "@lodestar/reqresp": "^1.41.0-dev.9fa839a030",
-    "@lodestar/state-transition": "^1.41.0-dev.9fa839a030",
-    "@lodestar/types": "^1.41.0-dev.9fa839a030",
-    "@lodestar/utils": "^1.41.0-dev.9fa839a030",
-    "@lodestar/validator": "^1.41.0-dev.9fa839a030",
+    "@lodestar/api": "^1.41.0-dev.a35cbde8b3",
+    "@lodestar/config": "^1.41.0-dev.a35cbde8b3",
+    "@lodestar/db": "^1.41.0-dev.a35cbde8b3",
+    "@lodestar/fork-choice": "^1.41.0-dev.a35cbde8b3",
+    "@lodestar/light-client": "^1.41.0-dev.a35cbde8b3",
+    "@lodestar/logger": "^1.41.0-dev.a35cbde8b3",
+    "@lodestar/params": "^1.41.0-dev.a35cbde8b3",
+    "@lodestar/reqresp": "^1.41.0-dev.a35cbde8b3",
+    "@lodestar/state-transition": "^1.41.0-dev.a35cbde8b3",
+    "@lodestar/types": "^1.41.0-dev.a35cbde8b3",
+    "@lodestar/utils": "^1.41.0-dev.a35cbde8b3",
+    "@lodestar/validator": "^1.41.0-dev.a35cbde8b3",
     "@multiformats/multiaddr": "^12.1.3",
     "datastore-core": "^10.0.2",
     "datastore-fs": "^10.0.6",
@@ -169,7 +169,7 @@
     "@chainsafe/swap-or-not-shuffle": "^1.2.1",
     "@libp2p/interface-internal": "^2.3.18",
     "@libp2p/logger": "^5.1.21",
-    "@lodestar/spec-test-util": "^1.41.0-dev.9fa839a030",
+    "@lodestar/spec-test-util": "^1.41.0-dev.a35cbde8b3",
     "@types/js-yaml": "^4.0.5",
     "@types/qs": "^6.9.7",
     "@types/tmp": "^0.2.3",
@@ -188,5 +188,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "1ba8fa66f8fc0890153a0ecc8cd5b3be617ce410"
+  "gitHead": "090cdf258f4c067ebe6b5f0bdba221c2c23b9962"
 }

package/src/api/impl/beacon/blocks/index.ts

@@ -1,6 +1,7 @@
 import {routes} from "@lodestar/api";
 import {ApiError, ApplicationMethods} from "@lodestar/api/server";
 import {
+  BUILDER_INDEX_SELF_BUILD,
   ForkPostBellatrix,
   ForkPostFulu,
   ForkPreGloas,
@@ -27,6 +28,7 @@ import {
   WithOptionalBytes,
   deneb,
   fulu,
+  gloas,
   isDenebBlockContents,
   sszTypesFor,
 } from "@lodestar/types";
@@ -42,6 +44,7 @@ import {
   ProduceFullBellatrix,
   ProduceFullDeneb,
   ProduceFullFulu,
+  ProduceFullGloas,
 } from "../../../../chain/produceBlock/index.js";
 import {validateGossipBlock} from "../../../../chain/validation/block.js";
 import {OpSource} from "../../../../chain/validatorMonitor.js";
@@ -51,7 +54,7 @@ import {
   kzgCommitmentToVersionedHash,
   reconstructBlobs,
 } from "../../../../util/blobs.js";
-import {getDataColumnSidecarsFromBlock} from "../../../../util/dataColumns.js";
+import {getDataColumnSidecarsForGloas, getDataColumnSidecarsFromBlock} from "../../../../util/dataColumns.js";
 import {isOptimisticBlock} from "../../../../util/forkChoice.js";
 import {kzg} from "../../../../util/kzg.js";
 import {promiseAllMaybeAsync} from "../../../../util/promises.js";
@@ -93,6 +96,7 @@ export function getBeaconBlockApi({
     const fork = config.getForkName(slot);
     const blockRoot = toRootHex(chain.config.getForkTypes(slot).BeaconBlock.hashTreeRoot(signedBlock.message));
 
+    // TODO GLOAS: handle new BlockInput type
     const blockForImport = chain.seenBlockInputCache.getByBlock({
       block: signedBlock,
       source: BlockInputSource.api,
@@ -309,7 +313,9 @@ export function getBeaconBlockApi({
     ];
     const sentPeersArr = await promiseAllMaybeAsync<number | void>(publishPromises);
 
-    if (isForkPostFulu(fork)) {
+    if (isForkPostGloas(fork)) {
+      // After gloas, data columns are not published with the block but when publishing the execution payload envelope
+    } else if (isForkPostFulu(fork)) {
       let columnsPublishedWithZeroPeers = 0;
       // sent peers per topic are logged in network.publishGossip(), here we only track metrics for it
       // starting from fulu, we have to push to 128 subnets so need to make sure we have enough sent peers per topic
@@ -632,6 +638,143 @@ export function getBeaconBlockApi({
       await publishBlock(args, context, opts);
     },
 
+    async publishExecutionPayloadEnvelope({signedExecutionPayloadEnvelope}) {
+      const seenTimestampSec = Date.now() / 1000;
+      const envelope = signedExecutionPayloadEnvelope.message;
+      const slot = envelope.slot;
+      const fork = config.getForkName(slot);
+      const blockRootHex = toRootHex(envelope.beaconBlockRoot);
+
+      if (!isForkPostGloas(fork)) {
+        throw new ApiError(400, `publishExecutionPayloadEnvelope not supported for pre-gloas fork=${fork}`);
+      }
+
+      // TODO GLOAS: review checks, do we want to implement `broadcast_validation`?
+      const block = chain.forkChoice.getBlockHex(blockRootHex);
+      if (block === null) {
+        throw new ApiError(404, `Block not found for beacon block root ${blockRootHex}`);
+      }
+      if (block.slot !== slot) {
+        throw new ApiError(400, `Envelope slot ${slot} does not match block slot ${block.slot}`);
+      }
+
+      const isSelfBuild = envelope.builderIndex === BUILDER_INDEX_SELF_BUILD;
+      let dataColumnSidecars: gloas.DataColumnSidecars = [];
+
+      if (isSelfBuild) {
+        // For self-builds, construct and publish data column sidecars from cached block production data
+        const cachedResult = chain.blockProductionCache.get(blockRootHex) as ProduceFullGloas | undefined;
+        if (cachedResult === undefined) {
+          throw new ApiError(404, `No cached block production result found for block root ${blockRootHex}`);
+        }
+        if (!isForkPostGloas(cachedResult.fork)) {
+          throw new ApiError(400, `Cached block production result is for pre-gloas fork=${cachedResult.fork}`);
+        }
+        if (cachedResult.type !== BlockType.Full) {
+          throw new ApiError(400, "Cached block production result is not full block");
+        }
+
+        if (cachedResult.cells && cachedResult.blobsBundle.commitments.length > 0) {
+          const cellsAndProofs = cachedResult.cells.map((rowCells, rowIndex) => ({
+            cells: rowCells,
+            proofs: cachedResult.blobsBundle.proofs.slice(
+              rowIndex * NUMBER_OF_COLUMNS,
+              (rowIndex + 1) * NUMBER_OF_COLUMNS
+            ),
+          }));
+
+          dataColumnSidecars = getDataColumnSidecarsForGloas(slot, envelope.beaconBlockRoot, cellsAndProofs);
+        }
+      } else {
+        // TODO GLOAS: will this api be used by builders or only for self-building?
+      }
+
+      // TODO GLOAS: Verify execution payload envelope signature
+      // For self-builds, the proposer signs with their own validator key
+      // For external builders, verify using the builder's registered pubkey
+      // Use verify_execution_payload_envelope_signature(state, signed_envelope)
+
+      // TODO GLOAS: Process execution payload via state transition
+      // Call process_execution_payload(state, signed_envelope, execution_engine)
+
+      // TODO GLOAS: Update fork choice with the execution payload
+      // Call on_execution_payload(store, signed_envelope) to update fork choice state
+
+      // TODO GLOAS: Add envelope and data columns to block input via seenBlockInputCache
+      // and trigger block import (Gloas block import requires both beacon block and envelope)
+
+      const valLogMeta = {
+        slot,
+        blockRoot: blockRootHex,
+        builderIndex: envelope.builderIndex,
+        isSelfBuild,
+        dataColumns: dataColumnSidecars.length,
+      };
+
+      // If called near a slot boundary (e.g. late in slot N-1), hold briefly so gossip aligns with slot N.
+      const msToBlockSlot = computeTimeAtSlot(config, slot, chain.genesisTime) * 1000 - Date.now();
+      if (msToBlockSlot <= MAX_API_CLOCK_DISPARITY_MS && msToBlockSlot > 0) {
+        await sleep(msToBlockSlot);
+      }
+
+      const delaySec = seenTimestampSec - computeTimeAtSlot(config, slot, chain.genesisTime);
+      metrics?.gossipExecutionPayloadEnvelope.elapsedTimeTillReceived.observe({source: OpSource.api}, delaySec);
+
+      chain.logger.info("Publishing execution payload envelope", valLogMeta);
+
+      // Publish envelope and data columns
+      const publishPromises = [
+        // Gossip the signed execution payload envelope first
+        () => network.publishSignedExecutionPayloadEnvelope(signedExecutionPayloadEnvelope),
+        // For self-builds, publish all data column sidecars
+        ...dataColumnSidecars.map((dataColumnSidecar) => () => network.publishDataColumnSidecar(dataColumnSidecar)),
+      ];
+
+      const sentPeersArr = await promiseAllMaybeAsync<number | void>(publishPromises);
+
+      // Track metrics for data column publishing
+      if (dataColumnSidecars.length > 0) {
+        let columnsPublishedWithZeroPeers = 0;
+        // Skip first entry (envelope), track data columns
+        for (let i = 1; i < sentPeersArr.length; i++) {
+          const sentPeers = sentPeersArr[i] as number;
+          metrics?.dataColumns.sentPeersPerSubnet.observe(sentPeers);
+          if (sentPeers === 0) {
+            columnsPublishedWithZeroPeers++;
+          }
+        }
+        if (columnsPublishedWithZeroPeers > 0) {
+          chain.logger.warn("Published data columns to 0 peers, increased risk of reorg", {
+            slot,
+            blockRoot: blockRootHex,
+            columns: columnsPublishedWithZeroPeers,
+          });
+        }
+
+        metrics?.dataColumns.bySource.inc({source: BlockInputSource.api}, dataColumnSidecars.length);
+
+        if (chain.emitter.listenerCount(routes.events.EventType.dataColumnSidecar)) {
+          // TODO GLOAS: revisit this, we likely don't wanna emit KZG commitments anymore
+          const cachedResult = chain.blockProductionCache.get(blockRootHex) as ProduceFullGloas | undefined;
+          const kzgCommitments = cachedResult?.blobsBundle.commitments.map(toHex) ?? [];
+          for (const dataColumnSidecar of dataColumnSidecars) {
+            chain.emitter.emit(routes.events.EventType.dataColumnSidecar, {
+              blockRoot: blockRootHex,
+              slot,
+              index: dataColumnSidecar.index,
+              kzgCommitments,
+            });
+          }
+        }
+      }
+
+      chain.logger.info("Published execution payload envelope", {
+        ...valLogMeta,
+        delaySec,
+        sentPeers: (sentPeersArr[0] as number) ?? 0,
+      });
+    },
+
     async getBlobSidecars({blockId, indices}) {
       assertUniqueItems(indices, "Duplicate indices provided");
 

package/src/api/impl/lightclient/index.ts

@@ -1,7 +1,9 @@
 import {routes} from "@lodestar/api";
 import {ApplicationMethods} from "@lodestar/api/server";
 import {MAX_REQUEST_LIGHT_CLIENT_COMMITTEE_HASHES, MAX_REQUEST_LIGHT_CLIENT_UPDATES} from "@lodestar/params";
+import type {LightClientUpdate} from "@lodestar/types";
 import {fromHex} from "@lodestar/utils";
+import {LightClientServerError, LightClientServerErrorCode} from "../../../chain/errors/lightClientError.js";
 import {assertLightClientServer} from "../../../node/utils/lightclient.js";
 import {ApiModules} from "../types.js";
 // TODO: Import from lightclient/server package
@@ -16,8 +18,23 @@ export function getLightclientApi({
       assertLightClientServer(lightClientServer);
 
       const maxAllowedCount = Math.min(MAX_REQUEST_LIGHT_CLIENT_UPDATES, count);
-      const periods = Array.from({length: maxAllowedCount}, (_ignored, i) => i + startPeriod);
-      const updates = await Promise.all(periods.map((period) => lightClientServer.getUpdate(period)));
+      const updates: LightClientUpdate[] = [];
+      for (let i = 0; i < maxAllowedCount; i++) {
+        try {
+          const update = await lightClientServer.getUpdate(startPeriod + i);
+          updates.push(update);
+        } catch (e) {
+          if ((e as LightClientServerError).type?.code === LightClientServerErrorCode.RESOURCE_UNAVAILABLE) {
+            // Period not available, if we already have results, stop to preserve
+            // consecutive order. If not, skip and try the next period.
+            if (updates.length > 0) break;
+            continue;
+          }
+          // Unexpected error
+          throw e;
+        }
+      }
+
       return {
         data: updates,
         meta: {versions: updates.map((update) => config.getForkName(update.attestedHeader.beacon.slot))},

package/src/api/impl/validator/index.ts

@@ -3,6 +3,7 @@ import {routes} from "@lodestar/api";
 import {ApplicationMethods} from "@lodestar/api/server";
 import {ExecutionStatus, ProtoBlock} from "@lodestar/fork-choice";
 import {
+  BUILDER_INDEX_SELF_BUILD,
   ForkName,
   ForkPostBellatrix,
   ForkPreGloas,
@@ -14,6 +15,7 @@ import {
   isForkPostBellatrix,
   isForkPostDeneb,
   isForkPostElectra,
+  isForkPostGloas,
 } from "@lodestar/params";
 import {
   CachedBeaconStateAllForks,
@@ -45,6 +47,7 @@ import {
   Wei,
   bellatrix,
   getValidatorStatus,
+  gloas,
   phase0,
   ssz,
 } from "@lodestar/types";
@@ -69,7 +72,7 @@ import {
 } from "../../../chain/errors/index.js";
 import {ChainEvent, CommonBlockBody} from "../../../chain/index.js";
 import {PREPARE_NEXT_SLOT_BPS} from "../../../chain/prepareNextSlot.js";
-import {BlockType, ProduceFullDeneb} from "../../../chain/produceBlock/index.js";
+import {BlockType, ProduceFullDeneb, ProduceFullGloas} from "../../../chain/produceBlock/index.js";
 import {RegenCaller} from "../../../chain/regen/index.js";
 import {CheckpointHex} from "../../../chain/stateCache/types.js";
 import {validateApiAggregateAndProof} from "../../../chain/validation/index.js";
@@ -901,6 +904,77 @@ export function getValidatorApi(
       return {data, meta};
     },
 
+    async produceBlockV4({slot, randaoReveal, graffiti, feeRecipient}) {
+      const fork = config.getForkName(slot);
+
+      if (!isForkPostGloas(fork)) {
+        throw new ApiError(400, `produceBlockV4 not supported for pre-gloas fork=${fork}`);
+      }
+
+      notWhileSyncing();
+      await waitForSlot(slot);
+
+      // TODO GLOAS: support producing blocks from builder bids
+      const source = ProducedBlockSource.engine;
+
+      // TODO GLOAS: needs to be updated after fork choice changes are merged
+      const parentBlock = chain.getProposerHead(slot);
+      const {blockRoot: parentBlockRootHex, slot: parentSlot} = parentBlock;
+      const parentBlockRoot = fromHex(parentBlockRootHex);
+      notOnOutOfRangeData(parentBlockRoot);
+      metrics?.blockProductionSlotDelta.set(slot - parentSlot);
+      metrics?.blockProductionRequests.inc({source});
+
+      const graffitiBytes = toGraffitiBytes(
+        graffiti ?? getDefaultGraffiti(getLodestarClientVersion(), chain.executionEngine.clientVersion, {})
+      );
+      const commonBlockBodyPromise = chain.produceCommonBlockBody({
+        slot,
+        parentBlock,
+        randaoReveal,
+        graffiti: graffitiBytes,
+      });
+
+      let timer: undefined | ((opts: {source: ProducedBlockSource}) => number);
+      try {
+        timer = metrics?.blockProductionTime.startTimer();
+        const {block, executionPayloadValue, consensusBlockValue} = await chain.produceBlock({
+          slot,
+          parentBlock,
+          randaoReveal,
+          graffiti: graffitiBytes,
+          feeRecipient,
+          commonBlockBodyPromise,
+        });
+
+        metrics?.blockProductionSuccess.inc({source});
+        metrics?.blockProductionNumAggregated.observe({source}, block.body.attestations.length);
+        metrics?.blockProductionConsensusBlockValue.observe({source}, Number(formatWeiToEth(consensusBlockValue)));
+        metrics?.blockProductionExecutionPayloadValue.observe({source}, Number(formatWeiToEth(executionPayloadValue)));
+
+        const blockRoot = toRootHex(config.getForkTypes(slot).BeaconBlock.hashTreeRoot(block));
+        logger.verbose("Produced block", {
+          slot,
+          executionPayloadValue,
+          consensusBlockValue,
+          root: blockRoot,
+        });
+        if (chain.opts.persistProducedBlocks) {
+          void chain.persistBlock(block, "produced_engine_block");
+        }
+
+        return {
+          data: block as gloas.BeaconBlock,
+          meta: {
+            version: fork,
+            consensusBlockValue,
+          },
+        };
+      } finally {
+        timer?.({source});
+      }
+    },
+
     async produceAttestationData({committeeIndex, slot}) {
       notWhileSyncing();
 
@@ -1532,5 +1606,54 @@ export function getValidatorApi(
         count: filteredRegistrations.length,
       });
     },
+
+    async getExecutionPayloadEnvelope({slot, beaconBlockRoot}) {
+      const fork = config.getForkName(slot);
+
+      if (!isForkPostGloas(fork)) {
+        throw new ApiError(400, `getExecutionPayloadEnvelope not supported for pre-gloas fork=${fork}`);
+      }
+
+      notWhileSyncing();
+      await waitForSlot(slot);
+
+      const blockRootHex = toRootHex(beaconBlockRoot);
+      const produceResult = chain.blockProductionCache.get(blockRootHex);
+
+      if (produceResult === undefined) {
+        throw new ApiError(404, `No cached block production result found for block root ${blockRootHex}`);
+      }
+      if (!isForkPostGloas(produceResult.fork)) {
+        throw Error(`Cached block production result is for pre-gloas fork=${produceResult.fork}`);
+      }
+      if (produceResult.type !== BlockType.Full) {
+        throw Error("Cached block production result is not full block");
+      }
+
+      const {executionPayload, executionRequests, envelopeStateRoot} = produceResult as ProduceFullGloas;
+
+      const envelope: gloas.ExecutionPayloadEnvelope = {
+        payload: executionPayload,
+        executionRequests: executionRequests,
+        builderIndex: BUILDER_INDEX_SELF_BUILD,
+        beaconBlockRoot,
+        slot,
+        stateRoot: envelopeStateRoot,
+      };
+
+      logger.info("Produced execution payload envelope", {
+        slot,
+        blockRoot: blockRootHex,
+        transactions: executionPayload.transactions.length,
+        blockHash: toRootHex(executionPayload.blockHash),
+      });
+
+      return {
+        data: envelope,
+        meta: {
+          version: fork,
+        },
+      };
+    },
   };
 }

package/src/chain/blocks/importBlock.ts

@@ -101,9 +101,6 @@ export async function importBlock(
     }
   });
 
-  // Without forcefully clearing this cache, we would rely on WeakMap to evict memory which is not reliable
-  this.serializedCache.clear();
-
   // 2. Import block to fork choice
 
   // Should compute checkpoint balances before forkchoice.onBlock

package/src/chain/blocks/index.ts

@@ -1,6 +1,7 @@
 import {SignedBeaconBlock} from "@lodestar/types";
 import {isErrorAborted, toRootHex} from "@lodestar/utils";
 import {Metrics} from "../../metrics/metrics.js";
+import {nextEventLoop} from "../../util/eventLoop.js";
 import {JobItemQueue, isQueueErrorAborted} from "../../util/queue/index.js";
 import type {BeaconChain} from "../chain.js";
 import {BlockError, BlockErrorCode, isBlockErrorAborted} from "../errors/index.js";
@@ -100,9 +101,9 @@ export async function processBlocks(
     );
 
     for (const fullyVerifiedBlock of fullyVerifiedBlocks) {
-      // No need to sleep(0) here since `importBlock` includes a disk write
       // TODO: Consider batching importBlock too if it takes significant time
       await importBlock.call(this, fullyVerifiedBlock, opts);
+      await nextEventLoop();
     }
   } catch (e) {
     if (isErrorAborted(e) || isQueueErrorAborted(e) || isBlockErrorAborted(e)) {

package/src/chain/blocks/writeBlockInputToDb.ts

@@ -125,6 +125,9 @@ export async function persistBlockInputs(this: BeaconChain, blockInputs: IBlockI
       for (const blockInput of blockInputs) {
         this.seenBlockInputCache.prune(blockInput.blockRootHex);
       }
+      // Without forcefully clearing this cache, we would rely on WeakMap to evict memory which is not reliable.
+      // Clear here (after the DB write) so that writeBlockInputToDb can still use the cached serialized bytes.
+      this.serializedCache.clear();
       if (blockInputs.length === 1) {
         this.logger.debug("Pruned block input", {
           slot: blockInputs[0].slot,

package/src/chain/chain.ts

@@ -5,11 +5,19 @@ import {CompositeTypeAny, TreeView, Type} from "@chainsafe/ssz";
 import {BeaconConfig} from "@lodestar/config";
 import {CheckpointWithHex, IForkChoice, ProtoBlock, UpdateHeadOpt} from "@lodestar/fork-choice";
 import {LoggerNode} from "@lodestar/logger/node";
-import {EFFECTIVE_BALANCE_INCREMENT, GENESIS_SLOT, SLOTS_PER_EPOCH, isForkPostElectra} from "@lodestar/params";
+import {
+  BUILDER_INDEX_SELF_BUILD,
+  EFFECTIVE_BALANCE_INCREMENT,
+  GENESIS_SLOT,
+  SLOTS_PER_EPOCH,
+  isForkPostElectra,
+  isForkPostGloas,
+} from "@lodestar/params";
 import {
   BeaconStateAllForks,
   BeaconStateElectra,
   CachedBeaconStateAllForks,
+  CachedBeaconStateGloas,
   EffectiveBalanceIncrements,
   EpochShuffling,
   Index2PubkeyCache,
@@ -39,6 +47,7 @@ import {
   Wei,
   deneb,
   fulu,
+  gloas,
   isBlindedBeaconBlock,
   phase0,
   rewards,
@@ -87,8 +96,8 @@ import {
 } from "./opPools/index.js";
 import {IChainOptions} from "./options.js";
 import {PrepareNextSlotScheduler} from "./prepareNextSlot.js";
-import {computeNewStateRoot} from "./produceBlock/computeNewStateRoot.js";
-import {AssembledBlockType, BlockType, ProduceResult} from "./produceBlock/index.js";
+import {computeEnvelopeStateRoot, computeNewStateRoot} from "./produceBlock/computeNewStateRoot.js";
+import {AssembledBlockType, BlockType, ProduceFullGloas, ProduceResult} from "./produceBlock/index.js";
 import {BlockAttributes, produceBlockBody, produceCommonBlockBody} from "./produceBlock/produceBlockBody.js";
 import {QueuedStateRegenerator, RegenCaller} from "./regen/index.js";
 import {ReprocessController} from "./reprocess.js";
@@ -902,6 +911,7 @@ export class BeaconChain implements IBeaconChain {
     consensusBlockValue: Wei;
     shouldOverrideBuilder?: boolean;
   }> {
+    const fork = this.config.getForkName(slot);
     const state = await this.regen.getBlockSlotState(
       parentBlock,
       slot,
@@ -930,7 +940,7 @@ export class BeaconChain implements IBeaconChain {
     // The hashtree root computed here for debug log will get cached and hence won't introduce additional delays
     const bodyRoot =
       produceResult.type === BlockType.Full
-        ? this.config.getForkTypes(slot).BeaconBlockBody.hashTreeRoot(body)
+        ? sszTypesFor(fork).BeaconBlockBody.hashTreeRoot(body)
         : this.config
             .getPostBellatrixForkTypes(slot)
             .BlindedBeaconBlockBody.hashTreeRoot(body as BlindedBeaconBlockBody);
@@ -948,14 +958,33 @@ export class BeaconChain implements IBeaconChain {
       body,
     } as AssembledBlockType<T>;
 
-    const {newStateRoot, proposerReward} = computeNewStateRoot(this.metrics, state, block);
+    const {newStateRoot, proposerReward, postState} = computeNewStateRoot(this.metrics, state, block);
     block.stateRoot = newStateRoot;
     const blockRoot =
       produceResult.type === BlockType.Full
-        ? this.config.getForkTypes(slot).BeaconBlock.hashTreeRoot(block)
+        ? sszTypesFor(fork).BeaconBlock.hashTreeRoot(block)
         : this.config.getPostBellatrixForkTypes(slot).BlindedBeaconBlock.hashTreeRoot(block as BlindedBeaconBlock);
     const blockRootHex = toRootHex(blockRoot);
 
+    if (isForkPostGloas(fork)) {
+      // TODO GLOAS: we should retire BlockType post-gloas, may need a new enum for self vs non-self built
+      if (produceResult.type !== BlockType.Full) {
+        throw Error(`Unexpected block type=${produceResult.type} for post-gloas fork=${fork}`);
+      }
+
+      const gloasResult = produceResult as ProduceFullGloas;
+      const envelope: gloas.ExecutionPayloadEnvelope = {
+        payload: gloasResult.executionPayload,
+        executionRequests: gloasResult.executionRequests,
+        builderIndex: BUILDER_INDEX_SELF_BUILD,
+        beaconBlockRoot: blockRoot,
+        slot,
+        stateRoot: ZERO_HASH,
+      };
+      const envelopeStateRoot = computeEnvelopeStateRoot(this.metrics, postState as CachedBeaconStateGloas, envelope);
+      gloasResult.envelopeStateRoot = envelopeStateRoot;
+    }
+
     // Track the produced block for consensus broadcast validations, later validation, etc.
     this.blockProductionCache.set(blockRootHex, produceResult);
     this.metrics?.blockProductionCacheSize.set(this.blockProductionCache.size);

package/src/chain/emitter.ts

@@ -3,7 +3,7 @@ import {StrictEventEmitter} from "strict-event-emitter-types";
 import {routes} from "@lodestar/api";
 import {CheckpointWithHex} from "@lodestar/fork-choice";
 import {CachedBeaconStateAllForks} from "@lodestar/state-transition";
-import {RootHex, deneb, fulu, phase0} from "@lodestar/types";
+import {DataColumnSidecar, RootHex, deneb, phase0} from "@lodestar/types";
 import {PeerIdStr} from "../util/peerId.js";
 import {BlockInputSource, IBlockInput} from "./blocks/blockInput/types.js";
 
@@ -88,7 +88,7 @@ export type IChainEvents = ApiEvents & {
 
   [ChainEvent.updateTargetCustodyGroupCount]: (targetGroupCount: number) => void;
 
-  [ChainEvent.publishDataColumns]: (sidecars: fulu.DataColumnSidecar[]) => void;
+  [ChainEvent.publishDataColumns]: (sidecars: DataColumnSidecar[]) => void;
 
   [ChainEvent.publishBlobSidecars]: (sidecars: deneb.BlobSidecar[]) => void;
 

package/src/chain/lightClient/index.ts

@@ -355,7 +355,10 @@ export class LightClientServer {
     // Signature data
     const update = await this.db.bestLightClientUpdate.get(period);
     if (!update) {
-      throw Error(`No partialUpdate available for period ${period}`);
+      throw new LightClientServerError(
+        {code: LightClientServerErrorCode.RESOURCE_UNAVAILABLE},
+        `No partialUpdate available for period ${period}`
+      );
     }
     return update;
   }

package/src/chain/options.ts

@@ -27,6 +27,7 @@ export type IChainOptions = BlockProcessOpts &
     blsVerifyAllMainThread?: boolean;
     blsVerifyAllMultiThread?: boolean;
     blacklistedBlocks?: string[];
+    // TODO GLOAS: add similar option for execution payload envelopes?
     persistProducedBlocks?: boolean;
     persistInvalidSszObjects?: boolean;
     persistInvalidSszObjectsDir?: string;

package/src/chain/prepareNextSlot.ts

@@ -1,14 +1,14 @@
 import {routes} from "@lodestar/api";
 import {ChainForkConfig} from "@lodestar/config";
 import {getSafeExecutionBlockHash} from "@lodestar/fork-choice";
-import {ForkPostBellatrix, ForkSeq, SLOTS_PER_EPOCH} from "@lodestar/params";
+import {ForkPostBellatrix, ForkSeq, SLOTS_PER_EPOCH, isForkPostBellatrix} from "@lodestar/params";
 import {
   CachedBeaconStateAllForks,
   CachedBeaconStateExecutions,
+  CachedBeaconStateGloas,
   StateHashTreeRootSource,
   computeEpochAtSlot,
   computeTimeAtSlot,
-  isExecutionStateType,
 } from "@lodestar/state-transition";
 import {Slot} from "@lodestar/types";
 import {Logger, fromHex, isErrorAborted, sleep} from "@lodestar/utils";
@@ -120,10 +120,10 @@ export class PrepareNextSlotScheduler {
         RegenCaller.precomputeEpoch
       );
 
-      if (isExecutionStateType(prepareState)) {
+      if (isForkPostBellatrix(fork)) {
         const proposerIndex = prepareState.epochCtx.getBeaconProposer(prepareSlot);
         const feeRecipient = this.chain.beaconProposerCache.get(proposerIndex);
-        let updatedPrepareState = prepareState;
+        let updatedPrepareState = prepareState as CachedBeaconStateExecutions | CachedBeaconStateGloas;
         let updatedHeadRoot = headRoot;
 
         if (feeRecipient) {
@@ -146,7 +146,7 @@ export class PrepareNextSlotScheduler {
               // only transfer cache if epoch transition because that's the state we will use to stateTransition() the 1st block of epoch
               {dontTransferCache: !isEpochTransition},
               RegenCaller.predictProposerHead
-            )) as CachedBeaconStateExecutions;
+            )) as CachedBeaconStateExecutions | CachedBeaconStateGloas;
             updatedHeadRoot = proposerHeadRoot;
           }