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

only invalidate {current,previous}_epoch_participation flag cache once (#3063)

This commit is contained in:
tersec 2021-11-09 02:44:02 +00:00 committed by GitHub
parent a0f6a19267
commit 95b0ecc5a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
beacon_chain/spec/beaconstate.nim
View File

@ -621,22 +621,27 @@ proc process_attestation*(
pa[].inclusion_delay = state.slot - attestation.data.slot pa[].inclusion_delay = state.slot - attestation.data.slot
pa[].proposer_index = proposer_index.get().uint64 pa[].proposer_index = proposer_index.get().uint64
# For Altair # Altair and Merge
template updateParticipationFlags(epoch_participation: untyped) = template updateParticipationFlags(epoch_participation: untyped) =
var proposer_reward_numerator = 0'u64 var proposer_reward_numerator = 0'u64
# Participation flag indices # Participation flag indices
let let participation_flag_indices =
participation_flag_indices = get_attestation_participation_flag_indices(
get_attestation_participation_flag_indices( state, attestation.data, state.slot - attestation.data.slot)
state, attestation.data, state.slot - attestation.data.slot)
for index in get_attesting_indices(state, attestation.data, attestation.aggregation_bits, cache): for index in get_attesting_indices(
for flag_index, weight in PARTICIPATION_FLAG_WEIGHTS: state, attestation.data, attestation.aggregation_bits, cache):
if flag_index in participation_flag_indices and not has_flag(epoch_participation[index], flag_index): for flag_index, weight in PARTICIPATION_FLAG_WEIGHTS:
epoch_participation[index] = add_flag(epoch_participation[index], flag_index) if flag_index in participation_flag_indices and
proposer_reward_numerator += get_base_reward( not has_flag(epoch_participation.asSeq[index], flag_index):
state, index, base_reward_per_increment) * weight.uint64 # these are all valid, #TODO statically verify or do it type-safely epoch_participation.asSeq[index] =
add_flag(epoch_participation.asSeq[index], flag_index)
# these are all valid; TODO statically verify or do it type-safely
proposer_reward_numerator += get_base_reward(
state, index, base_reward_per_increment) * weight.uint64
epoch_participation.clearCache()
# Reward proposer # Reward proposer
let let

4
research/block_sim.nim
View File

@ -72,8 +72,8 @@ cli do(slots = SLOTS_PER_EPOCH * 6,
validatorKeyToIndex = initTable[ValidatorPubKey, int]() validatorKeyToIndex = initTable[ValidatorPubKey, int]()
cfg = defaultRuntimeConfig cfg = defaultRuntimeConfig
cfg.ALTAIR_FORK_EPOCH = 96.Slot.epoch cfg.ALTAIR_FORK_EPOCH = 64.Slot.epoch
cfg.MERGE_FORK_EPOCH = 160.Slot.epoch cfg.MERGE_FORK_EPOCH = 128.Slot.epoch
echo "Starting simulation..." echo "Starting simulation..."