fix(operation-pool): include only chain-matching attestations

Author: perfogic

crates/common/operation_pool/src/lib.rs

@@ -219,6 +219,10 @@ impl OperationPool {
                 let target_epoch = compute_epoch_at_slot(key.slot);
                 (target_epoch == current_epoch || target_epoch == previous_epoch)
                     && key.slot + MIN_ATTESTATION_INCLUSION_DELAY <= state.slot
+                    && attestations
+                        .get(*key)
+                        .and_then(|group| group.first())
+                        .is_some_and(|attestation| attestation_matches_state(attestation, state))
             })
             .collect();
         keys.sort_by_key(|key| std::cmp::Reverse(key.slot));
@@ -273,6 +277,25 @@ impl OperationPool {
     }
 }
 
+fn attestation_matches_state(attestation: &Attestation, state: &BeaconState) -> bool {
+    let data = &attestation.data;
+    let target_epoch = compute_epoch_at_slot(data.slot);
+    let expected_source = if target_epoch == state.get_current_epoch() {
+        state.current_justified_checkpoint
+    } else {
+        state.previous_justified_checkpoint
+    };
+
+    data.target.epoch == target_epoch
+        && data.source == expected_source
+        && state
+            .get_block_root(target_epoch)
+            .is_ok_and(|target_root| data.target.root == target_root)
+        && state
+            .get_block_root_at_slot(data.slot)
+            .is_ok_and(|block_root| data.beacon_block_root == block_root)
+}
+
 /// Aggregate non-overlapping votes from the same attestation group.
 fn aggregate_attestation_group(group: &[Attestation]) -> Option<Attestation> {
     let mut aggregate = group.first()?.clone();