git.delta.rocks / unique-network / refs/commits / 50176c630c6d

difftreelog

feat(rmrk) move internal rmrk id to property

Daniel Shiposha2022-06-10parent: #4f0a446.patch.diff
in: master

2 files changed

modifiedpallets/proxy-rmrk-core/src/lib.rsdiffbeforeafterboth
68 pub type UniqueCollectionId<T: Config> =68 pub type UniqueCollectionId<T: Config> =
69 StorageMap<_, Twox64Concat, RmrkCollectionId, CollectionId, ValueQuery>;69 StorageMap<_, Twox64Concat, RmrkCollectionId, CollectionId, ValueQuery>;
70
71 #[pallet::storage]
72 pub type RmrkInernalCollectionId<T: Config> =
73 StorageMap<_, Twox64Concat, CollectionId, RmrkCollectionId, ValueQuery>;
7470
75 #[pallet::pallet]71 #[pallet::pallet]
76 #[pallet::generate_store(pub(super) trait Store)]72 #[pallet::generate_store(pub(super) trait Store)]
226222
227 <UniqueCollectionId<T>>::insert(rmrk_collection_id, unique_collection_id);223 <UniqueCollectionId<T>>::insert(rmrk_collection_id, unique_collection_id);
224
228 <RmrkInernalCollectionId<T>>::insert(unique_collection_id, rmrk_collection_id);225 <PalletCommon<T>>::set_scoped_collection_property(
226 unique_collection_id,
227 PropertyScope::Rmrk,
228 Self::rmrk_property(RmrkInternalCollectionId, &rmrk_collection_id)?
229 )?;
229230
230 <CollectionIndex<T>>::mutate(|n| *n += 1);231 <CollectionIndex<T>>::mutate(|n| *n += 1);
231232
1318 pub fn rmrk_collection_id(1319 pub fn rmrk_collection_id(
1319 unique_collection_id: CollectionId,1320 unique_collection_id: CollectionId,
1320 ) -> Result<RmrkCollectionId, DispatchError> {1321 ) -> Result<RmrkCollectionId, DispatchError> {
1321 <RmrkInernalCollectionId<T>>::try_get(unique_collection_id)1322 Self::get_collection_property_decoded(
1323 unique_collection_id,
1324 RmrkInternalCollectionId
1322 .map_err(|_| <Error<T>>::CollectionUnknown.into())1325 )
1323 }1326 }
13241327
1325 pub fn get_nft_collection(1328 pub fn get_nft_collection(
modifiedpallets/proxy-rmrk-core/src/property.rsdiffbeforeafterboth
20pub enum RmrkProperty<'r> {20pub enum RmrkProperty<'r> {
21 Metadata,21 Metadata,
22 CollectionType,22 CollectionType,
23 RmrkInternalCollectionId,
23 TokenType,24 TokenType,
24 Transferable,25 Transferable,
25 RoyaltyInfo,26 RoyaltyInfo,
66 match self {67 match self {
67 Self::Metadata => key!("metadata"),68 Self::Metadata => key!("metadata"),
68 Self::CollectionType => key!("collection-type"),69 Self::CollectionType => key!("collection-type"),
70 Self::RmrkInternalCollectionId => key!("internal-id"),
69 Self::TokenType => key!("token-type"),71 Self::TokenType => key!("token-type"),
70 Self::Transferable => key!("transferable"),72 Self::Transferable => key!("transferable"),
71 Self::RoyaltyInfo => key!("royalty-info"),73 Self::RoyaltyInfo => key!("royalty-info"),