aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main.qml40
-rw-r--r--monero-wallet-gui.pro4
-rw-r--r--src/main/main.cpp6
-rw-r--r--src/qt/network.cpp (renamed from src/qt/prices.cpp)92
-rw-r--r--src/qt/network.h20
-rw-r--r--src/qt/prices.h29
6 files changed, 84 insertions, 107 deletions
diff --git a/main.qml b/main.qml
index bcf067bd..88e607b0 100644
--- a/main.qml
+++ b/main.qml
@@ -1135,9 +1135,9 @@ ApplicationWindow {
triggeredOnStart: false
}
- function fiatApiParseTicker(resp, currency){
+ function fiatApiParseTicker(url, resp, currency){
// parse & validate incoming JSON
- if(resp._url.startsWith("https://api.kraken.com/0/")){
+ if(url.startsWith("https://api.kraken.com/0/")){
if(resp.hasOwnProperty("error") && resp.error.length > 0 || !resp.hasOwnProperty("result")){
appWindow.fiatApiError("Kraken API has error(s)");
return;
@@ -1146,14 +1146,14 @@ ApplicationWindow {
var key = currency === "xmreur" ? "XXMRZEUR" : "XXMRZUSD";
var ticker = resp.result[key]["o"];
return ticker;
- } else if(resp._url.startsWith("https://api.coingecko.com/api/v3/")){
+ } else if(url.startsWith("https://api.coingecko.com/api/v3/")){
var key = currency === "xmreur" ? "eur" : "usd";
if(!resp.hasOwnProperty("monero") || !resp["monero"].hasOwnProperty(key)){
appWindow.fiatApiError("Coingecko API has error(s)");
return;
}
return resp["monero"][key];
- } else if(resp._url.startsWith("https://min-api.cryptocompare.com/data/")){
+ } else if(url.startsWith("https://min-api.cryptocompare.com/data/")){
var key = currency === "xmreur" ? "EUR" : "USD";
if(!resp.hasOwnProperty(key)){
appWindow.fiatApiError("cryptocompare API has error(s)");
@@ -1163,13 +1163,7 @@ ApplicationWindow {
}
}
- function fiatApiGetCurrency(resp){
- // map response to `appWindow.fiatPriceAPIs` object
- if (!resp.hasOwnProperty('_url')){
- appWindow.fiatApiError("invalid JSON");
- return;
- }
-
+ function fiatApiGetCurrency(url) {
var apis = appWindow.fiatPriceAPIs;
for (var api in apis){
if (!apis.hasOwnProperty(api))
@@ -1179,23 +1173,34 @@ ApplicationWindow {
if(!apis[api].hasOwnProperty(cur))
continue;
- var url = apis[api][cur];
- if(url === resp._url){
+ if (apis[api][cur] === url) {
return cur;
}
}
}
}
- function fiatApiJsonReceived(resp){
+ function fiatApiJsonReceived(url, resp, error) {
+ if (error) {
+ appWindow.fiatApiError(error);
+ return;
+ }
+
+ try {
+ resp = JSON.parse(resp);
+ } catch (e) {
+ appWindow.fiatApiError("bad JSON: " + e);
+ return;
+ }
+
// handle incoming JSON, set ticker
- var currency = appWindow.fiatApiGetCurrency(resp);
+ var currency = appWindow.fiatApiGetCurrency(url);
if(typeof currency == "undefined"){
appWindow.fiatApiError("could not get currency");
return;
}
- var ticker = appWindow.fiatApiParseTicker(resp, currency);
+ var ticker = appWindow.fiatApiParseTicker(url, resp, currency);
if(ticker <= 0){
appWindow.fiatApiError("could not get ticker");
return;
@@ -1227,7 +1232,7 @@ ApplicationWindow {
}
var url = provider[userCurrency];
- Prices.getJSON(url);
+ Network.getJSON(url, fiatApiJsonReceived);
}
function fiatApiCurrencySymbol() {
@@ -1285,7 +1290,6 @@ ApplicationWindow {
walletManager.checkUpdatesComplete.connect(onWalletCheckUpdatesComplete);
walletManager.walletPassphraseNeeded.connect(onWalletPassphraseNeeded);
IPC.uriHandler.connect(onUriHandler);
- Prices.priceJsonReceived.connect(appWindow.fiatApiJsonReceived);
if(typeof daemonManager != "undefined") {
daemonManager.daemonStarted.connect(onDaemonStarted);
diff --git a/monero-wallet-gui.pro b/monero-wallet-gui.pro
index 30272e5c..04242c66 100644
--- a/monero-wallet-gui.pro
+++ b/monero-wallet-gui.pro
@@ -79,8 +79,8 @@ HEADERS += \
src/qt/FutureScheduler.h \
src/qt/ipc.h \
src/qt/KeysFiles.h \
+ src/qt/network.h \
src/qt/utils.h \
- src/qt/prices.h \
src/qt/macoshelper.h \
src/qt/MoneroSettings.h \
src/qt/TailsOS.h
@@ -115,8 +115,8 @@ SOURCES += src/main/main.cpp \
src/qt/FutureScheduler.cpp \
src/qt/ipc.cpp \
src/qt/KeysFiles.cpp \
+ src/qt/network.cpp \
src/qt/utils.cpp \
- src/qt/prices.cpp \
src/qt/MoneroSettings.cpp \
src/qt/TailsOS.cpp
diff --git a/src/main/main.cpp b/src/main/main.cpp
index c5210e5f..c6c0ea52 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -62,11 +62,11 @@
#include "Logger.h"
#include "MainApp.h"
#include "qt/ipc.h"
+#include "qt/network.h"
#include "qt/utils.h"
#include "qt/TailsOS.h"
#include "qt/KeysFiles.h"
#include "qt/MoneroSettings.h"
-#include "qt/prices.h"
// IOS exclusions
#ifndef Q_OS_IOS
@@ -436,8 +436,8 @@ int main(int argc, char *argv[])
#endif
engine.rootContext()->setContextProperty("builtWithScanner", builtWithScanner);
- Prices prices;
- engine.rootContext()->setContextProperty("Prices", &prices);
+ Network network;
+ engine.rootContext()->setContextProperty("Network", &network);
// Load main window (context properties needs to be defined obove this line)
engine.load(QUrl(QStringLiteral("qrc:///main.qml")));
diff --git a/src/qt/prices.cpp b/src/qt/network.cpp
index 6c09553a..0d523a5c 100644
--- a/src/qt/prices.cpp
+++ b/src/qt/network.cpp
@@ -1,21 +1,21 @@
// Copyright (c) 2014-2019, The Monero Project
-//
+//
// All rights reserved.
-//
+//
// Redistribution and use in source and binary forms, with or without modification, are
// permitted provided that the following conditions are met:
-//
+//
// 1. Redistributions of source code must retain the above copyright notice, this list of
// conditions and the following disclaimer.
-//
+//
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
// of conditions and the following disclaimer in the documentation and/or other
// materials provided with the distribution.
-//
+//
// 3. Neither the name of the copyright holder nor the names of its contributors may be
// used to endorse or promote products derived from this software without specific
// prior written permission.
-//
+//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
@@ -26,6 +26,8 @@
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#include "network.h"
+
#include <QDebug>
#include <QtCore>
@@ -37,74 +39,54 @@
#pragma GCC diagnostic pop
#include "utils.h"
-#include "prices.h"
-Prices::Prices(QObject *parent)
+Network::Network(QObject *parent)
: QObject(parent)
, m_scheduler(this)
{
}
-void Prices::getJSON(const QString url) const
+void Network::get(const QString &url, const QJSValue &callback, const QString &contentType) const
{
qDebug() << QString("Fetching: %1").arg(url);
- m_scheduler.run([this, url] {
- epee::net_utils::http::http_simple_client http_client;
+ m_scheduler.run(
+ [url, contentType] {
+ epee::net_utils::http::http_simple_client httpClient;
- const QUrl urlParsed(url);
- http_client.set_server(urlParsed.host().toStdString(), urlParsed.scheme() == "https" ? "443" : "80", {});
+ const QUrl urlParsed(url);
+ httpClient.set_server(urlParsed.host().toStdString(), urlParsed.scheme() == "https" ? "443" : "80", {});
- const QString uri = (urlParsed.hasQuery() ? urlParsed.path() + "?" + urlParsed.query() : urlParsed.path());
- const epee::net_utils::http::http_response_info* pri = NULL;
- constexpr std::chrono::milliseconds timeout = std::chrono::seconds(15);
+ const QString uri = (urlParsed.hasQuery() ? urlParsed.path() + "?" + urlParsed.query() : urlParsed.path());
+ const epee::net_utils::http::http_response_info *pri = NULL;
+ constexpr std::chrono::milliseconds timeout = std::chrono::seconds(15);
- const bool result = http_client.invoke(
- uri.toStdString(),
- "GET",
- {},
- timeout,
- std::addressof(pri),
+ epee::net_utils::http::fields_list headers({{"User-Agent", randomUserAgent().toStdString()}});
+ if (!contentType.isEmpty())
{
- {"Content-Type", "application/json; charset=utf-8"},
- {"User-Agent", randomUserAgent().toStdString()}
- });
+ headers.push_back({"Content-Type", contentType.toStdString()});
+ }
+ const bool result = httpClient.invoke(uri.toStdString(), "GET", {}, timeout, std::addressof(pri), headers);
- if (!result)
- {
- this->gotError("unknown error");
- }
- else if (!pri)
- {
- this->gotError("internal error (null response ptr)");
- }
- else if (pri->m_response_code != 200)
- {
- this->gotError(QString("response code: %1").arg(pri->m_response_code));
- }
- else
- {
- QJsonDocument doc = QJsonDocument::fromJson({&pri->m_body[0], static_cast<int>(pri->m_body.size())});
- if (doc.isEmpty())
+ if (!result)
{
- this->gotError("bad JSON");
+ return QJSValueList({QJSValue(), QJSValue(), "unknown error"});
}
- else
+ if (!pri)
{
- // Insert source url for later reference
- QJsonObject docobj = doc.object();
- docobj["_url"] = url;
- doc.setObject(docobj);
-
- QVariantMap vMap = doc.object().toVariantMap();
- emit priceJsonReceived(vMap);
+ return QJSValueList({QJSValue(), QJSValue(), "internal error (null response ptr)"});
}
- }
- });
+ if (pri->m_response_code != 200)
+ {
+ return QJSValueList({QJSValue(), QJSValue(), QString("response code: %1").arg(pri->m_response_code)});
+ }
+
+ return QJSValueList({url, QString::fromStdString(pri->m_body)});
+ },
+ callback);
}
-void Prices::gotError(const QString &message) const
+void Network::getJSON(const QString &url, const QJSValue &callback) const
{
- qCritical() << "[Fiat API] Error:" << message;
- emit priceJsonError(message);
+ get(url, callback, "application/json; charset=utf-8");
}
diff --git a/src/qt/network.h b/src/qt/network.h
new file mode 100644
index 00000000..765b2512
--- /dev/null
+++ b/src/qt/network.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <QCoreApplication>
+#include <QtNetwork>
+
+#include "FutureScheduler.h"
+
+class Network : public QObject
+{
+ Q_OBJECT
+public:
+ Network(QObject *parent = nullptr);
+
+public:
+ Q_INVOKABLE void get(const QString &url, const QJSValue &callback, const QString &contentType = {}) const;
+ Q_INVOKABLE void getJSON(const QString &url, const QJSValue &callback) const;
+
+private:
+ mutable FutureScheduler m_scheduler;
+};
diff --git a/src/qt/prices.h b/src/qt/prices.h
deleted file mode 100644
index 4168aedc..00000000
--- a/src/qt/prices.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef PRICES_H
-#define PRICES_H
-
-#include <QCoreApplication>
-#include <QtNetwork>
-
-#include "FutureScheduler.h"
-
-class Prices : public QObject
-{
-Q_OBJECT
-public:
- Prices(QObject *parent = nullptr);
-
-public:
- Q_INVOKABLE void getJSON(const QString url) const;
-
-private:
- void gotError(const QString &message) const;
-
-signals:
- void priceJsonReceived(QVariantMap document) const;
- void priceJsonError(QString message) const;
-
-private:
- mutable FutureScheduler m_scheduler;
-};
-
-#endif // PRICES_H
generated by cgit v1.2.3 (git 2.51.0) at 2026-08-16 12:32:58 +0000