Specify error on get blob older than data availability boundary

sigp · Jan 11, 2023 · bdade5c · bdade5c
1 parent 5470c08
commit bdade5c
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs
@@ -1056,18 +1056,29 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             Some(blobs) => Ok(Some(blobs)),
             None => {
                 if let Ok(Some(block)) = self.get_blinded_block(block_root) {
-                    let expected_kzg_commitments = block.message().body().blob_kzg_commitments()?;
+                    let current_slot = self.slot()?;
+                    let current_epoch = current_slot.epoch(T::EthSpec::slots_per_epoch());
 
-                    if expected_kzg_commitments.len() > 0 {
-                        Err(Error::DBInconsistent(format!(
-                            "Expected kzg commitments but no blobs stored for block root {}",
-                            block_root
-                        )))
+                    if block.slot().epoch(T::EthSpec::slots_per_epoch())
+                        + *MIN_EPOCHS_FOR_BLOBS_SIDECARS_REQUESTS
+                        >= current_epoch
+                    {
+                        let expected_kzg_commitments =
+                            block.message().body().blob_kzg_commitments()?;
+
+                        if expected_kzg_commitments.len() > 0 {
+                            Err(Error::DBInconsistent(format!(
+                                "Expected kzg commitments but no blobs stored for block root {}",
+                                block_root
+                            )))
+                        } else {
+                            Ok(Some(BlobsSidecar::empty_from_parts(
+                                *block_root,
+                                block.slot(),
+                            )))
+                        }
                     } else {
-                        Ok(Some(BlobsSidecar::empty_from_parts(
-                            *block_root,
-                            block.slot(),
-                        )))
+                        Err(Error::DBError(DBError::BlobsTooOld(*block_root)))
                     }
                 } else {
                     Ok(None)

diff --git a/beacon_node/store/src/errors.rs b/beacon_node/store/src/errors.rs
@@ -19,6 +19,8 @@ pub enum Error {
     },
     RlpError(String),
     BlockNotFound(Hash256),
+    /// The blobs sidecar mapping to this block root is older than the data availability boundary.
+    BlobsTooOld(Hash256),
     NoContinuationData,
     SplitPointModified(Slot, Slot),
     ConfigError(StoreConfigError),