XCM v1

xcm/src/lib.rs

@@ -63,3 +63,18 @@ pub enum VersionedMultiLocation {
 pub enum VersionedMultiAsset {
 	V0(v0::MultiAsset),
 }
+
+impl From<v0::MultiAsset> for VersionedMultiAsset {
+	fn from(x: v0::MultiAsset) -> Self {
+		VersionedMultiAsset::V0(x)
+	}
+}
+
+impl core::convert::TryFrom<VersionedMultiAsset> for v0::MultiAsset {
+	type Error = ();
+	fn try_from(x: VersionedMultiAsset) -> core::result::Result<Self, ()> {
+		match x {
+			VersionedMultiAsset::V0(x) => Ok(x),
+		}
+	}
+}

xcm/src/v0/mod.rs

@@ -20,30 +20,41 @@ use core::{result, convert::TryFrom, fmt::Debug};
 use derivative::Derivative;
 use alloc::vec::Vec;
 use parity_scale_codec::{self, Encode, Decode};
-use crate::{VersionedMultiAsset, DoubleEncoded, VersionedXcm};
+use crate::{DoubleEncoded, VersionedXcm};
 
 mod junction;
 mod multi_asset;
 mod multi_location;
 mod order;
 mod traits;
+pub mod multiasset;	// the new multiasset.
+
 pub use junction::{Junction, NetworkId, BodyId, BodyPart};
-pub use multi_asset::{MultiAsset, AssetInstance};
+pub use multiasset::{
+	AssetId, AssetInstance, MultiAsset, MultiAssets, MultiAssetFilter, Fungibility, WildMultiAsset, WildFungibility
+};
 pub use multi_location::MultiLocation;
 pub use order::Order;
 pub use traits::{Error, Result, SendXcm, ExecuteXcm, Outcome};
 
 /// A prelude for importing all types typically used when interacting with XCM messages.
 pub mod prelude {
 	pub use super::junction::{Junction::*, NetworkId, BodyId, BodyPart};
-	pub use super::multi_asset::{MultiAsset::{self, *}, AssetInstance::{self, *}};
+	pub use super::multiasset::{
+		AssetId, MultiAssets, MultiAsset,
+		AssetInstance::{self, *},
+		MultiAssetFilter::{self, *},
+		Fungibility::{self, *},
+		WildMultiAsset::{self, *},
+		WildFungibility::{self, Fungible as WildFungible, NonFungible as WildNonFungible},
+	};
 	pub use super::multi_location::MultiLocation::{self, *};
 	pub use super::order::Order::{self, *};
 	pub use super::traits::{Error as XcmError, Result as XcmResult, SendXcm, ExecuteXcm, Outcome};
 	pub use super::{Xcm::{self, *}, OriginKind};
 }
 
-// TODO: #2841 #XCMENCODE Efficient encodings for Vec<MultiAsset>, Vec<Order>, using initial byte values 128+ to encode
+// TODO: #2841 #XCMENCODE Efficient encodings for MultiAssets, Vec<Order>, using initial byte values 128+ to encode
 //   the number of items in the vector.
 
 /// Basically just the XCM (more general) version of `ParachainDispatchOrigin`.
@@ -73,7 +84,7 @@ pub enum OriginKind {
 #[derive(Clone, Eq, PartialEq, Encode, Decode, Debug)]
 pub enum Response {
 	/// Some assets.
-	Assets(Vec<MultiAsset>),
+	Assets(MultiAssets),
 }
 
 /// Cross-Consensus Message: A message from one consensus system to another.
@@ -99,7 +110,7 @@ pub enum Xcm<Call> {
 	///
 	/// Errors:
 	#[codec(index = 0)]
-	WithdrawAsset { assets: Vec<MultiAsset>, effects: Vec<Order<Call>> },
+	WithdrawAsset { assets: MultiAssets, effects: Vec<Order<Call>> },
 
 	/// Asset(s) (`assets`) have been received into the ownership of this system on the `origin` system.
 	///
@@ -116,7 +127,7 @@ pub enum Xcm<Call> {
 	///
 	/// Errors:
 	#[codec(index = 1)]
-	ReserveAssetDeposit { assets: Vec<MultiAsset>, effects: Vec<Order<Call>> },
+	ReserveAssetDeposit { assets: MultiAssets, effects: Vec<Order<Call>> },
 
 	/// Asset(s) (`assets`) have been destroyed on the `origin` system and equivalent assets should be
 	/// created on this system.
@@ -134,7 +145,7 @@ pub enum Xcm<Call> {
 	///
 	/// Errors:
 	#[codec(index = 2)]
-	TeleportAsset { assets: Vec<MultiAsset>, effects: Vec<Order<Call>> },
+	TeleportAsset { assets: MultiAssets, effects: Vec<Order<Call>> },
 
 	/// Indication of the contents of the holding account corresponding to the `QueryHolding` order of `query_id`.
 	///
@@ -161,7 +172,7 @@ pub enum Xcm<Call> {
 	///
 	/// Errors:
 	#[codec(index = 4)]
-	TransferAsset { assets: Vec<MultiAsset>, dest: MultiLocation },
+	TransferAsset { assets: MultiAssets, dest: MultiLocation },
 
 	/// Withdraw asset(s) (`assets`) from the ownership of `origin` and place equivalent assets under the
 	/// ownership of `dest` within this consensus system.
@@ -179,7 +190,7 @@ pub enum Xcm<Call> {
 	///
 	/// Errors:
 	#[codec(index = 5)]
-	TransferReserveAsset { assets: Vec<MultiAsset>, dest: MultiLocation, effects: Vec<Order<()>> },
+	TransferReserveAsset { assets: MultiAssets, dest: MultiLocation, effects: Vec<Order<()>> },
 
 	/// Apply the encoded transaction `call`, whose dispatch-origin should be `origin` as expressed by the kind
 	/// of origin `origin_type`.

xcm/src/v0/multi_asset.rs

@@ -16,37 +16,10 @@
 
 //! Cross-Consensus Message format data structures.
 
-use core::{result, convert::TryFrom};
 use alloc::vec::Vec;
 
 use parity_scale_codec::{self, Encode, Decode};
-use super::{MultiLocation, VersionedMultiAsset};
-
-/// A general identifier for an instance of a non-fungible asset class.
-#[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, Debug)]
-pub enum AssetInstance {
-	/// Undefined - used if the NFA class has only one instance.
-	Undefined,
-
-	/// A compact index. Technically this could be greater than `u128`, but this implementation supports only
-	/// values up to `2**128 - 1`.
-	Index { #[codec(compact)] id: u128 },
-
-	/// A 4-byte fixed-length datum.
-	Array4([u8; 4]),
-
-	/// An 8-byte fixed-length datum.
-	Array8([u8; 8]),
-
-	/// A 16-byte fixed-length datum.
-	Array16([u8; 16]),
-
-	/// A 32-byte fixed-length datum.
-	Array32([u8; 32]),
-
-	/// An arbitrary piece of data. Use only when necessary.
-	Blob(Vec<u8>),
-}
+use super::{MultiLocation, AssetInstance};
 
 /// A single general identifier for an asset.
 ///
@@ -306,21 +279,6 @@ impl MultiAsset {
 	}
 }
 
-impl From<MultiAsset> for VersionedMultiAsset {
-	fn from(x: MultiAsset) -> Self {
-		VersionedMultiAsset::V0(x)
-	}
-}
-
-impl TryFrom<VersionedMultiAsset> for MultiAsset {
-	type Error = ();
-	fn try_from(x: VersionedMultiAsset) -> result::Result<Self, ()> {
-		match x {
-			VersionedMultiAsset::V0(x) => Ok(x),
-		}
-	}
-}
-
 #[cfg(test)]
 mod tests {
 	use super::*;