fix: make sure shuffling is calculated when querying next epoch propo…

…sers (#7156) * feat: make getBeaconProposersNextEpoch async to await for shuffling calculation * fix: build error in getBeaconProposersNextEpoch * fix: failed unit test * refactor: use tuyen suggestion to await for shuffling keeping state-transition sync
ChainSafe · Oct 18, 2024 · 5ca8a96 · 5ca8a96
1 parent c01ff83
commit 5ca8a96
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/packages/beacon-node/src/api/impl/validator/index.ts b/packages/beacon-node/src/api/impl/validator/index.ts
@@ -957,6 +957,8 @@ export function getValidatorApi(
           break;
 
         case stateEpoch + 1:
+          // make sure shuffling is calculated and ready for next call to calculate nextProposers
+          await chain.shufflingCache.get(state.epochCtx.nextEpoch, state.epochCtx.nextDecisionRoot);
           // Requesting duties for next epoch is allowed since they can be predicted with high probabilities.
           // @see `epochCtx.getBeaconProposersNextEpoch` JSDocs for rationale.
           indexes = state.epochCtx.getBeaconProposersNextEpoch();

diff --git a/packages/state-transition/src/cache/epochCache.ts b/packages/state-transition/src/cache/epochCache.ts
@@ -921,7 +921,7 @@ export class EpochCache {
   getBeaconProposersNextEpoch(): ValidatorIndex[] {
     if (!this.proposersNextEpoch.computed) {
       const indexes = computeProposers(
-        this.config.getForkSeqAtEpoch(this.epoch + 1),
+        this.config.getForkSeqAtEpoch(this.nextEpoch),
         this.proposersNextEpoch.seed,
         this.getShufflingAtEpoch(this.nextEpoch),
         this.effectiveBalanceIncrements