add fulu.KzgProofs/fulu.BlobsBundle and disambiguate elsewhere (#7412)

tersec · web-flow · commit 1be318565a36 · 2025-08-24T05:36:12.000Z
diff --git a/beacon_chain/el/engine_api_conversions.nim b/beacon_chain/el/engine_api_conversions.nim
@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 
 import
   kzg4844/[kzg_abi, kzg],
@@ -191,7 +191,7 @@ func asConsensusType*(payload: engine_api.GetPayloadV3Response):
       commitments: KzgCommitments.init(
         payload.blobsBundle.commitments.mapIt(
           kzg_abi.KzgCommitment(bytes: it.data))),
-      proofs: KzgProofs.init(
+      proofs: deneb.KzgProofs.init(
         payload.blobsBundle.proofs.mapIt(
           kzg_abi.KzgProof(bytes: it.data))),
       blobs: Blobs.init(
@@ -211,7 +211,7 @@ func asConsensusType*(
       commitments: KzgCommitments.init(
         payload.blobsBundle.commitments.mapIt(
           kzg_abi.KzgCommitment(bytes: it.data))),
-      proofs: KzgProofs.init(
+      proofs: deneb.KzgProofs.init(
         payload.blobsBundle.proofs.mapIt(
           kzg_abi.KzgProof(bytes: it.data))),
       blobs: Blobs.init(
@@ -231,7 +231,7 @@ func asConsensusType*(
       commitments: KzgCommitments.init(
         payload.blobsBundle.commitments.mapIt(
           kzg_abi.KzgCommitment(bytes: it.data))),
-      proofs: KzgProofs.init(
+      proofs: deneb.KzgProofs.init(
         payload.blobsBundle.proofs.mapIt(
           kzg_abi.KzgProof(bytes: it.data))),
       blobs: Blobs.init(
diff --git a/beacon_chain/spec/datatypes/fulu.nim b/beacon_chain/spec/datatypes/fulu.nim
@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 
 # Types specific to Fulu (i.e. known to have changed across hard forks) - see
 # `base` for types and guidelines common across forks
@@ -35,7 +35,7 @@ from ./altair import
 from ./capella import
   ExecutionBranch, HistoricalSummary, SignedBLSToExecutionChange,
   SignedBLSToExecutionChangeList, Withdrawal, EXECUTION_PAYLOAD_GINDEX
-from ./deneb import Blobs, BlobsBundle, KzgCommitments, KzgProofs
+from ./deneb import Blobs, KzgCommitments, KzgProofs
 
 export json_serialization, base
 
@@ -90,12 +90,12 @@ type
   DataColumn* = List[KzgCell, Limit(MAX_BLOB_COMMITMENTS_PER_BLOCK)]
   DataColumnIndices* = List[ColumnIndex, Limit(NUMBER_OF_COLUMNS)]
 
-  # https://github.com/ethereum/consensus-specs/blob/v1.5.0-beta.3/specs/fulu/das-core.md#datacolumnsidecar
+  # https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.5/specs/fulu/das-core.md#datacolumnsidecar
   DataColumnSidecar* = object
     index*: ColumnIndex # Index of column in extended matrix
     column*: DataColumn
     kzg_commitments*: KzgCommitments
-    kzg_proofs*: KzgProofs
+    kzg_proofs*: deneb.KzgProofs
     signed_block_header*: SignedBeaconBlockHeader
     kzg_commitments_inclusion_proof*:
       array[KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH, Eth2Digest]
@@ -125,6 +125,16 @@ type
     column_index*: ColumnIndex
     row_index*: RowIndex
 
+  # https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.5/specs/fulu/validator.md#blobsbundle
+  KzgProofs* = List[KzgProof,
+    Limit FIELD_ELEMENTS_PER_EXT_BLOB * MAX_BLOB_COMMITMENTS_PER_BLOCK]
+
+  # https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.5/specs/fulu/validator.md#blobsbundle
+  BlobsBundle* = object
+    commitments*: KzgCommitments
+    proofs*: fulu.KzgProofs
+    blobs*: Blobs
+
   # Not in spec, defined in order to compute custody subnets
   CgcBits* = BitArray[DATA_COLUMN_SIDECAR_SUBNET_COUNT]
 
@@ -166,7 +176,7 @@ type
   ExecutionPayloadForSigning* = object
     executionPayload*: ExecutionPayload
     blockValue*: Wei
-    blobsBundle*: BlobsBundle
+    blobsBundle*: deneb.BlobsBundle # [New in Fulu]
     executionRequests*: seq[seq[byte]]
 
   # https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.10/specs/deneb/beacon-chain.md#executionpayloadheader
@@ -608,7 +618,7 @@ type
 
   BlockContents* = object
     `block`*: BeaconBlock
-    kzg_proofs*: KzgProofs
+    kzg_proofs*: deneb.KzgProofs
     blobs*: Blobs
 
 func shortLog*(v: DataColumnSidecar): auto =
diff --git a/beacon_chain/spec/eth2_apis/eth2_rest_serialization.nim b/beacon_chain/spec/eth2_apis/eth2_rest_serialization.nim
@@ -46,7 +46,6 @@ RestJson.useDefaultSerializationFor(
   BeaconBlockHeader,
   BlobSidecar,
   BlobSidecarInfoObject,
-  BlobsBundle,
   Checkpoint,
   ConsolidationRequest,
   ContributionAndProof,
@@ -224,6 +223,7 @@ RestJson.useDefaultSerializationFor(
   deneb.BeaconBlock,
   deneb.BeaconBlockBody,
   deneb.BeaconState,
+  deneb.BlobsBundle,
   deneb.BlockContents,
   deneb.ExecutionPayload,
   deneb.ExecutionPayloadHeader,
diff --git a/beacon_chain/spec/helpers.nim b/beacon_chain/spec/helpers.nim
@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 
 # Uncategorized helper functions from the spec
 
@@ -229,7 +229,7 @@ func verify_blob_sidecar_inclusion_proof*(
 func create_blob_sidecars*(
     forkyBlck: deneb.SignedBeaconBlock | electra.SignedBeaconBlock |
     fulu.SignedBeaconBlock,
-    kzg_proofs: KzgProofs,
+    kzg_proofs: deneb.KzgProofs,
     blobs: Blobs): seq[BlobSidecar] =
   template kzg_commitments: untyped =
     forkyBlck.message.body.blob_kzg_commitments
diff --git a/beacon_chain/spec/peerdas_helpers.nim b/beacon_chain/spec/peerdas_helpers.nim
@@ -235,7 +235,7 @@ func get_data_column_sidecars*(signed_beacon_block: fulu.SignedBeaconBlock,
       index: ColumnIndex(column_index),
       column: DataColumn.init(column_cells),
       kzg_commitments: blck.body.blob_kzg_commitments,
-      kzg_proofs: KzgProofs.init(column_proofs),
+      kzg_proofs: deneb.KzgProofs.init(column_proofs),
       signed_block_header: signed_beacon_block_header)
     blck.body.build_proof(
       KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH_GINDEX.GeneralizedIndex,
@@ -292,7 +292,7 @@ proc assemble_data_column_sidecars*(signed_beacon_block: fulu.SignedBeaconBlock,
       index: ColumnIndex(columnIndex),
       column: DataColumn.init(column),
       kzg_commitments: blck.body.blob_kzg_commitments,
-      kzg_proofs: KzgProofs.init(kzgProofOfColumn),
+      kzg_proofs: deneb.KzgProofs.init(kzgProofOfColumn),
       signed_block_header: signed_beacon_block_header)
     blck.body.build_proof(
       KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH_GINDEX.GeneralizedIndex,
diff --git a/tests/test_mev_calls.nim b/tests/test_mev_calls.nim
@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 {.used.}
 
 import
@@ -274,7 +274,7 @@ proc setupEngineAPI*(router: var RestRouter, node: TestNodeRef) =
           execution_payload: electra.ExecutionPayload(
             parent_hash: blck.message.body.execution_payload_header.parent_hash
           ),
-          blobs_bundle: BlobsBundle()
+          blobs_bundle: deneb.BlobsBundle()
         )
       respondSszOrJson(contentType, payload)
     else:
diff --git a/tests/test_sync_manager.nim b/tests/test_sync_manager.nim
@@ -5,7 +5,7 @@
 #   * Apache v2 license (license terms in the root directory or at https://www.apache.org/licenses/LICENSE-2.0).
 # at your option. This file may not be copied, modified, or distributed except according to those terms.
 
-{.push raises: [].}
+{.push raises: [], gcsafe.}
 {.used.}
 
 import std/[strutils, sequtils]
@@ -83,7 +83,7 @@ func createBlobs(
         if kzgs.len > 0:
           forkyBlck.root = hash_tree_root(forkyBlck.message)
           var
-            kzg_proofs: KzgProofs
+            kzg_proofs: deneb.KzgProofs
             blobs: Blobs
           for _ in kzgs:
             doAssert kzg_proofs.add default(KzgProof)
@@ -1739,7 +1739,7 @@ suite "SyncManager test suite":
 
   test "[SyncQueue] checkBlobsResponse() test":
     const maxBlobsPerBlockElectra = 9
-    
+
     proc checkBlobsResponse[T](
         req: SyncRequest[T],
         data: openArray[Slot]): Result[void, cstring] =
