Use sliceFrom()

ChainSafe · May 7, 2024 · a5b5fe0 · a5b5fe0
1 parent 2f6df3d
commit a5b5fe0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 16 deletions.
diff --git a/packages/state-transition/src/block/processWithdrawals.ts b/packages/state-transition/src/block/processWithdrawals.ts
@@ -25,8 +25,7 @@ export function processWithdrawals(
   state: CachedBeaconStateCapella | CachedBeaconStateElectra,
   payload: capella.FullOrBlindedExecutionPayload
 ): void {
-  // const {withdrawals: expectedWithdrawals, partialWithdrawalsCount} = getExpectedWithdrawals(fork, state);
-  const {withdrawals: expectedWithdrawals} = getExpectedWithdrawals(fork, state);
+  const {withdrawals: expectedWithdrawals, partialWithdrawalsCount} = getExpectedWithdrawals(fork, state);
   const numWithdrawals = expectedWithdrawals.length;
 
   if (isCapellaPayloadHeader(payload)) {
@@ -57,8 +56,8 @@ export function processWithdrawals(
   }
 
   if (fork >= ForkSeq.electra) {
-    const _stateElectra = state as CachedBeaconStateElectra;
-    // TODO Electra: stateElectra.pendingPartialWithdrawals need to implement slicing mechanism for ListCompositeTreeViewDU
+    const stateElectra = state as CachedBeaconStateElectra;
+    stateElectra.pendingPartialWithdrawals = stateElectra.pendingPartialWithdrawals.sliceFrom(partialWithdrawalsCount);
   }
 
   // Update the nextWithdrawalIndex

diff --git a/packages/state-transition/src/epoch/processPendingBalanceDeposits.ts b/packages/state-transition/src/epoch/processPendingBalanceDeposits.ts
@@ -12,7 +12,7 @@ import {getActivationExitChurnLimit} from "../util/validator.js";
 export function processPendingBalanceDeposits(state: CachedBeaconStateElectra): void {
   const availableForProcessing = state.depositBalanceToConsume + BigInt(getActivationExitChurnLimit(state));
   let processedAmount = 0n;
-  let _nextDepositIndex = 0;
+  let nextDepositIndex = 0;
 
   for (const deposit of state.pendingBalanceDeposits.getAllReadonly()) {
     const {amount} = deposit;
@@ -21,13 +21,11 @@ export function processPendingBalanceDeposits(state: CachedBeaconStateElectra):
     }
     increaseBalance(state, deposit.index, Number(amount));
     processedAmount = processedAmount + amount;
-    _nextDepositIndex++;
+    nextDepositIndex++;
   }
 
-  // TODO Electra: Impl slicing for ssz
-  const remainingPendingBalanceDeposits = [];
-  // const remainingPendingBalanceDeposits = state.pendingBalanceDeposits.slice()
-  // state.pendingBalanceDeposits = remainingPendingBalanceDeposits
+  const remainingPendingBalanceDeposits = state.pendingBalanceDeposits.sliceFrom(nextDepositIndex);
+  state.pendingBalanceDeposits = remainingPendingBalanceDeposits;
 
   if (remainingPendingBalanceDeposits.length === 0) {
     state.depositBalanceToConsume = 0n;

diff --git a/packages/state-transition/src/epoch/processPendingConsolidations.ts b/packages/state-transition/src/epoch/processPendingConsolidations.ts
@@ -17,14 +17,14 @@ import {switchToCompoundingValidator} from "../util/electra.js";
  *
  */
 export function processPendingConsolidations(state: CachedBeaconStateElectra): void {
-  let _nextPendingConsolidation = 0;
+  let nextPendingConsolidation = 0;
 
   for (const pendingConsolidation of state.pendingConsolidations.getAllReadonly()) {
     const {sourceIndex, targetIndex} = pendingConsolidation;
     const sourceValidator = state.validators.getReadonly(sourceIndex);
 
     if (sourceValidator.slashed) {
-      _nextPendingConsolidation++;
+      nextPendingConsolidation++;
       continue;
     }
 
@@ -38,10 +38,8 @@ export function processPendingConsolidations(state: CachedBeaconStateElectra): v
     decreaseBalance(state, sourceIndex, activeBalance);
     increaseBalance(state, targetIndex, activeBalance);
 
-    _nextPendingConsolidation++;
+    nextPendingConsolidation++;
   }
 
-  // TODO Electra: impl slicing for ssz
-  // const remainingPendingConsolidations = [];
-  // state.pendingConsolidations =remainingPendingConsolidations
+  state.pendingConsolidations = state.pendingConsolidations.sliceFrom(nextPendingConsolidation);
 }