further cleanups and clarifications to fulu builder api

Author: agnxsh

beacon_chain/el/engine_api_conversions.nim

@@ -233,11 +233,11 @@ func asConsensusTypeFulu*(
     # The `mapIt` calls below are necessary only because we use different distinct
     # types for KZG commitments and Blobs in the `web3` and the `deneb` spec types.
     # Both are defined as `array[N, byte]` under the hood.
-    blobsBundle: deneb.BlobsBundle(
+    blobsBundle: fulu.BlobsBundleV2(
       commitments: KzgCommitments.init(
         payload.blobsBundle.commitments.mapIt(
           kzg_abi.KzgCommitment(bytes: it.data))),
-      proofs: KzgProofs.init(
+      proofs: KzgProofsV2.init(
         payload.blobsBundle.proofs.mapIt(
           kzg_abi.KzgProof(bytes: it.data))),
       blobs: Blobs.init(

beacon_chain/spec/datatypes/deneb.nim

@@ -108,6 +108,7 @@ type
     excess_blob_gas*: uint64 # [New in Deneb]
 
   # https://github.com/ethereum/consensus-specs/blob/v1.6.0-alpha.0/specs/deneb/validator.md#blobsbundle
+  # https://github.com/ethereum/builder-specs/blob/ae1d97d080a12bfb7ca248b58fb1fc6b10aed02e/specs/fulu/builder.md#blobsbundle
   KzgProofs* = List[KzgProof, Limit MAX_BLOB_COMMITMENTS_PER_BLOCK]
   Blobs* = List[Blob, Limit MAX_BLOB_COMMITMENTS_PER_BLOCK]
   BlobRoots* = List[Eth2Digest, Limit MAX_BLOB_COMMITMENTS_PER_BLOCK]

beacon_chain/spec/datatypes/fulu.nim

@@ -123,6 +123,15 @@ type
     column_index*: ColumnIndex
     row_index*: RowIndex
 
+  # https://github.com/ethereum/builder-specs/blob/ae1d97d080a12bfb7ca248b58fb1fc6b10aed02e/specs/fulu/builder.md#blobsbundle
+  KzgProofsV2* = List[KzgProof, Limit FIELD_ELEMENTS_PER_EXT_BLOB * MAX_BLOB_COMMITMENTS_PER_BLOCK]
+
+  # https://github.com/ethereum/builder-specs/blob/ae1d97d080a12bfb7ca248b58fb1fc6b10aed02e/specs/fulu/builder.md#blobsbundle
+  BlobsBundleV2* = object
+    commitments*: KzgCommitments
+    proofs*: KzgProofsV2
+    blobs*: Blobs
+
   # Not in spec, defined in order to compute custody subnets
   CgcBits* = BitArray[DATA_COLUMN_SIDECAR_SUBNET_COUNT]
 
@@ -164,7 +173,7 @@ type
   ExecutionPayloadForSigning* = object
     executionPayload*: ExecutionPayload
     blockValue*: Wei
-    blobsBundle*: BlobsBundle
+    blobsBundle*: BlobsBundleV2 # [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
@@ -606,7 +615,7 @@ type
 
   BlockContents* = object
     `block`*: BeaconBlock
-    kzg_proofs*: KzgProofs
+    kzg_proofs*: KzgProofsV2
     blobs*: Blobs
 
 func shortLog*(v: DataColumnSidecar): auto =

beacon_chain/spec/eth2_apis/eth2_rest_serialization.nim

@@ -270,6 +270,7 @@ RestJson.useDefaultSerializationFor(
   fulu_mev.BlindedBeaconBlock,
   fulu_mev.BlindedBeaconBlockBody,
   fulu_mev.BuilderBid,
+  fulu_mev.ExecutionPayloadAndBlobsBundle,
   fulu_mev.SignedBlindedBeaconBlock,
   fulu_mev.SignedBuilderBid,
   phase0.AggregateAndProof,

beacon_chain/spec/eth2_apis/rest_types.nim

@@ -550,6 +550,7 @@ type
   GetHeaderResponseElectra* = DataVersionEnclosedObject[electra_mev.SignedBuilderBid]
   GetHeaderResponseFulu* = DataVersionEnclosedObject[fulu_mev.SignedBuilderBid]
   SubmitBlindedBlockResponseElectra* = DataVersionEnclosedObject[electra_mev.ExecutionPayloadAndBlobsBundle]
+  SubmitBlindedBlockResponseFulu* = DataVersionEnclosedObject[fulu_mev.ExecutionPayloadAndBlobsBundle]
 
   RestNodeValidity* {.pure.} = enum
     valid = "VALID",

beacon_chain/spec/forks.nim

@@ -489,7 +489,8 @@ template kind*(
       fulu.MsgTrustedSignedBeaconBlock |
       fulu.TrustedSignedBeaconBlock |
       fulu_mev.SignedBlindedBeaconBlock |
-      fulu_mev.SignedBuilderBid]): ConsensusFork =
+      fulu_mev.SignedBuilderBid |
+      fulu_mev.ExecutionPayloadAndBlobsBundle]): ConsensusFork =
   ConsensusFork.Fulu
 
 template BeaconState*(kind: static ConsensusFork): auto =

beacon_chain/spec/mev/fulu_mev.nim

@@ -13,6 +13,7 @@ from stew/byteutils import to0xHex
 from ".."/datatypes/phase0 import AttesterSlashing
 from ".."/datatypes/capella import SignedBLSToExecutionChange
 from ".."/datatypes/deneb import BlobsBundle, KzgCommitments
+from ".."/datatypes/fulu import BlobsBundleV2
 from ".."/datatypes/electra import
   Attestation, AttesterSlashing, ExecutionRequests
 from ".."/eth2_merkleization import hash_tree_root
@@ -69,11 +70,17 @@ type
     message*: BlindedBeaconBlock
     signature*: ValidatorSig
 
+  # https://github.com/ethereum/builder-specs/blob/ae1d97d080a12bfb7ca248b58fb1fc6b10aed02e/specs/fulu/builder.md#executionpayloadandblobsbundle
+  ExecutionPayloadAndBlobsBundle* = object
+    execution_payload*: electra.ExecutionPayload
+    blobs_bundle*: BlobsBundleV2 # [New in Fulu]
+
   # Not spec, but suggested by spec
   BlindedExecutionPayloadAndBlobsBundle* = object
     execution_payload_header*: fulu.ExecutionPayloadHeader
     blob_kzg_commitments*: KzgCommitments # [New in Deneb]
 
+
 func shortLog*(v: BlindedBeaconBlock): auto =
   (
     slot: shortLog(v.slot),

beacon_chain/spec/state_transition.nim

@@ -570,7 +570,7 @@ proc makeBeaconBlockWithRewards*(
                hash_tree_root(validator_changes.proposer_slashings),
                hash_tree_root(validator_changes.electra_attester_slashings),
                hash_tree_root(
-                 List[electra.Attestation, Limit MAX_ATTESTATIONS](
+                 List[electra.Attestation, Limit MAX_ATTESTATIONS_ELECTRA](
                    attestations)),
                hash_tree_root(List[Deposit, Limit MAX_DEPOSITS](deposits)),
                hash_tree_root(validator_changes.voluntary_exits),

beacon_chain/validators/beacon_validators.nim

@@ -81,6 +81,7 @@ type
     executionPayloadValue*: Wei
     consensusBlockValue*: UInt256
     blobsBundle*: deneb.BlobsBundle
+    blobsBundleV2*: fulu.BlobsBundleV2
 
   BuilderBid[SBBB] = object
     blindedBlckPart*: SBBB
@@ -585,15 +586,24 @@ proc makeBeaconBlockForHeadAndSlot*(
     $error
 
   if res.isOk:
+    let val = res.get()
     ok(EngineBid(
-      blck: res.get().blck,
+      blck: val.blck,
       executionPayloadValue: payload.blockValue,
-      consensusBlockValue: res.get().rewards.blockConsensusValue(),
-      blobsBundle:
-        when typeof(payload).kind >= ConsensusFork.Deneb:
+      consensusBlockValue: val.rewards.blockConsensusValue(),
+      blobsBundle: (
+        when typeof(payload).kind >= ConsensusFork.Deneb and
+             typeof(payload).kind < ConsensusFork.Fulu:
           payload.blobsBundle
         else:
           default(deneb.BlobsBundle)
+      ),
+      blobsBundleV2: (
+        when typeof(payload).kind >= ConsensusFork.Fulu:
+          payload.blobsBundle
+        else:
+          default(fulu.BlobsBundleV2)
+      )
     ))
   else:
     err(res.error)
@@ -1236,7 +1246,7 @@ proc proposeBlockAux(
       blobsOpt =
         when consensusFork >= ConsensusFork.Deneb:
           Opt.some(signedBlock.create_blob_sidecars(
-            engineBid.blobsBundle.proofs, engineBid.blobsBundle.blobs))
+            KzgProofs(engineBid.blobsBundle.proofs), engineBid.blobsBundle.blobs))
         else:
           Opt.none(seq[BlobSidecar])
       newBlockRef = (
@@ -2043,15 +2053,27 @@ proc makeMaybeBlindedBeaconBlockForHeadAndSlotImpl[ResultType](
 
   doAssert engineBid.blck.kind == consensusFork
   template forkyBlck: untyped = engineBid.blck.forky(consensusFork)
-  when consensusFork >= ConsensusFork.Deneb:
+  when consensusFork >= ConsensusFork.Fulu:
+    doAssert engineBid.blobsBundleV2.commitments ==
+      forkyBlck.body.blob_kzg_commitments
+    ResultType.ok((
+      blck: consensusFork.MaybeBlindedBeaconBlock(
+        isBlinded: false,
+        data: consensusFork.BlockContents(
+          `block`: forkyBlck,
+          kzg_proofs: KzgProofsV2(engineBid.blobsBundleV2.proofs),
+          blobs: engineBid.blobsBundleV2.blobs)),
+      executionValue: Opt.some(engineBid.executionPayloadValue),
+      consensusValue: Opt.some(engineBid.consensusBlockValue)))
+  elif consensusFork >= ConsensusFork.Deneb:
     doAssert engineBid.blobsBundle.commitments ==
       forkyBlck.body.blob_kzg_commitments
     ResultType.ok((
       blck: consensusFork.MaybeBlindedBeaconBlock(
         isBlinded: false,
         data: consensusFork.BlockContents(
           `block`: forkyBlck,
-          kzg_proofs: engineBid.blobsBundle.proofs,
+          kzg_proofs: KzgProofs(engineBid.blobsBundle.proofs),
           blobs: engineBid.blobsBundle.blobs)),
       executionValue: Opt.some(engineBid.executionPayloadValue),
       consensusValue: Opt.some(engineBid.consensusBlockValue)))