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
before · runtime/common/config/pallets/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/>.1617use frame_support::parameter_types;18use sp_runtime::traits::AccountIdConversion;19use crate::{20	runtime_common::{21		dispatch::CollectionDispatchT,22		config::{substrate::TreasuryModuleId, ethereum::EvmCollectionHelpersAddress},23		weights::CommonWeights,24		RelayChainBlockNumberProvider,25	},26	Runtime, RuntimeEvent, RuntimeCall, Balances,27};28use frame_support::traits::{ConstU32, ConstU64};29use up_common::{30	types::{AccountId, Balance, BlockNumber},31	constants::*,32};33use up_data_structs::{34	mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},35};36use sp_arithmetic::Perbill;3738#[cfg(feature = "rmrk")]39pub mod rmrk;4041#[cfg(feature = "scheduler")]42pub mod scheduler;4344#[cfg(feature = "foreign-assets")]45pub mod foreign_asset;4647#[cfg(feature = "app-promotion")]48pub mod app_promotion;4950parameter_types! {51	pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();52	pub const CollectionCreationPrice: Balance = 2 * UNIQUE;53}5455impl pallet_common::Config for Runtime {56	type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;57	type RuntimeEvent = RuntimeEvent;58	type Currency = Balances;59	type CollectionCreationPrice = CollectionCreationPrice;60	type TreasuryAccountId = TreasuryAccountId;61	type CollectionDispatch = CollectionDispatchT<Self>;6263	type EvmTokenAddressMapping = EvmTokenAddressMapping;64	type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;65	type ContractAddress = EvmCollectionHelpersAddress;66}6768impl pallet_structure::Config for Runtime {69	type RuntimeEvent = RuntimeEvent;70	type RuntimeCall = RuntimeCall;71	type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;72}7374impl pallet_fungible::Config for Runtime {75	type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;76}77impl pallet_refungible::Config for Runtime {78	type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;79}80impl pallet_nonfungible::Config for Runtime {81	type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;82}8384parameter_types! {85	pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied86}8788/// Used for the pallet inflation89impl pallet_inflation::Config for Runtime {90	type Currency = Balances;91	type TreasuryAccountId = TreasuryAccountId;92	type InflationBlockInterval = InflationBlockInterval;93	type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;94}9596impl pallet_unique::Config for Runtime {97	type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;98	type CommonWeightInfo = CommonWeights<Self>;99	type RefungibleExtensionsWeightInfo = CommonWeights<Self>;100}101102parameter_types! {103	pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);104	pub const DayRelayBlocks: BlockNumber = RELAY_DAYS;105}106impl pallet_configuration::Config for Runtime {107	type DefaultWeightToFeeCoefficient = ConstU32<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;108	type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;109	type MaxOverridedAllowedLocations = ConstU32<16>;110	type AppPromotionDailyRate = AppPromotionDailyRate;111	type DayRelayBlocks = DayRelayBlocks;112}113114impl pallet_maintenance::Config for Runtime {115	type RuntimeEvent = RuntimeEvent;116	type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;117}
modifiedruntime/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
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