github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-04-28 03:00:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

darkfid: convert balance to float

Browse Source
This commit is contained in:
lunar-mining
2021-10-10 09:22:27 +02:00
parent 40285b0c94
commit 182964ed6f
2 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/bin/darkfid.rs
View File

@@ -9,8 +9,8 @@ use drk::{
},
serial::{deserialize, serialize},
util::{
assign_id, decimals, decode_base10, expand_path, join_config_path, DrkTokenList,
NetworkName, SolTokenList,
assign_id, decimals, decode_base10, encode_base10, expand_path, join_config_path,
DrkTokenList, NetworkName, SolTokenList,
},
wallet::WalletDb,
Error, Result,
@@ -137,23 +137,33 @@ impl Darkfid {
// --> {"method": "get_balances", "params": []}
// <-- {"result": "get_balances": "[token: btc, value: 0]"}
async fn get_balances(&self, id: Value, _params: Value) -> JsonResult {
let result: Result<HashMap<String, u64>> = async {
let result: Result<HashMap<String, String>> = async {
let balances = self.client.lock().await.get_balances().await?;
let mut symbols = Vec::new();
let mut amounts = Vec::new();
for id in balances.keys() {
let id: jubjub::Fr = deserialize(&id)?;
if let Some(symbol) = self.drk_tokenlist.clone().symbol_from_id(id)? {
symbols.push(symbol);
}
for amount in balances.values() {
amounts.push(amount);
// this is hardcoded for SOL
// TODO: if id == btc_id:
// network = bitcoin
// else
// network = solana
let network = "solana";
if let Some(symbol) = self.drk_tokenlist.clone().symbol_from_id(id)? {
let decimals = decimals(network, &symbol, &self.sol_tokenlist)?;
for amount in balances.values() {
let amount = encode_base10(*amount, decimals);
amounts.push(amount);
}
symbols.push(symbol);
}
}
let new_balances: HashMap<String, u64> = symbols
let new_balances: HashMap<String, String> = symbols
.into_iter()
.zip(amounts.into_iter())
.map(|(key, value)| return (key.clone(), value.clone()))

5
src/util/parse.rs
View File

@@ -80,11 +80,6 @@ pub fn decimals(network: &str, _token: &str, _tokenlist: &SolTokenList) -> Resul
}
}
//pub fn to_apo(amount: f64, decimals: u32) -> Result<u64> {
// let apo = amount as u64 * u64::pow(10, decimals as u32);
// Ok(apo)
//}
pub fn symbol_to_id(token: &str, tokenlist: &SolTokenList) -> Result<String> {
let vec: Vec<char> = token.chars().collect();
let mut counter = 0;