Skip to content

fix: add is dynamic fee fn #5546

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
Aug 5, 2023
Merged

fix: add is dynamic fee fn #5546

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions anvil/core/src/eth/transaction/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,11 @@ pub enum TypedTransaction {
// == impl TypedTransaction ==

impl TypedTransaction {
/// Returns true if the transaction uses dynamic fees: EIP1559
pub fn is_dynamic_fee(&self) -> bool {
matches!(self, TypedTransaction::EIP1559(_))
}

pub fn gas_price(&self) -> U256 {
match self {
TypedTransaction::Legacy(tx) => tx.gas_price,
Expand Down
3 changes: 1 addition & 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 @@ -2247,7 +2247,7 @@ pub fn transaction_build(
) -> Transaction {
let mut transaction: Transaction = eth_transaction.clone().into();

if let TypedTransaction::EIP1559(_) = eth_transaction.as_ref() {
if eth_transaction.is_dynamic_fee() {
Copy link
Member

@Evalir Evalir Aug 5, 2023

Choose a reason for hiding this comment

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

right, this properly "inverts" the check that used to happen below with !is_eip1559

if block.is_none() && info.is_none() {
// transaction is not mined yet, gas price is considered just `max_fee_per_gas`
transaction.gas_price = transaction.max_fee_per_gas;
Expand All @@ -2264,7 +2264,6 @@ pub fn transaction_build(
} else {
transaction.max_fee_per_gas = None;
transaction.max_priority_fee_per_gas = None;
transaction.transaction_type = None;
}

transaction.block_hash =
Expand Down