Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

handle rewards overflow #1635

Merged
merged 4 commits into from
Mar 10, 2020
Merged

handle rewards overflow #1635

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d4ec7d
add REWARD_OVERFLOW_INCREMENT to avoid overflow in rewards calculation
djrtwo Mar 3, 2020
f082aa6
use EFFECTIVE_BALANCE_INCREMENT to normalize reward calculations
djrtwo Mar 3, 2020
882b9ee
Merge branch 'dev' into rewards-overflow
hwwhww Mar 10, 2020
1579072
add note about total balance overflowing
djrtwo Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion specs/phase0/beacon-chain.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ The following values are (non-configurable) constants used throughout the specif
| `MAX_EFFECTIVE_BALANCE` | `Gwei(2**5 * 10**9)` (= 32,000,000,000) |
| `EJECTION_BALANCE` | `Gwei(2**4 * 10**9)` (= 16,000,000,000) |
| `EFFECTIVE_BALANCE_INCREMENT` | `Gwei(2**0 * 10**9)` (= 1,000,000,000) |
| `REWARD_OVERFLOW_INCREMENT` | `Gwei(2**6)` (= 64) |

### Initial values

Expand Down Expand Up @@ -1313,7 +1314,9 @@ def get_attestation_deltas(state: BeaconState) -> Tuple[Sequence[Gwei], Sequence
attesting_balance = get_total_balance(state, unslashed_attesting_indices)
for index in eligible_validator_indices:
if index in unslashed_attesting_indices:
rewards[index] += get_base_reward(state, index) * attesting_balance // total_balance
increment = REWARD_OVERFLOW_INCREMENT # Factored out from reward numerator to avoid uint64 overflow
reward_numerator = get_base_reward(state, index) // increment * attesting_balance
djrtwo marked this conversation as resolved.
Show resolved Hide resolved
rewards[index] = reward_numerator // total_balance * increment
else:
penalties[index] += get_base_reward(state, index)

Expand Down
7 changes: 5 additions & 2 deletions .../core/pyspec/eth2spec/test/phase_0/epoch_processing/test_process_rewards_and_penalties.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
from copy import deepcopy

from eth2spec.test.context import spec_state_test, with_all_phases, spec_test, \
misc_balances, with_custom_state, default_activation_threshold, single_phase
from eth2spec.test.context import (
spec_state_test, with_all_phases, spec_test,
misc_balances, with_custom_state, default_activation_threshold,
single_phase,
)
from eth2spec.test.helpers.state import (
next_epoch,
next_slot,
Expand Down