git.delta.rocks / unique-network / refs/commits / 1ddd82e06cac

difftreelog

Merge pull request #398 from UniqueNetwork/release-v923000

kozyrevdev2022-06-22parents: #011ebf2 #0d9468b.patch.diff
in: master
Release v923000

16 files changed

modifiedpallets/common/src/benchmarking.rsdiffbeforeafterboth
98 token_owner: false,98 token_owner: false,
99 collection_admin: false,99 collection_admin: false,
100 restricted: None,100 restricted: None,
101 #[cfg(feature = "runtime-benchmarks")]
101 permissive: true,102 permissive: true,
102 }),103 }),
103 mint_mode: Some(true),104 mint_mode: Some(true),
modifiedpallets/common/src/lib.rsdiffbeforeafterboth
1212 limit_default_clone!(old_limit, new_limit,1212 limit_default_clone!(old_limit, new_limit,
1213 access => {},1213 access => {},
1214 mint_mode => {},1214 mint_mode => {},
1215 nesting => {1215 nesting => { /* todo check for permissive, if only it gets out of benchmarks */ },
1216 #[cfg(not(feature = "runtime-benchmarks"))]
1217 ensure!(
1218 // Permissive is only allowed for tests and internal usage of chain for now
1219 old_limit.permissive || !new_limit.permissive,
1220 <Error<T>>::NoPermission,
1221 )
1222 },
1223 );1216 );
1224 Ok(new_limit)1217 Ok(new_limit)
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
1039 ) -> DispatchResult {1039 ) -> DispatchResult {
1040 let nesting = handle.permissions.nesting();1040 let nesting = handle.permissions.nesting();
1041
1042 #[cfg(not(feature = "runtime-benchmarks"))]
1043 let permissive = false;
1044 #[cfg(feature = "runtime-benchmarks")]
1041 if nesting.permissive {1045 let permissive = nesting.permissive;
1046
1047 if permissive {
1042 // Pass1048 // Pass
1043 } else if nesting.token_owner1049 } else if nesting.token_owner
1044 && <PalletStructure<T>>::check_indirectly_owned(1050 && <PalletStructure<T>>::check_indirectly_owned(
modifiedpallets/proxy-rmrk-core/src/lib.rsdiffbeforeafterboth
205 token_owner: true,205 token_owner: true,
206 collection_admin: false,206 collection_admin: false,
207 restricted: None,207 restricted: None,
208208 #[cfg(feature = "runtime-benchmarks")]
209 permissive: false,209 permissive: false,
210 }),210 }),
211 ..Default::default()211 ..Default::default()
modifiedpallets/proxy-rmrk-core/src/weights.rsdiffbeforeafterboth
3//! Autogenerated weights for pallet_proxy_rmrk_core3//! Autogenerated weights for pallet_proxy_rmrk_core
4//!4//!
5//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev5//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
6//! DATE: 2022-06-17, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`6//! DATE: 2022-06-21, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
7//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 10247//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
88
9// Executed Command:9// Executed Command:
64 // Storage: Common CollectionById (r:0 w:1)64 // Storage: Common CollectionById (r:0 w:1)
65 // Storage: RmrkCore UniqueCollectionId (r:0 w:1)65 // Storage: RmrkCore UniqueCollectionId (r:0 w:1)
66 fn create_collection() -> Weight {66 fn create_collection() -> Weight {
67 (42_359_000 as Weight)67 (49_986_000 as Weight)
68 .saturating_add(T::DbWeight::get().reads(5 as Weight))68 .saturating_add(T::DbWeight::get().reads(5 as Weight))
69 .saturating_add(T::DbWeight::get().writes(8 as Weight))69 .saturating_add(T::DbWeight::get().writes(8 as Weight))
70 }70 }
77 // Storage: Nonfungible TokensBurnt (r:0 w:1)77 // Storage: Nonfungible TokensBurnt (r:0 w:1)
78 // Storage: Common AdminAmount (r:0 w:1)78 // Storage: Common AdminAmount (r:0 w:1)
79 fn destroy_collection() -> Weight {79 fn destroy_collection() -> Weight {
80 (45_375_000 as Weight)80 (50_177_000 as Weight)
81 .saturating_add(T::DbWeight::get().reads(5 as Weight))81 .saturating_add(T::DbWeight::get().reads(5 as Weight))
82 .saturating_add(T::DbWeight::get().writes(6 as Weight))82 .saturating_add(T::DbWeight::get().writes(6 as Weight))
83 }83 }
84 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)84 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)
85 // Storage: Common CollectionById (r:1 w:1)85 // Storage: Common CollectionById (r:1 w:1)
86 // Storage: Common CollectionProperties (r:1 w:0)86 // Storage: Common CollectionProperties (r:1 w:0)
87 fn change_collection_issuer() -> Weight {87 fn change_collection_issuer() -> Weight {
88 (22_753_000 as Weight)88 (25_949_000 as Weight)
89 .saturating_add(T::DbWeight::get().reads(3 as Weight))89 .saturating_add(T::DbWeight::get().reads(3 as Weight))
90 .saturating_add(T::DbWeight::get().writes(1 as Weight))90 .saturating_add(T::DbWeight::get().writes(1 as Weight))
91 }91 }
95 // Storage: Nonfungible TokensMinted (r:1 w:0)95 // Storage: Nonfungible TokensMinted (r:1 w:0)
96 // Storage: Nonfungible TokensBurnt (r:1 w:0)96 // Storage: Nonfungible TokensBurnt (r:1 w:0)
97 fn lock_collection() -> Weight {97 fn lock_collection() -> Weight {
98 (24_356_000 as Weight)98 (27_183_000 as Weight)
99 .saturating_add(T::DbWeight::get().reads(5 as Weight))99 .saturating_add(T::DbWeight::get().reads(5 as Weight))
100 .saturating_add(T::DbWeight::get().writes(1 as Weight))100 .saturating_add(T::DbWeight::get().writes(1 as Weight))
101 }101 }
109 // Storage: Nonfungible Owned (r:0 w:1)109 // Storage: Nonfungible Owned (r:0 w:1)
110 // Storage: Nonfungible TokenAuxProperties (r:2 w:2)110 // Storage: Nonfungible TokenAuxProperties (r:2 w:2)
111 fn mint_nft(b: u32, ) -> Weight {111 fn mint_nft(b: u32, ) -> Weight {
112 (44_853_000 as Weight)112 (65_512_000 as Weight)
113 // Standard Error: 2_000113 // Standard Error: 12_000
114 .saturating_add((10_721_000 as Weight).saturating_mul(b as Weight))114 .saturating_add((11_525_000 as Weight).saturating_mul(b as Weight))
115 .saturating_add(T::DbWeight::get().reads(6 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)))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))117 .saturating_add(T::DbWeight::get().writes(5 as Weight))
129 // Storage: Nonfungible TokenProperties (r:0 w:1)129 // Storage: Nonfungible TokenProperties (r:0 w:1)
130 fn burn_nft(b: u32, ) -> Weight {130 fn burn_nft(b: u32, ) -> Weight {
131 (0 as Weight)131 (0 as Weight)
132 // Standard Error: 1_590_000132 // Standard Error: 1_472_000
133 .saturating_add((319_825_000 as Weight).saturating_mul(b as Weight))133 .saturating_add((296_221_000 as Weight).saturating_mul(b as Weight))
134 .saturating_add(T::DbWeight::get().reads(9 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)))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))136 .saturating_add(T::DbWeight::get().writes(6 as Weight))
146 // Storage: Nonfungible TokenChildren (r:0 w:1)146 // Storage: Nonfungible TokenChildren (r:0 w:1)
147 // Storage: Nonfungible Owned (r:0 w:2)147 // Storage: Nonfungible Owned (r:0 w:2)
148 fn send() -> Weight {148 fn send() -> Weight {
149 (72_576_000 as Weight)149 (82_778_000 as Weight)
150 .saturating_add(T::DbWeight::get().reads(12 as Weight))150 .saturating_add(T::DbWeight::get().reads(12 as Weight))
151 .saturating_add(T::DbWeight::get().writes(6 as Weight))151 .saturating_add(T::DbWeight::get().writes(6 as Weight))
152 }152 }
160 // Storage: Nonfungible TokenChildren (r:0 w:1)160 // Storage: Nonfungible TokenChildren (r:0 w:1)
161 // Storage: Nonfungible Owned (r:0 w:2)161 // Storage: Nonfungible Owned (r:0 w:2)
162 fn accept_nft() -> Weight {162 fn accept_nft() -> Weight {
163 (79_670_000 as Weight)163 (90_190_000 as Weight)
164 .saturating_add(T::DbWeight::get().reads(15 as Weight))164 .saturating_add(T::DbWeight::get().reads(15 as Weight))
165 .saturating_add(T::DbWeight::get().writes(7 as Weight))165 .saturating_add(T::DbWeight::get().writes(7 as Weight))
166 }166 }
175 // Storage: Nonfungible Allowance (r:5 w:0)175 // Storage: Nonfungible Allowance (r:5 w:0)
176 // Storage: Nonfungible Owned (r:0 w:5)176 // Storage: Nonfungible Owned (r:0 w:5)
177 fn reject_nft() -> Weight {177 fn reject_nft() -> Weight {
178 (254_989_000 as Weight)178 (262_238_000 as Weight)
179 .saturating_add(T::DbWeight::get().reads(29 as Weight))179 .saturating_add(T::DbWeight::get().reads(29 as Weight))
180 .saturating_add(T::DbWeight::get().writes(25 as Weight))180 .saturating_add(T::DbWeight::get().writes(25 as Weight))
181 }181 }
185 // Storage: Nonfungible TokenProperties (r:1 w:1)185 // Storage: Nonfungible TokenProperties (r:1 w:1)
186 // Storage: Nonfungible TokenData (r:5 w:0)186 // Storage: Nonfungible TokenData (r:5 w:0)
187 fn set_property() -> Weight {187 fn set_property() -> Weight {
188 (48_651_000 as Weight)188 (55_187_000 as Weight)
189 .saturating_add(T::DbWeight::get().reads(9 as Weight))189 .saturating_add(T::DbWeight::get().reads(9 as Weight))
190 .saturating_add(T::DbWeight::get().writes(1 as Weight))190 .saturating_add(T::DbWeight::get().writes(1 as Weight))
191 }191 }
195 // Storage: Nonfungible TokenProperties (r:1 w:1)195 // Storage: Nonfungible TokenProperties (r:1 w:1)
196 // Storage: Nonfungible TokenData (r:5 w:0)196 // Storage: Nonfungible TokenData (r:5 w:0)
197 fn set_priority() -> Weight {197 fn set_priority() -> Weight {
198 (47_579_000 as Weight)198 (54_092_000 as Weight)
199 .saturating_add(T::DbWeight::get().reads(9 as Weight))199 .saturating_add(T::DbWeight::get().reads(9 as Weight))
200 .saturating_add(T::DbWeight::get().writes(1 as Weight))200 .saturating_add(T::DbWeight::get().writes(1 as Weight))
201 }201 }
206 // Storage: Nonfungible TokenProperties (r:1 w:1)206 // Storage: Nonfungible TokenProperties (r:1 w:1)
207 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)207 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)
208 fn add_basic_resource() -> Weight {208 fn add_basic_resource() -> Weight {
209 (55_013_000 as Weight)209 (62_551_000 as Weight)
210 .saturating_add(T::DbWeight::get().reads(10 as Weight))210 .saturating_add(T::DbWeight::get().reads(10 as Weight))
211 .saturating_add(T::DbWeight::get().writes(2 as Weight))211 .saturating_add(T::DbWeight::get().writes(2 as Weight))
212 }212 }
217 // Storage: Nonfungible TokenProperties (r:1 w:1)217 // Storage: Nonfungible TokenProperties (r:1 w:1)
218 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)218 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)
219 fn add_composable_resource() -> Weight {219 fn add_composable_resource() -> Weight {
220 (55_184_000 as Weight)220 (61_778_000 as Weight)
221 .saturating_add(T::DbWeight::get().reads(10 as Weight))221 .saturating_add(T::DbWeight::get().reads(10 as Weight))
222 .saturating_add(T::DbWeight::get().writes(2 as Weight))222 .saturating_add(T::DbWeight::get().writes(2 as Weight))
223 }223 }
228 // Storage: Nonfungible TokenProperties (r:1 w:1)228 // Storage: Nonfungible TokenProperties (r:1 w:1)
229 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)229 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)
230 fn add_slot_resource() -> Weight {230 fn add_slot_resource() -> Weight {
231 (54_792_000 as Weight)231 (62_700_000 as Weight)
232 .saturating_add(T::DbWeight::get().reads(10 as Weight))232 .saturating_add(T::DbWeight::get().reads(10 as Weight))
233 .saturating_add(T::DbWeight::get().writes(2 as Weight))233 .saturating_add(T::DbWeight::get().writes(2 as Weight))
234 }234 }
238 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)238 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)
239 // Storage: Nonfungible TokenData (r:5 w:0)239 // Storage: Nonfungible TokenData (r:5 w:0)
240 fn remove_resource() -> Weight {240 fn remove_resource() -> Weight {
241 (46_447_000 as Weight)241 (52_920_000 as Weight)
242 .saturating_add(T::DbWeight::get().reads(9 as Weight))242 .saturating_add(T::DbWeight::get().reads(9 as Weight))
243 .saturating_add(T::DbWeight::get().writes(1 as Weight))243 .saturating_add(T::DbWeight::get().writes(1 as Weight))
244 }244 }
248 // Storage: Nonfungible TokenData (r:5 w:0)248 // Storage: Nonfungible TokenData (r:5 w:0)
249 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)249 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)
250 fn accept_resource() -> Weight {250 fn accept_resource() -> Weight {
251 (45_096_000 as Weight)251 (52_450_000 as Weight)
252 .saturating_add(T::DbWeight::get().reads(9 as Weight))252 .saturating_add(T::DbWeight::get().reads(9 as Weight))
253 .saturating_add(T::DbWeight::get().writes(1 as Weight))253 .saturating_add(T::DbWeight::get().writes(1 as Weight))
254 }254 }
258 // Storage: Nonfungible TokenData (r:5 w:0)258 // Storage: Nonfungible TokenData (r:5 w:0)
259 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)259 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)
260 fn accept_resource_removal() -> Weight {260 fn accept_resource_removal() -> Weight {
261 (45_445_000 as Weight)261 (50_901_000 as Weight)
262 .saturating_add(T::DbWeight::get().reads(9 as Weight))262 .saturating_add(T::DbWeight::get().reads(9 as Weight))
263 .saturating_add(T::DbWeight::get().writes(1 as Weight))263 .saturating_add(T::DbWeight::get().writes(1 as Weight))
264 }264 }
275 // Storage: Common CollectionById (r:0 w:1)275 // Storage: Common CollectionById (r:0 w:1)
276 // Storage: RmrkCore UniqueCollectionId (r:0 w:1)276 // Storage: RmrkCore UniqueCollectionId (r:0 w:1)
277 fn create_collection() -> Weight {277 fn create_collection() -> Weight {
278 (42_359_000 as Weight)278 (49_986_000 as Weight)
279 .saturating_add(RocksDbWeight::get().reads(5 as Weight))279 .saturating_add(RocksDbWeight::get().reads(5 as Weight))
280 .saturating_add(RocksDbWeight::get().writes(8 as Weight))280 .saturating_add(RocksDbWeight::get().writes(8 as Weight))
281 }281 }
288 // Storage: Nonfungible TokensBurnt (r:0 w:1)288 // Storage: Nonfungible TokensBurnt (r:0 w:1)
289 // Storage: Common AdminAmount (r:0 w:1)289 // Storage: Common AdminAmount (r:0 w:1)
290 fn destroy_collection() -> Weight {290 fn destroy_collection() -> Weight {
291 (45_375_000 as Weight)291 (50_177_000 as Weight)
292 .saturating_add(RocksDbWeight::get().reads(5 as Weight))292 .saturating_add(RocksDbWeight::get().reads(5 as Weight))
293 .saturating_add(RocksDbWeight::get().writes(6 as Weight))293 .saturating_add(RocksDbWeight::get().writes(6 as Weight))
294 }294 }
295 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)295 // Storage: RmrkCore UniqueCollectionId (r:1 w:0)
296 // Storage: Common CollectionById (r:1 w:1)296 // Storage: Common CollectionById (r:1 w:1)
297 // Storage: Common CollectionProperties (r:1 w:0)297 // Storage: Common CollectionProperties (r:1 w:0)
298 fn change_collection_issuer() -> Weight {298 fn change_collection_issuer() -> Weight {
299 (22_753_000 as Weight)299 (25_949_000 as Weight)
300 .saturating_add(RocksDbWeight::get().reads(3 as Weight))300 .saturating_add(RocksDbWeight::get().reads(3 as Weight))
301 .saturating_add(RocksDbWeight::get().writes(1 as Weight))301 .saturating_add(RocksDbWeight::get().writes(1 as Weight))
302 }302 }
306 // Storage: Nonfungible TokensMinted (r:1 w:0)306 // Storage: Nonfungible TokensMinted (r:1 w:0)
307 // Storage: Nonfungible TokensBurnt (r:1 w:0)307 // Storage: Nonfungible TokensBurnt (r:1 w:0)
308 fn lock_collection() -> Weight {308 fn lock_collection() -> Weight {
309 (24_356_000 as Weight)309 (27_183_000 as Weight)
310 .saturating_add(RocksDbWeight::get().reads(5 as Weight))310 .saturating_add(RocksDbWeight::get().reads(5 as Weight))
311 .saturating_add(RocksDbWeight::get().writes(1 as Weight))311 .saturating_add(RocksDbWeight::get().writes(1 as Weight))
312 }312 }
320 // Storage: Nonfungible Owned (r:0 w:1)320 // Storage: Nonfungible Owned (r:0 w:1)
321 // Storage: Nonfungible TokenAuxProperties (r:2 w:2)321 // Storage: Nonfungible TokenAuxProperties (r:2 w:2)
322 fn mint_nft(b: u32, ) -> Weight {322 fn mint_nft(b: u32, ) -> Weight {
323 (44_853_000 as Weight)323 (65_512_000 as Weight)
324 // Standard Error: 2_000324 // Standard Error: 12_000
325 .saturating_add((10_721_000 as Weight).saturating_mul(b as Weight))325 .saturating_add((11_525_000 as Weight).saturating_mul(b as Weight))
326 .saturating_add(RocksDbWeight::get().reads(6 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)))327 .saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
328 .saturating_add(RocksDbWeight::get().writes(5 as Weight))328 .saturating_add(RocksDbWeight::get().writes(5 as Weight))
340 // Storage: Nonfungible TokenProperties (r:0 w:1)340 // Storage: Nonfungible TokenProperties (r:0 w:1)
341 fn burn_nft(b: u32, ) -> Weight {341 fn burn_nft(b: u32, ) -> Weight {
342 (0 as Weight)342 (0 as Weight)
343 // Standard Error: 1_590_000343 // Standard Error: 1_472_000
344 .saturating_add((319_825_000 as Weight).saturating_mul(b as Weight))344 .saturating_add((296_221_000 as Weight).saturating_mul(b as Weight))
345 .saturating_add(RocksDbWeight::get().reads(9 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)))346 .saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(b as Weight)))
347 .saturating_add(RocksDbWeight::get().writes(6 as Weight))347 .saturating_add(RocksDbWeight::get().writes(6 as Weight))
357 // Storage: Nonfungible TokenChildren (r:0 w:1)357 // Storage: Nonfungible TokenChildren (r:0 w:1)
358 // Storage: Nonfungible Owned (r:0 w:2)358 // Storage: Nonfungible Owned (r:0 w:2)
359 fn send() -> Weight {359 fn send() -> Weight {
360 (72_576_000 as Weight)360 (82_778_000 as Weight)
361 .saturating_add(RocksDbWeight::get().reads(12 as Weight))361 .saturating_add(RocksDbWeight::get().reads(12 as Weight))
362 .saturating_add(RocksDbWeight::get().writes(6 as Weight))362 .saturating_add(RocksDbWeight::get().writes(6 as Weight))
363 }363 }
371 // Storage: Nonfungible TokenChildren (r:0 w:1)371 // Storage: Nonfungible TokenChildren (r:0 w:1)
372 // Storage: Nonfungible Owned (r:0 w:2)372 // Storage: Nonfungible Owned (r:0 w:2)
373 fn accept_nft() -> Weight {373 fn accept_nft() -> Weight {
374 (79_670_000 as Weight)374 (90_190_000 as Weight)
375 .saturating_add(RocksDbWeight::get().reads(15 as Weight))375 .saturating_add(RocksDbWeight::get().reads(15 as Weight))
376 .saturating_add(RocksDbWeight::get().writes(7 as Weight))376 .saturating_add(RocksDbWeight::get().writes(7 as Weight))
377 }377 }
386 // Storage: Nonfungible Allowance (r:5 w:0)386 // Storage: Nonfungible Allowance (r:5 w:0)
387 // Storage: Nonfungible Owned (r:0 w:5)387 // Storage: Nonfungible Owned (r:0 w:5)
388 fn reject_nft() -> Weight {388 fn reject_nft() -> Weight {
389 (254_989_000 as Weight)389 (262_238_000 as Weight)
390 .saturating_add(RocksDbWeight::get().reads(29 as Weight))390 .saturating_add(RocksDbWeight::get().reads(29 as Weight))
391 .saturating_add(RocksDbWeight::get().writes(25 as Weight))391 .saturating_add(RocksDbWeight::get().writes(25 as Weight))
392 }392 }
396 // Storage: Nonfungible TokenProperties (r:1 w:1)396 // Storage: Nonfungible TokenProperties (r:1 w:1)
397 // Storage: Nonfungible TokenData (r:5 w:0)397 // Storage: Nonfungible TokenData (r:5 w:0)
398 fn set_property() -> Weight {398 fn set_property() -> Weight {
399 (48_651_000 as Weight)399 (55_187_000 as Weight)
400 .saturating_add(RocksDbWeight::get().reads(9 as Weight))400 .saturating_add(RocksDbWeight::get().reads(9 as Weight))
401 .saturating_add(RocksDbWeight::get().writes(1 as Weight))401 .saturating_add(RocksDbWeight::get().writes(1 as Weight))
402 }402 }
406 // Storage: Nonfungible TokenProperties (r:1 w:1)406 // Storage: Nonfungible TokenProperties (r:1 w:1)
407 // Storage: Nonfungible TokenData (r:5 w:0)407 // Storage: Nonfungible TokenData (r:5 w:0)
408 fn set_priority() -> Weight {408 fn set_priority() -> Weight {
409 (47_579_000 as Weight)409 (54_092_000 as Weight)
410 .saturating_add(RocksDbWeight::get().reads(9 as Weight))410 .saturating_add(RocksDbWeight::get().reads(9 as Weight))
411 .saturating_add(RocksDbWeight::get().writes(1 as Weight))411 .saturating_add(RocksDbWeight::get().writes(1 as Weight))
412 }412 }
417 // Storage: Nonfungible TokenProperties (r:1 w:1)417 // Storage: Nonfungible TokenProperties (r:1 w:1)
418 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)418 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)
419 fn add_basic_resource() -> Weight {419 fn add_basic_resource() -> Weight {
420 (55_013_000 as Weight)420 (62_551_000 as Weight)
421 .saturating_add(RocksDbWeight::get().reads(10 as Weight))421 .saturating_add(RocksDbWeight::get().reads(10 as Weight))
422 .saturating_add(RocksDbWeight::get().writes(2 as Weight))422 .saturating_add(RocksDbWeight::get().writes(2 as Weight))
423 }423 }
428 // Storage: Nonfungible TokenProperties (r:1 w:1)428 // Storage: Nonfungible TokenProperties (r:1 w:1)
429 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)429 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)
430 fn add_composable_resource() -> Weight {430 fn add_composable_resource() -> Weight {
431 (55_184_000 as Weight)431 (61_778_000 as Weight)
432 .saturating_add(RocksDbWeight::get().reads(10 as Weight))432 .saturating_add(RocksDbWeight::get().reads(10 as Weight))
433 .saturating_add(RocksDbWeight::get().writes(2 as Weight))433 .saturating_add(RocksDbWeight::get().writes(2 as Weight))
434 }434 }
439 // Storage: Nonfungible TokenProperties (r:1 w:1)439 // Storage: Nonfungible TokenProperties (r:1 w:1)
440 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)440 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)
441 fn add_slot_resource() -> Weight {441 fn add_slot_resource() -> Weight {
442 (54_792_000 as Weight)442 (62_700_000 as Weight)
443 .saturating_add(RocksDbWeight::get().reads(10 as Weight))443 .saturating_add(RocksDbWeight::get().reads(10 as Weight))
444 .saturating_add(RocksDbWeight::get().writes(2 as Weight))444 .saturating_add(RocksDbWeight::get().writes(2 as Weight))
445 }445 }
449 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)449 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)
450 // Storage: Nonfungible TokenData (r:5 w:0)450 // Storage: Nonfungible TokenData (r:5 w:0)
451 fn remove_resource() -> Weight {451 fn remove_resource() -> Weight {
452 (46_447_000 as Weight)452 (52_920_000 as Weight)
453 .saturating_add(RocksDbWeight::get().reads(9 as Weight))453 .saturating_add(RocksDbWeight::get().reads(9 as Weight))
454 .saturating_add(RocksDbWeight::get().writes(1 as Weight))454 .saturating_add(RocksDbWeight::get().writes(1 as Weight))
455 }455 }
459 // Storage: Nonfungible TokenData (r:5 w:0)459 // Storage: Nonfungible TokenData (r:5 w:0)
460 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)460 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)
461 fn accept_resource() -> Weight {461 fn accept_resource() -> Weight {
462 (45_096_000 as Weight)462 (52_450_000 as Weight)
463 .saturating_add(RocksDbWeight::get().reads(9 as Weight))463 .saturating_add(RocksDbWeight::get().reads(9 as Weight))
464 .saturating_add(RocksDbWeight::get().writes(1 as Weight))464 .saturating_add(RocksDbWeight::get().writes(1 as Weight))
465 }465 }
469 // Storage: Nonfungible TokenData (r:5 w:0)469 // Storage: Nonfungible TokenData (r:5 w:0)
470 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)470 // Storage: Nonfungible TokenAuxProperties (r:1 w:1)
471 fn accept_resource_removal() -> Weight {471 fn accept_resource_removal() -> Weight {
472 (45_445_000 as Weight)472 (50_901_000 as Weight)
473 .saturating_add(RocksDbWeight::get().reads(9 as Weight))473 .saturating_add(RocksDbWeight::get().reads(9 as Weight))
474 .saturating_add(RocksDbWeight::get().writes(1 as Weight))474 .saturating_add(RocksDbWeight::get().writes(1 as Weight))
475 }475 }
modifiedpallets/proxy-rmrk-equip/src/weights.rsdiffbeforeafterboth
3//! Autogenerated weights for pallet_proxy_rmrk_equip3//! Autogenerated weights for pallet_proxy_rmrk_equip
4//!4//!
5//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev5//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
6//! DATE: 2022-06-20, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`6//! DATE: 2022-06-21, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
7//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 10247//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
88
9// Executed Command:9// Executed Command:
54 // Storage: Nonfungible TokenData (r:0 w:1)54 // Storage: Nonfungible TokenData (r:0 w:1)
55 // Storage: Nonfungible Owned (r:0 w:1)55 // Storage: Nonfungible Owned (r:0 w:1)
56 fn create_base(b: u32, ) -> Weight {56 fn create_base(b: u32, ) -> Weight {
57 (44_927_000 as Weight)57 (62_832_000 as Weight)
58 // Standard Error: 9_00058 // Standard Error: 22_000
59 .saturating_add((18_896_000 as Weight).saturating_mul(b as Weight))59 .saturating_add((20_106_000 as Weight).saturating_mul(b as Weight))
60 .saturating_add(T::DbWeight::get().reads(6 as Weight))60 .saturating_add(T::DbWeight::get().reads(6 as Weight))
61 .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(b as Weight)))61 .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(b as Weight)))
62 .saturating_add(T::DbWeight::get().writes(8 as Weight))62 .saturating_add(T::DbWeight::get().writes(8 as Weight))
71 // Storage: Nonfungible TokenData (r:0 w:1)71 // Storage: Nonfungible TokenData (r:0 w:1)
72 // Storage: Nonfungible Owned (r:0 w:1)72 // Storage: Nonfungible Owned (r:0 w:1)
73 fn theme_add(b: u32, ) -> Weight {73 fn theme_add(b: u32, ) -> Weight {
74 (39_120_000 as Weight)74 (46_793_000 as Weight)
75 // Standard Error: 11_00075 // Standard Error: 61_000
76 .saturating_add((2_367_000 as Weight).saturating_mul(b as Weight))76 .saturating_add((3_061_000 as Weight).saturating_mul(b as Weight))
77 .saturating_add(T::DbWeight::get().reads(6 as Weight))77 .saturating_add(T::DbWeight::get().reads(6 as Weight))
78 .saturating_add(T::DbWeight::get().writes(5 as Weight))78 .saturating_add(T::DbWeight::get().writes(5 as Weight))
79 }79 }
82 // Storage: RmrkEquip InernalPartId (r:1 w:0)82 // Storage: RmrkEquip InernalPartId (r:1 w:0)
83 // Storage: Nonfungible TokenProperties (r:1 w:1)83 // Storage: Nonfungible TokenProperties (r:1 w:1)
84 fn equippable() -> Weight {84 fn equippable() -> Weight {
85 (27_172_000 as Weight)85 (32_495_000 as Weight)
86 .saturating_add(T::DbWeight::get().reads(4 as Weight))86 .saturating_add(T::DbWeight::get().reads(4 as Weight))
87 .saturating_add(T::DbWeight::get().writes(1 as Weight))87 .saturating_add(T::DbWeight::get().writes(1 as Weight))
88 }88 }
103 // Storage: Nonfungible TokenData (r:0 w:1)103 // Storage: Nonfungible TokenData (r:0 w:1)
104 // Storage: Nonfungible Owned (r:0 w:1)104 // Storage: Nonfungible Owned (r:0 w:1)
105 fn create_base(b: u32, ) -> Weight {105 fn create_base(b: u32, ) -> Weight {
106 (44_927_000 as Weight)106 (62_832_000 as Weight)
107 // Standard Error: 9_000107 // Standard Error: 22_000
108 .saturating_add((18_896_000 as Weight).saturating_mul(b as Weight))108 .saturating_add((20_106_000 as Weight).saturating_mul(b as Weight))
109 .saturating_add(RocksDbWeight::get().reads(6 as Weight))109 .saturating_add(RocksDbWeight::get().reads(6 as Weight))
110 .saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(b as Weight)))110 .saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(b as Weight)))
111 .saturating_add(RocksDbWeight::get().writes(8 as Weight))111 .saturating_add(RocksDbWeight::get().writes(8 as Weight))
120 // Storage: Nonfungible TokenData (r:0 w:1)120 // Storage: Nonfungible TokenData (r:0 w:1)
121 // Storage: Nonfungible Owned (r:0 w:1)121 // Storage: Nonfungible Owned (r:0 w:1)
122 fn theme_add(b: u32, ) -> Weight {122 fn theme_add(b: u32, ) -> Weight {
123 (39_120_000 as Weight)123 (46_793_000 as Weight)
124 // Standard Error: 11_000124 // Standard Error: 61_000
125 .saturating_add((2_367_000 as Weight).saturating_mul(b as Weight))125 .saturating_add((3_061_000 as Weight).saturating_mul(b as Weight))
126 .saturating_add(RocksDbWeight::get().reads(6 as Weight))126 .saturating_add(RocksDbWeight::get().reads(6 as Weight))
127 .saturating_add(RocksDbWeight::get().writes(5 as Weight))127 .saturating_add(RocksDbWeight::get().writes(5 as Weight))
128 }128 }
131 // Storage: RmrkEquip InernalPartId (r:1 w:0)131 // Storage: RmrkEquip InernalPartId (r:1 w:0)
132 // Storage: Nonfungible TokenProperties (r:1 w:1)132 // Storage: Nonfungible TokenProperties (r:1 w:1)
133 fn equippable() -> Weight {133 fn equippable() -> Weight {
134 (27_172_000 as Weight)134 (32_495_000 as Weight)
135 .saturating_add(RocksDbWeight::get().reads(4 as Weight))135 .saturating_add(RocksDbWeight::get().reads(4 as Weight))
136 .saturating_add(RocksDbWeight::get().writes(1 as Weight))136 .saturating_add(RocksDbWeight::get().writes(1 as Weight))
137 }137 }
modifiedprimitives/data-structs/src/lib.rsdiffbeforeafterboth
454 token_owner: false,454 token_owner: false,
455 collection_admin: false,455 collection_admin: false,
456 restricted: None,456 restricted: None,
457457 #[cfg(feature = "runtime-benchmarks")]
458 permissive: false,458 permissive: false,
459 };459 };
460 self.nesting.as_ref().unwrap_or(&DEFAULT)460 self.nesting.as_ref().unwrap_or(&DEFAULT)
499 /// If set - only tokens from specified collections can be nested499 /// If set - only tokens from specified collections can be nested
500 pub restricted: Option<OwnerRestrictedSet>,500 pub restricted: Option<OwnerRestrictedSet>,
501501
502 #[cfg(feature = "runtime-benchmarks")]
502 /// Anyone can nest tokens, mutually exclusive with `token_owner`, `admin`503 /// Anyone can nest tokens, mutually exclusive with `token_owner`, `admin`
503 pub permissive: bool,504 pub permissive: bool,
504}505}
modifiedruntime/common/src/constants.rsdiffbeforeafterboth
35pub const CENTIUNIQUE: Balance = 10 * MILLIUNIQUE;35pub const CENTIUNIQUE: Balance = 10 * MILLIUNIQUE;
36pub const UNIQUE: Balance = 100 * CENTIUNIQUE;36pub const UNIQUE: Balance = 100 * CENTIUNIQUE;
3737
38// Targeting 0.1 UNQ per transfer
38pub const WEIGHT_TO_FEE_COEFF: u32 = 142_688_000;39pub const WEIGHT_TO_FEE_COEFF: u32 = 207_890_902;
3940
40// Targeting 0.15 UNQ per transfer41// Targeting 0.15 UNQ per transfer via ETH
41pub const MIN_GAS_PRICE: u64 = 1_019_493_469_850;42pub const MIN_GAS_PRICE: u64 = 1_019_493_469_850;
4243
43/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.44/// We assume that ~10% of the block weight is consumed by `on_initalize` handlers.
52parameter_types! {53parameter_types! {
53 pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS;54 pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS;
5455
55 pub const TransactionByteFee: Balance = 501 * MICROUNIQUE; // Targeting 0.1 Unique per NFT transfer56 pub const TransactionByteFee: Balance = 501 * MICROUNIQUE;
56}57}
5758
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
508508
509 fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {509 fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
510 smallvec!(WeightToFeeCoefficient {510 smallvec!(WeightToFeeCoefficient {
511 // Targeting 0.1 Unique per NFT transfer
512 coeff_integer: WEIGHT_TO_FEE_COEFF.into(),511 coeff_integer: WEIGHT_TO_FEE_COEFF.into(),
513 coeff_frac: Perbill::zero(),512 coeff_frac: Perbill::zero(),
514 negative: false,513 negative: false,
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
507507
508 fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {508 fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
509 smallvec!(WeightToFeeCoefficient {509 smallvec!(WeightToFeeCoefficient {
510 // Targeting 0.1 Unique per NFT transfer
511 coeff_integer: WEIGHT_TO_FEE_COEFF.into(),510 coeff_integer: WEIGHT_TO_FEE_COEFF.into(),
512 coeff_frac: Perbill::zero(),511 coeff_frac: Perbill::zero(),
513 negative: false,512 negative: false,
810 RelayLocation,
811 AccountId,
812 Balances,
813 (),
814 >;
815 type ResponseHandler = (); // Don't handle responses for now.809 type ResponseHandler = (); // Don't handle responses for now.
816 type SubscriptionService = PolkadotXcm;810 type SubscriptionService = PolkadotXcm;
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
506506
507 fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {507 fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
508 smallvec!(WeightToFeeCoefficient {508 smallvec!(WeightToFeeCoefficient {
509 // Targeting 0.1 Unique per NFT transfer
510 coeff_integer: WEIGHT_TO_FEE_COEFF.into(),509 coeff_integer: WEIGHT_TO_FEE_COEFF.into(),
511 coeff_frac: Perbill::zero(),510 coeff_frac: Perbill::zero(),
512 negative: false,511 negative: false,
809 RelayLocation,
810 AccountId,
811 Balances,
812 (),
813 >;
814 type ResponseHandler = (); // Don't handle responses for now.808 type ResponseHandler = (); // Don't handle responses for now.
815 type SubscriptionService = PolkadotXcm;809 type SubscriptionService = PolkadotXcm;
modifiedtests/src/createItem.test.tsdiffbeforeafterboth
158158
159 const newCollectionID = await createCollectionWithPropsExpectSuccess();159 const newCollectionID = await createCollectionWithPropsExpectSuccess();
160 160
161 createItemWithPropsExpectFailure(alice, newCollectionID, 'NFT', prps);161 await createItemWithPropsExpectFailure(alice, newCollectionID, 'NFT', prps);
162 });162 });
163 });163 });
164164
165 it('Trying to add bigger property than allowed', async () => {165 it('Trying to add bigger property than allowed', async () => {
166 await usingApi(async () => {166 await usingApi(async () => {
167 const newCollectionID = await createCollectionWithPropsExpectSuccess();167 const newCollectionID = await createCollectionWithPropsExpectSuccess();
168 168
169 createItemWithPropsExpectFailure(alice, newCollectionID, 'NFT', [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}]);169 await createItemWithPropsExpectFailure(alice, newCollectionID, 'NFT', [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}]);
170 });170 });
171 });171 });
172});172});
modifiedtests/src/nesting/unnest.test.tsdiffbeforeafterboth
153153
154 // Create a nested token ouroboros154 // Create a nested token ouroboros
155 const nestedToken = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, targetToken)});155 const nestedToken = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, targetToken)});
156 expect(transferExpectSuccess(collection, targetToken, alice, {Ethereum: tokenIdToAddress(collection, nestedToken)})).to.be.rejectedWith(/^structure\.OuroborosDetected$/);156 await expect(transferExpectSuccess(collection, targetToken, alice, {Ethereum: tokenIdToAddress(collection, nestedToken)})).to.be.rejectedWith(/^structure\.OuroborosDetected$/);
157 });157 });
158});158});
159159
modifiedtests/update_apps.shdiffbeforeafterboth
1#!/usr/bin/env sh1#!/usr/bin/env sh
2
3set -eux
24
3./update_types.sh5./update_types.sh
46
modifiedtests/update_apps_start.shdiffbeforeafterboth
1#!/usr/bin/env sh1#!/usr/bin/env sh
2
3set -eux
24
3./update_apps.sh5./update_apps.sh
46
modifiedtests/update_types.shdiffbeforeafterboth
1#!/usr/bin/env sh1#!/usr/bin/env sh
2
3set -eux
24
3yarn polkadot-types5yarn polkadot-types
46