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

REST API now returns supply in SOL rather than lamports (#10170) (#10173)

Browse Source 
automerge

(cherry picked from commit 18be7a7966)

Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
mergify[bot]
2020-05-21 16:53:58 -07:00
committed by GitHub
parent 95675f8f42
commit b3b32befd7
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/rpc_service.rs
View File

@ -15,7 +15,7 @@ use solana_ledger::{
blockstore::Blockstore, blockstore::Blockstore,
snapshot_utils, snapshot_utils,
}; };
use solana_sdk::{hash::Hash, pubkey::Pubkey}; use solana_sdk::{hash::Hash, native_token::lamports_to_sol, pubkey::Pubkey};
use std::{ use std::{
collections::HashSet, collections::HashSet,
net::SocketAddr, net::SocketAddr,
@ -245,13 +245,16 @@ fn process_rest(bank_forks: &Arc<RwLock<BankForks>>, path: &str) -> Option<Strin
let total_supply = bank.capitalization(); let total_supply = bank.capitalization();
let non_circulating_supply = let non_circulating_supply =
crate::non_circulating_supply::calculate_non_circulating_supply(&bank).lamports; crate::non_circulating_supply::calculate_non_circulating_supply(&bank).lamports;
Some(format!("{}", total_supply - non_circulating_supply)) Some(format!(
"{}",
lamports_to_sol(total_supply - non_circulating_supply)
))
} }
"/v0/total-supply" => { "/v0/total-supply" => {
let r_bank_forks = bank_forks.read().unwrap(); let r_bank_forks = bank_forks.read().unwrap();
let bank = r_bank_forks.root_bank(); let bank = r_bank_forks.root_bank();
let total_supply = bank.capitalization(); let total_supply = bank.capitalization();
Some(format!("{}", total_supply)) Some(format!("{}", lamports_to_sol(total_supply)))
} }
_ => None, _ => None,
} }
@ -444,11 +447,11 @@ mod tests {
assert_eq!(None, process_rest(&bank_forks, "not-a-supported-rest-api")); assert_eq!(None, process_rest(&bank_forks, "not-a-supported-rest-api"));
assert_eq!( assert_eq!(
Some("10127".to_string()), Some("0.000010127".to_string()),
process_rest(&bank_forks, "/v0/circulating-supply") process_rest(&bank_forks, "/v0/circulating-supply")
); );
assert_eq!( assert_eq!(
Some("10127".to_string()), Some("0.000010127".to_string()),
process_rest(&bank_forks, "/v0/total-supply") process_rest(&bank_forks, "/v0/total-supply")
); );
} }