@lodestar/state-transition 1.39.0 → 1.40.0-dev.313caaeef7

package/src/rewards/syncCommitteeRewards.ts

@@ -4,8 +4,6 @@ import {BeaconBlock, ValidatorIndex, altair, rewards} from "@lodestar/types";
 import {Index2PubkeyCache} from "../cache/pubkeyCache.js";
 import {CachedBeaconStateAllForks, CachedBeaconStateAltair} from "../cache/stateCache.js";
 
-type BalanceRecord = {val: number}; // Use val for convenient way to increment/decrement balance
-
 export async function computeSyncCommitteeRewards(
   config: BeaconConfig,
   index2pubkey: Index2PubkeyCache,
@@ -19,7 +17,7 @@ export async function computeSyncCommitteeRewards(
   }
 
   const altairBlock = block as altair.BeaconBlock;
-  const preStateAltair = preState as CachedBeaconStateAltair;
+  const preStateAltair = preState.clone() as CachedBeaconStateAltair;
 
   // Bound syncCommitteeValidatorIndices in case it goes beyond SYNC_COMMITTEE_SIZE just to be safe
   const syncCommitteeValidatorIndices = preStateAltair.epochCtx.currentSyncCommitteeIndexed.validatorIndices.slice(
@@ -29,24 +27,23 @@ export async function computeSyncCommitteeRewards(
   const {syncParticipantReward} = preStateAltair.epochCtx;
   const {syncCommitteeBits} = altairBlock.body.syncAggregate;
 
-  // Use balance of each committee as starting point such that we cap the penalty to avoid balance dropping below 0
-  const balances: Map<ValidatorIndex, BalanceRecord> = new Map();
-  for (const i of syncCommitteeValidatorIndices) {
-    balances.set(i, {val: preStateAltair.balances.get(i)});
-  }
+  // Track reward deltas per validator (can appear multiple times in sync committee)
+  const rewardDeltas: Map<ValidatorIndex, number> = new Map();
 
-  for (const i of syncCommitteeValidatorIndices) {
-    const balanceRecord = balances.get(i) as BalanceRecord;
+  // Iterate by position index to correctly access syncCommitteeBits
+  for (let i = 0; i < syncCommitteeValidatorIndices.length; i++) {
+    const validatorIndex = syncCommitteeValidatorIndices[i];
+    const currentDelta = rewardDeltas.get(validatorIndex) ?? 0;
     if (syncCommitteeBits.get(i)) {
       // Positive rewards for participants
-      balanceRecord.val += syncParticipantReward;
+      rewardDeltas.set(validatorIndex, currentDelta + syncParticipantReward);
     } else {
       // Negative rewards for non participants
-      balanceRecord.val = Math.max(0, balanceRecord.val - syncParticipantReward);
+      rewardDeltas.set(validatorIndex, currentDelta - syncParticipantReward);
     }
   }
 
-  const rewards = Array.from(balances, ([validatorIndex, v]) => ({validatorIndex, reward: v.val}));
+  const rewards = Array.from(rewardDeltas, ([validatorIndex, reward]) => ({validatorIndex, reward}));
 
   if (validatorIds.length) {
     const filtersSet = new Set(validatorIds);

package/src/signatureSets/blsToExecutionChange.ts

@@ -2,14 +2,13 @@ import {PublicKey} from "@chainsafe/blst";
 import {BeaconConfig} from "@lodestar/config";
 import {DOMAIN_BLS_TO_EXECUTION_CHANGE, ForkName} from "@lodestar/params";
 import {capella, ssz} from "@lodestar/types";
-import {CachedBeaconStateAllForks} from "../types.js";
 import {ISignatureSet, SignatureSetType, computeSigningRoot, verifySignatureSet} from "../util/index.js";
 
 export function verifyBlsToExecutionChangeSignature(
-  state: CachedBeaconStateAllForks,
+  config: BeaconConfig,
   signedBLSToExecutionChange: capella.SignedBLSToExecutionChange
 ): boolean {
-  return verifySignatureSet(getBlsToExecutionChangeSignatureSet(state.config, signedBLSToExecutionChange));
+  return verifySignatureSet(getBlsToExecutionChangeSignatureSet(config, signedBLSToExecutionChange));
 }
 
 /**

package/src/types.ts

@@ -23,4 +23,5 @@ export type {
   BeaconStateFulu,
   BeaconStateGloas,
   BeaconStatePhase0,
+  ShufflingGetter,
 } from "./cache/types.js";

package/src/util/electra.ts

@@ -3,12 +3,9 @@ import {ValidatorIndex, ssz} from "@lodestar/types";
 import {G2_POINT_AT_INFINITY} from "../constants/constants.js";
 import {CachedBeaconStateElectra, CachedBeaconStateGloas} from "../types.js";
 import {hasEth1WithdrawalCredential} from "./capella.js";
-import {hasBuilderWithdrawalCredential} from "./gloas.ts";
 
 export function hasCompoundingWithdrawalCredential(withdrawalCredentials: Uint8Array): boolean {
-  return (
-    withdrawalCredentials[0] === COMPOUNDING_WITHDRAWAL_PREFIX || hasBuilderWithdrawalCredential(withdrawalCredentials)
-  );
+  return withdrawalCredentials[0] === COMPOUNDING_WITHDRAWAL_PREFIX;
 }
 
 export function hasExecutionWithdrawalCredential(withdrawalCredentials: Uint8Array): boolean {

package/src/util/epochShuffling.ts

@@ -9,54 +9,13 @@ import {
   TARGET_COMMITTEE_SIZE,
 } from "@lodestar/params";
 import {Epoch, RootHex, ValidatorIndex, ssz} from "@lodestar/types";
-import {GaugeExtra, Logger, NoLabels, intDiv, toRootHex} from "@lodestar/utils";
+import {intDiv, toRootHex} from "@lodestar/utils";
 import {BeaconStateAllForks} from "../types.js";
 import {getBlockRootAtSlot} from "./blockRoot.js";
 import {computeAnchorCheckpoint} from "./computeAnchorCheckpoint.js";
 import {computeStartSlotAtEpoch} from "./epoch.js";
 import {getSeed} from "./seed.js";
 
-export interface ShufflingBuildProps {
-  state: BeaconStateAllForks;
-  activeIndices: Uint32Array;
-}
-
-export interface PublicShufflingCacheMetrics {
-  shufflingCache: {
-    nextShufflingNotOnEpochCache: GaugeExtra<NoLabels>;
-  };
-}
-export interface IShufflingCache {
-  metrics: PublicShufflingCacheMetrics | null;
-  logger: Logger | null;
-  /**
-   * Gets a cached shuffling via the epoch and decision root. If the state and
-   * activeIndices are passed and a shuffling is not available it will be built
-   * synchronously. If the state is not passed and the shuffling is not available
-   * nothing will be returned.
-   *
-   * NOTE: If a shuffling is already queued and not calculated it will build and resolve
-   * the promise but the already queued build will happen at some later time
-   */
-  getSync<T extends ShufflingBuildProps | undefined>(
-    epoch: Epoch,
-    decisionRoot: RootHex,
-    buildProps?: T
-  ): T extends ShufflingBuildProps ? EpochShuffling : EpochShuffling | null;
-
-  /**
-   * Gets a cached shuffling via the epoch and decision root.  Returns a promise
-   * for the shuffling if it hs not calculated yet.  Returns null if a build has
-   * not been queued nor a shuffling was calculated.
-   */
-  get(epoch: Epoch, decisionRoot: RootHex): Promise<EpochShuffling | null>;
-
-  /**
-   * Queue asynchronous build for an EpochShuffling
-   */
-  build(epoch: Epoch, decisionRoot: RootHex, state: BeaconStateAllForks, activeIndices: Uint32Array): void;
-}
-
 /**
  * Readonly interface for EpochShuffling.
  */
@@ -164,7 +123,7 @@ export async function computeEpochShufflingAsync(
   };
 }
 
-function calculateDecisionRoot(state: BeaconStateAllForks, epoch: Epoch): RootHex {
+export function calculateDecisionRoot(state: BeaconStateAllForks, epoch: Epoch): RootHex {
   const pivotSlot = computeStartSlotAtEpoch(epoch - 1) - 1;
   return toRootHex(getBlockRootAtSlot(state, pivotSlot));
 }

package/src/util/gloas.ts

@@ -1,19 +1,21 @@
 import {byteArrayEquals} from "@chainsafe/ssz";
 import {
+  BUILDER_INDEX_FLAG,
   BUILDER_PAYMENT_THRESHOLD_DENOMINATOR,
   BUILDER_PAYMENT_THRESHOLD_NUMERATOR,
   BUILDER_WITHDRAWAL_PREFIX,
   EFFECTIVE_BALANCE_INCREMENT,
+  FAR_FUTURE_EPOCH,
+  MIN_DEPOSIT_AMOUNT,
   SLOTS_PER_EPOCH,
 } from "@lodestar/params";
-import {gloas} from "@lodestar/types";
 import {AttestationData} from "@lodestar/types/phase0";
 import {CachedBeaconStateGloas} from "../types.ts";
 import {getBlockRootAtSlot} from "./blockRoot.ts";
 import {computeEpochAtSlot} from "./epoch.ts";
 import {RootCache} from "./rootCache.ts";
 
-export function hasBuilderWithdrawalCredential(withdrawalCredentials: Uint8Array): boolean {
+export function isBuilderWithdrawalCredential(withdrawalCredentials: Uint8Array): boolean {
   return withdrawalCredentials[0] === BUILDER_WITHDRAWAL_PREFIX;
 }
 
@@ -25,14 +27,113 @@ export function getBuilderPaymentQuorumThreshold(state: CachedBeaconStateGloas):
   return Math.floor(quorum / BUILDER_PAYMENT_THRESHOLD_DENOMINATOR);
 }
 
-export function isBuilderPaymentWithdrawable(
-  state: CachedBeaconStateGloas,
-  withdrawal: gloas.BuilderPendingWithdrawal
-): boolean {
-  const builder = state.validators.getReadonly(withdrawal.builderIndex);
+/**
+ * Check if a validator index represents a builder (has the builder flag set).
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/beacon-chain.md#new-is_builder_index
+ */
+export function isBuilderIndex(validatorIndex: number): boolean {
+  return (validatorIndex & BUILDER_INDEX_FLAG) !== 0;
+}
+
+/**
+ * Convert a builder index to a flagged validator index for use in Withdrawal containers.
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/beacon-chain.md#new-convert_builder_index_to_validator_index
+ */
+export function convertBuilderIndexToValidatorIndex(builderIndex: number): number {
+  return builderIndex | BUILDER_INDEX_FLAG;
+}
+
+/**
+ * Convert a flagged validator index back to a builder index.
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/beacon-chain.md#new-convert_validator_index_to_builder_index
+ */
+export function convertValidatorIndexToBuilderIndex(validatorIndex: number): number {
+  return validatorIndex & ~BUILDER_INDEX_FLAG;
+}
+
+/**
+ * Check if a builder is active (deposited and not yet withdrawable).
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/beacon-chain.md#isactivebuilder
+ */
+export function isActiveBuilder(state: CachedBeaconStateGloas, builderIndex: number): boolean {
+  const builder = state.builders.getReadonly(builderIndex);
+  const finalizedEpoch = state.finalizedCheckpoint.epoch;
+
+  return builder.depositEpoch < finalizedEpoch && builder.withdrawableEpoch === FAR_FUTURE_EPOCH;
+}
+
+/**
+ * Get the total pending balance to withdraw for a builder (from withdrawals + payments).
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/beacon-chain.md#new-get_pending_balance_to_withdraw_for_builder
+ */
+export function getPendingBalanceToWithdrawForBuilder(state: CachedBeaconStateGloas, builderIndex: number): number {
+  let pendingBalance = 0;
+
+  // Sum pending withdrawals
+  for (let i = 0; i < state.builderPendingWithdrawals.length; i++) {
+    const withdrawal = state.builderPendingWithdrawals.getReadonly(i);
+    if (withdrawal.builderIndex === builderIndex) {
+      pendingBalance += withdrawal.amount;
+    }
+  }
+
+  // Sum pending payments
+  for (let i = 0; i < state.builderPendingPayments.length; i++) {
+    const payment = state.builderPendingPayments.getReadonly(i);
+    if (payment.withdrawal.builderIndex === builderIndex) {
+      pendingBalance += payment.withdrawal.amount;
+    }
+  }
+
+  return pendingBalance;
+}
+
+/**
+ * Check if a builder has sufficient balance to cover a bid amount.
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/beacon-chain.md#new-can_builder_cover_bid
+ */
+export function canBuilderCoverBid(state: CachedBeaconStateGloas, builderIndex: number, bidAmount: number): boolean {
+  const builder = state.builders.getReadonly(builderIndex);
+  const pendingBalance = getPendingBalanceToWithdrawForBuilder(state, builderIndex);
+  const minBalance = MIN_DEPOSIT_AMOUNT + pendingBalance;
+
+  if (builder.balance < minBalance) {
+    return false;
+  }
+
+  return builder.balance - minBalance >= bidAmount;
+}
+
+/**
+ * Initiate a builder exit by setting their withdrawable epoch.
+ * Spec: https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/gloas/beacon-chain.md#new-initiate_builder_exit
+ */
+export function initiateBuilderExit(state: CachedBeaconStateGloas, builderIndex: number): void {
+  const builder = state.builders.get(builderIndex);
+
+  // Return if builder already initiated exit
+  if (builder.withdrawableEpoch !== FAR_FUTURE_EPOCH) {
+    return;
+  }
+
+  // Set builder exit epoch
   const currentEpoch = computeEpochAtSlot(state.slot);
+  builder.withdrawableEpoch = currentEpoch + state.config.MIN_BUILDER_WITHDRAWABILITY_DELAY;
+}
 
-  return builder.withdrawableEpoch >= currentEpoch || !builder.slashed;
+/**
+ * Find the index of a builder by their public key.
+ * Returns null if not found.
+ *
+ * May consider builder pubkey cache if performance becomes an issue.
+ */
+export function findBuilderIndexByPubkey(state: CachedBeaconStateGloas, pubkey: Uint8Array): number | null {
+  for (let i = 0; i < state.builders.length; i++) {
+    if (byteArrayEquals(state.builders.getReadonly(i).pubkey, pubkey)) {
+      return i;
+    }
+  }
+  return null;
 }
 
 export function isAttestationSameSlot(state: CachedBeaconStateGloas, data: AttestationData): boolean {

package/src/util/index.ts

@@ -5,7 +5,6 @@ export * from "./attesterStatus.js";
 export * from "./balance.js";
 export * from "./blindedBlock.js";
 export * from "./blockRoot.js";
-export * from "./calculateCommitteeAssignments.js";
 export * from "./capella.js";
 export * from "./computeAnchorCheckpoint.js";
 export * from "./deposit.js";
@@ -20,7 +19,7 @@ export * from "./interop.js";
 export * from "./loadState/index.js";
 export * from "./rootCache.js";
 export * from "./seed.js";
-export * from "./shufflingDecisionRoot.js";
+export * from "./shuffling.js";
 export * from "./signatureSets.js";
 export * from "./signingRoot.js";
 export * from "./slot.js";

package/src/util/shuffling.ts

@@ -0,0 +1,234 @@
+import {ForkName, ForkSeq, SLOTS_PER_EPOCH, isForkPostFulu} from "@lodestar/params";
+import {
+  Attestation,
+  CommitteeIndex,
+  Epoch,
+  IndexedAttestation,
+  Root,
+  Slot,
+  ValidatorIndex,
+  electra,
+} from "@lodestar/types";
+import {LodestarError} from "@lodestar/utils";
+import {CachedBeaconStateAllForks} from "../cache/stateCache.js";
+import {getBlockRootAtSlot} from "./blockRoot.js";
+import {computeStartSlotAtEpoch} from "./epoch.js";
+import {EpochShuffling} from "./epochShuffling.js";
+
+/**
+ * Returns the block root which decided the proposer shuffling for the current epoch. This root
+ * can be used to key this proposer shuffling.
+ *
+ * Returns `null` on the one-off scenario where the genesis block decides its own shuffling.
+ * It should be set to the latest block applied to this `state` or the genesis block root.
+ */
+export function proposerShufflingDecisionRoot(fork: ForkName, state: CachedBeaconStateAllForks): Root | null {
+  const decisionSlot = proposerShufflingDecisionSlot(fork, state);
+  if (state.slot === decisionSlot) {
+    return null;
+  }
+  return getBlockRootAtSlot(state, decisionSlot);
+}
+
+/**
+ * Returns the slot at which the proposer shuffling was decided. The block root at this slot
+ * can be used to key the proposer shuffling for the current epoch.
+ */
+function proposerShufflingDecisionSlot(fork: ForkName, state: CachedBeaconStateAllForks): Slot {
+  // After fulu, the decision slot is in previous epoch due to deterministic proposer lookahead
+  const epoch = isForkPostFulu(fork) ? state.epochCtx.epoch - 1 : state.epochCtx.epoch;
+  const startSlot = computeStartSlotAtEpoch(epoch);
+  return Math.max(startSlot - 1, 0);
+}
+
+/**
+ * Returns the block root which decided the attester shuffling for the given `requestedEpoch`.
+ * This root can be used to key that attester shuffling.
+ *
+ * Returns `null` on the one-off scenario where the genesis block decides its own shuffling.
+ * It should be set to the latest block applied to this `state` or the genesis block root.
+ */
+export function attesterShufflingDecisionRoot(state: CachedBeaconStateAllForks, requestedEpoch: Epoch): Root | null {
+  const decisionSlot = attesterShufflingDecisionSlot(state, requestedEpoch);
+  if (state.slot === decisionSlot) {
+    return null;
+  }
+  return getBlockRootAtSlot(state, decisionSlot);
+}
+
+/**
+ * Returns the slot at which the proposer shuffling was decided. The block root at this slot
+ * can be used to key the proposer shuffling for the current epoch.
+ */
+function attesterShufflingDecisionSlot(state: CachedBeaconStateAllForks, requestedEpoch: Epoch): Slot {
+  const epoch = attesterShufflingDecisionEpoch(state, requestedEpoch);
+  const slot = computeStartSlotAtEpoch(epoch);
+  return Math.max(slot - 1, 0);
+}
+
+/**
+ * Returns the epoch at which the attester shuffling was decided.
+ *
+ * Spec ref: https://github.com/ethereum/beacon-APIs/blob/v2.1.0/apis/validator/duties/attester.yaml#L15
+ *
+ * Throws an error when:
+ * - `EpochTooLow` when `requestedEpoch` is more than 1 prior to `currentEpoch`.
+ * - `EpochTooHigh` when `requestedEpoch` is more than 1 after `currentEpoch`.
+ */
+function attesterShufflingDecisionEpoch(state: CachedBeaconStateAllForks, requestedEpoch: Epoch): Epoch {
+  const currentEpoch = state.epochCtx.epoch;
+
+  // Next
+  if (requestedEpoch === currentEpoch + 1) return currentEpoch;
+  // Current
+  if (requestedEpoch === currentEpoch) return Math.max(currentEpoch - 1, 0);
+  // Previous
+  if (requestedEpoch === currentEpoch - 1) return Math.max(currentEpoch - 2, 0);
+
+  if (requestedEpoch < currentEpoch) {
+    throw Error(`EpochTooLow: current ${currentEpoch} requested ${requestedEpoch}`);
+  }
+  throw Error(`EpochTooHigh: current ${currentEpoch} requested ${requestedEpoch}`);
+}
+
+// Copied from lodestar-api package to avoid depending on the package
+export interface AttesterDuty {
+  validatorIndex: ValidatorIndex;
+  committeeIndex: CommitteeIndex;
+  committeeLength: number;
+  committeesAtSlot: number;
+  validatorCommitteeIndex: number;
+  slot: Slot;
+}
+
+export function calculateCommitteeAssignments(
+  epochShuffling: EpochShuffling,
+  requestedValidatorIndices: ValidatorIndex[]
+): Map<ValidatorIndex, AttesterDuty> {
+  const requestedValidatorIndicesSet = new Set(requestedValidatorIndices);
+  const duties = new Map<ValidatorIndex, AttesterDuty>();
+
+  const epochCommittees = epochShuffling.committees;
+  for (let epochSlot = 0; epochSlot < SLOTS_PER_EPOCH; epochSlot++) {
+    const slotCommittees = epochCommittees[epochSlot];
+    for (let i = 0, committeesAtSlot = slotCommittees.length; i < committeesAtSlot; i++) {
+      for (let j = 0, committeeLength = slotCommittees[i].length; j < committeeLength; j++) {
+        const validatorIndex = slotCommittees[i][j];
+        if (requestedValidatorIndicesSet.has(validatorIndex)) {
+          duties.set(validatorIndex, {
+            validatorIndex,
+            committeeLength,
+            committeesAtSlot,
+            validatorCommitteeIndex: j,
+            committeeIndex: i,
+            slot: epochShuffling.epoch * SLOTS_PER_EPOCH + epochSlot,
+          });
+        }
+      }
+    }
+  }
+
+  return duties;
+}
+
+/**
+ * Return the indexed attestation corresponding to ``attestation``.
+ */
+export function getIndexedAttestation(
+  epochShuffling: EpochShuffling,
+  fork: ForkSeq,
+  attestation: Attestation
+): IndexedAttestation {
+  const {data} = attestation;
+  const attestingIndices = getAttestingIndices(epochShuffling, fork, attestation);
+
+  // sort in-place
+  attestingIndices.sort((a, b) => a - b);
+  return {
+    attestingIndices: attestingIndices,
+    data: data,
+    signature: attestation.signature,
+  };
+}
+
+/**
+ * Return indices of validators who attestested in `attestation`
+ */
+export function getAttestingIndices(epochShuffling: EpochShuffling, fork: ForkSeq, attestation: Attestation): number[] {
+  if (fork < ForkSeq.electra) {
+    const {aggregationBits, data} = attestation;
+    const validatorIndices = getBeaconCommittee(epochShuffling, data.slot, data.index);
+
+    return aggregationBits.intersectValues(validatorIndices);
+  }
+  const {aggregationBits, committeeBits, data} = attestation as electra.Attestation;
+
+  // There is a naming conflict on the term `committeeIndices`
+  // In Lodestar it usually means a list of validator indices of participants in a committee
+  // In the spec it means a list of committee indices according to committeeBits
+  // This `committeeIndices` refers to the latter
+  // TODO Electra: resolve the naming conflicts
+  const committeeIndices = committeeBits.getTrueBitIndexes();
+
+  const validatorsByCommittee = getBeaconCommittees(epochShuffling, data.slot, committeeIndices);
+
+  // Create a new Uint32Array to flatten `validatorsByCommittee`
+  const totalLength = validatorsByCommittee.reduce((acc, curr) => acc + curr.length, 0);
+  const committeeValidators = new Uint32Array(totalLength);
+
+  let offset = 0;
+  for (const committee of validatorsByCommittee) {
+    committeeValidators.set(committee, offset);
+    offset += committee.length;
+  }
+
+  return aggregationBits.intersectValues(committeeValidators);
+}
+
+/**
+ * Return the beacon committee at slot for index.
+ */
+export function getBeaconCommittee(epochShuffling: EpochShuffling, slot: Slot, index: CommitteeIndex): Uint32Array {
+  return getBeaconCommittees(epochShuffling, slot, [index])[0];
+}
+
+/**
+ * Return a Uint32Array[] representing committees validator indices
+ */
+export function getBeaconCommittees(
+  epochShuffling: EpochShuffling,
+  slot: Slot,
+  indices: CommitteeIndex[]
+): Uint32Array[] {
+  if (indices.length === 0) {
+    throw new Error("Attempt to get committees without providing CommitteeIndex");
+  }
+
+  const slotCommittees = epochShuffling.committees[slot % SLOTS_PER_EPOCH];
+  const committees = [];
+
+  for (const index of indices) {
+    if (index >= slotCommittees.length) {
+      throw new ShufflingError({
+        code: ShufflingErrorCode.COMMITTEE_INDEX_OUT_OF_RANGE,
+        index,
+        maxIndex: slotCommittees.length,
+      });
+    }
+    committees.push(slotCommittees[index]);
+  }
+
+  return committees;
+}
+
+export enum ShufflingErrorCode {
+  COMMITTEE_INDEX_OUT_OF_RANGE = "SHUFFLING_ERROR_COMMITTEE_INDEX_OUT_OF_RANGE",
+}
+
+type ShufflingErrorType = {
+  code: ShufflingErrorCode.COMMITTEE_INDEX_OUT_OF_RANGE;
+  index: number;
+  maxIndex: number;
+};
+
+export class ShufflingError extends LodestarError<ShufflingErrorType> {}

package/src/util/validator.ts

@@ -2,13 +2,15 @@ import {ChainForkConfig} from "@lodestar/config";
 import {
   EFFECTIVE_BALANCE_INCREMENT,
   ForkSeq,
+  MAX_EFFECTIVE_BALANCE,
   MAX_EFFECTIVE_BALANCE_ELECTRA,
   MIN_ACTIVATION_BALANCE,
 } from "@lodestar/params";
 import {Epoch, ValidatorIndex, phase0} from "@lodestar/types";
 import {intDiv} from "@lodestar/utils";
 import {BeaconStateAllForks, CachedBeaconStateElectra, CachedBeaconStateGloas, EpochCache} from "../types.js";
-import {hasCompoundingWithdrawalCredential} from "./electra.js";
+import {hasEth1WithdrawalCredential} from "./capella.js";
+import {hasCompoundingWithdrawalCredential, hasExecutionWithdrawalCredential} from "./electra.js";
 
 /**
  * Check if [[validator]] is active
@@ -94,6 +96,34 @@ export function getMaxEffectiveBalance(withdrawalCredentials: Uint8Array): numbe
   return MIN_ACTIVATION_BALANCE;
 }
 
+/**
+ * Check if validator is partially withdrawable.
+ * https://github.com/ethereum/consensus-specs/blob/v1.7.0-alpha.1/specs/electra/beacon-chain.md#modified-is_partially_withdrawable_validator
+ */
+export function isPartiallyWithdrawableValidator(fork: ForkSeq, validator: phase0.Validator, balance: number): boolean {
+  const isPostElectra = fork >= ForkSeq.electra;
+
+  // Check withdrawal credentials
+  const hasWithdrawableCredentials = isPostElectra
+    ? hasExecutionWithdrawalCredential(validator.withdrawalCredentials)
+    : hasEth1WithdrawalCredential(validator.withdrawalCredentials);
+
+  if (!hasWithdrawableCredentials) {
+    return false;
+  }
+
+  // Get max effective balance based on fork
+  const maxEffectiveBalance = isPostElectra
+    ? getMaxEffectiveBalance(validator.withdrawalCredentials)
+    : MAX_EFFECTIVE_BALANCE;
+
+  // Check if at max effective balance and has excess balance
+  const hasMaxEffectiveBalance = validator.effectiveBalance === maxEffectiveBalance;
+  const hasExcessBalance = balance > maxEffectiveBalance;
+
+  return hasMaxEffectiveBalance && hasExcessBalance;
+}
+
 export function getPendingBalanceToWithdraw(
   fork: ForkSeq,
   state: CachedBeaconStateElectra | CachedBeaconStateGloas,

package/lib/util/calculateCommitteeAssignments.d.ts

@@ -1,12 +0,0 @@
-import { CommitteeIndex, Slot, ValidatorIndex } from "@lodestar/types";
-import { EpochShuffling } from "./epochShuffling.js";
-export interface AttesterDuty {
-    validatorIndex: ValidatorIndex;
-    committeeIndex: CommitteeIndex;
-    committeeLength: number;
-    committeesAtSlot: number;
-    validatorCommitteeIndex: number;
-    slot: Slot;
-}
-export declare function calculateCommitteeAssignments(epochShuffling: EpochShuffling, requestedValidatorIndices: ValidatorIndex[]): Map<ValidatorIndex, AttesterDuty>;
-//# sourceMappingURL=calculateCommitteeAssignments.d.ts.map

package/lib/util/calculateCommitteeAssignments.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"calculateCommitteeAssignments.d.ts","sourceRoot":"","sources":["../../src/util/calculateCommitteeAssignments.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,cAAc,EAAE,IAAI,EAAE,cAAc,EAAC,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAC,cAAc,EAAC,MAAM,qBAAqB,CAAC;AAGnD,MAAM,WAAW,YAAY;IAC3B,cAAc,EAAE,cAAc,CAAC;IAC/B,cAAc,EAAE,cAAc,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,uBAAuB,EAAE,MAAM,CAAC;IAChC,IAAI,EAAE,IAAI,CAAC;CACZ;AAED,wBAAgB,6BAA6B,CAC3C,cAAc,EAAE,cAAc,EAC9B,yBAAyB,EAAE,cAAc,EAAE,GAC1C,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAyBnC"}

package/lib/util/calculateCommitteeAssignments.js

@@ -1,26 +0,0 @@
-import { SLOTS_PER_EPOCH } from "@lodestar/params";
-export function calculateCommitteeAssignments(epochShuffling, requestedValidatorIndices) {
-    const requestedValidatorIndicesSet = new Set(requestedValidatorIndices);
-    const duties = new Map();
-    const epochCommittees = epochShuffling.committees;
-    for (let epochSlot = 0; epochSlot < SLOTS_PER_EPOCH; epochSlot++) {
-        const slotCommittees = epochCommittees[epochSlot];
-        for (let i = 0, committeesAtSlot = slotCommittees.length; i < committeesAtSlot; i++) {
-            for (let j = 0, committeeLength = slotCommittees[i].length; j < committeeLength; j++) {
-                const validatorIndex = slotCommittees[i][j];
-                if (requestedValidatorIndicesSet.has(validatorIndex)) {
-                    duties.set(validatorIndex, {
-                        validatorIndex,
-                        committeeLength,
-                        committeesAtSlot,
-                        validatorCommitteeIndex: j,
-                        committeeIndex: i,
-                        slot: epochShuffling.epoch * SLOTS_PER_EPOCH + epochSlot,
-                    });
-                }
-            }
-        }
-    }
-    return duties;
-}
-//# sourceMappingURL=calculateCommitteeAssignments.js.map

package/lib/util/calculateCommitteeAssignments.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"calculateCommitteeAssignments.js","sourceRoot":"","sources":["../../src/util/calculateCommitteeAssignments.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,kBAAkB,CAAC;AAcjD,MAAM,UAAU,6BAA6B,CAC3C,cAA8B,EAC9B,yBAA2C;IAE3C,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACxE,MAAM,MAAM,GAAG,IAAI,GAAG,EAAgC,CAAC;IAEvD,MAAM,eAAe,GAAG,cAAc,CAAC,UAAU,CAAC;IAClD,KAAK,IAAI,SAAS,GAAG,CAAC,EAAE,SAAS,GAAG,eAAe,EAAE,SAAS,EAAE,EAAE,CAAC;QACjE,MAAM,cAAc,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;QAClD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,gBAAgB,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,GAAG,gBAAgB,EAAE,CAAC,EAAE,EAAE,CAAC;YACpF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,eAAe,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,eAAe,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrF,MAAM,cAAc,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5C,IAAI,4BAA4B,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;oBACrD,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE;wBACzB,cAAc;wBACd,eAAe;wBACf,gBAAgB;wBAChB,uBAAuB,EAAE,CAAC;wBAC1B,cAAc,EAAE,CAAC;wBACjB,IAAI,EAAE,cAAc,CAAC,KAAK,GAAG,eAAe,GAAG,SAAS;qBACzD,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC"}