Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RPC Parameters to accept input and data field #6094

Merged
merged 9 commits into from
Oct 27, 2023
Merged

RPC Parameters to accept input and data field #6094

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9014fa4
Accept input or data as payload for RPC calls
gfukushima Oct 26, 2023
34bb2f4
Add json new rpc valid and invalid request to test the changes
gfukushima Oct 26, 2023
1c9fae3
Merge branch 'main' into rpc_with_input_field
gfukushima Oct 26, 2023
bb2b8a4
Merge branch 'main' into rpc_with_input_field
gfukushima Oct 27, 2023
8d5fd5d
Change JsonCallParameter signature to avoid duplicating constructor
gfukushima Oct 27, 2023
62d5846
Merge remote-tracking branch 'origin/rpc_with_input_field' into rpc_w…
gfukushima Oct 27, 2023
20c5eaa
Merge branch 'main' into rpc_with_input_field
gfukushima Oct 27, 2023
24e4cf9
Add changelog
gfukushima Oct 27, 2023
0af765d
Merge remote-tracking branch 'origin/rpc_with_input_field' into rpc_w…
gfukushima Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 35 additions & 3 deletions ...java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/parameters/JsonCallParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,31 @@ public class JsonCallParameter extends CallParameter {

private final Optional<Boolean> strict;

public JsonCallParameter(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this used anywhere outside of tests? Can we just rip the band-aid off and migrate to the new signaure? IntelliJ has a tool for this Refactor>Change Signature... (command/alt F6)

Copy link
Contributor Author

@gfukushima gfukushima Oct 27, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only used in tests, changing class to only use a single constructor. thanks for the feedback.

@JsonProperty("from") final Address from,
@JsonProperty("to") final Address to,
@JsonDeserialize(using = HexLongDeserializer.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,
@JsonProperty("strict") final Boolean strict,
@JsonProperty("accessList") final List<AccessListEntry> accessList) {
this(
from,
to,
gasLimit,
gasPrice,
maxPriorityFeePerGas,
maxFeePerGas,
value,
data,
null,
strict,
accessList);
}

@JsonCreator
public JsonCallParameter(
@JsonProperty("from") final Address from,
Expand All @@ -49,10 +74,12 @@ public JsonCallParameter(
@JsonProperty("maxPriorityFeePerGas") final Wei maxPriorityFeePerGas,
@JsonProperty("maxFeePerGas") final Wei maxFeePerGas,
@JsonProperty("value") final Wei value,
@JsonDeserialize(using = HexStringDeserializer.class) @JsonProperty("data")
final Bytes payload,
@JsonDeserialize(using = HexStringDeserializer.class) @JsonProperty("input")
final Bytes input,
@JsonDeserialize(using = HexStringDeserializer.class) @JsonProperty("data") final Bytes data,
@JsonProperty("strict") final Boolean strict,
@JsonProperty("accessList") final List<AccessListEntry> accessList) {

super(
from,
to,
Expand All @@ -61,8 +88,13 @@ public JsonCallParameter(
Optional.ofNullable(maxPriorityFeePerGas),
Optional.ofNullable(maxFeePerGas),
value,
payload,
Optional.ofNullable(input != null ? input : data).orElse(null),
Optional.ofNullable(accessList));

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

this.strict = Optional.ofNullable(strict);
}

Expand Down
25 changes: 25 additions & 0 deletions .../hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_invalidWithInputAndDataAttribute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"request": {
"id": 3,
"jsonrpc": "2.0",
"method": "eth_call",
"params": [
{
"to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
"from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"input": "0x12a7b914",
"data": "0x12a7b914"
},
"0x19"
]
},
"response": {
"jsonrpc": "2.0",
"id": 3,
"error" : {
"code" : -32602,
"message" : "Invalid params"
}
},
"statusCode": 200
}
21 changes: 21 additions & 0 deletions .../resources/org/hyperledger/besu/ethereum/api/jsonrpc/eth/eth_call_withInputAttribute.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"request": {
"id": 3,
"jsonrpc": "2.0",
"method": "eth_call",
"params": [
{
"to": "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f",
"from": "a94f5374fce5edbc8e2a8697c15331677e6ebf0b",
"input": "0x12a7b914"
},
"0x19"
]
},
"response": {
"jsonrpc": "2.0",
"id": 3,
"result": "0x0000000000000000000000000000000000000000000000000000000000000001"
},
"statusCode": 200
}
Loading