From 6fc5fc79ed58e7433e8afda68d53ea75b18f89f0 Mon Sep 17 00:00:00 2001
From: Agnish Ghosh <iamagnix@gmail.com>
Date: Sun, 13 Oct 2024 13:48:51 +0530
Subject: [PATCH] have gather data columns in enqueue block

---
 .../consensus_object_pools/data_column_quarantine.nim     | 6 +++---
 beacon_chain/gossip_processing/eth2_processor.nim         | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/beacon_chain/consensus_object_pools/data_column_quarantine.nim b/beacon_chain/consensus_object_pools/data_column_quarantine.nim
index c8c2ee0a0..b9d8aee66 100644
--- a/beacon_chain/consensus_object_pools/data_column_quarantine.nim
+++ b/beacon_chain/consensus_object_pools/data_column_quarantine.nim
@@ -88,14 +88,14 @@ func accumulateDataColumns*(quarantine: DataColumnQuarantine,
 func gatherDataColumns*(quarantine: DataColumnQuarantine,
                        blck: deneb.SignedBeaconBlock | 
                        electra.SignedBeaconBlock): 
-                       seq[DataColumnSidecar] =
-  var columns: seq[DataColumnSidecar]
+                       seq[ref DataColumnSidecar] =
+  var columns: seq[ref DataColumnSidecar]
   for i in 0..<NUMBER_OF_COLUMNS:
     let idx = ColumnIndex(i)
     if quarantine.data_columns.hasKey(
         (blck.root, idx)):
       let value = quarantine.data_columns.getOrDefault((blck.root, idx), default(ref DataColumnSidecar))
-      columns.add(value[])
+      columns.add(value)
   columns
 
 func popDataColumns*(
diff --git a/beacon_chain/gossip_processing/eth2_processor.nim b/beacon_chain/gossip_processing/eth2_processor.nim
index 72db361d9..814b4ae85 100644
--- a/beacon_chain/gossip_processing/eth2_processor.nim
+++ b/beacon_chain/gossip_processing/eth2_processor.nim
@@ -8,7 +8,7 @@
 {.push raises: [].}
 
 import
-  std/tables,
+  std/[tables, sequtils],
   stew/results,
   chronicles, chronos, metrics, taskpools,
   ../networking/eth2_network,
@@ -404,7 +404,7 @@ proc processDataColumnSidecar*(
           self.blockProcessor[].enqueueBlock(
             MsgSource.gossip, columnless,
             Opt.none(BlobSidecars),
-            Opt.some(self.dataColumnQuarantine[].popDataColumns(block_root, forkyBlck)))
+            Opt.some(self.dataColumnQuarantine[].gatherDataColumns(forkyBlck)))
         elif self.dataColumnQuarantine[].hasEnoughDataColumns(forkyBlck):
           let
             columns = self.dataColumnQuarantine[].gatherDataColumns(forkyBlck)
@@ -412,9 +412,9 @@ proc processDataColumnSidecar*(
               self.dataColumnQuarantine[].supernode:
             let
               reconstructed_columns = 
-                self.processReconstructionFromGossip(forkyBlck, columns)
+                self.processReconstructionFromGossip(forkyBlck, columns.mapIt(it[]))
             for rc in reconstructed_columns.get:
-              if rc notin self.dataColumnQuarantine[].gatherDataColumns(forkyBlck):
+              if rc notin self.dataColumnQuarantine[].gatherDataColumns(forkyBlck).mapIt(it[]):
                 self.dataColumnQuarantine[].put(newClone(rc))
           self.blockProcessor[].enqueueBlock(
             MsgSource.gossip, columnless,