Move finality delay calculation (#8757)

Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
This commit is contained in:
terence tsao 2021-04-13 11:28:46 -07:00 committed by GitHub
parent efbefaeb7c
commit 3e686a71e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -134,8 +134,6 @@ func attestationDelta(pBal *Balance, v *Validator, prevEpoch, finalizedEpoch typ
} }
// Process finality delay penalty // Process finality delay penalty
finalityDelay := helpers.FinalityDelay(prevEpoch, finalizedEpoch)
if helpers.IsInInactivityLeak(prevEpoch, finalizedEpoch) { if helpers.IsInInactivityLeak(prevEpoch, finalizedEpoch) {
// If validator is performing optimally, this cancels all rewards for a neutral balance. // If validator is performing optimally, this cancels all rewards for a neutral balance.
proposerReward := br / params.BeaconConfig().ProposerRewardQuotient proposerReward := br / params.BeaconConfig().ProposerRewardQuotient
@ -144,6 +142,7 @@ func attestationDelta(pBal *Balance, v *Validator, prevEpoch, finalizedEpoch typ
// Equivalent to the following condition from the spec: // Equivalent to the following condition from the spec:
// `index not in get_unslashed_attesting_indices(state, matching_target_attestations)` // `index not in get_unslashed_attesting_indices(state, matching_target_attestations)`
if !v.IsPrevEpochTargetAttester || v.IsSlashed { if !v.IsPrevEpochTargetAttester || v.IsSlashed {
finalityDelay := helpers.FinalityDelay(prevEpoch, finalizedEpoch)
p += vb * uint64(finalityDelay) / params.BeaconConfig().InactivityPenaltyQuotient p += vb * uint64(finalityDelay) / params.BeaconConfig().InactivityPenaltyQuotient
} }
} }