AtHeartEngineer/status-linea-besu
1
0
Fork 0
mirror of https://github.com/vacp2p/status-linea-besu.git synced 2026-01-09 23:38:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: eth_call deserialization to correctly ignore unknown fields in the transaction object (#7323)

Browse Source 
* fix: Use Builder for JsonCallParameter
* changelog
* add additional unit tests
* fix: Update builder to withGas to match the json eth_call
---------

Signed-off-by: Usman Saleem <usman@usmans.info>
This commit is contained in:
Usman Saleem
2024-07-16 19:19:22 +10:00
committed by GitHub
parent 223f1bc3bb
commit 3366f79c95
15 changed files with 725 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -14,6 +14,7 @@
- Implement gnark-crypto for eip-2537 [#7316](https://github.com/hyperledger/besu/pull/7316)
### Bug fixes
- Fix `eth_call` deserialization to correctly ignore unknown fields in the transaction object. [#7323](https://github.com/hyperledger/besu/pull/7323)
## 24.7.0

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

@@ -64,20 +64,12 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnExpectedResultForCallAtLatestBlock() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
null,
null,
null,
null,
null,
Bytes.fromHexString("0x12a7b914"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"))
.withInput(Bytes.fromHexString("0x12a7b914"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(
@@ -91,20 +83,12 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnExpectedResultForCallAtSpecificBlock() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
null,
null,
null,
null,
null,
Bytes.fromHexString("0x12a7b914"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"))
.withInput(Bytes.fromHexString("0x12a7b914"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "0x8");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(
@@ -118,21 +102,13 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnSuccessWhenCreatingContract() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
null,
null,
null,
null,
null,
null,
Bytes.fromHexString(
"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withInput(
Bytes.fromHexString(
"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(
@@ -147,20 +123,13 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnErrorWithGasLimitTooLow() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
0L,
null,
null,
null,
null,
Bytes.fromHexString("0x12a7b914"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"))
.withGas(0L)
.withInput(Bytes.fromHexString("0x12a7b914"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcErrorResponse(null, RpcErrorType.INTRINSIC_GAS_EXCEEDS_LIMIT);
@@ -173,20 +142,14 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnErrorWithGasPriceTooHighAndStrict() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
null,
Wei.fromHexString("0x10000000000000"),
null,
null,
null,
Bytes.fromHexString("0x12a7b914"),
null,
true,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"))
.withGasPrice(Wei.fromHexString("0x10000000000000"))
.withInput(Bytes.fromHexString("0x12a7b914"))
.withStrict(true)
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcErrorResponse(null, RpcErrorType.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);
@@ -199,20 +162,14 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnSuccessWithGasPriceTooHighNotStrict() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
null,
Wei.fromHexString("0x10000000000000"),
null,
null,
null,
Bytes.fromHexString("0x12a7b914"),
null,
false,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"))
.withGasPrice(Wei.fromHexString("0x10000000000000"))
.withInput(Bytes.fromHexString("0x12a7b914"))
.withStrict(false)
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(
@@ -226,20 +183,13 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnErrorWithGasPriceTooHigh() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
null,
Wei.fromHexString("0x10000000000000"),
null,
null,
null,
Bytes.fromHexString("0x12a7b914"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"))
.withGasPrice(Wei.fromHexString("0x10000000000000"))
.withInput(Bytes.fromHexString("0x12a7b914"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcErrorResponse(null, RpcErrorType.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);
@@ -252,20 +202,13 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnSuccessWithValidGasPrice() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
null,
Wei.fromHexString("0x10"),
null,
null,
null,
Bytes.fromHexString("0x12a7b914"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"))
.withGasPrice(Wei.fromHexString("0x10"))
.withInput(Bytes.fromHexString("0x12a7b914"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(
@@ -279,20 +222,13 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnErrorWithGasPriceAndEmptyBalance() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xdeadbeef00000000000000000000000000000000"),
Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
null,
Wei.fromHexString("0x10"),
null,
null,
null,
Bytes.fromHexString("0x12a7b914"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xdeadbeef00000000000000000000000000000000"))
.withTo(Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"))
.withGasPrice(Wei.fromHexString("0x10"))
.withInput(Bytes.fromHexString("0x12a7b914"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcErrorResponse(null, RpcErrorType.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);
@@ -305,20 +241,13 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnSuccessWithZeroGasPriceAndEmptyBalance() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xdeadbeef00000000000000000000000000000000"),
Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
null,
Wei.fromHexString("0x0"),
null,
null,
null,
Bytes.fromHexString("0x12a7b914"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xdeadbeef00000000000000000000000000000000"))
.withTo(Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"))
.withGasPrice(Wei.fromHexString("0x0"))
.withInput(Bytes.fromHexString("0x12a7b914"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(
@@ -332,20 +261,12 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnSuccessWithoutGasPriceAndEmptyBalance() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xdeadbeef00000000000000000000000000000000"),
Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
null,
null,
null,
null,
null,
Bytes.fromHexString("0x12a7b914"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xdeadbeef00000000000000000000000000000000"))
.withTo(Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"))
.withInput(Bytes.fromHexString("0x12a7b914"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(
@@ -359,20 +280,13 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnSuccessWithInvalidGasPricingAndEmptyBalance() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xdeadbeef00000000000000000000000000000000"),
Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
null,
null,
Wei.fromHexString("0x0A"),
null,
null,
Bytes.fromHexString("0x12a7b914"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xdeadbeef00000000000000000000000000000000"))
.withTo(Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"))
.withMaxPriorityFeePerGas(Wei.fromHexString("0x0A"))
.withInput(Bytes.fromHexString("0x12a7b914"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(
@@ -386,20 +300,10 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnEmptyHashResultForCallWithOnlyToField() {
final JsonCallParameter callParameter =
new JsonCallParameter(
null,
Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withTo(Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x");
@@ -411,20 +315,13 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnSuccessWithInputAndDataFieldSetToSameValue() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
null,
null,
null,
null,
null,
Bytes.fromHexString("0x12a7b914"),
Bytes.fromHexString("0x12a7b914"),
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"))
.withInput(Bytes.fromHexString("0x12a7b914"))
.withData(Bytes.fromHexString("0x12a7b914"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(

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

@@ -79,10 +79,11 @@ public class EthCreateAccessListIntegrationTest {
"0x0000000000000000000000000000000000000000000000000000000000000003"))));
final JsonCallParameter callParameter =
createAccessListJsonCallParameters(
"0x658bdf435d810c91414ec09147daa6db62406379",
"0xbb00000000000000000000000000000000000000",
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0x658bdf435d810c91414ec09147daa6db62406379"))
.withTo(Address.fromHexString("0xbb00000000000000000000000000000000000000"))
.withAccessList(null)
.build();
assertAccessListExpectedResult(callParameter, expectedAccessListEntryList, expectedGasUsed);
}
@@ -101,10 +102,11 @@ public class EthCreateAccessListIntegrationTest {
"0x0000000000000000000000000000000000000000000000000000000000000003"))));
final JsonCallParameter callParameter =
createAccessListJsonCallParameters(
"0x658bdf435d810c91414ec09147daa6db62406379",
"0xbb00000000000000000000000000000000000000",
expectedAccessListEntryList);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0x658bdf435d810c91414ec09147daa6db62406379"))
.withTo(Address.fromHexString("0xbb00000000000000000000000000000000000000"))
.withAccessList(expectedAccessListEntryList)
.build();
assertAccessListExpectedResult(callParameter, expectedAccessListEntryList, expectedGasUsed);
}
@@ -115,10 +117,11 @@ public class EthCreateAccessListIntegrationTest {
final List<AccessListEntry> expectedAccessListEntryList = new ArrayList<>();
final JsonCallParameter callParameter =
createAccessListJsonCallParameters(
"0x658bdf435d810c91414ec09147daa6db62406379",
"0x0100000000000000000000000000000000000000",
expectedAccessListEntryList);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0x658bdf435d810c91414ec09147daa6db62406379"))
.withTo(Address.fromHexString("0x0100000000000000000000000000000000000000"))
.withAccessList(expectedAccessListEntryList)
.build();
assertAccessListExpectedResult(callParameter, expectedAccessListEntryList, expectedGasUsed);
}
@@ -129,10 +132,11 @@ public class EthCreateAccessListIntegrationTest {
final List<AccessListEntry> expectedAccessListEntryList = new ArrayList<>();
final JsonCallParameter callParameter =
createAccessListJsonCallParameters(
"0x658bdf435d810c91414ec09147daa6db62406379",
"0xaa00000000000000000000000000000000000000",
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0x658bdf435d810c91414ec09147daa6db62406379"))
.withTo(Address.fromHexString("0xaa00000000000000000000000000000000000000"))
.withAccessList(null)
.build();
assertAccessListExpectedResult(callParameter, expectedAccessListEntryList, expectedGasUsed);
}
@@ -140,8 +144,8 @@ public class EthCreateAccessListIntegrationTest {
@Test
public void shouldReturnExpectedValueForEmptyCallParameter() {
final JsonCallParameter callParameter =
new JsonCallParameter(
null, null, null, null, null, null, null, null, null, null, null, null, null);
new JsonCallParameter.JsonCallParameterBuilder().build();
final JsonRpcRequestContext request = requestWithParams(callParameter);
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(null, new CreateAccessListResult(new ArrayList<>(), 0xcf08));
@@ -154,20 +158,12 @@ public class EthCreateAccessListIntegrationTest {
@Test
public void shouldReturnExpectedValueForTransfer() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x8888f1f195afa192cfee860698584c030f4c9db1"),
null,
null,
null,
null,
Wei.ZERO,
null,
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x8888f1f195afa192cfee860698584c030f4c9db1"))
.withValue(Wei.ZERO)
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter);
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(null, new CreateAccessListResult(new ArrayList<>(), 0x5208));
@@ -180,21 +176,13 @@ public class EthCreateAccessListIntegrationTest {
@Test
public void shouldReturnExpectedValueForContractDeploy() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
null,
null,
null,
null,
null,
null,
Bytes.fromHexString(
"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withInput(
Bytes.fromHexString(
"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter);
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(null, new CreateAccessListResult(new ArrayList<>(), 0x1f081));
@@ -207,21 +195,16 @@ public class EthCreateAccessListIntegrationTest {
@Test
public void shouldIgnoreSenderBalanceAccountWhenStrictModeDisabledAndReturnExpectedValue() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0x0000000000000000000000000000000000000000"),
null,
1L,
Wei.fromHexString("0x9999999999"),
null,
null,
null,
Bytes.fromHexString(
"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
null,
false,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0x0000000000000000000000000000000000000000"))
.withGas(1L)
.withGasPrice(Wei.fromHexString("0x9999999999"))
.withInput(
Bytes.fromHexString(
"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"))
.withStrict(false)
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter);
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(null, new CreateAccessListResult(new ArrayList<>(), 0x1f081));
@@ -234,8 +217,7 @@ public class EthCreateAccessListIntegrationTest {
@Test
public void shouldReturnExpectedValueForInsufficientGas() {
final JsonCallParameter callParameter =
new JsonCallParameter(
null, null, 1L, null, null, null, null, null, null, null, null, null, null);
new JsonCallParameter.JsonCallParameterBuilder().withGas(1L).build();
final JsonRpcRequestContext request = requestWithParams(callParameter);
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(null, new CreateAccessListResult(new ArrayList<>(), 0xcf08));
@@ -257,24 +239,6 @@ public class EthCreateAccessListIntegrationTest {
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
}
private JsonCallParameter createAccessListJsonCallParameters(
final String from, final String to, final List<AccessListEntry> accessList) {
return new JsonCallParameter(
Address.fromHexString(from),
Address.fromHexString(to),
null,
null,
null,
null,
null,
null,
null,
null,
accessList,
null,
null);
}
private JsonRpcRequestContext requestWithParams(final Object... params) {
return new JsonRpcRequestContext(new JsonRpcRequest("2.0", "eth_createAccessList", params));
}

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

@@ -66,8 +66,7 @@ public class EthEstimateGasIntegrationTest {
@Test
public void shouldReturnExpectedValueForEmptyCallParameter() {
final JsonCallParameter callParameter =
new JsonCallParameter(
null, null, null, null, null, null, null, null, null, null, null, null, null);
new JsonCallParameter.JsonCallParameterBuilder().build();
final JsonRpcRequestContext request = requestWithParams(callParameter);
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x5208");
@@ -79,20 +78,12 @@ public class EthEstimateGasIntegrationTest {
@Test
public void shouldReturnExpectedValueForTransfer() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x8888f1f195afa192cfee860698584c030f4c9db1"),
null,
null,
null,
null,
Wei.ONE,
null,
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x8888f1f195afa192cfee860698584c030f4c9db1"))
.withValue(Wei.ONE)
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter);
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x5208");
@@ -104,21 +95,13 @@ public class EthEstimateGasIntegrationTest {
@Test
public void shouldReturnExpectedValueForContractDeploy() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
null,
null,
null,
null,
null,
null,
Bytes.fromHexString(
"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withInput(
Bytes.fromHexString(
"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter);
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x1b551");
@@ -130,21 +113,16 @@ public class EthEstimateGasIntegrationTest {
@Test
public void shouldIgnoreSenderBalanceAccountWhenStrictModeDisabledAndReturnExpectedValue() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0x0000000000000000000000000000000000000000"),
null,
1L,
Wei.fromHexString("0x9999999999"),
null,
null,
null,
Bytes.fromHexString(
"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
null,
false,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0x0000000000000000000000000000000000000000"))
.withGas(1L)
.withGasPrice(Wei.fromHexString("0x9999999999"))
.withInput(
Bytes.fromHexString(
"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"))
.withStrict(false)
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter);
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x1b551");
@@ -156,21 +134,16 @@ public class EthEstimateGasIntegrationTest {
@Test
public void shouldNotIgnoreSenderBalanceAccountWhenStrictModeDisabledAndThrowError() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
null,
1L,
Wei.fromHexString("0x9999999999"),
null,
null,
null,
Bytes.fromHexString(
"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
null,
true,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"))
.withGas(1L)
.withGasPrice(Wei.fromHexString("0x9999999999"))
.withInput(
Bytes.fromHexString(
"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"))
.withStrict(true)
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter);
final ValidationResult<TransactionInvalidReason> validationResult =
ValidationResult.invalid(
@@ -186,8 +159,7 @@ public class EthEstimateGasIntegrationTest {
@Test
public void shouldReturnExpectedValueForInsufficientGas() {
final JsonCallParameter callParameter =
new JsonCallParameter(
null, null, 1L, null, null, null, null, null, null, null, null, null, null);
new JsonCallParameter.JsonCallParameterBuilder().withGas(1L).build();
final JsonRpcRequestContext request = requestWithParams(callParameter);
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x5208");

190
ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthCallIntegrationTest.java
View File

@@ -64,20 +64,12 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnSuccessWithoutGasPriceAndEmptyBalance() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xdeadbeef00000000000000000000000000000000"),
Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
null,
null,
null,
null,
null,
Bytes.fromHexString("0x2e64cec1"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xdeadbeef00000000000000000000000000000000"))
.withTo(Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"))
.withInput(Bytes.fromHexString("0x2e64cec1"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(
@@ -91,20 +83,13 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnErrorWithGasPriceTooHigh() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
null,
Wei.fromHexString("0x10000000000000"),
null,
null,
null,
Bytes.fromHexString("0x2e64cec1"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"))
.withGasPrice(Wei.fromHexString("0x10000000000000"))
.withInput(Bytes.fromHexString("0x2e64cec1"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcErrorResponse(null, RpcErrorType.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);
@@ -117,20 +102,13 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnSuccessWithValidGasPrice() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
null,
Wei.fromHexString("0x3B9ACA01"),
null,
null,
null,
Bytes.fromHexString("0x2e64cec1"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"))
.withGasPrice(Wei.fromHexString("0x3B9ACA01"))
.withInput(Bytes.fromHexString("0x2e64cec1"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(
@@ -144,20 +122,13 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnErrorWithGasPriceLessThanCurrentBaseFee() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
null,
Wei.fromHexString("0x0A"),
null,
null,
null,
Bytes.fromHexString("0x2e64cec1"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"))
.withGasPrice(Wei.fromHexString("0x0A"))
.withInput(Bytes.fromHexString("0x2e64cec1"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcErrorResponse(null, RpcErrorType.GAS_PRICE_BELOW_CURRENT_BASE_FEE);
@@ -170,20 +141,13 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnSuccessWithValidMaxFeePerGas() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
null,
null,
null,
Wei.fromHexString("0x3B9ACA01"),
null,
Bytes.fromHexString("0x2e64cec1"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"))
.withMaxFeePerGas(Wei.fromHexString("0x3B9ACA01"))
.withInput(Bytes.fromHexString("0x2e64cec1"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(
@@ -197,20 +161,14 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnSuccessWithValidMaxFeePerGasAndMaxPriorityFeePerGas() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
null,
null,
Wei.fromHexString("0x3B9ACA00"),
Wei.fromHexString("0x3B9ACA01"),
null,
Bytes.fromHexString("0x2e64cec1"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"))
.withMaxPriorityFeePerGas(Wei.fromHexString("0x3B9ACA00"))
.withMaxFeePerGas(Wei.fromHexString("0x3B9ACA01"))
.withInput(Bytes.fromHexString("0x2e64cec1"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(
@@ -224,20 +182,13 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnErrorWithValidMaxFeePerGasLessThanCurrentBaseFee() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
null,
null,
null,
Wei.fromHexString("0x0A"),
null,
Bytes.fromHexString("0x2e64cec1"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"))
.withMaxFeePerGas(Wei.fromHexString("0x0A"))
.withInput(Bytes.fromHexString("0x2e64cec1"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcErrorResponse(null, RpcErrorType.GAS_PRICE_BELOW_CURRENT_BASE_FEE);
@@ -250,20 +201,14 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnErrorWithValidMaxFeePerGasLessThanMaxPriorityFeePerGas() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
null,
null,
Wei.fromHexString("0x3B9ACA02"),
Wei.fromHexString("0x3B9ACA01"),
null,
Bytes.fromHexString("0x2e64cec1"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"))
.withMaxPriorityFeePerGas(Wei.fromHexString("0x3B9ACA02"))
.withMaxFeePerGas(Wei.fromHexString("0x3B9ACA01"))
.withInput(Bytes.fromHexString("0x2e64cec1"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcErrorResponse(
@@ -277,20 +222,13 @@ public class EthCallIntegrationTest {
@Test
public void shouldReturnErrorWithMaxFeePerGasAndEmptyBalance() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xdeadbeef00000000000000000000000000000000"),
Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"),
null,
null,
null,
Wei.fromHexString("0x3B9ACA01"),
null,
Bytes.fromHexString("0x2e64cec1"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xdeadbeef00000000000000000000000000000000"))
.withTo(Address.fromHexString("0x9b8397f1b0fecd3a1a40cdd5e8221fa461898517"))
.withMaxFeePerGas(Wei.fromHexString("0x3B9ACA01"))
.withInput(Bytes.fromHexString("0x2e64cec1"))
.build();
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcErrorResponse(null, RpcErrorType.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);

84
ethereum/api/src/integration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/methods/fork/london/EthEstimateGasIntegrationTest.java
View File

@@ -67,20 +67,11 @@ public class EthEstimateGasIntegrationTest {
@Test
public void shouldReturnExpectedValueForTransfer() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x8888f1f195afa192cfee860698584c030f4c9db1"),
null,
null,
null,
null,
Wei.ONE,
null,
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x8888f1f195afa192cfee860698584c030f4c9db1"))
.withValue(Wei.ONE)
.build();
final JsonRpcResponse response = method.response(requestWithParams(callParameter));
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x5208");
@@ -89,22 +80,13 @@ public class EthEstimateGasIntegrationTest {
@Test
public void shouldReturnExpectedValueForTransfer_WithAccessList() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
Address.fromHexString("0x8888f1f195afa192cfee860698584c030f4c9db1"),
null,
null,
null,
null,
Wei.ONE,
null,
null,
null,
createAccessList(),
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withTo(Address.fromHexString("0x8888f1f195afa192cfee860698584c030f4c9db1"))
.withValue(Wei.ONE)
.withAccessList(createAccessList())
.build();
final JsonRpcResponse response = method.response(requestWithParams(callParameter));
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x62d4");
@@ -114,21 +96,13 @@ public class EthEstimateGasIntegrationTest {
@Test
public void shouldReturnExpectedValueForContractDeploy() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
null,
null,
null,
null,
null,
null,
Bytes.fromHexString(
"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withInput(
Bytes.fromHexString(
"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"))
.build();
final JsonRpcResponse response = method.response(requestWithParams(callParameter));
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x1f081");
assertThat(response).usingRecursiveComparison().isEqualTo(expectedResponse);
@@ -137,21 +111,13 @@ public class EthEstimateGasIntegrationTest {
@Test
public void shouldReturnExpectedValueForContractDeploy_WithAccessList() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
null,
null,
null,
null,
null,
null,
Bytes.fromHexString(
"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"),
null,
null,
createAccessList(),
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"))
.withInput(
Bytes.fromHexString(
"0x608060405234801561001057600080fd5b50610157806100206000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680633bdab8bf146100515780639ae97baa14610068575b600080fd5b34801561005d57600080fd5b5061006661007f565b005b34801561007457600080fd5b5061007d6100b9565b005b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60016040518082815260200191505060405180910390a1565b7fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60026040518082815260200191505060405180910390a17fa53887c1eed04528e23301f55ad49a91634ef5021aa83a97d07fd16ed71c039a60036040518082815260200191505060405180910390a15600a165627a7a7230582010ddaa52e73a98c06dbcd22b234b97206c1d7ed64a7c048e10c2043a3d2309cb0029"))
.withAccessList(createAccessList())
.build();
final JsonRpcResponse response = method.response(requestWithParams(callParameter));
final JsonRpcResponse expectedResponse = new JsonRpcSuccessResponse(null, "0x2014d");

11
ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/AbstractEstimateGas.java
View File

@@ -17,7 +17,6 @@ package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
import org.hyperledger.besu.datatypes.Wei;
import org.hyperledger.besu.ethereum.api.jsonrpc.JsonRpcErrorConverter;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.exception.InvalidJsonRpcParameters;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcError;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.response.JsonRpcErrorResponse;
@@ -94,16 +93,6 @@ public abstract class AbstractEstimateGas implements JsonRpcMethod {
return ((long) ((gasUsedByTransaction + gasStipend) * subCallMultiplier));
}
protected JsonCallParameter validateAndGetCallParams(final JsonRpcRequestContext request) {
final JsonCallParameter callParams = request.getRequiredParameter(0, JsonCallParameter.class);
if (callParams.getGasPrice() != null
&& (callParams.getMaxFeePerGas().isPresent()
|| callParams.getMaxPriorityFeePerGas().isPresent())) {
throw new InvalidJsonRpcParameters("gasPrice cannot be used with baseFee or maxFeePerGas");
}
return callParams;
}
protected JsonRpcErrorResponse errorResponse(
final JsonRpcRequestContext request, final TransactionSimulatorResult result) {

2
ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessList.java
View File

@@ -14,6 +14,8 @@
*/
package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonCallParameterUtil.validateAndGetCallParams;
import org.hyperledger.besu.datatypes.AccessListEntry;
import org.hyperledger.besu.datatypes.Wei;
import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;

2
ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGas.java
View File

@@ -14,6 +14,8 @@
*/
package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods;
import static org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods.JsonCallParameterUtil.validateAndGetCallParams;
import org.hyperledger.besu.ethereum.api.jsonrpc.RpcMethod;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.JsonRpcRequestContext;
import org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters.JsonCallParameter;

344
ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java
View File

@@ -26,68 +26,338 @@ import java.util.List;
import java.util.Optional;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import org.apache.tuweni.bytes.Bytes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* This class is used to deserialize JSON parameters for a call to the JSON-RPC method eth_call. It
* extends {@link CallParameter} by adding support for JSON-specific fields such as strict mode,
* access lists, and blob versioned hashes. It also handles unknown JSON properties gracefully.
*
* <p>To build an instance of this class, use the {@link JsonCallParameterBuilder}:
*
* <pre>{@code
* JsonCallParameter param = new JsonCallParameter.JsonCallParameterBuilder()
* .withFrom(Address.fromHexString("0x..."))
* .withTo(Address.fromHexString("0x..."))
* .withGas(21000L)
* .withGasPrice(Wei.of(1000000000L))
* .withValue(Wei.ZERO)
* .withInput(Bytes.fromHexString("0x..."))
* .withStrict(true) // Optional
* .withAccessList(accessList) // Optional
* .withMaxFeePerGas(Wei.of(2)) // Optional
* .withMaxPriorityFeePerGas(Wei.of(1)) // Optional
* .withMaxFeePerBlobGas(Wei.of(3)) // Optional
* .withBlobVersionedHashes(blobVersionedHashes) // Optional
* .build();
* }</pre>
*
* <p>Note: Only one of 'data' or 'input' should be provided to the builder. If both are provided
* and their values differ, an {@link IllegalArgumentException} is thrown.
*
* <p>Unknown JSON properties encountered during deserialization are logged but do not affect the
* deserialization process, allowing for flexibility in JSON formats.
*/
@JsonIgnoreProperties(ignoreUnknown = true)
@JsonDeserialize(builder = JsonCallParameter.JsonCallParameterBuilder.class)
public class JsonCallParameter extends CallParameter {
private static final Logger LOG = LoggerFactory.getLogger(JsonCallParameter.class);
private final Optional<Boolean> strict;
@JsonCreator
public JsonCallParameter(
@JsonProperty("from") final Address from,
@JsonProperty("to") final Address to,
@JsonDeserialize(using = GasDeserializer.class) @JsonProperty("gas") final Long gasLimit,
@JsonProperty("gasPrice") final Wei gasPrice,
@JsonProperty("maxPriorityFeePerGas") final Wei maxPriorityFeePerGas,
@JsonProperty("maxFeePerGas") final Wei maxFeePerGas,
@JsonProperty("value") final Wei value,
@JsonDeserialize(using = HexStringDeserializer.class) @JsonProperty("data") final Bytes data,
@JsonDeserialize(using = HexStringDeserializer.class) @JsonProperty("input")
final Bytes input,
@JsonProperty("strict") final Boolean strict,
@JsonProperty("accessList") final List<AccessListEntry> accessList,
@JsonProperty("maxFeePerBlobGas") final Wei maxFeePerBlobGas,
@JsonProperty("blobVersionedHashes") final List<VersionedHash> blobVersionedHashes) {
private JsonCallParameter(
final Address from,
final Address to,
final Long gasLimit,
final Wei gasPrice,
final Optional<Wei> maxPriorityFeePerGas,
final Optional<Wei> maxFeePerGas,
final Wei value,
final Bytes payload,
final Optional<Boolean> strict,
final Optional<List<AccessListEntry>> accessList,
final Optional<Wei> maxFeePerBlobGas,
final Optional<List<VersionedHash>> blobVersionedHashes) {
super(
from,
to,
gasLimit != null ? gasLimit : -1L,
gasLimit,
gasPrice,
Optional.ofNullable(maxPriorityFeePerGas),
Optional.ofNullable(maxFeePerGas),
maxPriorityFeePerGas,
maxFeePerGas,
value,
Optional.ofNullable(input != null ? input : data).orElse(null),
Optional.ofNullable(accessList),
Optional.ofNullable(maxFeePerBlobGas),
Optional.ofNullable(blobVersionedHashes));
payload,
accessList,
maxFeePerBlobGas,
blobVersionedHashes);
if (input != null && data != null && !input.equals(data)) {
throw new IllegalArgumentException("Only one of 'input' or 'data' should be provided");
}
this.strict = Optional.ofNullable(strict);
this.strict = strict;
}
/**
* Returns whether the call should be executed in strict mode.
*
* @return Optional strict mode flag
*/
public Optional<Boolean> isMaybeStrict() {
return strict;
}
@JsonAnySetter
public void logUnknownProperties(final String key, final Object value) {
LOG.debug(
"unknown property - {} with value - {} and type - {} caught during serialization",
key,
value,
value.getClass());
/**
* Builder for {@link JsonCallParameter}. Used by Jackson to deserialize {@code
* JsonCallParameter}.
*/
public static final class JsonCallParameterBuilder {
private Optional<Boolean> strict = Optional.empty();
private Address from;
private Address to;
private long gas = -1;
private Optional<Wei> maxPriorityFeePerGas = Optional.empty();
private Optional<Wei> maxFeePerGas = Optional.empty();
private Optional<Wei> maxFeePerBlobGas = Optional.empty();
private Wei gasPrice;
private Wei value;
private Bytes data;
private Bytes input;
private Optional<List<AccessListEntry>> accessList = Optional.empty();
private Optional<List<VersionedHash>> blobVersionedHashes = Optional.empty();
/** Default constructor. */
public JsonCallParameterBuilder() {}
/**
* Sets the strict mode for the {@link JsonCallParameter}. If strict mode is enabled, the call
* will be executed with stricter validation rules. This is optional and defaults to not being
* in strict mode if not specified.
*
* @param strict the strict mode flag, can be {@code null} to indicate the absence of a strict
* mode preference
* @return the {@link JsonCallParameterBuilder} instance for chaining
*/
public JsonCallParameterBuilder withStrict(final Boolean strict) {
this.strict = Optional.ofNullable(strict);
return this;
}
/**
* Sets the "from" address for the {@link JsonCallParameter}. This address represents the sender
* of the call.
*
* @param from the sender's address
* @return the {@link JsonCallParameterBuilder} instance for chaining
*/
public JsonCallParameterBuilder withFrom(final Address from) {
this.from = from;
return this;
}
/**
* Sets the "to" address for the {@link JsonCallParameter}. This address represents the
* recipient of the call. It can be null for contract creation transactions.
*
* @param to the recipient's address
* @return the {@link JsonCallParameterBuilder} instance for chaining
*/
public JsonCallParameterBuilder withTo(final Address to) {
this.to = to;
return this;
}
/**
* Sets the gas for the {@link JsonCallParameter} used for transaction execution. eth_call uses
* 0 gas but this parameter may be needed by some executions. By default, if not specified, the
* gas is set to -1, indicating that it is not set.
*
* @param gas the gas limit for the call, can be {@code null} to indicate that the gas limit is
* not set
* @return the {@link JsonCallParameterBuilder} instance for chaining
*/
@JsonDeserialize(using = GasDeserializer.class)
public JsonCallParameterBuilder withGas(final Long gas) {
this.gas = Optional.ofNullable(gas).orElse(-1L);
return this;
}
/**
* Sets the maximum priority fee per gas for the {@link JsonCallParameter}. This fee is used to
* incentivize miners to include the transaction in a block. It is an optional parameter, and if
* not specified, it defaults to an empty {@link Optional}.
*
* @param maxPriorityFeePerGas the maximum priority fee per gas, can be {@code null} to indicate
* no preference
* @return the {@link JsonCallParameterBuilder} instance for chaining
*/
public JsonCallParameterBuilder withMaxPriorityFeePerGas(final Wei maxPriorityFeePerGas) {
this.maxPriorityFeePerGas = Optional.ofNullable(maxPriorityFeePerGas);
return this;
}
/**
* Sets the maximum fee per gas for the {@link JsonCallParameter}. This fee represents the
* maximum amount of gas that the sender is willing to pay. It is an optional parameter, and if
* not specified, it defaults to an empty {@link Optional}.
*
* @param maxFeePerGas the maximum fee per gas, can be {@code null} to indicate no preference
* @return the {@link JsonCallParameterBuilder} instance for chaining
*/
public JsonCallParameterBuilder withMaxFeePerGas(final Wei maxFeePerGas) {
this.maxFeePerGas = Optional.ofNullable(maxFeePerGas);
return this;
}
/**
* Sets the maximum fee per blob gas for the {@link JsonCallParameter}. This fee is specific to
* certain types of transactions and is an optional parameter. If not specified, it defaults to
* an empty {@link Optional}.
*
* @param maxFeePerBlobGas the maximum fee per blob gas, can be {@code null} to indicate no
* preference
* @return the {@link JsonCallParameterBuilder} instance for chaining
*/
public JsonCallParameterBuilder withMaxFeePerBlobGas(final Wei maxFeePerBlobGas) {
this.maxFeePerBlobGas = Optional.ofNullable(maxFeePerBlobGas);
return this;
}
/**
* Sets the gas price for the {@link JsonCallParameter}. The gas price is used to calculate the
* transaction fee as the product of gas price and gas used. It is an optional parameter, and if
* not specified, it defaults to the network's current gas price.
*
* @param gasPrice the gas price, can be {@code null} to indicate that the network's current gas
* price should be used
* @return the {@link JsonCallParameterBuilder} instance for chaining
*/
public JsonCallParameterBuilder withGasPrice(final Wei gasPrice) {
this.gasPrice = gasPrice;
return this;
}
/**
* Sets the value to be transferred with the call for the {@link JsonCallParameter}. This value
* is the amount of Wei to be transferred from the sender to the recipient. It is an optional
* parameter, and if not specified, it defaults to 0, indicating that no value is transferred.
*
* @param value the value to be transferred, can be {@code null} to indicate no value is
* transferred
* @return the {@link JsonCallParameterBuilder} instance for chaining
*/
public JsonCallParameterBuilder withValue(final Wei value) {
this.value = value;
return this;
}
/**
* Sets the data for the {@link JsonCallParameter}. This data represents the payload of the
* call. Note: Only one of 'data' or 'input' should be provided. If both are provided and their
* values differ, an exception will be thrown during the build process.
*
* @param data the payload data
* @return the {@link JsonCallParameterBuilder} instance for chaining
*/
@JsonDeserialize(using = HexStringDeserializer.class)
public JsonCallParameterBuilder withData(final Bytes data) {
this.data = data;
return this;
}
/**
* Sets the input for the {@link JsonCallParameter}. This input is an alternative representation
* of the payload for the call. Note: Only one of 'input' or 'data' should be provided. If both
* are provided and their values differ, an exception will be thrown during the build process.
*
* @param input the payload input
* @return the {@link JsonCallParameterBuilder} instance for chaining
*/
@JsonDeserialize(using = HexStringDeserializer.class)
public JsonCallParameterBuilder withInput(final Bytes input) {
this.input = input;
return this;
}
/**
* Sets the access list for the {@link JsonCallParameter}. The access list is a list of
* addresses and storage keys that the transaction plans to access. This is an optional
* parameter, and if not specified, it defaults to an empty {@link Optional}.
*
* @param accessList the access list, can be {@code null} to indicate no access list is provided
* @return the {@link JsonCallParameterBuilder} instance for chaining
*/
public JsonCallParameterBuilder withAccessList(final List<AccessListEntry> accessList) {
this.accessList = Optional.ofNullable(accessList);
return this;
}
/**
* Sets the blob versioned hashes for the {@link JsonCallParameter}. This is a list of versioned
* hashes related to blob transactions, allowing for more complex transaction types. It is an
* optional parameter, and if not specified, it defaults to an empty {@link Optional}.
*
* @param blobVersionedHashes the list of versioned hashes, can be {@code null} to indicate no
* versioned hashes are provided
* @return the {@link JsonCallParameterBuilder} instance for chaining
*/
public JsonCallParameterBuilder withBlobVersionedHashes(
final List<VersionedHash> blobVersionedHashes) {
this.blobVersionedHashes = Optional.ofNullable(blobVersionedHashes);
return this;
}
/**
* Handles unknown JSON properties during deserialization. This method is invoked when an
* unknown property is encountered in the JSON being deserialized into a {@link
* JsonCallParameter} object. It logs the unknown property's key, value, and the value's type if
* the value is not null. This allows for flexibility in JSON formats and aids in debugging
* issues related to unexpected properties.
*
* @param key the key of the unknown property
* @param value the value of the unknown property, which can be any type
*/
@JsonAnySetter
public void withUnknownProperties(final String key, final Object value) {
LOG.debug(
"unknown property - {} with value - {} and type - {} caught during serialization",
key,
value,
value != null ? value.getClass() : "NULL");
}
/**
* Builds a {@link JsonCallParameter} instance based on the provided parameters. This method
* also validates that only one of 'input' or 'data' is provided. If both are provided and their
* values differ, an {@link IllegalArgumentException} is thrown. This ensures the integrity of
* the payload data for the call.
*
* @return a new {@link JsonCallParameter} instance with the specified configuration
* @throws IllegalArgumentException if both 'input' and 'data' are provided and their values are
* not equal
*/
public JsonCallParameter build() {
if (input != null && data != null && !input.equals(data)) {
throw new IllegalArgumentException("Only one of 'input' or 'data' should be provided");
}
final Bytes payload = input != null ? input : data;
return new JsonCallParameter(
from,
to,
gas,
gasPrice,
maxPriorityFeePerGas,
maxFeePerGas,
value,
payload,
strict,
accessList,
maxFeePerBlobGas,
blobVersionedHashes);
}
}
}

27
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCallTest.java
View File

@@ -115,8 +115,7 @@ public class EthCallTest {
@Test
public void shouldAcceptRequestWhenMissingOptionalFields() {
final JsonCallParameter callParameter =
new JsonCallParameter(
null, null, null, null, null, null, null, null, null, Boolean.FALSE, null, null, null);
new JsonCallParameter.JsonCallParameterBuilder().withStrict(Boolean.FALSE).build();
final JsonRpcRequestContext request = ethCallRequest(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(null, Bytes.of().toString());
@@ -444,20 +443,16 @@ public class EthCallTest {
private JsonCallParameter callParameter(
final Wei gasPrice, final Wei maxFeesPerGas, final Wei maxPriorityFeesPerGas) {
return new JsonCallParameter(
Address.fromHexString("0x0"),
Address.fromHexString("0x0"),
0L,
gasPrice,
maxFeesPerGas,
maxPriorityFeesPerGas,
Wei.ZERO,
Bytes.EMPTY,
null,
null,
null,
null,
null);
return new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0x0"))
.withTo(Address.fromHexString("0x0"))
.withGas(0L)
.withGasPrice(gasPrice)
.withMaxFeePerGas(maxFeesPerGas)
.withMaxPriorityFeePerGas(maxPriorityFeesPerGas)
.withValue(Wei.ZERO)
.withInput(Bytes.EMPTY)
.build();
}
private JsonRpcRequestContext ethCallRequest(

50
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthCreateAccessListTest.java
View File

@@ -142,7 +142,7 @@ public class EthCreateAccessListTest {
Assertions.assertThatThrownBy(() -> method.response(request))
.isInstanceOf(InvalidJsonRpcParameters.class)
.hasMessageContaining("gasPrice cannot be used with baseFee or maxFeePerGas");
.hasMessageContaining("gasPrice cannot be used with maxFeePerGas or maxPriorityFeePerGas");
}
@Test
@@ -305,20 +305,15 @@ public class EthCreateAccessListTest {
}
private JsonCallParameter legacyTransactionCallParameter(final Wei gasPrice) {
return new JsonCallParameter(
Address.fromHexString("0x0"),
Address.fromHexString("0x0"),
0L,
gasPrice,
null,
null,
Wei.ZERO,
Bytes.EMPTY,
null,
false,
null,
null,
null);
return new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0x0"))
.withTo(Address.fromHexString("0x0"))
.withGas(0L)
.withGasPrice(gasPrice)
.withValue(Wei.ZERO)
.withInput(Bytes.EMPTY)
.withStrict(Boolean.FALSE)
.build();
}
private CallParameter eip1559TransactionCallParameter() {
@@ -336,20 +331,17 @@ public class EthCreateAccessListTest {
private JsonCallParameter eip1559TransactionCallParameter(
final Optional<Wei> gasPrice, final List<AccessListEntry> accessListEntries) {
return new JsonCallParameter(
Address.fromHexString("0x0"),
Address.fromHexString("0x0"),
null,
gasPrice.orElse(null),
Wei.fromHexString("0x10"),
Wei.fromHexString("0x10"),
Wei.ZERO,
Bytes.EMPTY,
null,
false,
accessListEntries,
null,
null);
return new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0x0"))
.withTo(Address.fromHexString("0x0"))
.withGasPrice(gasPrice.orElse(null))
.withMaxFeePerGas(Wei.fromHexString("0x10"))
.withMaxPriorityFeePerGas(Wei.fromHexString("0x10"))
.withValue(Wei.ZERO)
.withInput(Bytes.EMPTY)
.withStrict(Boolean.FALSE)
.withAccessList(accessListEntries)
.build();
}
private List<AccessListEntry> createAccessList() {

49
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthEstimateGasTest.java
View File

@@ -167,7 +167,7 @@ public class EthEstimateGasTest {
mockTransientProcessorResultGasEstimate(1L, false, false);
Assertions.assertThatThrownBy(() -> method.response(request))
.isInstanceOf(InvalidJsonRpcParameters.class)
.hasMessageContaining("gasPrice cannot be used with baseFee or maxFeePerGas");
.hasMessageContaining("gasPrice cannot be used with maxFeePerGas or maxPriorityFeePerGas");
}
@Test
@@ -465,20 +465,15 @@ public class EthEstimateGasTest {
private JsonCallParameter legacyTransactionCallParameter(
final Wei gasPrice, final boolean isStrict) {
return new JsonCallParameter(
Address.fromHexString("0x0"),
Address.fromHexString("0x0"),
0L,
gasPrice,
null,
null,
Wei.ZERO,
Bytes.EMPTY,
null,
isStrict,
null,
null,
null);
return new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0x0"))
.withTo(Address.fromHexString("0x0"))
.withGas(0L)
.withGasPrice(gasPrice)
.withValue(Wei.ZERO)
.withInput(Bytes.EMPTY)
.withStrict(isStrict)
.build();
}
private CallParameter modifiedLegacyTransactionCallParameter(final Wei gasPrice) {
@@ -499,20 +494,16 @@ public class EthEstimateGasTest {
}
private JsonCallParameter eip1559TransactionCallParameter(final Optional<Wei> gasPrice) {
return new JsonCallParameter(
Address.fromHexString("0x0"),
Address.fromHexString("0x0"),
null,
gasPrice.orElse(null),
Wei.fromHexString("0x10"),
Wei.fromHexString("0x10"),
Wei.ZERO,
Bytes.EMPTY,
null,
false,
null,
null,
null);
return new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0x0"))
.withTo(Address.fromHexString("0x0"))
.withGasPrice(gasPrice.orElse(null))
.withMaxPriorityFeePerGas(Wei.fromHexString("0x10"))
.withMaxFeePerGas(Wei.fromHexString("0x10"))
.withValue(Wei.ZERO)
.withInput(Bytes.EMPTY)
.withStrict(false)
.build();
}
private CallParameter modifiedEip1559TransactionCallParameter() {

80
ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameterTest.java
View File

@@ -15,9 +15,12 @@
package org.hyperledger.besu.ethereum.api.jsonrpc.internal.parameters;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.tuweni.bytes.Bytes;
import org.junit.jupiter.api.Test;
public class JsonCallParameterTest {
@@ -25,7 +28,7 @@ public class JsonCallParameterTest {
private final ObjectMapper objectMapper = new ObjectMapper();
@Test
public void acceptsAndCapMaxValueForGasLimit() throws JsonProcessingException {
public void acceptsAndCapMaxValueForGas() throws JsonProcessingException {
final String json =
"""
{
@@ -37,4 +40,79 @@ public class JsonCallParameterTest {
assertThat(callParameter.getGasLimit()).isEqualTo(Long.MAX_VALUE);
}
@Test
public void dataAsPayLoad() throws JsonProcessingException {
final String json =
"""
{
"data": "0x1234"
}
""";
final JsonCallParameter callParameter = objectMapper.readValue(json, JsonCallParameter.class);
assertThat(callParameter.getPayload()).isEqualTo(Bytes.fromHexString("0x1234"));
}
@Test
public void inputAsPayLoad() throws JsonProcessingException {
final String json =
"""
{
"input": "0x1234"
}
""";
final JsonCallParameter callParameter = objectMapper.readValue(json, JsonCallParameter.class);
assertThat(callParameter.getPayload()).isEqualTo(Bytes.fromHexString("0x1234"));
}
@Test
public void inputAndDataWithSameValueAsPayLoad() throws JsonProcessingException {
final String json =
"""
{
"input": "0x1234",
"data": "0x1234"
}
""";
final JsonCallParameter callParameter = objectMapper.readValue(json, JsonCallParameter.class);
assertThat(callParameter.getPayload()).isEqualTo(Bytes.fromHexString("0x1234"));
}
@Test
public void inputAndDataWithDifferentValueAsPayLoadCauseException() {
final String json =
"""
{
"input": "0x1234",
"data": "0x1235"
}
""";
assertThatExceptionOfType(JsonMappingException.class)
.isThrownBy(() -> objectMapper.readValue(json, JsonCallParameter.class))
.withMessageContaining("problem: Only one of 'input' or 'data' should be provided");
}
@Test
public void extraParametersAreIgnored() throws JsonProcessingException {
// 0x96 = 150
final String json =
"""
{
"gas": "0x96",
"gasLimit": "0xfa",
"extraField": "extra"
}
""";
final JsonCallParameter callParameter = objectMapper.readValue(json, JsonCallParameter.class);
assertThat(callParameter.getGasLimit()).isEqualTo(150);
}
}

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

@@ -75,20 +75,13 @@ public class PrivCallTest {
@Test
public void shouldThrowInvalidJsonRpcParametersExceptionWhenMissingToField() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0x0"),
null,
0L,
Wei.ZERO,
null,
null,
Wei.ZERO,
Bytes.EMPTY,
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0x0"))
.withGas(0L)
.withGasPrice(Wei.ZERO)
.withValue(Wei.ZERO)
.withInput(Bytes.EMPTY)
.build();
final JsonRpcRequestContext request = ethCallRequest(privacyGroupId, callParameter, "latest");
final Throwable thrown = catchThrowable(() -> method.response(request));
@@ -113,20 +106,9 @@ public class PrivCallTest {
@Test
public void shouldAcceptRequestWhenMissingOptionalFields() {
final JsonCallParameter callParameter =
new JsonCallParameter(
null,
Address.fromHexString("0x0"),
null,
null,
null,
null,
null,
null,
null,
null,
null,
null,
null);
new JsonCallParameter.JsonCallParameterBuilder()
.withTo(Address.fromHexString("0x0"))
.build();
final JsonRpcRequestContext request = ethCallRequest(privacyGroupId, callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(null, Bytes.of().toString());
@@ -196,20 +178,14 @@ public class PrivCallTest {
}
private JsonCallParameter callParameter() {
return new JsonCallParameter(
Address.fromHexString("0x0"),
Address.fromHexString("0x0"),
0L,
Wei.ZERO,
null,
null,
Wei.ZERO,
Bytes.EMPTY,
null,
null,
null,
null,
null);
return new JsonCallParameter.JsonCallParameterBuilder()
.withFrom(Address.fromHexString("0x0"))
.withTo(Address.fromHexString("0x0"))
.withGas(0L)
.withGasPrice(Wei.ZERO)
.withValue(Wei.ZERO)
.withInput(Bytes.EMPTY)
.build();
}
private JsonRpcRequestContext ethCallRequest(