cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix try_prune_blobs to use state root

Browse Source
This commit is contained in:
Emilia Hane 2023-01-13 16:04:29 +01:00
parent d67468d737
commit 667cca5cf2
No known key found for this signature in database
GPG Key ID: E73394F9C09206FA
3 changed files with 42 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
beacon_node/beacon_chain/src/beacon_chain.rs
View File

@ -50,6 +50,7 @@ use crate::persisted_fork_choice::PersistedForkChoice;
use crate::pre_finalization_cache::PreFinalizationBlockCache;
use crate::shuffling_cache::{BlockShufflingIds, ShufflingCache};
use crate::snapshot_cache::{BlockProductionPreState, SnapshotCache};
use crate::store::Split;
use crate::sync_committee_verification::{
Error as SyncCommitteeError, VerifiedSyncCommitteeMessage, VerifiedSyncContribution,
};
@ -3029,7 +3030,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
}
if Some(current_epoch)
>= self.spec.eip4844_fork_epoch.map(|eip4844_fork_epoch| {
> self.spec.eip4844_fork_epoch.map(|eip4844_fork_epoch| {
eip4844_fork_epoch + *MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS
})
{
@ -3038,15 +3039,18 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
// Update db's metadata for blobs pruning.
if current_slot == current_epoch_start_slot {
if let Some(mut blob_info) = self.store.get_blob_info() {
// Pruning enabled until data availability boundary.
if let Some(data_availability_boundary) = self.data_availability_boundary() {
blob_info.data_availability_boundary = self.state_root_at_slot(
data_availability_boundary.start_slot(T::EthSpec::slots_per_epoch()),
)?;
self.store.compare_and_set_blob_info_with_write(
self.store.get_blob_info(),
Some(blob_info),
)?;
let dab_slot =
data_availability_boundary.end_slot(T::EthSpec::slots_per_epoch());
if let Some(dab_state_root) = self.state_root_at_slot(dab_slot)? {
blob_info.data_availability_boundary =
Split::new(dab_slot, dab_state_root);
self.store.compare_and_set_blob_info_with_write(
self.store.get_blob_info(),
Some(blob_info),
)?;
}
}
}
}

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

@ -1704,63 +1704,21 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
}
}
let data_availability_breakpoint: Hash256;
match blob_info.data_availability_boundary {
Some(breakpoint) => {
if breakpoint == blob_info.oldest_blob_parent {
return Ok(());
}
data_availability_breakpoint = breakpoint;
}
None => {
return Ok(());
}
}
// Load the state from which to prune blobs so we can backtrack.
let prune_state = self.get_state(&data_availability_breakpoint, None)?.ok_or(
HotColdDBError::MissingStateToPruneBlobs(data_availability_breakpoint),
)?;
// The data_availability_breakpoint is set at the start of an epoch indicating the epoch
// before can be pruned.
let prune_epoch = prune_state.current_epoch() - 1;
// The finalized block may or may not have its blobs sidecar stored, depending on
// whether it was at a skipped slot. However for a fully pruned database its parent
// should *always* have been pruned. In the case of blobs sidecars we look at the next
// parent block with at least one kzg commitment.
let already_pruned = process_results(
BlockRootsIter::new(&prune_state, blob_info.oldest_blob_slot),
|mut iter| {
iter.find(|(_, block_root)| {
move || -> bool {
if let Ok(Some(erase_parent_block)) = self.get_blinded_block(&block_root) {
if let Ok(expected_kzg_commitments) =
erase_parent_block.message().body().blob_kzg_commitments()
{
if expected_kzg_commitments.len() > 0 {
return true;
}
}
}
false
}()
})
.map_or(Ok(true), |(_, split_parent_root)| {
self.blobs_sidecar_exists(&split_parent_root)
.map(|exists| !exists)
})
},
)??;
if already_pruned && !force {
if blob_info.last_pruned_epoch == blob_info.next_epoch_to_prune && !force {
info!(self.log, "Blobs sidecars are pruned");
return Ok(());
}
let dab_state_root = blob_info.data_availability_boundary.state_root;
// Load the state from which to prune blobs so we can backtrack.
let dab_state = self
.get_state(&dab_state_root, None)?
.ok_or(HotColdDBError::MissingStateToPruneBlobs(dab_state_root))?;
let dab_block_root = dab_state.get_latest_block_root(dab_state_root);
let dab_slot = dab_state.slot();
// Iterate block roots backwards to oldest blob slot.
warn!(
self.log,
@ -1771,7 +1729,9 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
let mut ops = vec![];
let mut last_pruned_block_root = None;
for res in BlockRootsIterator::new(self, &prune_state) {
for res in std::iter::once(Ok((dab_block_root, dab_slot)))
.chain(BlockRootsIterator::new(self, &dab_state))
{
let (block_root, slot) = match res {
Ok(tuple) => tuple,
Err(e) => {
@ -1797,15 +1757,13 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
ops.push(StoreOp::DeleteBlobs(block_root));
}
if block_root == blob_info.oldest_blob_parent {
if slot <= blob_info.oldest_blob_slot {
info!(
self.log,
"Blobs sidecar pruning reached earliest available blobs sidecar";
"slot" => slot
);
blob_info.oldest_blob_slot = slot;
blob_info.last_pruned_epoch = prune_epoch;
blob_info.oldest_blob_parent = data_availability_breakpoint;
blob_info.oldest_blob_slot = dab_slot + 1;
break;
}
}
@ -1818,6 +1776,7 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
"blobs_sidecars_pruned" => blobs_sidecars_pruned,
);
blob_info.last_pruned_epoch = dab_state.current_epoch();
self.compare_and_set_blob_info_with_write(self.get_blob_info(), Some(blob_info))?;
Ok(())
@ -1968,7 +1927,7 @@ pub fn migrate_database<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>>(
}
/// Struct for storing the split slot and state root in the database.
#[derive(Debug, Clone, Copy, PartialEq, Default, Encode, Decode, Deserialize, Serialize)]
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Encode, Decode, Deserialize, Serialize)]
pub struct Split {
pub(crate) slot: Slot,
pub(crate) state_root: Hash256,
@ -1988,6 +1947,12 @@ impl StoreItem for Split {
}
}
impl Split {
pub fn new(slot: Slot, state_root: Hash256) -> Self {
Split { slot, state_root }
}
}
/// Type hint.
fn no_state_root_iter() -> Option<std::iter::Empty<Result<(Hash256, Slot), Error>>> {
None

12
beacon_node/store/src/metadata.rs
View File

@ -1,4 +1,4 @@
use crate::{DBColumn, Error, StoreItem};
use crate::{DBColumn, Error, Split, StoreItem};
use serde_derive::{Deserialize, Serialize};
use ssz::{Decode, Encode};
use ssz_derive::{Decode, Encode};
@ -124,14 +124,12 @@ impl StoreItem for AnchorInfo {
pub struct BlobInfo {
/// The latest epoch that blobs were pruned.
pub last_pruned_epoch: Epoch,
/// The block root of the next blobs to prune from.
pub data_availability_boundary: Option<Hash256>,
/// The block root of the next blob that needs to be added to fill in the history.
pub oldest_blob_parent: Hash256,
/// The next epoch to prune blobs from.
pub next_epoch_to_prune: Epoch,
/// The state root and slot of the next blobs to prune from.
pub data_availability_boundary: Split,
/// The slot before which blobs are available.
pub oldest_blob_slot: Slot,
/// The slot from which blobs are available.
pub latest_blob_slot: Slot,
}
impl StoreItem for BlobInfo {