From a875bec5f2b4f06bf4a98d228d74dcfdd3bb446c Mon Sep 17 00:00:00 2001
From: Emilia Hane <emiliaha95@gmail.com>
Date: Wed, 18 Jan 2023 20:57:10 +0100
Subject: [PATCH] Fix blobs store bug

---
 beacon_node/store/src/hot_cold_store.rs          | 10 +++++++---
 beacon_node/store/src/impls/execution_payload.rs |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/beacon_node/store/src/hot_cold_store.rs b/beacon_node/store/src/hot_cold_store.rs
index 71015f2a6..54d21a7c2 100644
--- a/beacon_node/store/src/hot_cold_store.rs
+++ b/beacon_node/store/src/hot_cold_store.rs
@@ -496,7 +496,7 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
 
     /// Check if the blobs sidecar for a block exists on disk.
     pub fn blobs_sidecar_exists(&self, block_root: &Hash256) -> Result<bool, Error> {
-        self.get_item::<BlobsSidecar<T>>(block_root)
+        self.get_item::<BlobsSidecar<E>>(block_root)
             .map(|blobs| blobs.is_some())
     }
 
@@ -543,7 +543,7 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
     pub fn blobs_as_kv_store_ops(
         &self,
         key: &Hash256,
-        blobs: &BlobsSidecar<E>,
+        blobs: BlobsSidecar<E>,
         ops: &mut Vec<KeyValueStoreOp>,
     ) {
         let db_key = get_key_for_col(DBColumn::BeaconBlob.into(), key.as_bytes());
@@ -778,7 +778,11 @@ impl<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<E>> HotColdDB<E, Hot, Cold>
                 }
 
                 StoreOp::PutBlobs(block_root, blobs) => {
-                    self.blobs_as_kv_store_ops(&block_root, &blobs, &mut key_value_batch);
+                    self.blobs_as_kv_store_ops(
+                        &block_root,
+                        (&*blobs).clone(),
+                        &mut key_value_batch,
+                    );
                 }
 
                 StoreOp::PutStateSummary(state_root, summary) => {
diff --git a/beacon_node/store/src/impls/execution_payload.rs b/beacon_node/store/src/impls/execution_payload.rs
index ad68d1fba..01a2dba0b 100644
--- a/beacon_node/store/src/impls/execution_payload.rs
+++ b/beacon_node/store/src/impls/execution_payload.rs
@@ -1,7 +1,7 @@
 use crate::{DBColumn, Error, StoreItem};
 use ssz::{Decode, Encode};
 use types::{
-    EthSpec, ExecutionPayload, ExecutionPayloadCapella, ExecutionPayloadEip4844,
+    BlobsSidecar, EthSpec, ExecutionPayload, ExecutionPayloadCapella, ExecutionPayloadEip4844,
     ExecutionPayloadMerge,
 };
 
@@ -25,6 +25,7 @@ macro_rules! impl_store_item {
 impl_store_item!(ExecutionPayloadMerge);
 impl_store_item!(ExecutionPayloadCapella);
 impl_store_item!(ExecutionPayloadEip4844);
+impl_store_item!(BlobsSidecar);
 
 /// This fork-agnostic implementation should be only used for writing.
 ///