Skip to content

main: add more fiat currencies, deprecate kraken api #4592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SNeedlewoods wants to merge 1 commit into
base: master
Choose a base branch
from
+64 −28
Open

main: add more fiat currencies, deprecate kraken api #4592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 32 additions & 26 deletions main.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2014-2024, The Monero Project
// Copyright (c) 2014-2026, The Monero Project
//
// All rights reserved.
//
Expand Down Expand Up @@ -106,19 +106,18 @@ ApplicationWindow {
// fiat price conversion
property real fiatPrice: 0
property var fiatPriceAPIs: {
const currencies = ["xmrusd", "xmreur", "xmrgbp", "xmrcad", "xmraud", "xmrnzd", "xmrchf"];
var coingecko = {};
var cryptocompare = {};
for (var i = 0; i < currencies.length; ++i) {
const currency = currencies[i];
const key = getKeyFromCurrency(currency);
coingecko[currency] = "https://api.coingecko.com/api/v3/simple/price?ids=monero&vs_currencies=" + key;
cryptocompare[currency] = "https://min-api.cryptocompare.com/data/price?fsym=XMR&tsyms=" + key.toUpperCase();
}
return {
"kraken": {
"xmrusd": "https://api.kraken.com/0/public/Ticker?pair=XMRUSD",
"xmreur": "https://api.kraken.com/0/public/Ticker?pair=XMREUR"
},
"coingecko": {
"xmrusd": "https://api.coingecko.com/api/v3/simple/price?ids=monero&vs_currencies=usd",
"xmreur": "https://api.coingecko.com/api/v3/simple/price?ids=monero&vs_currencies=eur"
},
"cryptocompare": {
"xmrusd": "https://min-api.cryptocompare.com/data/price?fsym=XMR&tsyms=USD",
"xmreur": "https://min-api.cryptocompare.com/data/price?fsym=XMR&tsyms=EUR",
}
"coingecko": coingecko,
"cryptocompare": cryptocompare
}
}

Expand Down Expand Up @@ -1233,26 +1232,23 @@ ApplicationWindow {
triggeredOnStart: true
}

function getKeyFromCurrency(currency) {
if (currency.length !== 6 || currency.substring(0, 3) !== "xmr")
return undefined;
return currency.substring(3);
}

function fiatApiParseTicker(url, resp, currency){
// parse & validate incoming JSON
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;
}

var key = currency === "xmreur" ? "XXMRZEUR" : "XXMRZUSD";
var ticker = resp.result[key]["c"][0];
return ticker;
} else if(url.startsWith("https://api.coingecko.com/api/v3/")){
var key = currency === "xmreur" ? "eur" : "usd";
if(url.startsWith("https://api.coingecko.com/api/v3/")){
var key = getKeyFromCurrency(currency)
if(!resp.hasOwnProperty("monero") || !resp["monero"].hasOwnProperty(key)){
appWindow.fiatApiError("Coingecko API has error(s)");
return;
}
return resp["monero"][key];
} else if(url.startsWith("https://min-api.cryptocompare.com/data/")){
var key = currency === "xmreur" ? "EUR" : "USD";
var key = getKeyFromCurrency(currency)
if(!resp.hasOwnProperty(key)){
appWindow.fiatApiError("cryptocompare API has error(s)");
return;
Expand Down Expand Up @@ -1336,6 +1332,16 @@ ApplicationWindow {
return "USD";
case "xmreur":
return "EUR";
case "xmrgbp":
return "GBP";
case "xmrcad":
return "CAD";
case "xmraud":
return "AUD";
case "xmrnzd":
return "NZD";
case "xmrchf":
return "CHF";
default:
console.error("unsupported currency", persistentSettings.fiatPriceCurrency);
return "UNSUPPORTED";
Expand Down Expand Up @@ -1517,7 +1523,7 @@ ApplicationWindow {

property bool fiatPriceEnabled: false
property bool fiatPriceToggle: false
property string fiatPriceProvider: "kraken"
property string fiatPriceProvider: "coingecko"
property string fiatPriceCurrency: "xmrusd"

property string proxyAddress: "127.0.0.1:9050"
Expand Down
34 changes: 32 additions & 2 deletions pages/settings/SettingsLayout.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2014-2024, The Monero Project
// Copyright (c) 2014-2026, The Monero Project
//
// All rights reserved.
//
Expand Down Expand Up @@ -227,7 +227,17 @@ Rectangle {
Layout.maximumWidth: 100
labelText: qsTr("Currency") + translationManager.emptyString
labelFontSize: 14
currentIndex: persistentSettings.fiatPriceCurrency === "xmrusd" ? 0 : 1
currentIndex: (function() {
switch (persistentSettings.fiatPriceCurrency) {
case "xmrusd": return 0
case "xmreur": return 1
case "xmrgbp": return 2
case "xmrcad": return 3
case "xmraud": return 4
case "xmrnzd": return 5
case "xmrchf": return 6
}
})()
dataModel: fiatPriceCurrencyModel
onChanged: {
var obj = dataModel.get(currentIndex);
Expand Down Expand Up @@ -322,6 +332,26 @@ Rectangle {
data: "xmreur"
column1: "EUR"
}
ListElement {
data: "xmrgbp"
column1: "GBP"
}
ListElement {
data: "xmrcad"
column1: "CAD"
}
ListElement {
data: "xmraud"
column1: "AUD"
}
ListElement {
data: "xmrnzd"
column1: "NZD"
}
ListElement {
data: "xmrchf"
column1: "CHF"
}
}

Component.onCompleted: {
Expand Down
Loading