From 0282ad31281f9f56fbebcff171238e361e7bef68 Mon Sep 17 00:00:00 2001
From: Shawn Tabrizi <shawntabrizi@gmail.com>
Date: Wed, 16 Jun 2021 21:57:29 +0100
Subject: [PATCH] fix xcm pallet origin (#3272)

---
 polkadot/runtime/kusama/src/lib.rs  |  2 +-
 polkadot/runtime/rococo/src/lib.rs  |  2 +-
 polkadot/runtime/westend/src/lib.rs |  2 +-
 polkadot/xcm/pallet-xcm/src/lib.rs  | 21 +++++++++++----------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs
index 6b21007d9e..62f3b858ce 100644
--- a/polkadot/runtime/kusama/src/lib.rs
+++ b/polkadot/runtime/kusama/src/lib.rs
@@ -1474,7 +1474,7 @@ construct_runtime! {
 		Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>} = 73,
 
 		// Pallet for sending XCM.
-		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>} = 99,
+		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 99,
 	}
 }
 
diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs
index 17ab62718f..146becad08 100644
--- a/polkadot/runtime/rococo/src/lib.rs
+++ b/polkadot/runtime/rococo/src/lib.rs
@@ -253,7 +253,7 @@ construct_runtime! {
 		Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 91,
 
 		// Pallet for sending XCM.
-		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>} = 99,
+		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 99,
 	}
 }
 
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
index a8a7faaf00..51cf971972 100644
--- a/polkadot/runtime/westend/src/lib.rs
+++ b/polkadot/runtime/westend/src/lib.rs
@@ -1072,7 +1072,7 @@ construct_runtime! {
 		Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>} = 64,
 
 		// Pallet for sending XCM.
-		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>} = 99,
+		XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 99,
 	}
 }
 
diff --git a/polkadot/xcm/pallet-xcm/src/lib.rs b/polkadot/xcm/pallet-xcm/src/lib.rs
index a622916062..d89356cc02 100644
--- a/polkadot/xcm/pallet-xcm/src/lib.rs
+++ b/polkadot/xcm/pallet-xcm/src/lib.rs
@@ -262,18 +262,19 @@ pub mod pallet {
 			AccountIdConversion::<T::AccountId>::into_account(&ID)
 		}
 	}
-}
 
-/// Origin for the parachains module.
-#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
-pub enum Origin {
-	/// It comes from somewhere in the XCM space.
-	Xcm(MultiLocation),
-}
+	/// Origin for the parachains module.
+	#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
+	#[pallet::origin]
+	pub enum Origin {
+		/// It comes from somewhere in the XCM space.
+		Xcm(MultiLocation),
+	}
 
-impl From<MultiLocation> for Origin {
-	fn from(location: MultiLocation) -> Origin {
-		Origin::Xcm(location)
+	impl From<MultiLocation> for Origin {
+		fn from(location: MultiLocation) -> Origin {
+			Origin::Xcm(location)
+		}
 	}
 }