Merge branch 'electra_attestation_changes' of https://github.com/sigp/lighthouse into block-processing-electra

consensus/types/src/attestation.rs

@@ -248,6 +248,9 @@ impl<'a, E: EthSpec> AttestationRef<'a, E> {
 
 impl<E: EthSpec> AttestationElectra<E> {
     /// Are the aggregation bitfields of these attestations disjoint?
+    // TODO(electra): check whether the definition from CompactIndexedAttestation::should_aggregate
+    // is useful where this is used, i.e. only consider attestations disjoint when their committees
+    // match AND their aggregation bits do not intersect.
     pub fn signers_disjoint_from(&self, other: &Self) -> bool {
         self.aggregation_bits
             .intersection(&other.aggregation_bits)