From d4f05089cd46674bf5e54b0dacf649260ba63761 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Fri, 18 Nov 2022 22:36:07 +0100 Subject: [PATCH] added multiasset balances on UI signals --- src/wallet/view_iface.h | 10 ++-------- src/wallet/wallets_manager.cpp | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/wallet/view_iface.h b/src/wallet/view_iface.h index 9a8a4e4d..85bb353e 100644 --- a/src/wallet/view_iface.h +++ b/src/wallet/view_iface.h @@ -197,18 +197,12 @@ public: wallet_state_error = 3 }; - uint64_t balance; - uint64_t unlocked_balance; - uint64_t awaiting_in; - uint64_t awaiting_out; + std::list balances; uint64_t minied_total; BEGIN_KV_SERIALIZE_MAP() KV_CHAIN_BASE(wallet_status_info_base) - KV_SERIALIZE(balance) - KV_SERIALIZE(unlocked_balance) - KV_SERIALIZE(awaiting_in) - KV_SERIALIZE(awaiting_out) + KV_SERIALIZE(balances) KV_SERIALIZE(minied_total) END_KV_SERIALIZE_MAP() }; diff --git a/src/wallet/wallets_manager.cpp b/src/wallet/wallets_manager.cpp index f238a5d6..16357bb5 100644 --- a/src/wallet/wallets_manager.cpp +++ b/src/wallet/wallets_manager.cpp @@ -1724,7 +1724,7 @@ void wallets_manager::prepare_wallet_status_info(wallet_vs_options& wo, view::wa wsi.is_mining = wo.do_mining; wsi.wallet_id = wo.wallet_id; wsi.is_alias_operations_available = !wo.has_related_alias_in_unconfirmed; - wsi.balance = wo.w->get()->balance(wsi.unlocked_balance, wsi.awaiting_in, wsi.awaiting_out, wsi.minied_total); + wo.w->get()->balance(wsi.balances, wsi.minied_total); } std::string wallets_manager::check_available_sources(uint64_t wallet_id, std::list& amounts) {