gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-30 12:47:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix il committee calc

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-04-30 16:15:43 +02:00
parent e75eb4758c
commit e23e3ac794
1 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
consensus/types/src/state/beacon_state.rs
View File

@@ -1007,46 +1007,26 @@ impl<E: EthSpec> BeaconState<E> {
pub fn get_inclusion_list_committee( pub fn get_inclusion_list_committee(
&self, &self,
slot: Slot, slot: Slot,
spec: &ChainSpec, _spec: &ChainSpec,
) -> Result<InclusionListCommittee<E>, BeaconStateError> { ) -> Result<InclusionListCommittee<E>, BeaconStateError> {
let epoch = slot.epoch(E::slots_per_epoch()); let committees = self.get_beacon_committees_at_slot(slot)?;
let current_epoch = self.current_epoch();
let next_epoch = current_epoch.safe_add(1)?;
// TODO(focil) review this logic let indices: Vec<usize> = committees
if epoch != current_epoch && epoch != next_epoch { .into_iter()
return Err(BeaconStateError::SlotOutOfBounds); .flat_map(|c| c.committee.iter().copied())
.collect();
if indices.is_empty() {
return Err(BeaconStateError::InsufficientValidators);
} }
let seed = self.get_seed(epoch, Domain::InclusionListCommittee, spec)?; let committee_size = E::InclusionListCommitteeSize::to_usize();
let active_validator_indices = self.get_active_validator_indices(epoch, spec)?; let il_committee: Vec<u64> = (0..committee_size)
let active_validator_count = active_validator_indices.len(); .map(|i| indices[i % indices.len()] as u64)
.collect();
let start = (slot.safe_rem(E::slots_per_epoch())?)
.as_usize()
.safe_mul(E::InclusionListCommitteeSize::to_usize())?;
let end = start.safe_add(E::InclusionListCommitteeSize::to_usize())?;
let mut i = start;
let mut il_committee_indices =
Vec::with_capacity(E::InclusionListCommitteeSize::to_usize());
while i < end {
let shuffled_index = compute_shuffled_index(
i.safe_rem(active_validator_count)?,
active_validator_count,
seed.as_slice(),
spec.shuffle_round_count,
)
.ok_or(BeaconStateError::UnableToShuffle)?;
let validator_index = *active_validator_indices
.get(shuffled_index)
.ok_or(BeaconStateError::ShuffleIndexOutOfBounds(shuffled_index))?;
il_committee_indices.push(validator_index as u64);
i.safe_add_assign(1)?;
}
Ok(InclusionListCommittee::<E>::from( Ok(InclusionListCommittee::<E>::from(
il_committee_indices.try_into()?, il_committee.try_into()?,
)) ))
} }