🚀 chore(Cargo.toml): update dependencies versions to improve compatibility and performance

🐛 fix(functions.rs): fix cloning of class_id variable to prevent ownership issues
✨ feat(functions.rs): add support for creating frunique collections with configurable owner and admin roles
🐛 fix(functions.rs): fix cloning of collection variable to prevent ownership issues

Author: tlacloc

pallets/fruniques/Cargo.toml

@@ -13,22 +13,22 @@ repository = "https://github.com/hashed-io/hashed-pallets"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-log = "0.4"
+log = { version = "0.4.17", default-features = false }
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
-scale-info = { default-features = false, version = "2.0.1", features = [
+scale-info = { default-features = false, version = "2.5.0", features = [
 	"derive"
 ] }
-frame-support = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
-frame-system = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
-frame-benchmarking = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", optional = true }
-sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
-pallet-uniques = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
+frame-support = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
+frame-system = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
+frame-benchmarking = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0", optional = true }
+sp-runtime = { version = "24.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
+pallet-uniques = { version = "4.0.0-dev", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
 pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
 pallet-rbac = { path = "../rbac/", default-features = false, version = "4.0.0-dev" }
 
 [dev-dependencies]
-sp-core = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
-sp-io = { default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
+sp-core = { version = "21.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
+sp-io = { version = "23.0.0", default-features = false, git = "https://github.com/paritytech/substrate.git", branch = "polkadot-v1.0.0" }
 
 [features]
 default = ["std"]

pallets/fruniques/src/functions.rs

@@ -164,7 +164,7 @@ impl<T: Config> Pallet<T> {
 	) -> DispatchResult {
 		pallet_uniques::Pallet::<T>::set_attribute(
 			origin,
-			*class_id,
+			*class_id.clone(),
 			Some(instance_id),
 			key,
 			value,
@@ -182,15 +182,15 @@ impl<T: Config> Pallet<T> {
 	where
 		<T as pallet_uniques::Config>::ItemId: From<u32>,
 	{
-		let nex_item: ItemId = <NextFrunique<T>>::try_get(collection).unwrap_or(0);
-		<NextFrunique<T>>::insert(collection, nex_item + 1);
+		let nex_item: ItemId = <NextFrunique<T>>::try_get(collection.clone()).unwrap_or(0);
+		<NextFrunique<T>>::insert(collection.clone(), nex_item + 1);
 
 		let item = Self::u32_to_instance_id(nex_item);
-		pallet_uniques::Pallet::<T>::do_mint(collection, item, owner, |_| Ok(()))?;
+		pallet_uniques::Pallet::<T>::do_mint(collection.clone(), item, owner, |_| Ok(()))?;
 
 		pallet_uniques::Pallet::<T>::set_metadata(
 			frame_system::RawOrigin::Root.into(),
-			collection,
+			collection.clone(),
 			item.clone(),
 			metadata,
 			false,
@@ -200,7 +200,7 @@ impl<T: Config> Pallet<T> {
 			for (key, value) in attributes {
 				pallet_uniques::Pallet::<T>::set_attribute(
 					frame_system::RawOrigin::Root.into(),
-					collection,
+					collection.clone(),
 					Some(item),
 					key,
 					value,
@@ -272,15 +272,23 @@ impl<T: Config> Pallet<T> {
 		let scope_id = class_id.using_encoded(blake2_256);
 		T::Rbac::create_scope(Self::pallet_id(), scope_id)?;
 
-		Self::insert_auth_in_frunique_collection(owner.clone(), class_id, FruniqueRole::Owner)?;
+		Self::insert_auth_in_frunique_collection(
+			owner.clone(),
+			class_id.clone(),
+			FruniqueRole::Owner,
+		)?;
 
 		pallet_uniques::Pallet::<T>::do_create_collection(
-			class_id,
+			class_id.clone(),
 			owner.clone(),
 			admin.clone(),
 			T::CollectionDeposit::get(),
 			false,
-			pallet_uniques::Event::Created { collection: class_id, creator: admin.clone(), owner },
+			pallet_uniques::Event::Created {
+				collection: class_id.clone(),
+				creator: admin.clone(),
+				owner,
+			},
 		)?;
 
 		pallet_uniques::Pallet::<T>::set_collection_metadata(
@@ -308,13 +316,13 @@ impl<T: Config> Pallet<T> {
 	{
 		ensure!(Self::collection_exists(&collection), Error::<T>::CollectionNotFound);
 
-		let nex_item: ItemId = <NextFrunique<T>>::try_get(collection).unwrap_or(0);
+		let nex_item: ItemId = <NextFrunique<T>>::try_get(collection.clone()).unwrap_or(0);
 		let item = Self::u32_to_instance_id(nex_item);
 
-		Self::do_mint(collection, owner.clone(), metadata.clone(), attributes)?;
+		Self::do_mint(collection.clone(), owner.clone(), metadata.clone(), attributes)?;
 
 		if let Some(ref parent_info) = parent_info {
-			return Self::do_nft_division(collection, item, metadata, parent_info, owner)
+			return Self::do_nft_division(collection.clone(), item, metadata, parent_info, owner)
 		}
 
 		let frunique_data = FruniqueData {
@@ -329,7 +337,7 @@ impl<T: Config> Pallet<T> {
 			verified_by: None,
 		};
 
-		<FruniqueInfo<T>>::insert(collection, item, frunique_data);
+		<FruniqueInfo<T>>::insert(collection.clone(), item, frunique_data);
 		<FruniqueRoots<T>>::insert(collection, item, true);
 
 		Ok(())
@@ -382,7 +390,7 @@ impl<T: Config> Pallet<T> {
 			verified_by: None,
 		};
 
-		<FruniqueInfo<T>>::insert(collection, item, frunique_data);
+		<FruniqueInfo<T>>::insert(collection.clone(), item, frunique_data);
 
 		let frunique_child: ChildInfo<T> = ChildInfo {
 			collection_id: collection,
@@ -422,13 +430,14 @@ impl<T: Config> Pallet<T> {
 		ensure!(Self::collection_exists(&collection), Error::<T>::CollectionNotFound);
 		ensure!(Self::instance_exists(&collection, &item), Error::<T>::FruniqueNotFound);
 
-		let frunique_data: FruniqueData<T> = <FruniqueInfo<T>>::try_get(collection, item).unwrap();
+		let frunique_data: FruniqueData<T> =
+			<FruniqueInfo<T>>::try_get(collection.clone(), item).unwrap();
 
 		ensure!(!frunique_data.frozen, Error::<T>::FruniqueFrozen);
 		ensure!(!frunique_data.redeemed, Error::<T>::FruniqueAlreadyRedeemed);
 
 		<FruniqueInfo<T>>::try_mutate::<_, _, _, DispatchError, _>(
-			collection,
+			collection.clone(),
 			item,
 			|frunique_data| -> DispatchResult {
 				let frunique = frunique_data.as_mut().ok_or(Error::<T>::FruniqueNotFound)?;