cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

op-pool: check previous epoch in get_attestations

Browse Source
This commit is contained in:
Michael Sproul 2019-03-25 11:56:30 +11:00
parent e512f7c0e1
commit 22a90a0224
No known key found for this signature in database
GPG Key ID: 77B1309D2E54E914
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eth2/operation_pool/src/lib.rs
View File

@ -145,13 +145,17 @@ impl OperationPool {
/// Get a list of attestations for inclusion in a block. /// Get a list of attestations for inclusion in a block.
pub fn get_attestations(&self, state: &BeaconState, spec: &ChainSpec) -> Vec<Attestation> { pub fn get_attestations(&self, state: &BeaconState, spec: &ChainSpec) -> Vec<Attestation> {
// Attestations for the current fork... // Attestations for the current fork, which may be from the current or previous epoch.
// FIXME: should we also check domain bytes for the previous epoch? let prev_epoch = state.previous_epoch(spec);
let current_epoch = state.slot.epoch(spec.slots_per_epoch); let current_epoch = state.current_epoch(spec);
let domain_bytes = AttestationId::compute_domain_bytes(current_epoch, state, spec); let prev_domain_bytes = AttestationId::compute_domain_bytes(prev_epoch, state, spec);
let curr_domain_bytes = AttestationId::compute_domain_bytes(current_epoch, state, spec);
self.attestations self.attestations
.iter() .iter()
.filter(|(key, _)| key.domain_bytes_match(&domain_bytes)) .filter(|(key, _)| {
key.domain_bytes_match(&prev_domain_bytes)
|| key.domain_bytes_match(&curr_domain_bytes)
})
.flat_map(|(_, attestations)| attestations) .flat_map(|(_, attestations)| attestations)
// That are valid... // That are valid...
.filter(|attestation| validate_attestation(state, attestation, spec).is_ok()) .filter(|attestation| validate_attestation(state, attestation, spec).is_ok())