Add Paseo NetworkId for the new testnet to XCM

polkadot/xcm/src/v3/junction.rs

@@ -107,14 +107,16 @@ impl TryFrom<OldNetworkId> for NetworkId {
 
 impl From<NewNetworkId> for Option<NetworkId> {
 	fn from(new: NewNetworkId) -> Self {
-		Some(NetworkId::from(new))
+		NetworkId::try_from(new).ok()
 	}
 }
 
-impl From<NewNetworkId> for NetworkId {
-	fn from(new: NewNetworkId) -> Self {
+impl TryFrom<NewNetworkId> for NetworkId {
+	type Error = ();
+
+	fn try_from(new: NewNetworkId) -> Result<Self, Self::Error> {
 		use NewNetworkId::*;
-		match new {
+		Ok(match new {
 			ByGenesis(hash) => Self::ByGenesis(hash),
 			ByFork { block_number, block_hash } => Self::ByFork { block_number, block_hash },
 			Polkadot => Self::Polkadot,
@@ -126,7 +128,8 @@ impl From<NewNetworkId> for NetworkId {
 			BitcoinCore => Self::BitcoinCore,
 			BitcoinCash => Self::BitcoinCash,
 			PolkadotBulletin => Self::PolkadotBulletin,
-		}
+			Paseo => return Err(()),
+		})
 	}
 }
 
@@ -447,18 +450,24 @@ impl TryFrom<NewJunction> for Junction {
 		use NewJunction::*;
 		Ok(match value {
 			Parachain(id) => Self::Parachain(id),
-			AccountId32 { network: maybe_network, id } =>
-				Self::AccountId32 { network: maybe_network.map(|network| network.into()), id },
-			AccountIndex64 { network: maybe_network, index } =>
-				Self::AccountIndex64 { network: maybe_network.map(|network| network.into()), index },
-			AccountKey20 { network: maybe_network, key } =>
-				Self::AccountKey20 { network: maybe_network.map(|network| network.into()), key },
+			AccountId32 { network: maybe_network, id } => Self::AccountId32 {
+				network: maybe_network.map(|network| network.try_into()).transpose()?,
+				id,
+			},
+			AccountIndex64 { network: maybe_network, index } => Self::AccountIndex64 {
+				network: maybe_network.map(|network| network.try_into()).transpose()?,
+				index,
+			},
+			AccountKey20 { network: maybe_network, key } => Self::AccountKey20 {
+				network: maybe_network.map(|network| network.try_into()).transpose()?,
+				key,
+			},
 			PalletInstance(index) => Self::PalletInstance(index),
 			GeneralIndex(id) => Self::GeneralIndex(id),
 			GeneralKey { length, data } => Self::GeneralKey { length, data },
 			OnlyChild => Self::OnlyChild,
 			Plurality { id, part } => Self::Plurality { id, part },
-			GlobalConsensus(network) => Self::GlobalConsensus(network.into()),
+			GlobalConsensus(network) => Self::GlobalConsensus(network.try_into()?),
 		})
 	}
 }

polkadot/xcm/src/v3/mod.rs

@@ -1446,7 +1446,7 @@ impl<Call> TryFrom<NewInstruction<Call>> for Instruction<Call> {
 			ClearTransactStatus => Self::ClearTransactStatus,
 			UniversalOrigin(junction) => Self::UniversalOrigin(junction.try_into()?),
 			ExportMessage { network, destination, xcm } => Self::ExportMessage {
-				network: network.into(),
+				network: network.try_into()?,
 				destination: destination.try_into()?,
 				xcm: xcm.try_into()?,
 			},

polkadot/xcm/src/v4/junction.rs

@@ -150,6 +150,8 @@ pub enum NetworkId {
 	BitcoinCash,
 	/// The Polkadot Bulletin chain.
 	PolkadotBulletin,
+	/// The Paseo testnet Relay-chain.
+	Paseo,
 }
 
 impl From<OldNetworkId> for Option<NetworkId> {

prdoc/pr_3328.prdoc

@@ -0,0 +1,13 @@
+# Schema: Polkadot SDK PRDoc Schema (prdoc) v1.0.0
+# See doc at https://raw.githubusercontent.com/paritytech/polkadot-sdk/master/prdoc/schema_user.json
+
+title: Add Paseo NetworkId to XCM
+
+doc:
+  - audience: Runtime Dev
+    description: |
+      A new NetworkId was added to XCMv4 for the new [Paseo testnet](https://forum.polkadot.network/t/the-new-polkadot-community-testnet/4956).
+      Conversion from v4::NetworkId to v3::NetworkId is now fallible because of this extra variant.
+
+crates:
+  - name: "staging-xcm"