Merge branch 'master' into cirko33-10687-bug

Author: cirko33

cumulus/client/service/src/lib.rs

@@ -43,7 +43,9 @@ use sc_network::{
 };
 use sc_network_sync::SyncingService;
 use sc_network_transactions::TransactionsHandlerController;
-use sc_service::{Configuration, SpawnTaskHandle, TaskManager, WarpSyncConfig};
+use sc_service::{
+	Configuration, SpawnEssentialTaskHandle, SpawnTaskHandle, TaskManager, WarpSyncConfig,
+};
 use sc_telemetry::{log, TelemetryWorkerHandle};
 use sc_tracing::block::TracingExecuteBlock;
 use sc_utils::mpsc::TracingUnboundedSender;
@@ -291,6 +293,7 @@ pub struct BuildNetworkParams<
 	pub para_id: ParaId,
 	pub relay_chain_interface: RCInterface,
 	pub spawn_handle: SpawnTaskHandle,
+	pub spawn_essential_handle: SpawnEssentialTaskHandle,
 	pub import_queue: IQ,
 	pub sybil_resistance_level: CollatorSybilResistance,
 	pub metrics: sc_network::NotificationMetrics,
@@ -305,6 +308,7 @@ pub async fn build_network<'a, Block, Client, RCInterface, IQ, Network>(
 		transaction_pool,
 		para_id,
 		spawn_handle,
+		spawn_essential_handle,
 		relay_chain_interface,
 		import_queue,
 		sybil_resistance_level,
@@ -374,6 +378,7 @@ where
 		client,
 		transaction_pool,
 		spawn_handle,
+		spawn_essential_handle,
 		import_queue,
 		block_announce_validator_builder: Some(Box::new(move |_| block_announce_validator)),
 		warp_sync_config,

cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs

@@ -147,7 +147,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("westmint"),
 	impl_name: alloc::borrow::Cow::Borrowed("westmint"),
 	authoring_version: 1,
-	spec_version: 1_021_001,
+	spec_version: 1_021_002,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 16,

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs

@@ -244,7 +244,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: alloc::borrow::Cow::Borrowed("bridge-hub-westend"),
 	impl_name: alloc::borrow::Cow::Borrowed("bridge-hub-westend"),
 	authoring_version: 1,
-	spec_version: 1_021_000,
+	spec_version: 1_021_001,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 6,

cumulus/polkadot-omni-node/lib/src/common/spec.rs

@@ -394,6 +394,7 @@ pub(crate) trait NodeSpec: BaseNodeSpec {
 					transaction_pool: transaction_pool.clone(),
 					para_id,
 					spawn_handle: task_manager.spawn_handle(),
+					spawn_essential_handle: task_manager.spawn_essential_handle(),
 					relay_chain_interface: relay_chain_interface.clone(),
 					import_queue: params.import_queue,
 					sybil_resistance_level: Self::SYBIL_RESISTANCE,

cumulus/polkadot-omni-node/lib/src/nodes/aura.rs

@@ -242,6 +242,7 @@ where
 				client: client.clone(),
 				transaction_pool: transaction_pool.clone(),
 				spawn_handle: task_manager.spawn_handle(),
+				spawn_essential_handle: task_manager.spawn_essential_handle(),
 				import_queue,
 				net_config,
 				block_announce_validator_builder: None,

cumulus/polkadot-omni-node/lib/src/nodes/mod.rs

@@ -19,4 +19,4 @@ pub mod aura;
 /// The current node version for cumulus official binaries, which takes the basic
 /// SemVer form `<major>.<minor>.<patch>`. It should correspond to the latest
 /// `polkadot` version of a stable release.
-pub const NODE_VERSION: &'static str = "1.21.0";
+pub const NODE_VERSION: &'static str = "1.21.1";

cumulus/test/service/src/lib.rs

@@ -362,6 +362,7 @@ where
 			transaction_pool: transaction_pool.clone(),
 			para_id,
 			spawn_handle: task_manager.spawn_handle(),
+			spawn_essential_handle: task_manager.spawn_essential_handle(),
 			relay_chain_interface: relay_chain_interface.clone(),
 			import_queue: params.import_queue,
 			metrics: Net::register_notification_metrics(

polkadot/node/primitives/src/lib.rs

@@ -60,7 +60,7 @@ pub use disputes::{
 /// relatively rare.
 ///
 /// The associated worker binaries should use the same version as the node that spawns them.
-pub const NODE_VERSION: &'static str = "1.21.0";
+pub const NODE_VERSION: &'static str = "1.21.1";
 
 // For a 16-ary Merkle Prefix Trie, we can expect at most 16 32-byte hashes per node
 // plus some overhead:

polkadot/node/service/src/builder/mod.rs

@@ -462,6 +462,7 @@ where
 				client: client.clone(),
 				transaction_pool: transaction_pool.clone(),
 				spawn_handle: task_manager.spawn_handle(),
+				spawn_essential_handle: task_manager.spawn_essential_handle(),
 				import_queue,
 				block_announce_validator_builder: None,
 				warp_sync_config: Some(WarpSyncConfig::WithProvider(warp_sync)),

prdoc/pr_10847.prdoc

@@ -0,0 +1,23 @@
+title: 'net: Spawn network backend as essential task'
+doc:
+- audience: Node Dev
+  description: |-
+    This PR spawns the network backends as essential (libp2p / litep2p).
+
+    When the network future exits, it will bring down the whole process.
+    - there's no point in running a node without the core network backend as it will not be able to communicate with peers
+    - while at it, have changed some logs from debug to warn
+    - the network backend can be brought down unintentionally by the `import_notif_stream`
+
+
+    Discovered during:
+    - https://github.com/paritytech/polkadot-sdk/issues/10821
+crates:
+- name: cumulus-client-service
+  bump: patch
+- name: polkadot-omni-node-lib
+  bump: patch
+- name: polkadot-service
+  bump: patch
+- name: sc-service
+  bump: patch