First try

Author: macladson

beacon_node/http_api/src/lib.rs

@@ -4446,6 +4446,24 @@ pub fn serve<T: BeaconChainTypes>(
             },
         );
 
+    // POST lighthouse/database/import_blobs
+    let post_lighthouse_database_import_blobs = database_path
+        .and(warp::path("import_blobs"))
+        .and(warp::path::end())
+        .and(warp_utils::json::json())
+        .and(task_spawner_filter.clone())
+        .and(chain_filter.clone())
+        .then(
+            |blobs, task_spawner: TaskSpawner<T::EthSpec>, chain: Arc<BeaconChain<T>>| {
+                task_spawner.blocking_json_task(Priority::P1, move || {
+                    match chain.store.import_historical_blobs(blobs) {
+                        Ok(()) => Ok(()),
+                        Err(e) => Err(warp_utils::reject::custom_server_error(format!("{e:?}"))),
+                    }
+                })
+            },
+        );
+
     // GET lighthouse/analysis/block_rewards
     let get_lighthouse_block_rewards = warp::path("lighthouse")
         .and(warp::path("analysis"))
@@ -4807,6 +4825,7 @@ pub fn serve<T: BeaconChainTypes>(
                     .uor(post_validator_liveness_epoch)
                     .uor(post_lighthouse_liveness)
                     .uor(post_lighthouse_database_reconstruct)
+                    .uor(post_lighthouse_database_import_blobs)
                     .uor(post_lighthouse_block_rewards)
                     .uor(post_lighthouse_ui_validator_metrics)
                     .uor(post_lighthouse_ui_validator_info)

beacon_node/store/src/errors.rs

@@ -50,10 +50,6 @@ pub enum Error {
     MissingGenesisState,
     MissingSnapshot(Slot),
     BlockReplayError(BlockReplayError),
-    AddPayloadLogicError,
-    InvalidKey,
-    InvalidBytes,
-    InconsistentFork(InconsistentFork),
     #[cfg(feature = "leveldb")]
     LevelDbError(LevelDBError),
     #[cfg(feature = "redb")]
@@ -68,6 +64,11 @@ pub enum Error {
         state_root: Hash256,
         slot: Slot,
     },
+    AddPayloadLogicError,
+    InvalidKey,
+    InvalidBytes,
+    InvalidBlobImport(String),
+    InconsistentFork(InconsistentFork),
     Hdiff(hdiff::Error),
     ForwardsIterInvalidColumn(DBColumn),
     ForwardsIterGap(DBColumn, Slot, Slot),

beacon_node/store/src/hot_cold_store.rs

@@ -41,6 +41,8 @@ use types::data_column_sidecar::{ColumnIndex, DataColumnSidecar, DataColumnSidec
 use types::*;
 use zstd::{Decoder, Encoder};
 
+const HISTORICAL_BLOB_BATCH_SIZE: usize = 1000;
+
 /// On-disk database that stores finalized states efficiently.
 ///
 /// Stores vector fields like the `block_roots` and `state_roots` separately, and only stores
@@ -852,6 +854,48 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
         Ok(())
     }
 
+    /// Import historical blobs.
+    pub fn import_historical_blobs(
+        &self,
+        historical_blobs: Vec<(Hash256, BlobSidecarList<E>)>,
+    ) -> Result<(), Error> {
+        if historical_blobs.is_empty() {
+            return Ok(());
+        }
+
+        let mut total_imported = 0;
+
+        for chunk in historical_blobs.chunks(HISTORICAL_BLOB_BATCH_SIZE) {
+            let mut ops = Vec::with_capacity(chunk.len());
+
+            for (block_root, blobs) in chunk {
+                // Verify block exists.
+                if !self.block_exists(block_root)? {
+                    warn!(
+                        self.log,
+                        "Skipping import of blobs; block root does not exist.";
+                        "block_root" => ?block_root,
+                        "num_blobs" => blobs.len(),
+                    );
+                    continue;
+                }
+
+                self.blobs_as_kv_store_ops(block_root, blobs.clone(), &mut ops);
+                total_imported += blobs.len();
+            }
+
+            self.blobs_db.do_atomically(ops)?;
+        }
+
+        debug!(
+            self.log,
+            "Imported historical blobs.";
+            "total_imported" => total_imported,
+        );
+
+        Ok(())
+    }
+
     pub fn blobs_as_kv_store_ops(
         &self,
         key: &Hash256,