Complete usage of ProducerOrigin in pallet_rmrk_core::Config

rmrk-team · Jan 17, 2023 · b5306d4 · b5306d4
1 parent 22add24
commit b5306d4
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 14 deletions.
diff --git a/pallets/rmrk-core/src/functions.rs b/pallets/rmrk-core/src/functions.rs
@@ -46,7 +46,11 @@ impl<T: Config>
 			priority_index += 1;
 		}
 		Self::deposit_event(Event::PrioritySet { collection_id, nft_id });
-		Ok(Some(<T as pallet::Config>::WeightInfo::set_priority(priority_index, T::NestingBudget::get())).into())
+		Ok(Some(<T as pallet::Config>::WeightInfo::set_priority(
+			priority_index,
+			T::NestingBudget::get(),
+		))
+		.into())
 	}
 }
 

diff --git a/pallets/rmrk-core/src/lib.rs b/pallets/rmrk-core/src/lib.rs
@@ -9,10 +9,13 @@
 use frame_support::{
 	dispatch::{DispatchResult, DispatchResultWithPostInfo},
 	ensure,
-	traits::tokens::{nonfungibles::*, Locker},
+	traits::{
+		tokens::{nonfungibles::*, Locker},
+		EnsureOrigin, IsType,
+	},
 	transactional, BoundedVec,
 };
-use frame_system::ensure_signed;
+use frame_system::{ensure_signed, RawOrigin};
 
 use sp_runtime::{traits::StaticLookup, DispatchError, Permill};
 use sp_std::convert::TryInto;
@@ -122,7 +125,7 @@ pub mod pallet {
 	pub trait Config: frame_system::Config + pallet_uniques::Config {
 		/// Because this pallet emits events, it depends on the runtime's definition of an event.
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
-		type ProtocolOrigin: EnsureOrigin<Self::RuntimeOrigin>;
+		type ProtocolOrigin: EnsureOrigin<Self::RuntimeOrigin, Success = Self::AccountId>;
 
 		/// The maximum resource symbol length
 		#[pallet::constant]
@@ -443,7 +446,7 @@ pub mod pallet {
 			transferable: bool,
 			resources: Option<BoundedResourceInfoTypeOf<T>>,
 		) -> DispatchResult {
-			let sender = ensure_signed(origin)?;
+			let sender = T::ProtocolOrigin::ensure_origin(origin)?;
 			if let Some(collection_issuer) =
 				pallet_uniques::Pallet::<T>::collection_owner(collection_id)
 			{
@@ -483,7 +486,7 @@ pub mod pallet {
 		/// - `recipient`: Receiver of the royalty
 		/// - `royalty`: Permillage reward from each trade for the Recipient
 		/// - `metadata`: Arbitrary data about an nft, e.g. IPFS hash
-    #[pallet::call_index(1)]
+		#[pallet::call_index(1)]
 		#[pallet::weight(<T as pallet::Config>::WeightInfo::mint_nft_directly_to_nft(T::NestingBudget::get()))]
 		#[transactional]
 		pub fn mint_nft_directly_to_nft(
@@ -497,7 +500,7 @@ pub mod pallet {
 			transferable: bool,
 			resources: Option<BoundedResourceInfoTypeOf<T>>,
 		) -> DispatchResult {
-			let sender = ensure_signed(origin.clone())?;
+			let sender = T::ProtocolOrigin::ensure_origin(origin.clone())?;
 
 			// Collection must exist and sender must be issuer of collection
 			if let Some(collection_issuer) =
@@ -535,7 +538,7 @@ pub mod pallet {
 			max: Option<u32>,
 			symbol: BoundedCollectionSymbolOf<T>,
 		) -> DispatchResult {
-			let sender = ensure_signed(origin)?;
+			let sender = T::ProtocolOrigin::ensure_origin(origin)?;
 
 			Self::collection_create(sender, collection_id, metadata, max, symbol)?;
 

diff --git a/pallets/rmrk-core/src/mock.rs b/pallets/rmrk-core/src/mock.rs
@@ -9,7 +9,7 @@ use frame_support::{
 	parameter_types,
 	traits::{AsEnsureOriginWithArg, ConstU32, Everything},
 };
-use frame_system::EnsureRoot;
+use frame_system::{EnsureRoot, EnsureSigned};
 use sp_core::{crypto::AccountId32, H256};
 use sp_runtime::{
 	testing::Header,
@@ -60,7 +60,7 @@ use pallet_rmrk_core::RmrkBenchmark;
 impl pallet_rmrk_core::Config for Test {
 	// type Currency = Balances;
 	type RuntimeEvent = RuntimeEvent;
-	type ProtocolOrigin = EnsureRoot<AccountId>;
+	type ProtocolOrigin = EnsureSigned<AccountId>;
 	type ResourceSymbolLimit = ResourceSymbolLimit;
 	type PartsLimit = PartsLimit;
 	type MaxPriorities = MaxPriorities;

diff --git a/pallets/rmrk-equip/src/mock.rs b/pallets/rmrk-equip/src/mock.rs
@@ -8,7 +8,7 @@ use frame_support::{
 	traits::{AsEnsureOriginWithArg, ConstU32, Everything},
 	weights::Weight,
 };
-use frame_system::EnsureRoot;
+use frame_system::{EnsureRoot, EnsureSigned};
 use sp_core::{crypto::AccountId32, H256};
 use sp_runtime::{
 	testing::Header,
@@ -71,7 +71,7 @@ use pallet_rmrk_core::RmrkBenchmark;
 
 impl pallet_rmrk_core::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
-	type ProtocolOrigin = EnsureRoot<AccountId>;
+	type ProtocolOrigin = EnsureSigned<AccountId>;
 	type ResourceSymbolLimit = ResourceSymbolLimit;
 	type PartsLimit = PartsLimit;
 	type MaxPriorities = MaxPriorities;

diff --git a/pallets/rmrk-market/src/mock.rs b/pallets/rmrk-market/src/mock.rs
@@ -106,10 +106,11 @@ parameter_types! {
 
 #[cfg(feature = "runtime-benchmarks")]
 use pallet_rmrk_core::RmrkBenchmark;
+use system::EnsureSigned;
 
 impl pallet_rmrk_core::Config for Test {
 	type RuntimeEvent = RuntimeEvent;
-	type ProtocolOrigin = EnsureRoot<AccountId>;
+	type ProtocolOrigin = EnsureSigned<AccountId>;
 	type ResourceSymbolLimit = ResourceSymbolLimit;
 	type PartsLimit = PartsLimit;
 	type MaxPriorities = MaxPriorities;

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -362,7 +362,7 @@ use pallet_rmrk_core::RmrkBenchmark;
 
 impl pallet_rmrk_core::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type ProtocolOrigin = frame_system::EnsureRoot<AccountId>;
+	type ProtocolOrigin = frame_system::EnsureSigned<AccountId>;
 	type ResourceSymbolLimit = ResourceSymbolLimit;
 	type PartsLimit = PartsLimit;
 	type MaxPriorities = MaxPriorities;