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

allow 50k validators on block_sim by avoiding repeated get_total_active_balance() in get_proposer_reward()

This commit is contained in:
Dustin Brody 2020-07-07 18:52:12 +02:00 committed by tersec
parent b7d1967449
commit 3c030d945d
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
beacon_chain/spec/state_transition_epoch.nim
View File

@ -62,8 +62,6 @@ func get_total_active_balance*(state: BeaconState, cache: var StateCache): Gwei
let let
epoch = state.slot.compute_epoch_at_slot epoch = state.slot.compute_epoch_at_slot
try: try:
# TODO refactor get_empty_per_epoch_cache() not to be, well, empty, so can
# avoid this ever refilling, and raiseAssert, and get rid of var
if epoch notin cache.shuffled_active_validator_indices: if epoch notin cache.shuffled_active_validator_indices:
cache.shuffled_active_validator_indices[epoch] = cache.shuffled_active_validator_indices[epoch] =
get_shuffled_active_validator_indices(state, epoch) get_shuffled_active_validator_indices(state, epoch)
@ -249,9 +247,8 @@ func get_base_reward(state: BeaconState, index: ValidatorIndex,
integer_squareroot(total_balance) div BASE_REWARDS_PER_EPOCH integer_squareroot(total_balance) div BASE_REWARDS_PER_EPOCH
func get_proposer_reward(state: BeaconState, attesting_index: ValidatorIndex, func get_proposer_reward(state: BeaconState, attesting_index: ValidatorIndex,
cache: var StateCache): Gwei = total_balance: Gwei): Gwei =
let total_balance = get_total_active_balance(state, cache) # Spec version recalculates get_total_active_balance(state) quadratically
get_base_reward(state, attesting_index, total_balance) div PROPOSER_REWARD_QUOTIENT get_base_reward(state, attesting_index, total_balance) div PROPOSER_REWARD_QUOTIENT
func get_finality_delay(state: BeaconState): uint64 = func get_finality_delay(state: BeaconState): uint64 =
@ -355,10 +352,11 @@ func get_inclusion_delay_deltas(state: BeaconState, cache: var StateCache):
if a.inclusion_delay < attestation.inclusion_delay: if a.inclusion_delay < attestation.inclusion_delay:
attestation = a attestation = a
# TODO remove duplicate calculation of get_proposer_reward() rewards[attestation.proposer_index] +=
rewards[attestation.proposer_index] += get_proposer_reward(state, index, cache) get_proposer_reward(state, index, total_balance)
let max_attester_reward = let max_attester_reward =
get_base_reward(state, index, total_balance) - get_proposer_reward(state, index, cache) get_base_reward(state, index, total_balance) -
get_proposer_reward(state, index, total_balance)
rewards[index] += Gwei(max_attester_reward div attestation.inclusion_delay) rewards[index] += Gwei(max_attester_reward div attestation.inclusion_delay)
# No penalties associated with inclusion delay # No penalties associated with inclusion delay
@ -369,7 +367,7 @@ func get_inactivity_penalty_deltas(state: BeaconState, cache: var StateCache):
seq[Gwei] = seq[Gwei] =
# Return inactivity reward/penalty deltas for each validator. # Return inactivity reward/penalty deltas for each validator.
var penalties = repeat(0'u64, len(state.validators)) var penalties = repeat(0'u64, len(state.validators))
let total_balance = get_total_active_balance(state, cache) # DO NOT KEEP RECALCULATING THIS let total_balance = get_total_active_balance(state, cache)
if is_in_inactivity_leak(state): if is_in_inactivity_leak(state):
let let
matching_target_attestations = matching_target_attestations =
@ -381,7 +379,7 @@ func get_inactivity_penalty_deltas(state: BeaconState, cache: var StateCache):
let base_reward = get_base_reward(state, index, total_balance) let base_reward = get_base_reward(state, index, total_balance)
penalties[index] += penalties[index] +=
Gwei(BASE_REWARDS_PER_EPOCH * base_reward - Gwei(BASE_REWARDS_PER_EPOCH * base_reward -
get_proposer_reward(state, index, cache)) get_proposer_reward(state, index, total_balance))
# matching_target_attesting_indices is a HashSet # matching_target_attesting_indices is a HashSet
if index notin matching_target_attesting_indices: if index notin matching_target_attesting_indices:
let effective_balance = state.validators[index].effective_balance let effective_balance = state.validators[index].effective_balance