txpool: don't maintain the pool during major sync

bin/node/cli/src/service.rs

@@ -646,6 +646,7 @@ mod tests {
 
 				futures::executor::block_on(service.transaction_pool().maintain(
 					ChainEvent::NewBestBlock { hash: parent_header.hash(), tree_route: None },
+					Arc::new(sp_consensus::NoNetwork),
 				));
 
 				let mut proposer_factory = sc_basic_authorship::ProposerFactory::new(

client/basic-authorship/src/basic_authorship.rs

@@ -615,11 +615,14 @@ mod tests {
 			.unwrap();
 
 		block_on(
-			txpool.maintain(chain_event(
-				client
-					.expect_header(client.info().genesis_hash)
-					.expect("there should be header"),
-			)),
+			txpool.maintain(
+				chain_event(
+					client
+						.expect_header(client.info().genesis_hash)
+						.expect("there should be header"),
+				),
+				Arc::new(sp_consensus::NoNetwork),
+			),
 		);
 
 		let mut proposer_factory =
@@ -708,11 +711,14 @@ mod tests {
 		block_on(txpool.submit_at(&BlockId::number(0), SOURCE, vec![extrinsic(0)])).unwrap();
 
 		block_on(
-			txpool.maintain(chain_event(
-				client
-					.expect_header(client.info().genesis_hash)
-					.expect("there should be header"),
-			)),
+			txpool.maintain(
+				chain_event(
+					client
+						.expect_header(client.info().genesis_hash)
+						.expect("there should be header"),
+				),
+				Arc::new(sp_consensus::NoNetwork),
+			),
 		);
 
 		let mut proposer_factory =
@@ -809,11 +815,14 @@ mod tests {
 		};
 
 		block_on(
-			txpool.maintain(chain_event(
-				client
-					.expect_header(client.info().genesis_hash)
-					.expect("there should be header"),
-			)),
+			txpool.maintain(
+				chain_event(
+					client
+						.expect_header(client.info().genesis_hash)
+						.expect("there should be header"),
+				),
+				Arc::new(sp_consensus::NoNetwork),
+			),
 		);
 		assert_eq!(txpool.ready().count(), 7);
 
@@ -822,11 +831,10 @@ mod tests {
 		let hashof1 = block.hash();
 		block_on(client.import(BlockOrigin::Own, block)).unwrap();
 
-		block_on(
-			txpool.maintain(chain_event(
-				client.expect_header(hashof1).expect("there should be header"),
-			)),
-		);
+		block_on(txpool.maintain(
+			chain_event(client.expect_header(hashof1).expect("there should be header")),
+			Arc::new(sp_consensus::NoNetwork),
+		));
 		assert_eq!(txpool.ready().count(), 5);
 
 		// now let's make sure that we can still make some progress
@@ -872,7 +880,9 @@ mod tests {
 
 		block_on(txpool.submit_at(&BlockId::number(0), SOURCE, extrinsics)).unwrap();
 
-		block_on(txpool.maintain(chain_event(genesis_header.clone())));
+		block_on(
+			txpool.maintain(chain_event(genesis_header.clone()), Arc::new(sp_consensus::NoNetwork)),
+		);
 
 		let mut proposer_factory =
 			ProposerFactory::new(spawner.clone(), client.clone(), txpool.clone(), None, None);
@@ -958,11 +968,14 @@ mod tests {
 		.unwrap();
 
 		block_on(
-			txpool.maintain(chain_event(
-				client
-					.expect_header(client.info().genesis_hash)
-					.expect("there should be header"),
-			)),
+			txpool.maintain(
+				chain_event(
+					client
+						.expect_header(client.info().genesis_hash)
+						.expect("there should be header"),
+				),
+				Arc::new(sp_consensus::NoNetwork),
+			),
 		);
 		assert_eq!(txpool.ready().count(), MAX_SKIPPED_TRANSACTIONS * 3);
 
@@ -1020,11 +1033,14 @@ mod tests {
 		.unwrap();
 
 		block_on(
-			txpool.maintain(chain_event(
-				client
-					.expect_header(client.info().genesis_hash)
-					.expect("there should be header"),
-			)),
+			txpool.maintain(
+				chain_event(
+					client
+						.expect_header(client.info().genesis_hash)
+						.expect("there should be header"),
+				),
+				Arc::new(sp_consensus::NoNetwork),
+			),
 		);
 		assert_eq!(txpool.ready().count(), MAX_SKIPPED_TRANSACTIONS * 2 + 2);
 

client/consensus/manual-seal/src/lib.rs

@@ -585,10 +585,13 @@ mod tests {
 
 		let header = client.header(created_block.hash).expect("db error").expect("imported above");
 		assert_eq!(header.number, 1);
-		pool.maintain(sc_transaction_pool_api::ChainEvent::NewBestBlock {
-			hash: header.hash(),
-			tree_route: None,
-		})
+		pool.maintain(
+			sc_transaction_pool_api::ChainEvent::NewBestBlock {
+				hash: header.hash(),
+				tree_route: None,
+			},
+			Arc::new(sp_consensus::NoNetwork),
+		)
 		.await;
 
 		let (tx1, rx1) = futures::channel::oneshot::channel();

client/service/src/builder.rs

@@ -350,6 +350,7 @@ pub trait SpawnTaskNetwork<Block: BlockT>:
 	sc_offchain::NetworkProvider
 	+ NetworkStateInfo
 	+ NetworkStatusProvider<Block>
+	+ sp_consensus::SyncOracle
 	+ Send
 	+ Sync
 	+ 'static
@@ -362,6 +363,7 @@ where
 	T: sc_offchain::NetworkProvider
 		+ NetworkStateInfo
 		+ NetworkStatusProvider<Block>
+		+ sp_consensus::SyncOracle
 		+ Send
 		+ Sync
 		+ 'static,
@@ -498,7 +500,11 @@ where
 	spawn_handle.spawn(
 		"txpool-notifications",
 		Some("transaction-pool"),
-		sc_transaction_pool::notification_future(client.clone(), transaction_pool.clone()),
+		sc_transaction_pool::notification_future(
+			client.clone(),
+			transaction_pool.clone(),
+			network.clone(),
+		),
 	);
 
 	spawn_handle.spawn(

client/transaction-pool/Cargo.toml

@@ -19,6 +19,7 @@ futures = "0.3.21"
 futures-timer = "3.0.2"
 linked-hash-map = "0.5.4"
 log = "0.4.17"
+num-traits = "0.2.8"
 parking_lot = "0.12.1"
 serde = { version = "1.0.136", features = ["derive"] }
 thiserror = "1.0.30"
@@ -28,6 +29,7 @@ sc-transaction-pool-api = { version = "4.0.0-dev", path = "./api" }
 sc-utils = { version = "4.0.0-dev", path = "../utils" }
 sp-api = { version = "4.0.0-dev", path = "../../primitives/api" }
 sp-blockchain = { version = "4.0.0-dev", path = "../../primitives/blockchain" }
+sp-consensus = { version = "0.10.0-dev", path = "../../primitives/consensus/common" }
 sp-core = { version = "7.0.0", path = "../../primitives/core" }
 sp-runtime = { version = "7.0.0", path = "../../primitives/runtime" }
 sp-tracing = { version = "6.0.0", path = "../../primitives/tracing" }

client/transaction-pool/api/Cargo.toml

@@ -16,6 +16,7 @@ serde = { version = "1.0.136", features = ["derive"] }
 thiserror = "1.0.30"
 sp-blockchain = { version = "4.0.0-dev", path = "../../../primitives/blockchain" }
 sp-runtime = { version = "7.0.0", default-features = false, path = "../../../primitives/runtime" }
+sp-consensus = { version = "0.10.0-dev", path = "../../../primitives/consensus/common" }
 
 [dev-dependencies]
 serde_json = "1.0"

client/transaction-pool/api/src/lib.rs

@@ -307,7 +307,9 @@ pub enum ChainEvent<B: BlockT> {
 #[async_trait]
 pub trait MaintainedTransactionPool: TransactionPool {
 	/// Perform maintenance
-	async fn maintain(&self, event: ChainEvent<Self::Block>);
+	async fn maintain<SO>(&self, event: ChainEvent<Self::Block>, sync_oracle: Arc<SO>)
+	where
+		SO: sp_consensus::SyncOracle + std::marker::Send + std::marker::Sync + ?Sized;
 }
 
 /// Transaction pool interface for submitting local transactions that exposes a