Prevent panic for different size bitlists (#5233)

* Fix #5232 * Merge branch 'master' into bugfix-5232
prysmaticlabs · Mar 28, 2020 · 6bc70e2 · 6bc70e2
1 parent f2a3fad
commit 6bc70e2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/beacon-chain/operations/attestations/kv/aggregated.go b/beacon-chain/operations/attestations/kv/aggregated.go
@@ -100,7 +100,7 @@ func (p *AttCaches) DeleteAggregatedAttestation(att *ethpb.Attestation) error {
 
 	filtered := make([]*ethpb.Attestation, 0)
 	for _, a := range attList {
-		if !att.AggregationBits.Contains(a.AggregationBits) {
+		if att.AggregationBits.Len() == a.AggregationBits.Len() && !att.AggregationBits.Contains(a.AggregationBits) {
 			filtered = append(filtered, a)
 		}
 	}

diff --git a/beacon-chain/operations/attestations/kv/aggregated_test.go b/beacon-chain/operations/attestations/kv/aggregated_test.go
@@ -52,7 +52,8 @@ func TestKV_Aggregated_CanDelete(t *testing.T) {
 	att1 := &ethpb.Attestation{Data: &ethpb.AttestationData{Slot: 1}, AggregationBits: bitfield.Bitlist{0b1101}}
 	att2 := &ethpb.Attestation{Data: &ethpb.AttestationData{Slot: 2}, AggregationBits: bitfield.Bitlist{0b1101}}
 	att3 := &ethpb.Attestation{Data: &ethpb.AttestationData{Slot: 3}, AggregationBits: bitfield.Bitlist{0b1101}}
-	atts := []*ethpb.Attestation{att1, att2, att3}
+	att4 := &ethpb.Attestation{Data: &ethpb.AttestationData{Slot: 3}, AggregationBits: bitfield.Bitlist{0b10101}}
+	atts := []*ethpb.Attestation{att1, att2, att3, att4}
 
 	for _, att := range atts {
 		if err := cache.SaveAggregatedAttestation(att); err != nil {