update storage map to only have parent information when is needed, delete unused extrinsics.

Author: tlacloc

pallets/fruniques/src/functions.rs

@@ -67,6 +67,13 @@ impl<T: Config> Pallet<T> {
 		false
 	}
 
+	pub fn item_exists(class_id: &T::CollectionId, instance_id: &T::ItemId) -> bool {
+		if let Some(_owner) = pallet_uniques::Pallet::<T>::owner(*class_id, *instance_id) {
+			return true;
+		}
+		false
+	}
+
 	pub fn set_attribute(
 		origin: OriginFor<T>,
 		class_id: &T::CollectionId,

pallets/fruniques/src/lib.rs

@@ -108,7 +108,7 @@ pub mod pallet {
 		CollectionId,
 		Blake2_128Concat,
 		ItemId, // FruniqueId
-		HierarchicalInfo, // ParentId and flag if it inherit attributes
+		Option<HierarchicalInfo>, // ParentId and flag if it inherit attributes
 		ValueQuery
 	>;
 
@@ -155,44 +155,6 @@ pub mod pallet {
 			Ok(())
 		}
 
-		/// Issue a new frunique from a public origin.
-		///
-		/// A new NFT (unique) is created and reserved,
-		/// a fungible token (asset) is created and minted to the owner.
-		///
-		/// The origin must be Signed and the sender must have sufficient funds free.
-		///
-		/// `AssetDeposit` funds of sender are reserved.
-		///
-		/// Parameters:
-		/// - `asset_id`: The identifier of the new asset. This must not be currently in use to identify
-		/// an existing asset.
-		/// - `class`: The identifier of the new asset class. This must not be currently in use.
-		/// - `admin`: The admin of this class of assets. The admin is the initial address of each
-		/// member of the asset class's admin team.
-		///
-		/// Emits `FruniqueCreated` event when successful.
-		///
-		/// Weight: `O(1)`
-		#[pallet::weight(10_000 + T::DbWeight::get().writes(1))]
-		pub fn create(
-			origin: OriginFor<T>,
-			class_id: T::CollectionId,
-			instance_id: T::ItemId,
-			numeric_value: Option<Permill>,
-			admin: <T::Lookup as sp_runtime::traits::StaticLookup>::Source,
-		) -> DispatchResult {
-			let owner = ensure_signed(origin.clone())?;
-
-			// create an NFT in the uniques pallet
-			Self::do_create(origin.clone(), class_id, instance_id, numeric_value, admin.clone())?;
-
-			let admin = T::Lookup::lookup(admin)?;
-			Self::deposit_event(Event::FruniqueCreated(owner, admin, class_id, instance_id));
-
-			Ok(())
-		}
-
 		#[pallet::weight(10_000 + T::DbWeight::get().writes(4))]
 		pub fn instance_exists(
 			_origin: OriginFor<T>,
@@ -244,49 +206,6 @@ pub mod pallet {
 			Ok(())
 		}
 
-		/// ## Create a frunique with given attributes.
-		/// `origin` must be signed by the owner of the frunique.
-		/// - `attributes` must be a list of pairs of `key` and `value`.
-		/// `key` must be a valid key for the asset class.
-		/// `value` must be a valid value for the asset class.
-		/// `attributes` must not be empty.
-		/// - `instance_id` must be a valid instance of the asset class.
-		/// - `class_id` must be a valid class of the asset class.
-		/// - `numeric_value` must be a valid value for the asset class.
-		/// - `admin` must be a valid admin of the asset class.
-		/// - `instance_id` must not be already in use.
-		/// - `class_id` must not be already in use.
-		/// - `numeric_value` must not be already in use.
-		#[pallet::weight(10_000 + T::DbWeight::get().writes(1))]
-		pub fn create_with_attributes(
-			origin: OriginFor<T>,
-			class_id: T::CollectionId,
-			instance_id: T::ItemId,
-			numeric_value: Option<Permill>,
-			admin: <T::Lookup as sp_runtime::traits::StaticLookup>::Source,
-			attributes: Vec<(BoundedVec<u8, T::KeyLimit>, BoundedVec<u8, T::ValueLimit>)>,
-		) -> DispatchResult {
-			// ! Ensure the admin is the one who can add attributes to the frunique.
-			ensure!(!attributes.is_empty(), Error::<T>::AttributesEmpty);
-
-			let owner = ensure_signed(origin.clone())?;
-			// create an NFT in the uniques pallet
-			Self::do_create(origin.clone(), class_id, instance_id, numeric_value, admin.clone())?;
-			for attribute in &attributes {
-				Self::set_attribute(
-					origin.clone(),
-					&class_id.clone(),
-					Self::u32_to_instance_id(instance_id.clone()),
-					attribute.0.clone(),
-					attribute.1.clone(),
-				)?;
-			}
-
-			let admin = T::Lookup::lookup(admin)?;
-			Self::deposit_event(Event::FruniqueCreated(owner, admin, class_id, instance_id));
-			Ok(())
-		}
-
 		/// ## NFT Division
 		///
 		/// PD: the Key/value length limits are inherited from the uniques pallet,
@@ -328,115 +247,17 @@ pub mod pallet {
 				attributes
 			)?;
 
+			Self::deposit_event(Event::FruniqueCreated(owner.clone(), owner, class_id, instance_id));
+
 			if let Some(parent_info) = parent_info {
 				// ! check if parent exists
-				<FruniqueParent<T>>::insert(class_id, instance_id, parent_info);
+				ensure!(Self::item_exists(&class_id, &parent_info.0),  <Error<T>>::CollectionNotFound);
+				<FruniqueParent<T>>::insert(class_id, instance_id, Some(parent_info));
 				// Self::do_hierarchical_division(origin.clone(), class_id, instance_id, parent_info)?;
 			}
 
 			Ok(())
 		}
-		// Old one
-		// #[pallet::weight(10_000 + T::DbWeight::get().writes(4))]
-		// pub fn spawn(
-		// 	origin: OriginFor<T>,
-		// 	class_id: T::CollectionId,
-		// 	instance_id: T::ItemId,
-		// 	inherit_attrs: bool,
-		// 	_p: Permill,
-		// 	admin: <T::Lookup as sp_runtime::traits::StaticLookup>::Source,
-		// ) -> DispatchResult
-		// where
-		// 	<T as pallet_uniques::Config>::ItemId: From<u32>,
-		// {
-		// 	// Boilerplate (setup, conversions, ensure_signed)
-		// 	let owner = ensure_signed(origin.clone())?;
-		// 	let encoded_id = instance_id.encode();
-		// 	// TODO: Check if the instance_id exists?
-		// 	let parent_id_key = BoundedVec::<u8, T::KeyLimit>::try_from(r#"parent_id"#.encode())
-		// 		.expect("Error on encoding the parent_id key to BoundedVec");
-		// 	let mut parent_id_val: BoundedVec<u8, T::ValueLimit>;
-		// 	// Instance n number of nfts (with the respective parentId)
-		// 	let new_instance_id = Self::frunique_cnt().try_into().unwrap();
-		// 	// Mint a unique
-		// 	Self::mint(origin.clone(), &class_id, new_instance_id, admin.clone())?;
-		// 	// Set the respective attributtes
-		// 	if inherit_attrs {
-		// 		// TODO: Check all the parent's instance attributes
-		// 		// Let's start with some static attributes check (does parent_id exist?)
-		// 		// Options:
-		// 		// 1.- Constant &str array containing the keys
-		// 		// 2.- Set a whole single attribute as bytes, containing all the fruniques metadata (parent_id, numerical_value, etc..)
-		// 		// 3.- Keep our own metadata (or whole nfts) storage on
-		// 		// 3.1.- Consider the 3 above but with interfaces/traits
-		// 		// I'm assuming doing it via scripts on the front-end isn't viable option
-		// 		let parent_id =
-		// 			Self::get_nft_attribute(&class_id, &instance_id, &"parent_id".encode());
-		// 		if parent_id.len() > 0 {
-		// 			parent_id_val = parent_id;
-		// 		} else {
-		// 			parent_id_val = BoundedVec::<u8, T::ValueLimit>::try_from(encoded_id.clone())
-		// 				.expect("Error on converting the parent_id to BoundedVec");
-		// 		}
-		// 		let num_value =
-		// 			Self::get_nft_attribute(&class_id, &instance_id, &"num_value".encode());
-		// 		if num_value.len() > 0 {
-		// 			let num_value_key =
-		// 				BoundedVec::<u8, T::KeyLimit>::try_from(r#"num_value"#.encode())
-		// 					.expect("Error on encoding the num_value key to BoundedVec");
-		// 			// TODO: Call bytes_to_u32 & divide the numeric value before setting it
-		// 			Self::set_attribute(
-		// 				origin.clone(),
-		// 				&class_id,
-		// 				Self::u32_to_instance_id(new_instance_id),
-		// 				num_value_key,
-		// 				num_value,
-		// 			)?;
-		// 		}
-		// 		if let Some(parent_attr) = pallet_uniques::Pallet::<T>::attribute(
-		// 			&class_id,
-		// 			&instance_id,
-		// 			&"parent_id".encode(),
-		// 		) {
-		// 			//println!(" Instance number {:?} parent_id (parent's parent): {:#?}", instance_id, Self::bytes_to_u32( parent_attr.clone() ));
-		// 			parent_id_val = BoundedVec::<u8, T::ValueLimit>::try_from(parent_attr)
-		// 				.expect("Error on converting the parent_id to BoundedVec");
-		// 		} else {
-		// 			//println!("The parent doesn't have a parent_id");
-		// 			parent_id_val = BoundedVec::<u8, T::ValueLimit>::try_from(encoded_id)
-		// 				.expect("Error on converting the parent_id to BoundedVec");
-		// 		}
-		// 	} else {
-		// 		parent_id_val = BoundedVec::<u8, T::ValueLimit>::try_from(encoded_id)
-		// 			.expect("Error on converting the parent_id to BoundedVec");
-		// 	}
-		// 	// (for encoding reasons the parentId is stored on hex format as a secondary side-effect, I hope it's not too much of a problem).
-		// 	Self::set_attribute(
-		// 		origin.clone(),
-		// 		&class_id,
-		// 		Self::u32_to_instance_id(new_instance_id),
-		// 		parent_id_key,
-		// 		parent_id_val,
-		// 	)?;
-		// 	let _e = Self::instance_exists(origin, class_id, instance_id);
-		// 	//let final_test = pallet_uniques::Pallet::<T>::attribute(&class_id, &Self::u16_to_instance_id(new_instance_id ), &r#"parent_id"#.encode() );
-		// 	//println!("The parent_id of {} is now {:?}",new_instance_id, Self::bytes_to_u32(final_test.unwrap()) );
-		// 	// TODO: set the divided value attribute. Numbers, divisions and floating points are giving a lot of problems
-		// 	let admin = T::Lookup::lookup(admin)?;
-		// 	Self::deposit_event(Event::FruniqueDivided(owner, admin, class_id, instance_id));
-		// 	// Freeze the nft to prevent trading it? Burn it? Not clear, so nothing at the moment
-		// 	// Freeze parent
-
-		// 	// unique -> n parts of parent
-		// 	// unique is freezed
-		// 	// 1, 2, 3, 4, ..., n
-		// 	// alice 1 & bob 1 & carol 1 & ... & n
-		// 	// (n - 5) -> m parts of parent
-		// 	// m parts of the new frunique
-		// 	// n
-
-		// 	Ok(())
-		// }
 
 		/// Kill all the stored data.
 		///

pallets/fruniques/src/types.rs

@@ -11,4 +11,4 @@ pub type StringLimit<T> = BoundedVec<u8, <T as pallet_uniques::Config>::StringLi
 pub type CollectionId = u32;
 pub type ItemId = u32;
 
-pub type HierarchicalInfo = (Option<ItemId>, bool);
+pub type HierarchicalInfo = (ItemId, bool);