From a89847b1f1d0ee2f5ed3e447f80ee7ecdf9f34ef Mon Sep 17 00:00:00 2001
From: Agnish Ghosh <iamagnix@gmail.com>
Date: Thu, 10 Oct 2024 01:41:18 +0530
Subject: [PATCH] missing data columns improvement

---
 .../consensus_object_pools/data_column_quarantine.nim | 11 +++--------
 beacon_chain/nimbus_beacon_node.nim                   |  4 ----
 beacon_chain/sync/request_manager.nim                 |  3 ++-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/beacon_chain/consensus_object_pools/data_column_quarantine.nim b/beacon_chain/consensus_object_pools/data_column_quarantine.nim
index d0af5af42..714f0a8ee 100644
--- a/beacon_chain/consensus_object_pools/data_column_quarantine.nim
+++ b/beacon_chain/consensus_object_pools/data_column_quarantine.nim
@@ -104,14 +104,9 @@ func hasDataColumns*(quarantine: DataColumnQuarantine,
     blck: deneb.SignedBeaconBlock | electra.SignedBeaconBlock): bool =
   var counter = 0
   for i in 0..<NUMBER_OF_COLUMNS:
-    let idx = ColumnIndex(i)
-    if len(blck.message.body.blob_kzg_commitments) != 0 and 
-        quarantine.data_columns.hasKey(
-        (blck.root, idx)):
-      inc counter
-  if counter != max(SAMPLES_PER_SLOT, CUSTODY_REQUIREMENT) or
-      counter != NUMBER_OF_COLUMNS:
-    return false
+    if len(blck.message.body.blob_kzg_commitments) != 0:
+      if (blck.root, ColumnIndex i) notin quarantine.data_columns:
+        return false
   true
 
 func dataColumnFetchRecord*(quarantine: DataColumnQuarantine,
diff --git a/beacon_chain/nimbus_beacon_node.nim b/beacon_chain/nimbus_beacon_node.nim
index bff5b2f14..e31116b5a 100644
--- a/beacon_chain/nimbus_beacon_node.nim
+++ b/beacon_chain/nimbus_beacon_node.nim
@@ -427,10 +427,6 @@ proc initFullNode(
               return err(VerifierError.UnviableFork)
             else:
               return err(VerifierError.MissingParent)
-          elif accumulatedColumns.len == 0:
-            return await blockProcessor[].addBlock(MsgSource.gossip, signedBlock,
-                                      Opt.none(BlobSidecars), Opt.none(DataColumnSidecars),
-                                      maybeFinalized = maybeFinalized)
           elif supernode == true and accumulatedColumns.len >= localCustodyColumns.len div 2:
             let data_columns = dataColumnQuarantine[].popDataColumns(forkyBlck.root, forkyBlck)
             return await blockProcessor[].addBlock(MsgSource.gossip, signedBlock,
diff --git a/beacon_chain/sync/request_manager.nim b/beacon_chain/sync/request_manager.nim
index 880161352..5189c8b26 100644
--- a/beacon_chain/sync/request_manager.nim
+++ b/beacon_chain/sync/request_manager.nim
@@ -541,7 +541,8 @@ proc getMissingDataColumns(rman: RequestManager): seq[DataColumnIdentifier] =
           debug "Not handling missing data columns early in slot"
           continue
 
-        if not rman.dataColumnQuarantine[].hasDataColumns(forkyBlck):
+        if not rman.dataColumnQuarantine[].hasDataColumns(forkyBlck) and
+            len(forkyBlck.message.body.blob_kzg_commitments) != 0:
           let missing = rman.dataColumnQuarantine[].dataColumnFetchRecord(forkyBlck)
           if len(missing.indices) == 0:
             warn "quarantine is missing data columns, but missing indices are empty",