From 1ddd82e06cac7b4898ebaf5fec8756e309e2f944 Mon Sep 17 00:00:00 2001 From: kozyrevdev <73348153+kozyrevdev@users.noreply.github.com> Date: Wed, 22 Jun 2022 08:37:29 +0000 Subject: [PATCH] Merge pull request #398 from UniqueNetwork/release-v923000 Release v923000 --- --- a/pallets/common/src/benchmarking.rs +++ b/pallets/common/src/benchmarking.rs @@ -98,6 +98,7 @@ token_owner: false, collection_admin: false, restricted: None, + #[cfg(feature = "runtime-benchmarks")] permissive: true, }), mint_mode: Some(true), --- a/pallets/common/src/lib.rs +++ b/pallets/common/src/lib.rs @@ -1212,14 +1212,7 @@ limit_default_clone!(old_limit, new_limit, access => {}, mint_mode => {}, - nesting => { - #[cfg(not(feature = "runtime-benchmarks"))] - ensure!( - // Permissive is only allowed for tests and internal usage of chain for now - old_limit.permissive || !new_limit.permissive, - >::NoPermission, - ) - }, + nesting => { /* todo check for permissive, if only it gets out of benchmarks */ }, ); Ok(new_limit) } --- a/pallets/nonfungible/src/lib.rs +++ b/pallets/nonfungible/src/lib.rs @@ -1038,7 +1038,13 @@ nesting_budget: &dyn Budget, ) -> DispatchResult { let nesting = handle.permissions.nesting(); - if nesting.permissive { + + #[cfg(not(feature = "runtime-benchmarks"))] + let permissive = false; + #[cfg(feature = "runtime-benchmarks")] + let permissive = nesting.permissive; + + if permissive { // Pass } else if nesting.token_owner && >::check_indirectly_owned( --- a/pallets/proxy-rmrk-core/src/lib.rs +++ b/pallets/proxy-rmrk-core/src/lib.rs @@ -205,7 +205,7 @@ token_owner: true, collection_admin: false, restricted: None, - + #[cfg(feature = "runtime-benchmarks")] permissive: false, }), ..Default::default() --- 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-17, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-06-21, 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_359_000 as Weight) + (49_986_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 { - (45_375_000 as Weight) + (50_177_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_753_000 as Weight) + (25_949_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 { - (24_356_000 as Weight) + (27_183_000 as Weight) .saturating_add(T::DbWeight::get().reads(5 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -109,9 +109,9 @@ // Storage: Nonfungible Owned (r:0 w:1) // Storage: Nonfungible TokenAuxProperties (r:2 w:2) fn mint_nft(b: u32, ) -> Weight { - (44_853_000 as Weight) - // Standard Error: 2_000 - .saturating_add((10_721_000 as Weight).saturating_mul(b as Weight)) + (65_512_000 as Weight) + // Standard Error: 12_000 + .saturating_add((11_525_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_590_000 - .saturating_add((319_825_000 as Weight).saturating_mul(b as Weight)) + // Standard Error: 1_472_000 + .saturating_add((296_221_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_576_000 as Weight) + (82_778_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 { - (79_670_000 as Weight) + (90_190_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 { - (254_989_000 as Weight) + (262_238_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 { - (48_651_000 as Weight) + (55_187_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_579_000 as Weight) + (54_092_000 as Weight) .saturating_add(T::DbWeight::get().reads(9 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -206,7 +206,7 @@ // Storage: Nonfungible TokenProperties (r:1 w:1) // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn add_basic_resource() -> Weight { - (55_013_000 as Weight) + (62_551_000 as Weight) .saturating_add(T::DbWeight::get().reads(10 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -217,7 +217,7 @@ // Storage: Nonfungible TokenProperties (r:1 w:1) // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn add_composable_resource() -> Weight { - (55_184_000 as Weight) + (61_778_000 as Weight) .saturating_add(T::DbWeight::get().reads(10 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -228,7 +228,7 @@ // Storage: Nonfungible TokenProperties (r:1 w:1) // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn add_slot_resource() -> Weight { - (54_792_000 as Weight) + (62_700_000 as Weight) .saturating_add(T::DbWeight::get().reads(10 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } @@ -238,7 +238,7 @@ // Storage: Nonfungible TokenAuxProperties (r:1 w:1) // Storage: Nonfungible TokenData (r:5 w:0) fn remove_resource() -> Weight { - (46_447_000 as Weight) + (52_920_000 as Weight) .saturating_add(T::DbWeight::get().reads(9 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -248,7 +248,7 @@ // Storage: Nonfungible TokenData (r:5 w:0) // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn accept_resource() -> Weight { - (45_096_000 as Weight) + (52_450_000 as Weight) .saturating_add(T::DbWeight::get().reads(9 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -258,7 +258,7 @@ // Storage: Nonfungible TokenData (r:5 w:0) // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn accept_resource_removal() -> Weight { - (45_445_000 as Weight) + (50_901_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_359_000 as Weight) + (49_986_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 { - (45_375_000 as Weight) + (50_177_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_753_000 as Weight) + (25_949_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 { - (24_356_000 as Weight) + (27_183_000 as Weight) .saturating_add(RocksDbWeight::get().reads(5 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -320,9 +320,9 @@ // Storage: Nonfungible Owned (r:0 w:1) // Storage: Nonfungible TokenAuxProperties (r:2 w:2) fn mint_nft(b: u32, ) -> Weight { - (44_853_000 as Weight) - // Standard Error: 2_000 - .saturating_add((10_721_000 as Weight).saturating_mul(b as Weight)) + (65_512_000 as Weight) + // Standard Error: 12_000 + .saturating_add((11_525_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_590_000 - .saturating_add((319_825_000 as Weight).saturating_mul(b as Weight)) + // Standard Error: 1_472_000 + .saturating_add((296_221_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_576_000 as Weight) + (82_778_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 { - (79_670_000 as Weight) + (90_190_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 { - (254_989_000 as Weight) + (262_238_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 { - (48_651_000 as Weight) + (55_187_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_579_000 as Weight) + (54_092_000 as Weight) .saturating_add(RocksDbWeight::get().reads(9 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -417,7 +417,7 @@ // Storage: Nonfungible TokenProperties (r:1 w:1) // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn add_basic_resource() -> Weight { - (55_013_000 as Weight) + (62_551_000 as Weight) .saturating_add(RocksDbWeight::get().reads(10 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } @@ -428,7 +428,7 @@ // Storage: Nonfungible TokenProperties (r:1 w:1) // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn add_composable_resource() -> Weight { - (55_184_000 as Weight) + (61_778_000 as Weight) .saturating_add(RocksDbWeight::get().reads(10 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } @@ -439,7 +439,7 @@ // Storage: Nonfungible TokenProperties (r:1 w:1) // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn add_slot_resource() -> Weight { - (54_792_000 as Weight) + (62_700_000 as Weight) .saturating_add(RocksDbWeight::get().reads(10 as Weight)) .saturating_add(RocksDbWeight::get().writes(2 as Weight)) } @@ -449,7 +449,7 @@ // Storage: Nonfungible TokenAuxProperties (r:1 w:1) // Storage: Nonfungible TokenData (r:5 w:0) fn remove_resource() -> Weight { - (46_447_000 as Weight) + (52_920_000 as Weight) .saturating_add(RocksDbWeight::get().reads(9 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -459,7 +459,7 @@ // Storage: Nonfungible TokenData (r:5 w:0) // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn accept_resource() -> Weight { - (45_096_000 as Weight) + (52_450_000 as Weight) .saturating_add(RocksDbWeight::get().reads(9 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } @@ -469,7 +469,7 @@ // Storage: Nonfungible TokenData (r:5 w:0) // Storage: Nonfungible TokenAuxProperties (r:1 w:1) fn accept_resource_removal() -> Weight { - (45_445_000 as Weight) + (50_901_000 as Weight) .saturating_add(RocksDbWeight::get().reads(9 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } --- a/pallets/proxy-rmrk-equip/src/weights.rs +++ b/pallets/proxy-rmrk-equip/src/weights.rs @@ -3,7 +3,7 @@ //! Autogenerated weights for pallet_proxy_rmrk_equip //! //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-06-20, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! DATE: 2022-06-21, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]` //! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024 // Executed Command: @@ -54,9 +54,9 @@ // Storage: Nonfungible TokenData (r:0 w:1) // Storage: Nonfungible Owned (r:0 w:1) fn create_base(b: u32, ) -> Weight { - (44_927_000 as Weight) - // Standard Error: 9_000 - .saturating_add((18_896_000 as Weight).saturating_mul(b as Weight)) + (62_832_000 as Weight) + // Standard Error: 22_000 + .saturating_add((20_106_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(6 as Weight)) .saturating_add(T::DbWeight::get().reads((2 as Weight).saturating_mul(b as Weight))) .saturating_add(T::DbWeight::get().writes(8 as Weight)) @@ -71,9 +71,9 @@ // Storage: Nonfungible TokenData (r:0 w:1) // Storage: Nonfungible Owned (r:0 w:1) fn theme_add(b: u32, ) -> Weight { - (39_120_000 as Weight) - // Standard Error: 11_000 - .saturating_add((2_367_000 as Weight).saturating_mul(b as Weight)) + (46_793_000 as Weight) + // Standard Error: 61_000 + .saturating_add((3_061_000 as Weight).saturating_mul(b as Weight)) .saturating_add(T::DbWeight::get().reads(6 as Weight)) .saturating_add(T::DbWeight::get().writes(5 as Weight)) } @@ -82,7 +82,7 @@ // Storage: RmrkEquip InernalPartId (r:1 w:0) // Storage: Nonfungible TokenProperties (r:1 w:1) fn equippable() -> Weight { - (27_172_000 as Weight) + (32_495_000 as Weight) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(1 as Weight)) } @@ -103,9 +103,9 @@ // Storage: Nonfungible TokenData (r:0 w:1) // Storage: Nonfungible Owned (r:0 w:1) fn create_base(b: u32, ) -> Weight { - (44_927_000 as Weight) - // Standard Error: 9_000 - .saturating_add((18_896_000 as Weight).saturating_mul(b as Weight)) + (62_832_000 as Weight) + // Standard Error: 22_000 + .saturating_add((20_106_000 as Weight).saturating_mul(b as Weight)) .saturating_add(RocksDbWeight::get().reads(6 as Weight)) .saturating_add(RocksDbWeight::get().reads((2 as Weight).saturating_mul(b as Weight))) .saturating_add(RocksDbWeight::get().writes(8 as Weight)) @@ -120,9 +120,9 @@ // Storage: Nonfungible TokenData (r:0 w:1) // Storage: Nonfungible Owned (r:0 w:1) fn theme_add(b: u32, ) -> Weight { - (39_120_000 as Weight) - // Standard Error: 11_000 - .saturating_add((2_367_000 as Weight).saturating_mul(b as Weight)) + (46_793_000 as Weight) + // Standard Error: 61_000 + .saturating_add((3_061_000 as Weight).saturating_mul(b as Weight)) .saturating_add(RocksDbWeight::get().reads(6 as Weight)) .saturating_add(RocksDbWeight::get().writes(5 as Weight)) } @@ -131,7 +131,7 @@ // Storage: RmrkEquip InernalPartId (r:1 w:0) // Storage: Nonfungible TokenProperties (r:1 w:1) fn equippable() -> Weight { - (27_172_000 as Weight) + (32_495_000 as Weight) .saturating_add(RocksDbWeight::get().reads(4 as Weight)) .saturating_add(RocksDbWeight::get().writes(1 as Weight)) } --- a/primitives/data-structs/src/lib.rs +++ b/primitives/data-structs/src/lib.rs @@ -454,7 +454,7 @@ token_owner: false, collection_admin: false, restricted: None, - + #[cfg(feature = "runtime-benchmarks")] permissive: false, }; self.nesting.as_ref().unwrap_or(&DEFAULT) @@ -499,6 +499,7 @@ /// If set - only tokens from specified collections can be nested pub restricted: Option, + #[cfg(feature = "runtime-benchmarks")] /// Anyone can nest tokens, mutually exclusive with `token_owner`, `admin` pub permissive: bool, } --- a/runtime/common/src/constants.rs +++ b/runtime/common/src/constants.rs @@ -35,9 +35,10 @@ pub const CENTIUNIQUE: Balance = 10 * MILLIUNIQUE; pub const UNIQUE: Balance = 100 * CENTIUNIQUE; -pub const WEIGHT_TO_FEE_COEFF: u32 = 142_688_000; +// Targeting 0.1 UNQ per transfer +pub const WEIGHT_TO_FEE_COEFF: u32 = 207_890_902; -// Targeting 0.15 UNQ per transfer +// Targeting 0.15 UNQ per transfer via ETH pub const MIN_GAS_PRICE: u64 = 1_019_493_469_850; /// We assume that ~10% of the block weight is consumed by `on_initalize` handlers. @@ -52,5 +53,5 @@ parameter_types! { pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS; - pub const TransactionByteFee: Balance = 501 * MICROUNIQUE; // Targeting 0.1 Unique per NFT transfer + pub const TransactionByteFee: Balance = 501 * MICROUNIQUE; } --- a/runtime/opal/src/lib.rs +++ b/runtime/opal/src/lib.rs @@ -508,7 +508,6 @@ fn polynomial() -> WeightToFeeCoefficients { smallvec!(WeightToFeeCoefficient { - // Targeting 0.1 Unique per NFT transfer coeff_integer: WEIGHT_TO_FEE_COEFF.into(), coeff_frac: Perbill::zero(), negative: false, --- a/runtime/quartz/src/lib.rs +++ b/runtime/quartz/src/lib.rs @@ -507,7 +507,6 @@ fn polynomial() -> WeightToFeeCoefficients { smallvec!(WeightToFeeCoefficient { - // Targeting 0.1 Unique per NFT transfer coeff_integer: WEIGHT_TO_FEE_COEFF.into(), coeff_frac: Perbill::zero(), negative: false, @@ -805,13 +804,8 @@ type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = UsingOnlySelfCurrencyComponents< - LinearFee, - RelayLocation, - AccountId, - Balances, - (), - >; + type Trader = + UsingOnlySelfCurrencyComponents, RelayLocation, AccountId, Balances, ()>; type ResponseHandler = (); // Don't handle responses for now. type SubscriptionService = PolkadotXcm; --- a/runtime/unique/src/lib.rs +++ b/runtime/unique/src/lib.rs @@ -506,7 +506,6 @@ fn polynomial() -> WeightToFeeCoefficients { smallvec!(WeightToFeeCoefficient { - // Targeting 0.1 Unique per NFT transfer coeff_integer: WEIGHT_TO_FEE_COEFF.into(), coeff_frac: Perbill::zero(), negative: false, @@ -804,13 +803,8 @@ type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = UsingOnlySelfCurrencyComponents< - LinearFee, - RelayLocation, - AccountId, - Balances, - (), - >; + type Trader = + UsingOnlySelfCurrencyComponents, RelayLocation, AccountId, Balances, ()>; type ResponseHandler = (); // Don't handle responses for now. type SubscriptionService = PolkadotXcm; --- a/tests/src/createItem.test.ts +++ b/tests/src/createItem.test.ts @@ -158,7 +158,7 @@ const newCollectionID = await createCollectionWithPropsExpectSuccess(); - createItemWithPropsExpectFailure(alice, newCollectionID, 'NFT', prps); + await createItemWithPropsExpectFailure(alice, newCollectionID, 'NFT', prps); }); }); @@ -166,7 +166,7 @@ await usingApi(async () => { const newCollectionID = await createCollectionWithPropsExpectSuccess(); - createItemWithPropsExpectFailure(alice, newCollectionID, 'NFT', [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}]); + await createItemWithPropsExpectFailure(alice, newCollectionID, 'NFT', [{key: 'k', value: 'vvvvvv'.repeat(5000)}, {key: 'k2', value: 'vvv'.repeat(5000)}]); }); }); }); --- a/tests/src/nesting/unnest.test.ts +++ b/tests/src/nesting/unnest.test.ts @@ -153,6 +153,6 @@ // Create a nested token ouroboros const nestedToken = await createItemExpectSuccess(alice, collection, 'NFT', {Ethereum: tokenIdToAddress(collection, targetToken)}); - expect(transferExpectSuccess(collection, targetToken, alice, {Ethereum: tokenIdToAddress(collection, nestedToken)})).to.be.rejectedWith(/^structure\.OuroborosDetected$/); + await expect(transferExpectSuccess(collection, targetToken, alice, {Ethereum: tokenIdToAddress(collection, nestedToken)})).to.be.rejectedWith(/^structure\.OuroborosDetected$/); }); }); --- a/tests/update_apps.sh +++ b/tests/update_apps.sh @@ -1,5 +1,7 @@ #!/usr/bin/env sh +set -eux + ./update_types.sh if [ ! -d polkadot-apps ]; then @@ -8,4 +10,4 @@ pushd polkadot-apps yarn link ../unique-types-js -popd \ No newline at end of file +popd --- a/tests/update_apps_start.sh +++ b/tests/update_apps_start.sh @@ -1,7 +1,9 @@ #!/usr/bin/env sh +set -eux + ./update_apps.sh pushd polkadot-apps yarn start -popd \ No newline at end of file +popd --- a/tests/update_types.sh +++ b/tests/update_types.sh @@ -1,5 +1,7 @@ #!/usr/bin/env sh +set -eux + yarn polkadot-types if [ ! -d unique-types-js ]; then -- gitstuff