create_blob_sidecars() likely doesn't work properly with Fulu/columns (#7413)

Author: tersec

beacon_chain/rpc/rest_beacon_api.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
   std/[typetraits, sequtils, sets],
@@ -1042,7 +1042,7 @@ proc installBeaconApiHandlers*(router: var RestRouter, node: BeaconNode) =
             doAssert strictVerification notin node.dag.updateFlags
             return RestApiResponse.jsonError(Http400, InvalidBlockObjectError)
 
-          when consensusFork >= ConsensusFork.Deneb:
+          when consensusFork in [ConsensusFork.Deneb, ConsensusFork.Electra]:
             await node.router.routeSignedBeaconBlock(
               forkyBlck, Opt.some(
                 forkyBlck.create_blob_sidecars(kzg_proofs, blobs)),
@@ -1099,7 +1099,7 @@ proc installBeaconApiHandlers*(router: var RestRouter, node: BeaconNode) =
             doAssert strictVerification notin node.dag.updateFlags
             return RestApiResponse.jsonError(Http400, InvalidBlockObjectError)
 
-          when consensusFork >= ConsensusFork.Deneb:
+          when consensusFork in [ConsensusFork.Deneb, ConsensusFork.Electra]:
             await node.router.routeSignedBeaconBlock(
               forkyBlck, Opt.some(
                 forkyBlck.create_blob_sidecars(kzg_proofs, blobs)),

beacon_chain/spec/helpers.nim

@@ -227,8 +227,7 @@ func verify_blob_sidecar_inclusion_proof*(
   ok()
 
 func create_blob_sidecars*(
-    forkyBlck: deneb.SignedBeaconBlock | electra.SignedBeaconBlock |
-    fulu.SignedBeaconBlock,
+    forkyBlck: deneb.SignedBeaconBlock | electra.SignedBeaconBlock,
     kzg_proofs: deneb.KzgProofs,
     blobs: Blobs): seq[BlobSidecar] =
   template kzg_commitments: untyped =

beacon_chain/spec/validator.nim

@@ -4,7 +4,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.}
 
 # Helpers and functions pertaining to managing the validator set
 
@@ -445,13 +445,12 @@ func compute_proposer_indices*(
     epoch: Epoch, seed: Eth2Digest,
     indices: seq[ValidatorIndex]
 ): seq[Opt[ValidatorIndex]] =
-  let startSlot = epoch.start_slot()
   var proposerIndices: seq[Opt[ValidatorIndex]]
 
-  for i in 0..<SLOTS_PER_EPOCH:
+  for epochSlot in epoch.slots():
     var buffer: array[32 + 8, byte]
     buffer[0..31] = seed.data
-    buffer[32..39] = uint_to_bytes((startSlot + i).asUInt64)
+    buffer[32..39] = uint_to_bytes(epochSlot.asUInt64)
 
     let slotSeed = eth2digest(buffer)  # Concatenate manually using buffer
     let proposerIndex = compute_proposer_index(state, indices, slotSeed)
@@ -524,14 +523,12 @@ func get_beacon_proposer_indices*(
             shuffled_index, seq_len, epoch_shuffle_seed))
 
     res
-
   else:
     # Not using shuffled indices here is not a bug,
     # as the method of computing proposer in the below
     # function does not require shuffled indices post Fulu
     get_beacon_proposer_indices(state, epoch)
 
-
 func initialize_proposer_lookahead*(state: electra.BeaconState,
                                     cache: var StateCache):
                                     HashArray[Limit ((MIN_SEED_LOOKAHEAD + 1) * SLOTS_PER_EPOCH), uint64] =

beacon_chain/validators/beacon_validators.nim

@@ -559,7 +559,7 @@ proc proposeBlockAux(
     )
 
     blobsOpt =
-      when consensusFork >= ConsensusFork.Deneb:
+      when consensusFork in [ConsensusFork.Deneb, ConsensusFork.Electra]:
         Opt.some(
           signedBlock.create_blob_sidecars(
             engineBlock.blobsBundle.proofs, engineBlock.blobsBundle.blobs

research/wss_sim.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.}
 
 # `wss_sim` loads a state and a set of validator keys, then simulates a
 # beacon chain running with the given validators producing blocks
@@ -306,7 +306,7 @@ cli do(validatorsDir: string, secretsDir: string,
               proposerPrivkey).toValidatorSig())
 
         dump(".", signedBlock)
-        when consensusFork >= ConsensusFork.Deneb:
+        when consensusFork in [ConsensusFork.Deneb, ConsensusFork.Electra]:
           let blobs = signedBlock.create_blob_sidecars(
             payload.blobsBundle.proofs, payload.blobsBundle.blobs)
           for blob in blobs:

tests/test_block_processor.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
@@ -73,9 +73,8 @@ suite "Block processor" & preset():
     discard processor.runQueueProcessingLoop()
 
   asyncTest "Reverse order block add & get" & preset():
-    let
-      missing = await processor[].addBlock(
-        MsgSource.gossip, ForkedSignedBeaconBlock.init(b2))
+    let missing = await processor[].addBlock(
+      MsgSource.gossip, ForkedSignedBeaconBlock.init(b2))
 
     check: missing.error == VerifierError.MissingParent
 

tests/test_sync_manager.nim

@@ -75,7 +75,9 @@ func createBlobs(
   var res = newSeq[ref BlobSidecar](len(slots))
   for blck in blocks:
     withBlck(blck[]):
-      when consensusFork >= ConsensusFork.Deneb:
+      when consensusFork >= ConsensusFork.Fulu:
+        doAssert false   # create_blob_sidecars() might not work as such
+      elif consensusFork in [ConsensusFork.Deneb, ConsensusFork.Electra]:
         template kzgs: untyped = forkyBlck.message.body.blob_kzg_commitments
         for i, slot in slots:
           if slot == forkyBlck.message.slot: