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

Add pico-inflation feature

Browse Source
This commit is contained in:
Michael Vines
2020-09-25 16:19:03 -07:00
parent 718f33260b
commit aa5c008fa8
8 changed files with 59 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
sdk/src/inflation.rs
View File

@@ -19,7 +19,7 @@ pub struct Inflation {
pub foundation_term: f64,
/// DEPRECATED, this field is currently unused
pub storage: f64,
__unused: f64,
}
const DEFAULT_INITIAL: f64 = 0.15;
@@ -27,7 +27,6 @@ const DEFAULT_TERMINAL: f64 = 0.015;
const DEFAULT_TAPER: f64 = 0.15;
const DEFAULT_FOUNDATION: f64 = 0.05;
const DEFAULT_FOUNDATION_TERM: f64 = 7.0;
const DEFAULT_STORAGE: f64 = 0.0;
impl Default for Inflation {
fn default() -> Self {
@@ -37,7 +36,7 @@ impl Default for Inflation {
taper: DEFAULT_TAPER,
foundation: DEFAULT_FOUNDATION,
foundation_term: DEFAULT_FOUNDATION_TERM,
storage: DEFAULT_STORAGE,
__unused: 0.0,
}
}
}
@@ -50,9 +49,22 @@ impl Inflation {
taper: 0.0,
foundation: 0.0,
foundation_term: 0.0,
storage: 0.0,
__unused: 0.0,
}
}
// fixed inflation rate at `validator` percentage for staking rewards, and none for foundation
pub fn new_fixed(validator: f64) -> Self {
Self {
initial: validator,
terminal: validator,
taper: 1.0,
foundation: 0.0,
foundation_term: 0.0,
__unused: 0.0,
}
}
/// inflation rate at year
pub fn total(&self, year: f64) -> f64 {
assert!(year >= 0.0);
@@ -67,12 +79,7 @@ impl Inflation {
/// portion of total that goes to validators
pub fn validator(&self, year: f64) -> f64 {
self.total(year) - self.storage(year) - self.foundation(year)
}
/// DEPRECATED
fn storage(&self, year: f64) -> f64 {
self.total(year) * self.storage
self.total(year) - self.foundation(year)
}
/// portion of total that goes to foundation
@@ -100,7 +107,7 @@ mod tests {
let total = inflation.total(*year);
assert_eq!(
total,
inflation.validator(*year) + inflation.storage(*year) + inflation.foundation(*year)
inflation.validator(*year) + inflation.foundation(*year)
);
assert!(total < last);
assert!(total >= inflation.terminal);
@@ -108,4 +115,13 @@ mod tests {
}
assert_eq!(last, inflation.terminal);
}
#[test]
#[allow(clippy::float_cmp)]
fn test_inflation_fixed() {
let inflation = Inflation::new_fixed(0.001);
for year in &[0.1, 0.5, 1.0, DEFAULT_FOUNDATION_TERM, 100.0] {
assert_eq!(inflation.total(*year), 0.001);
}
}
}