Skip to content

chore: removed is_eip1559 boolean flag #5534

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

chore: removed is_eip1559 boolean flag #5534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30bd06e
chore: removed is_eip1559 flag
andyrobert3 Aug 3, 2023
cf7a3fb
chore: set eip1559 fields to "None" if not EIP1559 type
andyrobert3 Aug 3, 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
3 changes: 0 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 @@ -958,7 +958,6 @@ impl EthApi {
pending.transaction,
None,
None,
true,
Some(self.backend.base_fee()),
);
// we set the from field here explicitly to the set sender of the pending transaction,
Expand Down Expand Up @@ -1883,7 +1882,6 @@ impl EthApi {
tx.pending_transaction.transaction.clone(),
None,
None,
true,
None,
);

Expand Down Expand Up @@ -2231,7 +2229,6 @@ impl EthApi {
tx,
Some(&block),
Some(info),
true,
Some(base_fee),
);
block_transactions.push(tx);
Expand Down
7 changes: 2 additions & 5 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 @@ -1360,7 +1360,7 @@ impl Backend {
let info = storage.transactions.get(&hash)?.info.clone();
let tx = block.transactions.get(info.transaction_index as usize)?.clone();

let tx = transaction_build(Some(hash), tx, Some(block), Some(info), true, base_fee);
let tx = transaction_build(Some(hash), tx, Some(block), Some(info), base_fee);
transactions.push(tx);
}
Some(transactions)
Expand Down Expand Up @@ -1978,7 +1978,6 @@ impl Backend {
tx,
Some(&block),
Some(info),
true,
block.header.base_fee_per_gas,
))
}
Expand Down Expand Up @@ -2014,7 +2013,6 @@ impl Backend {
tx,
Some(&block),
Some(info),
true,
block.header.base_fee_per_gas,
))
}
Expand Down Expand Up @@ -2238,7 +2236,6 @@ pub fn transaction_build(
eth_transaction: MaybeImpersonatedTransaction,
block: Option<&Block>,
info: Option<TransactionInfo>,
is_eip1559: bool,
base_fee: Option<U256>,
) -> Transaction {
let mut transaction: Transaction = eth_transaction.clone().into();
Expand All @@ -2257,7 +2254,7 @@ pub fn transaction_build(
base_fee.checked_add(max_priority_fee_per_gas).unwrap_or_else(U256::max_value),
);
}
} else if !is_eip1559 {
} else {
transaction.max_fee_per_gas = None;
transaction.max_priority_fee_per_gas = None;
transaction.transaction_type = None;
Expand Down