--- 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(::WeightInfo::payout_stakers(stakers_number.unwrap_or(20) as u32))] + #[pallet::weight(::WeightInfo::payout_stakers(stakers_number.unwrap_or(DEFAULT_NUMBER_PAYOUTS) as u32))] pub fn payout_stakers(admin: OriginFor, stakers_number: Option) -> DispatchResult { let admin_id = ensure_signed(admin)?; --- a/pallets/configuration/src/lib.rs +++ b/pallets/configuration/src/lib.rs @@ -52,7 +52,7 @@ type DefaultMinGasPrice: Get; #[pallet::constant] - type MaxOverridedAllowedLocations: Get; + type MaxXcmAllowedLocations: Get; #[pallet::constant] type AppPromotionDailyRate: Get; #[pallet::constant] @@ -77,7 +77,7 @@ #[pallet::storage] pub type XcmAllowedLocationsOverride = StorageValue< - Value = BoundedVec, + Value = BoundedVec, QueryKind = OptionQuery, >; @@ -118,7 +118,7 @@ #[pallet::weight(T::DbWeight::get().writes(1))] pub fn set_xcm_allowed_locations( origin: OriginFor, - locations: Option>, + locations: Option>, ) -> DispatchResult { ensure_root(origin)?; >::set(locations); --- 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; } --- 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} = 73, - #[runtimes(opal)] + #[runtimes(opal, quartz)] ForeignAssets: pallet_foreign_assets::{Pallet, Call, Storage, Event} = 80, // Frontier --- 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 = [] --- 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