Implement AliasOrigin processing in XCVM

xcm/xcm-builder/src/lib.rs

@@ -90,4 +90,4 @@ pub use universal_exports::{
 };
 
 mod origin_aliases;
-pub use origin_aliases::AliasSiblingAccountId32;
+pub use origin_aliases::{AliasCase, RemovePrefixAccountId32};

xcm/xcm-builder/src/origin_aliases.rs

@@ -15,65 +15,32 @@
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
 
 use frame_support::traits::{ContainsPair, Get};
+use sp_std::marker::PhantomData;
 use xcm::latest::prelude::*;
 
-pub struct AliasSiblingAccountId32<ParachainId>(sp_std::marker::PhantomData<ParachainId>);
-impl<ParachainId: Get<u32>> ContainsPair<MultiLocation, MultiLocation>
-	for AliasSiblingAccountId32<ParachainId>
+pub struct RemovePrefixAccountId32<Prefix>(PhantomData<Prefix>);
+impl<Prefix: Get<MultiLocation>> ContainsPair<MultiLocation, MultiLocation>
+	for RemovePrefixAccountId32<Prefix>
 {
 	fn contains(origin: &MultiLocation, target: &MultiLocation) -> bool {
-		match origin {
-			MultiLocation {
-				parents: 1,
-				interior:
-					X2(Parachain(para_id), origin_account  @  AccountId32 {network: _, id: _, }),
-			} if *para_id == ParachainId::get() => match target {
-				MultiLocation {
-					parents: 0,
-					interior: X1(alias_account),
-				} if origin_account == alias_account => true,
-				_ => false,
-			},
-			_ => false,
+		if let Ok(appended) = (*target).prepended_with(Prefix::get()) {
+			if appended == *origin {
+				match appended.last() {
+					Some(AccountId32 { .. }) => return true,
+					_ => return false,
+				}
+			}
 		}
+		false
 	}
 }
 
-pub struct AliasParentAccountId32;
-impl ContainsPair<MultiLocation, MultiLocation> for AliasParentAccountId32 {
-    fn contains(origin: &MultiLocation, target: &MultiLocation) -> bool {
-        match origin {
-            MultiLocation {
-                parents: 1,
-                interior: X1(origin_account  @  AccountId32 {network: _, id: _, })
-            } => match target {
-                MultiLocation {
-                    parents: 0,
-                    interior: X1(alias_account)
-                } if alias_account == origin_account => true,
-                _ => false,
-            }
-            _ => false
-        }
-    }
-}
-
-pub struct AliasChildAccountId32<ParachainId>(sp_std::marker::PhantomData<ParachainId>);
-impl<ParachainId: Get<u32>> ContainsPair<MultiLocation, MultiLocation> for AliasChildAccountId32<ParachainId> {
-    fn contains(origin: &MultiLocation, target: &MultiLocation) -> bool {
-		match origin {
-			MultiLocation {
-				parents: 0,
-				interior:
-					X2(Parachain(para_id), origin_account  @  AccountId32 {network: _, id: _, }),
-			} if *para_id == ParachainId::get() => match target {
-				MultiLocation {
-					parents: 0,
-					interior: X1(alias_account),
-				} if origin_account == alias_account => true,
-				_ => false,
-			},
-			_ => false,
-		}
+pub struct AliasCase<T>(PhantomData<T>);
+impl<T: Get<(MultiLocation, MultiLocation)>> ContainsPair<MultiLocation, MultiLocation>
+	for AliasCase<T>
+{
+	fn contains(origin: &MultiLocation, target: &MultiLocation) -> bool {
+		let (o, t) = T::get();
+		&o == origin && &t == target
 	}
 }

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

@@ -18,20 +18,54 @@ use super::*;
 
 #[test]
 fn alias_sibling_account_should_work() {
-    // Wrong parachain
-    assert!(!AliasSiblingAccountId32::<ConstU32<1>>::contains(
-        &(Parent, Parachain(2), AccountId32 { network: None, id: [0;32] }).into(), 
-        &(AccountId32 { network: None, id: [0;32] }).into()
-    ));
-
-    // Accounts Differ
-    assert!(!AliasSiblingAccountId32::<ConstU32<1>>::contains(
-        &(Parent, Parachain(1), AccountId32 { network: None, id: [0;32] }).into(), 
-        &(AccountId32 { network: None, id: [1;32] }).into()
-    ));
-
-    assert!(AliasSiblingAccountId32::<ConstU32<1>>::contains(
-        &(Parent, Parachain(1), AccountId32 { network: None, id: [0;32] }).into(), 
-        &(AccountId32 { network: None, id: [0;32] }).into()
-    ));
-}
+	// 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(
+		&(Parent, Parachain(1), AccountId32 { network: None, id: [0; 32] }).into(),
+		&(AccountId32 { network: None, id: [1; 32] }).into()
+	));
+
+	assert!(RemovePrefixAccountId32::<AliasSiblingPrefix>::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(
+		&(Parachain(1), AccountId32 { network: None, id: [0; 32] }).into(),
+		&(AccountId32 { network: None, id: [1; 32] }).into()
+	));
+
+	assert!(RemovePrefixAccountId32::<AliasChildPrefix>::contains(
+		&(Parachain(1), AccountId32 { network: None, id: [0; 32] }).into(),
+		&(AccountId32 { network: None, id: [0; 32] }).into()
+	));
+}
+
+#[test]
+fn alias_parent_account_should_work() {
+	// Accounts Differ
+	assert!(!RemovePrefixAccountId32::<AliasParentPrefix>::contains(
+		&(Parent, AccountId32 { network: None, id: [0; 32] }).into(),
+		&(AccountId32 { network: None, id: [1; 32] }).into()
+	));
+
+	assert!(RemovePrefixAccountId32::<AliasParentPrefix>::contains(
+		&(Parent, AccountId32 { network: None, id: [0; 32] }).into(),
+		&(AccountId32 { network: None, id: [0; 32] }).into()
+	));
+}

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

@@ -16,7 +16,9 @@
 
 use crate::{
 	barriers::{AllowSubscriptionsFrom, RespectSuspension},
-	test_utils::*, AliasSiblingAccountId32, origin_aliases::{AliasChildAccountId32, AliasParentAccountId32},
+	origin_aliases::{AliasChildAccountId32, AliasParentAccountId32},
+	test_utils::*,
+	AliasSiblingAccountId32,
 };
 pub use crate::{
 	AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowTopLevelPaidExecutionFrom,
@@ -30,7 +32,7 @@ pub use frame_support::{
 	},
 	ensure, parameter_types,
 	sp_runtime::DispatchErrorWithPostInfo,
-	traits::{Contains, Get, IsInVec, ConstU32},
+	traits::{ConstU32, Contains, Get, IsInVec},
 };
 pub use parity_scale_codec::{Decode, Encode};
 pub use sp_io::hashing::blake2_256;
@@ -642,11 +644,13 @@ impl AssetExchange for TestAssetExchange {
 	}
 }
 
-pub type TestAliases = (
-	AliasSiblingAccountId32<ConstU32<1>>,
-	AliasChildAccountId32<ConstU32<1>>,
-	AliasParentAccountId32,
-);
+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;
 impl Config for TestConfig {