From 18e3ba2a3994afc2cd8e2229afb5422e2d06b615 Mon Sep 17 00:00:00 2001
From: Agnish Ghosh <iamagnix@gmail.com>
Date: Wed, 26 Jun 2024 12:26:37 +0530
Subject: [PATCH] fix: get_data_column_sidecar

---
 beacon_chain/spec/eip7594_helpers.nim      | 10 +++++-
 beacon_chain/validators/message_router.nim | 42 +++++++++++-----------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/beacon_chain/spec/eip7594_helpers.nim b/beacon_chain/spec/eip7594_helpers.nim
index 9c129a6da..aa37a29f2 100644
--- a/beacon_chain/spec/eip7594_helpers.nim
+++ b/beacon_chain/spec/eip7594_helpers.nim
@@ -11,7 +11,9 @@
 import
   std/[algorithm, macros, tables],
   stew/results,
-  ssz_serialization/proofs,
+  ssz_serialization/[
+    proofs,
+    types],
   chronicles,
   ./[beacon_time, crypto],
   kzg4844/kzg_ex,
@@ -145,7 +147,12 @@ proc get_data_column_sidecars*(signed_block: deneb.SignedBeaconBlock | electra.S
     signed_block_header: SignedBeaconBlockHeader
     blck = signed_block.message
     cellsAndProofs: seq[KzgCellsAndKzgProofs]
+    kzg_incl_proof: array[KZG_COMMITMENT_INCLUSION_PROOF_DEPTH, Eth2Digest]
 
+  blck.body.build_proof(
+    27.GeneralizedIndex,
+    kzg_incl_proof).expect("Valid gindex")
+  
   for blob in blobs:
     let
       computed_cell = computeCellsAndKzgProofs(blob)
@@ -181,6 +188,7 @@ proc get_data_column_sidecars*(signed_block: deneb.SignedBeaconBlock | electra.S
       kzgCommitments: blck.body.blob_kzg_commitments,
       kzgProofs: kzgProofOfColumn,
       signed_block_header: signed_block_header
+
     )
     blck.body.build_proof(
       kzg_commitment_inclusion_proof_gindex(BlobIndex(columnIndex)),
diff --git a/beacon_chain/validators/message_router.nim b/beacon_chain/validators/message_router.nim
index 2b945e8a4..479a91e9d 100644
--- a/beacon_chain/validators/message_router.nim
+++ b/beacon_chain/validators/message_router.nim
@@ -161,27 +161,27 @@ proc routeSignedBeaconBlock*(
         notice "Blob sent", blob = shortLog(blobs[i])
     blobRefs = Opt.some(blobs.mapIt(newClone(it)))
   
-  var dataColumnRefs = Opt.none(DataColumnSidecars)
-  when typeof(blck).kind >= ConsensusFork.Deneb:   
-    if blobsOpt.isSome():
-      let blobs = blobsOpt.get()
-      let data_columns = get_data_column_sidecars(blck, blobs.mapIt(it.blob)).get()
-      var das_workers = newSeq[Future[SendResult]](len(data_columns))
-      for i in 0..<data_columns.lenu64:
-        let subnet_id = compute_subnet_for_data_column_sidecar(i)
-        das_workers[i] = 
-            router[].network.broadcastDataColumnSidecar(subnet_id, data_columns[i])
-      let allres = await allFinished(das_workers)
-      for i in 0..<allres.len:
-        let res = allres[i]
-        doAssert res.finished()
-        if res.failed():
-          notice "Data Columns not sent",
-            data_column = shortLog(data_columns[i]), error = res.error[]
-        else:
-          notice "Data columns sent", data_column = shortLog(data_columns[i])
-      blobRefs = Opt.some(blobs.mapIt(newClone(it)))
-      dataColumnRefs = Opt.some(data_columns.mapIt(newClone(it)))
+  # var dataColumnRefs = Opt.none(DataColumnSidecars)
+  # when typeof(blck).kind >= ConsensusFork.Deneb:   
+  #   if blobsOpt.isSome():
+  #     let blobs = blobsOpt.get()
+  #     let data_columns = get_data_column_sidecars(blck, blobs.mapIt(it.blob)).get()
+  #     var das_workers = newSeq[Future[SendResult]](len(data_columns))
+  #     for i in 0..<data_columns.lenu64:
+  #       let subnet_id = compute_subnet_for_data_column_sidecar(i)
+  #       das_workers[i] = 
+  #           router[].network.broadcastDataColumnSidecar(subnet_id, data_columns[i])
+  #     let allres = await allFinished(das_workers)
+  #     for i in 0..<allres.len:
+  #       let res = allres[i]
+  #       doAssert res.finished()
+  #       if res.failed():
+  #         notice "Data Columns not sent",
+  #           data_column = shortLog(data_columns[i]), error = res.error[]
+  #       else:
+  #         notice "Data columns sent", data_column = shortLog(data_columns[i])
+  #     blobRefs = Opt.some(blobs.mapIt(newClone(it)))
+  #     dataColumnRefs = Opt.some(data_columns.mapIt(newClone(it)))
     
   let added = await router[].blockProcessor[].addBlock(
     MsgSource.api, ForkedSignedBeaconBlock.init(blck), blobRefs, Opt.none(DataColumnSidecars))