chore: add debug trace

Author: perfogic

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

@@ -84,6 +84,7 @@ impl BeaconChain {
                     "beacon_e2e_trace: failed to process block attestation through fork choice: {err:?}"
                 );
             }
+            store.operation_pool.remove_attestation(attestation);
         }
 
         // Build and Emit Block event

crates/common/consensus/beacon/src/electra/beacon_state.rs

@@ -77,6 +77,7 @@ use ssz_types::{
     serde_utils::{quoted_u64_fixed_vec, quoted_u64_var_list},
     typenum::{U4, U32, U64, U2048, U8192, U65536, U262144, U16777216, U134217728},
 };
+use tracing::info;
 use tree_hash::TreeHash;
 use tree_hash_derive::TreeHash;
 
@@ -1937,6 +1938,18 @@ impl BeaconState {
         let total_active_balance = self.get_total_active_balance();
         let previous_target_balance = self.get_total_balance(previous_indices);
         let current_target_balance = self.get_total_balance(current_indices);
+        info!(
+            state_slot = self.slot,
+            current_epoch = self.get_current_epoch(),
+            previous_epoch = self.get_previous_epoch(),
+            total_active_balance,
+            previous_target_balance,
+            current_target_balance,
+            current_justified_epoch = self.current_justified_checkpoint.epoch,
+            previous_justified_epoch = self.previous_justified_checkpoint.epoch,
+            finalized_epoch = self.finalized_checkpoint.epoch,
+            "beacon_e2e_trace: weighing justification balances"
+        );
 
         self.weigh_justification_and_finalization(
             total_active_balance,
@@ -2024,6 +2037,21 @@ impl BeaconState {
         {
             self.finalized_checkpoint = old_current_justified_checkpoint;
         }
+        info!(
+            state_slot = self.slot,
+            current_epoch,
+            previous_epoch,
+            previous_epoch_target_balance,
+            current_epoch_target_balance,
+            total_active_balance,
+            justification_bits = ?bits,
+            old_previous_justified_epoch = old_previous_justified_checkpoint.epoch,
+            old_current_justified_epoch = old_current_justified_checkpoint.epoch,
+            previous_justified_epoch = self.previous_justified_checkpoint.epoch,
+            current_justified_epoch = self.current_justified_checkpoint.epoch,
+            finalized_epoch = self.finalized_checkpoint.epoch,
+            "beacon_e2e_trace: weighed justification result"
+        );
 
         Ok(())
     }
@@ -2158,6 +2186,19 @@ impl BeaconState {
         // Participation flag indices
         let participation_flag_indices =
             self.get_attestation_participation_flag_indices(data, self.slot - data.slot)?;
+        let attesting_indices = self.get_attesting_indices(attestation)?;
+        info!(
+            state_slot = self.slot,
+            attestation_slot = data.slot,
+            source_epoch = data.source.epoch,
+            target_epoch = data.target.epoch,
+            beacon_block_root = %data.beacon_block_root,
+            target_root = %data.target.root,
+            inclusion_delay = self.slot - data.slot,
+            participation_flag_indices = ?participation_flag_indices,
+            attesting_indices = ?attesting_indices,
+            "beacon_e2e_trace: state attestation participation"
+        );
         // Verify signature
         ensure!(
             self.is_valid_indexed_attestation(&self.get_indexed_attestation(attestation)?)?,
@@ -2166,7 +2207,7 @@ impl BeaconState {
 
         let base_reward_per_increment = self.get_base_reward_per_increment();
         let mut proposer_reward_numerator = 0;
-        for index in self.get_attesting_indices(attestation)? {
+        for index in attesting_indices {
             let index = index as usize;
             for (flag_index, &weight) in PARTICIPATION_FLAG_WEIGHTS.iter().enumerate() {
                 let flag_index = flag_index as u8;

crates/common/operation_pool/src/lib.rs

@@ -10,8 +10,9 @@ use ream_consensus_beacon::{
     voluntary_exit::SignedVoluntaryExit,
 };
 use ream_consensus_misc::{
-    constants::beacon::MIN_ATTESTATION_INCLUSION_DELAY, deposit::Deposit,
-    misc::compute_epoch_at_slot,
+    constants::beacon::MIN_ATTESTATION_INCLUSION_DELAY,
+    deposit::Deposit,
+    misc::{compute_epoch_at_slot, get_committee_indices},
 };
 use tree_hash::TreeHash;
 
@@ -204,6 +205,18 @@ impl OperationPool {
         }
     }
 
+    pub fn remove_attestation(&self, attestation: &Attestation) {
+        let slot = attestation.data.slot;
+        let attestation_data_root = attestation.data.tree_hash_root();
+        let committee_indices = get_committee_indices(&attestation.committee_bits);
+
+        self.attestations.write().retain(|key, _| {
+            key.slot != slot
+                || key.attestation_data_root != attestation_data_root
+                || !committee_indices.contains(&key.committee_index)
+        });
+    }
+
     /// Select attestations that can be included in the block.
     ///
     /// Only keep attestations whose target epoch is current or previous, whose minimum inclusion

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

@@ -1530,10 +1530,25 @@ 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);
+    info!(
+        slot,
+        state_slot = state.slot,
+        selected_attestations = ?selected_attestations
+            .iter()
+            .map(|attestation| {
+                (
+                    attestation.data.slot,
+                    attestation.data.source.epoch,
+                    attestation.data.target.epoch,
+                    attestation.aggregation_bits.num_set_bits(),
+                )
+            })
+            .collect::<Vec<_>>(),
+        "beacon_e2e_trace: validator selected attestations for block"
+    );
+    let attestations: VariableList<Attestation, U8> =
+        selected_attestations.try_into().unwrap_or_default();
     let deposits: VariableList<Deposit, U16> = operation_pool
         .get_all_deposits()
         .try_into()