From 3543b9ac7520192f1e19a6d86cd7f11a79eed5ef Mon Sep 17 00:00:00 2001
From: realbigsean <sean@sigmaprime.io>
Date: Wed, 18 Jan 2023 18:15:03 -0500
Subject: [PATCH] return a `BlobsUnavailable` error when the block root is a
 pre-4844 block

---
 beacon_node/beacon_chain/src/beacon_chain.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs
index a43d82ff329..99b463e0bce 100644
--- a/beacon_node/beacon_chain/src/beacon_chain.rs
+++ b/beacon_node/beacon_chain/src/beacon_chain.rs
@@ -1068,7 +1068,10 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                         // If there are no KZG commitments in the block, we know the sidecar should
                         // be empty.
                         let expected_kzg_commitments =
-                            block.message().body().blob_kzg_commitments()?;
+                            match block.message().body().blob_kzg_commitments() {
+                                Ok(kzg_commitments) => kzg_commitments,
+                                Err(_) => return Err(Error::BlobsUnavailable),
+                            };
                         if expected_kzg_commitments.is_empty() {
                             Ok(Some(BlobsSidecar::empty_from_parts(
                                 *block_root,