polkadot-omni-node: fixes and changes related to GetParachainInfo

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

@@ -157,19 +157,24 @@ pub(crate) trait BaseNodeSpec {
 		parachain_config: &Configuration,
 	) -> Option<ParaId> {
 		let best_hash = client.chain_info().best_hash;
-		let para_id = if let Ok(para_id) = client.runtime_api().parachain_id(best_hash) {
-			para_id
-		} else {
-			// TODO: remove this once `para_id` extension is removed: https://github.com/paritytech/polkadot-sdk/issues/8740
-			#[allow(deprecated)]
-			let id = ParaId::from(
-				DeprecatedExtensions::try_get(&*parachain_config.chain_spec)
-					.and_then(|ext| ext.para_id)?,
-			);
-			// TODO: https://github.com/paritytech/polkadot-sdk/issues/8747
-			// TODO: https://github.com/paritytech/polkadot-sdk/issues/8740
-			log::info!("Deprecation notice: the parachain id was provided via the chain spec. This way of providing the parachain id to the node is not recommended. The alternative is to implement the `cumulus_primitives_core::GetParachainInfo` runtime API in the runtime, and upgrade it on-chain. Starting with `stable2512` providing the parachain id via the chain spec will not be supported anymore.");
-			id
+		let para_id = match client.runtime_api().parachain_id(best_hash) {
+			Ok(para_id) => para_id,
+			Err(err) => {
+				log::info!(
+					"`cumulus_primitives_core::GetParachainInfo` runtime API call errored with {}",
+					err
+				);
+				// TODO: remove this once `para_id` extension is removed: https://github.com/paritytech/polkadot-sdk/issues/8740
+				#[allow(deprecated)]
+				let id = ParaId::from(
+					DeprecatedExtensions::try_get(&*parachain_config.chain_spec)
+						.and_then(|ext| ext.para_id)?,
+				);
+				// TODO: https://github.com/paritytech/polkadot-sdk/issues/8747
+				// TODO: https://github.com/paritytech/polkadot-sdk/issues/8740
+				log::info!("Deprecation notice: the parachain id was provided via the chain spec. This way of providing the parachain id to the node is not recommended. The alternative is to implement the `cumulus_primitives_core::GetParachainInfo` runtime API in the runtime, and upgrade it on-chain. Starting with `stable2512` providing the parachain id via the chain spec will not be supported anymore.");
+				id
+			},
 		};
 
 		let parachain_account =

cumulus/polkadot-parachain/src/chain_spec/asset_hubs.rs

@@ -31,6 +31,11 @@ pub fn asset_hub_westend_development_config() -> GenericChainSpec {
 	.with_id("asset-hub-westend-dev")
 	.with_chain_type(ChainType::Local)
 	.with_genesis_config_preset_name(sp_genesis_builder::DEV_RUNTIME_PRESET)
+	.with_genesis_config_patch(serde_json::json!({
+		"parachainInfo": {
+			"parachainId": 1000u32,
+		},
+	}))
 	.with_properties(properties)
 	.build()
 }
@@ -49,6 +54,11 @@ pub fn asset_hub_westend_local_config() -> GenericChainSpec {
 	.with_id("asset-hub-westend-local")
 	.with_chain_type(ChainType::Local)
 	.with_genesis_config_preset_name(sp_genesis_builder::LOCAL_TESTNET_RUNTIME_PRESET)
+	.with_genesis_config_patch(serde_json::json!({
+		"parachainInfo": {
+			"parachainId": 1000u32,
+		},
+	}))
 	.with_properties(properties)
 	.build()
 }

prdoc/pr_9201.prdoc

@@ -0,0 +1,11 @@
+title: '`polkadot-parachain`: added asset-hub-westend-local paracahinInfo genesis patch'
+doc:
+- audience: [ Runtime Dev, Node Dev, Node Operator ] 
+  description: |-
+    - Provides some updated to the asset-hub-westend-local chain specification, by adding appropriate gensis patch for parachainInfo.
+    - refactors the logic related to fetching `para_id` with the node, so that when failing to use `GetParachainInfo::parachain_id` we also get a log with the error (before defaulting to `para_id` extracted from chain spec).
+crates:
+- name: polkadot-parachain-bin
+  bump: minor 
+- name: polkadot-omni-node-lib
+  bump: minor