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

Add epoch rewards metric datapoint (bp #12505) (#12509)

Browse Source 
* Add epoch rewards metric datapoint

(cherry picked from commit e50386f928)

# Conflicts:
#	runtime/src/bank.rs

* Update bank.rs

Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
mergify[bot]
2020-09-26 04:02:23 +00:00
committed by GitHub
parent 0c4074049b
commit 8e3882287a
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
runtime/src/bank.rs
View File

@ -1015,14 +1015,21 @@ impl Bank {
// period: time that has passed as a fraction of a year, basically the length of // period: time that has passed as a fraction of a year, basically the length of
// an epoch as a fraction of a year // an epoch as a fraction of a year
// calculated as: slots_elapsed / (slots / year) // calculated as: slots_elapsed / (slots / year)
let period_in_year = let epoch_duration_in_years =
self.epoch_schedule.get_slots_in_epoch(prev_epoch) as f64 / self.slots_per_year; self.epoch_schedule.get_slots_in_epoch(prev_epoch) as f64 / self.slots_per_year;
let validator_rewards = { let (validator_rate, foundation_rate) = {
let inflation = self.inflation.read().unwrap(); let inflation = self.inflation.read().unwrap();
error!("rewards: {:?}", inflation);
(
(*inflation).validator(slot_in_year),
(*inflation).foundation(slot_in_year),
)
};
(*inflation).validator(slot_in_year) * self.capitalization() as f64 * period_in_year let capitalization = self.capitalization();
} as u64; let validator_rewards =
(validator_rate * capitalization as f64 * epoch_duration_in_years) as u64;
let vote_balance_and_staked = self.stakes.read().unwrap().vote_balance_and_staked(); let vote_balance_and_staked = self.stakes.read().unwrap().vote_balance_and_staked();
@ -1050,6 +1057,18 @@ impl Bank {
self.capitalization self.capitalization
.fetch_add(validator_rewards_paid, Ordering::Relaxed); .fetch_add(validator_rewards_paid, Ordering::Relaxed);
datapoint_warn!(
"epoch_rewards",
("slot", self.slot, i64),
("epoch", self.epoch, i64),
("validator_rate", validator_rate, f64),
("foundation_rate", foundation_rate, f64),
("epoch_duration_in_years", epoch_duration_in_years, f64),
("validator_rewards", validator_rewards_paid, i64),
("pre_capitalization", capitalization, i64),
("post_capitalization", self.capitalization(), i64)
);
} }
/// map stake delegations into resolved (pubkey, account) pairs /// map stake delegations into resolved (pubkey, account) pairs
@ -1083,7 +1102,7 @@ impl Bank {
} }
/// iterate over all stakes, redeem vote credits for each stake we can /// iterate over all stakes, redeem vote credits for each stake we can
/// successfully load and parse, return total payout /// successfully load and parse, return the lamport value of one point
fn pay_validator_rewards(&mut self, rewards: u64) -> f64 { fn pay_validator_rewards(&mut self, rewards: u64) -> f64 {
let stake_history = self.stakes.read().unwrap().history().clone(); let stake_history = self.stakes.read().unwrap().history().clone();