some more changes, caller functions

Author: agnxsh

beacon_chain/gossip_processing/block_processor.nim

@@ -183,7 +183,9 @@ proc verifySidecars(
 ): Result[void, VerifierError] =
   const consensusFork = typeof(signedBlock).kind
 
-  when consensusFork == ConsensusFork.Gloas:
+  when sidecarsOpt is NoSidecars:
+    static: doAssert consensusFork in ConsensusFork.Phase0 .. ConsensusFork.Capella
+  elif consensusFork == ConsensusFork.Gloas:
     # For Gloas, we still need to store the columns if they're provided
     # but skip validation since we don't have kzg_commitments in the block
     debugGloasComment "potentially validate against payload envelope"
@@ -219,8 +221,6 @@ proc verifySidecars(
             signature = shortLog(signedBlock.signature),
             msg = r.error()
           return err(VerifierError.Invalid)
-  elif consensusFork in ConsensusFork.Phase0 .. ConsensusFork.Capella:
-    static: doAssert sidecarsOpt is NoSidecars
   else:
     {.error: "Unknown consensus fork " & $consensusFork.}
 
@@ -394,7 +394,8 @@ proc enqueueQuarantine(self: ref BlockProcessor, parent: BlockRef) =
     withBlck(quarantined):
       when consensusFork == ConsensusFork.Gloas:
         debugGloasComment ""
-        const sidecarsOpt = noSidecars
+        # Representing only Phase0 -> Capella sidecars as `noSidecars` for now
+        let sidecarsOpt = Opt.none(gloas.DataColumnSidecars)
       elif consensusFork == ConsensusFork.Fulu:
         let sidecarsOpt =
           if len(forkyBlck.message.body.blob_kzg_commitments) == 0:

beacon_chain/networking/eth2_network.nim

@@ -2840,14 +2840,24 @@ proc broadcastBlobSidecar*(
 
 proc broadcastDataColumnSidecar*(
     node: Eth2Node, subnet_id: uint64,
-    data_column: fulu.DataColumnSidecar | gloas.DataColumnSidecar):
+    data_column: fulu.DataColumnSidecar):
     Future[SendResult] {.async: (raises: [CancelledError], raw: true).} =
   let
     contextEpoch = data_column.signed_block_header.message.slot.epoch
     topic = getDataColumnSidecarTopic(
       node.forkDigestAtEpoch(contextEpoch), subnet_id)
   node.broadcast(topic, data_column)
 
+proc broadcastDataColumnSidecar*(
+    node: Eth2Node, subnet_id: uint64,
+    data_column: gloas.DataColumnSidecar):
+    Future[SendResult] {.async: (raises: [CancelledError], raw: true).} =
+  let
+    contextEpoch = data_column.slot.epoch
+    topic = getDataColumnSidecarTopic(
+      node.forkDigestAtEpoch(contextEpoch), subnet_id)
+  node.broadcast(topic, data_column)
+
 proc broadcastSyncCommitteeMessage*(
     node: Eth2Node, msg: SyncCommitteeMessage,
     subcommitteeIdx: SyncSubcommitteeIndex):

beacon_chain/rpc/rest_beacon_api.nim

@@ -1048,10 +1048,9 @@ proc installBeaconApiHandlers*(router: var RestRouter, node: BeaconNode) =
             doAssert strictVerification notin node.dag.updateFlags
             return RestApiResponse.jsonError(Http400, InvalidBlockObjectError)
 
-          when consensusFork in [ConsensusFork.Deneb, ConsensusFork.Electra]:
+          when consensusFork == ConsensusFork.Gloas:
             await node.router.routeSignedBeaconBlock(
-              forkyBlck, Opt.some(
-                forkyBlck.create_blob_sidecars(kzg_proofs, blobs)),
+              forkyBlck, Opt.none(seq[gloas.DataColumnSidecar]),
               checkValidator = true)
           elif consensusFork >= ConsensusFork.Fulu and
               consensusFork < ConsensusFork.Gloas:
@@ -1062,6 +1061,11 @@ proc installBeaconApiHandlers*(router: var RestRouter, node: BeaconNode) =
               forkyBlck,
               Opt.some(data_columns),
               checkValidator = true)
+          elif consensusFork in [ConsensusFork.Deneb, ConsensusFork.Electra]:
+            await node.router.routeSignedBeaconBlock(
+              forkyBlck, Opt.some(
+                forkyBlck.create_blob_sidecars(kzg_proofs, blobs)),
+              checkValidator = true)
           else:
             await node.router.routeSignedBeaconBlock(
               forkyBlck,
@@ -1198,8 +1202,12 @@ proc installBeaconApiHandlers*(router: var RestRouter, node: BeaconNode) =
 
         let res = withBlck(forked):
           forkyBlck.root = hash_tree_root(forkyBlck.message)
-          await node.router.routeSignedBeaconBlock(
-            forkyBlck, noSidecarsAtFork, checkValidator = true)
+          when consensusFork >= ConsensusFork.Bellatrix:
+            return RestApiResponse.jsonError(
+              Http400, $consensusFork & " builder API unsupported")
+          else:
+            await node.router.routeSignedBeaconBlock(
+              forkyBlck, noSidecarsAtFork, checkValidator = true)
 
         if res.isErr():
           return RestApiResponse.jsonError(

beacon_chain/validators/beacon_validators.nim

@@ -574,18 +574,21 @@ proc proposeBlockAux(
       message: engineBlock.blck, signature: signature, root: blockRoot
     )
 
-  when consensusFork in [ConsensusFork.Deneb, ConsensusFork.Electra]:
-    let sidecarsOpt =
-      Opt.some(
-        signedBlock.create_blob_sidecars(
-          engineBlock.blobsBundle.proofs,
-          engineBlock.blobsBundle.blobs))
+  when consensusFork == ConsensusFork.Gloas:
+    # using noSidecars for Phase0 -> Capella blocks for now
+    let sidecarsOpt = Opt.none(seq[gloas.DataColumnSidecar])
   elif consensusFork >= ConsensusFork.Fulu and
       consensusFork < ConsensusFork.Gloas:
     let sidecarsOpt =
       Opt.some(signedBlock.assemble_data_column_sidecars(
         engineBlock.blobsBundle.blobs.mapIt(kzg.KzgBlob(bytes: it)),
         @(engineBlock.blobsBundle.proofs.mapIt(kzg.KzgProof(it)))))
+  elif consensusFork in [ConsensusFork.Deneb, ConsensusFork.Electra]:
+    let sidecarsOpt =
+      Opt.some(
+        signedBlock.create_blob_sidecars(
+          engineBlock.blobsBundle.proofs,
+          engineBlock.blobsBundle.blobs))
   else:
     const sidecarsOpt = noSidecarsAtFork
 

beacon_chain/validators/message_router.nim

@@ -145,6 +145,43 @@ proc publishRouteBlock(
     signature = shortLog(blck.signature),
     delay
 
+proc publishSidecars(
+    router: ref MessageRouter,
+    blck: gloas.SignedBeaconBlock,
+    sidecarsOpt: Opt[seq[gloas.DataColumnSidecar]]
+): Future[Opt[gloas.DataColumnSidecars]] {.async: (raises: [CancelledError]).} =
+  let cols = sidecarsOpt.get()
+  var workers = newSeq[Future[SendResult]](len(cols))
+
+  for i, dc in cols:
+    let subnet = compute_subnet_for_data_column_sidecar(dc.index)
+    workers[i] = router[].network.broadcastDataColumnSidecar(subnet, dc)
+
+  let resAll = await allFinished(workers)
+
+  for i in 0..<resAll.len:
+    let r = resAll[i]
+    doAssert r.finished()
+    if r.failed():
+      notice "Data column not sent",
+        data_column = shortLog(cols[i]), error = r.error[]
+    else:
+      notice "Data column sent",
+        data_column = shortLog(cols[i])
+
+  # Custody filtering
+  let metadata = router[].network.metadata.custody_group_count
+  let allowed =
+    router[].network.cfg.resolve_columns_from_custody_groups(
+      router[].network.nodeId, metadata)
+
+  var finalCols: gloas.DataColumnSidecars
+  for dc in cols:
+    if dc.index in allowed:
+      finalCols.add newClone(dc)
+
+  Opt.some(finalCols)
+
 proc publishSidecars(
     router: ref MessageRouter,
     blck: fulu.SignedBeaconBlock,
@@ -267,15 +304,8 @@ proc routeSignedBeaconBlock*(
   await router.publishRouteBlock(blck)
 
   # 3. Publish sidecars
-  when someSidecarsOpt is NoSidecarsAtFork and
-       typeof(blck).kind in ConsensusFork.Phase0..ConsensusFork.Capella:
+  when someSidecarsOpt is NoSidecarsAtFork:
     const finalSidecars = noSidecars
-  elif someSidecarsOpt is NoSidecarsAtFork and
-       typeof(blck).kind in ConsensusFork.Deneb..ConsensusFork.Electra:
-    let finalSidecars = Opt.none(BlobSidecars)
-  elif someSidecarsOpt is NoSidecarsAtFork and
-       typeof(blck).kind in ConsensusFork.Fulu..ConsensusFork.Gloas:
-    let finalSidecars = Opt.none(fulu.DataColumnSidecars)
   else:
     let finalSidecars = await publishSidecars(router, blck, someSidecarsOpt)