Merge 21e3728 into 6ab2697

Author: wemeetagain

packages/beacon-node/src/chain/rewards/attestationsRewards.ts

@@ -140,35 +140,35 @@ function computeTotalAttestationsRewardsAltair(
   validatorIds: (ValidatorIndex | string)[] = []
 ): TotalAttestationsReward[] {
   const rewards = [];
-  const {statuses} = transitionCache;
+  const {flags} = transitionCache;
   const {epochCtx, config} = state;
   const validatorIndices = validatorIds
     .map((id) => (typeof id === "number" ? id : epochCtx.pubkey2index.get(id)))
     .filter((index) => index !== undefined); // Validator indices to include in the result
 
   const inactivityPenaltyDenominator = config.INACTIVITY_SCORE_BIAS * INACTIVITY_PENALTY_QUOTIENT_ALTAIR;
 
-  for (let i = 0; i < statuses.length; i++) {
+  for (let i = 0; i < flags.length; i++) {
     if (validatorIndices.length && !validatorIndices.includes(i)) {
       continue;
     }
 
-    const status = statuses[i];
-    if (!hasMarkers(status.flags, FLAG_ELIGIBLE_ATTESTER)) {
+    const flag = flags[i];
+    if (!hasMarkers(flag, FLAG_ELIGIBLE_ATTESTER)) {
       continue;
     }
 
     const effectiveBalanceIncrement = epochCtx.effectiveBalanceIncrements[i];
 
     const currentRewards = {...defaultAttestationsReward, validatorIndex: i};
 
-    if (hasMarkers(status.flags, FLAG_PREV_SOURCE_ATTESTER_UNSLASHED)) {
+    if (hasMarkers(flag, FLAG_PREV_SOURCE_ATTESTER_UNSLASHED)) {
       currentRewards.source = idealRewards[effectiveBalanceIncrement].source;
     } else {
       currentRewards.source = penalties[effectiveBalanceIncrement].source * -1; // Negative reward to indicate penalty
     }
 
-    if (hasMarkers(status.flags, FLAG_PREV_TARGET_ATTESTER_UNSLASHED)) {
+    if (hasMarkers(flag, FLAG_PREV_TARGET_ATTESTER_UNSLASHED)) {
       currentRewards.target = idealRewards[effectiveBalanceIncrement].target;
     } else {
       currentRewards.target = penalties[effectiveBalanceIncrement].target * -1;
@@ -179,7 +179,7 @@ function computeTotalAttestationsRewardsAltair(
       currentRewards.inactivity = Math.floor(inactivityPenaltyNumerator / inactivityPenaltyDenominator) * -1;
     }
 
-    if (hasMarkers(status.flags, FLAG_PREV_HEAD_ATTESTER_UNSLASHED)) {
+    if (hasMarkers(flag, FLAG_PREV_HEAD_ATTESTER_UNSLASHED)) {
       currentRewards.head = idealRewards[effectiveBalanceIncrement].head;
     }
 

packages/beacon-node/src/metrics/validatorMonitor.ts

@@ -1,6 +1,5 @@
 import {
   computeEpochAtSlot,
-  AttesterStatus,
   parseAttesterFlags,
   CachedBeaconStateAllForks,
   CachedBeaconStateAltair,
@@ -39,7 +38,14 @@ export enum OpSource {
 export type ValidatorMonitor = {
   registerLocalValidator(index: number): void;
   registerLocalValidatorInSyncCommittee(index: number, untilEpoch: Epoch): void;
-  registerValidatorStatuses(currentEpoch: Epoch, statuses: AttesterStatus[], balances?: number[]): void;
+  registerValidatorStatuses(
+    currentEpoch: Epoch,
+    inclusionDelays: number[],
+    flags: number[],
+    isActiveCurrEpoch: boolean[],
+    isActivePrevEpoch: boolean[],
+    balances?: number[]
+  ): void;
   registerBeaconBlock(src: OpSource, seenTimestampSec: Seconds, block: BeaconBlock): void;
   registerBlobSidecar(src: OpSource, seenTimestampSec: Seconds, blob: deneb.BlobSidecar): void;
   registerImportedBlock(block: BeaconBlock, data: {proposerBalanceDelta: number}): void;
@@ -115,12 +121,17 @@ type ValidatorStatus = {
   inclusionDistance: number;
 };
 
-function statusToSummary(status: AttesterStatus): ValidatorStatus {
-  const flags = parseAttesterFlags(status.flags);
+function statusToSummary(
+  inclusionDelay: number,
+  flag: number,
+  isActiveInCurrentEpoch: boolean,
+  isActiveInPreviousEpoch: boolean
+): ValidatorStatus {
+  const flags = parseAttesterFlags(flag);
   return {
     isSlashed: flags.unslashed,
-    isActiveInCurrentEpoch: status.active,
-    isActiveInPreviousEpoch: status.active,
+    isActiveInCurrentEpoch,
+    isActiveInPreviousEpoch,
     // TODO: Implement
     currentEpochEffectiveBalance: 0,
 
@@ -130,7 +141,7 @@ function statusToSummary(status: AttesterStatus): ValidatorStatus {
     isCurrSourceAttester: flags.currSourceAttester,
     isCurrTargetAttester: flags.currTargetAttester,
     isCurrHeadAttester: flags.currHeadAttester,
-    inclusionDistance: status.inclusionDelay,
+    inclusionDistance: inclusionDelay,
   };
 }
 
@@ -287,7 +298,7 @@ export function createValidatorMonitor(
       }
     },
 
-    registerValidatorStatuses(currentEpoch, statuses, balances) {
+    registerValidatorStatuses(currentEpoch, inclusionDelays, flags, isActiveCurrEpoch, isActiveInPrevEpoch, balances) {
       // Prevent registering status for the same epoch twice. processEpoch() may be ran more than once for the same epoch.
       if (currentEpoch <= lastRegisteredStatusEpoch) {
         return;
@@ -301,12 +312,12 @@ export function createValidatorMonitor(
         // - One to account for it being the previous epoch.
         // - One to account for the state advancing an epoch whilst generating the validator
         //     statuses.
-        const status = statuses[index];
-        if (status === undefined) {
-          continue;
-        }
-
-        const summary = statusToSummary(status);
+        const summary = statusToSummary(
+          inclusionDelays[index],
+          flags[index],
+          isActiveCurrEpoch[index],
+          isActiveInPrevEpoch[index]
+        );
 
         if (summary.isPrevSourceAttester) {
           metrics.validatorMonitor.prevEpochOnChainSourceAttesterHit.inc();

packages/state-transition/src/cache/epochTransitionCache.ts

@@ -3,8 +3,6 @@ import {intDiv} from "@lodestar/utils";
 import {EPOCHS_PER_SLASHINGS_VECTOR, FAR_FUTURE_EPOCH, ForkSeq, MAX_EFFECTIVE_BALANCE} from "@lodestar/params";
 
 import {
-  AttesterStatus,
-  createAttesterStatus,
   hasMarkers,
   FLAG_UNSLASHED,
   FLAG_ELIGIBLE_ATTESTER,
@@ -128,7 +126,12 @@ export interface EpochTransitionCache {
    * - prev attester flag set
    * With a status flag to check this conditions at once we just have to mask with an OR of the conditions.
    */
-  statuses: AttesterStatus[];
+
+  proposerIndices: number[];
+
+  inclusionDelays: number[];
+
+  flags: number[];
 
   /**
    * balances array will be populated by processRewardsAndPenalties() and consumed by processEffectiveBalanceUpdates().
@@ -161,13 +164,40 @@ export interface EpochTransitionCache {
    */
   nextEpochTotalActiveBalanceByIncrement: number;
 
+  /**
+   * Track by validator index if it's active in the prev epoch.
+   * Used in metrics
+   */
+  isActivePrevEpoch: boolean[];
+
+  /**
+   * Track by validator index if it's active in the current epoch.
+   * Used in metrics
+   */
+  isActiveCurrEpoch: boolean[];
+
   /**
    * Track by validator index if it's active in the next epoch.
    * Used in `processEffectiveBalanceUpdates` to save one loop over validators after epoch process.
    */
   isActiveNextEpoch: boolean[];
 }
 
+// reuse arrays to avoid memory reallocation and gc
+// WARNING: this is not async safe
+/** WARNING: reused, never gc'd */
+const isActivePrevEpoch = new Array<boolean>();
+/** WARNING: reused, never gc'd */
+const isActiveCurrEpoch = new Array<boolean>();
+/** WARNING: reused, never gc'd */
+const isActiveNextEpoch = new Array<boolean>();
+/** WARNING: reused, never gc'd */
+const proposerIndices = new Array<number>();
+/** WARNING: reused, never gc'd */
+const inclusionDelays = new Array<number>();
+/** WARNING: reused, never gc'd */
+const flags = new Array<number>();
+
 export function beforeProcessEpoch(
   state: CachedBeaconStateAllForks,
   opts?: EpochTransitionCacheOpts
@@ -188,9 +218,6 @@ export function beforeProcessEpoch(
   const indicesEligibleForActivation: ValidatorIndex[] = [];
   const indicesToEject: ValidatorIndex[] = [];
   const nextEpochShufflingActiveValidatorIndices: ValidatorIndex[] = [];
-  const isActivePrevEpoch: boolean[] = [];
-  const isActiveNextEpoch: boolean[] = [];
-  const statuses: AttesterStatus[] = [];
 
   let totalActiveStakeByIncrement = 0;
 
@@ -200,21 +227,47 @@ export function beforeProcessEpoch(
   const validators = state.validators.getAllReadonlyValues();
   const validatorCount = validators.length;
 
+  // pre-fill with true (most validators are active)
+  isActivePrevEpoch.length = validatorCount;
+  isActiveCurrEpoch.length = validatorCount;
+  isActiveNextEpoch.length = validatorCount;
+  isActivePrevEpoch.fill(true);
+  isActiveCurrEpoch.fill(true);
+  isActiveNextEpoch.fill(true);
+
+  // During the epoch transition, additional data is precomputed to avoid traversing any state a second
+  // time. Attestations are a big part of this, and each validator has a "status" to represent its
+  // precomputed participation.
+  // - proposerIndex: number; // -1 when not included by any proposer
+  // - inclusionDelay: number;
+  // - flags: number; // bitfield of AttesterFlags
+  proposerIndices.length = validatorCount;
+  inclusionDelays.length = validatorCount;
+  flags.length = validatorCount;
+  proposerIndices.fill(-1);
+  inclusionDelays.fill(0);
+  // flags.fill(0);
+  // flags will be zero'd out below
+  // In the first loop, set slashed+eligibility
+  // In the second loop, set participation flags
+  // TODO: optimize by combining the two loops
+  // likely will require splitting into phase0 and post-phase0 versions
+
   // Clone before being mutated in processEffectiveBalanceUpdates
   epochCtx.beforeEpochTransition();
 
   const effectiveBalancesByIncrements = epochCtx.effectiveBalanceIncrements;
 
   for (let i = 0; i < validatorCount; i++) {
     const validator = validators[i];
-    const status = createAttesterStatus();
+    let flag = 0;
 
     if (validator.slashed) {
       if (slashingsEpoch === validator.withdrawableEpoch) {
         indicesToSlash.push(i);
       }
     } else {
-      status.flags |= FLAG_UNSLASHED;
+      flag |= FLAG_UNSLASHED;
     }
 
     const {activationEpoch, exitEpoch} = validator;
@@ -223,19 +276,24 @@ export function beforeProcessEpoch(
     const isActiveNext = activationEpoch <= nextEpoch && nextEpoch < exitEpoch;
     const isActiveNext2 = activationEpoch <= nextEpoch2 && nextEpoch2 < exitEpoch;
 
-    isActivePrevEpoch.push(isActivePrev);
+    if (!isActivePrev) {
+      isActivePrevEpoch[i] = false;
+    }
 
     // Both active validators and slashed-but-not-yet-withdrawn validators are eligible to receive penalties.
     // This is done to prevent self-slashing from being a way to escape inactivity leaks.
     // TODO: Consider using an array of `eligibleValidatorIndices: number[]`
     if (isActivePrev || (validator.slashed && prevEpoch + 1 < validator.withdrawableEpoch)) {
       eligibleValidatorIndices.push(i);
-      status.flags |= FLAG_ELIGIBLE_ATTESTER;
+      flag |= FLAG_ELIGIBLE_ATTESTER;
     }
 
+    flags[i] = flag;
+
     if (isActiveCurr) {
-      status.active = true;
       totalActiveStakeByIncrement += effectiveBalancesByIncrements[i];
+    } else {
+      isActiveCurrEpoch[i] = false;
     }
 
     // To optimize process_registry_updates():
@@ -278,16 +336,16 @@ export function beforeProcessEpoch(
     //
     // Use `else` since indicesEligibleForActivationQueue + indicesEligibleForActivation + indicesToEject are mutually exclusive
     else if (
-      status.active &&
+      isActiveCurr &&
       validator.exitEpoch === FAR_FUTURE_EPOCH &&
       validator.effectiveBalance <= config.EJECTION_BALANCE
     ) {
       indicesToEject.push(i);
     }
 
-    statuses.push(status);
-
-    isActiveNextEpoch.push(isActiveNext);
+    if (!isActiveNext) {
+      isActiveNextEpoch[i] = false;
+    }
 
     if (isActiveNext2) {
       nextEpochShufflingActiveValidatorIndices.push(i);
@@ -312,7 +370,9 @@ export function beforeProcessEpoch(
   if (forkSeq === ForkSeq.phase0) {
     processPendingAttestations(
       state as CachedBeaconStatePhase0,
-      statuses,
+      proposerIndices,
+      inclusionDelays,
+      flags,
       (state as CachedBeaconStatePhase0).previousEpochAttestations.getAllReadonly(),
       prevEpoch,
       FLAG_PREV_SOURCE_ATTESTER,
@@ -321,7 +381,9 @@ export function beforeProcessEpoch(
     );
     processPendingAttestations(
       state as CachedBeaconStatePhase0,
-      statuses,
+      proposerIndices,
+      inclusionDelays,
+      flags,
       (state as CachedBeaconStatePhase0).currentEpochAttestations.getAllReadonly(),
       currentEpoch,
       FLAG_CURR_SOURCE_ATTESTER,
@@ -330,23 +392,15 @@ export function beforeProcessEpoch(
     );
   } else {
     const previousEpochParticipation = (state as CachedBeaconStateAltair).previousEpochParticipation.getAll();
-    for (let i = 0; i < previousEpochParticipation.length; i++) {
-      const status = statuses[i];
-      // this is required to pass random spec tests in altair
-      if (isActivePrevEpoch[i]) {
-        // FLAG_PREV are indexes [0,1,2]
-        status.flags |= previousEpochParticipation[i];
-      }
-    }
-
     const currentEpochParticipation = (state as CachedBeaconStateAltair).currentEpochParticipation.getAll();
-    for (let i = 0; i < currentEpochParticipation.length; i++) {
-      const status = statuses[i];
-      // this is required to pass random spec tests in altair
-      if (status.active) {
-        // FLAG_PREV are indexes [3,4,5], so shift by 3
-        status.flags |= currentEpochParticipation[i] << 3;
-      }
+    for (let i = 0; i < validatorCount; i++) {
+      flags[i] |=
+        // checking active status first is required to pass random spec tests in altair
+        // in practice, inactive validators will have 0 participation
+        // FLAG_PREV are indexes [0,1,2]
+        (isActivePrevEpoch[i] ? previousEpochParticipation[i] : 0) |
+        // FLAG_CURR are indexes [3,4,5], so shift by 3
+        (isActiveCurrEpoch[i] ? currentEpochParticipation[i] << 3 : 0);
     }
   }
 
@@ -361,19 +415,19 @@ export function beforeProcessEpoch(
   const FLAG_PREV_HEAD_ATTESTER_UNSLASHED = FLAG_PREV_HEAD_ATTESTER | FLAG_UNSLASHED;
   const FLAG_CURR_TARGET_UNSLASHED = FLAG_CURR_TARGET_ATTESTER | FLAG_UNSLASHED;
 
-  for (let i = 0; i < statuses.length; i++) {
-    const status = statuses[i];
+  for (let i = 0; i < validatorCount; i++) {
     const effectiveBalanceByIncrement = effectiveBalancesByIncrements[i];
-    if (hasMarkers(status.flags, FLAG_PREV_SOURCE_ATTESTER_UNSLASHED)) {
+    const flag = flags[i];
+    if (hasMarkers(flag, FLAG_PREV_SOURCE_ATTESTER_UNSLASHED)) {
       prevSourceUnslStake += effectiveBalanceByIncrement;
     }
-    if (hasMarkers(status.flags, FLAG_PREV_TARGET_ATTESTER_UNSLASHED)) {
+    if (hasMarkers(flag, FLAG_PREV_TARGET_ATTESTER_UNSLASHED)) {
       prevTargetUnslStake += effectiveBalanceByIncrement;
     }
-    if (hasMarkers(status.flags, FLAG_PREV_HEAD_ATTESTER_UNSLASHED)) {
+    if (hasMarkers(flag, FLAG_PREV_HEAD_ATTESTER_UNSLASHED)) {
       prevHeadUnslStake += effectiveBalanceByIncrement;
     }
-    if (hasMarkers(status.flags, FLAG_CURR_TARGET_UNSLASHED)) {
+    if (hasMarkers(flag, FLAG_CURR_TARGET_UNSLASHED)) {
       currTargetUnslStake += effectiveBalanceByIncrement;
     }
   }
@@ -421,8 +475,12 @@ export function beforeProcessEpoch(
     nextEpochShufflingActiveValidatorIndices,
     // to be updated in processEffectiveBalanceUpdates
     nextEpochTotalActiveBalanceByIncrement: 0,
+    isActivePrevEpoch,
+    isActiveCurrEpoch,
     isActiveNextEpoch,
-    statuses,
+    proposerIndices,
+    inclusionDelays,
+    flags,
 
     // Will be assigned in processRewardsAndPenalties()
     balances: undefined,