@lodestar/state-transition 1.48.0-dev.0dbea0de1b → 1.48.0-dev.24040c7f67

package/package.json

@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/ChainSafe/lodestar/issues"
   },
-  "version": "1.48.0-dev.0dbea0de1b",
+  "version": "1.48.0-dev.24040c7f67",
   "type": "module",
   "exports": {
     ".": {
@@ -68,16 +68,16 @@
     "@chainsafe/as-sha256": "^1.2.5",
     "@chainsafe/lodestar-z": "catalog:",
     "@chainsafe/persistent-merkle-tree": "^1.3.1",
-    "@chainsafe/ssz": "^1.6.3",
+    "@chainsafe/ssz": "^1.7.0",
     "@chainsafe/swap-or-not-shuffle": "^1.2.1",
-    "@lodestar/config": "^1.48.0-dev.0dbea0de1b",
-    "@lodestar/params": "^1.48.0-dev.0dbea0de1b",
-    "@lodestar/types": "^1.48.0-dev.0dbea0de1b",
-    "@lodestar/utils": "^1.48.0-dev.0dbea0de1b",
+    "@lodestar/config": "^1.48.0-dev.24040c7f67",
+    "@lodestar/params": "^1.48.0-dev.24040c7f67",
+    "@lodestar/types": "^1.48.0-dev.24040c7f67",
+    "@lodestar/utils": "^1.48.0-dev.24040c7f67",
     "@vekexasia/bigint-buffer2": "^1.1.1"
   },
   "devDependencies": {
-    "@lodestar/api": "^1.48.0-dev.0dbea0de1b"
+    "@lodestar/api": "^1.48.0-dev.24040c7f67"
   },
   "keywords": [
     "ethereum",
@@ -85,5 +85,5 @@
     "beacon",
     "blockchain"
   ],
-  "gitHead": "865965f50b18da8a70d0fe3f00c2c6b0f1058aba"
+  "gitHead": "6ceccbe902ccb43b8d4e12f69e56cbb095b815e8"
 }

package/src/block/index.ts

@@ -20,7 +20,7 @@ import {processPayloadAttestation} from "./processPayloadAttestation.js";
 import {processRandao} from "./processRandao.js";
 import {processSyncAggregate} from "./processSyncCommittee.js";
 import {processWithdrawals} from "./processWithdrawals.js";
-import {ProcessBlockOpts, ProposerRewardType} from "./types.js";
+import {BlockProcessStep, ProcessBlockOpts, ProposerRewardType} from "./types.js";
 
 // Spec tests
 export {
@@ -53,24 +53,38 @@ export function processBlock(
 ): void {
   const {verifySignatures = true} = opts ?? {};
 
+  // Capture the parent block's slot before processBlockHeader overwrites latestBlockHeader
+  const parentSlot: Slot | null =
+    fork >= ForkSeq.gloas ? (state as CachedBeaconStateGloas).latestBlockHeader.slot : null;
+
   // Apply the parent's deferred payload effects before everything else. Must run before
   // processBlockHeader and processExecutionPayloadBid so subsequent steps see the updated state.
   if (fork >= ForkSeq.gloas) {
+    const timer = metrics?.processBlockStepTime.startTimer({step: BlockProcessStep.processParentExecutionPayload});
     processParentExecutionPayload(state as CachedBeaconStateGloas, block as BeaconBlock<ForkPostGloas>);
+    timer?.();
   }
 
-  processBlockHeader(state, block);
+  {
+    const timer = metrics?.processBlockStepTime.startTimer({step: BlockProcessStep.processBlockHeader});
+    processBlockHeader(state, block);
+    timer?.();
+  }
 
-  if (fork >= ForkSeq.gloas) {
-    // Parent payload's execution requests were already applied by processParentExecutionPayload above
-    processWithdrawals(fork, state as CachedBeaconStateGloas);
-  } else if (fork >= ForkSeq.capella) {
-    const fullOrBlindedPayload = getFullOrBlindedPayload(block);
-    processWithdrawals(
-      fork,
-      state as CachedBeaconStateCapella,
-      fullOrBlindedPayload as capella.FullOrBlindedExecutionPayload
-    );
+  if (fork >= ForkSeq.capella) {
+    const timer = metrics?.processBlockStepTime.startTimer({step: BlockProcessStep.processWithdrawals});
+    if (fork >= ForkSeq.gloas) {
+      // Parent payload's execution requests were already applied by processParentExecutionPayload above
+      processWithdrawals(fork, state as CachedBeaconStateGloas);
+    } else {
+      const fullOrBlindedPayload = getFullOrBlindedPayload(block);
+      processWithdrawals(
+        fork,
+        state as CachedBeaconStateCapella,
+        fullOrBlindedPayload as capella.FullOrBlindedExecutionPayload
+      );
+    }
+    timer?.();
   }
 
   // The call to the process_execution_payload must happen before the call to the process_randao as the former depends
@@ -83,26 +97,48 @@ export function processBlock(
     fork >= ForkSeq.bellatrix &&
     isExecutionEnabled(state as CachedBeaconStateBellatrix, block)
   ) {
+    const timer = metrics?.processBlockStepTime.startTimer({step: BlockProcessStep.processExecutionPayload});
     processExecutionPayload(fork, state as CachedBeaconStateBellatrix, block.body, externalData);
+    timer?.();
   }
 
-  let parentSlot: Slot | null = null;
   if (fork >= ForkSeq.gloas) {
-    parentSlot = processExecutionPayloadBid(
+    const timer = metrics?.processBlockStepTime.startTimer({step: BlockProcessStep.processExecutionPayloadBid});
+    processExecutionPayloadBid(
       state as CachedBeaconStateGloas,
       (block as BeaconBlock<ForkPostGloas>).body.signedExecutionPayloadBid
     );
+    timer?.();
+  }
+
+  {
+    const timer = metrics?.processBlockStepTime.startTimer({step: BlockProcessStep.processRandao});
+    processRandao(state, block, verifySignatures);
+    timer?.();
+  }
+
+  {
+    const timer = metrics?.processBlockStepTime.startTimer({step: BlockProcessStep.processEth1Data});
+    processEth1Data(state, block.body.eth1Data);
+    timer?.();
+  }
+
+  {
+    const timer = metrics?.processBlockStepTime.startTimer({step: BlockProcessStep.processOperations});
+    processOperations(fork, state, block.body, parentSlot, opts, metrics);
+    timer?.();
   }
 
-  processRandao(state, block, verifySignatures);
-  processEth1Data(state, block.body.eth1Data);
-  processOperations(fork, state, block.body, parentSlot, opts, metrics);
   if (fork >= ForkSeq.altair) {
+    const timer = metrics?.processBlockStepTime.startTimer({step: BlockProcessStep.processSyncAggregate});
     processSyncAggregate(state, block as altair.BeaconBlock, verifySignatures);
+    timer?.();
   }
 
   if (fork >= ForkSeq.deneb) {
+    const timer = metrics?.processBlockStepTime.startTimer({step: BlockProcessStep.processBlobKzgCommitments});
     processBlobKzgCommitments(externalData);
+    timer?.();
     // Only throw PreData so beacon can also sync/process blocks optimistically
     // and let forkChoice handle it
     if (externalData.dataAvailabilityStatus === DataAvailabilityStatus.PreData) {

package/src/block/processExecutionPayloadBid.ts

@@ -5,7 +5,7 @@ import {
   PAYLOAD_BUILDER_VERSION,
   SLOTS_PER_EPOCH,
 } from "@lodestar/params";
-import {Slot, gloas, heze, ssz} from "@lodestar/types";
+import {gloas, heze, ssz} from "@lodestar/types";
 import {byteArrayEquals, toHex, toRootHex} from "@lodestar/utils";
 import {G2_POINT_AT_INFINITY} from "../constants/constants.js";
 import {getExecutionPayloadBidSigningRoot} from "../signatureSets/executionPayloadBid.js";
@@ -22,7 +22,7 @@ import {
 export function processExecutionPayloadBid(
   state: CachedBeaconStateGloas | CachedBeaconStateHeze,
   signedBid: gloas.SignedExecutionPayloadBid
-): Slot {
+): void {
   const bid = signedBid.message;
   const {builderIndex, value: amount} = bid;
 
@@ -76,6 +76,10 @@ export function processExecutionPayloadBid(
     );
   }
 
+  if (byteArrayEquals(bid.blockHash, bid.parentBlockHash)) {
+    throw Error(`Block hash ${toRootHex(bid.blockHash)} of bid must not equal its parent block hash`);
+  }
+
   const parentBlockRoot = getBlockRootAtSlot(state, state.slot - 1);
   if (!byteArrayEquals(bid.parentBlockRoot, parentBlockRoot)) {
     throw Error(
@@ -110,14 +114,11 @@ export function processExecutionPayloadBid(
     state.builderPendingPayments.set(SLOTS_PER_EPOCH + (bid.slot % SLOTS_PER_EPOCH), pendingPaymentView);
   }
 
-  const parentSlot = state.latestExecutionPayloadBid.slot;
   if (state.config.getForkSeq(state.slot) >= ForkSeq.heze) {
     state.latestExecutionPayloadBid = ssz.heze.ExecutionPayloadBid.toViewDU(bid as heze.ExecutionPayloadBid);
   } else {
     state.latestExecutionPayloadBid = ssz.gloas.ExecutionPayloadBid.toViewDU(bid);
   }
-
-  return parentSlot;
 }
 
 function verifyExecutionPayloadBidSignature(

package/src/block/processOperations.ts

@@ -1,12 +1,4 @@
-import {
-  ForkSeq,
-  MAX_ATTESTATIONS_ELECTRA,
-  MAX_ATTESTER_SLASHINGS_ELECTRA,
-  MAX_BLS_TO_EXECUTION_CHANGES,
-  MAX_PAYLOAD_ATTESTATIONS,
-  MAX_PROPOSER_SLASHINGS,
-  MAX_VOLUNTARY_EXITS,
-} from "@lodestar/params";
+import {ForkSeq} from "@lodestar/params";
 import {BeaconBlockBody, Slot, capella, electra, gloas} from "@lodestar/types";
 import {BeaconStateTransitionMetrics} from "../metrics.js";
 import {
@@ -26,7 +18,7 @@ import {processPayloadAttestation} from "./processPayloadAttestation.js";
 import {processProposerSlashing} from "./processProposerSlashing.js";
 import {processVoluntaryExit} from "./processVoluntaryExit.js";
 import {processWithdrawalRequest} from "./processWithdrawalRequest.js";
-import {ProcessBlockOpts} from "./types.js";
+import {ProcessBlockOpts, ProcessOperationsStep} from "./types.js";
 
 export {
   processProposerSlashing,
@@ -48,10 +40,6 @@ export function processOperations(
   opts: ProcessBlockOpts = {verifySignatures: true},
   metrics?: BeaconStateTransitionMetrics | null
 ): void {
-  if (fork >= ForkSeq.gloas) {
-    assertGloasOperationLimits(body as gloas.BeaconBlockBody);
-  }
-
   // verify that outstanding deposits are processed up to the maximum number of deposits.
   // From Fulu the eth1 bridge deposit mechanism was removed, so blocks must not contain any deposits.
   const maxDeposits = fork >= ForkSeq.fulu ? 0 : getEth1DepositCount(state);
@@ -61,64 +49,94 @@ export function processOperations(
     );
   }
 
-  for (const proposerSlashing of body.proposerSlashings) {
-    processProposerSlashing(fork, state, proposerSlashing, opts.verifySignatures);
+  {
+    const timer = metrics?.processOperationsStepTime.startTimer({step: ProcessOperationsStep.processProposerSlashing});
+    for (const proposerSlashing of body.proposerSlashings) {
+      processProposerSlashing(fork, state, proposerSlashing, opts.verifySignatures);
+    }
+    timer?.();
   }
-  for (const attesterSlashing of body.attesterSlashings) {
-    processAttesterSlashing(fork, state, attesterSlashing, opts.verifySignatures);
+
+  {
+    const timer = metrics?.processOperationsStepTime.startTimer({step: ProcessOperationsStep.processAttesterSlashing});
+    for (const attesterSlashing of body.attesterSlashings) {
+      processAttesterSlashing(fork, state, attesterSlashing, opts.verifySignatures);
+    }
+    timer?.();
   }
 
-  processAttestations(fork, state, body.attestations, parentSlot, opts.verifySignatures, metrics);
+  {
+    const timer = metrics?.processOperationsStepTime.startTimer({step: ProcessOperationsStep.processAttestations});
+    processAttestations(fork, state, body.attestations, parentSlot, opts.verifySignatures, metrics);
+    timer?.();
+  }
 
-  for (const deposit of body.deposits) {
-    processDeposit(fork, state, deposit);
+  {
+    const timer = metrics?.processOperationsStepTime.startTimer({step: ProcessOperationsStep.processDeposit});
+    for (const deposit of body.deposits) {
+      processDeposit(fork, state, deposit);
+    }
+    timer?.();
   }
 
-  for (const voluntaryExit of body.voluntaryExits) {
-    processVoluntaryExit(fork, state, voluntaryExit, opts.verifySignatures);
+  {
+    const timer = metrics?.processOperationsStepTime.startTimer({step: ProcessOperationsStep.processVoluntaryExit});
+    for (const voluntaryExit of body.voluntaryExits) {
+      processVoluntaryExit(fork, state, voluntaryExit, opts.verifySignatures);
+    }
+    timer?.();
   }
 
   if (fork >= ForkSeq.capella) {
+    const timer = metrics?.processOperationsStepTime.startTimer({
+      step: ProcessOperationsStep.processBlsToExecutionChange,
+    });
     for (const blsToExecutionChange of (body as capella.BeaconBlockBody).blsToExecutionChanges) {
       processBlsToExecutionChange(state as CachedBeaconStateCapella, blsToExecutionChange);
     }
+    timer?.();
   }
 
   if (fork >= ForkSeq.electra && fork < ForkSeq.gloas) {
     const stateElectra = state as CachedBeaconStateElectra;
     const bodyElectra = body as electra.BeaconBlockBody;
 
-    for (const depositRequest of bodyElectra.executionRequests.deposits) {
-      processDepositRequest(fork, stateElectra, depositRequest);
+    {
+      const timer = metrics?.processOperationsStepTime.startTimer({step: ProcessOperationsStep.processDepositRequest});
+      for (const depositRequest of bodyElectra.executionRequests.deposits) {
+        processDepositRequest(fork, stateElectra, depositRequest);
+      }
+      timer?.();
     }
 
-    for (const elWithdrawalRequest of bodyElectra.executionRequests.withdrawals) {
-      processWithdrawalRequest(fork, stateElectra, elWithdrawalRequest);
+    {
+      const timer = metrics?.processOperationsStepTime.startTimer({
+        step: ProcessOperationsStep.processWithdrawalRequest,
+      });
+      for (const elWithdrawalRequest of bodyElectra.executionRequests.withdrawals) {
+        processWithdrawalRequest(fork, stateElectra, elWithdrawalRequest);
+      }
+      timer?.();
     }
 
-    for (const elConsolidationRequest of bodyElectra.executionRequests.consolidations) {
-      processConsolidationRequest(stateElectra, elConsolidationRequest);
+    {
+      const timer = metrics?.processOperationsStepTime.startTimer({
+        step: ProcessOperationsStep.processConsolidationRequest,
+      });
+      for (const elConsolidationRequest of bodyElectra.executionRequests.consolidations) {
+        processConsolidationRequest(stateElectra, elConsolidationRequest);
+      }
+      timer?.();
     }
   }
 
   if (fork >= ForkSeq.gloas) {
+    const timer = metrics?.processOperationsStepTime.startTimer({
+      step: ProcessOperationsStep.processPayloadAttestation,
+    });
     for (const payloadAttestation of (body as gloas.BeaconBlockBody).payloadAttestations) {
-      processPayloadAttestation(state as CachedBeaconStateGloas, payloadAttestation);
+      processPayloadAttestation(state as CachedBeaconStateGloas, payloadAttestation, opts.verifySignatures);
     }
-  }
-}
-
-function assertGloasOperationLimits(body: gloas.BeaconBlockBody): void {
-  assertMaxLength("proposerSlashings", body.proposerSlashings.length, MAX_PROPOSER_SLASHINGS);
-  assertMaxLength("attesterSlashings", body.attesterSlashings.length, MAX_ATTESTER_SLASHINGS_ELECTRA);
-  assertMaxLength("attestations", body.attestations.length, MAX_ATTESTATIONS_ELECTRA);
-  assertMaxLength("voluntaryExits", body.voluntaryExits.length, MAX_VOLUNTARY_EXITS);
-  assertMaxLength("blsToExecutionChanges", body.blsToExecutionChanges.length, MAX_BLS_TO_EXECUTION_CHANGES);
-  assertMaxLength("payloadAttestations", body.payloadAttestations.length, MAX_PAYLOAD_ATTESTATIONS);
-}
-
-function assertMaxLength(name: string, length: number, limit: number): void {
-  if (length > limit) {
-    throw new Error(`Block contains too many ${name}: count=${length} limit=${limit}`);
+    timer?.();
   }
 }

package/src/block/processParentExecutionPayload.ts

@@ -1,12 +1,4 @@
-import {
-  ForkPostGloas,
-  MAX_BUILDER_DEPOSIT_REQUESTS_PER_PAYLOAD,
-  MAX_BUILDER_EXIT_REQUESTS_PER_PAYLOAD,
-  MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD,
-  MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD,
-  SLOTS_PER_EPOCH,
-  SLOTS_PER_HISTORICAL_ROOT,
-} from "@lodestar/params";
+import {ForkPostGloas, SLOTS_PER_EPOCH, SLOTS_PER_HISTORICAL_ROOT} from "@lodestar/params";
 import {BeaconBlock, gloas, ssz} from "@lodestar/types";
 import {byteArrayEquals, toRootHex} from "@lodestar/utils";
 import {CachedBeaconStateGloas} from "../types.js";
@@ -55,11 +47,9 @@ export function processParentExecutionPayload(state: CachedBeaconStateGloas, blo
  * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.6/specs/gloas/beacon-chain.md#new-apply_parent_execution_payload
  */
 export function applyParentExecutionPayload(state: CachedBeaconStateGloas, requests: gloas.ExecutionRequests): void {
-  assertExecutionRequestsWithinLimits(requests);
-
   const fork = state.config.getForkSeq(state.slot);
   const parentBid = state.latestExecutionPayloadBid;
-  const parentSlot = parentBid.slot;
+  const parentSlot = state.latestBlockHeader.slot;
   const parentEpoch = computeEpochAtSlot(parentSlot);
   const currentEpoch = computeEpochAtSlot(state.slot);
 
@@ -126,21 +116,6 @@ function settleBuilderPayment(state: CachedBeaconStateGloas, paymentIndex: numbe
   state.builderPendingPayments.set(paymentIndex, ssz.gloas.BuilderPendingPayment.defaultViewDU());
 }
 
-function assertExecutionRequestsWithinLimits(requests: gloas.ExecutionRequests): void {
-  assertMaxLength("withdrawals", requests.withdrawals.length, MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD);
-  assertMaxLength("consolidations", requests.consolidations.length, MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD);
-  // New in GLOAS:EIP8282
-  assertMaxLength("builderDeposits", requests.builderDeposits.length, MAX_BUILDER_DEPOSIT_REQUESTS_PER_PAYLOAD);
-  // New in GLOAS:EIP8282
-  assertMaxLength("builderExits", requests.builderExits.length, MAX_BUILDER_EXIT_REQUESTS_PER_PAYLOAD);
-}
-
-function assertMaxLength(name: string, length: number, limit: number): void {
-  if (length > limit) {
-    throw new Error(`Too many parent execution request ${name} count=${length} limit=${limit}`);
-  }
-}
-
 function assertEmptyExecutionRequests(requests: gloas.ExecutionRequests): void {
   if (
     requests.deposits.length !== 0 ||

package/src/block/processPayloadAttestation.ts

@@ -5,7 +5,8 @@ import {isValidIndexedPayloadAttestation} from "./isValidIndexedPayloadAttestati
 
 export function processPayloadAttestation(
   state: CachedBeaconStateGloas,
-  payloadAttestation: gloas.PayloadAttestation
+  payloadAttestation: gloas.PayloadAttestation,
+  verifySignature = true
 ): void {
   const data = payloadAttestation.data;
 
@@ -19,7 +20,7 @@ export function processPayloadAttestation(
 
   const indexedPayloadAttestation = state.epochCtx.getIndexedPayloadAttestation(data.slot, payloadAttestation);
 
-  if (!isValidIndexedPayloadAttestation(state, indexedPayloadAttestation, true)) {
+  if (!isValidIndexedPayloadAttestation(state, indexedPayloadAttestation, verifySignature)) {
     throw Error("Invalid payload attestation");
   }
 }

package/src/block/types.ts

@@ -7,3 +7,35 @@ export enum ProposerRewardType {
   syncAggregate = "sync_aggregate",
   slashing = "slashing",
 }
+
+/**
+ * Steps of `processBlock()` tracked in metrics
+ */
+export enum BlockProcessStep {
+  processParentExecutionPayload = "processParentExecutionPayload",
+  processBlockHeader = "processBlockHeader",
+  processWithdrawals = "processWithdrawals",
+  processExecutionPayload = "processExecutionPayload",
+  processExecutionPayloadBid = "processExecutionPayloadBid",
+  processRandao = "processRandao",
+  processEth1Data = "processEth1Data",
+  processOperations = "processOperations",
+  processSyncAggregate = "processSyncAggregate",
+  processBlobKzgCommitments = "processBlobKzgCommitments",
+}
+
+/**
+ * Steps of `processOperations()` tracked in metrics
+ */
+export enum ProcessOperationsStep {
+  processProposerSlashing = "processProposerSlashing",
+  processAttesterSlashing = "processAttesterSlashing",
+  processAttestations = "processAttestations",
+  processDeposit = "processDeposit",
+  processVoluntaryExit = "processVoluntaryExit",
+  processBlsToExecutionChange = "processBlsToExecutionChange",
+  processDepositRequest = "processDepositRequest",
+  processWithdrawalRequest = "processWithdrawalRequest",
+  processConsolidationRequest = "processConsolidationRequest",
+  processPayloadAttestation = "processPayloadAttestation",
+}

package/src/epoch/processInactivityUpdates.ts

@@ -37,6 +37,7 @@ export function processInactivityUpdates(state: CachedBeaconStateAltair, cache:
 
   inactivityScoresArr.length = state.validators.length;
   inactivityScores.getAll(inactivityScoresArr);
+  let shouldSetInactivityScores = false;
 
   for (let i = 0; i < flags.length; i++) {
     const flag = flags[i];
@@ -53,8 +54,14 @@ export function processInactivityUpdates(state: CachedBeaconStateAltair, cache:
         inactivityScore -= Math.min(INACTIVITY_SCORE_RECOVERY_RATE, inactivityScore);
       }
       if (inactivityScore !== prevInactivityScore) {
-        inactivityScores.set(i, inactivityScore);
+        inactivityScoresArr[i] = inactivityScore;
+        shouldSetInactivityScores = true;
       }
     }
   }
+
+  if (shouldSetInactivityScores) {
+    // Rebuilding the full view is slightly slower than individual sets only when very few scores change.
+    state.inactivityScores = state.type.fields.inactivityScores.toViewDU(inactivityScoresArr);
+  }
 }

package/src/epoch/processPtcWindow.ts

@@ -1,4 +1,4 @@
-import {MIN_SEED_LOOKAHEAD} from "@lodestar/params";
+import {MIN_SEED_LOOKAHEAD, SLOTS_PER_EPOCH} from "@lodestar/params";
 import {ssz} from "@lodestar/types";
 import {CachedBeaconStateGloas, EpochTransitionCache} from "../types.js";
 import {computeEpochShuffling} from "../util/epochShuffling.js";
@@ -22,17 +22,24 @@ export function processPtcWindow(state: CachedBeaconStateGloas, cache: EpochTran
     state,
     nextEpoch,
     nextEpochShuffling.committees,
+    nextEpochShuffling.shuffling,
     state.epochCtx.effectiveBalanceIncrements
   );
 
   // Stash for finalProcessEpoch to shift into epoch cache
   cache.nextEpochPayloadTimelinessCommittees = newNextPayloadTimelinessCommittees;
 
-  // Write shifted window to state: current(N) + next(N+1) + newlyComputed(N+2)
-  // From the perspective of upcoming epoch N+1, this is previous + current + next
-  state.ptcWindow = ssz.gloas.PtcWindow.toViewDU([
-    ...state.epochCtx.payloadTimelinessCommittees,
-    ...state.epochCtx.nextPayloadTimelinessCommittees,
-    ...newNextPayloadTimelinessCommittees,
-  ]);
+  // Shift the current and next epochs forward by reusing their SSZ subtrees and cached hashes.
+  // Only the newly computed epoch needs new subtrees.
+  const ptcWindow = state.ptcWindow;
+  const retainedLength = ptcWindow.length - SLOTS_PER_EPOCH;
+  for (let i = 0; i < retainedLength; i++) {
+    ptcWindow.set(i, ptcWindow.getReadonly(i + SLOTS_PER_EPOCH));
+  }
+  for (let i = 0; i < SLOTS_PER_EPOCH; i++) {
+    ptcWindow.set(
+      retainedLength + i,
+      ssz.gloas.PayloadTimelinessCommittee.toViewDU(newNextPayloadTimelinessCommittees[i])
+    );
+  }
 }

package/src/index.ts

@@ -13,7 +13,7 @@ export {
 } from "./block/processVoluntaryExit.js";
 // Withdrawals for new blocks
 export {getExpectedWithdrawals} from "./block/processWithdrawals.js";
-export {ProposerRewardType} from "./block/types.js";
+export {BlockProcessStep, ProcessOperationsStep, ProposerRewardType} from "./block/types.js";
 export {
   type EffectiveBalanceIncrements,
   getEffectiveBalanceIncrementsWithLen,

package/src/lightClient/spec/index.ts

@@ -32,7 +32,7 @@ export {
   type SyncCommitteeFast,
 } from "./store.js";
 export {
-  getLcExecutionRoot,
+  getLightClientExecutionRoot,
   getSafetyThreshold,
   isFinalityUpdate,
   isSyncCommitteeUpdate,

package/src/lightClient/spec/utils.ts

@@ -207,9 +207,9 @@ function getGindexIndex(gindex: number): number {
  * Gloas headers removed `execution` so Pre-Gloas headers upgraded to the Gloas format
  * require reconstruction of the original execution payload header root.
  *
- * Spec: https://github.com/ethereum/consensus-specs/blob/e762dd6e2c45ee05648b5787e7d261279aec226a/specs/gloas/light-client/sync-protocol.md#modified-get_lc_execution_root
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.14/specs/gloas/light-client/sync-protocol.md#modified-get_lc_execution_root
  */
-export function getLcExecutionRoot(config: ChainForkConfig, header: LightClientHeader): Uint8Array {
+export function getLightClientExecutionRoot(config: ChainForkConfig, header: LightClientHeader): Uint8Array {
   const epoch = computeEpochAtSlot(header.beacon.slot);
 
   if (!isGloasLightClientHeader(header)) {

package/src/metrics.ts

@@ -1,6 +1,6 @@
 import {ForkName} from "@lodestar/params";
 import {MetricsRegister} from "@lodestar/utils";
-import {ProposerRewardType} from "./block/types.js";
+import {BlockProcessStep, ProcessOperationsStep, ProposerRewardType} from "./block/types.js";
 import {EpochTransitionStep} from "./epoch/index.js";
 import {StateCloneSource, StateHashTreeRootSource} from "./stateTransition.js";
 import {CachedBeaconStateAllForks} from "./types.js";
@@ -57,10 +57,21 @@ export function getMetrics(register: MetricsRegister) {
     processBlockTime: register.histogram({
       name: "lodestar_stfn_process_block_seconds",
       help: "Time to process a single block in seconds",
-      // TODO: Add metrics for each step
       // Block processing can take 5-40ms, 100ms max
       buckets: [0.005, 0.01, 0.02, 0.05, 0.1, 1],
     }),
+    processBlockStepTime: register.histogram<{step: BlockProcessStep}>({
+      name: "lodestar_stfn_process_block_step_seconds",
+      help: "Time to call each step of process block in seconds",
+      labelNames: ["step"],
+      buckets: [0.001, 0.005, 0.01, 0.025, 0.05, 0.1],
+    }),
+    processOperationsStepTime: register.histogram<{step: ProcessOperationsStep}>({
+      name: "lodestar_stfn_process_operations_step_seconds",
+      help: "Time to call each step of process operations in seconds",
+      labelNames: ["step"],
+      buckets: [0.001, 0.005, 0.01, 0.025, 0.05, 0.1],
+    }),
     processBlockCommitTime: register.histogram({
       name: "lodestar_stfn_process_block_commit_seconds",
       help: "Time to call commit after process a single block in seconds",

package/src/rewards/blockRewards.ts

@@ -42,9 +42,7 @@ export async function computeBlockRewards(
   let syncAggregateReward = cachedSyncAggregateReward;
 
   if (blockAttestationReward === 0) {
-    const parentSlot = isForkPostGloas(fork)
-      ? (preState as CachedBeaconStateGloas).latestExecutionPayloadBid.slot
-      : null;
+    const parentSlot = isForkPostGloas(fork) ? (preState as CachedBeaconStateGloas).latestBlockHeader.slot : null;
     blockAttestationReward =
       fork === ForkName.phase0
         ? computeBlockAttestationRewardPhase0(block as phase0.BeaconBlock, preState as CachedBeaconStatePhase0)

package/src/signatureSets/index.ts

@@ -1,13 +1,14 @@
 import {BeaconConfig} from "@lodestar/config";
 import {ForkSeq} from "@lodestar/params";
-import {IndexedAttestation, SignedBeaconBlock, altair, capella} from "@lodestar/types";
+import {IndexedAttestation, SignedBeaconBlock, altair, capella, gloas} from "@lodestar/types";
 import {getSyncCommitteeSignatureSet} from "../block/processSyncCommittee.js";
 import {SyncCommitteeCache} from "../cache/syncCommitteeCache.js";
-import {IBeaconStateView} from "../stateView/interface.js";
-import {ISignatureSet} from "../util/index.js";
+import {IBeaconStateView, IBeaconStateViewGloas} from "../stateView/interface.js";
+import {ISignatureSet, createAggregateSignatureSetFromComponents} from "../util/index.js";
 import {getAttesterSlashingsSignatureSets} from "./attesterSlashings.js";
 import {getBlsToExecutionChangeSignatureSets} from "./blsToExecutionChange.js";
 import {getAttestationsSignatureSets} from "./indexedAttestation.js";
+import {getPayloadAttestationDataSigningRoot} from "./indexedPayloadAttestation.js";
 import {getBlockProposerSignatureSet} from "./proposer.js";
 import {getProposerSlashingsSignatureSets} from "./proposerSlashings.js";
 import {getRandaoRevealSignatureSet} from "./randao.js";
@@ -79,5 +80,18 @@ export function getBlockSignatureSets(
     }
   }
 
+  if (fork >= ForkSeq.gloas) {
+    for (const payloadAttestation of (signedBlock as gloas.SignedBeaconBlock).message.body.payloadAttestations) {
+      const ptc = (state as IBeaconStateViewGloas).getPayloadTimelinessCommittee(payloadAttestation.data.slot);
+      signatureSets.push(
+        createAggregateSignatureSetFromComponents(
+          payloadAttestation.aggregationBits.intersectValues(ptc),
+          getPayloadAttestationDataSigningRoot(config, payloadAttestation.data),
+          payloadAttestation.signature
+        )
+      );
+    }
+  }
+
   return signatureSets;
 }

package/src/slot/upgradeStateToGloas.ts

@@ -110,7 +110,7 @@ export function upgradeStateToGloas(
     ssz.gloas.PendingConsolidations
   );
   stateGloasView.proposerLookahead = stateGloasCloned.proposerLookahead;
-  stateGloasView.ptcWindow = ssz.gloas.PtcWindow.toViewDU(initializePtcWindow(stateFulu));
+  stateGloasView.ptcWindow = ssz.gloas.PayloadTimelinessCommitteeWindow.toViewDU(initializePtcWindow(stateFulu));
 
   for (let i = 0; i < SLOTS_PER_HISTORICAL_ROOT; i++) {
     stateGloasView.executionPayloadAvailability.set(i, true);