Skip to content

Pass details on GasTooHigh #5489

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 3 commits into from
Aug 1, 2023
Merged

Pass details on GasTooHigh #5489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17773eb
Pass details on GasTooHigh
fffffffgggggggggd Jul 27, 2023
0d96bf2
Update anvil/src/eth/backend/mem/mod.rs
Evalir Aug 1, 2023
0d85e12
chore: fmt/clippy
Evalir Aug 1, 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
7 changes: 4 additions & 3 deletions anvil/src/eth/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2053,7 +2053,7 @@ impl EthApi {

// Exceptional case: init used too much gas, we need to increase the gas limit and try
// again
if let Err(BlockchainError::InvalidTransaction(InvalidTransactionError::GasTooHigh)) =
if let Err(BlockchainError::InvalidTransaction(InvalidTransactionError::GasTooHigh(_))) =
ethres
{
// if price or limit was included in the request then we can execute the request
Expand Down Expand Up @@ -2125,8 +2125,9 @@ impl EthApi {

// Exceptional case: init used too much gas, we need to increase the gas limit and try
// again
if let Err(BlockchainError::InvalidTransaction(InvalidTransactionError::GasTooHigh)) =
ethres
if let Err(BlockchainError::InvalidTransaction(InvalidTransactionError::GasTooHigh(
_,
))) = ethres
{
// increase the lowest gas limit
lowest_gas_limit = mid_gas_limit;
Expand Down
6 changes: 4 additions & 2 deletions anvil/src/eth/backend/mem/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use crate::{
time::{utc_from_secs, TimeManager},
validate::TransactionValidator,
},
error::{BlockchainError, InvalidTransactionError},
error::{BlockchainError, ErrDetail, InvalidTransactionError},
fees::{FeeDetails, FeeManager},
macros::node_info,
pool::transactions::PoolTransaction,
Expand Down Expand Up @@ -2180,7 +2180,9 @@ impl TransactionValidator for Backend {
// Check gas limit, iff block gas limit is set.
if !env.cfg.disable_block_gas_limit && tx.gas_limit() > env.block.gas_limit.into() {
warn!(target: "backend", "[{:?}] gas too high", tx.hash());
return Err(InvalidTransactionError::GasTooHigh)
return Err(InvalidTransactionError::GasTooHigh(ErrDetail {
detail: String::from("tx.gas_limit > env.block.gas_limit"),
}))
}

// check nonce
Expand Down
31 changes: 26 additions & 5 deletions anvil/src/eth/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ pub enum FeeHistoryError {
InvalidBlockRange,
}

#[derive(Debug)]
pub struct ErrDetail {
pub detail: String,
}

/// An error due to invalid transaction
#[derive(thiserror::Error, Debug)]
pub enum InvalidTransactionError {
Expand Down Expand Up @@ -150,8 +155,8 @@ pub enum InvalidTransactionError {
#[error("intrinsic gas too low")]
GasTooLow,
/// returned if the transaction gas exceeds the limit
#[error("intrinsic gas too high")]
GasTooHigh,
#[error("intrinsic gas too high -- {}",.0.detail)]
GasTooHigh(ErrDetail),
Copy link
Member

@Evalir Evalir Jul 29, 2023

Choose a reason for hiding this comment

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

Hmm, i think we could have just a String here—if we wanna name it a bit more fancily we can just make a type like type GasErrorDetail = String;.

/// Thrown to ensure no one is able to specify a transaction with a tip higher than the total
/// fee cap.
#[error("max priority fee per gas higher than max fee per gas")]
Expand Down Expand Up @@ -185,8 +190,16 @@ impl From<revm::primitives::InvalidTransaction> for InvalidTransactionError {
InvalidTransactionError::TipAboveFeeCap
}
InvalidTransaction::GasPriceLessThanBasefee => InvalidTransactionError::FeeCapTooLow,
InvalidTransaction::CallerGasLimitMoreThanBlock => InvalidTransactionError::GasTooHigh,
InvalidTransaction::CallGasCostMoreThanGasLimit => InvalidTransactionError::GasTooHigh,
InvalidTransaction::CallerGasLimitMoreThanBlock => {
InvalidTransactionError::GasTooHigh(ErrDetail {
detail: String::from("CallerGasLimitMoreThanBlock"),
})
}
InvalidTransaction::CallGasCostMoreThanGasLimit => {
InvalidTransactionError::GasTooHigh(ErrDetail {
detail: String::from("CallGasCostMoreThanGasLimit"),
})
}
InvalidTransaction::RejectCallerWithCode => InvalidTransactionError::SenderNoEOA,
InvalidTransaction::LackOfFundForGasLimit { .. } => {
InvalidTransactionError::InsufficientFunds
Expand Down Expand Up @@ -272,7 +285,15 @@ impl<T: Serialize> ToRpcResponseResult for Result<T> {
data: serde_json::to_value(data).ok(),
}
}
InvalidTransactionError::GasTooLow | InvalidTransactionError::GasTooHigh => {
InvalidTransactionError::GasTooLow => {
// <https://eips.ethereum.org/EIPS/eip-1898>
RpcError {
code: ErrorCode::ServerError(-32000),
message: err.to_string().into(),
data: None,
}
}
InvalidTransactionError::GasTooHigh(_) => {
// <https://eips.ethereum.org/EIPS/eip-1898>
RpcError {
code: ErrorCode::ServerError(-32000),
Expand Down