From dfcc89138f23b95cb9a104dee6a2010ceed80cc9 Mon Sep 17 00:00:00 2001
From: Agnish Ghosh <iamagnix@gmail.com>
Date: Sat, 12 Oct 2024 16:42:56 +0530
Subject: [PATCH] add more specifics to reconstruction and block addition
 conditions

---
 .../gossip_processing/block_processor.nim     |  2 +-
 .../gossip_processing/eth2_processor.nim      | 10 +++++---
 beacon_chain/spec/eip7594_helpers.nim         | 24 ++++++++++++++-----
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/beacon_chain/gossip_processing/block_processor.nim b/beacon_chain/gossip_processing/block_processor.nim
index fe96d50a8..6de06e2bd 100644
--- a/beacon_chain/gossip_processing/block_processor.nim
+++ b/beacon_chain/gossip_processing/block_processor.nim
@@ -232,7 +232,7 @@ proc storeBackfillBlock(
           columnsOk = r.isOk()
 
     if not columnsOk:
-      if dataColumnsOpt.isSome:
+      if dataColumnsOpt.isSome and dataColumnsOpt.get.len >= (NUMBER_OF_COLUMNS div 2):
         let
           data_columns = dataColumnsOpt.get
           recovered_cps = 
diff --git a/beacon_chain/gossip_processing/eth2_processor.nim b/beacon_chain/gossip_processing/eth2_processor.nim
index bd4a26a57..95a2b5735 100644
--- a/beacon_chain/gossip_processing/eth2_processor.nim
+++ b/beacon_chain/gossip_processing/eth2_processor.nim
@@ -398,11 +398,15 @@ proc processDataColumnSidecar*(
     let columnless = o.unsafeGet()
     withBlck(columnless):
       when consensusFork >= ConsensusFork.Deneb:   
-        if self.dataColumnQuarantine[].hasEnoughDataColumns(forkyBlck):
+        if self.dataColumnQuarantine[].hasMissingDataColumns(forkyBlck):
+          self.blockProcessor[].enqueueBlock(
+            MsgSource.gossip, columnless,
+            Opt.none(BlobSidecars),
+            Opt.some(self.dataColumnQuarantine[].popDataColumns(block_root, forkyBlck)))
+        elif self.dataColumnQuarantine[].hasEnoughDataColumns(forkyBlck):
           let
             columns = self.dataColumnQuarantine[].gatherDataColumns(forkyBlck)
-          if columns.len >= (NUMBER_OF_COLUMNS div 2) or
-              self.dataColumnQuarantine[].supernode:
+          if columns.len >= (NUMBER_OF_COLUMNS div 2):
             let
               reconstructed_columns = 
                 self.processReconstructionFromGossip(forkyBlck, columns)
diff --git a/beacon_chain/spec/eip7594_helpers.nim b/beacon_chain/spec/eip7594_helpers.nim
index 2dd012505..fb8052271 100644
--- a/beacon_chain/spec/eip7594_helpers.nim
+++ b/beacon_chain/spec/eip7594_helpers.nim
@@ -191,8 +191,7 @@ proc recover_cells_and_proofs*(
       return err ("DataColumns do not have the same length")
 
   var
-    recovered_cps: seq[CellsAndProofs]
-  recovered_cps.setLen(blobCount)
+    recovered_cps = newSeq[CellsAndProofs](blobCount)
 
   for blobIdx in 0..<blobCount:
     var
@@ -217,7 +216,7 @@ proc recover_cells_and_proofs*(
     if not recovered_cells_and_proofs.isOk:
       return err("Issue with computing cells and proofs!")
 
-    recovered_cps.add recovered_cells_and_proofs.get
+    recovered_cps[bIdx] = recovered_cells_and_proofs.get
 
   ok(recovered_cps)
 
@@ -285,16 +284,28 @@ proc get_data_column_sidecars*(signed_beacon_block: deneb.TrustedSignedBeaconBlo
   var
     sidecars =
       newSeqOfCap[DataColumnSidecar](kzg_abi.CELLS_PER_EXT_BLOB)
+    # Flattened the cells and proofs from the `CellsAndProofs` type to 
+    # make it simpler to handle overall
+    flattened_cells = 
+      newSeq[CellBytes](cellsAndProofs.len)
+    flattened_proofs =
+      newSeq[ProofBytes](cellsAndProofs.len)
+
+
+  for i in 0..<cellsAndProofs.len:
+    flattened_cells[i] = cellsAndProofs[i].cells
+    flattened_proofs[i] = cellsAndProofs[i].proofs
 
   for column_index in 0..<NUMBER_OF_COLUMNS:
     var
       column_cells: seq[KzgCell]
       column_proofs: seq[KzgProof]
-    for i in 0..<cellsAndProofs.len:
-      column_cells.add(cellsAndProofs[i].cells)
-      column_proofs.add(cellsAndProofs[i].proofs)
+    for row_index in 0..<cellsAndProofs.len:
+      column_cells.add(flattened_cells[row_index][column_index])
+      column_proofs.add(flattened_proofs[row_index][column_index])
 
     column_proofs.setLen(blck.body.blob_kzg_commitments.len)
+    column_cells.setLen(blck.body.blob_kzg_commitments.len)
 
     var sidecar = DataColumnSidecar(
       index: ColumnIndex(column_index),
@@ -361,6 +372,7 @@ proc get_data_column_sidecars*(signed_beacon_block: deneb.SignedBeaconBlock |
       column_proofs.add(flattened_proofs[row_index][column_index])
 
     column_proofs.setLen(blck.body.blob_kzg_commitments.len)
+    column_cells.setLen(blck.body.blob_kzg_commitments.len)
 
     var sidecar = DataColumnSidecar(
       index: ColumnIndex(column_index),