From e11e03ebc7e374bf3aea403133ae136b0615d236 Mon Sep 17 00:00:00 2001
From: Agnish Ghosh <iamagnix@gmail.com>
Date: Tue, 8 Oct 2024 03:52:36 +0530
Subject: [PATCH] rework initial block acceptance

---
 beacon_chain/nimbus_beacon_node.nim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/beacon_chain/nimbus_beacon_node.nim b/beacon_chain/nimbus_beacon_node.nim
index e940ccdf4..54972f6f5 100644
--- a/beacon_chain/nimbus_beacon_node.nim
+++ b/beacon_chain/nimbus_beacon_node.nim
@@ -427,12 +427,13 @@ proc initFullNode(
         #                             maybeFinalized = maybeFinalized)
 
         when consensusFork >= ConsensusFork.Deneb:
-          if len(forkyBlck.message.body.blob_kzg_commitments) != 0:
+          if not dataColumnQuarantine[].hasDataColumns(forkyBlck) and 
+              len(forkyBlck.message.body.blob_kzg_commitments) == 0:
             if not quarantine[].addColumnless(dag.finalizedHead.slot, forkyBlck):
               err(VerifierError.UnviableFork)
             else:
               err(VerifierError.MissingParent)
-          elif dataColumnQuarantine[].hasDataColumns(forkyBlck):
+          else:
             let data_columns = dataColumnQuarantine[].popDataColumns(forkyBlck.root, forkyBlck)
             await blockProcessor[].addBlock(MsgSource.gossip, signedBlock,
                                       Opt.none(BlobSidecars), Opt.some(data_columns),