Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions consensus/types/src/beacon_state.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1190,19 +1190,29 @@ impl<E: EthSpec> BeaconState<E> {
// Proposer indices are only known for the current epoch, due to the dependence on the
// effective balances of validators, which change at every epoch transition.
let epoch = slot.epoch(E::slots_per_epoch());
// TODO(EIP-7917): Explore allowing this function to be called with a slot one epoch in the future.
if epoch != self.current_epoch() {
if epoch != self.current_epoch() && epoch != self.next_epoch()? {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be more intuitive to move this if check after the "Post-Fulu" comment

return Err(Error::SlotOutOfBounds);
}

if let Ok(proposer_lookahead) = self.proposer_lookahead() {
// Post-Fulu
let index = slot.as_usize().safe_rem(E::slots_per_epoch() as usize)?;
let slots_per_epoch = E::slots_per_epoch() as usize;
let start_offset = if epoch == self.current_epoch() {
0
} else {
slots_per_epoch
};
let index = start_offset.safe_add(slot.as_usize().safe_rem(slots_per_epoch)?)?;
proposer_lookahead
.get(index)
.ok_or(Error::ProposerLookaheadOutOfBounds { i: index })
.map(|index| *index as usize)
} else {
// Only allow next epoch computations after Fulu.
if epoch != self.current_epoch() {
return Err(Error::SlotOutOfBounds);
}

// Pre-Fulu
let seed = self.get_beacon_proposer_seed(slot, spec)?;
let indices = self.get_active_validator_indices(epoch, spec)?;
Expand Down
Loading