DragonX/SilentDragonXLite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Add max spendable from z adderss

Browse Source
This commit is contained in:
adityapk00
2019-02-02 21:56:01 -08:00
parent 01fdb1ec49
commit 7644064c32
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/websockets.cpp
View File

@@ -465,17 +465,26 @@ void AppDataServer::processSendTx(QJsonObject sendTx, MainWindow* mainwindow, QW
void AppDataServer::processGetInfo(QJsonObject jobj, MainWindow* mainWindow, QWebSocket* pClient) { void AppDataServer::processGetInfo(QJsonObject jobj, MainWindow* mainWindow, QWebSocket* pClient) {
auto connectedName = jobj["name"].toString(); auto connectedName = jobj["name"].toString();
double maxSpendable = 0;
if (mainWindow == nullptr || mainWindow->getRPC() == nullptr || if (mainWindow == nullptr || mainWindow->getRPC() == nullptr ||
mainWindow->getRPC()->getAllBalances() == nullptr) { mainWindow->getRPC()->getAllBalances() == nullptr) {
pClient->close(QWebSocketProtocol::CloseCodeNormal, "Not yet ready"); pClient->close(QWebSocketProtocol::CloseCodeNormal, "Not yet ready");
return; return;
} }
auto balances = mainWindow->getRPC()->getAllBalances()->values();
if (balances.length() > 0) { // Max spendable safely from a z address and from any address
std::sort(balances.begin(), balances.end(), std::less<double>()); double maxZSpendable = 0;
maxSpendable = balances[balances.length() - 1]; double maxSpendable = 0;
for (auto a : mainWindow->getRPC()->getAllBalances()->keys()) {
if (Settings::getInstance()->isSaplingAddress(a)) {
if (mainWindow->getRPC()->getAllBalances()->value(a) > maxZSpendable) {
maxZSpendable = mainWindow->getRPC()->getAllBalances()->value(a);
}
}
if (mainWindow->getRPC()->getAllBalances()->value(a) > maxSpendable) {
maxSpendable = mainWindow->getRPC()->getAllBalances()->value(a);
}
} }
{ {
@@ -490,6 +499,7 @@ void AppDataServer::processGetInfo(QJsonObject jobj, MainWindow* mainWindow, QWe
{"tAddress", mainWindow->getRPC()->getDefaultTAddress()}, {"tAddress", mainWindow->getRPC()->getDefaultTAddress()},
{"balance", AppDataModel::getInstance()->getTotalBalance()}, {"balance", AppDataModel::getInstance()->getTotalBalance()},
{"maxspendable", maxSpendable}, {"maxspendable", maxSpendable},
{"maxzspendable", maxZSpendable},
{"tokenName", Settings::getTokenName()}, {"tokenName", Settings::getTokenName()},
{"zecprice", Settings::getInstance()->getZECPrice()}, {"zecprice", Settings::getInstance()->getZECPrice()},
{"serverversion", QString(APP_VERSION)} {"serverversion", QString(APP_VERSION)}