diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 95eb84f..0120c81 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -1386,6 +1386,7 @@ + @@ -1407,6 +1408,29 @@ + + + + + TLS Support + + + + + + + Loading... + + + + + + + | + + + + diff --git a/src/rpc.cpp b/src/rpc.cpp index 221f227..0214004 100644 --- a/src/rpc.cpp +++ b/src/rpc.cpp @@ -613,12 +613,14 @@ void RPC::getInfoThenRefresh(bool force) { main->statusIcon->setPixmap(i.pixmap(16, 16)); } + ui->numconnections->setText(QString::number(connections) + " (" + QString::number(tlsconnections) + " TLS)" ); + ui->tlssupport->setText(hasTLS ? "Yes" : "No"); + // Get network sol/s QString method = "getnetworksolps"; conn->doRPCIgnoreError(makePayload(method), [=](const QJsonValue& reply) { qint64 solrate = reply.toInt(); - ui->numconnections->setText(QString::number(connections) + " (" + QString::number(tlsconnections) + " TLS)" ); ui->solrate->setText(QString::number(solrate) % " Sol/s"); }); @@ -1125,7 +1127,7 @@ void RPC::refreshPrice() { } else { qDebug() << reply->errorString(); } - s->setZECPrice(0); + s->setHUSHPrice(0); s->setBTCPrice(0); return; } @@ -1133,7 +1135,7 @@ void RPC::refreshPrice() { qDebug() << "No network errors"; if (parsed.isEmpty()) { - s->setZECPrice(0); + s->setHUSHPrice(0); s->setBTCPrice(0); return; } @@ -1154,7 +1156,7 @@ void RPC::refreshPrice() { qDebug() << "HUSH = " << QString::number(hush["eur"].toDouble()) << " EUR"; qDebug() << "HUSH = " << QString::number((int) 100000000 * hush["btc"].toDouble()) << " sat "; - s->setZECPrice( hush[ticker].toDouble() ); + s->setHUSHPrice( hush[ticker].toDouble() ); s->setBTCPrice( (unsigned int) 100000000 * hush["btc"].toDouble() ); ticker = ticker.toLower(); @@ -1199,7 +1201,7 @@ void RPC::refreshPrice() { } // If nothing, then set the price to 0; - Settings::getInstance()->setZECPrice(0); + Settings::getInstance()->setHUSHPrice(0); Settings::getInstance()->setBTCPrice(0); }); } diff --git a/src/settings.cpp b/src/settings.cpp index 14bd4e8..c3de779 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -159,8 +159,8 @@ bool Settings::isSaplingActive() { return (isTestnet() && getBlockNumber() > 0) || (!isTestnet() && getBlockNumber() > 0); } -double Settings::getZECPrice() { - return zecPrice; +double Settings::getHUSHPrice() { + return hushPrice; } double Settings::get_price(QString currency) { @@ -282,7 +282,7 @@ void Settings::saveRestore(QDialog* d) { QString Settings::getUSDFormat(double bal) { //TODO: respect current locale! - return QLocale(QLocale::English).toString(bal * Settings::getInstance()->getZECPrice(), 'f', 8) + " " +Settings::getInstance()->get_currency_name(); + return QLocale(QLocale::English).toString(bal * Settings::getInstance()->getHUSHPrice(), 'f', 8) + " " +Settings::getInstance()->get_currency_name(); } QString Settings::getDecimalString(double amt) { diff --git a/src/settings.h b/src/settings.h index 37531ce..6d66ca1 100644 --- a/src/settings.h +++ b/src/settings.h @@ -91,10 +91,10 @@ public: void setUsingZcashConf(QString confLocation); const QString& getZcashdConfLocation() { return _confLocation; } - void setZECPrice(double p) { zecPrice = p; } + void setHUSHPrice(double p) { hushPrice = p; } void set_fiat_price(double p) { fiat_price = p; } void setBTCPrice(unsigned int p) { btcPrice = p; } - double getZECPrice(); + double getHUSHPrice(); double get_fiat_price(); unsigned int getBTCPrice(); double get_price(QString currency); @@ -162,7 +162,7 @@ private: bool _headless = false; int _peerConnections = 0; - double zecPrice = 0.0; + double hushPrice = 0.0; double fiat_price = 0.0; unsigned int btcPrice = 0; std::map prices; diff --git a/src/websockets.cpp b/src/websockets.cpp index 5063dff..38305b9 100644 --- a/src/websockets.cpp +++ b/src/websockets.cpp @@ -855,7 +855,8 @@ void AppDataServer::processGetInfo(QJsonObject jobj, MainWindow* mainWindow, std {"maxspendable", maxSpendable}, {"maxzspendable", maxZSpendable}, {"tokenName", Settings::getTokenName()}, - {"zecprice", Settings::getInstance()->getZECPrice()}, + // changing this will break SDA + {"zecprice", Settings::getInstance()->getHUSHPrice()}, {"serverversion", QString(APP_VERSION)} }).toJson(); pClient->sendTextMessage(encryptOutgoing(r));