Do not add Electra attestations if committees size is not retrievable #8323
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
rolfyone
reviewed
May 17, 2024
| }; | ||
| final Bytes32 targetRoot = attestationData.getTarget().getRoot(); | ||
| LOG.debug( | ||
| "Committees size was not readily available for attestation with target root {}. Will attempt to retrieve it using the relevant state.", |
There was a problem hiding this comment.
i'd probably change this to just be something short like
Committee size was not found via target root {} for attestation at slot {}
rolfyone
reviewed
May 17, 2024
| if (attestation.requiresCommitteeBits()) { | ||
| final AttestationData attestationData = attestation.getData(); | ||
| LOG.debug( | ||
| "Committees size was not found for target root {} for attestation at slot {}. Will attempt to retrieve it using the relevant state.", |
There was a problem hiding this comment.
i think id still delete 'will attempt...'
There was a problem hiding this comment.
I deleted the whole log and moved it to getOrCreateAttestationGroup. It is now:
LOG.debug("Committees size was not available for attestation at slot {} and block root {}. Will NOT add this attestation to the pool.",attestationData.getTarget().getRoot(), attestationData.getBeaconBlockRoot());
rolfyone
reviewed
May 17, 2024
.../src/main/java/tech/pegasys/teku/statetransition/attestation/AggregatingAttestationPool.java
Outdated
Show resolved
Hide resolved
rolfyone
reviewed
May 17, 2024
| @@ -56,14 +55,14 @@ public class MatchingDataAttestationGroup implements Iterable<ValidatableAttesta | |||
| private final Spec spec; | |||
| private Optional<Bytes32> committeeShufflingSeed = Optional.empty(); | |||
| private final AttestationData attestationData; | |||
| private final Supplier<Int2IntMap> commiteesSizeSupplier; | |||
| private final Optional<Int2IntMap> committeesSize; | |||
There was a problem hiding this comment.
i think maybeCommitteeSize would be cleaner
There was a problem hiding this comment.
Left it as it is because we use that name in other places (where it is still Optional)
rolfyone
approved these changes
May 17, 2024
StefanBratanov
force-pushed
the
do_not_add_electra_att_if_exception
branch
from
4f3da70
to
5c23687
Compare
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
Filter out Electra attestations for which we can't retrieve the committees size from the relevant state
Fixed Issue(s)
N/A
Documentation
doc-change-requiredlabel to this PR if updates are required.Changelog