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

Jump to bottom

Allow API configuration to override supplied gasLimit #6978

Merged
merged 5 commits into from May 1, 2024
Merged

Allow API configuration to override supplied gasLimit #6978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7e33b1
allow gasLimit configuration for transaction simulation
matkt Apr 17, 2024
c3e9cf3
revise unit test to reflect new behavior of rpcGasCap
garyschulte Apr 22, 2024
cbf457c
Merge branch 'main' into feature/configurable-simulation-tx-gas-limit
garyschulte Apr 30, 2024
3cb8dcf
Merge branch 'main' into feature/configurable-simulation-tx-gas-limit
garyschulte May 1, 2024
d8cac98
Merge branch 'main' into feature/configurable-simulation-tx-gas-limit
garyschulte May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 2 additions & 5 deletions ...um/core/src/main/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulator.java
View file
Open in desktop
Expand Up @@ -235,11 +235,8 @@ public Optional<TransactionSimulatorResult> processWithWorldUpdater(
? callParams.getGasLimit()
: blockHeaderToProcess.getGasLimit();
if (rpcGasCap > 0) {
final long gasCap = rpcGasCap;
if (gasCap < gasLimit) {
gasLimit = gasCap;
LOG.info("Capping gasLimit to " + gasCap);
}
gasLimit = rpcGasCap;
LOG.info("Capping gasLimit to " + rpcGasCap);
Copy link
Contributor

Choose a reason for hiding this comment

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

so no longer comparing gasCap to gasLimit, just if > zero?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, it is essentially an override value from the cli. @matkt can speak to the specifics about why we would raise the cap beyond the requested limit, but I think it has something to do with simulating transactions that will exceed the anticipated gas, but not exceed some predefined hard cap (DoS vector).

Copy link
Contributor

Choose a reason for hiding this comment

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

yes it is need in order to allow user setting a high gasLimit for ethcall

}
final Wei value = callParams.getValue() != null ? callParams.getValue() : Wei.ZERO;
final Bytes payload = callParams.getPayload() != null ? callParams.getPayload() : Bytes.EMPTY;
Expand Down
6 changes: 4 additions & 2 deletions ...ore/src/test/java/org/hyperledger/besu/ethereum/transaction/TransactionSimulatorTest.java
View file
Open in desktop
Expand Up @@ -565,8 +565,9 @@ public void shouldCapGasLimitWhenOriginalTransactionExceedsGasCap() {
}

@Test
public void shouldKeepOriginalGasLimitWhenCapIsHigherThanOriginalValue() {
// generate a transaction with a gas limit that is lower than the gas cap
public void shouldUseRpcGasCapWhenCapIsHigherThanGasLimit() {
Copy link
Contributor

Choose a reason for hiding this comment

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

what if cap is lower than gasLimit

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah, this test can really just be renamed to something like "when present rpc gas cap supersedes request gas limit"

// generate a transaction with a gas limit that is lower than the gas cap,
// expect the gas cap to override parameter gas limit
final CallParameter callParameter =
eip1559TransactionCallParameter(Wei.ZERO, Wei.ZERO, GASCAP - 1);

Expand All @@ -589,6 +590,7 @@ public void shouldKeepOriginalGasLimitWhenCapIsHigherThanOriginalValue() {
.value(callParameter.getValue())
.payload(callParameter.getPayload())
.signature(FAKE_SIGNATURE)
.gasLimit(GASCAP)
.build();

// call process with original transaction
Expand Down