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

Correctly show reward percent changes (#14161)

Browse Source 
(cherry picked from commit bebfa6e93c)

Co-authored-by: Ryo Onodera <ryoqun@gmail.com>
This commit is contained in:
mergify[bot]
2020-12-16 18:15:36 +00:00
committed by GitHub
parent c481e4fe7f
commit 0276b6c4c2
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cli/src/cluster_query.rs
View File

@ -800,8 +800,9 @@ pub fn process_get_block(
format!(
"◎{:<19.9} {:>13.9}%",
lamports_to_sol(reward.post_balance),
reward.lamports.abs() as f64
/ (reward.post_balance as f64 - reward.lamports as f64)
(reward.lamports.abs() as f64
/ (reward.post_balance as f64 - reward.lamports as f64))
* 100.0
)
}
);

8
cli/src/stake.rs
View File

@ -1662,13 +1662,13 @@ pub(crate) fn fetch_epoch_rewards(
.find(|reward| reward.pubkey == address.to_string())
{
if reward.post_balance > reward.lamports.try_into().unwrap_or(0) {
let percent_change = reward.lamports.abs() as f64
let rate_change = reward.lamports.abs() as f64
/ (reward.post_balance as f64 - reward.lamports as f64);
let apr = wallclock_epoch_duration.map(|wallclock_epoch_duration| {
let wallclock_epochs_per_year =
(SECONDS_PER_DAY * 356) as f64 / wallclock_epoch_duration;
percent_change * wallclock_epochs_per_year
rate_change * wallclock_epochs_per_year
});
all_epoch_rewards.push(CliEpochReward {
@ -1676,8 +1676,8 @@ pub(crate) fn fetch_epoch_rewards(
effective_slot,
amount: reward.lamports.abs() as u64,
post_balance: reward.post_balance,
percent_change,
apr,
percent_change: rate_change * 100.0,
apr: apr.map(|r| r * 100.0),
});
}
}