gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-02 16:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable' into unstable

Browse Source
This commit is contained in:
Michael Sproul
2025-11-20 13:04:32 +11:00
parent d59e340d3b ced49dd265
commit 261322c3e3
29 changed files with 353 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_node/store/src/hot_cold_store.rs
View File

@@ -649,9 +649,15 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
.inspect(|cache| cache.lock().put_block(*block_root, full_block.clone()));
DatabaseBlock::Full(full_block)
} else if !self.config.prune_payloads {
} else if !self.config.prune_payloads || *block_root == split.block_root {
// If payload pruning is disabled there's a chance we may have the payload of
// this finalized block. Attempt to load it but don't error in case it's missing.
//
// We also allow for the split block's payload to be loaded *if it exists*. This is
// necessary on startup when syncing from an unaligned checkpoint (a checkpoint state
// at a skipped slot), and then loading the canonical head (with payload). If we modify
// payload pruning in future so that it doesn't prune the split block's payload, then
// this case could move to the case above where we error if the payload is missing.
let fork_name = blinded_block.fork_name(&self.spec)?;
if let Some(payload) = self.get_execution_payload(block_root, fork_name)? {
DatabaseBlock::Full(