gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Retry inflation parameter update (bp #12778) (#14060)

Browse Source 
* Retry inflation parameter update along with documentation updates (#12778)

* update initial inflation parameter

* update economics section of docs

(cherry picked from commit 1ab36203de)

# Conflicts:
#	docs/docusaurus.config.js
#	docs/package-lock.json

* Revert doc changes

* Revert doc changes

Co-authored-by: Eric Williams <ericlwilliams@gmail.com>
Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
This commit is contained in:
mergify[bot]
2020-12-11 05:19:51 +00:00
committed by GitHub
parent 0b5beac561
commit 980c7cdf64
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/src/bank.rs
View File

@ -9754,25 +9754,25 @@ pub(crate) mod tests {
if bank.slot == 0 { if bank.slot == 0 {
assert_eq!( assert_eq!(
bank.hash().to_string(), bank.hash().to_string(),
"HrxvKJxPhzgXgoJ2Rg91acrXWki6SErJk1sfxfTDWsZt" "6oxxAqridoSSPQ1rnEh8qBhQpMmLUve3X4fsNNr2gExE"
); );
} }
if bank.slot == 32 { if bank.slot == 32 {
assert_eq!( assert_eq!(
bank.hash().to_string(), bank.hash().to_string(),
"AemCVcpsULuA76fpDYzs74futtMQtNNiF1gz3VSVP4AS" "9FwpFSUvbCfzQMGXDSdvnNhNPpvHUsEJyNA9P3nqiLaJ"
); );
} }
if bank.slot == 64 { if bank.slot == 64 {
assert_eq!( assert_eq!(
bank.hash().to_string(), bank.hash().to_string(),
"4ECxp4u4SRwn2w7YUj28nnADMx7kQ2gYRB7PA617eWu6" "7p6g7GmE9quceefLtPe97fr9YQeYWB562os2ttiG3Anq"
); );
} }
if bank.slot == 128 { if bank.slot == 128 {
assert_eq!( assert_eq!(
bank.hash().to_string(), bank.hash().to_string(),
"AeHGi2VWQ7gWh6KkMQjrhY1ZrLUedgMxfvPRR82dyg6L" "DfeuEsVvVRUkce31sM1d4Vhhp6Si99JdVEtYddbBgLKV"
); );
break; break;
} }

2
sdk/src/inflation.rs
View File

@ -22,7 +22,7 @@ pub struct Inflation {
__unused: f64, __unused: f64,
} }
const DEFAULT_INITIAL: f64 = 0.15; const DEFAULT_INITIAL: f64 = 0.08;
const DEFAULT_TERMINAL: f64 = 0.015; const DEFAULT_TERMINAL: f64 = 0.015;
const DEFAULT_TAPER: f64 = 0.15; const DEFAULT_TAPER: f64 = 0.15;
const DEFAULT_FOUNDATION: f64 = 0.05; const DEFAULT_FOUNDATION: f64 = 0.05;