test: trace beacon e2e attestation inclusion

Author: perfogic

crates/common/chain/beacon/src/beacon_chain.rs

@@ -59,7 +59,18 @@ impl BeaconChain {
 
         for attestation in signed_block.message.body.attestations.iter() {
             if let Err(err) = on_attestation(&mut store, attestation.clone(), true) {
-                warn!("Failed to process block attestation through fork choice: {err:?}");
+                warn!(
+                    block_slot = signed_block.message.slot,
+                    block_root = %signed_block.message.block_root(),
+                    attestation_slot = attestation.data.slot,
+                    beacon_block_root = %attestation.data.beacon_block_root,
+                    source_epoch = attestation.data.source.epoch,
+                    source_root = %attestation.data.source.root,
+                    target_epoch = attestation.data.target.epoch,
+                    target_root = %attestation.data.target.root,
+                    aggregation_bits = attestation.aggregation_bits.num_set_bits(),
+                    "beacon_e2e_trace: failed block attestation fork-choice import: {err:?}"
+                );
             }
         }
 

crates/rpc/beacon/src/handlers/validator.rs

@@ -1521,10 +1521,27 @@ pub async fn get_blocks_v3(
         .get_all_attester_slashings()
         .try_into()
         .unwrap_or_default();
-    let attestations: VariableList<Attestation, U8> = operation_pool
-        .get_attestations_for_block(&state)
-        .try_into()
-        .unwrap_or_default();
+    let selected_attestations = operation_pool.get_attestations_for_block(&state);
+    tracing::info!(
+        slot,
+        state_slot = state.slot,
+        attestation_count = selected_attestations.len(),
+        attestation_slots = ?selected_attestations
+            .iter()
+            .map(|attestation| attestation.data.slot)
+            .collect::<Vec<_>>(),
+        target_epochs = ?selected_attestations
+            .iter()
+            .map(|attestation| attestation.data.target.epoch)
+            .collect::<Vec<_>>(),
+        aggregation_bits = ?selected_attestations
+            .iter()
+            .map(|attestation| attestation.aggregation_bits.num_set_bits())
+            .collect::<Vec<_>>(),
+        "beacon_e2e_trace: selected block attestations"
+    );
+    let attestations: VariableList<Attestation, U8> =
+        selected_attestations.try_into().unwrap_or_default();
     let deposits: VariableList<Deposit, U16> = operation_pool
         .get_all_deposits()
         .try_into()