XCM v3: Support for non-fungibles

runtime/kusama/src/xcm_config.rs

@@ -21,7 +21,7 @@ use super::{
 	Origin, ParaId, Runtime, WeightToFee, XcmPallet,
 };
 use frame_support::{
-	match_type, parameter_types,
+	match_types, parameter_types,
 	traits::{Everything, Nothing},
 	weights::Weight,
 };
@@ -114,7 +114,7 @@ parameter_types! {
 pub type TrustedTeleporters =
 	(xcm_builder::Case<KsmForStatemine>, xcm_builder::Case<KsmForEncointer>);
 
-match_type! {
+match_types! {
 	pub type OnlyParachains: impl Contains<MultiLocation> = {
 		MultiLocation { parents: 0, interior: X1(Parachain(_)) }
 	};

runtime/parachains/src/ump/benchmarking.rs

@@ -42,7 +42,7 @@ fn queue_upward_msg<T: Config>(
 fn create_message_min_size<T: Config>(size: u32) -> Vec<u8> {
 	// Create a message with an empty remark call to determine the encoding overhead
 	let msg_size_empty_transact = VersionedXcm::<T>::from(Xcm::<T>(vec![Transact {
-		origin_type: OriginKind::SovereignAccount,
+		origin_kind: OriginKind::SovereignAccount,
 		require_weight_at_most: Weight::MAX,
 		call: frame_system::Call::<T>::remark_with_event { remark: vec![] }.encode().into(),
 	}]))
@@ -54,7 +54,7 @@ fn create_message_min_size<T: Config>(size: u32) -> Vec<u8> {
 	let mut remark = Vec::new();
 	remark.resize(size, 0u8);
 	let msg = VersionedXcm::<T>::from(Xcm::<T>(vec![Transact {
-		origin_type: OriginKind::SovereignAccount,
+		origin_kind: OriginKind::SovereignAccount,
 		require_weight_at_most: Weight::MAX,
 		call: frame_system::Call::<T>::remark_with_event { remark }.encode().into(),
 	}]))
@@ -69,7 +69,7 @@ fn create_message_overweight<T: Config>() -> Vec<u8> {
 	// We use a `set_code` Call because it
 	let call = frame_system::Call::<T>::set_code { code: vec![] };
 	VersionedXcm::<T>::from(Xcm::<T>(vec![Transact {
-		origin_type: OriginKind::Superuser,
+		origin_kind: OriginKind::Superuser,
 		require_weight_at_most: max_block_weight,
 		call: call.encode().into(),
 	}]))

runtime/polkadot/src/xcm_config.rs

@@ -21,7 +21,7 @@ use super::{
 	Origin, ParaId, Runtime, WeightToFee, XcmPallet,
 };
 use frame_support::{
-	match_type, parameter_types,
+	match_types, parameter_types,
 	traits::{Everything, Nothing},
 	weights::Weight,
 };
@@ -108,7 +108,7 @@ parameter_types! {
 
 pub type TrustedTeleporters = (xcm_builder::Case<DotForStatemint>,);
 
-match_type! {
+match_types! {
 	pub type OnlyParachains: impl Contains<MultiLocation> = {
 		MultiLocation { parents: 0, interior: X1(Parachain(_)) }
 	};

runtime/westend/src/weights/xcm/mod.rs

@@ -98,7 +98,7 @@ impl<Call> XcmWeightInfo<Call> for WestendXcmWeight<Call> {
 		assets.weigh_multi_assets(XcmBalancesWeight::<Runtime>::transfer_reserve_asset())
 	}
 	fn transact(
-		_origin_type: &OriginKind,
+		_origin_kind: &OriginKind,
 		_require_weight_at_most: &u64,
 		_call: &DoubleEncoded<Call>,
 	) -> Weight {

xcm/pallet-xcm-benchmarks/src/generic/benchmarking.rs

@@ -63,7 +63,7 @@ benchmarks! {
 		let fee_asset = Concrete(Here.into());
 
 		let instruction = Instruction::<XcmCallOf<T>>::BuyExecution {
-			fees: (fee_asset, 100_000_000).into(), // should be something inside of holding
+			fees: (fee_asset, 100_000_000u128).into(), // should be something inside of holding
 			weight_limit: WeightLimit::Unlimited,
 		};
 

xcm/pallet-xcm-benchmarks/src/mock.rs

@@ -15,8 +15,7 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::*;
-use frame_support::{parameter_types, weights::Weight};
-use xcm_executor::traits::FilterAssetLocation;
+use frame_support::{parameter_types, traits::ContainsPair, weights::Weight};
 
 // An xcm sender/receiver akin to > /dev/null
 pub struct DevNull;
@@ -67,8 +66,8 @@ parameter_types! {
 }
 
 pub struct AllAssetLocationsPass;
-impl FilterAssetLocation for AllAssetLocationsPass {
-	fn filter_asset_location(_: &MultiAsset, _: &MultiLocation) -> bool {
+impl ContainsPair<MultiAsset, MultiLocation> for AllAssetLocationsPass {
+	fn contains(_: &MultiAsset, _: &MultiLocation) -> bool {
 		true
 	}
 }

xcm/pallet-xcm/src/lib.rs

@@ -25,7 +25,7 @@ mod tests;
 
 use codec::{Decode, Encode, EncodeLike};
 use frame_support::traits::{
-	Contains, Currency, Defensive, EnsureOrigin, Get, LockableCurrency, OriginTrait,
+	Contains, ContainsPair, Currency, Defensive, EnsureOrigin, Get, LockableCurrency, OriginTrait,
 };
 use scale_info::TypeInfo;
 use sp_runtime::{
@@ -82,48 +82,6 @@ pub mod pallet {
 	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
-	/// A trait for querying whether a type can be said to "contain" a single pair-value.
-	pub trait ContainsPair<A, B> {
-		/// Return `true` if this "contains" the pair-value `a, b`.
-		fn contains(a: &A, b: &B) -> bool;
-	}
-
-	impl<A, B> ContainsPair<A, B> for frame_support::traits::Everything {
-		fn contains(_: &A, _: &B) -> bool {
-			true
-		}
-	}
-
-	impl<A, B> ContainsPair<A, B> for frame_support::traits::Nothing {
-		fn contains(_: &A, _: &B) -> bool {
-			false
-		}
-	}
-
-	#[impl_trait_for_tuples::impl_for_tuples(0, 30)]
-	impl<A, B> ContainsPair<A, B> for Tuple {
-		fn contains(a: &A, b: &B) -> bool {
-			for_tuples!( #(
-				if Tuple::contains(a, b) { return true }
-			)* );
-			false
-		}
-	}
-
-	/// Create a type which implements the `Contains` trait for a particular type with syntax similar
-	/// to `matches!`.
-	#[macro_export]
-	macro_rules! match_type {
-		( pub type $n:ident: impl ContainsPair<$a:ty, $b:ty> = { $phead:pat_param $( | $ptail:pat )* } ; ) => {
-			pub struct $n;
-			impl $crate::traits::ContainsPair<$a, $b> for $n {
-				fn contains(a: &$a, b: &$b) -> bool {
-					matches!((a, b), $phead $( | $ptail )* )
-				}
-			}
-		}
-	}
-
 	pub type BalanceOf<T> =
 		<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
 
@@ -1315,7 +1273,7 @@ impl<T: Config> Pallet<T> {
 		} else {
 			None
 		};
-		log::trace!(target: "xcm::send_xcm", "dest: {:?}, message: {:?}", &dest, &message);
+		log::debug!(target: "xcm::send_xcm", "dest: {:?}, message: {:?}", &dest, &message);
 		let (ticket, price) = validate_send::<T::XcmRouter>(dest, message)?;
 		if let Some(fee_payer) = maybe_fee_payer {
 			Self::charge_fees(fee_payer, price).map_err(|_| SendError::Fees)?;

xcm/src/lib.rs

@@ -561,5 +561,5 @@ pub trait GetWeight<W> {
 #[test]
 fn conversion_works() {
 	use latest::prelude::*;
-	let _: VersionedMultiAssets = (Here, 1).into();
+	let _: VersionedMultiAssets = (Here, 1u128).into();
 }

xcm/src/v2/mod.rs

@@ -1026,10 +1026,12 @@ mod tests {
 
 	#[test]
 	fn basic_roundtrip_works() {
-		let xcm =
-			Xcm::<()>(vec![TransferAsset { assets: (Here, 1).into(), beneficiary: Here.into() }]);
+		let xcm = Xcm::<()>(vec![TransferAsset {
+			assets: (Here, 1u128).into(),
+			beneficiary: Here.into(),
+		}]);
 		let old_xcm =
-			OldXcm::<()>::TransferAsset { assets: (Here, 1).into(), beneficiary: Here.into() };
+			OldXcm::<()>::TransferAsset { assets: (Here, 1u128).into(), beneficiary: Here.into() };
 		assert_eq!(old_xcm, OldXcm::<()>::try_from(xcm.clone()).unwrap());
 		let new_xcm: Xcm<()> = old_xcm.try_into().unwrap();
 		assert_eq!(new_xcm, xcm);
@@ -1038,12 +1040,12 @@ mod tests {
 	#[test]
 	fn teleport_roundtrip_works() {
 		let xcm = Xcm::<()>(vec![
-			ReceiveTeleportedAsset((Here, 1).into()),
+			ReceiveTeleportedAsset((Here, 1u128).into()),
 			ClearOrigin,
 			DepositAsset { assets: Wild(All), max_assets: 1, beneficiary: Here.into() },
 		]);
 		let old_xcm: OldXcm<()> = OldXcm::<()>::ReceiveTeleportedAsset {
-			assets: (Here, 1).into(),
+			assets: (Here, 1u128).into(),
 			effects: vec![OldOrder::DepositAsset {
 				assets: Wild(All),
 				max_assets: 1,
@@ -1058,16 +1060,16 @@ mod tests {
 	#[test]
 	fn reserve_deposit_roundtrip_works() {
 		let xcm = Xcm::<()>(vec![
-			ReserveAssetDeposited((Here, 1).into()),
+			ReserveAssetDeposited((Here, 1u128).into()),
 			ClearOrigin,
-			BuyExecution { fees: (Here, 1).into(), weight_limit: Some(1).into() },
+			BuyExecution { fees: (Here, 1u128).into(), weight_limit: Some(1).into() },
 			DepositAsset { assets: Wild(All), max_assets: 1, beneficiary: Here.into() },
 		]);
 		let old_xcm: OldXcm<()> = OldXcm::<()>::ReserveAssetDeposited {
-			assets: (Here, 1).into(),
+			assets: (Here, 1u128).into(),
 			effects: vec![
 				OldOrder::BuyExecution {
-					fees: (Here, 1).into(),
+					fees: (Here, 1u128).into(),
 					debt: 1,
 					weight: 0,
 					instructions: vec![],

xcm/src/v3/junction.rs

@@ -71,7 +71,9 @@ impl From<OldNetworkId> for Option<NetworkId> {
 }
 
 /// An identifier of a pluralistic body.
-#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, Debug, TypeInfo, MaxEncodedLen)]
+#[derive(
+	Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, Debug, TypeInfo, MaxEncodedLen,
+)]
 pub enum BodyId {
 	/// The only body in its context.
 	Unit,
@@ -115,7 +117,9 @@ impl TryFrom<OldBodyId> for BodyId {
 }
 
 /// A part of a pluralistic body.
-#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, Debug, TypeInfo, MaxEncodedLen)]
+#[derive(
+	Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, Debug, TypeInfo, MaxEncodedLen,
+)]
 pub enum BodyPart {
 	/// The body's declaration, under whatever means it decides.
 	Voice,
@@ -176,7 +180,9 @@ impl TryFrom<OldBodyPart> for BodyPart {
 /// A single item in a path to describe the relative location of a consensus system.
 ///
 /// Each item assumes a pre-existing location as its context and is defined in terms of it.
-#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, Debug, TypeInfo, MaxEncodedLen)]
+#[derive(
+	Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, Debug, TypeInfo, MaxEncodedLen,
+)]
 pub enum Junction {
 	/// An indexed parachain belonging to and operated by the context.
 	///

xcm/src/v3/junctions.rs

@@ -29,7 +29,9 @@ pub(crate) const MAX_JUNCTIONS: usize = 8;
 ///
 /// Parent junctions cannot be constructed with this type. Refer to `MultiLocation` for
 /// instructions on constructing parent junctions.
-#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, Debug, TypeInfo, MaxEncodedLen)]
+#[derive(
+	Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, Debug, TypeInfo, MaxEncodedLen,
+)]
 pub enum Junctions {
 	/// The interpreting consensus system.
 	Here,
@@ -527,6 +529,10 @@ impl Junctions {
 		}
 		return self.at(prefix.len())
 	}
+
+	pub fn starts_with(&self, prefix: &Junctions) -> bool {
+		prefix.len() <= self.len() && prefix.iter().zip(self.iter()).all(|(x, y)| x == y)
+	}
 }
 
 impl TryFrom<MultiLocation> for Junctions {

xcm/src/v3/mod.rs

@@ -1220,8 +1220,10 @@ mod tests {
 
 	#[test]
 	fn basic_roundtrip_works() {
-		let xcm =
-			Xcm::<()>(vec![TransferAsset { assets: (Here, 1).into(), beneficiary: Here.into() }]);
+		let xcm = Xcm::<()>(vec![TransferAsset {
+			assets: (Here, 1u128).into(),
+			beneficiary: Here.into(),
+		}]);
 		let old_xcm = OldXcm::<()>(vec![OldInstruction::TransferAsset {
 			assets: (OldHere, 1).into(),
 			beneficiary: OldHere.into(),
@@ -1234,7 +1236,7 @@ mod tests {
 	#[test]
 	fn teleport_roundtrip_works() {
 		let xcm = Xcm::<()>(vec![
-			ReceiveTeleportedAsset((Here, 1).into()),
+			ReceiveTeleportedAsset((Here, 1u128).into()),
 			ClearOrigin,
 			DepositAsset { assets: Wild(AllCounted(1)), beneficiary: Here.into() },
 		]);
@@ -1255,9 +1257,9 @@ mod tests {
 	#[test]
 	fn reserve_deposit_roundtrip_works() {
 		let xcm = Xcm::<()>(vec![
-			ReserveAssetDeposited((Here, 1).into()),
+			ReserveAssetDeposited((Here, 1u128).into()),
 			ClearOrigin,
-			BuyExecution { fees: (Here, 1).into(), weight_limit: Some(1).into() },
+			BuyExecution { fees: (Here, 1u128).into(), weight_limit: Some(1).into() },
 			DepositAsset { assets: Wild(AllCounted(1)), beneficiary: Here.into() },
 		]);
 		let old_xcm = OldXcm::<()>(vec![
@@ -1281,7 +1283,7 @@ mod tests {
 	#[test]
 	fn deposit_asset_roundtrip_works() {
 		let xcm = Xcm::<()>(vec![
-			WithdrawAsset((Here, 1).into()),
+			WithdrawAsset((Here, 1u128).into()),
 			DepositAsset { assets: Wild(AllCounted(1)), beneficiary: Here.into() },
 		]);
 		let old_xcm = OldXcm::<()>(vec![
@@ -1300,7 +1302,7 @@ mod tests {
 	#[test]
 	fn deposit_reserve_asset_roundtrip_works() {
 		let xcm = Xcm::<()>(vec![
-			WithdrawAsset((Here, 1).into()),
+			WithdrawAsset((Here, 1u128).into()),
 			DepositReserveAsset {
 				assets: Wild(AllCounted(1)),
 				dest: Here.into(),