Simplify logic in calculating proposer score #2753
Merged
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
djrtwo
approved these changes
Dec 1, 2021
adiasg
reviewed
Dec 2, 2021
| @@ -182,14 +182,12 @@ def get_latest_attesting_balance(store: Store, root: Root) -> Gwei: | |||
| and get_ancestor(store, store.latest_messages[i].root, store.blocks[root].slot) == root) | |||
| )) | |||
| proposer_score = Gwei(0) | |||
| if store.proposer_boost_root != Root(): | |||
| block = store.blocks[root] | |||
| if get_ancestor(store, root, block.slot) == store.proposer_boost_root: | |||
There was a problem hiding this comment.
This line should have been
if get_ancestor(store, store.proposer_boost_root, store.blocks[root].slot) == root:
|
While the simplifying changes in this PR were sound for the underlying logic in the spec, the underlying logic itself was incorrect (see above comment). Thanks @realbigsean for both this PR and #2757! |
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.
The call to
get_ancestorwhen checking if the proposer score should be calculated inget_latest_attesting_balanceseems to be unnecessary so I removed it here.