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),

--- a/pallets/nonfungible/src/erc.rs
+++ b/pallets/nonfungible/src/erc.rs
@@ -274,6 +274,7 @@
 			CreateItemData::<T> {
 				const_data: BoundedVec::default(),
 				variable_data: BoundedVec::default(),
+				properties: BoundedVec::default(),
 				owner: to,
 			},
 			&budget,
@@ -321,6 +322,7 @@
 					.try_into()
 					.map_err(|_| "token uri is too long")?,
 				variable_data: BoundedVec::default(),
+				properties: BoundedVec::default(),
 				owner: to,
 			},
 			&budget,
@@ -438,6 +440,7 @@
 			.map(|_| CreateItemData::<T> {
 				const_data: BoundedVec::default(),
 				variable_data: BoundedVec::default(),
+				properties: BoundedVec::default(),
 				owner: to.clone(),
 			})
 			.collect();
@@ -481,6 +484,7 @@
 					.try_into()
 					.map_err(|_| "token uri is too long")?,
 				variable_data: vec![].try_into().unwrap(),
+				properties: BoundedVec::default(),
 				owner: to.clone(),
 			});
 		}

21use up_data_structs::{21use up_data_structs::{
22	AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,22	AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,
23	mapping::TokenAddressMapping, NestingRule, budget::Budget, Property, PropertyPermission,23	mapping::TokenAddressMapping, NestingRule, budget::Budget, Property, PropertyPermission,
24	PropertyKey, PropertyKeyPermission,24	PropertyKey, PropertyKeyPermission, Properties,
25};25};
26use pallet_evm::account::CrossAccountId;26use pallet_evm::account::CrossAccountId;
27use pallet_common::{27use pallet_common::{
99	#[pallet::getter(fn token_properties)]99	#[pallet::getter(fn token_properties)]
100	pub type TokenProperties<T: Config> = StorageNMap<100	pub type TokenProperties<T: Config> = StorageNMap<
101		Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),101		Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),
102		Value = up_data_structs::Properties,102		Value = Properties,
103		QueryKind = ValueQuery,103		QueryKind = ValueQuery,
104		OnEmpty = up_data_structs::TokenProperties,104		OnEmpty = up_data_structs::TokenProperties,
105	>;105	>;
571			);571			);
572			<Owned<T>>::insert((collection.id, &data.owner, token), true);572			<Owned<T>>::insert((collection.id, &data.owner, token), true);
573
574			Self::set_token_properties(
575				collection,
576				sender,
577				TokenId(token),
578				data.properties.into_inner(),
579			)?;
573580
574			collection.log_mirrored(ERC721Events::Transfer {581			collection.log_mirrored(ERC721Events::Transfer {
575				from: H160::default(),582				from: H160::default(),

--- 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,
 }