git.delta.rocks / unique-network / refs/commits / 7fd4751d0ab2

difftreelog

Merge pull request #784 from UniqueNetwork/fix/enable-foreign-assets-qtz-and-minor-fixes

kozyrevdev2022-12-16parents: #9a4bd0b #f08f3da.patch.diff
in: master
Fix/enable foreign assets qtz and minor fixes

6 files changed

modifiedpallets/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)?;
 
modifiedpallets/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);
modifiedruntime/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;
 }
modifiedruntime/common/construct_runtime/mod.rsdiffbeforeafterboth
before · runtime/common/construct_runtime/mod.rs
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/>.1617mod util;1819#[macro_export]20macro_rules! construct_runtime {21    ($select_runtime:ident) => {22        $crate::construct_runtime_impl! {23            select_runtime($select_runtime);2425            pub enum Runtime where26                Block = Block,27                NodeBlock = opaque::Block,28                UncheckedExtrinsic = UncheckedExtrinsic29            {30                System: frame_system = 0,3132                ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,33                ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,3435                Aura: pallet_aura::{Pallet, Config<T>} = 22,36                AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,3738                Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,39                RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,40                Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,41                TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 33,42                Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,43                Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,44                Vesting: orml_vesting::{Pallet, Storage, Call, Event<T>, Config<T>} = 37,4546                XTokens: orml_xtokens = 38,47                Tokens: orml_tokens = 39,48                // Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,4950                // XCM helpers.51                XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,52                PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,53                CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,54                DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,5556                // Unique Pallets57                Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,58                Unique: pallet_unique::{Pallet, Call, Storage} = 61,5960                // #[runtimes(opal)]61                // Scheduler: pallet_unique_scheduler_v2::{Pallet, Call, Storage, Event<T>} = 62,6263                Configuration: pallet_configuration::{Pallet, Call, Storage} = 63,6465                Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,66                // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,67                Common: pallet_common::{Pallet, Storage, Event<T>} = 66,68                Fungible: pallet_fungible::{Pallet, Storage} = 67,6970                #[runtimes(opal, quartz)]71                Refungible: pallet_refungible::{Pallet, Storage} = 68,7273                Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,74                Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,7576                #[runtimes(opal)]77                RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,7879                #[runtimes(opal)]80                RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,8182                #[runtimes(opal, quartz)]83                AppPromotion: pallet_app_promotion::{Pallet, Call, Storage, Event<T>} = 73,8485                #[runtimes(opal)]86                ForeignAssets: pallet_foreign_assets::{Pallet, Call, Storage, Event<T>} = 80,8788                // Frontier89                EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,90                Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,9192                EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,93                EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage, Event<T>} = 151,94                EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,95                EvmMigration: pallet_evm_migration::{Pallet, Call, Storage, Event<T>} = 153,9697                Maintenance: pallet_maintenance::{Pallet, Call, Storage, Event<T>} = 154,9899                #[runtimes(opal)]100                TestUtils: pallet_test_utils = 255,101            }102        }103    }104}
modifiedruntime/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 = []
modifiedtests/src/pallet-presence.test.tsdiffbeforeafterboth
--- a/tests/src/pallet-presence.test.ts
+++ b/tests/src/pallet-presence.test.ts
@@ -80,6 +80,7 @@
         requiredPallets.push(
           refungible,
           appPromotion,
+          foreignAssets,
         );
       } else if (chain.eq('UNIQUE')) {
         // Insert Unique additional pallets here