fix: fix electra genesis spec test (#6764)

* process pending deposit from eth1 * Fix the genesis params * fix * Fix * clean up --------- Co-authored-by: Nazar Hussain <[email protected]>
ChainSafe · Jun 25, 2024 · c36e440 · c36e440
1 parent f2462a7
commit c36e440
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 9 deletions.
diff --git a/packages/beacon-node/src/chain/genesis/genesis.ts b/packages/beacon-node/src/chain/genesis/genesis.ts
@@ -174,7 +174,13 @@ export class GenesisBuilder implements IGenesisBuilder {
         };
       });
 
-    const {activatedValidatorCount} = applyDeposits(this.config, this.state, newDeposits, this.depositTree);
+    const {activatedValidatorCount} = applyDeposits(
+      this.config.getForkSeq(this.state.slot),
+      this.config,
+      this.state,
+      newDeposits,
+      this.depositTree
+    );
     this.activatedValidatorCount += activatedValidatorCount;
 
     // TODO: If necessary persist deposits here to this.db.depositData, this.db.depositDataRoot

diff --git a/packages/state-transition/src/util/genesis.ts b/packages/state-transition/src/util/genesis.ts
@@ -4,17 +4,19 @@ import {
   EFFECTIVE_BALANCE_INCREMENT,
   EPOCHS_PER_HISTORICAL_VECTOR,
   ForkName,
+  ForkSeq,
   GENESIS_EPOCH,
   GENESIS_SLOT,
   MAX_EFFECTIVE_BALANCE,
   UNSET_DEPOSIT_RECEIPTS_START_INDEX,
 } from "@lodestar/params";
 import {Bytes32, phase0, Root, ssz, TimeSeconds} from "@lodestar/types";
 
-import {CachedBeaconStateAllForks, BeaconStateAllForks} from "../types.js";
+import {CachedBeaconStateAllForks, BeaconStateAllForks, CachedBeaconStateElectra} from "../types.js";
 import {createCachedBeaconState} from "../cache/stateCache.js";
 import {EpochCacheImmutableData} from "../cache/epochCache.js";
 import {processDeposit} from "../block/processDeposit.js";
+import {increaseBalance} from "../index.js";
 import {computeEpochAtSlot} from "./epoch.js";
 import {getActiveValidatorIndices} from "./validator.js";
 import {getTemporaryBlockHeader} from "./blockRoot.js";
@@ -127,6 +129,7 @@ export function applyTimestamp(config: ChainForkConfig, state: CachedBeaconState
  * @returns active validator indices
  */
 export function applyDeposits(
+  fork: ForkSeq,
   config: ChainForkConfig,
   state: CachedBeaconStateAllForks,
   newDeposits: phase0.Deposit[],
@@ -164,6 +167,16 @@ export function applyDeposits(
     processDeposit(fork, state, deposit);
   }
 
+  // Process deposit balance updates
+  if (fork >= ForkSeq.electra) {
+    const stateElectra = state as CachedBeaconStateElectra;
+    stateElectra.commit();
+    for (const {index: validatorIndex, amount} of stateElectra.pendingBalanceDeposits.getAllReadonly()) {
+      increaseBalance(state, validatorIndex, Number(amount));
+    }
+    stateElectra.pendingBalanceDeposits = ssz.electra.PendingBalanceDeposits.defaultViewDU();
+  }
+
   // Process activations
   const {epochCtx} = state;
   const balancesArr = state.balances.getAll();
@@ -226,6 +239,8 @@ export function initializeBeaconStateFromEth1(
     getTemporaryBlockHeader(config, config.getForkTypes(GENESIS_SLOT).BeaconBlock.defaultValue())
   );
 
+  const fork = config.getForkSeq(GENESIS_SLOT);
+
   // We need a CachedBeaconState to run processDeposit() which uses various caches.
   // However at this point the state's syncCommittees are not known.
   // This function can be called by:
@@ -240,13 +255,13 @@ export function initializeBeaconStateFromEth1(
   applyEth1BlockHash(state, eth1BlockHash);
 
   // Process deposits
-  applyDeposits(config, state, deposits, fullDepositDataRootList);
+  applyDeposits(fork, config, state, deposits, fullDepositDataRootList);
 
   // Commit before reading all validators in `getActiveValidatorIndices()`
   state.commit();
   const activeValidatorIndices = getActiveValidatorIndices(state, computeEpochAtSlot(GENESIS_SLOT));
 
-  if (GENESIS_SLOT >= config.ALTAIR_FORK_EPOCH) {
+  if (fork >= ForkSeq.altair) {
     const {syncCommittee} = getNextSyncCommittee(
       state,
       activeValidatorIndices,
@@ -259,7 +274,7 @@ export function initializeBeaconStateFromEth1(
     stateAltair.nextSyncCommittee = ssz.altair.SyncCommittee.toViewDU(syncCommittee);
   }
 
-  if (GENESIS_SLOT >= config.BELLATRIX_FORK_EPOCH) {
+  if (fork >= ForkSeq.bellatrix) {
     const stateBellatrix = state as CompositeViewDU<typeof ssz.bellatrix.BeaconState>;
     stateBellatrix.fork.previousVersion = config.BELLATRIX_FORK_VERSION;
     stateBellatrix.fork.currentVersion = config.BELLATRIX_FORK_VERSION;
@@ -268,7 +283,7 @@ export function initializeBeaconStateFromEth1(
       ssz.bellatrix.ExecutionPayloadHeader.defaultViewDU();
   }
 
-  if (GENESIS_SLOT >= config.CAPELLA_FORK_EPOCH) {
+  if (fork >= ForkSeq.capella) {
     const stateCapella = state as CompositeViewDU<typeof ssz.capella.BeaconState>;
     stateCapella.fork.previousVersion = config.CAPELLA_FORK_VERSION;
     stateCapella.fork.currentVersion = config.CAPELLA_FORK_VERSION;
@@ -277,7 +292,7 @@ export function initializeBeaconStateFromEth1(
       ssz.capella.ExecutionPayloadHeader.defaultViewDU();
   }
 
-  if (GENESIS_SLOT >= config.DENEB_FORK_EPOCH) {
+  if (fork >= ForkSeq.deneb) {
     const stateDeneb = state as CompositeViewDU<typeof ssz.deneb.BeaconState>;
     stateDeneb.fork.previousVersion = config.DENEB_FORK_VERSION;
     stateDeneb.fork.currentVersion = config.DENEB_FORK_VERSION;
@@ -286,7 +301,7 @@ export function initializeBeaconStateFromEth1(
       ssz.deneb.ExecutionPayloadHeader.defaultViewDU();
   }
 
-  if (GENESIS_SLOT >= config.ELECTRA_FORK_EPOCH) {
+  if (fork >= ForkSeq.electra) {
     const stateElectra = state as CompositeViewDU<typeof ssz.electra.BeaconState>;
     stateElectra.fork.previousVersion = config.ELECTRA_FORK_VERSION;
     stateElectra.fork.currentVersion = config.ELECTRA_FORK_VERSION;

diff --git a/packages/types/src/electra/sszTypes.ts b/packages/types/src/electra/sszTypes.ts
@@ -275,6 +275,11 @@ export const PendingBalanceDeposit = new ContainerType(
   {typeName: "PendingBalanceDeposit", jsonCase: "eth2"}
 );
 
+export const PendingBalanceDeposits = new ListCompositeType(
+  PendingBalanceDeposit,
+  Number(PENDING_BALANCE_DEPOSITS_LIMIT)
+);
+
 export const PartialWithdrawal = new ContainerType(
   {
     index: ValidatorIndex,
@@ -341,7 +346,7 @@ export const BeaconState = new ContainerType(
     earliestExitEpoch: Epoch, // New in Electra:EIP7251
     consolidationBalanceToConsume: Gwei, // New in Electra:EIP7251
     earliestConsolidationEpoch: Epoch, // New in Electra:EIP7251
-    pendingBalanceDeposits: new ListCompositeType(PendingBalanceDeposit, Number(PENDING_BALANCE_DEPOSITS_LIMIT)), // new in electra:eip7251
+    pendingBalanceDeposits: PendingBalanceDeposits, // new in electra:eip7251
     pendingPartialWithdrawals: new ListCompositeType(PartialWithdrawal, Number(PENDING_PARTIAL_WITHDRAWALS_LIMIT)), // New in Electra:EIP7251
     pendingConsolidations: new ListCompositeType(PendingConsolidation, Number(PENDING_CONSOLIDATIONS_LIMIT)), // new in electra:eip7251
   },