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

beacon_chain/gossip_processing/block_processor.nim

@@ -398,6 +398,7 @@ template withForkyBlckAndBlobs(
           # Nim 2.0.8: `forks.BlobSidecars(blobFork)` does not work here:
           # > type mismatch: got 'BlobFork' for 'blobFork`gensym15'
           #   but expected 'BlobSidecars'
+          # https://github.com/nim-lang/Nim/issues/23893
           when blobFork == BlobFork.Deneb:
             var fBlobs: deneb.BlobSidecars
           for blob in blobs.get:

tests/consensus_spec/deneb/test_fixture_ssz_consensus_objects.nim

@@ -122,7 +122,7 @@ suite "EF - Deneb - SSZ consensus objects " & preset():
           of "BeaconBlockHeader": checkSSZ(BeaconBlockHeader, path, hash)
           of "BeaconState": checkSSZ(deneb.BeaconState, path, hash)
           of "BlobIdentifier": checkSSZ(BlobIdentifier, path, hash)
-          of "BlobSidecar": checkSSZ(BlobSidecar, path, hash)
+          of "BlobSidecar": checkSSZ(deneb.BlobSidecar, path, hash)
           of "BLSToExecutionChange": checkSSZ(BLSToExecutionChange, path, hash)
           of "Checkpoint": checkSSZ(Checkpoint, path, hash)
           of "ContributionAndProof": checkSSZ(ContributionAndProof, path, hash)

tests/consensus_spec/electra/test_fixture_ssz_consensus_objects.nim

@@ -125,7 +125,7 @@ suite "EF - Electra - SSZ consensus objects " & preset():
           of "BeaconBlockHeader": checkSSZ(BeaconBlockHeader, path, hash)
           of "BeaconState": checkSSZ(electra.BeaconState, path, hash)
           of "BlobIdentifier": checkSSZ(BlobIdentifier, path, hash)
-          of "BlobSidecar": checkSSZ(BlobSidecar, path, hash)
+          of "BlobSidecar": checkSSZ(deneb.BlobSidecar, path, hash)
           of "BLSToExecutionChange": checkSSZ(BLSToExecutionChange, path, hash)
           of "Checkpoint": checkSSZ(Checkpoint, path, hash)
           of "ConsolidationRequest": checkSSZ(ConsolidationRequest, path, hash)