Adding inclusion_delay and inactivity to ideal_rewards object #7564
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
courtneyeh
reviewed
Oct 3, 2023
| @@ -69,7 +69,8 @@ public TotalAttestationReward(long validatorIndex, final RewardAndPenalty reward | |||
| this.inactivity = | |||
| detailedRewardAndPenalty | |||
| .getReward(RewardComponent.INACTIVITY) | |||
| .minus(detailedRewardAndPenalty.getPenalty(RewardComponent.INACTIVITY)); | |||
| .minus(detailedRewardAndPenalty.getPenalty(RewardComponent.INACTIVITY)) | |||
| .longValue(); | |||
There was a problem hiding this comment.
Now that we are using a long value, we should match the previous calculation's formats above.
this.inactivity =
detailedRewardAndPenalty.getReward(RewardComponent.INACTIVITY).longValue()
- detailedRewardAndPenalty.getPenalty(RewardComponent.INACTIVITY).longValue();
There was a problem hiding this comment.
Actually, we should probably update the other calculations to have a single .longValue() so we only do the unboxing once. I'll update the PR.
There was a problem hiding this comment.
Actually, I introduced a bug doing it that way because we would have issues when the penalties for a component is greater than the rewards and we end up with a negative value causing a UInt underflow.
...est/resources/tech/pegasys/teku/beaconrestapi/handlers/v1/rewards/getAttestationRewards.json
Show resolved
Hide resolved
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR Description
Added two new fields to the
ideal_rewardsobject accordingly to ethereum/beacon-APIs#340.Fixed Issue(s)
partially addresses #7554
Documentation
doc-change-requiredlabel to this PR if updates are required.Changelog