From e29a49f1071204ae3570b1ffd5c6935f86989dd2 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Wed, 28 Oct 2020 20:54:56 +0900 Subject: [PATCH] Use pico inflation for ledger-tool capitalization --enable-inflation (#13215) (#13221) * Use pico inflation for ledger-tool capitalization --enable-inflation * rust fmt (cherry picked from commit 7d2962135d032e9fde0bcd52fb9bd6e7fb85b1e8) Co-authored-by: Ryo Onodera --- ledger-tool/src/main.rs | 2 +- runtime/src/bank.rs | 2 +- sdk/src/inflation.rs | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs index 065f94d0a5..c6a73839f3 100644 --- a/ledger-tool/src/main.rs +++ b/ledger-tool/src/main.rs @@ -2002,7 +2002,7 @@ fn main() { } if arg_matches.is_present("enable_inflation") { - let inflation = Inflation::default(); + let inflation = Inflation::pico(); println!( "Forcing to: {:?} (was: {:?})", inflation, diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 8f7ab2d3c7..567bbcdd9f 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -3831,7 +3831,7 @@ impl Bank { let new_feature_activations = self.compute_active_feature_set(!init_finish_or_warp); if new_feature_activations.contains(&feature_set::pico_inflation::id()) { - *self.inflation.write().unwrap() = Inflation::new_fixed(0.0001); // 0.01% inflation + *self.inflation.write().unwrap() = Inflation::pico(); self.fee_rate_governor.burn_percent = 50; // 50% fee burn self.rent_collector.rent.burn_percent = 50; // 50% rent burn } diff --git a/sdk/src/inflation.rs b/sdk/src/inflation.rs index 58e42fe088..1cb783b263 100644 --- a/sdk/src/inflation.rs +++ b/sdk/src/inflation.rs @@ -65,6 +65,10 @@ impl Inflation { } } + pub fn pico() -> Self { + Self::new_fixed(0.0001) // 0.01% inflation + } + /// inflation rate at year pub fn total(&self, year: f64) -> f64 { assert!(year >= 0.0);