git.delta.rocks / unique-network / refs/commits / ae0e886a6664

11use nft_data_structs::{11use nft_data_structs::{
12	COLLECTION_NUMBER_LIMIT, Collection, CollectionId, CreateItemData, ExistenceRequirement,12	COLLECTION_NUMBER_LIMIT, Collection, CollectionId, CreateItemData, ExistenceRequirement,
13	MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_COLLECTION_NAME_LENGTH, MAX_TOKEN_PREFIX_LENGTH,13	MAX_COLLECTION_DESCRIPTION_LENGTH, MAX_COLLECTION_NAME_LENGTH, MAX_TOKEN_PREFIX_LENGTH,
14	MetaUpdatePermission, Pays, PostDispatchInfo, TokenId, Weight, WithdrawReasons,14	COLLECTION_ADMINS_LIMIT, MetaUpdatePermission, Pays, PostDispatchInfo, TokenId, Weight,
15	WithdrawReasons,
15};16};
16pub use pallet::*;17pub use pallet::*;
165	#[pallet::generate_store(pub(super) trait Store)]166	#[pallet::generate_store(pub(super) trait Store)]
166	pub struct Pallet<T>(_);167	pub struct Pallet<T>(_);
168
169	#[pallet::extra_constants]
170	impl<T: Config> Pallet<T> {
171		pub fn collection_admins_limit() -> u32 {
172			COLLECTION_ADMINS_LIMIT
173		}
174	}
167175
168	#[pallet::event]176	#[pallet::event]
169	#[pallet::generate_deposit(pub fn deposit_event)]177	#[pallet::generate_deposit(pub fn deposit_event)]
265		TotalCollectionsLimitExceeded,273		TotalCollectionsLimitExceeded,
266		/// variable_data exceeded data limit.274		/// variable_data exceeded data limit.
267		TokenVariableDataLimitExceeded,275		TokenVariableDataLimitExceeded,
276		/// Exceeded max admin amount
277		CollectionAdminAmountExceeded,
268278
269		/// Collection settings not allowing items transferring279		/// Collection settings not allowing items transferring
270		TransferNotAllowed,280		TransferNotAllowed,
305		QueryKind = OptionQuery,315		QueryKind = OptionQuery,
306	>;316	>;
317
318	#[pallet::storage]
319	pub type AdminAmount<T> = StorageMap<
320		Hasher = Blake2_128Concat,
321		Key = CollectionId,
322		Value = u32,
323		QueryKind = ValueQuery,
324	>;
307325
308	/// List of collection admins326	/// List of collection admins
309	#[pallet::storage]327	#[pallet::storage]
419437
420		<DestroyedCollectionCount<T>>::put(destroyed_collections);438		<DestroyedCollectionCount<T>>::put(destroyed_collections);
421		<CollectionById<T>>::remove(collection.id);439		<CollectionById<T>>::remove(collection.id);
440		<AdminAmount<T>>::remove(collection.id);
422		<IsAdmin<T>>::remove_prefix((collection.id,), None);441		<IsAdmin<T>>::remove_prefix((collection.id,), None);
423		<Allowlist<T>>::remove_prefix((collection.id,), None);442		<Allowlist<T>>::remove_prefix((collection.id,), None);
424		Ok(())443		Ok(())
435		// =========454		// =========
436455
437		if allowed {456		if allowed {
438			<Allowlist<T>>::insert((collection.id, user.as_sub()), true);457			<Allowlist<T>>::insert((collection.id, user), true);
439		} else {458		} else {
440			<Allowlist<T>>::remove((collection.id, user.as_sub()));459			<Allowlist<T>>::remove((collection.id, user));
441		}460		}
442461
443		Ok(())462		Ok(())
444	}463	}
464
465	pub fn toggle_admin(
466		collection: &CollectionHandle<T>,
467		sender: &T::CrossAccountId,
468		user: &T::CrossAccountId,
469		admin: bool,
470	) -> DispatchResult {
471		collection.check_is_owner_or_admin(&sender)?;
472
473		let was_admin = <IsAdmin<T>>::get((collection.id, user));
474		if was_admin == admin {
475			return Ok(());
476		}
477		let amount = <AdminAmount<T>>::get(collection.id);
478
479		if admin {
480			let amount = amount
481				.checked_add(1)
482				.ok_or(<Error<T>>::CollectionAdminAmountExceeded)?;
483			ensure!(
484				amount <= Self::collection_admins_limit(),
485				<Error<T>>::CollectionAdminAmountExceeded,
486			);
487
488			// =========
489
490			<AdminAmount<T>>::insert(collection.id, amount);
491			<IsAdmin<T>>::insert((collection.id, user), true);
492		} else {
493			<AdminAmount<T>>::insert(collection.id, amount.saturating_sub(1));
494			<IsAdmin<T>>::remove((collection.id, user));
495		}
496
497		Ok(())
498	}
445}499}
446500
447#[macro_export]501#[macro_export]

--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -36,8 +36,8 @@
 use sp_runtime::{sp_std::prelude::Vec};
 use nft_data_structs::{
 	MAX_DECIMAL_POINTS, MAX_SPONSOR_TIMEOUT, MAX_TOKEN_OWNERSHIP, CUSTOM_DATA_LIMIT,
-	VARIABLE_ON_CHAIN_SCHEMA_LIMIT, CONST_ON_CHAIN_SCHEMA_LIMIT, COLLECTION_ADMINS_LIMIT,
-	OFFCHAIN_SCHEMA_LIMIT, FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
+	VARIABLE_ON_CHAIN_SCHEMA_LIMIT, CONST_ON_CHAIN_SCHEMA_LIMIT, OFFCHAIN_SCHEMA_LIMIT,
+	FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
 	NFT_SPONSOR_TRANSFER_TIMEOUT, AccessMode, Collection, CreateItemData, CollectionLimits,
 	CollectionId, CollectionMode, TokenId, SchemaVersion, SponsorshipState, MetaUpdatePermission,
 };
@@ -156,7 +156,6 @@
 	where
 		origin: T::Origin
 	{
-		const CollectionAdminsLimit: u64 = COLLECTION_ADMINS_LIMIT;
 		type Error = Error<T>;
 
 		fn on_initialize(_now: T::BlockNumber) -> Weight {
@@ -406,12 +405,9 @@
 		#[transactional]
 		pub fn add_collection_admin(origin, collection_id: CollectionId, new_admin_id: T::CrossAccountId) -> DispatchResult {
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
-
 			let collection = <CollectionHandle<T>>::try_get(collection_id)?;
-			collection.check_is_owner_or_admin(&sender)?;
 
-			<IsAdmin<T>>::insert((collection_id, new_admin_id.as_sub()), true);
-			Ok(())
+			<PalletCommon<T>>::toggle_admin(&collection, &sender, &new_admin_id, true)
 		}
 
 		/// Remove admin address of the Collection. An admin address can remove itself. List of admins may become empty, in which case only Collection Owner will be able to add an Admin.
@@ -430,12 +426,9 @@
 		#[transactional]
 		pub fn remove_collection_admin(origin, collection_id: CollectionId, account_id: T::CrossAccountId) -> DispatchResult {
 			let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
-
 			let collection = <CollectionHandle<T>>::try_get(collection_id)?;
-			collection.check_is_owner_or_admin(&sender)?;
 
-			<IsAdmin<T>>::remove((collection_id, account_id.as_sub()));
-			Ok(())
+			<PalletCommon<T>>::toggle_admin(&collection, &sender, &account_id, false)
 		}
 
 		/// # Permissions

--- a/primitives/nft/src/lib.rs
+++ b/primitives/nft/src/lib.rs
@@ -41,7 +41,7 @@
 } else {
 	10
 };
-pub const COLLECTION_ADMINS_LIMIT: u64 = 5;
+pub const COLLECTION_ADMINS_LIMIT: u32 = 5;
 pub const COLLECTION_TOKEN_LIMIT: u32 = u32::MAX;
 pub const ACCOUNT_TOKEN_OWNERSHIP_LIMIT: u32 = if cfg!(not(feature = "limit-testing")) {
 	1000000