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

fix: deduplicate validate_initial_tx_gas API #2006

Merged
merged 2 commits into from
Jan 21, 2025
Merged

fix: deduplicate validate_initial_tx_gas API #2006

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c6499b
fix: deduplicate validate_initial_tx_gas API
Wodann Jan 14, 2025
fee24bc
misc: apply review suggestions
Wodann Jan 20, 2025
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
23 changes: 11 additions & 12 deletions crates/handler/src/validation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,10 @@ where
context: &Self::Context,
) -> Result<InitialAndFloorGas, Self::Error> {
let spec = context.cfg().spec().into();
validate_initial_tx_gas::<&Self::Context, InvalidTransaction>(context, spec)
.map_err(Into::into)
let initial_and_floor_gas =
validate_initial_tx_gas(context.tx(), spec).map_err(InvalidTransaction::from)?;

Ok(initial_and_floor_gas)
}
}

Expand Down Expand Up @@ -333,16 +335,13 @@ where
}

/// Validate initial transaction gas.
pub fn validate_initial_tx_gas<CTX, Error>(
context: CTX,
pub fn validate_initial_tx_gas<TransactionT>(
tx: TransactionT,
spec_id: SpecId,
) -> Result<InitialAndFloorGas, Error>
) -> Result<InitialAndFloorGas, InvalidTransaction>
where
CTX: TransactionGetter + CfgGetter,
Error: From<InvalidTransaction>,
TransactionT: Transaction,
{
let spec = context.cfg().spec().into();
let tx = context.tx();
let (accounts, storages) = tx.access_list_nums().unwrap_or_default();

let gas = gas::calculate_initial_tx_gas(
Expand All @@ -356,13 +355,13 @@ where

// Additional check to see if limit is big enough to cover initial gas.
if gas.initial_gas > tx.gas_limit() {
return Err(InvalidTransaction::CallGasCostMoreThanGasLimit.into());
return Err(InvalidTransaction::CallGasCostMoreThanGasLimit);
}

// EIP-7623: Increase calldata cost
// floor gas should be less than gas limit.
if spec.is_enabled_in(SpecId::PRAGUE) && gas.floor_gas > tx.gas_limit() {
return Err(InvalidTransaction::GasFloorMoreThanGasLimit.into());
if spec_id.is_enabled_in(SpecId::PRAGUE) && gas.floor_gas > tx.gas_limit() {
return Err(InvalidTransaction::GasFloorMoreThanGasLimit);
};

Ok(gas)
Expand Down
Loading