@lodestar/state-transition 1.22.0-dev.9c62011986 → 1.22.0-dev.9f4bf50408

package/lib/block/processVoluntaryExit.js

@@ -1,5 +1,5 @@
-import { FAR_FUTURE_EPOCH } from "@lodestar/params";
-import { isActiveValidator } from "../util/index.js";
+import { FAR_FUTURE_EPOCH, ForkSeq } from "@lodestar/params";
+import { getPendingBalanceToWithdraw, isActiveValidator } from "../util/index.js";
 import { verifyVoluntaryExitSignature } from "../signatureSets/index.js";
 import { initiateValidatorExit } from "./index.js";
 /**
@@ -7,12 +7,15 @@ import { initiateValidatorExit } from "./index.js";
  *
  * PERF: Work depends on number of VoluntaryExit per block. On regular networks the average is 0 / block.
  */
-export function processVoluntaryExit(state, signedVoluntaryExit, verifySignature = true) {
-    if (!isValidVoluntaryExit(state, signedVoluntaryExit, verifySignature)) {
-        throw Error("Invalid voluntary exit");
+export function processVoluntaryExit(fork, state, signedVoluntaryExit, verifySignature = true) {
+    const isValidExit = fork >= ForkSeq.electra
+        ? isValidVoluntaryExitElectra(state, signedVoluntaryExit, verifySignature)
+        : isValidVoluntaryExit(state, signedVoluntaryExit, verifySignature);
+    if (!isValidExit) {
+        throw Error(`Invalid voluntary exit at forkSeq=${fork}`);
     }
     const validator = state.validators.get(signedVoluntaryExit.message.validatorIndex);
-    initiateValidatorExit(state, validator);
+    initiateValidatorExit(fork, state, validator);
 }
 export function isValidVoluntaryExit(state, signedVoluntaryExit, verifySignature = true) {
     const { config, epochCtx } = state;
@@ -31,4 +34,11 @@ export function isValidVoluntaryExit(state, signedVoluntaryExit, verifySignature
         // verify signature
         (!verifySignature || verifyVoluntaryExitSignature(state, signedVoluntaryExit)));
 }
+function isValidVoluntaryExitElectra(state, signedVoluntaryExit, verifySignature = true) {
+    // only exit validator if it has no pending withdrawals in the queue (post-Electra only)
+    if (getPendingBalanceToWithdraw(state, signedVoluntaryExit.message.validatorIndex) === 0) {
+        return isValidVoluntaryExit(state, signedVoluntaryExit, verifySignature);
+    }
+    return false;
+}
 //# sourceMappingURL=processVoluntaryExit.js.map

package/lib/block/processVoluntaryExit.js.map

@@ -1 +1 @@
-{"version":3,"file":"processVoluntaryExit.js","sourceRoot":"","sources":["../../src/block/processVoluntaryExit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAC,4BAA4B,EAAC,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAC,qBAAqB,EAAC,MAAM,YAAY,CAAC;AAEjD;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAClC,KAAgC,EAChC,mBAA+C,EAC/C,eAAe,GAAG,IAAI;IAEtB,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,mBAAmB,EAAE,eAAe,CAAC,EAAE,CAAC;QACvE,MAAM,KAAK,CAAC,wBAAwB,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACnF,qBAAqB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,KAAgC,EAChC,mBAA+C,EAC/C,eAAe,GAAG,IAAI;IAEtB,MAAM,EAAC,MAAM,EAAE,QAAQ,EAAC,GAAG,KAAK,CAAC;IACjC,MAAM,aAAa,GAAG,mBAAmB,CAAC,OAAO,CAAC;IAClD,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IACrE,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC;IAEpC,OAAO;IACL,iCAAiC;IACjC,iBAAiB,CAAC,SAAS,EAAE,YAAY,CAAC;QAC1C,qCAAqC;QACrC,SAAS,CAAC,SAAS,KAAK,gBAAgB;QACxC,qFAAqF;QACrF,YAAY,IAAI,aAAa,CAAC,KAAK;QACnC,mDAAmD;QACnD,YAAY,IAAI,SAAS,CAAC,eAAe,GAAG,MAAM,CAAC,sBAAsB;QACzE,mBAAmB;QACnB,CAAC,CAAC,eAAe,IAAI,4BAA4B,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC,CAC/E,CAAC;AACJ,CAAC"}
+{"version":3,"file":"processVoluntaryExit.js","sourceRoot":"","sources":["../../src/block/processVoluntaryExit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAE,OAAO,EAAC,MAAM,kBAAkB,CAAC;AAE3D,OAAO,EAAC,2BAA2B,EAAE,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EAAC,4BAA4B,EAAC,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAC,qBAAqB,EAAC,MAAM,YAAY,CAAC;AAEjD;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAClC,IAAa,EACb,KAAgC,EAChC,mBAA+C,EAC/C,eAAe,GAAG,IAAI;IAEtB,MAAM,WAAW,GACf,IAAI,IAAI,OAAO,CAAC,OAAO;QACrB,CAAC,CAAC,2BAA2B,CAAC,KAAiC,EAAE,mBAAmB,EAAE,eAAe,CAAC;QACtG,CAAC,CAAC,oBAAoB,CAAC,KAAK,EAAE,mBAAmB,EAAE,eAAe,CAAC,CAAC;IACxE,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,MAAM,KAAK,CAAC,qCAAqC,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,mBAAmB,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACnF,qBAAqB,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,KAAgC,EAChC,mBAA+C,EAC/C,eAAe,GAAG,IAAI;IAEtB,MAAM,EAAC,MAAM,EAAE,QAAQ,EAAC,GAAG,KAAK,CAAC;IACjC,MAAM,aAAa,GAAG,mBAAmB,CAAC,OAAO,CAAC;IAClD,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;IACrE,MAAM,YAAY,GAAG,QAAQ,CAAC,KAAK,CAAC;IAEpC,OAAO;IACL,iCAAiC;IACjC,iBAAiB,CAAC,SAAS,EAAE,YAAY,CAAC;QAC1C,qCAAqC;QACrC,SAAS,CAAC,SAAS,KAAK,gBAAgB;QACxC,qFAAqF;QACrF,YAAY,IAAI,aAAa,CAAC,KAAK;QACnC,mDAAmD;QACnD,YAAY,IAAI,SAAS,CAAC,eAAe,GAAG,MAAM,CAAC,sBAAsB;QACzE,mBAAmB;QACnB,CAAC,CAAC,eAAe,IAAI,4BAA4B,CAAC,KAAK,EAAE,mBAAmB,CAAC,CAAC,CAC/E,CAAC;AACJ,CAAC;AAED,SAAS,2BAA2B,CAClC,KAA+B,EAC/B,mBAA+C,EAC/C,eAAe,GAAG,IAAI;IAEtB,wFAAwF;IACxF,IAAI,2BAA2B,CAAC,KAAK,EAAE,mBAAmB,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC;QACzF,OAAO,oBAAoB,CAAC,KAAK,EAAE,mBAAmB,EAAE,eAAe,CAAC,CAAC;IAC3E,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC"}

package/lib/block/processWithdrawalRequest.d.ts

@@ -0,0 +1,5 @@
+import { electra } from "@lodestar/types";
+import { ForkSeq } from "@lodestar/params";
+import { CachedBeaconStateElectra } from "../types.js";
+export declare function processWithdrawalRequest(fork: ForkSeq, state: CachedBeaconStateElectra, withdrawalRequest: electra.WithdrawalRequest): void;
+//# sourceMappingURL=processWithdrawalRequest.d.ts.map

package/lib/block/processWithdrawalRequest.js

@@ -0,0 +1,67 @@
+import { ssz } from "@lodestar/types";
+import { FAR_FUTURE_EPOCH, MIN_ACTIVATION_BALANCE, PENDING_PARTIAL_WITHDRAWALS_LIMIT, FULL_EXIT_REQUEST_AMOUNT, } from "@lodestar/params";
+import { toHex } from "@lodestar/utils";
+import { hasCompoundingWithdrawalCredential, hasExecutionWithdrawalCredential } from "../util/electra.js";
+import { getPendingBalanceToWithdraw, isActiveValidator } from "../util/validator.js";
+import { computeExitEpochAndUpdateChurn } from "../util/epoch.js";
+import { initiateValidatorExit } from "./initiateValidatorExit.js";
+export function processWithdrawalRequest(fork, state, withdrawalRequest) {
+    const amount = Number(withdrawalRequest.amount);
+    const { pendingPartialWithdrawals, validators, epochCtx } = state;
+    // no need to use unfinalized pubkey cache from 6110 as validator won't be active anyway
+    const { pubkey2index, config } = epochCtx;
+    const isFullExitRequest = amount === FULL_EXIT_REQUEST_AMOUNT;
+    // If partial withdrawal queue is full, only full exits are processed
+    if (pendingPartialWithdrawals.length >= PENDING_PARTIAL_WITHDRAWALS_LIMIT && !isFullExitRequest) {
+        return;
+    }
+    // bail out if validator is not in beacon state
+    // note that we don't need to check for 6110 unfinalized vals as they won't be eligible for withdraw/exit anyway
+    const validatorIndex = pubkey2index.get(withdrawalRequest.validatorPubkey);
+    if (validatorIndex === undefined) {
+        return;
+    }
+    const validator = validators.get(validatorIndex);
+    if (!isValidatorEligibleForWithdrawOrExit(validator, withdrawalRequest.sourceAddress, state)) {
+        return;
+    }
+    // TODO Electra: Consider caching pendingPartialWithdrawals
+    const pendingBalanceToWithdraw = getPendingBalanceToWithdraw(state, validatorIndex);
+    const validatorBalance = state.balances.get(validatorIndex);
+    if (isFullExitRequest) {
+        // only exit validator if it has no pending withdrawals in the queue
+        if (pendingBalanceToWithdraw === 0) {
+            initiateValidatorExit(fork, state, validator);
+        }
+        return;
+    }
+    // partial withdrawal request
+    const hasSufficientEffectiveBalance = validator.effectiveBalance >= MIN_ACTIVATION_BALANCE;
+    const hasExcessBalance = validatorBalance > MIN_ACTIVATION_BALANCE + pendingBalanceToWithdraw;
+    // Only allow partial withdrawals with compounding withdrawal credentials
+    if (hasCompoundingWithdrawalCredential(validator.withdrawalCredentials) &&
+        hasSufficientEffectiveBalance &&
+        hasExcessBalance) {
+        const amountToWithdraw = BigInt(Math.min(validatorBalance - MIN_ACTIVATION_BALANCE - pendingBalanceToWithdraw, amount));
+        const exitQueueEpoch = computeExitEpochAndUpdateChurn(state, amountToWithdraw);
+        const withdrawableEpoch = exitQueueEpoch + config.MIN_VALIDATOR_WITHDRAWABILITY_DELAY;
+        const pendingPartialWithdrawal = ssz.electra.PendingPartialWithdrawal.toViewDU({
+            index: validatorIndex,
+            amount: amountToWithdraw,
+            withdrawableEpoch,
+        });
+        state.pendingPartialWithdrawals.push(pendingPartialWithdrawal);
+    }
+}
+function isValidatorEligibleForWithdrawOrExit(validator, sourceAddress, state) {
+    const { withdrawalCredentials } = validator;
+    const addressStr = toHex(withdrawalCredentials.subarray(12));
+    const sourceAddressStr = toHex(sourceAddress);
+    const { epoch: currentEpoch, config } = state.epochCtx;
+    return (hasExecutionWithdrawalCredential(withdrawalCredentials) &&
+        addressStr === sourceAddressStr &&
+        isActiveValidator(validator, currentEpoch) &&
+        validator.exitEpoch === FAR_FUTURE_EPOCH &&
+        currentEpoch >= validator.activationEpoch + config.SHARD_COMMITTEE_PERIOD);
+}
+//# sourceMappingURL=processWithdrawalRequest.js.map

package/lib/block/processWithdrawalRequest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"processWithdrawalRequest.js","sourceRoot":"","sources":["../../src/block/processWithdrawalRequest.ts"],"names":[],"mappings":"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"}

package/lib/block/processWithdrawals.d.ts

@@ -1,8 +1,10 @@
 import { capella } from "@lodestar/types";
-import { CachedBeaconStateCapella } from "../types.js";
-export declare function processWithdrawals(state: CachedBeaconStateCapella, payload: capella.FullOrBlindedExecutionPayload): void;
-export declare function getExpectedWithdrawals(state: CachedBeaconStateCapella): {
+import { ForkSeq } from "@lodestar/params";
+import { CachedBeaconStateCapella, CachedBeaconStateElectra } from "../types.js";
+export declare function processWithdrawals(fork: ForkSeq, state: CachedBeaconStateCapella | CachedBeaconStateElectra, payload: capella.FullOrBlindedExecutionPayload): void;
+export declare function getExpectedWithdrawals(fork: ForkSeq, state: CachedBeaconStateCapella | CachedBeaconStateElectra): {
     withdrawals: capella.Withdrawal[];
     sampledValidators: number;
+    partialWithdrawalsCount: number;
 };
 //# sourceMappingURL=processWithdrawals.d.ts.map

package/lib/block/processWithdrawals.js

@@ -1,15 +1,18 @@
-import { byteArrayEquals, toHexString } from "@chainsafe/ssz";
+import { byteArrayEquals } from "@chainsafe/ssz";
 import { ssz } from "@lodestar/types";
-import { MAX_EFFECTIVE_BALANCE, MAX_WITHDRAWALS_PER_PAYLOAD, MAX_VALIDATORS_PER_WITHDRAWALS_SWEEP, } from "@lodestar/params";
-import { decreaseBalance, hasEth1WithdrawalCredential, isCapellaPayloadHeader } from "../util/index.js";
-export function processWithdrawals(state, payload) {
-    const { withdrawals: expectedWithdrawals } = getExpectedWithdrawals(state);
+import { MAX_WITHDRAWALS_PER_PAYLOAD, MAX_VALIDATORS_PER_WITHDRAWALS_SWEEP, ForkSeq, MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP, FAR_FUTURE_EPOCH, MIN_ACTIVATION_BALANCE, MAX_EFFECTIVE_BALANCE, } from "@lodestar/params";
+import { toRootHex } from "@lodestar/utils";
+import { decreaseBalance, getMaxEffectiveBalance, hasEth1WithdrawalCredential, hasExecutionWithdrawalCredential, isCapellaPayloadHeader, } from "../util/index.js";
+export function processWithdrawals(fork, state, payload) {
+    // partialWithdrawalsCount is withdrawals coming from EL since electra (EIP-7002)
+    // TODO - electra: may switch to executionWithdrawalsCount
+    const { withdrawals: expectedWithdrawals, partialWithdrawalsCount } = getExpectedWithdrawals(fork, state);
     const numWithdrawals = expectedWithdrawals.length;
     if (isCapellaPayloadHeader(payload)) {
         const expectedWithdrawalsRoot = ssz.capella.Withdrawals.hashTreeRoot(expectedWithdrawals);
         const actualWithdrawalsRoot = payload.withdrawalsRoot;
         if (!byteArrayEquals(expectedWithdrawalsRoot, actualWithdrawalsRoot)) {
-            throw Error(`Invalid withdrawalsRoot of executionPayloadHeader, expected=${toHexString(expectedWithdrawalsRoot)}, actual=${toHexString(actualWithdrawalsRoot)}`);
+            throw Error(`Invalid withdrawalsRoot of executionPayloadHeader, expected=${toRootHex(expectedWithdrawalsRoot)}, actual=${toRootHex(actualWithdrawalsRoot)}`);
         }
     }
     else {
@@ -27,6 +30,10 @@ export function processWithdrawals(state, payload) {
         const withdrawal = expectedWithdrawals[i];
         decreaseBalance(state, withdrawal.validatorIndex, Number(withdrawal.amount));
     }
+    if (fork >= ForkSeq.electra) {
+        const stateElectra = state;
+        stateElectra.pendingPartialWithdrawals = stateElectra.pendingPartialWithdrawals.sliceFrom(partialWithdrawalsCount);
+    }
     // Update the nextWithdrawalIndex
     if (expectedWithdrawals.length > 0) {
         const latestWithdrawal = expectedWithdrawals[expectedWithdrawals.length - 1];
@@ -45,39 +52,85 @@ export function processWithdrawals(state, payload) {
             (state.nextWithdrawalValidatorIndex + MAX_VALIDATORS_PER_WITHDRAWALS_SWEEP) % state.validators.length;
     }
 }
-export function getExpectedWithdrawals(state) {
+export function getExpectedWithdrawals(fork, state) {
+    if (fork < ForkSeq.capella) {
+        throw new Error(`getExpectedWithdrawals not supported at forkSeq=${fork} < ForkSeq.capella`);
+    }
     const epoch = state.epochCtx.epoch;
     let withdrawalIndex = state.nextWithdrawalIndex;
     const { validators, balances, nextWithdrawalValidatorIndex } = state;
+    const withdrawals = [];
+    const isPostElectra = fork >= ForkSeq.electra;
+    if (isPostElectra) {
+        const stateElectra = state;
+        // MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP = 8, PENDING_PARTIAL_WITHDRAWALS_LIMIT: 134217728 so we should only call getAllReadonly() if it makes sense
+        // pendingPartialWithdrawals comes from EIP-7002 smart contract where it takes fee so it's more likely than not validator is in correct condition to withdraw
+        // also we may break early if withdrawableEpoch > epoch
+        const allPendingPartialWithdrawals = stateElectra.pendingPartialWithdrawals.length <= MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP
+            ? stateElectra.pendingPartialWithdrawals.getAllReadonly()
+            : null;
+        // EIP-7002: Execution layer triggerable withdrawals
+        for (let i = 0; i < stateElectra.pendingPartialWithdrawals.length; i++) {
+            const withdrawal = allPendingPartialWithdrawals
+                ? allPendingPartialWithdrawals[i]
+                : stateElectra.pendingPartialWithdrawals.getReadonly(i);
+            if (withdrawal.withdrawableEpoch > epoch || withdrawals.length === MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP) {
+                break;
+            }
+            const validator = validators.getReadonly(withdrawal.index);
+            if (validator.exitEpoch === FAR_FUTURE_EPOCH &&
+                validator.effectiveBalance >= MIN_ACTIVATION_BALANCE &&
+                balances.get(withdrawal.index) > MIN_ACTIVATION_BALANCE) {
+                const balanceOverMinActivationBalance = BigInt(balances.get(withdrawal.index) - MIN_ACTIVATION_BALANCE);
+                const withdrawableBalance = balanceOverMinActivationBalance < withdrawal.amount ? balanceOverMinActivationBalance : withdrawal.amount;
+                withdrawals.push({
+                    index: withdrawalIndex,
+                    validatorIndex: withdrawal.index,
+                    address: validator.withdrawalCredentials.subarray(12),
+                    amount: withdrawableBalance,
+                });
+                withdrawalIndex++;
+            }
+        }
+    }
+    // partialWithdrawalsCount is withdrawals coming from EL since electra (EIP-7002)
+    const partialWithdrawalsCount = withdrawals.length;
     const bound = Math.min(validators.length, MAX_VALIDATORS_PER_WITHDRAWALS_SWEEP);
     let n = 0;
-    const withdrawals = [];
     // Just run a bounded loop max iterating over all withdrawals
     // however breaks out once we have MAX_WITHDRAWALS_PER_PAYLOAD
     for (n = 0; n < bound; n++) {
         // Get next validator in turn
         const validatorIndex = (nextWithdrawalValidatorIndex + n) % validators.length;
-        // It's most likely for validators to not have set eth1 credentials, than having 0 balance
         const validator = validators.getReadonly(validatorIndex);
-        if (!hasEth1WithdrawalCredential(validator.withdrawalCredentials)) {
+        const balance = balances.get(validatorIndex);
+        const { withdrawableEpoch, withdrawalCredentials, effectiveBalance } = validator;
+        const hasWithdrawableCredentials = isPostElectra
+            ? hasExecutionWithdrawalCredential(withdrawalCredentials)
+            : hasEth1WithdrawalCredential(withdrawalCredentials);
+        // early skip for balance = 0 as its now more likely that validator has exited/slahed with
+        // balance zero than not have withdrawal credentials set
+        if (balance === 0 || !hasWithdrawableCredentials) {
             continue;
         }
-        const balance = balances.get(validatorIndex);
-        if (balance > 0 && validator.withdrawableEpoch <= epoch) {
+        // capella full withdrawal
+        if (withdrawableEpoch <= epoch) {
             withdrawals.push({
                 index: withdrawalIndex,
                 validatorIndex,
-                address: validator.withdrawalCredentials.slice(12),
+                address: validator.withdrawalCredentials.subarray(12),
                 amount: BigInt(balance),
             });
             withdrawalIndex++;
         }
-        else if (validator.effectiveBalance === MAX_EFFECTIVE_BALANCE && balance > MAX_EFFECTIVE_BALANCE) {
+        else if (effectiveBalance === (isPostElectra ? getMaxEffectiveBalance(withdrawalCredentials) : MAX_EFFECTIVE_BALANCE) &&
+            balance > effectiveBalance) {
+            // capella partial withdrawal
             withdrawals.push({
                 index: withdrawalIndex,
                 validatorIndex,
-                address: validator.withdrawalCredentials.slice(12),
-                amount: BigInt(balance - MAX_EFFECTIVE_BALANCE),
+                address: validator.withdrawalCredentials.subarray(12),
+                amount: BigInt(balance - effectiveBalance),
             });
             withdrawalIndex++;
         }
@@ -86,6 +139,6 @@ export function getExpectedWithdrawals(state) {
             break;
         }
     }
-    return { withdrawals, sampledValidators: n };
+    return { withdrawals, sampledValidators: n, partialWithdrawalsCount };
 }
 //# sourceMappingURL=processWithdrawals.js.map

package/lib/block/processWithdrawals.js.map

@@ -1 +1 @@
-{"version":3,"file":"processWithdrawals.js","sourceRoot":"","sources":["../../src/block/processWithdrawals.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EAAC,GAAG,EAAU,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EACL,qBAAqB,EACrB,2BAA2B,EAC3B,oCAAoC,GACrC,MAAM,kBAAkB,CAAC;AAG1B,OAAO,EAAC,eAAe,EAAE,2BAA2B,EAAE,sBAAsB,EAAC,MAAM,kBAAkB,CAAC;AAEtG,MAAM,UAAU,kBAAkB,CAChC,KAA+B,EAC/B,OAA8C;IAE9C,MAAM,EAAC,WAAW,EAAE,mBAAmB,EAAC,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IACzE,MAAM,cAAc,GAAG,mBAAmB,CAAC,MAAM,CAAC;IAElD,IAAI,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC;QACpC,MAAM,uBAAuB,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;QAC1F,MAAM,qBAAqB,GAAG,OAAO,CAAC,eAAe,CAAC;QACtD,IAAI,CAAC,eAAe,CAAC,uBAAuB,EAAE,qBAAqB,CAAC,EAAE,CAAC;YACrE,MAAM,KAAK,CACT,+DAA+D,WAAW,CACxE,uBAAuB,CACxB,YAAY,WAAW,CAAC,qBAAqB,CAAC,EAAE,CAClD,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,mBAAmB,CAAC,MAAM,KAAK,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YAC9D,MAAM,KAAK,CAAC,uCAAuC,cAAc,WAAW,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;QAC5G,CAAC;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE,CAAC;YACxC,MAAM,UAAU,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;YAC1C,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvE,MAAM,KAAK,CAAC,gCAAgC,CAAC,EAAE,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,EAAE,CAAC,EAAE,EAAE,CAAC;QACxC,MAAM,UAAU,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;QAC1C,eAAe,CAAC,KAAK,EAAE,UAAU,CAAC,cAAc,EAAE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED,iCAAiC;IACjC,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnC,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC7E,KAAK,CAAC,mBAAmB,GAAG,gBAAgB,CAAC,KAAK,GAAG,CAAC,CAAC;IACzD,CAAC;IAED,0CAA0C;IAC1C,IAAI,mBAAmB,CAAC,MAAM,KAAK,2BAA2B,EAAE,CAAC;QAC/D,2FAA2F;QAC3F,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC7E,KAAK,CAAC,4BAA4B,GAAG,CAAC,gBAAgB,CAAC,cAAc,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;IACvG,CAAC;SAAM,CAAC;QACN,8FAA8F;QAC9F,0BAA0B;QAC1B,KAAK,CAAC,4BAA4B;YAChC,CAAC,KAAK,CAAC,4BAA4B,GAAG,oCAAoC,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;IAC1G,CAAC;AACH,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,KAA+B;IAIpE,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;IACnC,IAAI,eAAe,GAAG,KAAK,CAAC,mBAAmB,CAAC;IAChD,MAAM,EAAC,UAAU,EAAE,QAAQ,EAAE,4BAA4B,EAAC,GAAG,KAAK,CAAC;IACnE,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,oCAAoC,CAAC,CAAC;IAEhF,IAAI,CAAC,GAAG,CAAC,CAAC;IAEV,MAAM,WAAW,GAAyB,EAAE,CAAC;IAC7C,6DAA6D;IAC7D,8DAA8D;IAC9D,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC;QAC3B,6BAA6B;QAC7B,MAAM,cAAc,GAAG,CAAC,4BAA4B,GAAG,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC;QAE9E,0FAA0F;QAC1F,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC;QACzD,IAAI,CAAC,2BAA2B,CAAC,SAAS,CAAC,qBAAqB,CAAC,EAAE,CAAC;YAClE,SAAS;QACX,CAAC;QAED,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAE7C,IAAI,OAAO,GAAG,CAAC,IAAI,SAAS,CAAC,iBAAiB,IAAI,KAAK,EAAE,CAAC;YACxD,WAAW,CAAC,IAAI,CAAC;gBACf,KAAK,EAAE,eAAe;gBACtB,cAAc;gBACd,OAAO,EAAE,SAAS,CAAC,qBAAqB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClD,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC;aACxB,CAAC,CAAC;YACH,eAAe,EAAE,CAAC;QACpB,CAAC;aAAM,IAAI,SAAS,CAAC,gBAAgB,KAAK,qBAAqB,IAAI,OAAO,GAAG,qBAAqB,EAAE,CAAC;YACnG,WAAW,CAAC,IAAI,CAAC;gBACf,KAAK,EAAE,eAAe;gBACtB,cAAc;gBACd,OAAO,EAAE,SAAS,CAAC,qBAAqB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClD,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,qBAAqB,CAAC;aAChD,CAAC,CAAC;YACH,eAAe,EAAE,CAAC;QACpB,CAAC;QAED,4CAA4C;QAC5C,IAAI,WAAW,CAAC,MAAM,IAAI,2BAA2B,EAAE,CAAC;YACtD,MAAM;QACR,CAAC;IACH,CAAC;IAED,OAAO,EAAC,WAAW,EAAE,iBAAiB,EAAE,CAAC,EAAC,CAAC;AAC7C,CAAC"}
+{"version":3,"file":"processWithdrawals.js","sourceRoot":"","sources":["../../src/block/processWithdrawals.ts"],"names":[],"mappings":"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"}

package/lib/block/slashValidator.js

@@ -1,4 +1,4 @@
-import { EFFECTIVE_BALANCE_INCREMENT, EPOCHS_PER_SLASHINGS_VECTOR, ForkSeq, MIN_SLASHING_PENALTY_QUOTIENT, MIN_SLASHING_PENALTY_QUOTIENT_ALTAIR, MIN_SLASHING_PENALTY_QUOTIENT_BELLATRIX, PROPOSER_REWARD_QUOTIENT, PROPOSER_WEIGHT, TIMELY_TARGET_FLAG_INDEX, WEIGHT_DENOMINATOR, WHISTLEBLOWER_REWARD_QUOTIENT, } from "@lodestar/params";
+import { EFFECTIVE_BALANCE_INCREMENT, EPOCHS_PER_SLASHINGS_VECTOR, ForkSeq, MIN_SLASHING_PENALTY_QUOTIENT, MIN_SLASHING_PENALTY_QUOTIENT_ALTAIR, MIN_SLASHING_PENALTY_QUOTIENT_BELLATRIX, MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA, PROPOSER_REWARD_QUOTIENT, PROPOSER_WEIGHT, TIMELY_TARGET_FLAG_INDEX, WEIGHT_DENOMINATOR, WHISTLEBLOWER_REWARD_QUOTIENT, WHISTLEBLOWER_REWARD_QUOTIENT_ELECTRA, } from "@lodestar/params";
 import { decreaseBalance, increaseBalance } from "../util/index.js";
 import { initiateValidatorExit } from "./initiateValidatorExit.js";
 /** Same to https://github.com/ethereum/eth2.0-specs/blob/v1.1.0-alpha.5/specs/altair/beacon-chain.md#has_flag */
@@ -8,14 +8,14 @@ export function slashValidator(fork, state, slashedIndex, whistleblowerIndex) {
     const { epoch, effectiveBalanceIncrements } = epochCtx;
     const validator = state.validators.get(slashedIndex);
     // TODO: Bellatrix initiateValidatorExit validators.update() with the one below
-    initiateValidatorExit(state, validator);
+    initiateValidatorExit(fork, state, validator);
     validator.slashed = true;
     validator.withdrawableEpoch = Math.max(validator.withdrawableEpoch, epoch + EPOCHS_PER_SLASHINGS_VECTOR);
     const { effectiveBalance } = validator;
     // state.slashings is initially a Gwei (BigInt) vector, however since Nov 2023 it's converted to UintNum64 (number) vector in the state transition because:
     //  - state.slashings[nextEpoch % EPOCHS_PER_SLASHINGS_VECTOR] is reset per epoch in processSlashingsReset()
     //  - max slashed validators per epoch is SLOTS_PER_EPOCH * MAX_ATTESTER_SLASHINGS * MAX_VALIDATORS_PER_COMMITTEE which is 32 * 2 * 2048 = 131072 on mainnet
-    //  - with that and 32_000_000_000 MAX_EFFECTIVE_BALANCE, it still fits in a number given that Math.floor(Number.MAX_SAFE_INTEGER / 32_000_000_000) = 281474
+    //  - with that and 32_000_000_000 MAX_EFFECTIVE_BALANCE or 2048_000_000_000 MAX_EFFECTIVE_BALANCE_ELECTRA, it still fits in a number given that Math.floor(Number.MAX_SAFE_INTEGER / 32_000_000_000) = 281474
     //  - we don't need to compute the total slashings from state.slashings, it's handled by totalSlashingsByIncrement in EpochCache
     const slashingIndex = epoch % EPOCHS_PER_SLASHINGS_VECTOR;
     state.slashings.set(slashingIndex, (state.slashings.get(slashingIndex) ?? 0) + effectiveBalance);
@@ -24,10 +24,14 @@ export function slashValidator(fork, state, slashedIndex, whistleblowerIndex) {
         ? MIN_SLASHING_PENALTY_QUOTIENT
         : fork === ForkSeq.altair
             ? MIN_SLASHING_PENALTY_QUOTIENT_ALTAIR
-            : MIN_SLASHING_PENALTY_QUOTIENT_BELLATRIX;
+            : fork < ForkSeq.electra // no change from bellatrix to deneb
+                ? MIN_SLASHING_PENALTY_QUOTIENT_BELLATRIX
+                : MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA;
     decreaseBalance(state, slashedIndex, Math.floor(effectiveBalance / minSlashingPenaltyQuotient));
     // apply proposer and whistleblower rewards
-    const whistleblowerReward = Math.floor(effectiveBalance / WHISTLEBLOWER_REWARD_QUOTIENT);
+    const whistleblowerReward = fork < ForkSeq.electra
+        ? Math.floor(effectiveBalance / WHISTLEBLOWER_REWARD_QUOTIENT)
+        : Math.floor(effectiveBalance / WHISTLEBLOWER_REWARD_QUOTIENT_ELECTRA);
     const proposerReward = fork === ForkSeq.phase0
         ? Math.floor(whistleblowerReward / PROPOSER_REWARD_QUOTIENT)
         : Math.floor((whistleblowerReward * PROPOSER_WEIGHT) / WEIGHT_DENOMINATOR);

package/lib/block/slashValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"slashValidator.js","sourceRoot":"","sources":["../../src/block/slashValidator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"slashValidator.js","sourceRoot":"","sources":["../../src/block/slashValidator.ts"],"names":[],"mappings":"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"}

package/lib/cache/effectiveBalanceIncrements.d.ts

@@ -1,14 +1,13 @@
 import { BeaconStateAllForks } from "../types.js";
 /**
  * Alias to allow easier refactoring.
- * TODO: Estimate the risk of future proof of MAX_EFFECTIVE_BALANCE_INCREMENT < 255
  */
-export type EffectiveBalanceIncrements = Uint8Array;
-/** Helper to prevent re-writting tests downstream if we change Uint8Array to number[] */
+export type EffectiveBalanceIncrements = Uint16Array;
+/** Helper to prevent re-writting tests downstream if we change Uint16Array to number[] */
 export declare function getEffectiveBalanceIncrementsZeroed(len: number): EffectiveBalanceIncrements;
 /**
  * effectiveBalanceIncrements length will always be equal or greater than validatorCount. The
- * getEffectiveBalanceIncrementsByteLen() modulo is used to reduce the frequency at which its Uint8Array is recreated.
+ * getEffectiveBalanceIncrementsByteLen() modulo is used to reduce the frequency at which its Uint16Array is recreated.
  * if effectiveBalanceIncrements has length greater than validatorCount it's not a problem since those values would
  * never be accessed.
  */

package/lib/cache/effectiveBalanceIncrements.js

@@ -1,18 +1,18 @@
 import { EFFECTIVE_BALANCE_INCREMENT } from "@lodestar/params";
-/** Helper to prevent re-writting tests downstream if we change Uint8Array to number[] */
+/** Helper to prevent re-writting tests downstream if we change Uint16Array to number[] */
 export function getEffectiveBalanceIncrementsZeroed(len) {
-    return new Uint8Array(len);
+    return new Uint16Array(len);
 }
 /**
  * effectiveBalanceIncrements length will always be equal or greater than validatorCount. The
- * getEffectiveBalanceIncrementsByteLen() modulo is used to reduce the frequency at which its Uint8Array is recreated.
+ * getEffectiveBalanceIncrementsByteLen() modulo is used to reduce the frequency at which its Uint16Array is recreated.
  * if effectiveBalanceIncrements has length greater than validatorCount it's not a problem since those values would
  * never be accessed.
  */
 export function getEffectiveBalanceIncrementsWithLen(validatorCount) {
     // TODO: Research what's the best number to minimize both memory cost and copy costs
     const byteLen = 1024 * Math.ceil(validatorCount / 1024);
-    return new Uint8Array(byteLen);
+    return new Uint16Array(byteLen);
 }
 /**
  * Shows how EffectiveBalanceIncrements is meant to be populated.
@@ -21,7 +21,7 @@ export function getEffectiveBalanceIncrementsWithLen(validatorCount) {
  */
 export function getEffectiveBalanceIncrements(state) {
     const validatorsArr = state.validators.getAllReadonlyValues();
-    const effectiveBalanceIncrements = new Uint8Array(validatorsArr.length);
+    const effectiveBalanceIncrements = new Uint16Array(validatorsArr.length);
     for (let i = 0; i < validatorsArr.length; i++) {
         effectiveBalanceIncrements[i] = Math.floor(validatorsArr[i].effectiveBalance / EFFECTIVE_BALANCE_INCREMENT);
     }

package/lib/cache/effectiveBalanceIncrements.js.map

@@ -1 +1 @@
-{"version":3,"file":"effectiveBalanceIncrements.js","sourceRoot":"","sources":["../../src/cache/effectiveBalanceIncrements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,2BAA2B,EAAC,MAAM,kBAAkB,CAAC;AAS7D,yFAAyF;AACzF,MAAM,UAAU,mCAAmC,CAAC,GAAW;IAC7D,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,oCAAoC,CAAC,cAAsB;IACzE,oFAAoF;IACpF,MAAM,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAExD,OAAO,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;AACjC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,6BAA6B,CAAC,KAA0B;IACtE,MAAM,aAAa,GAAG,KAAK,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC;IAC9D,MAAM,0BAA0B,GAAG,IAAI,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACxE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,0BAA0B,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,gBAAgB,GAAG,2BAA2B,CAAC,CAAC;IAC9G,CAAC;IACD,OAAO,0BAA0B,CAAC;AACpC,CAAC"}
+{"version":3,"file":"effectiveBalanceIncrements.js","sourceRoot":"","sources":["../../src/cache/effectiveBalanceIncrements.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,2BAA2B,EAAC,MAAM,kBAAkB,CAAC;AAQ7D,0FAA0F;AAC1F,MAAM,UAAU,mCAAmC,CAAC,GAAW;IAC7D,OAAO,IAAI,WAAW,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,oCAAoC,CAAC,cAAsB;IACzE,oFAAoF;IACpF,MAAM,OAAO,GAAG,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,CAAC;IAExD,OAAO,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,6BAA6B,CAAC,KAA0B;IACtE,MAAM,aAAa,GAAG,KAAK,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC;IAC9D,MAAM,0BAA0B,GAAG,IAAI,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IACzE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC9C,0BAA0B,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,gBAAgB,GAAG,2BAA2B,CAAC,CAAC;IAC9G,CAAC;IACD,OAAO,0BAA0B,CAAC;AACpC,CAAC"}

package/lib/cache/epochCache.d.ts

@@ -1,9 +1,13 @@
-import { BLSSignature, CommitteeIndex, Epoch, Slot, ValidatorIndex, phase0, SyncPeriod } from "@lodestar/types";
+import { PublicKey } from "@chainsafe/blst";
+import * as immutable from "immutable";
+import { BLSSignature, CommitteeIndex, Epoch, Slot, ValidatorIndex, phase0, SyncPeriod, Attestation, IndexedAttestation } from "@lodestar/types";
 import { BeaconConfig, ChainConfig } from "@lodestar/config";
+import { ForkSeq } from "@lodestar/params";
 import { LodestarError } from "@lodestar/utils";
 import { EpochShuffling } from "../util/epochShuffling.js";
+import { EpochCacheMetrics } from "../metrics.js";
 import { EffectiveBalanceIncrements } from "./effectiveBalanceIncrements.js";
-import { Index2PubkeyCache, PubkeyIndexMap } from "./pubkeyCache.js";
+import { Index2PubkeyCache, PubkeyIndexMap, UnfinalizedPubkeyIndexMap, PubkeyHex } from "./pubkeyCache.js";
 import { BeaconStateAllForks, ShufflingGetter } from "./types.js";
 import { SyncCommitteeCache } from "./syncCommitteeCache.js";
 /** `= PROPOSER_WEIGHT / (WEIGHT_DENOMINATOR - PROPOSER_WEIGHT)` */
@@ -51,23 +55,30 @@ type ProposersDeferred = {
 export declare class EpochCache {
     config: BeaconConfig;
     /**
-     * Unique globally shared pubkey registry. There should only exist one for the entire application.
+     * Unique globally shared finalized pubkey registry. There should only exist one for the entire application.
      *
      * TODO: this is a hack, we need a safety mechanism in case a bad eth1 majority vote is in,
      * or handle non finalized data differently, or use an immutable.js structure for cheap copies
-     * Warning: may contain pubkeys that do not yet exist in the current state, but do in a later processed state.
+     *
+     * New: This would include only validators whose activation_eligibility_epoch != FAR_FUTURE_EPOCH and hence it is
+     * insert only. Validators could be 1) Active 2) In the activation queue 3) Initialized but pending queued
      *
      * $VALIDATOR_COUNT x 192 char String -> Number Map
      */
     pubkey2index: PubkeyIndexMap;
     /**
-     * Unique globally shared pubkey registry. There should only exist one for the entire application.
+     * Unique globally shared finalized pubkey registry. There should only exist one for the entire application.
      *
-     * Warning: may contain indices that do not yet exist in the current state, but do in a later processed state.
+     * New: This would include only validators whose activation_eligibility_epoch != FAR_FUTURE_EPOCH and hence it is
+     * insert only. Validators could be 1) Active 2) In the activation queue 3) Initialized but pending queued
      *
      * $VALIDATOR_COUNT x BLST deserialized pubkey (Jacobian coordinates)
      */
     index2pubkey: Index2PubkeyCache;
+    /**
+     * Unique pubkey registry shared in the same fork. There should only exist one for the fork.
+     */
+    unfinalizedPubkey2index: UnfinalizedPubkeyIndexMap;
     /**
      * Indexes of the block proposers for the current epoch.
      *
@@ -125,6 +136,7 @@ export declare class EpochCache {
      * initiateValidatorExit(). This value may vary on each fork of the state.
      *
      * NOTE: Changes block to block
+     * NOTE: No longer used by initiateValidatorExit post-electra
      */
     exitQueueEpoch: Epoch;
     /**
@@ -132,6 +144,7 @@ export declare class EpochCache {
      * initiateValidatorExit(). This value may vary on each fork of the state.
      *
      * NOTE: Changes block to block
+     * NOTE: No longer used by initiateValidatorExit post-electra
      */
     exitQueueChurn: number;
     /**
@@ -158,10 +171,20 @@ export declare class EpochCache {
     nextSyncCommitteeIndexed: SyncCommitteeCache;
     epoch: Epoch;
     syncPeriod: SyncPeriod;
+    /**
+     * state.validators.length of every state at epoch boundary
+     * They are saved in increasing order of epoch.
+     * The first validator length in the list corresponds to the state AFTER the latest finalized checkpoint state. ie. state.finalizedCheckpoint.epoch - 1
+     * The last validator length corresponds to the latest epoch state ie. this.epoch
+     * eg. latest epoch = 105, latest finalized cp state epoch = 102
+     * then the list will be (in terms of epoch) [103, 104, 105]
+     */
+    historicalValidatorLengths: immutable.List<number>;
     constructor(data: {
         config: BeaconConfig;
         pubkey2index: PubkeyIndexMap;
         index2pubkey: Index2PubkeyCache;
+        unfinalizedPubkey2index: UnfinalizedPubkeyIndexMap;
         proposers: number[];
         proposersPrevEpoch: number[] | null;
         proposersNextEpoch: ProposersDeferred;
@@ -184,10 +207,11 @@ export declare class EpochCache {
         nextSyncCommitteeIndexed: SyncCommitteeCache;
         epoch: Epoch;
         syncPeriod: SyncPeriod;
+        historialValidatorLengths: immutable.List<number>;
     });
     /**
      * Create an epoch cache
-     * @param validators cached validators that matches `state.validators`
+     * @param state a finalized beacon state. Passing in unfinalized state may cause unexpected behaviour eg. empty unfinalized cache
      *
      * SLOW CODE - 🐢
      */
@@ -201,6 +225,7 @@ export declare class EpochCache {
      * new epoch.
      */
     afterProcessEpoch(state: BeaconStateAllForks, epochTransitionCache: {
+        indicesEligibleForActivationQueue: ValidatorIndex[];
         nextEpochShufflingActiveValidatorIndices: ValidatorIndex[];
         nextEpochShufflingActiveIndicesLength: number;
         nextEpochTotalActiveBalanceByIncrement: number;
@@ -210,6 +235,10 @@ export declare class EpochCache {
      * Return the beacon committee at slot for index.
      */
     getBeaconCommittee(slot: Slot, index: CommitteeIndex): Uint32Array;
+    /**
+     * Return a single Uint32Array representing concatted committees of indices
+     */
+    getBeaconCommittees(slot: Slot, indices: CommitteeIndex[]): Uint32Array;
     getCommitteeCountPerSlot(epoch: Epoch): number;
     /**
      * Compute the correct subnet for a slot/committee index
@@ -258,7 +287,11 @@ export declare class EpochCache {
     /**
      * Return the indexed attestation corresponding to ``attestation``.
      */
-    getIndexedAttestation(attestation: phase0.Attestation): phase0.IndexedAttestation;
+    getIndexedAttestation(fork: ForkSeq, attestation: Attestation): IndexedAttestation;
+    /**
+     * Return indices of validators who attestested in `attestation`
+     */
+    getAttestingIndices(fork: ForkSeq, attestation: Attestation): number[];
     getCommitteeAssignments(epoch: Epoch, requestedValidatorIndices: ValidatorIndex[]): Map<ValidatorIndex, AttesterDuty>;
     /**
      * Return the committee assignment in the ``epoch`` for ``validator_index``.
@@ -270,7 +303,30 @@ export declare class EpochCache {
      */
     getCommitteeAssignment(epoch: Epoch, validatorIndex: ValidatorIndex): phase0.CommitteeAssignment | null;
     isAggregator(slot: Slot, index: CommitteeIndex, slotSignature: BLSSignature): boolean;
+    /**
+     * Return finalized pubkey given the validator index.
+     * Only finalized pubkey as we do not store unfinalized pubkey because no where in the spec has a
+     * need to make such enquiry
+     */
+    getPubkey(index: ValidatorIndex): PublicKey | undefined;
+    getValidatorIndex(pubkey: Uint8Array | PubkeyHex): ValidatorIndex | undefined;
+    /**
+     *
+     * Add unfinalized pubkeys
+     *
+     */
     addPubkey(index: ValidatorIndex, pubkey: Uint8Array): void;
+    addUnFinalizedPubkey(index: ValidatorIndex, pubkey: PubkeyHex | Uint8Array, metrics?: EpochCacheMetrics): void;
+    addFinalizedPubkeys(pubkeyMap: UnfinalizedPubkeyIndexMap, metrics?: EpochCacheMetrics): void;
+    /**
+     * Add finalized validator index and pubkey into finalized cache.
+     * Since addFinalizedPubkey() primarily takes pubkeys from unfinalized cache, it can take pubkey hex string directly
+     */
+    addFinalizedPubkey(index: ValidatorIndex, pubkey: PubkeyHex | Uint8Array, metrics?: EpochCacheMetrics): void;
+    /**
+     * Delete pubkeys from unfinalized cache
+     */
+    deleteUnfinalizedPubkeys(pubkeys: Iterable<PubkeyHex>): void;
     getShufflingAtSlot(slot: Slot): EpochShuffling;
     getShufflingAtSlotOrNull(slot: Slot): EpochShuffling | null;
     getShufflingAtEpoch(epoch: Epoch): EpochShuffling;
@@ -292,6 +348,8 @@ export declare class EpochCache {
     /** On phase0 -> altair fork, set both current and nextSyncCommitteeIndexed */
     setSyncCommitteesIndexed(nextSyncCommitteeIndices: number[]): void;
     effectiveBalanceIncrementsSet(index: number, effectiveBalance: number): void;
+    isPostElectra(): boolean;
+    getValidatorCountAtEpoch(targetEpoch: Epoch): number | undefined;
 }
 type AttesterDuty = {
     validatorIndex: ValidatorIndex;