fix xcm pallet origin (#3272)

This commit is contained in:
Shawn Tabrizi
2021-06-16 21:57:29 +01:00
committed by GitHub
parent 462ca043e5
commit 0282ad3128
4 changed files with 14 additions and 13 deletions
+1 -1
View File
@@ -1474,7 +1474,7 @@ construct_runtime! {
Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>} = 73, Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>} = 73,
// Pallet for sending XCM. // Pallet for sending XCM.
XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>} = 99, XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 99,
} }
} }
+1 -1
View File
@@ -253,7 +253,7 @@ construct_runtime! {
Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 91, Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>} = 91,
// Pallet for sending XCM. // Pallet for sending XCM.
XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>} = 99, XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 99,
} }
} }
+1 -1
View File
@@ -1072,7 +1072,7 @@ construct_runtime! {
Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>} = 64, Crowdloan: crowdloan::{Pallet, Call, Storage, Event<T>} = 64,
// Pallet for sending XCM. // Pallet for sending XCM.
XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>} = 99, XcmPallet: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin} = 99,
} }
} }
+7 -6
View File
@@ -262,19 +262,20 @@ pub mod pallet {
AccountIdConversion::<T::AccountId>::into_account(&ID) AccountIdConversion::<T::AccountId>::into_account(&ID)
} }
} }
}
/// Origin for the parachains module. /// Origin for the parachains module.
#[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)] #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug)]
pub enum Origin { #[pallet::origin]
pub enum Origin {
/// It comes from somewhere in the XCM space. /// It comes from somewhere in the XCM space.
Xcm(MultiLocation), Xcm(MultiLocation),
} }
impl From<MultiLocation> for Origin { impl From<MultiLocation> for Origin {
fn from(location: MultiLocation) -> Origin { fn from(location: MultiLocation) -> Origin {
Origin::Xcm(location) Origin::Xcm(location)
} }
}
} }
/// Ensure that the origin `o` represents a sibling parachain. /// Ensure that the origin `o` represents a sibling parachain.