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

Fix spent values in tx table

Browse Source
This commit is contained in:
Aditya Kulkarni
2019-10-26 19:21:01 -07:00
parent deff437c1d
commit 3e3d04f2bf
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/controller.cpp
View File

@@ -265,8 +265,6 @@ void Controller::processUnspent(const json& reply, QMap<QString, qint64>* balanc
bool spendable = it["unconfirmed_spent"].is_null() && it["spent"].is_null(); // TODO: Wait for 4 confirmations bool spendable = it["unconfirmed_spent"].is_null() && it["spent"].is_null(); // TODO: Wait for 4 confirmations
bool pending = !it["unconfirmed_spent"].is_null(); bool pending = !it["unconfirmed_spent"].is_null();
qDebug() << "For address" << qsAddr << "spendable, pending" << spendable << ":" << pending;
unspentOutputs->push_back(UnspentOutput{ qsAddr, txid, amount, block, spendable, pending }); unspentOutputs->push_back(UnspentOutput{ qsAddr, txid, amount, block, spendable, pending });
if (spendable) { if (spendable) {
(*balancesMap)[qsAddr] = (*balancesMap)[qsAddr] + it["value"].get<json::number_unsigned_t>(); (*balancesMap)[qsAddr] = (*balancesMap)[qsAddr] + it["value"].get<json::number_unsigned_t>();
@@ -344,7 +342,7 @@ void Controller::refreshTransactions() {
for (auto o: it["outgoing_metadata"].get<json::array_t>()) { for (auto o: it["outgoing_metadata"].get<json::array_t>()) {
QString address = QString::fromStdString(o["address"]); QString address = QString::fromStdString(o["address"]);
qint64 amount = -1 * o["value"].get<json::number_integer_t>(); // Sent items are -ve qint64 amount = -1 * o["value"].get<json::number_unsigned_t>(); // Sent items are -ve
QString memo; QString memo;
if (!o["memo"].is_null()) { if (!o["memo"].is_null()) {
@@ -385,7 +383,7 @@ void Controller::refreshTransactions() {
it["datetime"].get<json::number_unsigned_t>(), it["datetime"].get<json::number_unsigned_t>(),
address, address,
QString::fromStdString(it["txid"]), QString::fromStdString(it["txid"]),
model->getLatestBlock() - it["block_height"].get<json::number_unsigned_t>(), model->getLatestBlock() - it["block_height"].get<json::number_unsigned_t>() + 1,
items items
}; };
@@ -432,10 +430,10 @@ void Controller::executeTransaction(Tx tx,
zrpc->sendTransaction(QString::fromStdString(params.dump()), [=](const json& reply) { zrpc->sendTransaction(QString::fromStdString(params.dump()), [=](const json& reply) {
if (reply.find("txid") == reply.end()) { if (reply.find("txid") == reply.end()) {
error("", "Couldn't understand Response: " + QString::fromStdString(reply.dump())); error("", "Couldn't understand Response: " + QString::fromStdString(reply.dump()));
} else {
QString txid = QString::fromStdString(reply["txid"].get<json::string_t>());
submitted(txid);
} }
QString txid = QString::fromStdString(reply["txid"].get<json::string_t>());
submitted(txid);
}, },
[=](QString errStr) { [=](QString errStr) {
error("", errStr); error("", errStr);

4
src/settings.cpp
View File

@@ -189,6 +189,10 @@ QString Settings::getUSDFromZecAmount(qint64 bal) {
} }
QString Settings::getDecimalString(qint64 amt) { QString Settings::getDecimalString(qint64 amt) {
if (amt < 0) {
return "-" + Settings::getDecimalString(-1 * amt);
}
// Zcash has 8 decimal places // Zcash has 8 decimal places
int places = Settings::getNumberOfDecimalPlaces(); int places = Settings::getNumberOfDecimalPlaces();
qint64 divider = QString("1" + QString("0").repeated(places)).toULongLong(); qint64 divider = QString("1" + QString("0").repeated(places)).toULongLong();