Ignore subset aggregates #10674
Merged
Ignore subset aggregates #10674
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
…ysm into ignore-subset-aggregate
terencechain
force-pushed
the
ignore-subset-aggregate
branch
from
c1a22ac
to
e1368e9
Compare
…ysm into ignore-subset-aggregate
terencechain
commented
May 18, 2022
| @@ -221,6 +223,7 @@ func (s *Service) initCaches() { | |||
| s.seenUnAggregatedAttestationCache = lruwrpr.New(seenUnaggregatedAttSize) | |||
| s.seenSyncMessageCache = lruwrpr.New(seenSyncMsgSize) | |||
| s.seenSyncContributionCache = lruwrpr.New(seenSyncContributionSize) | |||
| s.syncContributionBitsOverlapCache = lruwrpr.New(seenSyncContributionSize) | |||
There was a problem hiding this comment.
For simplicity, I opted in same cache size as seenSyncContributionSize, open for other suggestions
terencechain
force-pushed
the
ignore-subset-aggregate
branch
2 times, most recently
from
871d8f5
to
d7c3fd3
Compare
terencechain
force-pushed
the
ignore-subset-aggregate
branch
from
d7c3fd3
to
b1f7eeb
Compare
terencechain
force-pushed
the
ignore-subset-aggregate
branch
from
44511ef
to
417187f
Compare
nisdas
reviewed
May 20, 2022
| if seen { | ||
| return pubsub.ValidationIgnore, nil | ||
| } | ||
| seen = s.hasSeenSyncContributionIndexSlot(c.Slot, m.Message.AggregatorIndex, types.CommitteeIndex(c.SubcommitteeIndex)) |
There was a problem hiding this comment.
thanks, I removed ignoreCached. I could also use ignoreCached here too if you prefer that
| if !ok { | ||
| return errors.New("could not covert cached value to []bitfield.Bitvector") | ||
| } | ||
| s.syncContributionBitsOverlapCache.Add(string(b), append(bitsList, c.AggregationBits.Bytes())) |
There was a problem hiding this comment.
you need to check whether it contains a bitlist that already contains over what the contribution has.
nisdas
reviewed
May 24, 2022
| func (s *Service) setSyncContributionBits(c *ethpb.SyncCommitteeContribution) error { | ||
| s.syncContributionBitsOverlapLock.Lock() | ||
| defer s.syncContributionBitsOverlapLock.Unlock() | ||
| b := append(c.BlockRoot, bytesutil.Bytes32(uint64(c.Slot))...) |
There was a problem hiding this comment.
I think you should copy c.BlockRoot first before appending it here. Due to how protobuf unmarshalling is carried out, you could unintentionally mutate this sync contribution.
| } | ||
|
|
||
| // BitListOverlaps returns true if there's an overlap between two bitlists. | ||
| func BitListOverlaps(bitLists [][]byte, b []byte) (bool, error) { |
There was a problem hiding this comment.
no need to export it here, as no consumer is going to use this from the sync package currently.
| @@ -10,3 +10,7 @@ import ( | |||
| func NewSyncCommitteeAggregationBits() bitfield.Bitvector128 { | |||
| return bitfield.NewBitvector128() | |||
| } | |||
|
|
|||
| func ConvertSyncContributionBitVector(b []byte) bitfield.Bitvector128 { | |||
There was a problem hiding this comment.
Suggested change
| func ConvertSyncContributionBitVector(b []byte) bitfield.Bitvector128 { | |
| func ConvertToSyncContributionBitVector(b []byte) bitfield.Bitvector128 { |
| @@ -10,3 +10,7 @@ import ( | |||
| func NewSyncCommitteeAggregationBits() bitfield.Bitvector8 { | |||
| return bitfield.NewBitvector8() | |||
| } | |||
|
|
|||
| func ConvertSyncContributionBitVector(b []byte) bitfield.Bitvector8 { | |||
There was a problem hiding this comment.
Suggested change
| func ConvertSyncContributionBitVector(b []byte) bitfield.Bitvector8 { | |
| func ConvertToSyncContributionBitVector(b []byte) bitfield.Bitvector8 { |
nisdas
previously approved these changes
May 24, 2022
nisdas
approved these changes
May 24, 2022
rauljordan
added a commit
that referenced
this pull request
May 26, 2022
This reverts commit 61cbe37.
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.
Implements and rationale: ethereum/consensus-specs#2847
This PR drops aggregated objects if a better aggregate has been seen. (i.e. bitfield overlaps). As a result, we should see a reduction in CPU usage and incoming and outgoing bandwidth.
Note: we did not have to do anything with aggregated attestation,
HasAggregatedAttestationalready checks the subset 🙌🏼