git.delta.rocks / unique-network / refs/commits / f89b8ce7a49d

--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -36,7 +36,7 @@
 	CUSTOM_DATA_LIMIT, CollectionLimits, CustomDataLimit, CreateCollectionData, SponsorshipState,
 	CreateItemExData, SponsoringRateLimit, budget::Budget, COLLECTION_FIELD_LIMIT, CollectionField,
 	PhantomType, Property, Properties, PropertiesPermissionMap, PropertyKey, PropertyPermission,
-	PropertiesError, PropertyKeyPermission, TokenData,
+	PropertiesError, PropertyKeyPermission, TokenData, CollectionPropertiesPermissionsVec,
 };
 pub use pallet::*;
 use sp_core::H160;
@@ -573,8 +573,24 @@
 			sponsorship,
 			limits,
 			meta_update_permission,
-			..
 		} = <CollectionById<T>>::get(collection)?;
+
+		let token_property_permissions = <CollectionPropertyPermissions<T>>::get(collection)
+			.iter()
+			.map(|(key, permission)| PropertyKeyPermission {
+				key: key.clone(),
+				permission: permission.clone(),
+			})
+			.collect();
+
+		let properties = <CollectionProperties<T>>::get(collection)
+			.iter()
+			.map(|(key, value)| Property {
+				key: key.clone(),
+				value: value.clone()
+			})
+			.collect();
+
 		Some(RpcCollection {
 			name: name.into_inner(),
 			description: description.into_inner(),
@@ -602,6 +618,8 @@
 				CollectionField::VariableOnChainSchema,
 			))
 			.into_inner(),
+			token_property_permissions,
+			properties,
 		})
 	}
 }
@@ -651,8 +669,6 @@
 				.map(|limits| Self::clamp_limits(data.mode.clone(), &Default::default(), limits))
 				.unwrap_or_else(|| Ok(CollectionLimits::default()))?,
 			meta_update_permission: data.meta_update_permission.unwrap_or_default(),
-			// token_property_permissions: data.token_property_permissions.unwrap_or_default(),
-			// properties: Properties::from_collection_props_vec(data.properties)?
 		};
 
 		CollectionProperties::<T>::insert(

329	pub variable_on_chain_schema: Vec<u8>,329	pub variable_on_chain_schema: Vec<u8>,
330	pub const_on_chain_schema: Vec<u8>,330	pub const_on_chain_schema: Vec<u8>,
331	pub meta_update_permission: MetaUpdatePermission,331	pub meta_update_permission: MetaUpdatePermission,
332	pub token_property_permissions: Vec<PropertyKeyPermission>,
333	pub properties: Vec<Property>,
332}334}
333335
334#[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)]336#[derive(Encode, Decode, Clone, PartialEq, TypeInfo, MaxEncodedLen)]