Merge branch 'dev/etan/df-forkedblobs' into feat_eip-7688

beacon_chain/spec/forks.nim

@@ -280,6 +280,9 @@ type
   ForkyBlobSidecar* =
     deneb.BlobSidecar
 
+  OptSeqForkyBlobSidecar* =
+    Opt[seq[deneb.BlobSidecar]]
+
   ForkyBlobSidecars* =
     deneb.BlobSidecars
 

beacon_chain/validators/beacon_validators.nim

@@ -1292,7 +1292,7 @@ proc proposeBlockAux(
           Opt.some(signedBlock.create_blob_sidecars(
             blobsBundle.proofs, blobsBundle.blobs))
         else:
-          Opt.none(seq[BlobSidecar])
+          Opt.none(seq[deneb.BlobSidecar])
       newBlockRef = (
         await node.router.routeSignedBeaconBlock(signedBlock, blobsOpt,
           checkValidator = false)

beacon_chain/validators/message_router.nim

@@ -84,7 +84,7 @@ template getCurrentBeaconTime(router: MessageRouter): BeaconTime =
 type RouteBlockResult = Result[Opt[BlockRef], string]
 proc routeSignedBeaconBlock*(
     router: ref MessageRouter, blck: ForkySignedBeaconBlock,
-    blobsOpt: Opt[seq[ForkyBlobSidecar]], checkValidator: bool):
+    blobsOpt: OptSeqForkyBlobSidecar, checkValidator: bool):
     Future[RouteBlockResult] {.async: (raises: [CancelledError]).} =
   ## Validate and broadcast beacon block, then add it to the block database
   ## Returns the new Head when block is added successfully to dag, none when

beacon_chain/validators/message_router_mev.nim

@@ -138,7 +138,7 @@ proc unblindAndRouteBlockMEV*(
       Opt.some(signedBlock.create_blob_sidecars(
         blobs_bundle.proofs, blobs_bundle.blobs))
     else:
-      Opt.none(seq[BlobSidecar])
+      Opt.none(seq[deneb.BlobSidecar])
 
   debug "unblindAndRouteBlockMEV: proposing unblinded block",
     blck = shortLog(signedBlock)