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

Fix blobs store bug

Browse Source
This commit is contained in:
Emilia Hane 2023-01-18 20:57:10 +01:00
parent 3bede06c9b
commit a875bec5f2
No known key found for this signature in database
GPG Key ID: E73394F9C09206FA
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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. /// Check if the blobs sidecar for a block exists on disk.
pub fn blobs_sidecar_exists(&self, block_root: &Hash256) -> Result<bool, Error> { 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()) .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( pub fn blobs_as_kv_store_ops(
&self, &self,
key: &Hash256, key: &Hash256,
blobs: &BlobsSidecar<E>, blobs: BlobsSidecar<E>,
ops: &mut Vec<KeyValueStoreOp>, ops: &mut Vec<KeyValueStoreOp>,
) { ) {
let db_key = get_key_for_col(DBColumn::BeaconBlob.into(), key.as_bytes()); 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) => { 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) => { StoreOp::PutStateSummary(state_root, summary) => {

3
beacon_node/store/src/impls/execution_payload.rs
View File

@ -1,7 +1,7 @@
use crate::{DBColumn, Error, StoreItem}; use crate::{DBColumn, Error, StoreItem};
use ssz::{Decode, Encode}; use ssz::{Decode, Encode};
use types::{ use types::{
EthSpec, ExecutionPayload, ExecutionPayloadCapella, ExecutionPayloadEip4844, BlobsSidecar, EthSpec, ExecutionPayload, ExecutionPayloadCapella, ExecutionPayloadEip4844,
ExecutionPayloadMerge, ExecutionPayloadMerge,
}; };
@ -25,6 +25,7 @@ macro_rules! impl_store_item {
impl_store_item!(ExecutionPayloadMerge); impl_store_item!(ExecutionPayloadMerge);
impl_store_item!(ExecutionPayloadCapella); impl_store_item!(ExecutionPayloadCapella);
impl_store_item!(ExecutionPayloadEip4844); impl_store_item!(ExecutionPayloadEip4844);
impl_store_item!(BlobsSidecar);
/// This fork-agnostic implementation should be only used for writing. /// This fork-agnostic implementation should be only used for writing.
/// ///