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

Fix conflicts from rebasing eip4844

Browse Source
This commit is contained in:
Emilia Hane 2023-02-09 08:20:08 +01:00
parent 290e1d2ff7
commit 1300fb7ffa
No known key found for this signature in database
GPG Key ID: E73394F9C09206FA
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1977,11 +1977,12 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
blob_info, blob_info,
BlobInfo { BlobInfo {
oldest_blob_slot: Some(end_slot + 1), oldest_blob_slot: Some(end_slot + 1),
blobs_db: blob_info.blobs_db,
}, },
)?; )?;
ops.push(StoreOp::KeyValueOp(update_blob_info)); ops.push(StoreOp::KeyValueOp(update_blob_info));
self.do_atomically(ops)?; self.do_atomically_with_block_and_blobs_cache(ops)?;
info!( info!(
self.log, self.log,
"Blobs sidecar pruning complete"; "Blobs sidecar pruning complete";

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

@ -126,8 +126,6 @@ pub struct BlobInfo {
pub oldest_blob_slot: Option<Slot>, pub oldest_blob_slot: Option<Slot>,
/// A separate blobs database is in use. /// A separate blobs database is in use.
pub blobs_db: bool, pub blobs_db: bool,
/// The slot after which blobs are available (>=).
pub oldest_blob_slot: Option<Slot>,
} }
impl StoreItem for BlobInfo { impl StoreItem for BlobInfo {

2
database_manager/src/lib.rs
View File

@ -337,10 +337,12 @@ pub fn prune_blobs<E: EthSpec>(
let spec = &runtime_context.eth2_config.spec; let spec = &runtime_context.eth2_config.spec;
let hot_path = client_config.get_db_path(); let hot_path = client_config.get_db_path();
let cold_path = client_config.get_freezer_db_path(); let cold_path = client_config.get_freezer_db_path();
let blobs_path = client_config.get_blobs_db_path();
let db = HotColdDB::<E, LevelDB<E>, LevelDB<E>>::open( let db = HotColdDB::<E, LevelDB<E>, LevelDB<E>>::open(
&hot_path, &hot_path,
&cold_path, &cold_path,
blobs_path,
|_, _, _| Ok(()), |_, _, _| Ok(()),
client_config.store, client_config.store,
spec.clone(), spec.clone(),