status-im
/
eth2.0-specs
mirror of https://github.com/status-im/eth2.0-specs.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1635 from ethereum/rewards-overflow 

handle rewards overflow
This commit is contained in:
Danny Ryan 2020-03-10 13:23:21 -06:00 committed by GitHub
parent 0d01299d17 1579072e15
commit 1c9ca3c168
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
specs/phase0/beacon-chain.md
View File

@ -958,6 +958,7 @@ def get_beacon_proposer_index(state: BeaconState) -> ValidatorIndex:
def get_total_balance(state: BeaconState, indices: Set[ValidatorIndex]) -> Gwei: def get_total_balance(state: BeaconState, indices: Set[ValidatorIndex]) -> Gwei:
""" """
Return the combined effective balance of the ``indices``. (1 Gwei minimum to avoid divisions by zero.) Return the combined effective balance of the ``indices``. (1 Gwei minimum to avoid divisions by zero.)
Math safe up to ~10B ETH, afterwhich this overflows uint64.
""" """
return Gwei(max(1, sum([state.validators[index].effective_balance for index in indices]))) return Gwei(max(1, sum([state.validators[index].effective_balance for index in indices])))
``` ```
@ -1324,7 +1325,9 @@ def get_attestation_deltas(state: BeaconState) -> Tuple[Sequence[Gwei], Sequence
attesting_balance = get_total_balance(state, unslashed_attesting_indices) attesting_balance = get_total_balance(state, unslashed_attesting_indices)
for index in eligible_validator_indices: for index in eligible_validator_indices:
if index in unslashed_attesting_indices: if index in unslashed_attesting_indices:
rewards[index] += get_base_reward(state, index) * attesting_balance // total_balance increment = EFFECTIVE_BALANCE_INCREMENT # Factored out from balance totals to avoid uint64 overflow
reward_numerator = get_base_reward(state, index) * (attesting_balance // increment)
rewards[index] = reward_numerator // (total_balance // increment)
else: else:
penalties[index] += get_base_reward(state, index) penalties[index] += get_base_reward(state, index)

7
tests/core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_rewards_and_penalties.py
View File

@ -1,7 +1,10 @@
from copy import deepcopy from copy import deepcopy
from eth2spec.test.context import spec_state_test, with_all_phases, spec_test, \ from eth2spec.test.context import (
misc_balances, with_custom_state, default_activation_threshold, single_phase spec_state_test, with_all_phases, spec_test,
misc_balances, with_custom_state, default_activation_threshold,
single_phase,
)
from eth2spec.test.helpers.state import ( from eth2spec.test.helpers.state import (
next_epoch, next_epoch,
next_slot, next_slot,