Change proposer cache overwrite logic #11191
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
rkapka
commented
Aug 9, 2022
beacon-chain/cache/payload_id.go
Outdated
| // Ok to overwrite if the slot is already set but the payload ID is not set. | ||
| ids, ok := f.slotToProposerAndPayloadIDs[slot] | ||
| // Ok to overwrite if the slot is already set but the cached payload ID is not set. | ||
| // Ok to overwrite if the slot is already set but the cached payload ID is not set. | ||
| // This combats the re-org case where payload assignment could change the epoch of. |
There was a problem hiding this comment.
This combats the re-org case where payload assignment could change the epoch of
There is something missing at the end of the sentence @terencechain. What should it say?
beacon-chain/cache/payload_id.go
Outdated
Comment on lines
57
to
58
| // Ok to overwrite if the slot is already set but the cached payload ID is not set. | ||
| // Ok to overwrite if the slot is already set but the cached payload ID is not set. |
There was a problem hiding this comment.
Duplicate lines?
Suggested change
| // Ok to overwrite if the slot is already set but the cached payload ID is not set. | |
| // Ok to overwrite if the slot is already set but the cached payload ID is not set. | |
| // Ok to overwrite if the slot is already set but the cached payload ID is not set. |
terencechain
reviewed
Aug 9, 2022
terencechain
reviewed
Aug 9, 2022
| if !ok || (ok && pId != [pIdLength]byte{}) { | ||
| f.slotToProposerAndPayloadIDs[slot] = bytes | ||
| byte8 := [8]byte{} | ||
| if !ok || (ok && bytes.Equal(ids[vIdLength:], byte8[:])) { |
There was a problem hiding this comment.
Could you add a unit test for condition bytes.Equal(ids[vIdLength:], byte8[:]) if it's not already covered? Thanks!
There was a problem hiding this comment.
It was already covered. I improved a comment in dc553ac
Co-authored-by: terencechain <[email protected]>
beacon-chain/cache/payload_id.go
Outdated
| ids, ok := f.slotToProposerAndPayloadIDs[slot] | ||
| // Ok to overwrite if the slot is already set but the cached payload ID is not set. | ||
| // This combats the re-org case where payload assignment could change at the start of the epoch. | ||
| byte8 := [8]byte{} |
There was a problem hiding this comment.
Why do we hardcode 8 here but use vpIdsLength on line 54?
terencechain
approved these changes
Aug 10, 2022
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.
What type of PR is this?
Bug fix
What does this PR do? Why is it needed?
Comment in
ProposerPayloadIDsCache.SetProposerAndPayloadIDssays:The mentioned payload ID refers to the cached ID, not the new one. The current comparison verifies the new ID.