git.delta.rocks / unique-network / refs/commits / 30f58ba5fa05

difftreelog

Merge pull request #268 from UniqueNetwork/hotfix/inflation_year_fix

kozyrevdev2021-12-10parents: #a1f3ad0 #002f42f.patch.diff
in: master
Hotfix/inflation year fix

3 files changed

modifiednode/cli/src/chain_spec.rsdiffbeforeafterboth
220 sudo: SudoConfig { key: root_key },220 sudo: SudoConfig { key: root_key },
221 vesting: VestingConfig { vesting: vec![] },221 vesting: VestingConfig { vesting: vec![] },
222 parachain_info: unique_runtime::ParachainInfoConfig { parachain_id: id },222 parachain_info: unique_runtime::ParachainInfoConfig { parachain_id: id },
223 parachain_system: Default::default(),
223 aura: unique_runtime::AuraConfig {224 aura: unique_runtime::AuraConfig {
224 authorities: initial_authorities,225 authorities: initial_authorities,
225 },226 },
modifiedpallets/inflation/src/lib.rsdiffbeforeafterboth
75 pub type NextRecalculationBlock<T: Config> =75 pub type NextRecalculationBlock<T: Config> =
76 StorageValue<Value = T::BlockNumber, QueryKind = ValueQuery>;76 StorageValue<Value = T::BlockNumber, QueryKind = ValueQuery>;
77
78 /// Relay block when inflation has started
79 #[pallet::storage]
80 pub type StartBlock<T: Config> = StorageValue<Value = T::BlockNumber, QueryKind = ValueQuery>;
7781
78 #[pallet::hooks]82 #[pallet::hooks]
79 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {83 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
145 ensure_root(origin)?;149 ensure_root(origin)?;
146150
147 // Start inflation if it has not been yet initialized151 // Start inflation if it has not been yet initialized
148 let next_inflation: T::BlockNumber = <NextInflationBlock<T>>::get();
149 if next_inflation == 0u32.into() {152 if <StartBlock<T>>::get() == 0u32.into() {
153 // Set inflation global start block
154 <StartBlock<T>>::set(inflation_start_relay_block);
155
150 // Recalculate inflation. This can be backdated and will catch up.156 // Recalculate inflation. This can be backdated and will catch up.
151 Self::recalculate_inflation(inflation_start_relay_block);157 Self::recalculate_inflation(inflation_start_relay_block);
166172
167impl<T: Config> Pallet<T> {173impl<T: Config> Pallet<T> {
168 pub fn recalculate_inflation(recalculation_block: T::BlockNumber) {174 pub fn recalculate_inflation(recalculation_block: T::BlockNumber) {
169 let current_year: u32 = (recalculation_block / T::BlockNumber::from(YEAR))175 let current_year: u32 = ((recalculation_block - <StartBlock<T>>::get())
176 / T::BlockNumber::from(YEAR))
170 .try_into()177 .try_into()
171 .unwrap_or(0);178 .unwrap_or(0);
modifiedpallets/inflation/src/tests.rsdiffbeforeafterboth
230 });230 });
231}231}
232
233#[test]
234fn inflation_start_large_kusama_block() {
235 new_test_ext().execute_with(|| {
236 // Total issuance = 1_000_000_000
237 let initial_issuance: u64 = 1_000_000_000;
238 let start_block: u64 = 10457457;
239 let _ = <Balances as Currency<_>>::deposit_creating(&1234, initial_issuance);
240 assert_eq!(Balances::free_balance(1234), initial_issuance);
241 MockBlockNumberProvider::set(start_block);
242
243 // Start inflation as sudo
244 assert_ok!(Inflation::start_inflation(
245 RawOrigin::Root.into(),
246 start_block
247 ));
248
249 // Go through all the block inflations for year 1,
250 // total issuance will be updated accordingly
251 // Inflation is set to start in block 1, so first iteration is block 101
252 for block in (101..YEAR).step_by(100) {
253 MockBlockNumberProvider::set(start_block + block);
254 Inflation::on_initialize(0);
255 }
256 assert_eq!(
257 initial_issuance + (FIRST_YEAR_BLOCK_INFLATION * (YEAR / 100)),
258 <Balances as Currency<_>>::total_issuance()
259 );
260
261 MockBlockNumberProvider::set(start_block + YEAR + 1);
262 Inflation::on_initialize(0);
263 let block_inflation_year_2 = block_inflation!();
264 // Expected 100-block inflation for year 2: 100 * 9.33% * initial issuance * 110% / YEAR == 1951
265 let expecter_year_2_inflation: u64 = (initial_issuance
266 + FIRST_YEAR_BLOCK_INFLATION * YEAR / 100)
267 * 933 * 100 / (10000 * YEAR);
268 assert_eq!(block_inflation_year_2 / 10, expecter_year_2_inflation / 10); // divide by 10 for approx. equality
269 });
270}
232271
233#[test]272#[test]
234fn inflation_after_year_10_is_flat() {273fn inflation_after_year_10_is_flat() {