--- a/Cargo.lock +++ b/Cargo.lock @@ -1300,9 +1300,9 @@ [[package]] name = "crossbeam-channel" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" +checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1321,15 +1321,15 @@ [[package]] name = "crossbeam-epoch" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" +checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d" dependencies = [ "autocfg", "cfg-if 1.0.0", "crossbeam-utils", - "lazy_static", "memoffset", + "once_cell", "scopeguard", ] @@ -1345,12 +1345,12 @@ [[package]] name = "crossbeam-utils" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +checksum = "8ff1f980957787286a554052d03c7aee98d99cc32e09f6d45f0a814133c87978" dependencies = [ "cfg-if 1.0.0", - "lazy_static", + "once_cell", ] [[package]] @@ -3662,12 +3662,12 @@ [[package]] name = "indexmap" -version = "1.8.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6012d540c5baa3589337a98ce73408de9b5a25ec9fc2c6fd6be8f0d39e0ca5a" +checksum = "6c6392766afd7964e2531940894cffe4bd8d7d17dbc3c1c4857040fd4b33bdb3" dependencies = [ "autocfg", - "hashbrown 0.11.2", + "hashbrown 0.12.1", "serde", ] @@ -11591,7 +11591,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "strum_macros 0.24.1", + "strum_macros 0.24.0", ] [[package]] @@ -11609,9 +11609,9 @@ [[package]] name = "strum_macros" -version = "0.24.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9550962e7cf70d9980392878dfaf1dcc3ece024f4cf3bf3c46b978d0bad61d6c" +checksum = "6878079b17446e4d3eba6192bb0a2950d5b14f0ed8424b852310e5a94345d0ef" dependencies = [ "heck 0.4.0", "proc-macro2", --- a/pallets/nonfungible/src/lib.rs +++ b/pallets/nonfungible/src/lib.rs @@ -28,7 +28,7 @@ use up_data_structs::{ AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData, mapping::TokenAddressMapping, budget::Budget, Property, PropertyPermission, PropertyKey, - PropertyKeyPermission, Properties, PropertyScope, TrySetProperty, TokenChild, SysPropertyValue, + PropertyKeyPermission, Properties, PropertyScope, TrySetProperty, TokenChild, AuxPropertyValue, }; use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm}; use pallet_common::{ @@ -125,15 +125,15 @@ >; #[pallet::storage] - #[pallet::getter(fn token_sys_property)] - pub type TokenSysProperties = StorageNMap< + #[pallet::getter(fn token_aux_property)] + pub type TokenAuxProperties = StorageNMap< Key = ( Key, Key, Key, Key, ), - Value = SysPropertyValue, + Value = AuxPropertyValue, QueryKind = OptionQuery, >; @@ -307,31 +307,31 @@ Ok(()) } - pub fn try_mutate_token_sys_property( + pub fn try_mutate_token_aux_property( collection_id: CollectionId, token_id: TokenId, scope: PropertyScope, key: PropertyKey, - f: impl FnOnce(&mut Option) -> Result, + f: impl FnOnce(&mut Option) -> Result, ) -> Result { - >::try_mutate((collection_id, token_id, scope, key), f) + >::try_mutate((collection_id, token_id, scope, key), f) } - pub fn remove_token_sys_property( + pub fn remove_token_aux_property( collection_id: CollectionId, token_id: TokenId, scope: PropertyScope, key: PropertyKey, ) { - >::remove((collection_id, token_id, scope, key)); + >::remove((collection_id, token_id, scope, key)); } - pub fn iterate_token_sys_properties( + pub fn iterate_token_aux_properties( collection_id: CollectionId, token_id: TokenId, scope: PropertyScope, - ) -> impl Iterator { - >::iter_prefix((collection_id, token_id, scope)) + ) -> impl Iterator { + >::iter_prefix((collection_id, token_id, scope)) } pub fn current_token_id(collection_id: CollectionId) -> TokenId { @@ -415,7 +415,7 @@ >::insert(collection.id, burnt); >::remove((collection.id, token)); >::remove((collection.id, token)); - >::remove_prefix((collection.id, token), None); + >::remove_prefix((collection.id, token), None); let old_spender = >::take((collection.id, token)); if let Some(old_spender) = old_spender { --- a/pallets/proxy-rmrk-core/src/lib.rs +++ b/pallets/proxy-rmrk-core/src/lib.rs @@ -762,7 +762,7 @@ let resource_id_key = Self::rmrk_property_key(ResourceId(resource_id))?; - let resource_info = >::token_sys_property(( + let resource_info = >::token_aux_property(( collection_id, nft_id, PropertyScope::Rmrk, @@ -777,7 +777,7 @@ >::ResourceNotPending ); - >::remove_token_sys_property( + >::remove_token_aux_property( collection_id, nft_id, PropertyScope::Rmrk, @@ -1194,7 +1194,7 @@ pending_removal: false, }; - >::try_mutate_token_sys_property( + >::try_mutate_token_aux_property( collection_id, nft_id, PropertyScope::Rmrk, @@ -1223,7 +1223,7 @@ let scope = PropertyScope::Rmrk; ensure!( - >::token_sys_property(( + >::token_aux_property(( collection_id, nft_id, scope, @@ -1239,7 +1239,7 @@ let sender = T::CrossAccountId::from_sub(sender); if topmost_owner == sender { - >::remove_token_sys_property( + >::remove_token_aux_property( collection_id, nft_id, PropertyScope::Rmrk, @@ -1262,7 +1262,7 @@ resource_id: RmrkResourceId, f: impl FnOnce(&mut RmrkResourceInfo) -> DispatchResult, ) -> DispatchResult { - >::try_mutate_token_sys_property( + >::try_mutate_token_aux_property( collection_id, nft_id, PropertyScope::Rmrk, --- a/pallets/proxy-rmrk-core/src/weights.rs +++ b/pallets/proxy-rmrk-core/src/weights.rs @@ -3,7 +3,7 @@ //! Autogenerated weights for pallet_proxy_rmrk_core //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-06-16, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-06-17, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024 // Executed Command: @@ -64,7 +64,7 @@ // Storage: Common CollectionById (r:0 w:1) // Storage: RmrkCore UniqueCollectionId (r:0 w:1) fn create_collection() -> Weight { - (42_239_000 as Weight) + (42_359_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(8 as Weight)) } @@ -77,7 +77,7 @@ // Storage: Nonfungible TokensBurnt (r:0 w:1) // Storage: Common AdminAmount (r:0 w:1) fn destroy_collection() -> Weight { - (44_684_000 as Weight) + (45_375_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } @@ -85,7 +85,7 @@ // Storage: Common CollectionById (r:1 w:1) // Storage: Common CollectionProperties (r:1 w:0) fn change_collection_issuer() -> Weight { - (22_513_000 as Weight) + (22_753_000 as Weight) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -95,7 +95,7 @@ // Storage: Nonfungible TokensMinted (r:1 w:0) // Storage: Nonfungible TokensBurnt (r:1 w:0) fn lock_collection() -> Weight { - (23_735_000 as Weight) + (24_356_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -107,11 +107,11 @@ // Storage: Nonfungible TokenProperties (r:1 w:1) // Storage: Nonfungible TokenData (r:0 w:1) // Storage: Nonfungible Owned (r:0 w:1) - // Storage: Nonfungible TokenSysProperties (r:2 w:2) + // Storage: Nonfungible TokenAuxProperties (r:2 w:2) fn mint_nft(b: u32, ) -> Weight { - (45_152_000 as Weight) + (44_853_000 as Weight) // Standard Error: 2_000 - .saturating_add((11_084_000 as Weight).saturating_mul(b as Weight)) + .saturating_add((10_721_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(6 as Weight)) .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight))) .saturating_add(T::DbWeight::get().writes(5 as Weight)) @@ -129,8 +129,8 @@ // Storage: Nonfungible TokenProperties (r:0 w:1) fn burn_nft(b: u32, ) -> Weight { (0 as Weight) - // Standard Error: 1_581_000 - .saturating_add((321_866_000 as Weight).saturating_mul(b as Weight)) + // Standard Error: 1_590_000 + .saturating_add((319_825_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(9 as Weight)) .saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(b as Weight))) .saturating_add(T::DbWeight::get().writes(6 as Weight)) @@ -146,7 +146,7 @@ // Storage: Nonfungible TokenChildren (r:0 w:1) // Storage: Nonfungible Owned (r:0 w:2) fn send() -> Weight { - (72_246_000 as Weight) + (72_576_000 as Weight) .saturating_add(T::DbWeight::get().reads(12 as Weight)) .saturating_add(T::DbWeight::get().writes(6 as Weight)) } @@ -160,7 +160,7 @@ // Storage: Nonfungible TokenChildren (r:0 w:1) // Storage: Nonfungible Owned (r:0 w:2) fn accept_nft() -> Weight { - (81_203_000 as Weight) + (79_670_000 as Weight) .saturating_add(T::DbWeight::get().reads(15 as Weight)) .saturating_add(T::DbWeight::get().writes(7 as Weight)) } @@ -175,7 +175,7 @@ // Storage: Nonfungible Allowance (r:5 w:0) // Storage: Nonfungible Owned (r:0 w:5) fn reject_nft() -> Weight { - (253_117_000 as Weight) + (254_989_000 as Weight) .saturating_add(T::DbWeight::get().reads(29 as Weight)) .saturating_add(T::DbWeight::get().writes(25 as Weight)) } @@ -185,7 +185,7 @@ // Storage: Nonfungible TokenProperties (r:1 w:1) // Storage: Nonfungible TokenData (r:5 w:0) fn set_property() -> Weight { - (49_653_000 as Weight) + (48_651_000 as Weight) .saturating_add(T::DbWeight::get().reads(9 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -195,7 +195,7 @@ // Storage: Nonfungible TokenProperties (r:1 w:1) // Storage: Nonfungible TokenData (r:5 w:0) fn set_priority() -> Weight { - (47_890_000 as Weight) + (47_579_000 as Weight) .saturating_add(T::DbWeight::get().reads(9 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -204,9 +204,9 @@ // Storage: Common CollectionById (r:1 w:0) // Storage: Nonfungible TokenData (r:5 w:0) // Storage: Nonfungible TokenProperties (r:1 w:1) - // Storage: Nonfungible TokenSysProperties (r:1 w:1) + // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn add_basic_resource() -> Weight { - (54_703_000 as Weight) + (55_013_000 as Weight) .saturating_add(T::DbWeight::get().reads(10 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -215,9 +215,9 @@ // Storage: Common CollectionById (r:1 w:0) // Storage: Nonfungible TokenData (r:5 w:0) // Storage: Nonfungible TokenProperties (r:1 w:1) - // Storage: Nonfungible TokenSysProperties (r:1 w:1) + // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn add_composable_resource() -> Weight { - (55_114_000 as Weight) + (55_184_000 as Weight) .saturating_add(T::DbWeight::get().reads(10 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -226,19 +226,19 @@ // Storage: Common CollectionById (r:1 w:0) // Storage: Nonfungible TokenData (r:5 w:0) // Storage: Nonfungible TokenProperties (r:1 w:1) - // Storage: Nonfungible TokenSysProperties (r:1 w:1) + // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn add_slot_resource() -> Weight { - (55_615_000 as Weight) + (54_792_000 as Weight) .saturating_add(T::DbWeight::get().reads(10 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } // Storage: RmrkCore UniqueCollectionId (r:1 w:0) // Storage: Common CollectionProperties (r:1 w:0) // Storage: Common CollectionById (r:1 w:0) - // Storage: Nonfungible TokenSysProperties (r:1 w:1) + // Storage: Nonfungible TokenAuxProperties (r:1 w:1) // Storage: Nonfungible TokenData (r:5 w:0) fn remove_resource() -> Weight { - (47_139_000 as Weight) + (46_447_000 as Weight) .saturating_add(T::DbWeight::get().reads(9 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -246,9 +246,9 @@ // Storage: Common CollectionProperties (r:1 w:0) // Storage: Common CollectionById (r:1 w:0) // Storage: Nonfungible TokenData (r:5 w:0) - // Storage: Nonfungible TokenSysProperties (r:1 w:1) + // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn accept_resource() -> Weight { - (45_535_000 as Weight) + (45_096_000 as Weight) .saturating_add(T::DbWeight::get().reads(9 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -256,9 +256,9 @@ // Storage: Common CollectionProperties (r:1 w:0) // Storage: Common CollectionById (r:1 w:0) // Storage: Nonfungible TokenData (r:5 w:0) - // Storage: Nonfungible TokenSysProperties (r:1 w:1) + // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn accept_resource_removal() -> Weight { - (46_327_000 as Weight) + (45_445_000 as Weight) .saturating_add(T::DbWeight::get().reads(9 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -275,7 +275,7 @@ // Storage: Common CollectionById (r:0 w:1) // Storage: RmrkCore UniqueCollectionId (r:0 w:1) fn create_collection() -> Weight { - (42_239_000 as Weight) + (42_359_000 as Weight) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(8 as Weight)) } @@ -288,7 +288,7 @@ // Storage: Nonfungible TokensBurnt (r:0 w:1) // Storage: Common AdminAmount (r:0 w:1) fn destroy_collection() -> Weight { - (44_684_000 as Weight) + (45_375_000 as Weight) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } @@ -296,7 +296,7 @@ // Storage: Common CollectionById (r:1 w:1) // Storage: Common CollectionProperties (r:1 w:0) fn change_collection_issuer() -> Weight { - (22_513_000 as Weight) + (22_753_000 as Weight) .saturating_add(RocksDbWeight::get().reads(3 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -306,7 +306,7 @@ // Storage: Nonfungible TokensMinted (r:1 w:0) // Storage: Nonfungible TokensBurnt (r:1 w:0) fn lock_collection() -> Weight { - (23_735_000 as Weight) + (24_356_000 as Weight) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -318,11 +318,11 @@ // Storage: Nonfungible TokenProperties (r:1 w:1) // Storage: Nonfungible TokenData (r:0 w:1) // Storage: Nonfungible Owned (r:0 w:1) - // Storage: Nonfungible TokenSysProperties (r:2 w:2) + // Storage: Nonfungible TokenAuxProperties (r:2 w:2) fn mint_nft(b: u32, ) -> Weight { - (45_152_000 as Weight) + (44_853_000 as Weight) // Standard Error: 2_000 - .saturating_add((11_084_000 as Weight).saturating_mul(b as Weight)) + .saturating_add((10_721_000 as Weight).saturating_mul(b as Weight)) .saturating_add(RocksDbWeight::get().reads(6 as Weight)) .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight))) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) @@ -340,8 +340,8 @@ // Storage: Nonfungible TokenProperties (r:0 w:1) fn burn_nft(b: u32, ) -> Weight { (0 as Weight) - // Standard Error: 1_581_000 - .saturating_add((321_866_000 as Weight).saturating_mul(b as Weight)) + // Standard Error: 1_590_000 + .saturating_add((319_825_000 as Weight).saturating_mul(b as Weight)) .saturating_add(RocksDbWeight::get().reads(9 as Weight)) .saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(b as Weight))) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) @@ -357,7 +357,7 @@ // Storage: Nonfungible TokenChildren (r:0 w:1) // Storage: Nonfungible Owned (r:0 w:2) fn send() -> Weight { - (72_246_000 as Weight) + (72_576_000 as Weight) .saturating_add(RocksDbWeight::get().reads(12 as Weight)) .saturating_add(RocksDbWeight::get().writes(6 as Weight)) } @@ -371,7 +371,7 @@ // Storage: Nonfungible TokenChildren (r:0 w:1) // Storage: Nonfungible Owned (r:0 w:2) fn accept_nft() -> Weight { - (81_203_000 as Weight) + (79_670_000 as Weight) .saturating_add(RocksDbWeight::get().reads(15 as Weight)) .saturating_add(RocksDbWeight::get().writes(7 as Weight)) } @@ -386,7 +386,7 @@ // Storage: Nonfungible Allowance (r:5 w:0) // Storage: Nonfungible Owned (r:0 w:5) fn reject_nft() -> Weight { - (253_117_000 as Weight) + (254_989_000 as Weight) .saturating_add(RocksDbWeight::get().reads(29 as Weight)) .saturating_add(RocksDbWeight::get().writes(25 as Weight)) } @@ -396,7 +396,7 @@ // Storage: Nonfungible TokenProperties (r:1 w:1) // Storage: Nonfungible TokenData (r:5 w:0) fn set_property() -> Weight { - (49_653_000 as Weight) + (48_651_000 as Weight) .saturating_add(RocksDbWeight::get().reads(9 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -406,7 +406,7 @@ // Storage: Nonfungible TokenProperties (r:1 w:1) // Storage: Nonfungible TokenData (r:5 w:0) fn set_priority() -> Weight { - (47_890_000 as Weight) + (47_579_000 as Weight) .saturating_add(RocksDbWeight::get().reads(9 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -415,9 +415,9 @@ // Storage: Common CollectionById (r:1 w:0) // Storage: Nonfungible TokenData (r:5 w:0) // Storage: Nonfungible TokenProperties (r:1 w:1) - // Storage: Nonfungible TokenSysProperties (r:1 w:1) + // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn add_basic_resource() -> Weight { - (54_703_000 as Weight) + (55_013_000 as Weight) .saturating_add(RocksDbWeight::get().reads(10 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } @@ -426,9 +426,9 @@ // Storage: Common CollectionById (r:1 w:0) // Storage: Nonfungible TokenData (r:5 w:0) // Storage: Nonfungible TokenProperties (r:1 w:1) - // Storage: Nonfungible TokenSysProperties (r:1 w:1) + // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn add_composable_resource() -> Weight { - (55_114_000 as Weight) + (55_184_000 as Weight) .saturating_add(RocksDbWeight::get().reads(10 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } @@ -437,19 +437,19 @@ // Storage: Common CollectionById (r:1 w:0) // Storage: Nonfungible TokenData (r:5 w:0) // Storage: Nonfungible TokenProperties (r:1 w:1) - // Storage: Nonfungible TokenSysProperties (r:1 w:1) + // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn add_slot_resource() -> Weight { - (55_615_000 as Weight) + (54_792_000 as Weight) .saturating_add(RocksDbWeight::get().reads(10 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } // Storage: RmrkCore UniqueCollectionId (r:1 w:0) // Storage: Common CollectionProperties (r:1 w:0) // Storage: Common CollectionById (r:1 w:0) - // Storage: Nonfungible TokenSysProperties (r:1 w:1) + // Storage: Nonfungible TokenAuxProperties (r:1 w:1) // Storage: Nonfungible TokenData (r:5 w:0) fn remove_resource() -> Weight { - (47_139_000 as Weight) + (46_447_000 as Weight) .saturating_add(RocksDbWeight::get().reads(9 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -457,9 +457,9 @@ // Storage: Common CollectionProperties (r:1 w:0) // Storage: Common CollectionById (r:1 w:0) // Storage: Nonfungible TokenData (r:5 w:0) - // Storage: Nonfungible TokenSysProperties (r:1 w:1) + // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn accept_resource() -> Weight { - (45_535_000 as Weight) + (45_096_000 as Weight) .saturating_add(RocksDbWeight::get().reads(9 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -467,9 +467,9 @@ // Storage: Common CollectionProperties (r:1 w:0) // Storage: Common CollectionById (r:1 w:0) // Storage: Nonfungible TokenData (r:5 w:0) - // Storage: Nonfungible TokenSysProperties (r:1 w:1) + // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn accept_resource_removal() -> Weight { - (46_327_000 as Weight) + (45_445_000 as Weight) .saturating_add(RocksDbWeight::get().reads(9 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } --- a/primitives/data-structs/src/lib.rs +++ b/primitives/data-structs/src/lib.rs @@ -104,7 +104,7 @@ pub const MAX_PROPERTY_VALUE_LENGTH: u32 = 32768; pub const MAX_PROPERTIES_PER_ITEM: u32 = 64; -pub const MAX_SYSTEM_PROPERTY_VALUE_LENGTH: u32 = 2048; +pub const MAX_AUX_PROPERTY_VALUE_LENGTH: u32 = 2048; pub const MAX_COLLECTION_PROPERTIES_SIZE: u32 = 40960; pub const MAX_TOKEN_PROPERTIES_SIZE: u32 = 32768; @@ -658,7 +658,7 @@ pub type BoundedBytes = BoundedVec; -pub type SysPropertyValue = BoundedBytes>; +pub type AuxPropertyValue = BoundedBytes>; pub type PropertyKey = BoundedBytes>; pub type PropertyValue = BoundedBytes>; --- a/runtime/opal/src/lib.rs +++ b/runtime/opal/src/lib.rs @@ -1513,7 +1513,7 @@ let nft_id = TokenId(nft_id); if RmrkCore::ensure_nft_type(collection_id, nft_id, NftType::Regular).is_err() { return Ok(Vec::new()); } - let resources = >::iterate_token_sys_properties( + let resources = >::iterate_token_aux_properties( collection_id, nft_id, PropertyScope::Rmrk ).filter_map(|(_, value)| { let resource_info: RmrkResourceInfo = RmrkCore::decode_property(&value).ok()?; --- a/runtime/quartz/src/lib.rs +++ b/runtime/quartz/src/lib.rs @@ -1513,7 +1513,7 @@ let nft_id = TokenId(nft_id); if RmrkCore::ensure_nft_type(collection_id, nft_id, NftType::Regular).is_err() { return Ok(Vec::new()); } - let resources = >::iterate_token_sys_properties( + let resources = >::iterate_token_aux_properties( collection_id, nft_id, PropertyScope::Rmrk ).filter_map(|(_, value)| { let resource_info: RmrkResourceInfo = RmrkCore::decode_property(&value).ok()?;