git.delta.rocks / unique-network / refs/commits / 59d3ddeed175

--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -100,6 +100,7 @@
 		up_data_structs::CreateItemData::NFT(data) => Ok(CreateItemData::<T> {
 			const_data: data.const_data,
 			variable_data: data.variable_data,
+			properties: data.properties,
 			owner: to.clone(),
 		}),
 		_ => fail!(<Error<T>>::NotNonfungibleDataUsedToMintFungibleCollectionToken),

274			CreateItemData::<T> {274			CreateItemData::<T> {
275				const_data: BoundedVec::default(),275				const_data: BoundedVec::default(),
276				variable_data: BoundedVec::default(),276				variable_data: BoundedVec::default(),
277				properties: BoundedVec::default(),
277				owner: to,278				owner: to,
278			},279			},
279			&budget,280			&budget,
321					.try_into()322					.try_into()
322					.map_err(|_| "token uri is too long")?,323					.map_err(|_| "token uri is too long")?,
323				variable_data: BoundedVec::default(),324				variable_data: BoundedVec::default(),
325				properties: BoundedVec::default(),
324				owner: to,326				owner: to,
325			},327			},
326			&budget,328			&budget,
438			.map(|_| CreateItemData::<T> {440			.map(|_| CreateItemData::<T> {
439				const_data: BoundedVec::default(),441				const_data: BoundedVec::default(),
440				variable_data: BoundedVec::default(),442				variable_data: BoundedVec::default(),
443				properties: BoundedVec::default(),
441				owner: to.clone(),444				owner: to.clone(),
442			})445			})
443			.collect();446			.collect();
481					.try_into()484					.try_into()
482					.map_err(|_| "token uri is too long")?,485					.map_err(|_| "token uri is too long")?,
483				variable_data: vec![].try_into().unwrap(),486				variable_data: vec![].try_into().unwrap(),
487				properties: BoundedVec::default(),
484				owner: to.clone(),488				owner: to.clone(),
485			});489			});
486		}490		}

--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -21,7 +21,7 @@
 use up_data_structs::{
 	AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,
 	mapping::TokenAddressMapping, NestingRule, budget::Budget, Property, PropertyPermission,
-	PropertyKey, PropertyKeyPermission,
+	PropertyKey, PropertyKeyPermission, Properties,
 };
 use pallet_evm::account::CrossAccountId;
 use pallet_common::{
@@ -99,7 +99,7 @@
 	#[pallet::getter(fn token_properties)]
 	pub type TokenProperties<T: Config> = StorageNMap<
 		Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),
-		Value = up_data_structs::Properties,
+		Value = Properties,
 		QueryKind = ValueQuery,
 		OnEmpty = up_data_structs::TokenProperties,
 	>;
@@ -571,6 +571,13 @@
 			);
 			<Owned<T>>::insert((collection.id, &data.owner, token), true);
 
+			Self::set_token_properties(
+				collection,
+				sender,
+				TokenId(token),
+				data.properties.into_inner(),
+			)?;
+
 			collection.log_mirrored(ERC721Events::Transfer {
 				from: H160::default(),
 				to: *data.owner.as_eth(),

--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -29,7 +29,7 @@
 use serde::{Serialize, Deserialize};
 
 use sp_core::U256;
-use sp_runtime::{ArithmeticError, sp_std::prelude::Vec, DispatchError};
+use sp_runtime::{ArithmeticError, sp_std::prelude::Vec};
 use codec::{Decode, Encode, EncodeLike, MaxEncodedLen};
 use frame_support::{BoundedVec, traits::ConstU32};
 use derivative::Derivative;
@@ -486,6 +486,10 @@
 	#[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]
 	#[derivative(Debug(format_with = "bounded::vec_debug"))]
 	pub variable_data: BoundedVec<u8, CustomDataLimit>,
+
+	#[cfg_attr(feature = "serde1", serde(with = "bounded::vec_serde"))]
+	#[derivative(Debug(format_with = "bounded::vec_debug"))]
+	pub properties: CollectionPropertiesVec,
 }
 
 #[derive(Encode, Decode, MaxEncodedLen, Default, Debug, Clone, PartialEq, TypeInfo)]
@@ -536,6 +540,8 @@
 	pub const_data: BoundedVec<u8, CustomDataLimit>,
 	#[derivative(Debug(format_with = "bounded::vec_debug"))]
 	pub variable_data: BoundedVec<u8, CustomDataLimit>,
+	#[derivative(Debug(format_with = "bounded::vec_debug"))]
+	pub properties: CollectionPropertiesVec,
 	pub owner: CrossAccountId,
 }