From 93a6ff98aaaf28ed656893aff01682c7da388b62 Mon Sep 17 00:00:00 2001 From: "lukebrich.eth" Date: Mon, 10 Jul 2023 06:12:45 -0400 Subject: [PATCH] feat: enforce txpool propagation setting (#3677) Co-authored-by: Matthias Seitz --- crates/transaction-pool/src/pool/mod.rs | 4 ++-- crates/transaction-pool/src/pool/txpool.rs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/crates/transaction-pool/src/pool/mod.rs b/crates/transaction-pool/src/pool/mod.rs index 5ae0147d64..e7f167c82a 100644 --- a/crates/transaction-pool/src/pool/mod.rs +++ b/crates/transaction-pool/src/pool/mod.rs @@ -232,13 +232,13 @@ where /// Returns hashes of _all_ transactions in the pool. pub(crate) fn pooled_transactions_hashes(&self) -> Vec { let pool = self.pool.read(); - pool.all().hashes_iter().collect() + pool.all().transactions_iter().filter(|tx| tx.propagate).map(|tx| *tx.hash()).collect() } /// Returns _all_ transactions in the pool. pub(crate) fn pooled_transactions(&self) -> Vec>> { let pool = self.pool.read(); - pool.all().transactions_iter().collect() + pool.all().transactions_iter().filter(|tx| tx.propagate).collect() } /// Updates the entire pool after a new block was executed. diff --git a/crates/transaction-pool/src/pool/txpool.rs b/crates/transaction-pool/src/pool/txpool.rs index 71b5590a68..9793da32a3 100644 --- a/crates/transaction-pool/src/pool/txpool.rs +++ b/crates/transaction-pool/src/pool/txpool.rs @@ -637,6 +637,7 @@ impl AllTransactions { } /// Returns an iterator over all _unique_ hashes in the pool + #[allow(unused)] pub(crate) fn hashes_iter(&self) -> impl Iterator + '_ { self.by_hash.keys().copied() }