Fix V3/V4 NetworkId issues

polkadot/xcm/src/lib.rs

@@ -338,7 +338,7 @@ macro_rules! versioned_type {
 					V2(x) => Ok(x),
 					V3(x) => x.try_into(),
 					V4(x) => {
-						let v3: $v3 = x.try_into()?;
+						let v3: $v3 = x.try_into().map_err(|_| ())?;
 						v3.try_into()
 					},
 				}
@@ -351,7 +351,7 @@ macro_rules! versioned_type {
 				match x {
 					V2(x) => x.try_into(),
 					V3(x) => Ok(x),
-					V4(x) => x.try_into(),
+					V4(x) => x.try_into().map_err(|_| ()),
 				}
 			}
 		}

polkadot/xcm/src/v3/junction.rs

@@ -22,7 +22,7 @@ use crate::{
 		BodyId as OldBodyId, BodyPart as OldBodyPart, Junction as OldJunction,
 		NetworkId as OldNetworkId,
 	},
-	v4::Junction as NewJunction,
+	v4::{Junction as NewJunction, NetworkId as NewNetworkId},
 	VersionedLocation,
 };
 use bounded_collections::{BoundedSlice, BoundedVec, ConstU32};
@@ -101,6 +101,30 @@ impl TryFrom<OldNetworkId> for NetworkId {
 	}
 }
 
+impl From<NewNetworkId> for Option<NetworkId> {
+	fn from(new: NewNetworkId) -> Self {
+		Some(NetworkId::from(new))
+	}
+}
+
+impl From<NewNetworkId> for NetworkId {
+	fn from(new: NewNetworkId) -> Self {
+		use NewNetworkId::*;
+		match new {
+			ByGenesis(hash) => Self::ByGenesis(hash),
+			ByFork { block_number, block_hash } => Self::ByFork { block_number, block_hash },
+			Polkadot => Self::Polkadot,
+			Kusama => Self::Kusama,
+			Westend => Self::Westend,
+			Rococo => Self::Rococo,
+			Wococo => Self::Wococo,
+			Ethereum { chain_id } => Self::Ethereum { chain_id },
+			BitcoinCore => Self::BitcoinCore,
+			BitcoinCash => Self::BitcoinCash,
+		}
+	}
+}
+
 /// An identifier of a pluralistic body.
 #[derive(
 	Copy,
@@ -412,15 +436,15 @@ impl TryFrom<NewJunction> for Junction {
 		use NewJunction::*;
 		Ok(match value {
 			Parachain(id) => Self::Parachain(id),
-			AccountId32 { network, id } => Self::AccountId32 { network, id },
-			AccountIndex64 { network, index } => Self::AccountIndex64 { network, index },
-			AccountKey20 { network, key } => Self::AccountKey20 { network, key },
+			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 },
 			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),
+			GlobalConsensus(network) => Self::GlobalConsensus(network.into()),
 		})
 	}
 }

polkadot/xcm/src/v3/mod.rs

@@ -1416,7 +1416,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: network.into(),
 				destination: destination.try_into()?,
 				xcm: xcm.try_into()?,
 			},

polkadot/xcm/src/v4/junction.rs

@@ -17,8 +17,8 @@
 //! Support data structures for `Location`, primarily the `Junction` datatype.
 
 use super::Location;
-pub use crate::v3::{BodyId, BodyPart, NetworkId};
-use crate::{v3::Junction as OldJunction, VersionedLocation};
+pub use crate::v3::{BodyId, BodyPart};
+use crate::{v3::{Junction as OldJunction, NetworkId as OldNetworkId}, VersionedLocation};
 use bounded_collections::{BoundedSlice, BoundedVec, ConstU32};
 use core::convert::TryFrom;
 use parity_scale_codec::{self, Decode, Encode, MaxEncodedLen};
@@ -101,6 +101,76 @@ pub enum Junction {
 	GlobalConsensus(NetworkId),
 }
 
+/// A global identifier of a data structure existing within consensus.
+///
+/// Maintenance note: Networks with global consensus and which are practically bridgeable within the
+/// Polkadot ecosystem are given preference over explicit naming in this enumeration.
+#[derive(
+	Copy,
+	Clone,
+	Eq,
+	PartialEq,
+	Ord,
+	PartialOrd,
+	Encode,
+	Decode,
+	Debug,
+	TypeInfo,
+	MaxEncodedLen,
+	Serialize,
+	Deserialize,
+)]
+pub enum NetworkId {
+	/// Network specified by the first 32 bytes of its genesis block.
+	ByGenesis([u8; 32]),
+	/// Network defined by the first 32-bytes of the hash and number of some block it contains.
+	ByFork { block_number: u64, block_hash: [u8; 32] },
+	/// The Polkadot mainnet Relay-chain.
+	Polkadot,
+	/// The Kusama canary-net Relay-chain.
+	Kusama,
+	/// The Westend testnet Relay-chain.
+	Westend,
+	/// The Rococo testnet Relay-chain.
+	Rococo,
+	/// The Wococo testnet Relay-chain.
+	Wococo,
+	/// An Ethereum network specified by its chain ID.
+	Ethereum {
+		/// The EIP-155 chain ID.
+		#[codec(compact)]
+		chain_id: u64,
+	},
+	/// The Bitcoin network, including hard-forks supported by Bitcoin Core development team.
+	BitcoinCore,
+	/// The Bitcoin network, including hard-forks supported by Bitcoin Cash developers.
+	BitcoinCash,
+}
+
+impl From<OldNetworkId> for Option<NetworkId> {
+	fn from(old: OldNetworkId) -> Self {
+		Some(NetworkId::from(old))
+	}
+}
+
+impl From<OldNetworkId> for NetworkId {
+	fn from(old: OldNetworkId) -> Self {
+		use OldNetworkId::*;
+		match old {
+			ByGenesis(hash) => Self::ByGenesis(hash),
+			ByFork { block_number, block_hash } => Self::ByFork { block_number, block_hash },
+			Polkadot => Self::Polkadot,
+			Kusama => Self::Kusama,
+			Westend => Self::Westend,
+			Rococo => Self::Rococo,
+			Wococo => Self::Wococo,
+			Ethereum { chain_id } => Self::Ethereum { chain_id },
+			BitcoinCore => Self::BitcoinCore,
+			BitcoinCash => Self::BitcoinCash,
+		}
+	}
+}
+
 impl From<NetworkId> for Junction {
 	fn from(n: NetworkId) -> Self {
 		Self::GlobalConsensus(n)
@@ -162,15 +232,15 @@ impl TryFrom<OldJunction> for Junction {
 		use OldJunction::*;
 		Ok(match value {
 			Parachain(id) => Self::Parachain(id),
-			AccountId32 { network, id } => Self::AccountId32 { network, id },
-			AccountIndex64 { network, index } => Self::AccountIndex64 { network, index },
-			AccountKey20 { network, key } => Self::AccountKey20 { network, key },
+			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 },
 			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),
+			GlobalConsensus(network) => Self::GlobalConsensus(network.into()),
 		})
 	}
 }