Skip to content

fix: check request gas limit before #18639

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

Merged
mattsse merged 1 commit into from
Sep 23, 2025
Merged

fix: check request gas limit before #18639

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions crates/rpc/rpc-eth-api/src/helpers/call.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,9 @@ pub trait Call:
DB: Database + DatabaseCommit + OverrideBlockHashes,
EthApiError: From<<DB as Database>::Error>,
{
// track whether the request has a gas limit set
let request_has_gas_limit = request.as_ref().gas_limit().is_some();

if let Some(requested_gas) = request.as_ref().gas_limit() {
let global_gas_cap = self.call_gas_limit();
if global_gas_cap != 0 && global_gas_cap < requested_gas {
Expand Down Expand Up @@ -800,15 +803,14 @@ pub trait Call:
.map_err(EthApiError::from_state_overrides_err)?;
}

let request_gas = request.as_ref().gas_limit();
let mut tx_env = self.create_txn_env(&evm_env, request, &mut *db)?;

// lower the basefee to 0 to avoid breaking EVM invariants (basefee < gasprice): <https://github.com/ethereum/go-ethereum/blob/355228b011ef9a85ebc0f21e7196f892038d49f0/internal/ethapi/api.go#L700-L704>
if tx_env.gas_price() == 0 {
evm_env.block_env.basefee = 0;
}

if request_gas.is_none() {
if !request_has_gas_limit {
// No gas limit was provided in the request, so we need to cap the transaction gas limit
if tx_env.gas_price() > 0 {
// If gas price is specified, cap transaction gas limit with caller allowance
Expand Down