Skip to content

Commit 0c40e45

Browse files
macfarlamacfarla
committed
add blobs to callParams
Signed-off-by: Sally MacFarlane <[email protected]>
1 parent db3284c commit 0c40e45

File tree

11 files changed

+78
-15
lines changed

11 files changed

+78
-15
lines changed

‎ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCallIntegrationTest.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ public void shouldReturnExpectedResultForCallAtLatestBlock() {
7777
null,
7878
null,
7979
null,
80+
null,
8081
null);
8182
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
8283
final JsonRpcResponse expectedResponse =
@@ -104,6 +105,7 @@ public void shouldReturnExpectedResultForCallAtSpecificBlock() {
104105
null,
105106
null,
106107
null,
108+
null,
107109
null);
108110
final JsonRpcRequestContext request = requestWithParams(callParameter, "0x8");
109111
final JsonRpcResponse expectedResponse =
@@ -132,6 +134,7 @@ public void shouldReturnSuccessWhenCreatingContract() {
132134
null,
133135
null,
134136
null,
137+
null,
135138
null);
136139
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
137140
final JsonRpcResponse expectedResponse =
@@ -160,6 +163,7 @@ public void shouldReturnErrorWithGasLimitTooLow() {
160163
null,
161164
null,
162165
null,
166+
null,
163167
null);
164168
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
165169
final JsonRpcResponse expectedResponse =
@@ -186,6 +190,7 @@ public void shouldReturnErrorWithGasPriceTooHighAndStrict() {
186190
true,
187191
null,
188192
null,
193+
null,
189194
null);
190195
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
191196
final JsonRpcResponse expectedResponse =
@@ -212,6 +217,7 @@ public void shouldReturnSuccessWithGasPriceTooHighNotStrict() {
212217
false,
213218
null,
214219
null,
220+
null,
215221
null);
216222
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
217223
final JsonRpcResponse expectedResponse =
@@ -239,6 +245,7 @@ public void shouldReturnErrorWithGasPriceTooHigh() {
239245
null,
240246
null,
241247
null,
248+
null,
242249
null);
243250
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
244251
final JsonRpcResponse expectedResponse =
@@ -265,6 +272,7 @@ public void shouldReturnSuccessWithValidGasPrice() {
265272
null,
266273
null,
267274
null,
275+
null,
268276
null);
269277
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
270278
final JsonRpcResponse expectedResponse =
@@ -292,6 +300,7 @@ public void shouldReturnErrorWithGasPriceAndEmptyBalance() {
292300
null,
293301
null,
294302
null,
303+
null,
295304
null);
296305
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
297306
final JsonRpcResponse expectedResponse =
@@ -318,6 +327,7 @@ public void shouldReturnSuccessWithZeroGasPriceAndEmptyBalance() {
318327
null,
319328
null,
320329
null,
330+
null,
321331
null);
322332
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
323333
final JsonRpcResponse expectedResponse =
@@ -345,6 +355,7 @@ public void shouldReturnSuccessWithoutGasPriceAndEmptyBalance() {
345355
null,
346356
null,
347357
null,
358+
null,
348359
null);
349360
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
350361
final JsonRpcResponse expectedResponse =
@@ -372,6 +383,7 @@ public void shouldReturnSuccessWithInvalidGasPricingAndEmptyBalance() {
372383
null,
373384
null,
374385
null,
386+
null,
375387
null);
376388
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
377389
final JsonRpcResponse expectedResponse =
@@ -399,6 +411,7 @@ public void shouldReturnEmptyHashResultForCallWithOnlyToField() {
399411
null,
400412
null,
401413
null,
414+
null,
402415
null);
403416
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
404417
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x");

‎ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthCreateAccessListIntegrationTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public void shouldSucceedWhenCreateAccessListSimpleContract() {
141141
public void shouldReturnExpectedValueForEmptyCallParameter() {
142142
final JsonCallParameter callParameter =
143143
new JsonCallParameter(
144-
null, null, null, null, null, null, null, null, null, null, null, null, null);
144+
null, null, null, null, null, null, null, null, null, null, null, null, null, null);
145145
final JsonRpcRequestContext request = requestWithParams(callParameter);
146146
final JsonRpcResponse expectedResponse =
147147
new JsonRpcSuccessResponse(null, new CreateAccessListResult(new ArrayList<>(), 0xcf08));
@@ -167,6 +167,7 @@ public void shouldReturnExpectedValueForTransfer() {
167167
null,
168168
null,
169169
null,
170+
null,
170171
null);
171172
final JsonRpcRequestContext request = requestWithParams(callParameter);
172173
final JsonRpcResponse expectedResponse =
@@ -194,6 +195,7 @@ public void shouldReturnExpectedValueForContractDeploy() {
194195
null,
195196
null,
196197
null,
198+
null,
197199
null);
198200
final JsonRpcRequestContext request = requestWithParams(callParameter);
199201
final JsonRpcResponse expectedResponse =
@@ -221,6 +223,7 @@ public void shouldIgnoreSenderBalanceAccountWhenStrictModeDisabledAndReturnExpec
221223
false,
222224
null,
223225
null,
226+
null,
224227
null);
225228
final JsonRpcRequestContext request = requestWithParams(callParameter);
226229
final JsonRpcResponse expectedResponse =
@@ -235,7 +238,7 @@ public void shouldIgnoreSenderBalanceAccountWhenStrictModeDisabledAndReturnExpec
235238
public void shouldReturnExpectedValueForInsufficientGas() {
236239
final JsonCallParameter callParameter =
237240
new JsonCallParameter(
238-
null, null, 1L, null, null, null, null, null, null, null, null, null, null);
241+
null, null, 1L, null, null, null, null, null, null, null, null, null, null, null);
239242
final JsonRpcRequestContext request = requestWithParams(callParameter);
240243
final JsonRpcResponse expectedResponse =
241244
new JsonRpcSuccessResponse(null, new CreateAccessListResult(new ArrayList<>(), 0xcf08));
@@ -272,6 +275,7 @@ private JsonCallParameter createAccessListJsonCallParameters(
272275
null,
273276
accessList,
274277
null,
278+
null,
275279
null);
276280
}
277281

‎ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/frontier/EthEstimateGasIntegrationTest.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void setUp() {
6666
public void shouldReturnExpectedValueForEmptyCallParameter() {
6767
final JsonCallParameter callParameter =
6868
new JsonCallParameter(
69-
null, null, null, null, null, null, null, null, null, null, null, null, null);
69+
null, null, null, null, null, null, null, null, null, null, null, null, null, null);
7070
final JsonRpcRequestContext request = requestWithParams(callParameter);
7171
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x5208");
7272

@@ -91,6 +91,7 @@ public void shouldReturnExpectedValueForTransfer() {
9191
null,
9292
null,
9393
null,
94+
null,
9495
null);
9596
final JsonRpcRequestContext request = requestWithParams(callParameter);
9697
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x5208");
@@ -117,6 +118,7 @@ public void shouldReturnExpectedValueForContractDeploy() {
117118
null,
118119
null,
119120
null,
121+
null,
120122
null);
121123
final JsonRpcRequestContext request = requestWithParams(callParameter);
122124
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x1b551");
@@ -143,6 +145,7 @@ public void shouldIgnoreSenderBalanceAccountWhenStrictModeDisabledAndReturnExpec
143145
false,
144146
null,
145147
null,
148+
null,
146149
null);
147150
final JsonRpcRequestContext request = requestWithParams(callParameter);
148151
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x1b551");
@@ -169,6 +172,7 @@ public void shouldNotIgnoreSenderBalanceAccountWhenStrictModeDisabledAndThrowErr
169172
true,
170173
null,
171174
null,
175+
null,
172176
null);
173177
final JsonRpcRequestContext request = requestWithParams(callParameter);
174178

@@ -186,7 +190,7 @@ public void shouldNotIgnoreSenderBalanceAccountWhenStrictModeDisabledAndThrowErr
186190
public void shouldReturnExpectedValueForInsufficientGas() {
187191
final JsonCallParameter callParameter =
188192
new JsonCallParameter(
189-
null, null, 1L, null, null, null, null, null, null, null, null, null, null);
193+
null, null, 1L, null, null, null, null, null, null, null, null, null, null, null);
190194
final JsonRpcRequestContext request = requestWithParams(callParameter);
191195
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x5208");
192196

‎ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
import org.hyperledger.besu.datatypes.AccessListEntry;
1818
import org.hyperledger.besu.datatypes.Address;
19+
import org.hyperledger.besu.datatypes.Blob;
1920
import org.hyperledger.besu.datatypes.VersionedHash;
2021
import org.hyperledger.besu.datatypes.Wei;
2122
import org.hyperledger.besu.ethereum.core.json.HexLongDeserializer;
@@ -56,7 +57,8 @@ public JsonCallParameter(
5657
@JsonProperty("strict") final Boolean strict,
5758
@JsonProperty("accessList") final List<AccessListEntry> accessList,
5859
@JsonProperty("maxFeePerBlobGas") final Wei maxFeePerBlobGas,
59-
@JsonProperty("blobVersionedHashes") final List<VersionedHash> blobVersionedHashes) {
60+
@JsonProperty("blobVersionedHashes") final List<VersionedHash> blobVersionedHashes,
61+
@JsonProperty("blobs") final List<Blob> blobs) {
6062

6163
super(
6264
from,
@@ -69,7 +71,8 @@ public JsonCallParameter(
6971
Optional.ofNullable(input != null ? input : data).orElse(null),
7072
Optional.ofNullable(accessList),
7173
Optional.ofNullable(maxFeePerBlobGas),
72-
Optional.ofNullable(blobVersionedHashes));
74+
Optional.ofNullable(blobVersionedHashes),
75+
Optional.ofNullable(blobs));
7376

7477
if (input != null && data != null) {
7578
throw new IllegalArgumentException("Only one of 'input' or 'data' should be provided");

‎ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCallTest.java

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,20 @@ public void shouldReturnInternalErrorWhenProcessorReturnsEmpty() {
116116
public void shouldAcceptRequestWhenMissingOptionalFields() {
117117
final JsonCallParameter callParameter =
118118
new JsonCallParameter(
119-
null, null, null, null, null, null, null, null, null, Boolean.FALSE, null, null, null);
119+
null,
120+
null,
121+
null,
122+
null,
123+
null,
124+
null,
125+
null,
126+
null,
127+
null,
128+
Boolean.FALSE,
129+
null,
130+
null,
131+
null,
132+
null);
120133
final JsonRpcRequestContext request = ethCallRequest(callParameter, "latest");
121134
final JsonRpcResponse expectedResponse =
122135
new JsonRpcSuccessResponse(null, Bytes.of().toString());
@@ -457,6 +470,7 @@ private JsonCallParameter callParameter(
457470
null,
458471
null,
459472
null,
473+
null,
460474
null);
461475
}
462476

‎ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessListTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,7 @@ private JsonCallParameter legacyTransactionCallParameter(final Wei gasPrice) {
318318
false,
319319
null,
320320
null,
321+
null,
321322
null);
322323
}
323324

@@ -349,6 +350,7 @@ private JsonCallParameter eip1559TransactionCallParameter(
349350
false,
350351
accessListEntries,
351352
null,
353+
null,
352354
null);
353355
}
354356

‎ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@ private JsonCallParameter legacyTransactionCallParameter(
475475
isStrict,
476476
null,
477477
null,
478+
null,
478479
null);
479480
}
480481

@@ -509,6 +510,7 @@ private JsonCallParameter eip1559TransactionCallParameter(final Optional<Wei> ga
509510
false,
510511
null,
511512
null,
513+
null,
512514
null);
513515
}
514516

‎ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/privacy/methods/priv/PrivCallTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ public void shouldThrowInvalidJsonRpcParametersExceptionWhenMissingToField() {
8888
null,
8989
null,
9090
null,
91+
null,
9192
null);
9293
final JsonRpcRequestContext request = ethCallRequest(privacyGroupId, callParameter, "latest");
9394

@@ -126,6 +127,7 @@ public void shouldAcceptRequestWhenMissingOptionalFields() {
126127
null,
127128
null,
128129
null,
130+
null,
129131
null);
130132
final JsonRpcRequestContext request = ethCallRequest(privacyGroupId, callParameter, "latest");
131133
final JsonRpcResponse expectedResponse =
@@ -209,6 +211,7 @@ private JsonCallParameter callParameter() {
209211
null,
210212
null,
211213
null,
214+
null,
212215
null);
213216
}
214217

0 commit comments

Comments
 (0)