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

Fix phase0 block production

Browse Source
This commit is contained in:
Michael Sproul
2022-07-18 14:15:16 +10:00
parent 4f98609bee
commit 830f8032f0
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
beacon_node/operation_pool/src/attestation.rs
View File

@@ -42,10 +42,7 @@ impl<'a, T: EthSpec> AttMaxCover<'a, T> {
total_active_balance: u64, total_active_balance: u64,
spec: &ChainSpec, spec: &ChainSpec,
) -> Option<Self> { ) -> Option<Self> {
// FIXME(sproul): re-enable let fresh_validators = earliest_attestation_validators(&att, state, base_state);
None
/*
let fresh_validators = earliest_attestation_validators(att, state, base_state);
let committee = state let committee = state
.get_beacon_committee(att.data.slot, att.data.index) .get_beacon_committee(att.data.slot, att.data.index)
.ok()?; .ok()?;
@@ -69,7 +66,6 @@ impl<'a, T: EthSpec> AttMaxCover<'a, T> {
att, att,
fresh_validators_rewards, fresh_validators_rewards,
}) })
*/
} }
/// Initialise an attestation cover object for Altair or later. /// Initialise an attestation cover object for Altair or later.
@@ -180,16 +176,16 @@ impl<'a, T: EthSpec> MaxCover for AttMaxCover<'a, T> {
/// ///
/// This isn't optimal, but with the Altair fork this code is obsolete and not worth upgrading. /// This isn't optimal, but with the Altair fork this code is obsolete and not worth upgrading.
pub fn earliest_attestation_validators<T: EthSpec>( pub fn earliest_attestation_validators<T: EthSpec>(
attestation: &Attestation<T>, attestation: &AttestationRef<T>,
state: &BeaconState<T>, state: &BeaconState<T>,
base_state: &BeaconStateBase<T>, base_state: &BeaconStateBase<T>,
) -> BitList<T::MaxValidatorsPerCommittee> { ) -> BitList<T::MaxValidatorsPerCommittee> {
// Bitfield of validators whose attestations are new/fresh. // Bitfield of validators whose attestations are new/fresh.
let mut new_validators = attestation.aggregation_bits.clone(); let mut new_validators = attestation.indexed.aggregation_bits.clone();
let state_attestations = if attestation.data.target.epoch == state.current_epoch() { let state_attestations = if attestation.checkpoint.target_epoch == state.current_epoch() {
&base_state.current_epoch_attestations &base_state.current_epoch_attestations
} else if attestation.data.target.epoch == state.previous_epoch() { } else if attestation.checkpoint.target_epoch == state.previous_epoch() {
&base_state.previous_epoch_attestations &base_state.previous_epoch_attestations
} else { } else {
return BitList::with_capacity(0).unwrap(); return BitList::with_capacity(0).unwrap();