chore: fork pallet nfts (#382)

pallets/nfts/src/benchmarking.rs

@@ -62,27 +62,6 @@ fn add_collection_metadata<T: Config<I>, I: 'static>() -> (T::AccountId, Account
 	(caller, caller_lookup)
 }
 
-fn approve_collection<T: Config<I>, I: 'static>(
-	index: u32,
-) -> (T::AccountId, AccountIdLookupOf<T>) {
-	let caller = Collection::<T, I>::get(T::Helper::collection(0)).unwrap().owner;
-	if caller != whitelisted_caller() {
-		whitelist_account!(caller);
-	}
-	let caller_lookup = T::Lookup::unlookup(caller.clone());
-	let delegate: T::AccountId = account("delegate", 0, SEED + index);
-	let delegate_lookup = T::Lookup::unlookup(delegate.clone());
-	let deadline = BlockNumberFor::<T>::max_value();
-	assert_ok!(Nfts::<T, I>::approve_transfer(
-		SystemOrigin::Signed(caller.clone()).into(),
-		T::Helper::collection(0),
-		None,
-		delegate_lookup.clone(),
-		Some(deadline),
-	));
-	(caller, caller_lookup)
-}
-
 fn mint_item<T: Config<I>, I: 'static>(
 	index: u16,
 ) -> (T::ItemId, T::AccountId, AccountIdLookupOf<T>) {
@@ -96,7 +75,7 @@ fn mint_item<T: Config<I>, I: 'static>(
 	let item_exists = Item::<T, I>::contains_key(collection, item);
 	let item_config = ItemConfigOf::<T, I>::get(collection, item);
 	if item_exists {
-		return (item, caller, caller_lookup);
+		return (item, caller, caller_lookup)
 	} else if let Some(item_config) = item_config {
 		assert_ok!(Nfts::<T, I>::force_mint(
 			SystemOrigin::Signed(caller.clone()).into(),
@@ -269,8 +248,6 @@ benchmarks_instance_pallet! {
 		let m in 0 .. 1_000;
 		let c in 0 .. 1_000;
 		let a in 0 .. 1_000;
-		let h in 0 .. 1_000;
-		let l in 0 .. 1_000;
 
 		let (collection, caller, _) = create_collection::<T, I>();
 		add_collection_metadata::<T, I>();
@@ -288,13 +265,6 @@ benchmarks_instance_pallet! {
 		for i in 0..a {
 			add_collection_attribute::<T, I>(i as u16);
 		}
-		for i in 0..h {
-			mint_item::<T, I>(i as u16);
-			burn_item::<T, I>(i as u16);
-		}
-		for i in 0..l {
-			approve_collection::<T, I>(i);
-		}
 		let witness = Collection::<T, I>::get(collection).unwrap().destroy_witness();
 	}: _(SystemOrigin::Signed(caller), collection, witness)
 	verify {
@@ -601,45 +571,27 @@ benchmarks_instance_pallet! {
 	}
 
 	approve_transfer {
-		let i in 0..1;
-
 		let (collection, caller, _) = create_collection::<T, I>();
 		let (item, ..) = mint_item::<T, I>(0);
 		let delegate: T::AccountId = account("delegate", 0, SEED);
 		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
-		let maybe_deadline = if i == 0 {
-			None
-		} else {
-			Some(BlockNumberFor::<T>::max_value())
-		};
-		let maybe_item = if i == 0 {
-			None
-		} else {
-			Some(item)
-		};
-	}: _(SystemOrigin::Signed(caller.clone()), collection, maybe_item, delegate_lookup, maybe_deadline)
+		let deadline = BlockNumberFor::<T>::max_value();
+	}: _(SystemOrigin::Signed(caller.clone()), collection, item, delegate_lookup, Some(deadline))
 	verify {
-		assert_last_event::<T, I>(Event::TransferApproved { collection, item: maybe_item, owner: caller, delegate, deadline: maybe_deadline }.into());
+		assert_last_event::<T, I>(Event::TransferApproved { collection, item, owner: caller, delegate, deadline: Some(deadline) }.into());
 	}
 
 	cancel_approval {
-		let i in 0..1;
-
 		let (collection, caller, _) = create_collection::<T, I>();
 		let (item, ..) = mint_item::<T, I>(0);
 		let delegate: T::AccountId = account("delegate", 0, SEED);
 		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
 		let origin = SystemOrigin::Signed(caller.clone()).into();
 		let deadline = BlockNumberFor::<T>::max_value();
-		let maybe_item = if i == 0 {
-		  None
-		} else {
-		  Some(item)
-		};
-		Nfts::<T, I>::approve_transfer(origin, collection, maybe_item, delegate_lookup.clone(), Some(deadline))?;
-	}: _(SystemOrigin::Signed(caller.clone()), collection, maybe_item, delegate_lookup)
+		Nfts::<T, I>::approve_transfer(origin, collection, item, delegate_lookup.clone(), Some(deadline))?;
+	}: _(SystemOrigin::Signed(caller.clone()), collection, item, delegate_lookup)
 	verify {
-		assert_last_event::<T, I>(Event::ApprovalCancelled { collection, item: maybe_item, owner: caller, delegate }.into());
+		assert_last_event::<T, I>(Event::ApprovalCancelled { collection, item, owner: caller, delegate }.into());
 	}
 
 	clear_all_transfer_approvals {
@@ -649,7 +601,7 @@ benchmarks_instance_pallet! {
 		let delegate_lookup = T::Lookup::unlookup(delegate.clone());
 		let origin = SystemOrigin::Signed(caller.clone()).into();
 		let deadline = BlockNumberFor::<T>::max_value();
-		Nfts::<T, I>::approve_transfer(origin, collection, Some(item), delegate_lookup.clone(), Some(deadline))?;
+		Nfts::<T, I>::approve_transfer(origin, collection, item, delegate_lookup.clone(), Some(deadline))?;
 	}: _(SystemOrigin::Signed(caller.clone()), collection, item)
 	verify {
 		assert_last_event::<T, I>(Event::AllApprovalsCancelled {collection, item, owner: caller}.into());

pallets/nfts/src/common_functions.rs

@@ -34,24 +34,6 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		Collection::<T, I>::get(collection).map(|i| i.owner)
 	}
 
-	/// Get the total number of items in the collection, if the collection exists.
-	pub fn collection_items(collection: T::CollectionId) -> Option<u32> {
-		Collection::<T, I>::get(collection).map(|i| i.items)
-	}
-
-	/// Get the allowances to spend items within the collection.
-	pub fn collection_allowances(collection: T::CollectionId) -> Option<u32> {
-		Collection::<T, I>::get(collection).map(|i| i.allowances)
-	}
-
-	/// Get the metadata of the collection item.
-	pub fn item_metadata(
-		collection: T::CollectionId,
-		item: T::ItemId,
-	) -> Option<BoundedVec<u8, T::StringLimit>> {
-		ItemMetadataOf::<T, I>::get(collection, item).map(|metadata| metadata.data)
-	}
-
 	/// Validates the signature of the given data with the provided signer's account ID.
 	///
 	/// # Errors

pallets/nfts/src/features/approvals.rs

@@ -64,6 +64,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		if let Some(check_origin) = maybe_check_origin {
 			ensure!(check_origin == details.owner, Error::<T, I>::NoPermission);
 		}
+
 		let now = frame_system::Pallet::<T>::block_number();
 		let deadline = maybe_deadline.map(|d| d.saturating_add(now));
 
@@ -74,11 +75,12 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		Item::<T, I>::insert(collection, item, &details);
 		Self::deposit_event(Event::TransferApproved {
 			collection,
-			item: Some(item),
+			item,
 			owner: details.owner,
 			delegate,
 			deadline,
 		});
+
 		Ok(())
 	}
 
@@ -124,7 +126,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 
 		Self::deposit_event(Event::ApprovalCancelled {
 			collection,
-			item: Some(item),
+			item,
 			owner: details.owner,
 			delegate,
 		});

pallets/nfts/src/features/create_delete_collection.rs

@@ -54,9 +54,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 				items: 0,
 				item_metadatas: 0,
 				item_configs: 0,
-				item_holders: 0,
 				attributes: 0,
-				allowances: 0,
 			},
 		);
 		CollectionRoleOf::<T, I>::insert(
@@ -121,11 +119,6 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 				collection_details.item_configs == witness.item_configs,
 				Error::<T, I>::BadWitness
 			);
-			ensure!(
-				collection_details.item_holders == witness.item_holders,
-				Error::<T, I>::BadWitness
-			);
-			ensure!(collection_details.allowances == witness.allowances, Error::<T, I>::BadWitness);
 
 			for (_, metadata) in ItemMetadataOf::<T, I>::drain_prefix(collection) {
 				if let Some(depositor) = metadata.deposit.account {
@@ -144,9 +137,6 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 				}
 			}
 
-			let _ =
-				AccountBalance::<T, I>::clear_prefix(collection, collection_details.items, None);
-			let _ = Allowances::<T, I>::clear_prefix((collection,), collection_details.items, None);
 			CollectionAccount::<T, I>::remove(&collection_details.owner, &collection);
 			T::Currency::unreserve(&collection_details.owner, collection_details.owner_deposit);
 			CollectionConfigOf::<T, I>::remove(collection);
@@ -157,9 +147,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 			Ok(DestroyWitness {
 				item_metadatas: collection_details.item_metadatas,
 				item_configs: collection_details.item_configs,
-				item_holders: collection_details.item_holders,
 				attributes: collection_details.attributes,
-				allowances: collection_details.allowances,
 			})
 		})
 	}

pallets/nfts/src/features/create_delete_item.rs

@@ -259,10 +259,6 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 					}
 				}
 
-				if AccountBalance::<T, I>::get(collection, &details.owner) == 1 {
-					collection_details.item_holders.saturating_dec();
-				}
-
 				Ok(details.owner)
 			},
 		)?;
@@ -272,9 +268,6 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		ItemPriceOf::<T, I>::remove(&collection, &item);
 		PendingSwapOf::<T, I>::remove(&collection, &item);
 		ItemAttributesApprovalsOf::<T, I>::remove(&collection, &item);
-		AccountBalance::<T, I>::mutate(collection, &owner, |balance| {
-			balance.saturating_dec();
-		});
 
 		if remove_config {
 			ItemConfigOf::<T, I>::remove(collection, item);

pallets/nfts/src/features/transfer.rs

@@ -54,7 +54,7 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		) -> DispatchResult,
 	) -> DispatchResult {
 		// Retrieve collection details.
-		let mut collection_details =
+		let collection_details =
 			Collection::<T, I>::get(&collection).ok_or(Error::<T, I>::UnknownCollection)?;
 
 		// Ensure the item is not locked.
@@ -86,24 +86,6 @@ impl<T: Config<I>, I: 'static> Pallet<T, I> {
 		// Perform the transfer with custom details using the provided closure.
 		with_details(&collection_details, &mut details)?;
 
-		// Update account balance of the owner.
-		let owner_balance =
-			AccountBalance::<T, I>::mutate(collection, &details.owner, |balance| -> u32 {
-				balance.saturating_dec();
-				*balance
-			});
-		if owner_balance == 0 {
-			collection_details.item_holders.saturating_dec();
-		}
-		// Update account balance of the destination account.
-		let dest_balance = AccountBalance::<T, I>::mutate(collection, &dest, |balance| -> u32 {
-			balance.saturating_inc();
-			*balance
-		});
-		if dest_balance == 1 {
-			collection_details.item_holders.saturating_inc();
-		}
-
 		// Update account ownership information.
 		Account::<T, I>::remove((&details.owner, &collection, &item));
 		Account::<T, I>::insert((&dest, &collection, &item), ());