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

difftreelog

Fix formatting

Greg Zaitsev2021-12-10parent: #2c4dad5.patch.diff
in: master

2 files changed

modifiedpallets/inflation/src/lib.rsdiffbeforeafterboth
before · pallets/inflation/src/lib.rs
1//2// This file is subject to the terms and conditions defined in3// file 'LICENSE', which is part of this source code package.4//56// #![recursion_limit = "1024"]7#![cfg_attr(not(feature = "std"), no_std)]89#[cfg(feature = "runtime-benchmarks")]10mod benchmarking;1112#[cfg(test)]13mod tests;1415use frame_support::{16	dispatch::{DispatchResult},17	traits::{Currency, Get},18};19pub use pallet::*;20use sp_runtime::{21	Perbill,22	traits::{BlockNumberProvider},23};2425use sp_std::convert::TryInto;2627type BalanceOf<T> =28	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;2930pub const YEAR: u32 = 5_259_600; // 6-second block31								 // pub const YEAR: u32 = 2_629_800; // 12-second block32pub const TOTAL_YEARS_UNTIL_FLAT: u32 = 9;33pub const START_INFLATION_PERCENT: u32 = 10;34pub const END_INFLATION_PERCENT: u32 = 4;3536#[frame_support::pallet]37pub mod pallet {38	use super::*;39	use frame_support::pallet_prelude::*;40	use frame_system::pallet_prelude::*;4142	#[pallet::config]43	pub trait Config: frame_system::Config {44		type Currency: Currency<Self::AccountId>;45		type TreasuryAccountId: Get<Self::AccountId>;4647		// The block number provider48		type BlockNumberProvider: BlockNumberProvider<BlockNumber = Self::BlockNumber>;4950		/// Number of blocks that pass between treasury balance updates due to inflation51		#[pallet::constant]52		type InflationBlockInterval: Get<Self::BlockNumber>;53	}5455	#[pallet::pallet]56	#[pallet::generate_store(pub(super) trait Store)]57	pub struct Pallet<T>(_);5859	/// starting year total issuance60	#[pallet::storage]61	pub type StartingYearTotalIssuance<T: Config> =62		StorageValue<Value = BalanceOf<T>, QueryKind = ValueQuery>;6364	/// Current inflation for `InflationBlockInterval` number of blocks65	#[pallet::storage]66	pub type BlockInflation<T: Config> = StorageValue<Value = BalanceOf<T>, QueryKind = ValueQuery>;6768	/// Next target (relay) block when inflation will be applied69	#[pallet::storage]70	pub type NextInflationBlock<T: Config> =71		StorageValue<Value = T::BlockNumber, QueryKind = ValueQuery>;7273	/// Next target (relay) block when inflation is recalculated74	#[pallet::storage]75	pub type NextRecalculationBlock<T: Config> =76		StorageValue<Value = T::BlockNumber, QueryKind = ValueQuery>;7778	/// Relay block when inflation has started79	#[pallet::storage]80	pub type StartBlock<T: Config> =81		StorageValue<Value = T::BlockNumber, QueryKind = ValueQuery>;8283	#[pallet::hooks]84	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {85		fn on_initialize(_: T::BlockNumber) -> Weight86		where87			<T as frame_system::Config>::BlockNumber: From<u32>,88		{89			let mut consumed_weight = 0;90			let mut add_weight = |reads, writes, weight| {91				consumed_weight += T::DbWeight::get().reads_writes(reads, writes);92				consumed_weight += weight;93			};9495			let block_interval: u32 = T::InflationBlockInterval::get().try_into().unwrap_or(0);96			let current_relay_block = T::BlockNumberProvider::current_block_number();97			let next_inflation: T::BlockNumber = <NextInflationBlock<T>>::get();98			add_weight(1, 0, 5_000_000);99100			// Apply inflation every InflationBlockInterval blocks101			// If next_inflation == 0, this means inflation wasn't yet initialized102			if (next_inflation != 0u32.into()) && (current_relay_block >= next_inflation) {103				// Recalculate inflation on the first block of the year (or if it is not initialized yet)104				// Do the "current_relay_block >= next_recalculation" check in the "current_relay_block >= next_inflation"105				// block because it saves InflationBlockInterval DB reads for NextRecalculationBlock.106				let next_recalculation: T::BlockNumber = <NextRecalculationBlock<T>>::get();107				add_weight(1, 0, 0);108				if current_relay_block >= next_recalculation {109					Self::recalculate_inflation(next_recalculation);110					add_weight(0, 4, 5_000_000);111				}112113				T::Currency::deposit_into_existing(114					&T::TreasuryAccountId::get(),115					<BlockInflation<T>>::get(),116				)117				.ok();118119				// Update inflation block120				<NextInflationBlock<T>>::set(next_inflation + block_interval.into());121122				add_weight(3, 3, 10_000_000);123			}124125			consumed_weight126		}127	}128129	#[pallet::call]130	impl<T: Config> Pallet<T> {131		/// This method sets the inflation start date. Can be only called once.132		/// Inflation start block can be backdated and will catch up. The method will create Treasury133		/// account if it does not exist and perform the first inflation deposit.134		///135		/// # Permissions136		///137		/// * Root138		///139		/// # Arguments140		///141		/// * inflation_start_relay_block: The relay chain block at which inflation should start142		#[pallet::weight(0)]143		pub fn start_inflation(144			origin: OriginFor<T>,145			inflation_start_relay_block: T::BlockNumber,146		) -> DispatchResult147		where148			<T as frame_system::Config>::BlockNumber: From<u32>,149		{150			ensure_root(origin)?;151152			// Start inflation if it has not been yet initialized153			if <StartBlock<T>>::get() == 0u32.into() {154				// Set inflation global start block155				<StartBlock<T>>::set(inflation_start_relay_block);156157				// Recalculate inflation. This can be backdated and will catch up.158				Self::recalculate_inflation(inflation_start_relay_block);159				let block_interval: u32 = T::InflationBlockInterval::get().try_into().unwrap_or(0);160				<NextInflationBlock<T>>::set(inflation_start_relay_block + block_interval.into());161162				// First time deposit - create Treasury account so that we can call deposit_into_existing everywhere else163				T::Currency::deposit_creating(164					&T::TreasuryAccountId::get(),165					<BlockInflation<T>>::get(),166				);167			}168169			Ok(())170		}171	}172}173174impl<T: Config> Pallet<T> {175	pub fn recalculate_inflation(recalculation_block: T::BlockNumber) {176		let current_year: u32 = ((recalculation_block - <StartBlock<T>>::get()) / T::BlockNumber::from(YEAR))177			.try_into()178			.unwrap_or(0);179		let block_interval: u32 = T::InflationBlockInterval::get().try_into().unwrap_or(0);180181		let one_percent = Perbill::from_percent(1);182183		if current_year <= TOTAL_YEARS_UNTIL_FLAT {184			let amount: BalanceOf<T> = Perbill::from_rational(185				block_interval186					* (START_INFLATION_PERCENT * TOTAL_YEARS_UNTIL_FLAT187						- current_year * (START_INFLATION_PERCENT - END_INFLATION_PERCENT)),188				YEAR * TOTAL_YEARS_UNTIL_FLAT,189			) * (one_percent * T::Currency::total_issuance());190			<BlockInflation<T>>::put(amount);191		} else {192			let amount: BalanceOf<T> =193				Perbill::from_rational(block_interval * END_INFLATION_PERCENT, YEAR)194					* (one_percent * T::Currency::total_issuance());195			<BlockInflation<T>>::put(amount);196		}197		<StartingYearTotalIssuance<T>>::set(T::Currency::total_issuance());198199		// Update recalculation and inflation blocks200		<NextRecalculationBlock<T>>::set(recalculation_block + YEAR.into());201	}202}
modifiedpallets/inflation/src/tests.rsdiffbeforeafterboth
--- a/pallets/inflation/src/tests.rs
+++ b/pallets/inflation/src/tests.rs
@@ -241,7 +241,10 @@
 		MockBlockNumberProvider::set(start_block);
 
 		// Start inflation as sudo
-		assert_ok!(Inflation::start_inflation(RawOrigin::Root.into(), start_block));
+		assert_ok!(Inflation::start_inflation(
+			RawOrigin::Root.into(),
+			start_block
+		));
 
 		// Go through all the block inflations for year 1,
 		// total issuance will be updated accordingly