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

Merge pull request #17 from adityapk00/master

Browse Source 
merge
This commit is contained in:
Denio
2019-10-27 22:57:07 +01:00
committed by GitHub
parent b3491aaec1 73c6773e49
commit 89f9f5c72b
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/controller.cpp
View File

@@ -144,8 +144,6 @@ void Controller::getInfoThenRefresh(bool force) {
static bool prevCallSucceeded = false; static bool prevCallSucceeded = false;
zrpc->fetchInfo([=] (const json& reply) { zrpc->fetchInfo([=] (const json& reply) {
qDebug() << "Info updated";
prevCallSucceeded = true; prevCallSucceeded = true;
// Testnet? // Testnet?
@@ -159,11 +157,13 @@ void Controller::getInfoThenRefresh(bool force) {
if (!Settings::getInstance()->isTestnet()) if (!Settings::getInstance()->isTestnet())
main->disableRecurring(); main->disableRecurring();
static int lastBlock = 0;
int curBlock = reply["latest_block_height"].get<json::number_integer_t>(); int curBlock = reply["latest_block_height"].get<json::number_integer_t>();
bool doUpdate = force || (model->getLatestBlock() != curBlock);
model->setLatestBlock(curBlock); model->setLatestBlock(curBlock);
ui->blockHeight->setText(QString::number(curBlock)); ui->blockHeight->setText(QString::number(curBlock));
qDebug() << "Refreshing. Full update: " << doUpdate;
// Connected, so display checkmark. // Connected, so display checkmark.
auto tooltip = Settings::getInstance()->getSettings().server + "\n" + QString::fromStdString(reply.dump()); auto tooltip = Settings::getInstance()->getSettings().server + "\n" + QString::fromStdString(reply.dump());
QIcon i(":/icons/res/connected.gif"); QIcon i(":/icons/res/connected.gif");
@@ -185,10 +185,8 @@ void Controller::getInfoThenRefresh(bool force) {
// See if recurring payments needs anything // See if recurring payments needs anything
Recurring::getInstance()->processPending(main); Recurring::getInstance()->processPending(main);
if ( force || (curBlock != lastBlock) ) { if ( doUpdate ) {
// Something changed, so refresh everything. // Something changed, so refresh everything.
lastBlock = curBlock;
refreshBalances(); refreshBalances();
refreshAddresses(); // This calls refreshZSentTransactions() and refreshReceivedZTrans() refreshAddresses(); // This calls refreshZSentTransactions() and refreshReceivedZTrans()
refreshTransactions(); refreshTransactions();
@@ -347,6 +345,10 @@ void Controller::refreshTransactions() {
CAmount total_amount; CAmount total_amount;
QList<TransactionItemDetail> items; QList<TransactionItemDetail> items;
auto confirmations = model->getLatestBlock() - it["block_height"].get<json::number_integer_t>() + 1;
auto txid = QString::fromStdString(it["txid"]);
auto datetime = it["datetime"].get<json::number_integer_t>();
// First, check if there's outgoing metadata // First, check if there's outgoing metadata
if (!it["outgoing_metadata"].is_null()) { if (!it["outgoing_metadata"].is_null()) {
@@ -375,12 +377,7 @@ void Controller::refreshTransactions() {
} }
txdata.push_back(TransactionItem{ txdata.push_back(TransactionItem{
"Sent", "Sent", datetime, address, txid,confirmations, items
it["datetime"].get<json::number_integer_t>(),
address,
QString::fromStdString(it["txid"]),
model->getLatestBlock() - it["block_height"].get<json::number_integer_t>(),
items
}); });
} else { } else {
// Incoming Transaction // Incoming Transaction
@@ -400,12 +397,7 @@ void Controller::refreshTransactions() {
TransactionItem tx{ TransactionItem tx{
"Receive", "Receive", datetime, address, txid,confirmations, items
it["datetime"].get<json::number_integer_t>(),
address,
QString::fromStdString(it["txid"]),
model->getLatestBlock() - it["block_height"].get<json::number_integer_t>() + 1,
items
}; };
txdata.push_back(tx); txdata.push_back(tx);