From 878cfc5d5c3f9e934afbeb15e38f7dc4f3803ee7 Mon Sep 17 00:00:00 2001
From: Agnish Ghosh <iamagnix@gmail.com>
Date: Wed, 2 Oct 2024 21:44:40 +0530
Subject: [PATCH] other fixes

---
 beacon_chain/gossip_processing/block_processor.nim | 7 ++++---
 beacon_chain/nimbus_beacon_node.nim                | 8 +++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/beacon_chain/gossip_processing/block_processor.nim b/beacon_chain/gossip_processing/block_processor.nim
index 661c15073..e28f19d98 100644
--- a/beacon_chain/gossip_processing/block_processor.nim
+++ b/beacon_chain/gossip_processing/block_processor.nim
@@ -260,7 +260,7 @@ proc storeBackfillBlock(
   let data_columns = dataColumnsOpt.valueOr: DataColumnSidecars @[]
   for c in data_columns:
     self.consensusManager.dag.db.putDataColumnSidecar(c[])
-    debug "Data column written to database!",
+    debug "StoreBackFillBlock: Data column written to database!",
       data_column = shortLog(c[])
 
   res
@@ -646,6 +646,7 @@ proc storeBlock(
       let kzgCommits = signedBlock.message.body.blob_kzg_commitments.asSeq
       debugEcho "Hitting verification"
       if data_columns.len > 0 and kzgCommits.len > 0:
+        debugEcho "Hitting verification 2"
         for i in 0..<data_columns.len:
           let r = verify_data_column_sidecar_kzg_proofs(data_columns[i][])
           if r.isErr():
@@ -655,7 +656,7 @@ proc storeBlock(
               blck = shortLog(signedBlock.message),
               signature = shortLog(signedBlock.signature),
               msg = r.error()
-          return err((VerifierError.Invalid, ProcessingStatus.completed))
+            return err((VerifierError.Invalid, ProcessingStatus.completed))
 
   type Trusted = typeof signedBlock.asTrusted()
 
@@ -707,7 +708,7 @@ proc storeBlock(
   let data_columns = dataColumnsOpt.valueOr: DataColumnSidecars @[]
   for c in data_columns:
     self.consensusManager.dag.db.putDataColumnSidecar(c[])
-    debug "Data column written to database!",
+    debug "StoreBlock: Data column written to database!",
       data_column = shortLog(c[])
 
   let addHeadBlockTick = Moment.now()
diff --git a/beacon_chain/nimbus_beacon_node.nim b/beacon_chain/nimbus_beacon_node.nim
index fab5e85e7..5877675ea 100644
--- a/beacon_chain/nimbus_beacon_node.nim
+++ b/beacon_chain/nimbus_beacon_node.nim
@@ -1545,15 +1545,17 @@ proc tryReconstructingDataColumns* (self: BeaconNode,
 
     # Reconstruct data column sidecars from recovered blobs
     let reconstructedDataColumns = get_data_column_sidecars(signed_block, recovered_cps.get)
-
+    debugEcho "Reconstructed Data Columns len"
+    debugEcho reconstructedDataColumns.get.len
     for data_column in reconstructedDataColumns.get:
       if data_column.index notin custodiedColumnIndices:
         continue
 
       finalisedDataColumns.add(data_column)
-      db.putDataColumnSidecar(data_column)
+    for fc in finalisedDataColumns:
+      db.putDataColumnSidecar(fc)
       debug "Reconstructed data column written to database",
-        data_column = shortLog(data_column)
+        data_column = shortLog(fc)
   ok(finalisedDataColumns)
 
 proc reconstructAndSendDataColumns*(node: BeaconNode) {.async.} =