feat: process deposit requests at epoch processing

packages/beacon-node/test/spec/presets/epoch_processing.test.ts

@@ -46,7 +46,7 @@ const epochTransitionFns: Record<string, EpochTransitionFn> = {
     epochFns.processSyncCommitteeUpdates(fork, state as CachedBeaconStateAltair);
   },
   historical_summaries_update: epochFns.processHistoricalSummariesUpdate as EpochTransitionFn,
-  pending_balance_deposits: epochFns.processPendingBalanceDeposits as EpochTransitionFn,
+  pending_deposits: epochFns.processPendingDeposits as EpochTransitionFn,
   pending_consolidations: epochFns.processPendingConsolidations as EpochTransitionFn,
 };
 

packages/beacon-node/test/spec/specTestVersioning.ts

@@ -15,7 +15,7 @@ import {DownloadTestsOptions} from "@lodestar/spec-test-util/downloadTests";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 export const ethereumConsensusSpecsTests: DownloadTestsOptions = {
-  specVersion: "v1.5.0-alpha.6",
+  specVersion: "v1.5.0-alpha.7",
   // Target directory is the host package root: 'packages/*/spec-tests'
   outputDir: path.join(__dirname, "../../spec-tests"),
   specTestsRepoUrl: "https://github.com/ethereum/consensus-spec-tests",

packages/params/src/index.ts

@@ -96,7 +96,7 @@ export const {
 
   MAX_EFFECTIVE_BALANCE_ELECTRA,
   MIN_ACTIVATION_BALANCE,
-  PENDING_BALANCE_DEPOSITS_LIMIT,
+  PENDING_DEPOSITS_LIMIT,
   PENDING_PARTIAL_WITHDRAWALS_LIMIT,
   PENDING_CONSOLIDATIONS_LIMIT,
   MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA,
@@ -107,6 +107,7 @@ export const {
   MAX_ATTESTER_SLASHINGS_ELECTRA,
   MAX_ATTESTATIONS_ELECTRA,
   MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP,
+  MAX_PENDING_DEPOSITS_PER_EPOCH,
   WHISTLEBLOWER_REWARD_QUOTIENT_ELECTRA,
 } = activePreset;
 

packages/params/src/presets/mainnet.ts

@@ -125,11 +125,12 @@ export const mainnetPreset: BeaconPreset = {
   MAX_ATTESTER_SLASHINGS_ELECTRA: 1,
   MAX_ATTESTATIONS_ELECTRA: 8,
   MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP: 8,
+  MAX_PENDING_DEPOSITS_PER_EPOCH: 16,
   // 2**11 * 10**9 (= 2,048,000,000,000) Gwei
   MAX_EFFECTIVE_BALANCE_ELECTRA: 2048000000000,
   MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA: 4096,
   MIN_ACTIVATION_BALANCE: 32000000000,
-  PENDING_BALANCE_DEPOSITS_LIMIT: 134217728,
+  PENDING_DEPOSITS_LIMIT: 134217728,
   PENDING_PARTIAL_WITHDRAWALS_LIMIT: 134217728,
   PENDING_CONSOLIDATIONS_LIMIT: 262144,
   MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: 1,

packages/params/src/presets/minimal.ts

@@ -126,11 +126,12 @@ export const minimalPreset: BeaconPreset = {
   MAX_ATTESTER_SLASHINGS_ELECTRA: 1,
   MAX_ATTESTATIONS_ELECTRA: 8,
   MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP: 1,
+  MAX_PENDING_DEPOSITS_PER_EPOCH: 16,
   // 2**11 * 10**9 (= 2,048,000,000,000) Gwei
   MAX_EFFECTIVE_BALANCE_ELECTRA: 2048000000000,
   MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA: 4096,
   MIN_ACTIVATION_BALANCE: 32000000000,
-  PENDING_BALANCE_DEPOSITS_LIMIT: 134217728,
+  PENDING_DEPOSITS_LIMIT: 134217728,
   PENDING_PARTIAL_WITHDRAWALS_LIMIT: 64,
   PENDING_CONSOLIDATIONS_LIMIT: 64,
   MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: 1,

packages/params/src/types.ts

@@ -89,10 +89,11 @@ export type BeaconPreset = {
   MAX_ATTESTER_SLASHINGS_ELECTRA: number;
   MAX_ATTESTATIONS_ELECTRA: number;
   MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP: number;
+  MAX_PENDING_DEPOSITS_PER_EPOCH: number;
   MAX_EFFECTIVE_BALANCE_ELECTRA: number;
   MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA: number;
   MIN_ACTIVATION_BALANCE: number;
-  PENDING_BALANCE_DEPOSITS_LIMIT: number;
+  PENDING_DEPOSITS_LIMIT: number;
   PENDING_PARTIAL_WITHDRAWALS_LIMIT: number;
   PENDING_CONSOLIDATIONS_LIMIT: number;
   MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: number;
@@ -189,10 +190,11 @@ export const beaconPresetTypes: BeaconPresetTypes = {
   MAX_ATTESTER_SLASHINGS_ELECTRA: "number",
   MAX_ATTESTATIONS_ELECTRA: "number",
   MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP: "number",
+  MAX_PENDING_DEPOSITS_PER_EPOCH: "number",
   MAX_EFFECTIVE_BALANCE_ELECTRA: "number",
   MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA: "number",
   MIN_ACTIVATION_BALANCE: "number",
-  PENDING_BALANCE_DEPOSITS_LIMIT: "number",
+  PENDING_DEPOSITS_LIMIT: "number",
   PENDING_PARTIAL_WITHDRAWALS_LIMIT: "number",
   PENDING_CONSOLIDATIONS_LIMIT: "number",
   MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD: "number",

packages/state-transition/src/block/processDeposit.ts

@@ -8,21 +8,15 @@ import {
   EFFECTIVE_BALANCE_INCREMENT,
   FAR_FUTURE_EPOCH,
   ForkSeq,
+  GENESIS_SLOT,
   MAX_EFFECTIVE_BALANCE,
 } from "@lodestar/params";
 
 import {DepositData} from "@lodestar/types/lib/phase0/types.js";
 import {DepositRequest} from "@lodestar/types/lib/electra/types.js";
 import {BeaconConfig} from "@lodestar/config";
 import {ZERO_HASH} from "../constants/index.js";
-import {
-  computeDomain,
-  computeSigningRoot,
-  hasCompoundingWithdrawalCredential,
-  hasEth1WithdrawalCredential,
-  increaseBalance,
-  switchToCompoundingValidator,
-} from "../util/index.js";
+import {computeDomain, computeSigningRoot, getMaxEffectiveBalance, increaseBalance} from "../util/index.js";
 import {CachedBeaconStateAllForks, CachedBeaconStateAltair, CachedBeaconStateElectra} from "../types.js";
 
 /**
@@ -62,37 +56,42 @@ export function applyDeposit(
   deposit: DepositData | DepositRequest
 ): void {
   const {config, validators, epochCtx} = state;
-  const {pubkey, withdrawalCredentials, amount} = deposit;
+  const {pubkey, withdrawalCredentials, amount, signature} = deposit;
 
   const cachedIndex = epochCtx.getValidatorIndex(pubkey);
-  if (cachedIndex === null || !Number.isSafeInteger(cachedIndex) || cachedIndex >= validators.length) {
-    if (isValidDepositSignature(config, pubkey, withdrawalCredentials, amount, deposit.signature)) {
-      addValidatorToRegistry(fork, state, pubkey, withdrawalCredentials, amount);
-    }
-  } else {
-    if (fork < ForkSeq.electra) {
+  const isNewValidator = cachedIndex === null || !Number.isSafeInteger(cachedIndex) || cachedIndex >= validators.length;
+
+  if (fork < ForkSeq.electra) {
+    if (isNewValidator) {
+      if (isValidDepositSignature(config, pubkey, withdrawalCredentials, amount, signature)) {
+        addValidatorToRegistry(fork, state, pubkey, withdrawalCredentials, amount);
+      }
+    } else {
       // increase balance by deposit amount right away pre-electra
       increaseBalance(state, cachedIndex, amount);
-    } else if (fork >= ForkSeq.electra) {
-      const stateElectra = state as CachedBeaconStateElectra;
-      const pendingBalanceDeposit = ssz.electra.PendingBalanceDeposit.toViewDU({
-        index: cachedIndex,
-        amount: BigInt(amount),
-      });
-      stateElectra.pendingBalanceDeposits.push(pendingBalanceDeposit);
-
-      if (
-        hasCompoundingWithdrawalCredential(withdrawalCredentials) &&
-        hasEth1WithdrawalCredential(validators.getReadonly(cachedIndex).withdrawalCredentials) &&
-        isValidDepositSignature(config, pubkey, withdrawalCredentials, amount, deposit.signature)
-      ) {
-        switchToCompoundingValidator(stateElectra, cachedIndex);
+    }
+  } else {
+    const stateElectra = state as CachedBeaconStateElectra;
+    const pendingDeposit = ssz.electra.PendingDeposit.toViewDU({
+      pubkey,
+      withdrawalCredentials,
+      amount,
+      signature,
+      slot: GENESIS_SLOT, // Use GENESIS_SLOT to distinguish from a pending deposit request
+    });
+
+    if (isNewValidator) {
+      if (isValidDepositSignature(config, pubkey, withdrawalCredentials, amount, deposit.signature)) {
+        addValidatorToRegistry(fork, state, pubkey, withdrawalCredentials, 0);
+        stateElectra.pendingDeposits.push(pendingDeposit);
       }
+    } else {
+      stateElectra.pendingDeposits.push(pendingDeposit);
     }
   }
 }
 
-function addValidatorToRegistry(
+export function addValidatorToRegistry(
   fork: ForkSeq,
   state: CachedBeaconStateAllForks,
   pubkey: BLSPubkey,
@@ -101,8 +100,10 @@ function addValidatorToRegistry(
 ): void {
   const {validators, epochCtx} = state;
   // add validator and balance entries
-  const effectiveBalance =
-    fork < ForkSeq.electra ? Math.min(amount - (amount % EFFECTIVE_BALANCE_INCREMENT), MAX_EFFECTIVE_BALANCE) : 0;
+  const effectiveBalance = Math.min(
+    amount - (amount % EFFECTIVE_BALANCE_INCREMENT),
+    fork < ForkSeq.electra ? MAX_EFFECTIVE_BALANCE : getMaxEffectiveBalance(withdrawalCredentials)
+  );
   validators.push(
     ssz.phase0.Validator.toViewDU({
       pubkey,
@@ -138,20 +139,10 @@ function addValidatorToRegistry(
     stateAltair.currentEpochParticipation.push(0);
   }
 
-  if (fork < ForkSeq.electra) {
-    state.balances.push(amount);
-  } else if (fork >= ForkSeq.electra) {
-    state.balances.push(0);
-    const stateElectra = state as CachedBeaconStateElectra;
-    const pendingBalanceDeposit = ssz.electra.PendingBalanceDeposit.toViewDU({
-      index: validatorIndex,
-      amount: BigInt(amount),
-    });
-    stateElectra.pendingBalanceDeposits.push(pendingBalanceDeposit);
-  }
+  state.balances.push(amount);
 }
 
-function isValidDepositSignature(
+export function isValidDepositSignature(
   config: BeaconConfig,
   pubkey: Uint8Array,
   withdrawalCredentials: Uint8Array,

packages/state-transition/src/block/processDepositRequest.ts

@@ -1,8 +1,7 @@
-import {electra} from "@lodestar/types";
+import {electra, ssz} from "@lodestar/types";
 import {ForkSeq, UNSET_DEPOSIT_REQUESTS_START_INDEX} from "@lodestar/params";
 
 import {CachedBeaconStateElectra} from "../types.js";
-import {applyDeposit} from "./processDeposit.js";
 
 export function processDepositRequest(
   fork: ForkSeq,
@@ -13,5 +12,13 @@ export function processDepositRequest(
     state.depositRequestsStartIndex = BigInt(depositRequest.index);
   }
 
-  applyDeposit(fork, state, depositRequest);
+  // Create pending deposit
+  const pendingDeposit = ssz.electra.PendingDeposit.toViewDU({
+    pubkey: depositRequest.pubkey,
+    withdrawalCredentials: depositRequest.withdrawalCredentials,
+    amount: depositRequest.amount,
+    signature: depositRequest.signature,
+    slot: state.slot,
+  });
+  state.pendingDeposits.push(pendingDeposit);
 }

packages/state-transition/src/epoch/index.ts

@@ -28,7 +28,7 @@ import {processRewardsAndPenalties} from "./processRewardsAndPenalties.js";
 import {processSlashings} from "./processSlashings.js";
 import {processSlashingsReset} from "./processSlashingsReset.js";
 import {processSyncCommitteeUpdates} from "./processSyncCommitteeUpdates.js";
-import {processPendingBalanceDeposits} from "./processPendingBalanceDeposits.js";
+import {processPendingDeposits} from "./processPendingDeposits.js";
 import {processPendingConsolidations} from "./processPendingConsolidations.js";
 
 // For spec tests
@@ -48,7 +48,7 @@ export {
   processParticipationFlagUpdates,
   processSyncCommitteeUpdates,
   processHistoricalSummariesUpdate,
-  processPendingBalanceDeposits,
+  processPendingDeposits,
   processPendingConsolidations,
 };
 
@@ -70,7 +70,7 @@ export enum EpochTransitionStep {
   processEffectiveBalanceUpdates = "processEffectiveBalanceUpdates",
   processParticipationFlagUpdates = "processParticipationFlagUpdates",
   processSyncCommitteeUpdates = "processSyncCommitteeUpdates",
-  processPendingBalanceDeposits = "processPendingBalanceDeposits",
+  processPendingDeposits = "processPendingDeposits",
   processPendingConsolidations = "processPendingConsolidations",
 }
 
@@ -131,9 +131,9 @@ export function processEpoch(
     const stateElectra = state as CachedBeaconStateElectra;
     {
       const timer = metrics?.epochTransitionStepTime.startTimer({
-        step: EpochTransitionStep.processPendingBalanceDeposits,
+        step: EpochTransitionStep.processPendingDeposits,
       });
-      processPendingBalanceDeposits(stateElectra, cache);
+      processPendingDeposits(stateElectra, cache);
       timer?.();
     }
 

packages/state-transition/src/epoch/processEffectiveBalanceUpdates.ts

@@ -42,7 +42,7 @@ export function processEffectiveBalanceUpdates(
   // update effective balances with hysteresis
 
   // epochTransitionCache.balances is initialized in processRewardsAndPenalties()
-  // and updated in processPendingBalanceDeposits() and processPendingConsolidations()
+  // and updated in processPendingDeposits() and processPendingConsolidations()
   // so it's recycled here for performance.
   const balances = cache.balances ?? state.balances.getAll();
   const currentEpochValidators = cache.validators;