updates per pr review

Author: shane-moore

consensus/state_processing/src/per_block_processing/signature_sets.rs

@@ -9,11 +9,12 @@ use tree_hash::TreeHash;
 use types::{
     AbstractExecPayload, AggregateSignature, AttesterSlashingRef, BeaconBlockRef, BeaconState,
     BeaconStateError, ChainSpec, DepositData, Domain, Epoch, EthSpec, Fork, Hash256,
-    IndexedAttestation, IndexedAttestationRef, IndexedPayloadAttestation, ProposerSlashing,
-    PublicKey, PublicKeyBytes, Signature, SignedAggregateAndProof, SignedBeaconBlock,
-    SignedBeaconBlockHeader, SignedBlsToExecutionChange, SignedContributionAndProof,
-    SignedExecutionPayloadBid, SignedExecutionPayloadEnvelope, SignedRoot, SignedVoluntaryExit,
-    SigningData, Slot, SyncAggregate, SyncAggregatorSelectionData, Unsigned,
+    InconsistentFork, IndexedAttestation, IndexedAttestationRef, IndexedPayloadAttestation,
+    ProposerSlashing, PublicKey, PublicKeyBytes, Signature, SignedAggregateAndProof,
+    SignedBeaconBlock, SignedBeaconBlockHeader, SignedBlsToExecutionChange,
+    SignedContributionAndProof, SignedExecutionPayloadBid, SignedExecutionPayloadEnvelope,
+    SignedRoot, SignedVoluntaryExit, SigningData, Slot, SyncAggregate, SyncAggregatorSelectionData,
+    Unsigned,
 };
 
 pub type Result<T> = std::result::Result<T, Error>;

consensus/types/src/beacon_state.rs

@@ -1075,14 +1075,15 @@ impl<E: EthSpec> BeaconState<E> {
             }
         }
 
+        let gloas_enabled = self.fork_name_unchecked().gloas_enabled();
         epoch
             .slot_iter(E::slots_per_epoch())
             .map(|slot| {
                 let mut preimage = seed.to_vec();
                 preimage.append(&mut int_to_bytes8(slot.as_u64()));
                 let seed = hash(&preimage);
 
-                if self.fork_name_unchecked().gloas_enabled() {
+                if gloas_enabled {
                     self.compute_balance_weighted_selection(indices, &seed, 1, true, spec)?
                         .first()
                         .copied()
@@ -2870,6 +2871,11 @@ impl<E: EthSpec> BeaconState<E> {
         iteration: usize,
         spec: &ChainSpec,
     ) -> Result<bool, Error> {
+        // TODO(EIP-7732): Consider grabbing effective balances from the epoch cache here.
+        // Note that this function will be used in a loop, so using cached values could be nice for performance.
+        // However, post-gloas, this function will be used in `compute_proposer_indices`, `get_next_sync_committee_indices`, and `get_ptc`, which has ~15 call sites in total
+        // so we will need to check each one to ensure epoch cache is initialized first, if we deem a good idea.
+        // Currently, we can't test if making the change would work since the test suite is not ready for gloas.
         let effective_balance = self.get_effective_balance(index)?;
         let max_effective_balance = spec.max_effective_balance_for_fork(self.fork_name_unchecked());