Add custom tx pool that skip remove_invalid when producing block (#910

)

* add custom tx pool that skip report_invalid

* cargo fmt

* add explanatory comment

* cargo fmt

node/src/custom_tx_pool.rs

@@ -0,0 +1,100 @@
+use futures::Future;
+use sc_transaction_pool_api::{
+	ImportNotificationStream, PoolFuture, PoolStatus, ReadyTransactions, TransactionFor,
+	TransactionPool, TransactionSource, TransactionStatusStreamFor, TxHash,
+};
+use sp_runtime::traits::{Block as BlockT, NumberFor};
+use std::{collections::HashMap, pin::Pin, sync::Arc};
+
+pub struct CustomPool<I> {
+	inner_pool: Arc<I>,
+}
+
+impl<I> CustomPool<I> {
+	pub fn new(inner_pool: Arc<I>) -> Self {
+		Self { inner_pool }
+	}
+}
+
+impl<I> TransactionPool for CustomPool<I>
+where
+	I: TransactionPool,
+{
+	type Block = I::Block;
+	type Hash = I::Hash;
+	type InPoolTransaction = I::InPoolTransaction;
+	type Error = I::Error;
+
+	fn submit_at(
+		&self,
+		at: <Self::Block as BlockT>::Hash,
+		source: TransactionSource,
+		xts: Vec<TransactionFor<Self>>,
+	) -> PoolFuture<Vec<Result<TxHash<Self>, Self::Error>>, Self::Error> {
+		self.inner_pool.submit_at(at, source, xts)
+	}
+
+	fn submit_one(
+		&self,
+		at: <Self::Block as BlockT>::Hash,
+		source: TransactionSource,
+		xt: TransactionFor<Self>,
+	) -> PoolFuture<TxHash<Self>, Self::Error> {
+		self.inner_pool.submit_one(at, source, xt)
+	}
+
+	fn submit_and_watch(
+		&self,
+		at: <Self::Block as BlockT>::Hash,
+		source: TransactionSource,
+		xt: TransactionFor<Self>,
+	) -> PoolFuture<Pin<Box<TransactionStatusStreamFor<Self>>>, Self::Error> {
+		self.inner_pool.submit_and_watch(at, source, xt)
+	}
+
+	fn remove_invalid(&self, _: &[TxHash<Self>]) -> Vec<Arc<Self::InPoolTransaction>> {
+		// Don't do anything on purpose.
+		Vec::new()
+	}
+
+	fn status(&self) -> PoolStatus {
+		self.inner_pool.status()
+	}
+
+	fn import_notification_stream(&self) -> ImportNotificationStream<TxHash<Self>> {
+		self.inner_pool.import_notification_stream()
+	}
+
+	fn hash_of(&self, xt: &TransactionFor<Self>) -> TxHash<Self> {
+		self.inner_pool.hash_of(xt)
+	}
+
+	fn on_broadcasted(&self, propagations: HashMap<TxHash<Self>, Vec<String>>) {
+		self.inner_pool.on_broadcasted(propagations)
+	}
+
+	fn ready_transaction(&self, hash: &TxHash<Self>) -> Option<Arc<Self::InPoolTransaction>> {
+		self.inner_pool.ready_transaction(hash)
+	}
+
+	fn ready_at(
+		&self,
+		at: NumberFor<Self::Block>,
+	) -> Pin<
+		Box<
+			dyn Future<
+					Output = Box<dyn ReadyTransactions<Item = Arc<Self::InPoolTransaction>> + Send>,
+				> + Send,
+		>,
+	> {
+		self.inner_pool.ready_at(at)
+	}
+
+	fn ready(&self) -> Box<dyn ReadyTransactions<Item = Arc<Self::InPoolTransaction>> + Send> {
+		self.inner_pool.ready()
+	}
+
+	fn futures(&self) -> Vec<Self::InPoolTransaction> {
+		self.inner_pool.futures()
+	}
+}

node/src/main.rs

@@ -23,9 +23,9 @@ mod chain_spec;
 mod service;
 mod cli;
 mod command;
+mod custom_tx_pool;
 mod eth;
 mod rpc;
-
 fn main() -> sc_cli::Result<()> {
 	command::run()
 }

node/src/service.rs

@@ -571,10 +571,15 @@ fn start_consensus(
 	// NOTE: because we use Aura here explicitly, we can use `CollatorSybilResistance::Resistant`
 	// when starting the network.
 
+	// TODO: Remove the custom tx pool when paritytech/polkadot-sdk#4639 is included in a stable
+	// release. This is a temporary workaround taken from here: https://github.com/frequency-chain/frequency/pull/2196.
+	let custom_transaction_pool =
+		std::sync::Arc::new(crate::custom_tx_pool::CustomPool::new(transaction_pool));
+
 	let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
 		task_manager.spawn_handle(),
 		client.clone(),
-		transaction_pool,
+		custom_transaction_pool,
 		prometheus_registry,
 		telemetry.clone(),
 	);

zombienet/native.toml

@@ -27,16 +27,17 @@ force_decorator = "generic-evm"
   ws_port = 9999
   command = "{{ZOMBIENET_LAOS_COMMAND}}"
   validator = true
+  args = ["--log=xcm=trace,aura=trace,txpool=trace,basic-authorship=trace"]
 
   [[parachains.collators]]
   name = "laos1"
   command = "{{ZOMBIENET_LAOS_COMMAND}}"
   validator = true
-  args = ["--log=xcm=trace"]
+  args = ["--log=xcm=trace,aura=trace,txpool=trace,basic-authorship=trace"]
 
     [[parachains.collators]]
   name = "laos2"
   command = "{{ZOMBIENET_LAOS_COMMAND}}"
   validator = true
-  args = ["--log=xcm=trace"]
+  args = ["--log=xcm=trace,aura=trace,txpool=trace,basic-authorship=trace"]