From b3b32befd717f15acb3313c58c8710c7b11784d8 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 21 May 2020 16:53:58 -0700
Subject: [PATCH] REST API now returns supply in SOL rather than lamports
 (#10170) (#10173)

automerge

(cherry picked from commit 18be7a79662c7c49cc5f7f07956aa4ab67ec2e17)

Co-authored-by: Michael Vines <mvines@gmail.com>
---
 core/src/rpc_service.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

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