Merge pull request #744 from ethereum/empty-attestation-bug

minor execution bugs
This commit is contained in:
Danny Ryan 2019-03-10 08:26:21 -06:00 committed by GitHub
commit 641bfc2f2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions

View File

@ -1882,8 +1882,7 @@ def get_base_reward(state: BeaconState, index: ValidatorIndex) -> Gwei:
``` ```
```python ```python
def get_inactivity_penalty(state: BeaconState, index: ValidatorIndex) -> Gwei: def get_inactivity_penalty(state: BeaconState, index: ValidatorIndex, epochs_since_finality: int) -> Gwei:
epochs_since_finality = get_current_epoch(state) + 1 - state.finalized_epoch
return ( return (
get_base_reward(state, index) + get_base_reward(state, index) +
get_effective_balance(state, index) * epochs_since_finality // INACTIVITY_PENALTY_QUOTIENT // 2 get_effective_balance(state, index) * epochs_since_finality // INACTIVITY_PENALTY_QUOTIENT // 2
@ -1943,8 +1942,9 @@ def compute_normal_justification_and_finalization_deltas(state: BeaconState) ->
else: else:
deltas[1][index] += get_base_reward(state, index) deltas[1][index] += get_base_reward(state, index)
# Proposer bonus # Proposer bonus
proposer_index = get_beacon_proposer_index(state, inclusion_slot(state, index)) if index in get_attesting_indices(state, state.previous_epoch_attestations):
deltas[0][proposer_index] += get_base_reward(state, index) // ATTESTATION_INCLUSION_REWARD_QUOTIENT proposer_index = get_beacon_proposer_index(state, inclusion_slot(state, index))
deltas[0][proposer_index] += get_base_reward(state, index) // ATTESTATION_INCLUSION_REWARD_QUOTIENT
return deltas return deltas
``` ```