Prevent deletion of payloads >= split slot

Author: michaelsproul

beacon_node/beacon_chain/src/migrate.rs

@@ -712,7 +712,7 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> BackgroundMigrator<E, Ho
 
         // Prune all payloads of the canonical finalized blocks
         if store.get_config().prune_payloads {
-            Self::prune_finalized_payloads(&newly_finalized_blocks, &mut batch);
+            Self::prune_finalized_payloads(new_finalized_slot, &newly_finalized_blocks, &mut batch);
         }
 
         store.do_atomically_with_block_and_blobs_cache(batch)?;
@@ -728,15 +728,17 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> BackgroundMigrator<E, Ho
     }
 
     fn prune_finalized_payloads(
+        new_finalized_slot: Slot,
         finalized_blocks: &[(Hash256, Slot)],
         hot_db_ops: &mut Vec<StoreOp<E>>,
     ) {
-        for (block_root, _) in finalized_blocks {
+        for (block_root, slot) in finalized_blocks {
             // Delete the execution payload if payload pruning is enabled. At a skipped slot we may
             // delete the payload for the finalized block itself, but that's OK as we only guarantee
-            // that payloads are present for slots >= the split slot. The payload fetching code is also
-            // forgiving of missing payloads.
-            hot_db_ops.push(StoreOp::DeleteExecutionPayload(*block_root));
+            // that payloads are present for slots >= the split slot.
+            if *slot < new_finalized_slot {
+                hot_db_ops.push(StoreOp::DeleteExecutionPayload(*block_root));
+            }
         }
     }