Merge branch 'master' into ao-overseer-all-messages-integration

* master:
  Implement PoV Distribution Subsystem (#1344)
  Bump Substrate (#1382)
  Update the Kusama bootnode IDs (#1377)
  Companion for #6575 (Add `WeightInfo`) (#1352)
  Companion for #6599 (#1371)
  Use `SpawnNamed` to give tasks names (#1379)
  Update to substrate#59ee76a0 (#1380)
  Companion PR for #6564 (#1350)
  Companion for #6584 (#1373)
  Companion for #6500 (decl_module: frame_system as default ident) (#1314)

Cargo.toml

@@ -45,6 +45,7 @@ members = [
 
 	"node/core/proposer",
 	"node/network/bridge",
+	"node/network/pov-distribution",
 	"node/network/statement-distribution",
 	"node/overseer",
 	"node/primitives",

availability-store/Cargo.toml

@@ -23,8 +23,8 @@ sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "mas
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
 keystore = { package = "sc-keystore", git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
-kvdb = "0.6.0"
-kvdb-memorydb = "0.6.0"
+kvdb = "0.7.0"
+kvdb-memorydb = "0.7.0"
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
-kvdb-rocksdb = "0.8.0"
+kvdb-rocksdb = "0.9.0"

availability-store/src/lib.rs

@@ -23,7 +23,7 @@
 #![warn(missing_docs)]
 
 use futures::prelude::*;
-use futures::{channel::{mpsc, oneshot}, task::Spawn};
+use futures::channel::{mpsc, oneshot};
 use keystore::KeyStorePtr;
 use polkadot_primitives::{
 	Hash, Block,
@@ -39,6 +39,7 @@ use client::{
 };
 use sp_api::{ApiExt, ProvideRuntimeApi};
 use codec::{Encode, Decode};
+use sp_core::traits::SpawnNamed;
 
 use log::warn;
 
@@ -174,7 +175,7 @@ impl Store {
 		&self,
 		wrapped_block_import: I,
 		client: Arc<P>,
-		spawner: impl Spawn,
+		spawner: impl SpawnNamed,
 		keystore: KeyStorePtr,
 	) -> ClientResult<AvailabilityBlockImport<I, P>>
 	where

availability-store/src/worker.rs

@@ -20,7 +20,7 @@ use std::sync::Arc;
 use std::thread;
 
 use log::{error, info, trace, warn};
-use sp_blockchain::{Result as ClientResult};
+use sp_blockchain::Result as ClientResult;
 use sp_runtime::traits::{Header as HeaderT, Block as BlockT, HashFor, BlakeTwo256};
 use sp_api::{ApiExt, ProvideRuntimeApi};
 use client::{
@@ -32,12 +32,13 @@ use consensus_common::{
 	ImportResult,
 	import_queue::CacheKeyId,
 };
+use sp_core::traits::SpawnNamed;
 use polkadot_primitives::{Block, BlockId, Hash};
 use polkadot_primitives::parachain::{
 	ParachainHost, ValidatorId, AbridgedCandidateReceipt, AvailableData,
 	ValidatorPair, ErasureChunk,
 };
-use futures::{prelude::*, future::select, channel::{mpsc, oneshot}, task::{Spawn, SpawnExt}};
+use futures::{prelude::*, future::select, channel::{mpsc, oneshot}};
 use futures::future::AbortHandle;
 use keystore::KeyStorePtr;
 
@@ -641,7 +642,7 @@ impl<I, P> AvailabilityBlockImport<I, P> {
 	pub(crate) fn new(
 		client: Arc<P>,
 		block_import: I,
-		spawner: impl Spawn,
+		spawner: impl SpawnNamed,
 		keystore: KeyStorePtr,
 		to_worker: mpsc::UnboundedSender<WorkerMsg>,
 	) -> Self
@@ -662,9 +663,7 @@ impl<I, P> AvailabilityBlockImport<I, P> {
 			to_worker.clone(),
 		));
 
-		if let Err(_) = spawner.spawn(prune_available.map(drop)) {
-			error!(target: LOG_TARGET, "Failed to spawn availability pruning task");
-		}
+		spawner.spawn("polkadot-prune-availibility", prune_available.map(drop).boxed());
 
 		AvailabilityBlockImport {
 			client,

cli/src/cli.rs

@@ -84,11 +84,9 @@ pub struct RunCmd {
 #[allow(missing_docs)]
 #[derive(Debug, StructOpt)]
 pub struct Cli {
-	#[allow(missing_docs)]
 	#[structopt(subcommand)]
 	pub subcommand: Option<Subcommand>,
 
-	#[allow(missing_docs)]
 	#[structopt(flatten)]
 	pub run: RunCmd,
 }

cli/src/command.rs

@@ -19,7 +19,7 @@ use log::info;
 use service::{IdentifyVariant, self};
 #[cfg(feature = "service-rewr")]
 use service_new::{IdentifyVariant, self as service};
-use sc_cli::{SubstrateCli, Result, RuntimeVersion, Role};
+use sc_cli::{CliConfiguration, SubstrateCli, Result, RuntimeVersion, Role};
 use crate::cli::{Cli, Subcommand};
 
 fn get_exec_name() -> Option<String> {
@@ -198,7 +198,7 @@ pub fn run() -> Result<()> {
 			}
 		},
 		Some(Subcommand::ValidationWorker(cmd)) => {
-			sc_cli::init_logger("");
+			sc_cli::init_logger("", cli.run.base.log_rotation_opt()?)?;
 
 			if cfg!(feature = "browser") {
 				Err(sc_cli::Error::Input("Cannot run validation worker in browser".into()))

collator/src/lib.rs

@@ -50,7 +50,7 @@ use std::sync::Arc;
 use std::time::Duration;
 use std::pin::Pin;
 
-use futures::{future, Future, Stream, FutureExt, StreamExt, task::Spawn};
+use futures::{future, Future, Stream, FutureExt, StreamExt};
 use log::warn;
 use sc_client_api::{StateBackend, BlockchainEvents};
 use sp_blockchain::HeaderBackend;
@@ -82,6 +82,7 @@ use polkadot_service_new::{
 	Error as ServiceError, FullNodeHandles, PolkadotClient,
 };
 use sc_service::SpawnTaskHandle;
+use sp_core::traits::SpawnNamed;
 
 const COLLATION_TIMEOUT: Duration = Duration::from_secs(30);
 
@@ -133,7 +134,7 @@ pub trait BuildParachainContext {
 			Client::Api: RuntimeApiCollection<Extrinsic>,
 			<Client::Api as ApiExt<Block>>::StateBackend: StateBackend<HashFor<Block>>,
 			Extrinsic: codec::Codec + Send + Sync + 'static,
-			SP: Spawn + Clone + Send + Sync + 'static;
+			SP: SpawnNamed + Clone + Send + Sync + 'static;
 }
 
 /// Parachain context needed for collation.
@@ -233,7 +234,7 @@ fn build_collator_service<SP, P, C, R, Extrinsic>(
 		P::ParachainContext: Send + 'static,
 		<P::ParachainContext as ParachainContext>::ProduceCandidate: Send,
 		Extrinsic: service::Codec + Send + Sync + 'static,
-		SP: Spawn + Clone + Send + Sync + 'static,
+		SP: SpawnNamed + Clone + Send + Sync + 'static,
 {
 	Err("Collator is not functional with the new service yet".into())
 }

network/src/legacy/gossip/mod.rs

@@ -295,7 +295,7 @@ pub(crate) fn pov_block_topic(parent_hash: Hash) -> Hash {
 pub fn register_validator<C: ChainContext + 'static>(
 	service: Arc<NetworkService<Block, Hash>>,
 	chain: C,
-	executor: &impl futures::task::Spawn,
+	executor: &impl sp_core::traits::SpawnNamed,
 ) -> RegisteredMessageValidator
 {
 	let s = service.clone();
@@ -331,12 +331,7 @@ pub fn register_validator<C: ChainContext + 'static>(
 		let fut = futures::future::poll_fn(move |cx| {
 			gossip_engine.lock().poll_unpin(cx)
 		});
-		let spawn_res = executor.spawn_obj(futures::task::FutureObj::from(Box::new(fut)));
-
-		// Note: we consider the chances of an error to spawn a background task almost null.
-		if spawn_res.is_err() {
-			log::error!(target: "polkadot-gossip", "Failed to spawn background task");
-		}
+		executor.spawn("polkadot-legacy-gossip-engine", fut.boxed());
 	}
 
 	RegisteredMessageValidator {