From 1300fb7ffac32fa43b0b4fee34caee47d16ba102 Mon Sep 17 00:00:00 2001
From: Emilia Hane <emiliaha95@gmail.com>
Date: Thu, 9 Feb 2023 08:20:08 +0100
Subject: [PATCH] Fix conflicts from rebasing eip4844

---
 beacon_node/store/src/hot_cold_store.rs | 3 ++-
 beacon_node/store/src/metadata.rs       | 2 --
 database_manager/src/lib.rs             | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/beacon_node/store/src/hot_cold_store.rs b/beacon_node/store/src/hot_cold_store.rs
index f8d143dcc..0693646fc 100644
--- a/beacon_node/store/src/hot_cold_store.rs
+++ b/beacon_node/store/src/hot_cold_store.rs
@@ -1977,11 +1977,12 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
             blob_info,
             BlobInfo {
                 oldest_blob_slot: Some(end_slot + 1),
+                blobs_db: blob_info.blobs_db,
             },
         )?;
         ops.push(StoreOp::KeyValueOp(update_blob_info));
 
-        self.do_atomically(ops)?;
+        self.do_atomically_with_block_and_blobs_cache(ops)?;
         info!(
             self.log,
             "Blobs sidecar pruning complete";
diff --git a/beacon_node/store/src/metadata.rs b/beacon_node/store/src/metadata.rs
index 6c3761eb8..92117254f 100644
--- a/beacon_node/store/src/metadata.rs
+++ b/beacon_node/store/src/metadata.rs
@@ -126,8 +126,6 @@ pub struct BlobInfo {
     pub oldest_blob_slot: Option<Slot>,
     /// A separate blobs database is in use.
     pub blobs_db: bool,
-    /// The slot after which blobs are available (>=).
-    pub oldest_blob_slot: Option<Slot>,
 }
 
 impl StoreItem for BlobInfo {
diff --git a/database_manager/src/lib.rs b/database_manager/src/lib.rs
index d9b480836..7d5753434 100644
--- a/database_manager/src/lib.rs
+++ b/database_manager/src/lib.rs
@@ -337,10 +337,12 @@ pub fn prune_blobs<E: EthSpec>(
     let spec = &runtime_context.eth2_config.spec;
     let hot_path = client_config.get_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(
         &hot_path,
         &cold_path,
+        blobs_path,
         |_, _, _| Ok(()),
         client_config.store,
         spec.clone(),