difftreelog
fix rename sys property to aux property
in: master
7 files changed
Cargo.lockdiffbeforeafterboth--- 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",
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- 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<T: Config> = StorageNMap<
+ #[pallet::getter(fn token_aux_property)]
+ pub type TokenAuxProperties<T: Config> = StorageNMap<
Key = (
Key<Twox64Concat, CollectionId>,
Key<Twox64Concat, TokenId>,
Key<Twox64Concat, PropertyScope>,
Key<Twox64Concat, PropertyKey>,
),
- Value = SysPropertyValue,
+ Value = AuxPropertyValue,
QueryKind = OptionQuery,
>;
@@ -307,31 +307,31 @@
Ok(())
}
- pub fn try_mutate_token_sys_property<R, E>(
+ pub fn try_mutate_token_aux_property<R, E>(
collection_id: CollectionId,
token_id: TokenId,
scope: PropertyScope,
key: PropertyKey,
- f: impl FnOnce(&mut Option<SysPropertyValue>) -> Result<R, E>,
+ f: impl FnOnce(&mut Option<AuxPropertyValue>) -> Result<R, E>,
) -> Result<R, E> {
- <TokenSysProperties<T>>::try_mutate((collection_id, token_id, scope, key), f)
+ <TokenAuxProperties<T>>::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,
) {
- <TokenSysProperties<T>>::remove((collection_id, token_id, scope, key));
+ <TokenAuxProperties<T>>::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<Item = (PropertyKey, SysPropertyValue)> {
- <TokenSysProperties<T>>::iter_prefix((collection_id, token_id, scope))
+ ) -> impl Iterator<Item = (PropertyKey, AuxPropertyValue)> {
+ <TokenAuxProperties<T>>::iter_prefix((collection_id, token_id, scope))
}
pub fn current_token_id(collection_id: CollectionId) -> TokenId {
@@ -415,7 +415,7 @@
<TokensBurnt<T>>::insert(collection.id, burnt);
<TokenData<T>>::remove((collection.id, token));
<TokenProperties<T>>::remove((collection.id, token));
- <TokenSysProperties<T>>::remove_prefix((collection.id, token), None);
+ <TokenAuxProperties<T>>::remove_prefix((collection.id, token), None);
let old_spender = <Allowance<T>>::take((collection.id, token));
if let Some(old_spender) = old_spender {
pallets/proxy-rmrk-core/src/lib.rsdiffbeforeafterboth--- 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 = <PalletNft<T>>::token_sys_property((
+ let resource_info = <PalletNft<T>>::token_aux_property((
collection_id,
nft_id,
PropertyScope::Rmrk,
@@ -777,7 +777,7 @@
<Error<T>>::ResourceNotPending
);
- <PalletNft<T>>::remove_token_sys_property(
+ <PalletNft<T>>::remove_token_aux_property(
collection_id,
nft_id,
PropertyScope::Rmrk,
@@ -1194,7 +1194,7 @@
pending_removal: false,
};
- <PalletNft<T>>::try_mutate_token_sys_property(
+ <PalletNft<T>>::try_mutate_token_aux_property(
collection_id,
nft_id,
PropertyScope::Rmrk,
@@ -1223,7 +1223,7 @@
let scope = PropertyScope::Rmrk;
ensure!(
- <PalletNft<T>>::token_sys_property((
+ <PalletNft<T>>::token_aux_property((
collection_id,
nft_id,
scope,
@@ -1239,7 +1239,7 @@
let sender = T::CrossAccountId::from_sub(sender);
if topmost_owner == sender {
- <PalletNft<T>>::remove_token_sys_property(
+ <PalletNft<T>>::remove_token_aux_property(
collection_id,
nft_id,
PropertyScope::Rmrk,
@@ -1262,7 +1262,7 @@
resource_id: RmrkResourceId,
f: impl FnOnce(&mut RmrkResourceInfo) -> DispatchResult,
) -> DispatchResult {
- <PalletNft<T>>::try_mutate_token_sys_property(
+ <PalletNft<T>>::try_mutate_token_aux_property(
collection_id,
nft_id,
PropertyScope::Rmrk,
pallets/proxy-rmrk-core/src/weights.rsdiffbeforeafterboth1// Template adopted from https://github.com/paritytech/substrate/blob/master/.maintain/frame-weight-template.hbs23//! Autogenerated weights for pallet_proxy_rmrk_core4//!5//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev6//! DATE: 2022-06-16, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`7//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 102489// Executed Command:10// target/release/unique-collator11// benchmark12// pallet13// --pallet14// pallet-proxy-rmrk-core15// --wasm-execution16// compiled17// --extrinsic18// *19// --template20// .maintain/frame-weight-template.hbs21// --steps=5022// --repeat=8023// --heap-pages=409624// --output=./pallets/proxy-rmrk-core/src/weights.rs2526#![cfg_attr(rustfmt, rustfmt_skip)]27#![allow(unused_parens)]28#![allow(unused_imports)]29#![allow(clippy::unnecessary_cast)]3031use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};32use sp_std::marker::PhantomData;3334/// Weight functions needed for pallet_proxy_rmrk_core.35pub trait WeightInfo {36 fn create_collection() -> Weight;37 fn destroy_collection() -> Weight;38 fn change_collection_issuer() -> Weight;39 fn lock_collection() -> Weight;40 fn mint_nft(b: u32, ) -> Weight;41 fn burn_nft(b: u32, ) -> Weight;42 fn send() -> Weight;43 fn accept_nft() -> Weight;44 fn reject_nft() -> Weight;45 fn set_property() -> Weight;46 fn set_priority() -> Weight;47 fn add_basic_resource() -> Weight;48 fn add_composable_resource() -> Weight;49 fn add_slot_resource() -> Weight;50 fn remove_resource() -> Weight;51 fn accept_resource() -> Weight;52 fn accept_resource_removal() -> Weight;53}5455/// Weights for pallet_proxy_rmrk_core using the Substrate node and recommended hardware.56pub struct SubstrateWeight<T>(PhantomData<T>);57impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {58 // Storage: Common CreatedCollectionCount (r:1 w:1)59 // Storage: Common DestroyedCollectionCount (r:1 w:0)60 // Storage: System Account (r:2 w:2)61 // Storage: RmrkCore CollectionIndex (r:1 w:1)62 // Storage: Common CollectionPropertyPermissions (r:0 w:1)63 // Storage: Common CollectionProperties (r:0 w:1)64 // Storage: Common CollectionById (r:0 w:1)65 // Storage: RmrkCore UniqueCollectionId (r:0 w:1)66 fn create_collection() -> Weight {67 (42_239_000 as Weight)68 .saturating_add(T::DbWeight::get().reads(5 as Weight))69 .saturating_add(T::DbWeight::get().writes(8 as Weight))70 }71 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)72 // Storage: Common CollectionProperties (r:1 w:1)73 // Storage: Common CollectionById (r:1 w:1)74 // Storage: Nonfungible TokenData (r:1 w:0)75 // Storage: Common DestroyedCollectionCount (r:1 w:1)76 // Storage: Nonfungible TokensMinted (r:0 w:1)77 // Storage: Nonfungible TokensBurnt (r:0 w:1)78 // Storage: Common AdminAmount (r:0 w:1)79 fn destroy_collection() -> Weight {80 (44_684_000 as Weight)81 .saturating_add(T::DbWeight::get().reads(5 as Weight))82 .saturating_add(T::DbWeight::get().writes(6 as Weight))83 }84 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)85 // Storage: Common CollectionById (r:1 w:1)86 // Storage: Common CollectionProperties (r:1 w:0)87 fn change_collection_issuer() -> Weight {88 (22_513_000 as Weight)89 .saturating_add(T::DbWeight::get().reads(3 as Weight))90 .saturating_add(T::DbWeight::get().writes(1 as Weight))91 }92 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)93 // Storage: Common CollectionProperties (r:1 w:0)94 // Storage: Common CollectionById (r:1 w:1)95 // Storage: Nonfungible TokensMinted (r:1 w:0)96 // Storage: Nonfungible TokensBurnt (r:1 w:0)97 fn lock_collection() -> Weight {98 (23_735_000 as Weight)99 .saturating_add(T::DbWeight::get().reads(5 as Weight))100 .saturating_add(T::DbWeight::get().writes(1 as Weight))101 }102 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)103 // Storage: Common CollectionProperties (r:1 w:0)104 // Storage: Common CollectionById (r:1 w:0)105 // Storage: Nonfungible TokensMinted (r:1 w:1)106 // Storage: Nonfungible AccountBalance (r:1 w:1)107 // Storage: Nonfungible TokenProperties (r:1 w:1)108 // Storage: Nonfungible TokenData (r:0 w:1)109 // Storage: Nonfungible Owned (r:0 w:1)110 // Storage: Nonfungible TokenSysProperties (r:2 w:2)111 fn mint_nft(b: u32, ) -> Weight {112 (45_152_000 as Weight)113 // Standard Error: 2_000114 .saturating_add((11_084_000 as Weight).saturating_mul(b as Weight))115 .saturating_add(T::DbWeight::get().reads(6 as Weight))116 .saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))117 .saturating_add(T::DbWeight::get().writes(5 as Weight))118 .saturating_add(T::DbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))119 }120 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)121 // Storage: Common CollectionProperties (r:1 w:0)122 // Storage: Common CollectionById (r:1 w:0)123 // Storage: Nonfungible TokenData (r:1 w:1)124 // Storage: Nonfungible TokenChildren (r:1 w:0)125 // Storage: Nonfungible TokensBurnt (r:1 w:1)126 // Storage: Nonfungible AccountBalance (r:1 w:1)127 // Storage: Nonfungible Allowance (r:1 w:0)128 // Storage: Nonfungible Owned (r:0 w:1)129 // Storage: Nonfungible TokenProperties (r:0 w:1)130 fn burn_nft(b: u32, ) -> Weight {131 (0 as Weight)132 // Standard Error: 1_581_000133 .saturating_add((321_866_000 as Weight).saturating_mul(b as Weight))134 .saturating_add(T::DbWeight::get().reads(9 as Weight))135 .saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(b as Weight)))136 .saturating_add(T::DbWeight::get().writes(6 as Weight))137 .saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(b as Weight)))138 }139 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)140 // Storage: Common CollectionProperties (r:1 w:0)141 // Storage: Common CollectionById (r:1 w:0)142 // Storage: Nonfungible TokenData (r:5 w:1)143 // Storage: Nonfungible TokenProperties (r:1 w:0)144 // Storage: Nonfungible AccountBalance (r:2 w:2)145 // Storage: Nonfungible Allowance (r:1 w:0)146 // Storage: Nonfungible TokenChildren (r:0 w:1)147 // Storage: Nonfungible Owned (r:0 w:2)148 fn send() -> Weight {149 (72_246_000 as Weight)150 .saturating_add(T::DbWeight::get().reads(12 as Weight))151 .saturating_add(T::DbWeight::get().writes(6 as Weight))152 }153 // Storage: RmrkCore UniqueCollectionId (r:2 w:0)154 // Storage: Common CollectionProperties (r:1 w:0)155 // Storage: Common CollectionById (r:2 w:0)156 // Storage: Nonfungible TokenData (r:6 w:1)157 // Storage: Nonfungible AccountBalance (r:2 w:2)158 // Storage: Nonfungible Allowance (r:1 w:0)159 // Storage: Nonfungible TokenProperties (r:1 w:1)160 // Storage: Nonfungible TokenChildren (r:0 w:1)161 // Storage: Nonfungible Owned (r:0 w:2)162 fn accept_nft() -> Weight {163 (81_203_000 as Weight)164 .saturating_add(T::DbWeight::get().reads(15 as Weight))165 .saturating_add(T::DbWeight::get().writes(7 as Weight))166 }167 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)168 // Storage: Common CollectionProperties (r:1 w:0)169 // Storage: Common CollectionById (r:1 w:0)170 // Storage: Nonfungible TokenData (r:5 w:5)171 // Storage: Nonfungible TokenProperties (r:1 w:5)172 // Storage: Nonfungible TokenChildren (r:9 w:4)173 // Storage: Nonfungible TokensBurnt (r:1 w:1)174 // Storage: Nonfungible AccountBalance (r:5 w:5)175 // Storage: Nonfungible Allowance (r:5 w:0)176 // Storage: Nonfungible Owned (r:0 w:5)177 fn reject_nft() -> Weight {178 (253_117_000 as Weight)179 .saturating_add(T::DbWeight::get().reads(29 as Weight))180 .saturating_add(T::DbWeight::get().writes(25 as Weight))181 }182 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)183 // Storage: Common CollectionProperties (r:1 w:0)184 // Storage: Common CollectionById (r:1 w:0)185 // Storage: Nonfungible TokenProperties (r:1 w:1)186 // Storage: Nonfungible TokenData (r:5 w:0)187 fn set_property() -> Weight {188 (49_653_000 as Weight)189 .saturating_add(T::DbWeight::get().reads(9 as Weight))190 .saturating_add(T::DbWeight::get().writes(1 as Weight))191 }192 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)193 // Storage: Common CollectionProperties (r:1 w:0)194 // Storage: Common CollectionById (r:1 w:0)195 // Storage: Nonfungible TokenProperties (r:1 w:1)196 // Storage: Nonfungible TokenData (r:5 w:0)197 fn set_priority() -> Weight {198 (47_890_000 as Weight)199 .saturating_add(T::DbWeight::get().reads(9 as Weight))200 .saturating_add(T::DbWeight::get().writes(1 as Weight))201 }202 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)203 // Storage: Common CollectionProperties (r:1 w:0)204 // Storage: Common CollectionById (r:1 w:0)205 // Storage: Nonfungible TokenData (r:5 w:0)206 // Storage: Nonfungible TokenProperties (r:1 w:1)207 // Storage: Nonfungible TokenSysProperties (r:1 w:1)208 fn add_basic_resource() -> Weight {209 (54_703_000 as Weight)210 .saturating_add(T::DbWeight::get().reads(10 as Weight))211 .saturating_add(T::DbWeight::get().writes(2 as Weight))212 }213 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)214 // Storage: Common CollectionProperties (r:1 w:0)215 // Storage: Common CollectionById (r:1 w:0)216 // Storage: Nonfungible TokenData (r:5 w:0)217 // Storage: Nonfungible TokenProperties (r:1 w:1)218 // Storage: Nonfungible TokenSysProperties (r:1 w:1)219 fn add_composable_resource() -> Weight {220 (55_114_000 as Weight)221 .saturating_add(T::DbWeight::get().reads(10 as Weight))222 .saturating_add(T::DbWeight::get().writes(2 as Weight))223 }224 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)225 // Storage: Common CollectionProperties (r:1 w:0)226 // Storage: Common CollectionById (r:1 w:0)227 // Storage: Nonfungible TokenData (r:5 w:0)228 // Storage: Nonfungible TokenProperties (r:1 w:1)229 // Storage: Nonfungible TokenSysProperties (r:1 w:1)230 fn add_slot_resource() -> Weight {231 (55_615_000 as Weight)232 .saturating_add(T::DbWeight::get().reads(10 as Weight))233 .saturating_add(T::DbWeight::get().writes(2 as Weight))234 }235 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)236 // Storage: Common CollectionProperties (r:1 w:0)237 // Storage: Common CollectionById (r:1 w:0)238 // Storage: Nonfungible TokenSysProperties (r:1 w:1)239 // Storage: Nonfungible TokenData (r:5 w:0)240 fn remove_resource() -> Weight {241 (47_139_000 as Weight)242 .saturating_add(T::DbWeight::get().reads(9 as Weight))243 .saturating_add(T::DbWeight::get().writes(1 as Weight))244 }245 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)246 // Storage: Common CollectionProperties (r:1 w:0)247 // Storage: Common CollectionById (r:1 w:0)248 // Storage: Nonfungible TokenData (r:5 w:0)249 // Storage: Nonfungible TokenSysProperties (r:1 w:1)250 fn accept_resource() -> Weight {251 (45_535_000 as Weight)252 .saturating_add(T::DbWeight::get().reads(9 as Weight))253 .saturating_add(T::DbWeight::get().writes(1 as Weight))254 }255 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)256 // Storage: Common CollectionProperties (r:1 w:0)257 // Storage: Common CollectionById (r:1 w:0)258 // Storage: Nonfungible TokenData (r:5 w:0)259 // Storage: Nonfungible TokenSysProperties (r:1 w:1)260 fn accept_resource_removal() -> Weight {261 (46_327_000 as Weight)262 .saturating_add(T::DbWeight::get().reads(9 as Weight))263 .saturating_add(T::DbWeight::get().writes(1 as Weight))264 }265}266267// For backwards compatibility and tests268impl WeightInfo for () {269 // Storage: Common CreatedCollectionCount (r:1 w:1)270 // Storage: Common DestroyedCollectionCount (r:1 w:0)271 // Storage: System Account (r:2 w:2)272 // Storage: RmrkCore CollectionIndex (r:1 w:1)273 // Storage: Common CollectionPropertyPermissions (r:0 w:1)274 // Storage: Common CollectionProperties (r:0 w:1)275 // Storage: Common CollectionById (r:0 w:1)276 // Storage: RmrkCore UniqueCollectionId (r:0 w:1)277 fn create_collection() -> Weight {278 (42_239_000 as Weight)279 .saturating_add(RocksDbWeight::get().reads(5 as Weight))280 .saturating_add(RocksDbWeight::get().writes(8 as Weight))281 }282 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)283 // Storage: Common CollectionProperties (r:1 w:1)284 // Storage: Common CollectionById (r:1 w:1)285 // Storage: Nonfungible TokenData (r:1 w:0)286 // Storage: Common DestroyedCollectionCount (r:1 w:1)287 // Storage: Nonfungible TokensMinted (r:0 w:1)288 // Storage: Nonfungible TokensBurnt (r:0 w:1)289 // Storage: Common AdminAmount (r:0 w:1)290 fn destroy_collection() -> Weight {291 (44_684_000 as Weight)292 .saturating_add(RocksDbWeight::get().reads(5 as Weight))293 .saturating_add(RocksDbWeight::get().writes(6 as Weight))294 }295 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)296 // Storage: Common CollectionById (r:1 w:1)297 // Storage: Common CollectionProperties (r:1 w:0)298 fn change_collection_issuer() -> Weight {299 (22_513_000 as Weight)300 .saturating_add(RocksDbWeight::get().reads(3 as Weight))301 .saturating_add(RocksDbWeight::get().writes(1 as Weight))302 }303 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)304 // Storage: Common CollectionProperties (r:1 w:0)305 // Storage: Common CollectionById (r:1 w:1)306 // Storage: Nonfungible TokensMinted (r:1 w:0)307 // Storage: Nonfungible TokensBurnt (r:1 w:0)308 fn lock_collection() -> Weight {309 (23_735_000 as Weight)310 .saturating_add(RocksDbWeight::get().reads(5 as Weight))311 .saturating_add(RocksDbWeight::get().writes(1 as Weight))312 }313 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)314 // Storage: Common CollectionProperties (r:1 w:0)315 // Storage: Common CollectionById (r:1 w:0)316 // Storage: Nonfungible TokensMinted (r:1 w:1)317 // Storage: Nonfungible AccountBalance (r:1 w:1)318 // Storage: Nonfungible TokenProperties (r:1 w:1)319 // Storage: Nonfungible TokenData (r:0 w:1)320 // Storage: Nonfungible Owned (r:0 w:1)321 // Storage: Nonfungible TokenSysProperties (r:2 w:2)322 fn mint_nft(b: u32, ) -> Weight {323 (45_152_000 as Weight)324 // Standard Error: 2_000325 .saturating_add((11_084_000 as Weight).saturating_mul(b as Weight))326 .saturating_add(RocksDbWeight::get().reads(6 as Weight))327 .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))328 .saturating_add(RocksDbWeight::get().writes(5 as Weight))329 .saturating_add(RocksDbWeight::get().writes((1 as Weight).saturating_mul(b as Weight)))330 }331 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)332 // Storage: Common CollectionProperties (r:1 w:0)333 // Storage: Common CollectionById (r:1 w:0)334 // Storage: Nonfungible TokenData (r:1 w:1)335 // Storage: Nonfungible TokenChildren (r:1 w:0)336 // Storage: Nonfungible TokensBurnt (r:1 w:1)337 // Storage: Nonfungible AccountBalance (r:1 w:1)338 // Storage: Nonfungible Allowance (r:1 w:0)339 // Storage: Nonfungible Owned (r:0 w:1)340 // Storage: Nonfungible TokenProperties (r:0 w:1)341 fn burn_nft(b: u32, ) -> Weight {342 (0 as Weight)343 // Standard Error: 1_581_000344 .saturating_add((321_866_000 as Weight).saturating_mul(b as Weight))345 .saturating_add(RocksDbWeight::get().reads(9 as Weight))346 .saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(b as Weight)))347 .saturating_add(RocksDbWeight::get().writes(6 as Weight))348 .saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(b as Weight)))349 }350 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)351 // Storage: Common CollectionProperties (r:1 w:0)352 // Storage: Common CollectionById (r:1 w:0)353 // Storage: Nonfungible TokenData (r:5 w:1)354 // Storage: Nonfungible TokenProperties (r:1 w:0)355 // Storage: Nonfungible AccountBalance (r:2 w:2)356 // Storage: Nonfungible Allowance (r:1 w:0)357 // Storage: Nonfungible TokenChildren (r:0 w:1)358 // Storage: Nonfungible Owned (r:0 w:2)359 fn send() -> Weight {360 (72_246_000 as Weight)361 .saturating_add(RocksDbWeight::get().reads(12 as Weight))362 .saturating_add(RocksDbWeight::get().writes(6 as Weight))363 }364 // Storage: RmrkCore UniqueCollectionId (r:2 w:0)365 // Storage: Common CollectionProperties (r:1 w:0)366 // Storage: Common CollectionById (r:2 w:0)367 // Storage: Nonfungible TokenData (r:6 w:1)368 // Storage: Nonfungible AccountBalance (r:2 w:2)369 // Storage: Nonfungible Allowance (r:1 w:0)370 // Storage: Nonfungible TokenProperties (r:1 w:1)371 // Storage: Nonfungible TokenChildren (r:0 w:1)372 // Storage: Nonfungible Owned (r:0 w:2)373 fn accept_nft() -> Weight {374 (81_203_000 as Weight)375 .saturating_add(RocksDbWeight::get().reads(15 as Weight))376 .saturating_add(RocksDbWeight::get().writes(7 as Weight))377 }378 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)379 // Storage: Common CollectionProperties (r:1 w:0)380 // Storage: Common CollectionById (r:1 w:0)381 // Storage: Nonfungible TokenData (r:5 w:5)382 // Storage: Nonfungible TokenProperties (r:1 w:5)383 // Storage: Nonfungible TokenChildren (r:9 w:4)384 // Storage: Nonfungible TokensBurnt (r:1 w:1)385 // Storage: Nonfungible AccountBalance (r:5 w:5)386 // Storage: Nonfungible Allowance (r:5 w:0)387 // Storage: Nonfungible Owned (r:0 w:5)388 fn reject_nft() -> Weight {389 (253_117_000 as Weight)390 .saturating_add(RocksDbWeight::get().reads(29 as Weight))391 .saturating_add(RocksDbWeight::get().writes(25 as Weight))392 }393 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)394 // Storage: Common CollectionProperties (r:1 w:0)395 // Storage: Common CollectionById (r:1 w:0)396 // Storage: Nonfungible TokenProperties (r:1 w:1)397 // Storage: Nonfungible TokenData (r:5 w:0)398 fn set_property() -> Weight {399 (49_653_000 as Weight)400 .saturating_add(RocksDbWeight::get().reads(9 as Weight))401 .saturating_add(RocksDbWeight::get().writes(1 as Weight))402 }403 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)404 // Storage: Common CollectionProperties (r:1 w:0)405 // Storage: Common CollectionById (r:1 w:0)406 // Storage: Nonfungible TokenProperties (r:1 w:1)407 // Storage: Nonfungible TokenData (r:5 w:0)408 fn set_priority() -> Weight {409 (47_890_000 as Weight)410 .saturating_add(RocksDbWeight::get().reads(9 as Weight))411 .saturating_add(RocksDbWeight::get().writes(1 as Weight))412 }413 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)414 // Storage: Common CollectionProperties (r:1 w:0)415 // Storage: Common CollectionById (r:1 w:0)416 // Storage: Nonfungible TokenData (r:5 w:0)417 // Storage: Nonfungible TokenProperties (r:1 w:1)418 // Storage: Nonfungible TokenSysProperties (r:1 w:1)419 fn add_basic_resource() -> Weight {420 (54_703_000 as Weight)421 .saturating_add(RocksDbWeight::get().reads(10 as Weight))422 .saturating_add(RocksDbWeight::get().writes(2 as Weight))423 }424 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)425 // Storage: Common CollectionProperties (r:1 w:0)426 // Storage: Common CollectionById (r:1 w:0)427 // Storage: Nonfungible TokenData (r:5 w:0)428 // Storage: Nonfungible TokenProperties (r:1 w:1)429 // Storage: Nonfungible TokenSysProperties (r:1 w:1)430 fn add_composable_resource() -> Weight {431 (55_114_000 as Weight)432 .saturating_add(RocksDbWeight::get().reads(10 as Weight))433 .saturating_add(RocksDbWeight::get().writes(2 as Weight))434 }435 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)436 // Storage: Common CollectionProperties (r:1 w:0)437 // Storage: Common CollectionById (r:1 w:0)438 // Storage: Nonfungible TokenData (r:5 w:0)439 // Storage: Nonfungible TokenProperties (r:1 w:1)440 // Storage: Nonfungible TokenSysProperties (r:1 w:1)441 fn add_slot_resource() -> Weight {442 (55_615_000 as Weight)443 .saturating_add(RocksDbWeight::get().reads(10 as Weight))444 .saturating_add(RocksDbWeight::get().writes(2 as Weight))445 }446 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)447 // Storage: Common CollectionProperties (r:1 w:0)448 // Storage: Common CollectionById (r:1 w:0)449 // Storage: Nonfungible TokenSysProperties (r:1 w:1)450 // Storage: Nonfungible TokenData (r:5 w:0)451 fn remove_resource() -> Weight {452 (47_139_000 as Weight)453 .saturating_add(RocksDbWeight::get().reads(9 as Weight))454 .saturating_add(RocksDbWeight::get().writes(1 as Weight))455 }456 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)457 // Storage: Common CollectionProperties (r:1 w:0)458 // Storage: Common CollectionById (r:1 w:0)459 // Storage: Nonfungible TokenData (r:5 w:0)460 // Storage: Nonfungible TokenSysProperties (r:1 w:1)461 fn accept_resource() -> Weight {462 (45_535_000 as Weight)463 .saturating_add(RocksDbWeight::get().reads(9 as Weight))464 .saturating_add(RocksDbWeight::get().writes(1 as Weight))465 }466 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)467 // Storage: Common CollectionProperties (r:1 w:0)468 // Storage: Common CollectionById (r:1 w:0)469 // Storage: Nonfungible TokenData (r:5 w:0)470 // Storage: Nonfungible TokenSysProperties (r:1 w:1)471 fn accept_resource_removal() -> Weight {472 (46_327_000 as Weight)473 .saturating_add(RocksDbWeight::get().reads(9 as Weight))474 .saturating_add(RocksDbWeight::get().writes(1 as Weight))475 }476}primitives/data-structs/src/lib.rsdiffbeforeafterboth--- 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<S> = BoundedVec<u8, S>;
-pub type SysPropertyValue = BoundedBytes<ConstU32<MAX_SYSTEM_PROPERTY_VALUE_LENGTH>>;
+pub type AuxPropertyValue = BoundedBytes<ConstU32<MAX_AUX_PROPERTY_VALUE_LENGTH>>;
pub type PropertyKey = BoundedBytes<ConstU32<MAX_PROPERTY_KEY_LENGTH>>;
pub type PropertyValue = BoundedBytes<ConstU32<MAX_PROPERTY_VALUE_LENGTH>>;
runtime/opal/src/lib.rsdiffbeforeafterboth--- 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 = <pallet_nonfungible::Pallet<Runtime>>::iterate_token_sys_properties(
+ let resources = <pallet_nonfungible::Pallet<Runtime>>::iterate_token_aux_properties(
collection_id, nft_id, PropertyScope::Rmrk
).filter_map(|(_, value)| {
let resource_info: RmrkResourceInfo = RmrkCore::decode_property(&value).ok()?;
runtime/quartz/src/lib.rsdiffbeforeafterboth--- 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 = <pallet_nonfungible::Pallet<Runtime>>::iterate_token_sys_properties(
+ let resources = <pallet_nonfungible::Pallet<Runtime>>::iterate_token_aux_properties(
collection_id, nft_id, PropertyScope::Rmrk
).filter_map(|(_, value)| {
let resource_info: RmrkResourceInfo = RmrkCore::decode_property(&value).ok()?;