Implement AliasOrigin processing in XCVM

xcm/xcm-builder/src/lib.rs

@@ -90,4 +90,7 @@ pub use universal_exports::{
 };
 
 mod origin_aliases;
-pub use origin_aliases::{AliasCase, RemovePrefixAccountId32};
+pub use origin_aliases::{
+	AliasCase, AliasForeignAccountId32, ChildPrefix, IsNativeAccountId32, ParentPrefix,
+	SiblingPrefix,
+};

xcm/xcm-builder/src/origin_aliases.rs

@@ -14,33 +14,71 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
-use frame_support::traits::{ContainsPair, Get};
+use frame_support::traits::{Contains, ContainsPair};
 use sp_std::marker::PhantomData;
 use xcm::latest::prelude::*;
 
-pub struct RemovePrefixAccountId32<Prefix>(PhantomData<Prefix>);
-impl<Prefix: Get<MultiLocation>> ContainsPair<MultiLocation, MultiLocation>
-	for RemovePrefixAccountId32<Prefix>
+pub struct AliasCase<Origin, Target>(PhantomData<(Origin, Target)>);
+impl<Origin, Target> ContainsPair<MultiLocation, MultiLocation> for AliasCase<Origin, Target>
+where
+	Origin: Contains<MultiLocation>,
+	Target: Contains<MultiLocation>,
 {
 	fn contains(origin: &MultiLocation, target: &MultiLocation) -> bool {
-		if let Ok(appended) = (*target).clone().prepended_with(Prefix::get()) {
-			if appended == *origin {
-				match appended.last() {
-					Some(AccountId32 { .. }) => return true,
-					_ => return false,
-				}
-			}
-		}
-		false
+		Origin::contains(origin) && Target::contains(target)
 	}
 }
 
-pub struct AliasCase<T>(PhantomData<T>);
-impl<T: Get<(MultiLocation, MultiLocation)>> ContainsPair<MultiLocation, MultiLocation>
-	for AliasCase<T>
+pub struct AliasForeignAccountId32<Prefix, Target>(PhantomData<(Prefix, Target)>);
+impl<Prefix: Contains<MultiLocation>, Target: Contains<MultiLocation>>
+	ContainsPair<MultiLocation, MultiLocation> for AliasForeignAccountId32<Prefix, Target>
 {
 	fn contains(origin: &MultiLocation, target: &MultiLocation) -> bool {
-		let (o, t) = T::get();
-		&o == origin && &t == target
+		if let (prefix, Some(account_id @ AccountId32 { .. })) = origin.split_last_interior() {
+			return Prefix::contains(&prefix) &&
+				Target::contains(target) &&
+				Some(&account_id) == target.last()
+		}
+		false
+	}
+}
+
+pub struct SiblingPrefix;
+impl Contains<MultiLocation> for SiblingPrefix {
+	fn contains(t: &MultiLocation) -> bool {
+		match *t {
+			MultiLocation { parents: 1, interior: X1(Parachain(_)) } => true,
+			_ => false,
+		}
 	}
 }
+
+pub struct ParentPrefix;
+impl Contains<MultiLocation> for ParentPrefix {
+	fn contains(t: &MultiLocation) -> bool {
+		match *t {
+			MultiLocation { parents: 1, interior: Here } => true,
+			_ => false,
+		}
+	}
+}
+
+pub struct ChildPrefix;
+impl Contains<MultiLocation> for ChildPrefix {
+	fn contains(t: &MultiLocation) -> bool {
+		match *t {
+			MultiLocation { parents: 0, interior: X1(Parachain(_)) } => true,
+			_ => false,
+		}
+	}
+}
+
+pub struct IsNativeAccountId32;
+impl Contains<MultiLocation> for IsNativeAccountId32 {
+	fn contains(t: &MultiLocation) -> bool {
+		match *t {
+			MultiLocation { parents: 0, interior: X1(AccountId32 { .. }) } => true,
+			_ => false,
+		}
+	}
+}

xcm/xcm-builder/src/tests/aliases.rs

@@ -18,39 +18,27 @@ use super::*;
 
 #[test]
 fn alias_sibling_account_should_work() {
-	// Wrong parachain
-	assert!(!RemovePrefixAccountId32::<AliasSiblingPrefix>::contains(
-		&(Parent, Parachain(2), AccountId32 { network: None, id: [0; 32] }).into(),
-		&(AccountId32 { network: None, id: [0; 32] }).into()
-	));
-
 	// Accounts Differ
-	assert!(!RemovePrefixAccountId32::<AliasSiblingPrefix>::contains(
+	assert!(!AliasForeignAccountId32::<SiblingPrefix, IsNativeAccountId32>::contains(
 		&(Parent, Parachain(1), AccountId32 { network: None, id: [0; 32] }).into(),
 		&(AccountId32 { network: None, id: [1; 32] }).into()
 	));
 
-	assert!(RemovePrefixAccountId32::<AliasSiblingPrefix>::contains(
+	assert!(AliasForeignAccountId32::<SiblingPrefix, IsNativeAccountId32>::contains(
 		&(Parent, Parachain(1), AccountId32 { network: None, id: [0; 32] }).into(),
 		&(AccountId32 { network: None, id: [0; 32] }).into()
 	));
 }
 
 #[test]
 fn alias_child_account_should_work() {
-	// Wrong parachain
-	assert!(!RemovePrefixAccountId32::<AliasChildPrefix>::contains(
-		&(Parachain(2), AccountId32 { network: None, id: [0; 32] }).into(),
-		&(AccountId32 { network: None, id: [0; 32] }).into()
-	));
-
 	// Accounts Differ
-	assert!(!RemovePrefixAccountId32::<AliasChildPrefix>::contains(
+	assert!(!AliasForeignAccountId32::<ChildPrefix, IsNativeAccountId32>::contains(
 		&(Parachain(1), AccountId32 { network: None, id: [0; 32] }).into(),
 		&(AccountId32 { network: None, id: [1; 32] }).into()
 	));
 
-	assert!(RemovePrefixAccountId32::<AliasChildPrefix>::contains(
+	assert!(AliasForeignAccountId32::<ChildPrefix, IsNativeAccountId32>::contains(
 		&(Parachain(1), AccountId32 { network: None, id: [0; 32] }).into(),
 		&(AccountId32 { network: None, id: [0; 32] }).into()
 	));
@@ -59,12 +47,12 @@ fn alias_child_account_should_work() {
 #[test]
 fn alias_parent_account_should_work() {
 	// Accounts Differ
-	assert!(!RemovePrefixAccountId32::<AliasParentPrefix>::contains(
+	assert!(!AliasForeignAccountId32::<ParentPrefix, IsNativeAccountId32>::contains(
 		&(Parent, AccountId32 { network: None, id: [0; 32] }).into(),
 		&(AccountId32 { network: None, id: [1; 32] }).into()
 	));
 
-	assert!(RemovePrefixAccountId32::<AliasParentPrefix>::contains(
+	assert!(AliasForeignAccountId32::<ParentPrefix, IsNativeAccountId32>::contains(
 		&(Parent, AccountId32 { network: None, id: [0; 32] }).into(),
 		&(AccountId32 { network: None, id: [0; 32] }).into()
 	));

xcm/xcm-builder/src/tests/mock.rs

@@ -16,9 +16,7 @@
 
 use crate::{
 	barriers::{AllowSubscriptionsFrom, RespectSuspension},
-	origin_aliases::{AliasChildAccountId32, AliasParentAccountId32},
 	test_utils::*,
-	AliasSiblingAccountId32,
 };
 pub use crate::{
 	AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowTopLevelPaidExecutionFrom,
@@ -644,12 +642,6 @@ impl AssetExchange for TestAssetExchange {
 	}
 }
 
-parameter_types! {
-	pub static AliasSiblingPrefix: MultiLocation = (Parent, Parachain(1)).into();
-	pub static AliasChildPrefix: MultiLocation = (Parachain(1)).into();
-	pub static AliasParentPrefix: MultiLocation = (Parent).into();
-}
-
 pub type TestAliases = ();
 
 pub struct TestConfig;