difftreelog
Merge pull request #784 from UniqueNetwork/fix/enable-foreign-assets-qtz-and-minor-fixes
in: master
Fix/enable foreign assets qtz and minor fixes
6 files changed
pallets/app-promotion/src/lib.rsdiffbeforeafterboth--- a/pallets/app-promotion/src/lib.rs
+++ b/pallets/app-promotion/src/lib.rs
@@ -564,7 +564,7 @@
/// # Arguments
///
/// * `stakers_number`: the number of stakers for which recalculation will be performed
- #[pallet::weight(<T as Config>::WeightInfo::payout_stakers(stakers_number.unwrap_or(20) as u32))]
+ #[pallet::weight(<T as Config>::WeightInfo::payout_stakers(stakers_number.unwrap_or(DEFAULT_NUMBER_PAYOUTS) as u32))]
pub fn payout_stakers(admin: OriginFor<T>, stakers_number: Option<u8>) -> DispatchResult {
let admin_id = ensure_signed(admin)?;
pallets/configuration/src/lib.rsdiffbeforeafterboth--- a/pallets/configuration/src/lib.rs
+++ b/pallets/configuration/src/lib.rs
@@ -52,7 +52,7 @@
type DefaultMinGasPrice: Get<u64>;
#[pallet::constant]
- type MaxOverridedAllowedLocations: Get<u32>;
+ type MaxXcmAllowedLocations: Get<u32>;
#[pallet::constant]
type AppPromotionDailyRate: Get<Perbill>;
#[pallet::constant]
@@ -77,7 +77,7 @@
#[pallet::storage]
pub type XcmAllowedLocationsOverride<T: Config> = StorageValue<
- Value = BoundedVec<MultiLocation, T::MaxOverridedAllowedLocations>,
+ Value = BoundedVec<MultiLocation, T::MaxXcmAllowedLocations>,
QueryKind = OptionQuery,
>;
@@ -118,7 +118,7 @@
#[pallet::weight(T::DbWeight::get().writes(1))]
pub fn set_xcm_allowed_locations(
origin: OriginFor<T>,
- locations: Option<BoundedVec<MultiLocation, T::MaxOverridedAllowedLocations>>,
+ locations: Option<BoundedVec<MultiLocation, T::MaxXcmAllowedLocations>>,
) -> DispatchResult {
ensure_root(origin)?;
<XcmAllowedLocationsOverride<T>>::set(locations);
runtime/common/config/pallets/mod.rsdiffbeforeafterboth--- a/runtime/common/config/pallets/mod.rs
+++ b/runtime/common/config/pallets/mod.rs
@@ -106,7 +106,7 @@
impl pallet_configuration::Config for Runtime {
type DefaultWeightToFeeCoefficient = ConstU32<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;
type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;
- type MaxOverridedAllowedLocations = ConstU32<16>;
+ type MaxXcmAllowedLocations = ConstU32<16>;
type AppPromotionDailyRate = AppPromotionDailyRate;
type DayRelayBlocks = DayRelayBlocks;
}
runtime/common/construct_runtime/mod.rsdiffbeforeafterboth--- a/runtime/common/construct_runtime/mod.rs
+++ b/runtime/common/construct_runtime/mod.rs
@@ -82,7 +82,7 @@
#[runtimes(opal, quartz)]
AppPromotion: pallet_app_promotion::{Pallet, Call, Storage, Event<T>} = 73,
- #[runtimes(opal)]
+ #[runtimes(opal, quartz)]
ForeignAssets: pallet_foreign_assets::{Pallet, Call, Storage, Event<T>} = 80,
// Frontier
runtime/quartz/Cargo.tomldiffbeforeafterboth--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -169,7 +169,7 @@
"pallet-maintenance/std",
]
limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
-quartz-runtime = ['refungible', 'app-promotion']
+quartz-runtime = ['refungible', 'app-promotion', 'foreign-assets']
refungible = []
scheduler = []
tests/src/pallet-presence.test.tsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {itSub, usingPlaygrounds, expect} from './util';1819// Pallets that must always be present20const requiredPallets = [21 'balances',22 'common',23 'randomnesscollectiveflip',24 'timestamp',25 'transactionpayment',26 'treasury',27 'structure',28 'system',29 'vesting',30 'parachainsystem',31 'parachaininfo',32 'evm',33 'evmcodersubstrate',34 'evmcontracthelpers',35 'evmmigration',36 'evmtransactionpayment',37 'ethereum',38 'fungible',39 'xcmpqueue',40 'polkadotxcm',41 'cumulusxcm',42 'dmpqueue',43 'inflation',44 'unique',45 'nonfungible',46 'charging',47 'configuration',48 'tokens',49 'xtokens',50 'maintenance',51];5253// Pallets that depend on consensus and governance configuration54const consensusPallets = [55 'sudo',56 'aura',57 'auraext',58];5960describe('Pallet presence', () => {61 before(async () => {62 await usingPlaygrounds(async helper => {63 const chain = await helper.callRpc('api.rpc.system.chain', []);6465 const refungible = 'refungible';66 const foreignAssets = 'foreignassets';67 const rmrkPallets = ['rmrkcore', 'rmrkequip'];68 const appPromotion = 'apppromotion';69 const testUtils = 'testutils';7071 if (chain.eq('OPAL by UNIQUE')) {72 requiredPallets.push(73 refungible,74 foreignAssets,75 appPromotion,76 testUtils,77 ...rmrkPallets,78 );79 } else if (chain.eq('QUARTZ by UNIQUE')) {80 requiredPallets.push(81 refungible,82 appPromotion,83 );84 } else if (chain.eq('UNIQUE')) {85 // Insert Unique additional pallets here86 }87 });88 });8990 itSub('Required pallets are present', ({helper}) => {91 expect(helper.fetchAllPalletNames()).to.contain.members([...requiredPallets]);92 });9394 itSub('Governance and consensus pallets are present', ({helper}) => {95 expect(helper.fetchAllPalletNames()).to.contain.members([...consensusPallets]);96 });9798 itSub('No extra pallets are included', ({helper}) => {99 expect(helper.fetchAllPalletNames().sort()).to.be.deep.equal([...requiredPallets, ...consensusPallets].sort());100 });101});1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617import {itSub, usingPlaygrounds, expect} from './util';1819// Pallets that must always be present20const requiredPallets = [21 'balances',22 'common',23 'randomnesscollectiveflip',24 'timestamp',25 'transactionpayment',26 'treasury',27 'structure',28 'system',29 'vesting',30 'parachainsystem',31 'parachaininfo',32 'evm',33 'evmcodersubstrate',34 'evmcontracthelpers',35 'evmmigration',36 'evmtransactionpayment',37 'ethereum',38 'fungible',39 'xcmpqueue',40 'polkadotxcm',41 'cumulusxcm',42 'dmpqueue',43 'inflation',44 'unique',45 'nonfungible',46 'charging',47 'configuration',48 'tokens',49 'xtokens',50 'maintenance',51];5253// Pallets that depend on consensus and governance configuration54const consensusPallets = [55 'sudo',56 'aura',57 'auraext',58];5960describe('Pallet presence', () => {61 before(async () => {62 await usingPlaygrounds(async helper => {63 const chain = await helper.callRpc('api.rpc.system.chain', []);6465 const refungible = 'refungible';66 const foreignAssets = 'foreignassets';67 const rmrkPallets = ['rmrkcore', 'rmrkequip'];68 const appPromotion = 'apppromotion';69 const testUtils = 'testutils';7071 if (chain.eq('OPAL by UNIQUE')) {72 requiredPallets.push(73 refungible,74 foreignAssets,75 appPromotion,76 testUtils,77 ...rmrkPallets,78 );79 } else if (chain.eq('QUARTZ by UNIQUE')) {80 requiredPallets.push(81 refungible,82 appPromotion,83 foreignAssets,84 );85 } else if (chain.eq('UNIQUE')) {86 // Insert Unique additional pallets here87 }88 });89 });9091 itSub('Required pallets are present', ({helper}) => {92 expect(helper.fetchAllPalletNames()).to.contain.members([...requiredPallets]);93 });9495 itSub('Governance and consensus pallets are present', ({helper}) => {96 expect(helper.fetchAllPalletNames()).to.contain.members([...consensusPallets]);97 });9899 itSub('No extra pallets are included', ({helper}) => {100 expect(helper.fetchAllPalletNames().sort()).to.be.deep.equal([...requiredPallets, ...consensusPallets].sort());101 });102});