Merge branch 'p2p-electra' of https://github.com/sigp/lighthouse into ef-tests-electra

consensus/state_processing/src/per_block_processing/process_operations.rs

@@ -653,6 +653,10 @@ pub fn process_consolidations<E: EthSpec>(
     verify_signatures: VerifySignatures,
     spec: &ChainSpec,
 ) -> Result<(), BlockProcessingError> {
+    if consolidations.is_empty() {
+        return Ok(());
+    }
+
     // If the pending consolidations queue is full, no consolidations are allowed in the block
     let pending_consolidations = state.pending_consolidations()?.len();
     let pending_consolidations_limit = E::pending_consolidations_limit();

consensus/types/src/attestation.rs

@@ -251,6 +251,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)