Store latest_block_slot in state summary

Author: dapplion

beacon_node/beacon_chain/src/migrate.rs

@@ -1,5 +1,5 @@
 use crate::errors::BeaconChainError;
-use crate::summaries_dag::{DAGStateSummaryV22, Error as SummariesDagError, StateSummariesDAG};
+use crate::summaries_dag::{DAGStateSummary, Error as SummariesDagError, StateSummariesDAG};
 use parking_lot::Mutex;
 use slog::{debug, error, info, warn, Logger};
 use std::collections::HashSet;
@@ -490,40 +490,31 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> BackgroundMigrator<E, Ho
                 .load_hot_state_summaries()?
                 .into_iter()
                 .map(|(state_root, summary)| {
-                    let block_root = summary.latest_block_root;
-                    // This error should never happen unless we break a DB invariant
-                    let block = store
-                        .get_blinded_block(&block_root)?
-                        .ok_or(PruningError::MissingBlindedBlock(block_root))?;
-                    Ok((
+                    (
                         state_root,
-                        DAGStateSummaryV22 {
+                        DAGStateSummary {
                             slot: summary.slot,
                             latest_block_root: summary.latest_block_root,
-                            block_slot: block.slot(),
-                            block_parent_root: block.parent_root(),
+                            latest_block_slot: summary.latest_block_slot,
+                            previous_state_root: summary.previous_state_root,
                         },
-                    ))
+                    )
                 })
-                .collect::<Result<Vec<(Hash256, DAGStateSummaryV22)>, BeaconChainError>>()?;
-
-            // De-duplicate block roots to reduce block reads below
-            let summary_block_roots = HashSet::<Hash256>::from_iter(
-                state_summaries
-                    .iter()
-                    .map(|(_, summary)| summary.latest_block_root),
-            );
+                .collect::<Vec<(Hash256, DAGStateSummary)>>();
 
             // Sanity check, there is at least one summary with the new finalized block root
-            if !summary_block_roots.contains(&new_finalized_checkpoint.root) {
+            if !state_summaries
+                .iter()
+                .any(|(_, s)| s.latest_block_root == new_finalized_checkpoint.root)
+            {
                 return Err(BeaconChainError::PruningError(
                     PruningError::MissingSummaryForFinalizedCheckpoint(
                         new_finalized_checkpoint.root,
                     ),
                 ));
             }
 
-            StateSummariesDAG::new_from_v22(state_summaries)
+            StateSummariesDAG::new(state_summaries)
                 .map_err(|e| PruningError::SummariesDagError("new StateSumariesDAG", e))?
         };
 

beacon_node/beacon_chain/src/schema_change/migration_schema_v24.rs

@@ -172,7 +172,6 @@ pub fn upgrade_to_v24<T: BeaconChainTypes>(
                         // blocks.
                         //
                         // 2. Convert the summary to the new format.
-                        let latest_block_root = old_summary.latest_block_root;
                         let previous_state_root = if state_root == split.state_root {
                             Hash256::ZERO
                         } else {
@@ -203,7 +202,8 @@ pub fn upgrade_to_v24<T: BeaconChainTypes>(
 
                         let new_summary = HotStateSummary {
                             slot,
-                            latest_block_root,
+                            latest_block_root: old_summary.latest_block_root,
+                            latest_block_slot: old_summary.latest_block_slot,
                             previous_state_root,
                             diff_base_state_root,
                         };

beacon_node/store/src/hot_cold_store.rs

@@ -3501,6 +3501,7 @@ fn get_ancenstor_state_root<'a, E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E
 pub struct HotStateSummary {
     pub slot: Slot,
     pub latest_block_root: Hash256,
+    pub latest_block_slot: Slot,
     // FIXME(tree-states): consider not storing the storage strategy and storing a state root instead
     pub diff_base_state_root: DiffBaseStateRoot,
     // FIXME(tree-states): should add this as part of this migration
@@ -3583,6 +3584,7 @@ impl HotStateSummary {
         Ok(HotStateSummary {
             slot: state.slot(),
             latest_block_root,
+            latest_block_slot: state.latest_block_header().slot,
             diff_base_state_root,
             // Note: if genesis state, it will point to its own state root
             previous_state_root: get_state_root(state.slot().saturating_sub(1_u64))?,