From 6d837bcdaa86ec1718aa29762282381288d2c468 Mon Sep 17 00:00:00 2001
From: Agnish Ghosh <iamagnix@gmail.com>
Date: Thu, 3 Oct 2024 02:33:25 +0530
Subject: [PATCH] fix more quarantine issues

---
 .../consensus_object_pools/data_column_quarantine.nim       | 6 +++---
 beacon_chain/gossip_processing/block_processor.nim          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/beacon_chain/consensus_object_pools/data_column_quarantine.nim b/beacon_chain/consensus_object_pools/data_column_quarantine.nim
index 32051f514..14e8deb3e 100644
--- a/beacon_chain/consensus_object_pools/data_column_quarantine.nim
+++ b/beacon_chain/consensus_object_pools/data_column_quarantine.nim
@@ -74,7 +74,7 @@ func popDataColumns*(
     blck: deneb.SignedBeaconBlock | electra.SignedBeaconBlock):
     seq[ref DataColumnSidecar] =
   var r: seq[ref DataColumnSidecar]
-  for idx in 0..<len(blck.message.body.blob_kzg_commitments):
+  for idx in 0..<NUMBER_OF_COLUMNS:
     var c: ref DataColumnSidecar
     if quarantine.data_columns.pop((digest, ColumnIndex idx), c):
       r.add(c)
@@ -82,7 +82,7 @@ func popDataColumns*(
 
 func hasDataColumns*(quarantine: DataColumnQuarantine,
     blck: deneb.SignedBeaconBlock | electra.SignedBeaconBlock): bool =
-  for idx in 0..<len(blck.message.body.blob_kzg_commitments):
+  for idx in 0..<NUMBER_OF_COLUMNS:
     if (blck.root, ColumnIndex idx) notin quarantine.data_columns:
       return false
   true
@@ -90,7 +90,7 @@ func hasDataColumns*(quarantine: DataColumnQuarantine,
 func dataColumnFetchRecord*(quarantine: DataColumnQuarantine,
     blck: deneb.SignedBeaconBlock | electra.SignedBeaconBlock): DataColumnFetchRecord =
   var indices: seq[ColumnIndex]
-  for i in 0..<len(blck.message.body.blob_kzg_commitments):
+  for i in 0..<NUMBER_OF_COLUMNS:
     let idx = ColumnIndex(i)
     if not quarantine.data_columns.hasKey(
         (blck.root, idx)):
diff --git a/beacon_chain/gossip_processing/block_processor.nim b/beacon_chain/gossip_processing/block_processor.nim
index b49a21a80..e77f3daa0 100644
--- a/beacon_chain/gossip_processing/block_processor.nim
+++ b/beacon_chain/gossip_processing/block_processor.nim
@@ -568,7 +568,7 @@ proc storeBlock(
           withBlck(parentBlck.get()):
             when consensusFork >= ConsensusFork.Deneb:
               var data_column_sidecars: DataColumnSidecars
-              for i in 0..<forkyBlck.message.body.blob_kzg_commitments.len:
+              for i in 0..<NUMBER_OF_COLUMNS:
                 let data_column = DataColumnSidecar.new()
                 if not dag.db.getDataColumnSidecar(parent_root, i.ColumnIndex, data_column[]):
                   columnsOk = false