diff --git a/substrate/client/transaction-pool/graph/src/base_pool.rs b/substrate/client/transaction-pool/graph/src/base_pool.rs
index a683741aa4076e8bd2f112d027cb4034c5d8a935..ed2a5e2f6c205875d0461ca1d82a3bf39fe0b0f4 100644
--- a/substrate/client/transaction-pool/graph/src/base_pool.rs
+++ b/substrate/client/transaction-pool/graph/src/base_pool.rs
@@ -341,7 +341,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
if removed.iter().any(|tx| tx.hash == hash) {
// We still need to remove all transactions that we promoted
// since they depend on each other and will never get to the best iterator.
- self.ready.remove_invalid(&promoted);
+ self.ready.remove_subtree(&promoted);
debug!(target: "txpool", "[{:?}] Cycle detected, bailing.", hash);
return Err(error::Error::CycleDetected)
@@ -403,7 +403,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
});
if let Some(minimal) = minimal {
- removed.append(&mut self.remove_invalid(&[minimal.transaction.hash.clone()]))
+ removed.append(&mut self.remove_subtree(&[minimal.transaction.hash.clone()]))
} else {
break;
}
@@ -423,7 +423,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
});
if let Some(minimal) = minimal {
- removed.append(&mut self.remove_invalid(&[minimal.transaction.hash.clone()]))
+ removed.append(&mut self.remove_subtree(&[minimal.transaction.hash.clone()]))
} else {
break;
}
@@ -440,8 +440,8 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
/// they were part of a chain, you may attempt to re-import them later.
/// NOTE If you want to remove ready transactions that were already used
/// and you don't want them to be stored in the pool use `prune_tags` method.
- pub fn remove_invalid(&mut self, hashes: &[Hash]) -> Vec<Arc<Transaction<Hash, Ex>>> {
- let mut removed = self.ready.remove_invalid(hashes);
+ pub fn remove_subtree(&mut self, hashes: &[Hash]) -> Vec<Arc<Transaction<Hash, Ex>>> {
+ let mut removed = self.ready.remove_subtree(hashes);
removed.extend(self.future.remove(hashes));
removed
}
@@ -454,7 +454,7 @@ impl<Hash: hash::Hash + Member + Serialize, Ex: std::fmt::Debug> BasePool<Hash,
/// Prunes transactions that provide given list of tags.
///
/// This will cause all transactions that provide these tags to be removed from the pool,
- /// but unlike `remove_invalid`, dependent transactions are not touched.
+ /// but unlike `remove_subtree`, dependent transactions are not touched.
/// Additional transactions from future queue might be promoted to ready if you satisfy tags
/// that the pool didn't previously know about.
pub fn prune_tags(&mut self, tags: impl IntoIterator<Item=Tag>) -> PruneStatus<Hash, Ex> {
@@ -905,7 +905,7 @@ mod tests {
assert_eq!(pool.future.len(), 1);
// when
- pool.remove_invalid(&[6, 1]);
+ pool.remove_subtree(&[6, 1]);
// then
assert_eq!(pool.ready().count(), 1);
diff --git a/substrate/client/transaction-pool/graph/src/pool.rs b/substrate/client/transaction-pool/graph/src/pool.rs
index d40942c5e9365db5a4fe898f3b746a58899d5c57..7d91ebaf4a71eefca2da5aa37730c8969409907d 100644
--- a/substrate/client/transaction-pool/graph/src/pool.rs
+++ b/substrate/client/transaction-pool/graph/src/pool.rs
@@ -283,7 +283,7 @@ impl<B: ChainApi> Pool<B> {
tags: impl IntoIterator<Item=Tag>,
known_imported_hashes: impl IntoIterator<Item=ExHash<B>> + Clone,
) -> impl Future<Output=Result<(), B::Error>> {
- log::trace!(target: "txpool", "Pruning at {:?}", at);
+ log::debug!(target: "txpool", "Pruning at {:?}", at);
// Prune all transactions that provide given tags
let prune_status = match self.validated_pool.prune_tags(tags) {
Ok(prune_status) => prune_status,
@@ -317,7 +317,7 @@ impl<B: ChainApi> Pool<B> {
}
/// Return an event stream of notifications for when transactions are imported to the pool.
- ///
+ ///
/// Consumers of this stream should use the `ready` method to actually get the
/// pending transactions in the right order.
pub fn import_notification_stream(&self) -> EventStream {
@@ -329,7 +329,7 @@ impl<B: ChainApi> Pool<B> {
self.validated_pool.on_broadcasted(propagated)
}
- /// Remove from the pool.
+ /// Remove invalid transactions from the pool.
pub fn remove_invalid(&self, hashes: &[ExHash<B>]) -> Vec<TransactionFor<B>> {
self.validated_pool.remove_invalid(hashes)
}
diff --git a/substrate/client/transaction-pool/graph/src/ready.rs b/substrate/client/transaction-pool/graph/src/ready.rs
index 3684572bd0233afc98b2e270c4104fb1756ba19e..81c370625c2f369b952aa51793cf9bb4b65cba1c 100644
--- a/substrate/client/transaction-pool/graph/src/ready.rs
+++ b/substrate/client/transaction-pool/graph/src/ready.rs
@@ -230,12 +230,12 @@ impl<Hash: hash::Hash + Member + Serialize, Ex> ReadyTransactions<Hash, Ex> {
}).collect()
}
- /// Removes invalid transactions from the ready pool.
+ /// Removes a subtree of transactions from the ready pool.
///
/// NOTE removing a transaction will also cause a removal of all transactions that depend on that one
/// (i.e. the entire subgraph that this transaction is a start of will be removed).
/// All removed transactions are returned.
- pub fn remove_invalid(&mut self, hashes: &[Hash]) -> Vec<Arc<Transaction<Hash, Ex>>> {
+ pub fn remove_subtree(&mut self, hashes: &[Hash]) -> Vec<Arc<Transaction<Hash, Ex>>> {
let mut removed = vec![];
let mut to_remove = hashes.iter().cloned().collect::<Vec<_>>();
diff --git a/substrate/client/transaction-pool/graph/src/validated_pool.rs b/substrate/client/transaction-pool/graph/src/validated_pool.rs
index 2aca2adb72f3a94a754b639de2feb850a61cca2c..f46c2b0cf659c8a6e1f5139edd12082e6f933950 100644
--- a/substrate/client/transaction-pool/graph/src/validated_pool.rs
+++ b/substrate/client/transaction-pool/graph/src/validated_pool.rs
@@ -215,9 +215,9 @@ impl<B: ChainApi> ValidatedPool<B> {
let hash = updated_transactions.keys().next().cloned().expect("transactions is not empty; qed");
// note we are not considering tx with hash invalid here - we just want
- // to remove it along with dependent transactions and `remove_invalid()`
+ // to remove it along with dependent transactions and `remove_subtree()`
// does exactly what we need
- let removed = pool.remove_invalid(&[hash.clone()]);
+ let removed = pool.remove_subtree(&[hash.clone()]);
for removed_tx in removed {
let removed_hash = removed_tx.hash.clone();
let updated_transaction = updated_transactions.remove(&removed_hash);
@@ -451,13 +451,23 @@ impl<B: ChainApi> ValidatedPool<B> {
}
}
- /// Remove from the pool.
+ /// Remove a subtree of transactions from the pool and mark them invalid.
+ ///
+ /// The transactions passed as an argument will be additionally banned
+ /// to prevent them from entering the pool right away.
+ /// Note this is not the case for the dependent transactions - those may
+ /// still be valid so we want to be able to re-import them.
pub fn remove_invalid(&self, hashes: &[ExHash<B>]) -> Vec<TransactionFor<B>> {
+ // early exit in case there is no invalid transactions.
+ if hashes.is_empty() {
+ return vec![]
+ }
+
// temporarily ban invalid transactions
debug!(target: "txpool", "Banning invalid transactions: {:?}", hashes);
self.rotator.ban(&time::Instant::now(), hashes.iter().cloned());
- let invalid = self.pool.write().remove_invalid(hashes);
+ let invalid = self.pool.write().remove_subtree(hashes);
let mut listener = self.listener.write();
for tx in &invalid {
diff --git a/substrate/client/transaction-pool/src/maintainer.rs b/substrate/client/transaction-pool/src/maintainer.rs
index a390dde88b765f8cc5af534d6481e58ac829e167..f5eeb90b8506c79952a21774a8330771a1c2b619 100644
--- a/substrate/client/transaction-pool/src/maintainer.rs
+++ b/substrate/client/transaction-pool/src/maintainer.rs
@@ -23,7 +23,7 @@ use futures::{
Future, FutureExt,
future::{Either, join, ready},
};
-use log::warn;
+use log::{warn, debug};
use parking_lot::Mutex;
use client_api::{
@@ -79,13 +79,14 @@ where
let retracted_transactions = retracted.to_vec().into_iter()
.filter_map(move |hash| client_copy.block_body(&BlockId::hash(hash)).ok().unwrap_or(None))
.flat_map(|block| block.into_iter())
- .filter(|tx| tx.is_signed().unwrap_or(false));
+ // if signed information is not present, attempt to resubmit anyway.
+ .filter(|tx| tx.is_signed().unwrap_or(true));
let resubmit_future = self.pool
.submit_at(id, retracted_transactions, true)
.then(|resubmit_result| ready(match resubmit_result {
Ok(_) => (),
Err(e) => {
- warn!("Error re-submitting transactions: {:?}", e);
+ debug!(target: "txpool", "Error re-submitting transactions: {:?}", e);
()
}
}));