Avoid putting pre-split states in the state cache

michaelsproul · michaelsproul · commit bc47fd6aa656 · 2025-05-28T16:50:24.000+10:00
diff --git a/beacon_node/store/src/hot_cold_store.rs b/beacon_node/store/src/hot_cold_store.rs
@@ -1477,7 +1477,8 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
                 // in the cache but not on disk. Instead of relying on the cache we try loading
                 // the state summary below and rely on that instead.
             }
-            PutStateOutcome::Finalized => {} // Continue to store.
+            // Continue to store.
+            PutStateOutcome::Finalized | PutStateOutcome::PreFinalizedIgnored => {}
         }
 
         // Computing diffs is expensive so we avoid it if we already have this state stored on
diff --git a/beacon_node/store/src/state_cache.rs b/beacon_node/store/src/state_cache.rs
@@ -44,9 +44,15 @@ pub struct StateCache<E: EthSpec> {
 
 #[derive(Debug)]
 pub enum PutStateOutcome {
+    /// State is prior to the cache's finalized state (lower slot) and was not inserted.
+    PreFinalizedIgnored,
+    /// State is equal to the cache's finalized state and was not inserted.
     Finalized,
+    /// State was already present in the cache.
     Duplicate,
-    /// Includes deleted states as a result of this insertion
+    /// State is new to the cache and was inserted.
+    ///
+    /// Includes deleted states as a result of this insertion.
     New(Vec<Hash256>),
 }
 
@@ -136,12 +142,12 @@ impl<E: EthSpec> StateCache<E> {
         block_root: Hash256,
         state: &BeaconState<E>,
     ) -> Result<PutStateOutcome, Error> {
-        if self
-            .finalized_state
-            .as_ref()
-            .is_some_and(|finalized_state| finalized_state.state_root == state_root)
-        {
-            return Ok(PutStateOutcome::Finalized);
+        if let Some(ref finalized_state) = self.finalized_state {
+            if finalized_state.state_root == state_root {
+                return Ok(PutStateOutcome::Finalized);
+            } else if state.slot() <= finalized_state.state.slot() {
+                return Ok(PutStateOutcome::PreFinalizedIgnored);
+            }
         }
 
         if self.states.peek(&state_root).is_some() {

Original file line number	Diff line number	Diff line change
`@@ -1477,7 +1477,8 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>`
`1477`	`1477`	`// in the cache but not on disk. Instead of relying on the cache we try loading`
`1478`	`1478`	`// the state summary below and rely on that instead.`
`1479`	`1479`	`}`
`1480`		`- PutStateOutcome::Finalized => {} // Continue to store.`
	`1480`	`+ // Continue to store.`
	`1481`	`+ PutStateOutcome::Finalized \| PutStateOutcome::PreFinalizedIgnored => {}`
`1481`	`1482`	`}`
`1482`	`1483`
`1483`	`1484`	`// Computing diffs is expensive so we avoid it if we already have this state stored on`