From 980c7cdf64452dd1ba801b6f6907c3952caf8293 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 11 Dec 2020 05:19:51 +0000 Subject: [PATCH] Retry inflation parameter update (bp #12778) (#14060) * Retry inflation parameter update along with documentation updates (#12778) * update initial inflation parameter * update economics section of docs (cherry picked from commit 1ab36203deed6f50bc807b06d22accc564188c99) # Conflicts: # docs/docusaurus.config.js # docs/package-lock.json * Revert doc changes * Revert doc changes Co-authored-by: Eric Williams Co-authored-by: Ryo Onodera --- runtime/src/bank.rs | 8 ++++---- sdk/src/inflation.rs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index c9d59a22dc..61f6b02b8f 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -9754,25 +9754,25 @@ pub(crate) mod tests { if bank.slot == 0 { assert_eq!( bank.hash().to_string(), - "HrxvKJxPhzgXgoJ2Rg91acrXWki6SErJk1sfxfTDWsZt" + "6oxxAqridoSSPQ1rnEh8qBhQpMmLUve3X4fsNNr2gExE" ); } if bank.slot == 32 { assert_eq!( bank.hash().to_string(), - "AemCVcpsULuA76fpDYzs74futtMQtNNiF1gz3VSVP4AS" + "9FwpFSUvbCfzQMGXDSdvnNhNPpvHUsEJyNA9P3nqiLaJ" ); } if bank.slot == 64 { assert_eq!( bank.hash().to_string(), - "4ECxp4u4SRwn2w7YUj28nnADMx7kQ2gYRB7PA617eWu6" + "7p6g7GmE9quceefLtPe97fr9YQeYWB562os2ttiG3Anq" ); } if bank.slot == 128 { assert_eq!( bank.hash().to_string(), - "AeHGi2VWQ7gWh6KkMQjrhY1ZrLUedgMxfvPRR82dyg6L" + "DfeuEsVvVRUkce31sM1d4Vhhp6Si99JdVEtYddbBgLKV" ); break; } diff --git a/sdk/src/inflation.rs b/sdk/src/inflation.rs index e0063477dd..6392417ef5 100644 --- a/sdk/src/inflation.rs +++ b/sdk/src/inflation.rs @@ -22,7 +22,7 @@ pub struct Inflation { __unused: f64, } -const DEFAULT_INITIAL: f64 = 0.15; +const DEFAULT_INITIAL: f64 = 0.08; const DEFAULT_TERMINAL: f64 = 0.015; const DEFAULT_TAPER: f64 = 0.15; const DEFAULT_FOUNDATION: f64 = 0.05;