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

Merge branch 'v0.6.1' into docker-env

Browse Source
This commit is contained in:
Paul Hauner
2019-06-04 09:25:00 +10:00
parent 092e36d03a a3a941efdf
commit 39cb63e01e
149 changed files with 5350 additions and 3060 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eth2/fork_choice/src/bitwise_lmd_ghost.rs
View File

@@ -71,10 +71,8 @@ impl<T: Store, E: EthSpec> BitwiseLMDGhost<T, E> {
current_state.get_active_validator_indices(block_slot.epoch(spec.slots_per_epoch));
for index in active_validator_indices {
let balance = std::cmp::min(
current_state.validator_balances[index],
spec.max_deposit_amount,
) / spec.fork_choice_balance_increment;
let balance = std::cmp::min(current_state.balances[index], spec.max_effective_balance)
/ spec.effective_balance_increment;
if balance > 0 {
if let Some(target) = self.latest_attestation_targets.get(&(index as u64)) {
*latest_votes.entry(*target).or_insert_with(|| 0) += balance;

5
eth2/fork_choice/src/optimized_lmd_ghost.rs
View File

@@ -69,11 +69,10 @@ impl<T: Store, E: EthSpec> OptimizedLMDGhost<T, E> {
let active_validator_indices =
current_state.get_active_validator_indices(block_slot.epoch(spec.slots_per_epoch));
let validator_balances = &current_state.validator_balances;
for index in active_validator_indices {
let balance = std::cmp::min(validator_balances[index], spec.max_deposit_amount)
/ spec.fork_choice_balance_increment;
let balance = std::cmp::min(current_state.balances[index], spec.max_effective_balance)
/ spec.effective_balance_increment;
if balance > 0 {
if let Some(target) = self.latest_attestation_targets.get(&(index as u64)) {
*latest_votes.entry(*target).or_insert_with(|| 0) += balance;

6
eth2/fork_choice/src/slow_lmd_ghost.rs
View File

@@ -43,10 +43,8 @@ impl<T: Store, E: EthSpec> SlowLMDGhost<T, E> {
current_state.get_active_validator_indices(block_slot.epoch(spec.slots_per_epoch));
for index in active_validator_indices {
let balance = std::cmp::min(
current_state.validator_balances[index],
spec.max_deposit_amount,
) / spec.fork_choice_balance_increment;
let balance = std::cmp::min(current_state.balances[index], spec.max_effective_balance)
/ spec.effective_balance_increment;
if balance > 0 {
if let Some(target) = self.latest_attestation_targets.get(&(index as u64)) {
*latest_votes.entry(*target).or_insert_with(|| 0) += balance;