Skip to content

Commit 97784b5

Browse files
committed
Revert "accomodate getBlobsV2"
This reverts commit 3fffb22.
1 parent 3fffb22 commit 97784b5

File tree

5 files changed

+0
-19
lines changed

5 files changed

+0
-19
lines changed

tests/test_json_marshalling.nim

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ suite "JSON-RPC Quantity":
204204
checkRandomObject(ExecutionPayloadV3)
205205
checkRandomObject(BlobsBundleV1)
206206
checkRandomObject(BlobAndProofV1)
207-
checkRandomObject(BlobAndProofV2)
208207
checkRandomObject(ExecutionPayloadBodyV1)
209208
checkRandomObject(PayloadAttributesV1)
210209
checkRandomObject(PayloadAttributesV2)

web3/conversions.nim

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ ExecutionPayloadV1OrV2.useDefaultSerializationIn JrpcConv
6060
ExecutionPayloadV3.useDefaultSerializationIn JrpcConv
6161
BlobsBundleV1.useDefaultSerializationIn JrpcConv
6262
BlobAndProofV1.useDefaultSerializationIn JrpcConv
63-
BlobAndProofV2.useDefaultSerializationFor JrpcConv
6463
ExecutionPayloadBodyV1.useDefaultSerializationIn JrpcConv
6564
PayloadAttributesV1.useDefaultSerializationIn JrpcConv
6665
PayloadAttributesV2.useDefaultSerializationIn JrpcConv

web3/engine_api.nim

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ createRpcSigsFromNim(RpcClient):
3939
proc engine_getPayloadBodiesByHashV1(hashes: seq[Hash32]): seq[Opt[ExecutionPayloadBodyV1]]
4040
proc engine_getPayloadBodiesByRangeV1(start: Quantity, count: Quantity): seq[Opt[ExecutionPayloadBodyV1]]
4141
proc engine_getBlobsV1(blob_versioned_hashes: seq[VersionedHash]): GetBlobsV1Response
42-
proc engine_getBlobsV2(blob_versioned_hashes: seq[VersionedHash]): GetBlobsV2Response
4342

4443
# https://github.com/ethereum/execution-apis/blob/9301c0697e4c7566f0929147112f6d91f65180f6/src/engine/common.md
4544
proc engine_exchangeCapabilities(methods: seq[string]): seq[string]
@@ -116,13 +115,6 @@ template getBlobs*(
116115
Future[GetBlobsV1Response] =
117116
engine_getBlobsV1(rpcClient, blob_versioned_hashes)
118117

119-
template getBlobs*(
120-
rpcClient: RpcClient,
121-
T: type GetBlobsV2Response,
122-
blob_versioned_hashes: seq[VersionedHash]):
123-
Future[GetBlobsV2Response] =
124-
engine_getBlobsV2(rpcClient, blob_versioned_hashes)
125-
126118
template newPayload*(
127119
rpcClient: RpcClient,
128120
payload: ExecutionPayloadV1): Future[PayloadStatusV1] =

web3/engine_api_types.nim

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,6 @@ type
131131
blob*: Blob
132132
proof*: KzgProof
133133

134-
BlobAndProofV2* = object
135-
blob*: Blob
136-
proofs*: array[cellsPerExternalBlob, KzgProof]
137-
138134
# https://github.com/ethereum/execution-apis/blob/v1.0.0-beta.4/src/engine/shanghai.md#executionpayloadbodyv1
139135
# For optional withdrawals field, see:
140136
# https://github.com/ethereum/execution-apis/blob/v1.0.0-beta.4/src/engine/shanghai.md#engine_getpayloadbodiesbyhashv1
@@ -227,8 +223,6 @@ type
227223

228224
GetBlobsV1Response* = seq[BlobAndProofV1]
229225

230-
GetBlobsV2Response* = seq[BlobAndProofV2]
231-
232226
SomeGetPayloadResponse* =
233227
ExecutionPayloadV1 |
234228
GetPayloadV2Response |

web3/primitives.nim

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ const
2929
# https://github.com/ethereum/execution-apis/blob/c4089414bbbe975bbc4bf1ccf0a3d31f76feb3e1/src/engine/cancun.md#blobsbundlev1
3030
fieldElementsPerBlob = 4096
3131

32-
# https://github.com/0x00101010/execution-apis/blob/eip-7594/src/engine/osaka.md#blobandproofv2
33-
cellsPerExternalBlob* = 128
34-
3532
type
3633
# https://github.com/ethereum/execution-apis/blob/c4089414bbbe975bbc4bf1ccf0a3d31f76feb3e1/src/schemas/base-types.yaml
3734

0 commit comments

Comments
 (0)