From 48dc9987a16f014535ec4adb605f861431f2a141 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Wed, 12 Apr 2023 17:53:52 +0200 Subject: [PATCH] chore: use cost in error (#2213) Co-authored-by: Roman Krasiuk --- crates/primitives/src/transaction/error.rs | 4 ++-- crates/transaction-pool/src/validate.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/primitives/src/transaction/error.rs b/crates/primitives/src/transaction/error.rs index 649ecbe36b..0062e68b98 100644 --- a/crates/primitives/src/transaction/error.rs +++ b/crates/primitives/src/transaction/error.rs @@ -7,8 +7,8 @@ use crate::U256; pub enum InvalidTransactionError { #[error("Transaction eip1559 priority fee is more then max fee.")] PriorityFeeMoreThenMaxFee, - #[error("Account does not have enough funds ({available_funds:?}) to cover transaction max fee: {max_fee:?}.")] - InsufficientFunds { max_fee: u128, available_funds: U256 }, + #[error("Account does not have enough funds ({available_funds:?}) to cover transaction cost: {cost:?}.")] + InsufficientFunds { cost: U256, available_funds: U256 }, #[error("Transaction nonce is not consistent.")] NonceNotConsistent, #[error("Old legacy transaction before Spurious Dragon should not have chain_id.")] diff --git a/crates/transaction-pool/src/validate.rs b/crates/transaction-pool/src/validate.rs index 67f986cea4..09587be116 100644 --- a/crates/transaction-pool/src/validate.rs +++ b/crates/transaction-pool/src/validate.rs @@ -257,11 +257,11 @@ where // Checks for max cost if transaction.cost() > account.balance { - let max_fee = transaction.max_fee_per_gas().unwrap_or_default(); + let cost = transaction.cost(); return TransactionValidationOutcome::Invalid( transaction, InvalidTransactionError::InsufficientFunds { - max_fee, + cost, available_funds: account.balance, } .into(),