column serving issue and other fixes (#7528)

* column serving issue and other fixes

* another change

* remove downscore

* fixes

Author: agnxsh

beacon_chain/gossip_processing/block_processor.nim

@@ -285,7 +285,7 @@ proc storeBackfillBlock(
   # Only store data columns after successfully establishing block viability.
   let columns = dataColumnsOpt.valueOr: DataColumnSidecars @[]
   debug "Inserting columns into database (backfill)",
-    indices = columns.mapIt($it[].index)
+    indices = columns.mapIt($it[].index).len
   for i in 0..<columns.len:
     self.consensusManager.dag.db.putDataColumnSidecar(columns[i][])
 
@@ -757,7 +757,7 @@ proc storeBlock(
   # write data columns now that block has been written
   let data_columns = dataColumnsOpt.valueOr: DataColumnSidecars @[]
   debug "Inserting columns into database",
-    indices = data_columns.mapIt($it.index)
+    indices = data_columns.mapIt($it.index).len
   for col in data_columns:
     self.consensusManager.dag.db.putDataColumnSidecar(col[])
 

beacon_chain/networking/eth2_network.nim

@@ -2511,8 +2511,10 @@ proc lookupCgcFromPeer*(peer: Peer): uint64 =
 
   let metadata = peer.metadata
   if metadata.isOk:
-    return metadata.get.custody_group_count
-
+    return (if metadata.get.custody_group_count > NUMBER_OF_COLUMNS:
+              0'u64
+            else:
+              metadata.get.custody_group_count)
   # Try getting the custody count from ENR if metadata fetch fails.
   debug "Could not get cgc from metadata, trying from ENR",
         peer_id = peer.peerId
@@ -2523,6 +2525,8 @@ proc lookupCgcFromPeer*(peer: Peer): uint64 =
     if enrFieldOpt.isOk:
       try:
         let cgc = SSZ.decode(enrFieldOpt.get, uint8)
+        if cgc > NUMBER_OF_COLUMNS:
+          return 0'u64
         return cgc.uint64
       except SszError, SerializationError:
         discard  # Ignore decoding errors and fallback to default

beacon_chain/nimbus_beacon_node.nim

@@ -1713,7 +1713,7 @@ proc reconstructDataColumns(node: BeaconNode, slot: Slot) =
   logScope:
     slot = slot
 
-  let blck = node.dag.getForkedBlock(node.dag.finalizedHead.blck.bid).valueOr:
+  let blck = node.dag.getForkedBlock(node.dag.head.bid).valueOr:
     warn "Failed to get the current slot head"
     return
 
@@ -1730,7 +1730,7 @@ proc reconstructDataColumns(node: BeaconNode, slot: Slot) =
         if node.dag.db.getDataColumnSidecar(forkyBlck.root, i, colData):
           columns.add(newClone(colData))
           indices.incl(i)
-      debug "Stored data columns", indices
+      debug "Stored data columns", columns = indices.len
 
       # Make sure the node has obtained 50%+ of all the columns
       if columns.lenu64 < (maxColCount div 2):
@@ -1747,6 +1747,7 @@ proc reconstructDataColumns(node: BeaconNode, slot: Slot) =
           error "Error in data column reconstruction"
           return
       let rowCount = recovered.len
+      var reconCounter = 0
       for i in 0 ..< maxColCount:
         if i in indices:
           continue
@@ -1758,13 +1759,17 @@ proc reconstructDataColumns(node: BeaconNode, slot: Slot) =
           proofs[j] = recovered[j].proofs[i]
         let dataColumn = fulu.DataColumnSidecar(
           index: ColumnIndex(i),
-          column: DataColumn(cells),
-          kzg_proofs: deneb.KzgProofs(proofs),
-          signed_block_header: forkyBlck.asSigned().toSignedBeaconBlockHeader())
+          column: DataColumn.init(cells),
+          kzg_commitments: columns[0].kzg_commitments,
+          kzg_proofs: deneb.KzgProofs.init(proofs),
+          signed_block_header: forkyBlck.asSigned().toSignedBeaconBlockHeader(),
+          kzg_commitments_inclusion_proof:
+            columns[0].kzg_commitments_inclusion_proof)
         node.dag.db.putDataColumnSidecar(dataColumn)
+        inc reconCounter
 
-      debug "Column reconstructed",
-        len = maxColCount - indices.lenu64
+      debug "Columns reconstructed",
+        columns = reconCounter
 
 proc onSlotEnd(node: BeaconNode, slot: Slot) {.async.} =
   # Things we do when slot processing has ended and we're about to wait for the

beacon_chain/spec/peerdas_helpers.nim

@@ -47,7 +47,8 @@ func handle_custody_groups(cfg: RuntimeConfig, node_id: NodeId,
     custody_groups: HashSet[CustodyIndex]
     current_id = node_id
 
-  while custody_groups.lenu64 < custody_group_count:
+  let safe_count = min(custody_group_count, cfg.NUMBER_OF_CUSTODY_GROUPS)
+  while custody_groups.lenu64 < safe_count:
     var hashed_bytes: array[8, byte]
 
     let