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

dev: track invalid transactions by sender in pool (#12138)

Browse Source
This commit is contained in:
greged93
2024-10-29 00:51:20 +01:00
committed by GitHub
parent 367eb44177
commit 462157880c
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
crates/transaction-pool/src/pool/best.rs
View File

@ -1,14 +1,14 @@
use crate::{
identifier::TransactionId, pool::pending::PendingTransaction, PoolTransaction,
TransactionOrdering, ValidPoolTransaction,
identifier::{SenderId, TransactionId},
pool::pending::PendingTransaction,
PoolTransaction, TransactionOrdering, ValidPoolTransaction,
};
use alloy_primitives::{Address, B256 as TxHash};
use alloy_primitives::Address;
use core::fmt;
use std::{
collections::{BTreeMap, BTreeSet, HashSet, VecDeque},
sync::Arc,
};
use tokio::sync::broadcast::{error::TryRecvError, Receiver};
use tracing::debug;
@ -80,7 +80,7 @@ pub(crate) struct BestTransactions<T: TransactionOrdering> {
/// then can be moved from the `all` set to the `independent` set.
pub(crate) independent: BTreeSet<PendingTransaction<T>>,
/// There might be the case where a yielded transactions is invalid, this will track it.
pub(crate) invalid: HashSet<TxHash>,
pub(crate) invalid: HashSet<SenderId>,
/// Used to receive any new pending transactions that have been added to the pool after this
/// iterator was static fileted
///
@ -94,7 +94,7 @@ pub(crate) struct BestTransactions<T: TransactionOrdering> {
impl<T: TransactionOrdering> BestTransactions<T> {
/// Mark the transaction and it's descendants as invalid.
pub(crate) fn mark_invalid(&mut self, tx: &Arc<ValidPoolTransaction<T::Transaction>>) {
self.invalid.insert(*tx.hash());
self.invalid.insert(tx.sender_id());
}
/// Returns the ancestor the given transaction, the transaction with `nonce - 1`.
@ -168,14 +168,14 @@ impl<T: TransactionOrdering> Iterator for BestTransactions<T> {
self.add_new_transactions();
// Remove the next independent tx with the highest priority
let best = self.independent.pop_last()?;
let hash = best.transaction.hash();
let sender_id = best.transaction.sender_id();
// skip transactions that were marked as invalid
if self.invalid.contains(hash) {
// skip transactions for which sender was marked as invalid
if self.invalid.contains(&sender_id) {
debug!(
target: "txpool",
"[{:?}] skipping invalid transaction",
hash
best.transaction.hash()
);
continue
}
@ -186,7 +186,7 @@ impl<T: TransactionOrdering> Iterator for BestTransactions<T> {
}
if self.skip_blobs && best.transaction.transaction.is_eip4844() {
// blobs should be skipped, marking the as invalid will ensure that no dependent
// blobs should be skipped, marking them as invalid will ensure that no dependent
// transactions are returned
self.mark_invalid(&best.transaction)
} else {