difftreelog
fix(inflation) BlockNumberProvider
in: master
2 files changed
pallets/inflation/src/lib.rsdiffbeforeafterboth--- a/pallets/inflation/src/lib.rs
+++ b/pallets/inflation/src/lib.rs
@@ -70,8 +70,8 @@
+ Mutate<Self::AccountId>;
type TreasuryAccountId: Get<Self::AccountId>;
- // The block number provider
- type BlockNumberProvider: BlockNumberProvider<BlockNumber = BlockNumberFor<Self>>;
+ // The block number provider, which should be callable from `on_initialize` hook.
+ type OnInitializeBlockNumberProvider: BlockNumberProvider<BlockNumber = BlockNumberFor<Self>>;
/// Number of blocks that pass between treasury balance updates due to inflation
#[pallet::constant]
@@ -118,7 +118,7 @@
};
let block_interval: u32 = T::InflationBlockInterval::get().try_into().unwrap_or(0);
- let current_relay_block = T::BlockNumberProvider::current_block_number();
+ let current_relay_block = T::OnInitializeBlockNumberProvider::current_block_number();
let next_inflation: BlockNumberFor<T> = <NextInflationBlock<T>>::get();
add_weight(1, 0, Weight::from_parts(5_000_000, 0));
runtime/common/config/pallets/mod.rsdiffbeforeafterboth1// 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 alloc::string::{String, ToString};1819use frame_support::{20 parameter_types,21 traits::{ConstU32, ConstU64, Currency},22};23use sp_arithmetic::Perbill;24use sp_runtime::traits::{BlockNumberProvider, AccountIdConversion};25use up_common::{26 constants::*,27 types::{AccountId, Balance, BlockNumber},28};29use up_data_structs::mapping::{CrossTokenAddressMapping, EvmTokenAddressMapping};3031#[cfg(feature = "governance")]32use crate::runtime_common::config::governance;33use crate::{34 runtime_common::{35 config::{ethereum::EvmCollectionHelpersAddress, substrate::TreasuryModuleId},36 dispatch::CollectionDispatchT,37 weights::CommonWeights,38 RelayChainBlockNumberProvider,39 },40 Balances, Runtime, RuntimeCall, RuntimeEvent, DECIMALS, TOKEN_SYMBOL, VERSION,41};4243#[cfg(feature = "foreign-assets")]44pub mod foreign_asset;4546#[cfg(feature = "app-promotion")]47pub mod app_promotion;4849#[cfg(feature = "collator-selection")]50pub mod collator_selection;5152#[cfg(feature = "preimage")]53pub mod preimage;5455parameter_types! {56 pub const CollectionCreationPrice: Balance = 2 * UNIQUE;57 pub TreasuryAccountId: AccountId = TreasuryModuleId::get().into_account_truncating();58}5960impl pallet_common::Config for Runtime {61 type WeightInfo = pallet_common::weights::SubstrateWeight<Self>;62 type RuntimeEvent = RuntimeEvent;63 type Currency = Balances;64 type CollectionCreationPrice = CollectionCreationPrice;65 type TreasuryAccountId = TreasuryAccountId;66 type CollectionDispatch = CollectionDispatchT<Self>;6768 type EvmTokenAddressMapping = EvmTokenAddressMapping;69 type CrossTokenAddressMapping = CrossTokenAddressMapping<Self::AccountId>;70 type ContractAddress = EvmCollectionHelpersAddress;71}7273impl pallet_structure::Config for Runtime {74 type RuntimeEvent = RuntimeEvent;75 type RuntimeCall = RuntimeCall;76 type WeightInfo = pallet_structure::weights::SubstrateWeight<Self>;77}7879impl pallet_fungible::Config for Runtime {80 type WeightInfo = pallet_fungible::weights::SubstrateWeight<Self>;81}82impl pallet_refungible::Config for Runtime {83 type WeightInfo = pallet_refungible::weights::SubstrateWeight<Self>;84}85impl pallet_nonfungible::Config for Runtime {86 type WeightInfo = pallet_nonfungible::weights::SubstrateWeight<Self>;87}8889parameter_types! {90 pub const Decimals: u8 = DECIMALS;91 pub Name: String = String::from_utf8_lossy(VERSION.impl_name.as_ref()).to_string();92 pub Symbol: String = TOKEN_SYMBOL.to_string();93}94impl pallet_balances_adapter::Config for Runtime {95 type Inspect = Balances;96 type Mutate = Balances;97 type CurrencyBalance = <Balances as Currency<Self::AccountId>>::Balance;98 type Decimals = Decimals;99 type Name = Name;100 type Symbol = Symbol;101 type WeightInfo = pallet_balances::weights::SubstrateWeight<Self>;102}103104parameter_types! {105 pub const InflationBlockInterval: BlockNumber = 100; // every time per how many blocks inflation is applied106}107108/// Pallet-inflation needs block number in on_initialize, where there is no `validation_data` exists yet109pub struct OnInitializeBlockNumberProvider;110impl BlockNumberProvider for OnInitializeBlockNumberProvider {111 type BlockNumber = BlockNumber;112113 fn current_block_number() -> Self::BlockNumber {114 use parity_scale_codec::Decode;115 use hex_literal::hex;116 use sp_io::storage;117 // TODO: Replace with the following code after https://github.com/paritytech/polkadot-sdk/commit/3ea497b5a0fdda252f9c5a3c257cfaf8685f02fd lands118 // <cumulus_pallet_parachain_system::Pallet<Runtime>>::last_relay_block_number()119120 // ParachainSystem.LastRelayChainBlockNumber121 let Some(encoded) = storage::get(&hex!("45323df7cc47150b3930e2666b0aa313a2bca190d36bd834cc73a38fc213ecbd")) else {122 // First parachain block123 return Default::default()124 };125 BlockNumber::decode(&mut encoded.as_ref()).expect("typeof(RelayBlockNumber) == typeof(BlockNumber) == u32; qed")126 }127}128129/// Used for the pallet inflation130impl pallet_inflation::Config for Runtime {131 type Currency = Balances;132 type TreasuryAccountId = TreasuryAccountId;133 type InflationBlockInterval = InflationBlockInterval;134 type OnInitializeBlockNumberProvider = OnInitializeBlockNumberProvider;135}136137impl pallet_unique::Config for Runtime {138 type WeightInfo = pallet_unique::weights::SubstrateWeight<Self>;139 type CommonWeightInfo = CommonWeights<Self>;140 type StructureWeightInfo = pallet_structure::weights::SubstrateWeight<Self>;141 type RefungibleExtensionsWeightInfo = CommonWeights<Self>;142}143144parameter_types! {145 pub AppPromotionDailyRate: Perbill = Perbill::from_rational(5u32, 10_000);146 pub const MaxCollators: u32 = MAX_COLLATORS;147 pub const LicenseBond: Balance = GENESIS_LICENSE_BOND;148149 pub const DayRelayBlocks: BlockNumber = RELAY_DAYS;150}151152#[cfg(not(feature = "session-test-timings"))]153parameter_types! {154 pub const SessionPeriod: BlockNumber = SESSION_LENGTH;155}156157#[cfg(feature = "session-test-timings")]158parameter_types! {159 pub const SessionPeriod: BlockNumber = 5 * MINUTES;160}161162impl pallet_configuration::Config for Runtime {163 type RuntimeEvent = RuntimeEvent;164 type Balance = Balance;165 type DefaultWeightToFeeCoefficient = ConstU64<{ up_common::constants::WEIGHT_TO_FEE_COEFF }>;166 type DefaultMinGasPrice = ConstU64<{ up_common::constants::MIN_GAS_PRICE }>;167 type DefaultCollatorSelectionMaxCollators = MaxCollators;168 type DefaultCollatorSelectionKickThreshold = SessionPeriod;169 type DefaultCollatorSelectionLicenseBond = LicenseBond;170 type MaxXcmAllowedLocations = ConstU32<16>;171 type AppPromotionDailyRate = AppPromotionDailyRate;172 type DayRelayBlocks = DayRelayBlocks;173 type WeightInfo = pallet_configuration::weights::SubstrateWeight<Self>;174}175176impl pallet_maintenance::Config for Runtime {177 type RuntimeEvent = RuntimeEvent;178179 type RuntimeCall = RuntimeCall;180181 #[cfg(feature = "governance")]182 type ManagerOrigin = governance::RootOrTechnicalCommitteeMember;183184 #[cfg(not(feature = "governance"))]185 type ManagerOrigin = frame_system::EnsureRoot<AccountId>;186187 type PreimageOrigin = frame_system::EnsureRoot<AccountId>;188189 #[cfg(feature = "preimage")]190 type Preimages = crate::Preimage;191 #[cfg(not(feature = "preimage"))]192 type Preimages = ();193 type WeightInfo = pallet_maintenance::weights::SubstrateWeight<Self>;194}