accomodate getBlobsV2

Author: agnxsh

tests/test_json_marshalling.nim

@@ -204,6 +204,7 @@ suite "JSON-RPC Quantity":
     checkRandomObject(ExecutionPayloadV3)
     checkRandomObject(BlobsBundleV1)
     checkRandomObject(BlobAndProofV1)
+    checkRandomObject(BlobAndProofV2)
     checkRandomObject(ExecutionPayloadBodyV1)
     checkRandomObject(PayloadAttributesV1)
     checkRandomObject(PayloadAttributesV2)

web3/conversions.nim

@@ -60,6 +60,7 @@ ExecutionPayloadV1OrV2.useDefaultSerializationIn JrpcConv
 ExecutionPayloadV3.useDefaultSerializationIn JrpcConv
 BlobsBundleV1.useDefaultSerializationIn JrpcConv
 BlobAndProofV1.useDefaultSerializationIn JrpcConv
+BlobAndProofV2.useDefaultSerializationFor JrpcConv
 ExecutionPayloadBodyV1.useDefaultSerializationIn JrpcConv
 PayloadAttributesV1.useDefaultSerializationIn JrpcConv
 PayloadAttributesV2.useDefaultSerializationIn JrpcConv

web3/engine_api.nim

@@ -39,6 +39,7 @@ createRpcSigsFromNim(RpcClient):
   proc engine_getPayloadBodiesByHashV1(hashes: seq[Hash32]): seq[Opt[ExecutionPayloadBodyV1]]
   proc engine_getPayloadBodiesByRangeV1(start: Quantity, count: Quantity): seq[Opt[ExecutionPayloadBodyV1]]
   proc engine_getBlobsV1(blob_versioned_hashes: seq[VersionedHash]): GetBlobsV1Response
+  proc engine_getBlobsV2(blob_versioned_hashes: seq[VersionedHash]): GetBlobsV2Response
 
   # https://github.com/ethereum/execution-apis/blob/9301c0697e4c7566f0929147112f6d91f65180f6/src/engine/common.md
   proc engine_exchangeCapabilities(methods: seq[string]): seq[string]
@@ -115,6 +116,13 @@ template getBlobs*(
     Future[GetBlobsV1Response] =
   engine_getBlobsV1(rpcClient, blob_versioned_hashes)
 
+template getBlobs*(
+    rpcClient: RpcClient,
+    T: type GetBlobsV2Response,
+    blob_versioned_hashes: seq[VersionedHash]):
+    Future[GetBlobsV2Response] =
+  engine_getBlobsV2(rpcClient, blob_versioned_hashes)
+
 template newPayload*(
     rpcClient: RpcClient,
     payload: ExecutionPayloadV1): Future[PayloadStatusV1] =

web3/engine_api_types.nim

@@ -131,6 +131,10 @@ type
     blob*: Blob
     proof*: KzgProof
 
+  BlobAndProofV2* = object
+    blob*: Blob
+    proofs*: array[cellsPerExternalBlob, KzgProof]
+
   # https://github.com/ethereum/execution-apis/blob/v1.0.0-beta.4/src/engine/shanghai.md#executionpayloadbodyv1
   # For optional withdrawals field, see:
   #   https://github.com/ethereum/execution-apis/blob/v1.0.0-beta.4/src/engine/shanghai.md#engine_getpayloadbodiesbyhashv1
@@ -223,6 +227,8 @@ type
 
   GetBlobsV1Response* = seq[BlobAndProofV1]
 
+  GetBlobsV2Response* = seq[BlobAndProofV2]
+
   SomeGetPayloadResponse* =
     ExecutionPayloadV1 |
     GetPayloadV2Response |

web3/primitives.nim

@@ -29,6 +29,9 @@ const
   # https://github.com/ethereum/execution-apis/blob/c4089414bbbe975bbc4bf1ccf0a3d31f76feb3e1/src/engine/cancun.md#blobsbundlev1
   fieldElementsPerBlob = 4096
 
+  # https://github.com/0x00101010/execution-apis/blob/eip-7594/src/engine/osaka.md#blobandproofv2
+  cellsPerExternalBlob* = 128
+
 type
   # https://github.com/ethereum/execution-apis/blob/c4089414bbbe975bbc4bf1ccf0a3d31f76feb3e1/src/schemas/base-types.yaml