@lodestar/state-transition 1.40.0-dev.3be9500fa9 → 1.40.0-dev.45b04262dc

package/src/block/index.ts

@@ -38,6 +38,7 @@ export {
 export * from "./externalData.js";
 export * from "./initiateValidatorExit.js";
 export * from "./isValidIndexedAttestation.js";
+export * from "./processDepositRequest.js";
 export * from "./processOperations.js";
 
 export function processBlock(

package/src/block/isValidIndexedAttestation.ts

@@ -21,7 +21,7 @@ export function isValidIndexedAttestation(
   }
 
   if (verifySignature) {
-    return verifySignatureSet(getIndexedAttestationSignatureSet(config, index2pubkey, stateSlot, indexedAttestation));
+    return verifySignatureSet(getIndexedAttestationSignatureSet(config, stateSlot, indexedAttestation), index2pubkey);
   }
   return true;
 }
@@ -40,7 +40,8 @@ export function isValidIndexedAttestationBigint(
 
   if (verifySignature) {
     return verifySignatureSet(
-      getIndexedAttestationBigintSignatureSet(config, index2pubkey, stateSlot, indexedAttestation)
+      getIndexedAttestationBigintSignatureSet(config, stateSlot, indexedAttestation),
+      index2pubkey
     );
   }
   return true;

package/src/block/isValidIndexedPayloadAttestation.ts

@@ -16,7 +16,10 @@ export function isValidIndexedPayloadAttestation(
   }
 
   if (verifySignature) {
-    return verifySignatureSet(getIndexedPayloadAttestationSignatureSet(state, indexedPayloadAttestation));
+    return verifySignatureSet(
+      getIndexedPayloadAttestationSignatureSet(state, indexedPayloadAttestation),
+      state.epochCtx.index2pubkey
+    );
   }
 
   return true;

package/src/block/processAttestationsAltair.ts

@@ -1,4 +1,3 @@
-import {byteArrayEquals} from "@chainsafe/ssz";
 import {
   EFFECTIVE_BALANCE_INCREMENT,
   ForkSeq,
@@ -15,7 +14,7 @@ import {
   WEIGHT_DENOMINATOR,
 } from "@lodestar/params";
 import {Attestation, Epoch, phase0} from "@lodestar/types";
-import {intSqrt} from "@lodestar/utils";
+import {byteArrayEquals, intSqrt} from "@lodestar/utils";
 import {BeaconStateTransitionMetrics} from "../metrics.js";
 import {getAttestationWithIndicesSignatureSet} from "../signatureSets/indexedAttestation.js";
 import {CachedBeaconStateAltair, CachedBeaconStateGloas} from "../types.js";
@@ -64,14 +63,8 @@ export function processAttestationsAltair(
     // TODO: Why should we verify an indexed attestation that we just created? If it's just for the signature
     // we can verify only that and nothing else.
     if (verifySignature) {
-      const sigSet = getAttestationWithIndicesSignatureSet(
-        state.config,
-        epochCtx.index2pubkey,
-        state.slot,
-        attestation,
-        attestingIndices
-      );
-      if (!verifySignatureSet(sigSet)) {
+      const sigSet = getAttestationWithIndicesSignatureSet(state.config, state.slot, attestation, attestingIndices);
+      if (!verifySignatureSet(sigSet, state.epochCtx.index2pubkey)) {
         throw new Error("Attestation signature is not valid");
       }
     }

package/src/block/processBlockHeader.ts

@@ -1,6 +1,5 @@
-import {byteArrayEquals} from "@chainsafe/ssz";
 import {BeaconBlock, BlindedBeaconBlock, ssz} from "@lodestar/types";
-import {toRootHex} from "@lodestar/utils";
+import {byteArrayEquals, toRootHex} from "@lodestar/utils";
 import {ZERO_HASH} from "../constants/index.js";
 import {CachedBeaconStateAllForks} from "../types.js";
 import {blindedOrFullBlockToHeader} from "../util/index.js";

package/src/block/processBlsToExecutionChange.ts

@@ -1,10 +1,9 @@
 import {digest} from "@chainsafe/as-sha256";
-import {byteArrayEquals} from "@chainsafe/ssz";
 import {BeaconConfig} from "@lodestar/config";
 import {BLS_WITHDRAWAL_PREFIX, ETH1_ADDRESS_WITHDRAWAL_PREFIX} from "@lodestar/params";
 import {capella} from "@lodestar/types";
 import {Validator} from "@lodestar/types/phase0";
-import {toHex} from "@lodestar/utils";
+import {byteArrayEquals, toHex} from "@lodestar/utils";
 import {verifyBlsToExecutionChangeSignature} from "../signatureSets/index.js";
 import {CachedBeaconStateCapella} from "../types.js";
 

package/src/block/processConsolidationRequest.ts

@@ -1,5 +1,6 @@
-import {FAR_FUTURE_EPOCH, ForkSeq, MIN_ACTIVATION_BALANCE, PENDING_CONSOLIDATIONS_LIMIT} from "@lodestar/params";
+import {FAR_FUTURE_EPOCH, MIN_ACTIVATION_BALANCE, PENDING_CONSOLIDATIONS_LIMIT} from "@lodestar/params";
 import {electra, ssz} from "@lodestar/types";
+import {byteArrayEquals} from "@lodestar/utils";
 import {CachedBeaconStateElectra, CachedBeaconStateGloas} from "../types.js";
 import {hasEth1WithdrawalCredential} from "../util/capella.js";
 import {
@@ -13,7 +14,6 @@ import {getConsolidationChurnLimit, getPendingBalanceToWithdraw, isActiveValidat
 
 // TODO Electra: Clean up necessary as there is a lot of overlap with isValidSwitchToCompoundRequest
 export function processConsolidationRequest(
-  fork: ForkSeq,
   state: CachedBeaconStateElectra | CachedBeaconStateGloas,
   consolidationRequest: electra.ConsolidationRequest
 ): void {
@@ -57,7 +57,7 @@ export function processConsolidationRequest(
 
   // Verify source withdrawal credentials
   const hasCorrectCredential = hasExecutionWithdrawalCredential(sourceValidator.withdrawalCredentials);
-  const isCorrectSourceAddress = Buffer.compare(sourceWithdrawalAddress, sourceAddress) === 0;
+  const isCorrectSourceAddress = byteArrayEquals(sourceWithdrawalAddress, sourceAddress);
   if (!(hasCorrectCredential && isCorrectSourceAddress)) {
     return;
   }
@@ -83,7 +83,7 @@ export function processConsolidationRequest(
   }
 
   // Verify the source has no pending withdrawals in the queue
-  if (getPendingBalanceToWithdraw(fork, state, sourceIndex) > 0) {
+  if (getPendingBalanceToWithdraw(state, sourceIndex) > 0) {
     return;
   }
 
@@ -125,7 +125,7 @@ function isValidSwitchToCompoundRequest(
   const sourceValidator = state.validators.getReadonly(sourceIndex);
   const sourceWithdrawalAddress = sourceValidator.withdrawalCredentials.subarray(12);
   // Verify request has been authorized
-  if (Buffer.compare(sourceWithdrawalAddress, sourceAddress) !== 0) {
+  if (!byteArrayEquals(sourceWithdrawalAddress, sourceAddress)) {
     return false;
   }
 

package/src/block/processDepositRequest.ts

@@ -1,21 +1,114 @@
-import {UNSET_DEPOSIT_REQUESTS_START_INDEX} from "@lodestar/params";
-import {electra, ssz} from "@lodestar/types";
+import {FAR_FUTURE_EPOCH, ForkSeq, UNSET_DEPOSIT_REQUESTS_START_INDEX} from "@lodestar/params";
+import {BLSPubkey, Bytes32, UintNum64, electra, ssz} from "@lodestar/types";
 import {CachedBeaconStateElectra, CachedBeaconStateGloas} from "../types.js";
+import {findBuilderIndexByPubkey, isBuilderWithdrawalCredential} from "../util/gloas.js";
+import {computeEpochAtSlot, isValidatorKnown} from "../util/index.js";
+import {isValidDepositSignature} from "./processDeposit.js";
+
+/**
+ * Apply a deposit for a builder. Either increases balance for existing builder or adds new builder to registry.
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/beacon-chain.md#new-apply_deposit_for_builder
+ */
+export function applyDepositForBuilder(
+  state: CachedBeaconStateGloas,
+  pubkey: BLSPubkey,
+  withdrawalCredentials: Bytes32,
+  amount: UintNum64,
+  signature: Bytes32
+): void {
+  const builderIndex = findBuilderIndexByPubkey(state, pubkey);
+
+  if (builderIndex !== null) {
+    // Existing builder - increase balance
+    const builder = state.builders.get(builderIndex);
+    builder.balance += amount;
+  } else {
+    // New builder - verify signature and add to registry
+    if (isValidDepositSignature(state.config, pubkey, withdrawalCredentials, amount, signature)) {
+      addBuilderToRegistry(state, pubkey, withdrawalCredentials, amount);
+    }
+  }
+}
+
+/**
+ * Add a new builder to the builders registry.
+ * Reuses slots from exited and fully withdrawn builders if available.
+ */
+function addBuilderToRegistry(
+  state: CachedBeaconStateGloas,
+  pubkey: BLSPubkey,
+  withdrawalCredentials: Bytes32,
+  amount: UintNum64
+): void {
+  const currentEpoch = computeEpochAtSlot(state.slot);
+
+  // Try to find a reusable slot from an exited builder with zero balance
+  let builderIndex = state.builders.length;
+  for (let i = 0; i < state.builders.length; i++) {
+    const builder = state.builders.getReadonly(i);
+    if (builder.withdrawableEpoch <= currentEpoch && builder.balance === 0) {
+      builderIndex = i;
+      break;
+    }
+  }
+
+  // Create new builder
+  const newBuilder = ssz.gloas.Builder.toViewDU({
+    pubkey,
+    version: withdrawalCredentials[0],
+    executionAddress: withdrawalCredentials.subarray(12),
+    balance: amount,
+    depositEpoch: currentEpoch,
+    withdrawableEpoch: FAR_FUTURE_EPOCH,
+  });
+
+  if (builderIndex < state.builders.length) {
+    // Reuse existing slot
+    state.builders.set(builderIndex, newBuilder);
+  } else {
+    // Append to end
+    state.builders.push(newBuilder);
+  }
+}
 
 export function processDepositRequest(
+  fork: ForkSeq,
   state: CachedBeaconStateElectra | CachedBeaconStateGloas,
   depositRequest: electra.DepositRequest
 ): void {
-  if (state.depositRequestsStartIndex === UNSET_DEPOSIT_REQUESTS_START_INDEX) {
+  const {pubkey, withdrawalCredentials, amount, signature} = depositRequest;
+
+  // Check if this is a builder or validator deposit
+  if (fork >= ForkSeq.gloas) {
+    const stateGloas = state as CachedBeaconStateGloas;
+    const builderIndex = findBuilderIndexByPubkey(stateGloas, pubkey);
+    const validatorIndex = state.epochCtx.getValidatorIndex(pubkey);
+
+    // Regardless of the withdrawal credentials prefix, if a builder/validator
+    // already exists with this pubkey, apply the deposit to their balance
+    const isBuilder = builderIndex !== null;
+    const isValidator = isValidatorKnown(state, validatorIndex);
+    const isBuilderPrefix = isBuilderWithdrawalCredential(withdrawalCredentials);
+
+    // Route to builder if it's an existing builder OR has builder prefix and is not a validator
+    if (isBuilder || (isBuilderPrefix && !isValidator)) {
+      // Apply builder deposits immediately
+      applyDepositForBuilder(stateGloas, pubkey, withdrawalCredentials, amount, signature);
+      return;
+    }
+  }
+
+  // Only set deposit_requests_start_index in Electra fork, not Gloas
+  if (fork < ForkSeq.gloas && state.depositRequestsStartIndex === UNSET_DEPOSIT_REQUESTS_START_INDEX) {
     state.depositRequestsStartIndex = depositRequest.index;
   }
 
-  // Create pending deposit
+  // Add validator deposits to the queue
   const pendingDeposit = ssz.electra.PendingDeposit.toViewDU({
-    pubkey: depositRequest.pubkey,
-    withdrawalCredentials: depositRequest.withdrawalCredentials,
-    amount: depositRequest.amount,
-    signature: depositRequest.signature,
+    pubkey,
+    withdrawalCredentials,
+    amount,
+    signature,
     slot: state.slot,
   });
   state.pendingDeposits.push(pendingDeposit);

package/src/block/processExecutionPayload.ts

@@ -1,7 +1,6 @@
-import {byteArrayEquals} from "@chainsafe/ssz";
 import {ForkName, ForkSeq, isForkPostDeneb} from "@lodestar/params";
 import {BeaconBlockBody, BlindedBeaconBlockBody, deneb, isExecutionPayload} from "@lodestar/types";
-import {toHex, toRootHex} from "@lodestar/utils";
+import {byteArrayEquals, toHex, toRootHex} from "@lodestar/utils";
 import {CachedBeaconStateBellatrix, CachedBeaconStateCapella} from "../types.js";
 import {
   executionPayloadToPayloadHeader,

package/src/block/processExecutionPayloadBid.ts

@@ -1,68 +1,47 @@
 import {PublicKey, Signature, verify} from "@chainsafe/blst";
-import {byteArrayEquals} from "@chainsafe/ssz";
-import {
-  DOMAIN_BEACON_BUILDER,
-  FAR_FUTURE_EPOCH,
-  ForkPostGloas,
-  MIN_ACTIVATION_BALANCE,
-  SLOTS_PER_EPOCH,
-} from "@lodestar/params";
+import {BUILDER_INDEX_SELF_BUILD, ForkPostGloas, SLOTS_PER_EPOCH} from "@lodestar/params";
 import {BeaconBlock, gloas, ssz} from "@lodestar/types";
-import {toHex, toRootHex} from "@lodestar/utils";
+import {byteArrayEquals, toHex, toRootHex} from "@lodestar/utils";
 import {G2_POINT_AT_INFINITY} from "../constants/constants.ts";
+import {getExecutionPayloadBidSigningRoot} from "../signatureSets/executionPayloadBid.js";
 import {CachedBeaconStateGloas} from "../types.ts";
-import {hasBuilderWithdrawalCredential} from "../util/gloas.ts";
-import {computeSigningRoot, getCurrentEpoch, getRandaoMix, isActiveValidator} from "../util/index.ts";
+import {canBuilderCoverBid, isActiveBuilder} from "../util/gloas.ts";
+import {getCurrentEpoch, getRandaoMix} from "../util/index.ts";
 
 export function processExecutionPayloadBid(state: CachedBeaconStateGloas, block: BeaconBlock<ForkPostGloas>): void {
   const signedBid = block.body.signedExecutionPayloadBid;
   const bid = signedBid.message;
   const {builderIndex, value: amount} = bid;
-  const builder = state.validators.getReadonly(builderIndex);
 
   // For self-builds, amount must be zero regardless of withdrawal credential prefix
-  if (builderIndex === block.proposerIndex) {
+  if (builderIndex === BUILDER_INDEX_SELF_BUILD) {
     if (amount !== 0) {
       throw Error(`Invalid execution payload bid: self-build with non-zero amount ${amount}`);
     }
     if (!byteArrayEquals(signedBid.signature, G2_POINT_AT_INFINITY)) {
       throw Error("Invalid execution payload bid: self-build with non-zero signature");
     }
-    // Non-self builds require builder withdrawal credential
-  } else {
-    if (!hasBuilderWithdrawalCredential(builder.withdrawalCredentials)) {
-      throw Error(`Invalid execution payload bid: builder ${builderIndex} does not have builder withdrawal credential`);
+  }
+  // Non-self builds require active builder with valid signature
+  else {
+    const builder = state.builders.getReadonly(builderIndex);
+
+    // Verify that the builder is active
+    if (!isActiveBuilder(builder, state.finalizedCheckpoint.epoch)) {
+      throw Error(`Invalid execution payload bid: builder ${builderIndex} is not active`);
+    }
+
+    // Verify that the builder has funds to cover the bid
+    if (!canBuilderCoverBid(state, builderIndex, amount)) {
+      throw Error(`Invalid execution payload bid: builder ${builderIndex} has insufficient balance`);
     }
 
+    // Verify that the bid signature is valid
     if (!verifyExecutionPayloadBidSignature(state, builder.pubkey, signedBid)) {
       throw Error(`Invalid execution payload bid: invalid signature for builder ${builderIndex}`);
     }
   }
 
-  if (!isActiveValidator(builder, getCurrentEpoch(state))) {
-    throw Error(`Invalid execution payload bid: builder ${builderIndex} is not active`);
-  }
-
-  if (builder.slashed) {
-    throw Error(`Invalid execution payload bid: builder ${builderIndex} is slashed`);
-  }
-
-  const pendingPayments = state.builderPendingPayments
-    .getAllReadonly()
-    .filter((payment) => payment.withdrawal.builderIndex === builderIndex)
-    .reduce((acc, payment) => acc + payment.withdrawal.amount, 0);
-  const pendingWithdrawals = state.builderPendingWithdrawals
-    .getAllReadonly()
-    .filter((withdrawal) => withdrawal.builderIndex === builderIndex)
-    .reduce((acc, withdrawal) => acc + withdrawal.amount, 0);
-
-  if (
-    amount !== 0 &&
-    state.balances.get(builderIndex) < amount + pendingPayments + pendingWithdrawals + MIN_ACTIVATION_BALANCE
-  ) {
-    throw Error("Insufficient builder balance");
-  }
-
   if (bid.slot !== block.slot) {
     throw Error(`Bid slot ${bid.slot} does not match block slot ${block.slot}`);
   }
@@ -91,7 +70,6 @@ export function processExecutionPayloadBid(state: CachedBeaconStateGloas, block:
         feeRecipient: bid.feeRecipient,
         amount,
         builderIndex,
-        withdrawableEpoch: FAR_FUTURE_EPOCH,
       }),
     });
 
@@ -106,8 +84,7 @@ function verifyExecutionPayloadBidSignature(
   pubkey: Uint8Array,
   signedBid: gloas.SignedExecutionPayloadBid
 ): boolean {
-  const domain = state.config.getDomain(state.slot, DOMAIN_BEACON_BUILDER);
-  const signingRoot = computeSigningRoot(ssz.gloas.ExecutionPayloadBid, signedBid.message, domain);
+  const signingRoot = getExecutionPayloadBidSigningRoot(state.config, state.slot, signedBid.message);
 
   try {
     const publicKey = PublicKey.fromBytes(pubkey);

package/src/block/processExecutionPayloadEnvelope.ts

@@ -1,10 +1,14 @@
 import {PublicKey, Signature, verify} from "@chainsafe/blst";
-import {byteArrayEquals} from "@chainsafe/ssz";
-import {DOMAIN_BEACON_BUILDER, SLOTS_PER_EPOCH, SLOTS_PER_HISTORICAL_ROOT} from "@lodestar/params";
+import {
+  BUILDER_INDEX_SELF_BUILD,
+  DOMAIN_BEACON_BUILDER,
+  SLOTS_PER_EPOCH,
+  SLOTS_PER_HISTORICAL_ROOT,
+} from "@lodestar/params";
 import {gloas, ssz} from "@lodestar/types";
-import {toHex, toRootHex} from "@lodestar/utils";
+import {byteArrayEquals, toHex, toRootHex} from "@lodestar/utils";
 import {CachedBeaconStateGloas} from "../types.ts";
-import {computeExitEpochAndUpdateChurn, computeSigningRoot, computeTimeAtSlot} from "../util/index.ts";
+import {computeSigningRoot, computeTimeAtSlot} from "../util/index.ts";
 import {processConsolidationRequest} from "./processConsolidationRequest.ts";
 import {processDepositRequest} from "./processDepositRequest.ts";
 import {processWithdrawalRequest} from "./processWithdrawalRequest.ts";
@@ -19,13 +23,8 @@ export function processExecutionPayloadEnvelope(
   const payload = envelope.payload;
   const fork = state.config.getForkSeq(envelope.slot);
 
-  if (verify) {
-    const builderIndex = envelope.builderIndex;
-    const pubkey = state.validators.getReadonly(builderIndex).pubkey;
-
-    if (!verifyExecutionPayloadEnvelopeSignature(state, pubkey, signedEnvelope)) {
-      throw new Error("Payload Envelope has invalid signature");
-    }
+  if (verify && !verifyExecutionPayloadEnvelopeSignature(state, signedEnvelope)) {
+    throw Error(`Execution payload envelope has invalid signature builderIndex=${envelope.builderIndex}`);
   }
 
   validateExecutionPayloadEnvelope(state, envelope);
@@ -33,7 +32,7 @@ export function processExecutionPayloadEnvelope(
   const requests = envelope.executionRequests;
 
   for (const deposit of requests.deposits) {
-    processDepositRequest(state, deposit);
+    processDepositRequest(fork, state, deposit);
   }
 
   for (const withdrawal of requests.withdrawals) {
@@ -41,7 +40,7 @@ export function processExecutionPayloadEnvelope(
   }
 
   for (const consolidation of requests.consolidations) {
-    processConsolidationRequest(fork, state, consolidation);
+    processConsolidationRequest(state, consolidation);
   }
 
   // Queue the builder payment
@@ -50,9 +49,6 @@ export function processExecutionPayloadEnvelope(
   const amount = payment.withdrawal.amount;
 
   if (amount > 0) {
-    const exitQueueEpoch = computeExitEpochAndUpdateChurn(state, BigInt(amount));
-
-    payment.withdrawal.withdrawableEpoch = exitQueueEpoch + state.config.MIN_VALIDATOR_WITHDRAWABILITY_DELAY;
     state.builderPendingWithdrawals.push(payment.withdrawal);
   }
 
@@ -75,6 +71,7 @@ function validateExecutionPayloadEnvelope(
 ): void {
   const payload = envelope.payload;
 
+  // Cache latest block header state root
   if (byteArrayEquals(state.latestBlockHeader.stateRoot, ssz.Root.defaultValue())) {
     const previousStateRoot = state.hashTreeRoot();
     state.latestBlockHeader.stateRoot = previousStateRoot;
@@ -87,20 +84,18 @@ function validateExecutionPayloadEnvelope(
     );
   }
 
-  // Verify consistency with the beacon block
   if (envelope.slot !== state.slot) {
     throw new Error(`Slot mismatch between envelope and state envelope=${envelope.slot} state=${state.slot}`);
   }
 
-  const committedBid = state.latestExecutionPayloadBid;
   // Verify consistency with the committed bid
+  const committedBid = state.latestExecutionPayloadBid;
   if (envelope.builderIndex !== committedBid.builderIndex) {
     throw new Error(
       `Builder index mismatch between envelope and committed bid envelope=${envelope.builderIndex} committedBid=${committedBid.builderIndex}`
     );
   }
 
-  // Verify consistency with the committed bid
   const envelopeKzgRoot = ssz.deneb.BlobKzgCommitments.hashTreeRoot(envelope.blobKzgCommitments);
   if (!byteArrayEquals(committedBid.blobKzgCommitmentsRoot, envelopeKzgRoot)) {
     throw new Error(
@@ -108,11 +103,18 @@ function validateExecutionPayloadEnvelope(
     );
   }
 
-  // Verify the withdrawals root
-  const envelopeWithdrawalsRoot = ssz.capella.Withdrawals.hashTreeRoot(envelope.payload.withdrawals);
-  if (!byteArrayEquals(state.latestWithdrawalsRoot, envelopeWithdrawalsRoot)) {
+  if (!byteArrayEquals(committedBid.prevRandao, payload.prevRandao)) {
+    throw new Error(
+      `Prev randao mismatch between committed bid and payload committedBid=${toHex(committedBid.prevRandao)} payload=${toHex(payload.prevRandao)}`
+    );
+  }
+
+  // Verify consistency with expected withdrawals
+  const payloadWithdrawalsRoot = ssz.capella.Withdrawals.hashTreeRoot(payload.withdrawals);
+  const expectedWithdrawalsRoot = state.payloadExpectedWithdrawals.hashTreeRoot();
+  if (!byteArrayEquals(payloadWithdrawalsRoot, expectedWithdrawalsRoot)) {
     throw new Error(
-      `Withdrawals root mismatch between envelope and latest withdrawals root envelope=${toRootHex(envelopeWithdrawalsRoot)} latestWithdrawalRoot=${toRootHex(state.latestWithdrawalsRoot)}`
+      `Withdrawals mismatch between payload and expected withdrawals payload=${toRootHex(payloadWithdrawalsRoot)} expected=${toRootHex(expectedWithdrawalsRoot)}`
     );
   }
 
@@ -137,13 +139,6 @@ function validateExecutionPayloadEnvelope(
     );
   }
 
-  // Verify prev_randao matches committed bid
-  if (!byteArrayEquals(committedBid.prevRandao, payload.prevRandao)) {
-    throw new Error(
-      `Prev randao mismatch between committed bid and payload committedBid=${toHex(committedBid.prevRandao)} payload=${toHex(payload.prevRandao)}`
-    );
-  }
-
   // Verify timestamp
   if (payload.timestamp !== computeTimeAtSlot(state.config, state.slot, state.genesisTime)) {
     throw new Error(
@@ -164,14 +159,22 @@ function validateExecutionPayloadEnvelope(
 
 function verifyExecutionPayloadEnvelopeSignature(
   state: CachedBeaconStateGloas,
-  pubkey: Uint8Array,
   signedEnvelope: gloas.SignedExecutionPayloadEnvelope
 ): boolean {
+  const builderIndex = signedEnvelope.message.builderIndex;
+
   const domain = state.config.getDomain(state.slot, DOMAIN_BEACON_BUILDER);
   const signingRoot = computeSigningRoot(ssz.gloas.ExecutionPayloadEnvelope, signedEnvelope.message, domain);
 
   try {
-    const publicKey = PublicKey.fromBytes(pubkey);
+    let publicKey: PublicKey;
+
+    if (builderIndex === BUILDER_INDEX_SELF_BUILD) {
+      const validatorIndex = state.latestBlockHeader.proposerIndex;
+      publicKey = state.epochCtx.index2pubkey[validatorIndex];
+    } else {
+      publicKey = PublicKey.fromBytes(state.builders.getReadonly(builderIndex).pubkey);
+    }
     const signature = Signature.fromBytes(signedEnvelope.signature, true);
 
     return verify(signingRoot, publicKey, signature);

package/src/block/processOperations.ts

@@ -75,7 +75,7 @@ export function processOperations(
     const bodyElectra = body as electra.BeaconBlockBody;
 
     for (const depositRequest of bodyElectra.executionRequests.deposits) {
-      processDepositRequest(stateElectra, depositRequest);
+      processDepositRequest(fork, stateElectra, depositRequest);
     }
 
     for (const elWithdrawalRequest of bodyElectra.executionRequests.withdrawals) {
@@ -83,7 +83,7 @@ export function processOperations(
     }
 
     for (const elConsolidationRequest of bodyElectra.executionRequests.consolidations) {
-      processConsolidationRequest(fork, stateElectra, elConsolidationRequest);
+      processConsolidationRequest(stateElectra, elConsolidationRequest);
     }
   }
 

package/src/block/processPayloadAttestation.ts

@@ -1,5 +1,5 @@
-import {byteArrayEquals} from "@chainsafe/ssz";
 import {gloas} from "@lodestar/types";
+import {byteArrayEquals} from "@lodestar/utils";
 import {CachedBeaconStateGloas} from "../types.ts";
 import {isValidIndexedPayloadAttestation} from "./isValidIndexedPayloadAttestation.ts";
 

package/src/block/processProposerSlashing.ts

@@ -92,9 +92,9 @@ export function assertValidProposerSlashing(
 
   // verify signatures
   if (verifySignatures) {
-    const signatureSets = getProposerSlashingSignatureSets(config, index2pubkey, stateSlot, proposerSlashing);
+    const signatureSets = getProposerSlashingSignatureSets(config, stateSlot, proposerSlashing);
     for (let i = 0; i < signatureSets.length; i++) {
-      if (!verifySignatureSet(signatureSets[i])) {
+      if (!verifySignatureSet(signatureSets[i], index2pubkey)) {
         throw new Error(`ProposerSlashing header${i + 1} signature invalid`);
       }
     }

package/src/block/processSyncCommittee.ts

@@ -1,8 +1,7 @@
-import {byteArrayEquals} from "@chainsafe/ssz";
 import {BeaconConfig} from "@lodestar/config";
 import {DOMAIN_SYNC_COMMITTEE, SYNC_COMMITTEE_SIZE} from "@lodestar/params";
 import {altair, ssz} from "@lodestar/types";
-import {Index2PubkeyCache} from "../cache/pubkeyCache.js";
+import {byteArrayEquals} from "@lodestar/utils";
 import {SyncCommitteeCache} from "../cache/syncCommitteeCache.js";
 import {G2_POINT_AT_INFINITY} from "../constants/index.js";
 import {CachedBeaconStateAllForks} from "../types.js";
@@ -28,13 +27,12 @@ export function processSyncAggregate(
     const participantIndices = block.body.syncAggregate.syncCommitteeBits.intersectValues(committeeIndices);
     const signatureSet = getSyncCommitteeSignatureSet(
       state.config,
-      state.epochCtx.index2pubkey,
       state.epochCtx.currentSyncCommitteeIndexed,
       block,
       participantIndices
     );
-    // When there's no participation we consider the signature valid and just ignore i
-    if (signatureSet !== null && !verifySignatureSet(signatureSet)) {
+    // When there's no participation we consider the signature valid and just ignore it
+    if (signatureSet !== null && !verifySignatureSet(signatureSet, state.epochCtx.index2pubkey)) {
       throw Error("Sync committee signature invalid");
     }
   }
@@ -73,7 +71,6 @@ export function processSyncAggregate(
 
 export function getSyncCommitteeSignatureSet(
   config: BeaconConfig,
-  index2pubkey: Index2PubkeyCache,
   currentSyncCommitteeIndexed: SyncCommitteeCache,
   block: altair.BeaconBlock,
   /** Optional parameter to prevent computing it twice */
@@ -122,7 +119,7 @@ export function getSyncCommitteeSignatureSet(
 
   return {
     type: SignatureSetType.aggregate,
-    pubkeys: participantIndices.map((i) => index2pubkey[i]),
+    indices: participantIndices,
     signingRoot: computeSigningRoot(ssz.Root, rootSigned, domain),
     signature,
   };