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

Fix compile

Browse Source
This commit is contained in:
Aditya Kulkarni
2019-10-26 22:04:15 -07:00
parent 12d6c64583
commit e87a4de5fe
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/camount.h
View File

@@ -15,6 +15,9 @@ public:
static CAmount fromqint64(qint64 a) { static CAmount fromqint64(qint64 a) {
return CAmount(a); return CAmount(a);
} }
static CAmount fromDouble(double d) {
return CAmount::fromDecimalString(QString::number(d, 'f', 8));
}
CAmount() : amount(0) {}; CAmount() : amount(0) {};
CAmount(const CAmount&) = default; CAmount(const CAmount&) = default;

24
src/recurring.cpp
View File

@@ -3,6 +3,7 @@
#include "mainwindow.h" #include "mainwindow.h"
#include "controller.h" #include "controller.h"
#include "settings.h" #include "settings.h"
#include "camount.h"
#include "ui_newrecurring.h" #include "ui_newrecurring.h"
#include "ui_recurringdialog.h" #include "ui_recurringdialog.h"
#include "ui_recurringpayments.h" #include "ui_recurringpayments.h"
@@ -69,7 +70,7 @@ QJsonObject RecurringPaymentInfo::toJson() {
{"desc", desc}, {"desc", desc},
{"from", fromAddr}, {"from", fromAddr},
{"to", toAddr}, {"to", toAddr},
{"amt", Settings::getDecimalString(amt)}, {"amt", amt},
{"memo", memo}, {"memo", memo},
{"currency", currency}, {"currency", currency},
{"schedule", (int)schedule}, {"schedule", (int)schedule},
@@ -81,7 +82,8 @@ QJsonObject RecurringPaymentInfo::toJson() {
} }
QString RecurringPaymentInfo::getAmountPretty() const { QString RecurringPaymentInfo::getAmountPretty() const {
return currency == "USD" ? Settings::getUSDFormat(amt) : Settings::getZECDisplayFormat(amt); CAmount amount = CAmount::fromDouble(amt);
return currency == "USD" ? amount.toDecimalUSDString() : amount.toDecimalZECString();
} }
QString RecurringPaymentInfo::getScheduleDescription() const { QString RecurringPaymentInfo::getScheduleDescription() const {
@@ -135,7 +137,7 @@ RecurringPaymentInfo* Recurring::getNewRecurringFromTx(QWidget* parent, MainWind
ui.lblTo->setText(tx.toAddrs[0].addr); ui.lblTo->setText(tx.toAddrs[0].addr);
// Default is USD // Default is USD
ui.lblAmt->setText(Settings::getUSDFromZecAmount(tx.toAddrs[0].amount)); ui.lblAmt->setText(tx.toAddrs[0].amount.toDecimalUSDString());
ui.txtMemo->setPlainText(tx.toAddrs[0].memo); ui.txtMemo->setPlainText(tx.toAddrs[0].memo);
ui.txtMemo->setEnabled(false); ui.txtMemo->setEnabled(false);
@@ -147,10 +149,10 @@ RecurringPaymentInfo* Recurring::getNewRecurringFromTx(QWidget* parent, MainWind
return; return;
if (c == "USD") { if (c == "USD") {
ui.lblAmt->setText(Settings::getUSDFromZecAmount(tx.toAddrs[0].amount)); ui.lblAmt->setText(tx.toAddrs[0].amount.toDecimalUSDString());
} }
else { else {
ui.lblAmt->setText(Settings::getDecimalString(tx.toAddrs[0].amount)); ui.lblAmt->setText(tx.toAddrs[0].amount.toDecimalString());
} }
}); });
@@ -203,11 +205,11 @@ void Recurring::updateInfoWithTx(RecurringPaymentInfo* r, Tx tx) {
r->fromAddr = tx.fromAddr; r->fromAddr = tx.fromAddr;
if (r->currency.isEmpty() || r->currency == "USD") { if (r->currency.isEmpty() || r->currency == "USD") {
r->currency = "USD"; r->currency = "USD";
r->amt = tx.toAddrs[0].amount * Settings::getInstance()->getZECPrice(); r->amt = tx.toAddrs[0].amount.toqint64() * Settings::getInstance()->getZECPrice();
} }
else { else {
r->currency = Settings::getTokenName(); r->currency = Settings::getTokenName();
r->amt = tx.toAddrs[0].amount; r->amt = tx.toAddrs[0].amount.toqint64();
} }
// Make sure that the number of payments is properly listed in the array // Make sure that the number of payments is properly listed in the array
@@ -460,7 +462,7 @@ void Recurring::processMultiplePending(RecurringPaymentInfo rpi, MainWindow* mai
void Recurring::executeRecurringPayment(MainWindow* main, RecurringPaymentInfo rpi, QList<int> paymentNumbers) { void Recurring::executeRecurringPayment(MainWindow* main, RecurringPaymentInfo rpi, QList<int> paymentNumbers) {
// Amount is in USD or ZEC? // Amount is in USD or ZEC?
qint64 amt = Settings::getAmountFromUserDecimalStr(QString::number(rpi.amt, 'f', 8)); double amount = rpi.amt;
if (rpi.currency == "USD") { if (rpi.currency == "USD") {
// If there is no price, then fail the payment // If there is no price, then fail the payment
if (Settings::getInstance()->getZECPrice() == 0) { if (Settings::getInstance()->getZECPrice() == 0) {
@@ -473,7 +475,7 @@ void Recurring::executeRecurringPayment(MainWindow* main, RecurringPaymentInfo r
} }
// Translate it into ZEC // Translate it into ZEC
amt = rpi.amt / Settings::getInstance()->getZECPrice(); amount = rpi.amt / Settings::getInstance()->getZECPrice();
} }
// Build a Tx // Build a Tx
@@ -483,9 +485,9 @@ void Recurring::executeRecurringPayment(MainWindow* main, RecurringPaymentInfo r
// If this is a multiple payment, we'll add up all the amounts // If this is a multiple payment, we'll add up all the amounts
if (paymentNumbers.size() > 1) if (paymentNumbers.size() > 1)
amt *= paymentNumbers.size(); amount *= paymentNumbers.size();
tx.toAddrs.append(ToFields { rpi.toAddr, amt, rpi.memo }); tx.toAddrs.append(ToFields { rpi.toAddr, CAmount::fromDouble(amount), rpi.memo });
// To prevent some weird race conditions, we immediately mark the payment as paid. // To prevent some weird race conditions, we immediately mark the payment as paid.
// If something goes wrong, we'll get the error callback below, and the status will be // If something goes wrong, we'll get the error callback below, and the status will be