gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-27 01:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into proto-array

Browse Source
This commit is contained in:
Paul Hauner
2020-01-15 17:25:32 +11:00
parent 76d7122b28 0e3e2bbbe7
commit ea19227eac
12 changed files with 410 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -210,6 +210,7 @@ impl<T: EthSpec> OperationPool<T> {
.map(|s| s.proposer_index)
.collect::<HashSet<_>>();
let epoch = state.current_epoch();
let attester_slashings = self
.attester_slashings
.read()
@@ -222,7 +223,7 @@ impl<T: EthSpec> OperationPool<T> {
// Take all slashings that will slash 1 or more validators.
let slashed_validators =
get_slashable_indices_modular(state, slashing, |index, validator| {
validator.slashed || to_be_slashed.contains(&index)
validator.is_slashable_at(epoch) && !to_be_slashed.contains(&index)
});
// Extend the `to_be_slashed` set so subsequent iterations don't try to include