jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: relax eth pooled tx (#13271)

Browse Source
This commit is contained in:
Matthias Seitz
2024-12-12 13:31:44 +01:00
committed by GitHub
parent efd090dc9e
commit 3f55071f62
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
crates/transaction-pool/src/traits.rs
View File

@ -1179,9 +1179,9 @@ pub trait EthPoolTransaction: PoolTransaction {
/// This type is essentially a wrapper around [`RecoveredTx`] with additional
/// fields derived from the transaction that are frequently used by the pools for ordering.
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct EthPooledTransaction<T = RecoveredTx> {
pub struct EthPooledTransaction<T = TransactionSigned> {
/// `EcRecovered` transaction, the consensus format.
pub(crate) transaction: T,
pub(crate) transaction: RecoveredTx<T>,
/// For EIP-1559 transactions: `max_fee_per_gas * gas_limit + tx_value`.
/// For legacy transactions: `gas_price * gas_limit + tx_value`.
@ -1197,23 +1197,25 @@ pub struct EthPooledTransaction<T = RecoveredTx> {
pub(crate) blob_sidecar: EthBlobTransactionSidecar,
}
impl EthPooledTransaction {
impl<T: SignedTransaction> EthPooledTransaction<T> {
/// Create new instance of [Self].
///
/// Caution: In case of blob transactions, this does marks the blob sidecar as
/// [`EthBlobTransactionSidecar::Missing`]
pub fn new(transaction: RecoveredTx, encoded_length: usize) -> Self {
pub fn new(transaction: RecoveredTx<T>, encoded_length: usize) -> Self {
let mut blob_sidecar = EthBlobTransactionSidecar::None;
let gas_cost = U256::from(transaction.transaction.max_fee_per_gas())
.saturating_mul(U256::from(transaction.transaction.gas_limit()));
let gas_cost = U256::from(transaction.max_fee_per_gas())
.saturating_mul(U256::from(transaction.gas_limit()));
let mut cost = gas_cost.saturating_add(transaction.value());
if let Some(blob_tx) = transaction.as_eip4844() {
if let (Some(blob_gas_used), Some(max_fee_per_blob_gas)) =
(transaction.blob_gas_used(), transaction.max_fee_per_blob_gas())
{
// Add max blob cost using saturating math to avoid overflow
cost = cost.saturating_add(U256::from(
blob_tx.max_fee_per_blob_gas.saturating_mul(blob_tx.blob_gas() as u128),
max_fee_per_blob_gas.saturating_mul(blob_gas_used as u128),
));
// because the blob sidecar is not included in this transaction variant, mark it as
@ -1225,7 +1227,7 @@ impl EthPooledTransaction {
}
/// Return the reference to the underlying transaction.
pub const fn transaction(&self) -> &RecoveredTx {
pub const fn transaction(&self) -> &RecoveredTx<T> {
&self.transaction
}
}