From befda5f68317ae95ca5348bc97eeab37faceddaf Mon Sep 17 00:00:00 2001
From: Branislav Kontur <bkontur@gmail.com>
Date: Tue, 17 Jun 2025 15:13:38 +0200
Subject: [PATCH 1/2] Set alias_origin correctly where needed

---
 .../collectives/collectives-polkadot/src/weights/xcm/mod.rs    | 3 +--
 .../coretime/coretime-kusama/src/weights/xcm/mod.rs            | 3 +--
 .../coretime/coretime-polkadot/src/weights/xcm/mod.rs          | 3 +--
 system-parachains/encointer/src/weights/xcm/mod.rs             | 3 +--
 system-parachains/people/people-kusama/src/weights/xcm/mod.rs  | 3 +--
 .../people/people-polkadot/src/weights/xcm/mod.rs              | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/system-parachains/collectives/collectives-polkadot/src/weights/xcm/mod.rs b/system-parachains/collectives/collectives-polkadot/src/weights/xcm/mod.rs
index 1267dc563e..bbe46f03f2 100644
--- a/system-parachains/collectives/collectives-polkadot/src/weights/xcm/mod.rs
+++ b/system-parachains/collectives/collectives-polkadot/src/weights/xcm/mod.rs
@@ -229,8 +229,7 @@ impl<Call> XcmWeightInfo<Call> for CollectivesWestendXcmWeight<Call> {
 		XcmGeneric::<Runtime>::clear_topic()
 	}
 	fn alias_origin(_: &Location) -> Weight {
-		// XCM Executor does not currently support alias origin operations
-		Weight::MAX
+		XcmGeneric::<Runtime>::alias_origin()
 	}
 	fn unpaid_execution(_: &WeightLimit, _: &Option<Location>) -> Weight {
 		XcmGeneric::<Runtime>::unpaid_execution()
diff --git a/system-parachains/coretime/coretime-kusama/src/weights/xcm/mod.rs b/system-parachains/coretime/coretime-kusama/src/weights/xcm/mod.rs
index 35d3f519fc..c4ad326d8f 100644
--- a/system-parachains/coretime/coretime-kusama/src/weights/xcm/mod.rs
+++ b/system-parachains/coretime/coretime-kusama/src/weights/xcm/mod.rs
@@ -227,8 +227,7 @@ impl<Call> XcmWeightInfo<Call> for CoretimeKusamaXcmWeight<Call> {
 		XcmGeneric::<Runtime>::clear_topic()
 	}
 	fn alias_origin(_: &Location) -> Weight {
-		// XCM Executor does not currently support alias origin operations
-		Weight::MAX
+		XcmGeneric::<Runtime>::alias_origin()
 	}
 	fn unpaid_execution(_: &WeightLimit, _: &Option<Location>) -> Weight {
 		XcmGeneric::<Runtime>::unpaid_execution()
diff --git a/system-parachains/coretime/coretime-polkadot/src/weights/xcm/mod.rs b/system-parachains/coretime/coretime-polkadot/src/weights/xcm/mod.rs
index 77816f8bbc..b6d5bb2271 100644
--- a/system-parachains/coretime/coretime-polkadot/src/weights/xcm/mod.rs
+++ b/system-parachains/coretime/coretime-polkadot/src/weights/xcm/mod.rs
@@ -227,8 +227,7 @@ impl<Call> XcmWeightInfo<Call> for CoretimePolkadotXcmWeight<Call> {
 		XcmGeneric::<Runtime>::clear_topic()
 	}
 	fn alias_origin(_: &Location) -> Weight {
-		// XCM Executor does not currently support alias origin operations
-		Weight::MAX
+		XcmGeneric::<Runtime>::alias_origin()
 	}
 	fn unpaid_execution(_: &WeightLimit, _: &Option<Location>) -> Weight {
 		XcmGeneric::<Runtime>::unpaid_execution()
diff --git a/system-parachains/encointer/src/weights/xcm/mod.rs b/system-parachains/encointer/src/weights/xcm/mod.rs
index a61d080054..d4045ddf27 100644
--- a/system-parachains/encointer/src/weights/xcm/mod.rs
+++ b/system-parachains/encointer/src/weights/xcm/mod.rs
@@ -227,8 +227,7 @@ impl<Call> XcmWeightInfo<Call> for EncointerKusamaXcmWeight<Call> {
 		XcmGeneric::<Runtime>::clear_topic()
 	}
 	fn alias_origin(_: &Location) -> Weight {
-		// XCM Executor does not currently support alias origin operations
-		Weight::MAX
+		XcmGeneric::<Runtime>::alias_origin()
 	}
 	fn unpaid_execution(_: &WeightLimit, _: &Option<Location>) -> Weight {
 		XcmGeneric::<Runtime>::unpaid_execution()
diff --git a/system-parachains/people/people-kusama/src/weights/xcm/mod.rs b/system-parachains/people/people-kusama/src/weights/xcm/mod.rs
index 8ab57ce7eb..3800ac6ead 100644
--- a/system-parachains/people/people-kusama/src/weights/xcm/mod.rs
+++ b/system-parachains/people/people-kusama/src/weights/xcm/mod.rs
@@ -230,8 +230,7 @@ impl<Call> XcmWeightInfo<Call> for PeopleKusamaXcmWeight<Call> {
 		XcmGeneric::<Runtime>::clear_topic()
 	}
 	fn alias_origin(_: &Location) -> Weight {
-		// XCM Executor does not currently support alias origin operations
-		Weight::MAX
+		XcmGeneric::<Runtime>::alias_origin()
 	}
 	fn unpaid_execution(_: &WeightLimit, _: &Option<Location>) -> Weight {
 		XcmGeneric::<Runtime>::unpaid_execution()
diff --git a/system-parachains/people/people-polkadot/src/weights/xcm/mod.rs b/system-parachains/people/people-polkadot/src/weights/xcm/mod.rs
index ad25f3414a..d709d3c315 100644
--- a/system-parachains/people/people-polkadot/src/weights/xcm/mod.rs
+++ b/system-parachains/people/people-polkadot/src/weights/xcm/mod.rs
@@ -230,8 +230,7 @@ impl<Call> XcmWeightInfo<Call> for PeoplePolkadotXcmWeight<Call> {
 		XcmGeneric::<Runtime>::clear_topic()
 	}
 	fn alias_origin(_: &Location) -> Weight {
-		// XCM Executor does not currently support alias origin operations
-		Weight::MAX
+		XcmGeneric::<Runtime>::alias_origin()
 	}
 	fn unpaid_execution(_: &WeightLimit, _: &Option<Location>) -> Weight {
 		XcmGeneric::<Runtime>::unpaid_execution()

From 9c49c75f81fa651f0dd900417eba8e45ea7c549b Mon Sep 17 00:00:00 2001
From: Branislav Kontur <bkontur@gmail.com>
Date: Tue, 17 Jun 2025 15:29:34 +0200
Subject: [PATCH 2/2] Fix encointer: ``` fn universal_alias() ->
 Result<(Location, Junction), BenchmarkError> { 
 Err(BenchmarkError::Skip) } ```

---
 system-parachains/encointer/src/weights/xcm/mod.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system-parachains/encointer/src/weights/xcm/mod.rs b/system-parachains/encointer/src/weights/xcm/mod.rs
index d4045ddf27..5918c2d857 100644
--- a/system-parachains/encointer/src/weights/xcm/mod.rs
+++ b/system-parachains/encointer/src/weights/xcm/mod.rs
@@ -200,7 +200,7 @@ impl<Call> XcmWeightInfo<Call> for EncointerKusamaXcmWeight<Call> {
 		XcmGeneric::<Runtime>::clear_transact_status()
 	}
 	fn universal_origin(_: &Junction) -> Weight {
-		XcmGeneric::<Runtime>::universal_origin()
+		Weight::MAX
 	}
 	fn export_message(_: &NetworkId, _: &Junctions, _: &Xcm<()>) -> Weight {
 		Weight::MAX