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

Update eth call post 1559 #2445

Merged
merged 11 commits into from
Jun 21, 2021
Merged

Update eth call post 1559 #2445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dcc9b84
fix trace nullpointer
matkt Jun 8, 2021
2c63ddc
Merge branch 'master' into fix-trace-nullpointer
matkt Jun 8, 2021
0957f20
update transaction description
matkt Jun 8, 2021
89fc16b
update eth_call for post EIP1559
matkt Jun 16, 2021
796217c
fix pipeline
matkt Jun 17, 2021
da79c32
Merge branch 'master' into feature/eth_call_post-1559
matkt Jun 17, 2021
33596a1
fix issues
matkt Jun 17, 2021
cc92705
Merge branch 'master' into feature/eth_call_post-1559
garyschulte Jun 17, 2021
0257c4a
clean after review
matkt Jun 17, 2021
aae9532
Merge branch 'master' into feature/eth_call_post-1559
matkt Jun 18, 2021
a0121e3
Merge branch 'master' into feature/eth_call_post-1559
garyschulte Jun 21, 2021
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
5 changes: 2 additions & 3 deletions ...ration-test/java/org/hyperledger/besu/ethereum/api/jsonrpc/JsonRpcTestMethodsFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import org.hyperledger.besu.ethereum.core.Block;
import org.hyperledger.besu.ethereum.core.BlockImporter;
import org.hyperledger.besu.ethereum.core.PrivacyParameters;
import org.hyperledger.besu.ethereum.core.ProtocolScheduleFixture;
import org.hyperledger.besu.ethereum.core.Synchronizer;
import org.hyperledger.besu.ethereum.eth.manager.EthPeers;
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPool;
Expand Down Expand Up @@ -76,8 +75,8 @@ public Map<String, JsonRpcMethod> methods() {
final MutableBlockchain blockchain = createInMemoryBlockchain(importer.getGenesisBlock());
final ProtocolContext context = new ProtocolContext(blockchain, stateArchive, null);

final ProtocolSchedule protocolSchedule = importer.getProtocolSchedule();
for (final Block block : importer.getBlocks()) {
final ProtocolSchedule protocolSchedule = importer.getProtocolSchedule();
final ProtocolSpec protocolSpec =
protocolSchedule.getByBlockNumber(block.getHeader().getNumber());
final BlockImporter blockImporter = protocolSpec.getBlockImporter();
Expand Down Expand Up @@ -127,7 +126,7 @@ public Map<String, JsonRpcMethod> methods() {
peerDiscovery,
blockchainQueries,
synchronizer,
ProtocolScheduleFixture.MAINNET,
protocolSchedule,
filterManager,
transactionPool,
miningCoordinator,
Expand Down
138 changes: 137 additions & 1 deletion ...onrpc/methods/EthCallIntegrationTest.java → ...fork/frontier/EthCallIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
Expand Down Expand Up @@ -200,6 +200,142 @@ public void shouldReturnSuccessWithGasPriceTooHighNotStrict() {
assertThat(response).isEqualToComparingFieldByField(expectedResponse);
}

@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);
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcErrorResponse(null, JsonRpcError.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);

final JsonRpcResponse response = method.response(request);

assertThat(response).isEqualToComparingFieldByField(expectedResponse);
}

@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);
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(
null, "0x0000000000000000000000000000000000000000000000000000000000000001");

final JsonRpcResponse response = method.response(request);

assertThat(response).isEqualToComparingFieldByField(expectedResponse);
}

@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);
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcErrorResponse(null, JsonRpcError.TRANSACTION_UPFRONT_COST_EXCEEDS_BALANCE);

final JsonRpcResponse response = method.response(request);

assertThat(response).isEqualToComparingFieldByField(expectedResponse);
}

@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);
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(
null, "0x0000000000000000000000000000000000000000000000000000000000000001");

final JsonRpcResponse response = method.response(request);

assertThat(response).isEqualToComparingFieldByField(expectedResponse);
}

@Test
public void shouldReturnSuccessWithoutGasPriceAndEmptyBalance() {
final JsonCallParameter callParameter =
new JsonCallParameter(
Address.fromHexString("0xdeadbeef00000000000000000000000000000000"),
Address.fromHexString("0x6295ee1b4f6dd65047762f924ecd367c17eabf8f"),
null,
null,
null,
null,
null,
Bytes.fromHexString("0x12a7b914"),
null);
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(
null, "0x0000000000000000000000000000000000000000000000000000000000000001");

final JsonRpcResponse response = method.response(request);

assertThat(response).isEqualToComparingFieldByField(expectedResponse);
}

@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);
final JsonRpcRequestContext request = requestWithParams(callParameter, "latest");
final JsonRpcResponse expectedResponse =
new JsonRpcSuccessResponse(
null, "0x0000000000000000000000000000000000000000000000000000000000000001");

final JsonRpcResponse response = method.response(request);

assertThat(response).isEqualToComparingFieldByField(expectedResponse);
}

@Test
public void shouldReturnEmptyHashResultForCallWithOnlyToField() {
final JsonCallParameter callParameter =
Expand Down
2 changes: 1 addition & 1 deletion ...ethods/EthEstimateGasIntegrationTest.java → ...ontier/EthEstimateGasIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;

import static org.assertj.core.api.Assertions.assertThat;

Expand Down
2 changes: 1 addition & 1 deletion ...ods/EthGetBlockByHashIntegrationTest.java → ...ier/EthGetBlockByHashIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;

import static org.assertj.core.api.Assertions.assertThat;

Expand Down
2 changes: 1 addition & 1 deletion ...s/EthGetBlockByNumberIntegrationTest.java → ...r/EthGetBlockByNumberIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.catchThrowable;
Expand Down
2 changes: 1 addition & 1 deletion ...s/EthGetFilterChangesIntegrationTest.java → ...r/EthGetFilterChangesIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;

import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
Expand Down
2 changes: 1 addition & 1 deletion ...leByBlockHashAndIndexIntegrationTest.java → ...leByBlockHashAndIndexIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;

import static org.assertj.core.api.Assertions.assertThat;

Expand Down
2 changes: 1 addition & 1 deletion ...ByBlockNumberAndIndexIntegrationTest.java → ...ByBlockNumberAndIndexIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;

import static org.assertj.core.api.Assertions.assertThat;

Expand Down
2 changes: 1 addition & 1 deletion ...GetPrivateTransactionIntegrationTest.java → ...GetPrivateTransactionIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
package org.hyperledger.besu.ethereum.api.jsonrpc.methods;
package org.hyperledger.besu.ethereum.api.jsonrpc.methods.fork.frontier;

import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThat;
Expand Down
Loading