single attestation cleanup & getCommitteeIndex bug fix #14984
+85
−70
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
james-prysm
commented
Feb 25, 2025
| // Verify the block being voted and the processed state is in beaconDB and the block has passed validation if it's in the beaconDB. | ||
| blockRoot := bytesutil.ToBytes32(data.BeaconBlockRoot) | ||
| if !s.hasBlockAndState(ctx, blockRoot) { | ||
| return s.saveToPendingAttPool(att) | ||
| } | ||
|
|
||
| if !s.cfg.chain.InForkchoice(bytesutil.ToBytes32(data.BeaconBlockRoot)) { | ||
| if !s.cfg.chain.InForkchoice(blockRoot) { |
There was a problem hiding this comment.
I think we can just use blockRoot here, because it's already calculated above
james-prysm
commented
Feb 25, 2025
| if validationRes != pubsub.ValidationAccept { | ||
| return validationRes, err | ||
| } | ||
|
|
||
| committee, err := helpers.BeaconCommitteeFromState(ctx, preState, att.GetData().Slot, committeeIndex) | ||
| committee, err := helpers.BeaconCommitteeFromState(ctx, preState, data.Slot, committeeIndex) |
There was a problem hiding this comment.
we don't need to get data again, we already have data
rkapka
reviewed
Feb 25, 2025
Co-authored-by: Radosław Kapka <[email protected]>
Co-authored-by: Radosław Kapka <[email protected]>
Co-authored-by: Radosław Kapka <[email protected]>
Co-authored-by: Radosław Kapka <[email protected]>
Co-authored-by: Radosław Kapka <[email protected]>
Co-authored-by: Radosław Kapka <[email protected]>
Co-authored-by: Radosław Kapka <[email protected]>
Co-authored-by: Radosław Kapka <[email protected]>
rkapka
approved these changes
Feb 26, 2025
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?
post electra when getting the committee index we should be using the GetCommitteeIndex() function instead of calling the field directly, this is beacuse the committee bits have been moved outside the attestation data so electra committee index field will always be 0.
This PR also does some minor cleanup to reduce cognitive load when reading what should be a single attestation vs regular attestation
kurtosis run with devnet 6 settings 3 nodes ( teku/nethermind, 2x prysm/geth)
attestation events still working
Which issues(s) does this PR fix?
Fixes #
Other notes for review
Acknowledgements