Merge pull request #5042 from BlueWallet/lbpfix

FIX: LBP API call
2024-11-19 18:00:17 +01:00 · 2022-09-27 22:30:32 +01:00 · 2022-09-27 22:30:32 +01:00 · e51da07117
commit e51da07117
parent dd7524976b 80d45c323a
4 changed files with 251 additions and 249 deletions
--- a/ios/Widgets/Shared/WidgetAPI.swift
+++ b/ios/Widgets/Shared/WidgetAPI.swift
@ -29,8 +29,8 @@ class WidgetAPI {
    switch source {
    case "Yadio":
      urlString = "https://api.yadio.io/json/\(endPointKey)"
-    case "BitcoinduLiban":
-      urlString = "https://bitcoinduliban.org/api.php?key=lbpusd"
+    case "YadioConvert":
+      urlString = "https://api.yadio.io/convert/1/BTC/\(endPointKey)"
    case "Exir":
      urlString = "https://api.exir.io/v1/ticker?symbol=btc-irt"
    case "wazirx":
@ -61,11 +61,14 @@ class WidgetAPI {
        let unix = Double(lastUpdated / 1_000)
        let lastUpdatedString = ISO8601DateFormatter().string(from: Date(timeIntervalSince1970: unix))
        latestRateDataStore = WidgetDataStore(rate: String(rateDouble), lastUpdate: lastUpdatedString, rateDouble: rateDouble)
-      case "BitcoinduLiban":
-        guard let rateString = json["BTC/LBP"] as? String else { break }
-        guard let rateDouble = Double(rateString) else { break }
-        let lastUpdatedString = ISO8601DateFormatter().string(from: Date())
-        latestRateDataStore = WidgetDataStore(rate: rateString, lastUpdate: lastUpdatedString, rateDouble: rateDouble)
+      case "YadioConvert":
+        guard let rateDict = json as? [String: Any],
+              let rateDouble = rateDict["rate"] as? Double,
+              let lastUpdated = json["timestamp"] as? Int
+        else { break }
+        let unix = Double(lastUpdated / 1_000)
+        let lastUpdatedString = ISO8601DateFormatter().string(from: Date(timeIntervalSince1970: unix))
+        latestRateDataStore = WidgetDataStore(rate: String(rateDouble), lastUpdate: lastUpdatedString, rateDouble: rateDouble)
      case "Exir":
        guard let rateDouble = json["last"] as? Double else { break }
        let rateString = String(rateDouble)
--- a/models/fiatUnit.ts
+++ b/models/fiatUnit.ts
@ -3,7 +3,7 @@ import untypedFiatUnit from './fiatUnits.json';
 export const FiatUnitSource = {
  CoinDesk: 'CoinDesk',
  Yadio: 'Yadio',
-  BitcoinduLiban: 'BitcoinduLiban',
+  YadioConvert: 'YadioConvert',
  Exir: 'Exir',
  wazirx: 'wazirx',
 } as const;
@ -41,15 +41,15 @@ const RateExtractors = {
    return rate;
  },

-  BitcoinduLiban: async (ticker: string): Promise<number> => {
+  YadioConvert: async (ticker: string): Promise<number> => {
    let json;
    try {
-      const res = await fetch('https://bitcoinduliban.org/api.php?key=lbpusd');
+      const res = await fetch(`https://api.yadio.io/convert/1/BTC/${ticker}`);
      json = await res.json();
    } catch (e: any) {
      throw new Error(`Could not update rate for ${ticker}: ${e.message}`);
    }
-    let rate = json?.[`BTC/${ticker}`];
+    let rate = json?.rate;
    if (!rate) throw new Error(`Could not update rate for ${ticker}: data is wrong`);

    rate = Number(rate);
@ -95,7 +95,7 @@ type FiatUnit = {
    endPointKey: string;
    symbol: string;
    locale: string;
-    source: 'CoinDesk' | 'Yadio' | 'Exir' | 'BitcoinduLiban' | 'wazirx';
+    source: 'CoinDesk' | 'Yadio' | 'Exir' | 'wazirx';
  };
 };
 export const FiatUnit = untypedFiatUnit as FiatUnit;
--- a/models/fiatUnits.json
+++ b/models/fiatUnits.json
@ -1,326 +1,326 @@
 {
    "USD": {
        "endPointKey": "USD",
-      "symbol": "$",
        "locale": "en-US",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "$"
    },
    "AED": {
        "endPointKey": "AED",
-      "symbol": "د.إ.",
        "locale": "ar-AE",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "د.إ."
    },
    "ANG": {
        "endPointKey": "ANG",
-      "symbol": "ƒ",
        "locale": "en-SX",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "ƒ"
    },
    "ARS": {
        "endPointKey": "ARS",
-      "symbol": "$",
        "locale": "es-AR",
-      "source": "Yadio"
+        "source": "Yadio",
+        "symbol": "$"
    },
    "AUD": {
        "endPointKey": "AUD",
-      "symbol": "$",
        "locale": "en-AU",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "$"
    },
    "AWG": {
        "endPointKey": "AWG",
-      "symbol": "ƒ",
        "locale": "nl-AW",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "ƒ"
    },
    "BHD": {
        "endPointKey": "BHD",
-      "symbol": "د.ب.",
        "locale": "ar-BH",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "د.ب."
    },
    "BRL": {
        "endPointKey": "BRL",
-      "symbol": "R$",
        "locale": "pt-BR",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "R$"
    },
    "CAD": {
        "endPointKey": "CAD",
-      "symbol": "$",
        "locale": "en-CA",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "$"
    },
    "CHF": {
        "endPointKey": "CHF",
-      "symbol": "CHF",
        "locale": "de-CH",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "CHF"
    },
    "CLP": {
        "endPointKey": "CLP",
-      "symbol": "$",
        "locale": "es-CL",
-      "source": "CoinDesk"
-    },
-    "COP": {
-      "endPointKey": "COP",
-      "symbol": "$",
-      "locale": "es-CO",
-      "source": "CoinDesk"
-    },
-    "CZK": {
-      "endPointKey": "CZK",
-      "symbol": "Kč",
-      "locale": "cs-CZ",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "$"
    },
    "CNY": {
        "endPointKey": "CNY",
-      "symbol": "¥",
        "locale": "zh-CN",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "¥"
+    },
+    "COP": {
+        "endPointKey": "COP",
+        "locale": "es-CO",
+        "source": "CoinDesk",
+        "symbol": "$"
+    },
+    "CZK": {
+        "endPointKey": "CZK",
+        "locale": "cs-CZ",
+        "source": "CoinDesk",
+        "symbol": "Kč"
    },
    "DKK": {
        "endPointKey": "DKK",
-    "symbol": "kr",
        "locale": "da-DK",
-    "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "kr"
    },
    "EUR": {
        "endPointKey": "EUR",
-      "symbol": "€",
        "locale": "en-IE",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "€"
    },
    "GBP": {
        "endPointKey": "GBP",
-      "symbol": "£",
        "locale": "en-GB",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "£"
    },
    "HRK": {
        "endPointKey": "HRK",
-      "symbol": "HRK",
        "locale": "hr-HR",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "HRK"
    },
    "HUF": {
        "endPointKey": "HUF",
-      "symbol": "Ft",
        "locale": "hu-HU",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "Ft"
    },
    "IDR": {
        "endPointKey": "IDR",
-      "symbol": "Rp",
        "locale": "id-ID",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "Rp"
    },
    "ILS": {
        "endPointKey": "ILS",
-      "symbol": "₪",
        "locale": "he-IL",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "₪"
    },
    "INR": {
        "endPointKey": "INR",
-      "symbol": "₹",
        "locale": "hi-HN",
-      "source": "wazirx"
-    },
-    "IRT": {
-      "endPointKey": "IRT",
-      "symbol": "تومان",
-      "locale": "fa-IR",
-      "source": "Exir"
+        "source": "wazirx",
+        "symbol": "₹"
    },
    "IRR": {
        "endPointKey": "IRR",
-      "symbol": "﷼",
        "locale": "fa-IR",
-      "source": "Exir"
+        "source": "Exir",
+        "symbol": "﷼"
+    },
+    "IRT": {
+        "endPointKey": "IRT",
+        "locale": "fa-IR",
+        "source": "Exir",
+        "symbol": "تومان"
    },
    "ISK": {
        "endPointKey": "ISK",
-      "symbol": "kr",
        "locale": "is-IS",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "kr"
    },
    "JPY": {
        "endPointKey": "JPY",
-      "symbol": "¥",
        "locale": "ja-JP",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "¥"
    },
    "KES": {
        "endPointKey": "KES",
-      "symbol": "Ksh",
        "locale": "en-KE",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "Ksh"
    },
    "KRW": {
        "endPointKey": "KRW",
-      "symbol": "₩",
        "locale": "ko-KR",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "₩"
    },
    "KWD": {
        "endPointKey": "KWD",
-      "symbol": "د.ك.",
        "locale": "ar-KW",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "د.ك."
    },
    "LBP": {
        "endPointKey": "LBP",
-      "symbol": "ل.ل.",
        "locale": "ar-LB",
-      "source": "BitcoinduLiban"
-    },
-    "MZN": {
-      "endPointKey": "MZN",
-      "symbol": "MTn",
-      "locale": "seh-MZ",
-      "source": "CoinDesk"
+        "source": "YadioConvert",
+        "symbol": "ل.ل."
    },
    "MXN": {
        "endPointKey": "MXN",
-      "symbol": "$",
        "locale": "es-MX",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "$"
    },
    "MYR": {
        "endPointKey": "MYR",
-      "symbol": "RM",
        "locale": "ms-MY",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "RM"
+    },
+    "MZN": {
+        "endPointKey": "MZN",
+        "locale": "seh-MZ",
+        "source": "CoinDesk",
+        "symbol": "MTn"
    },
    "NGN": {
        "endPointKey": "NGN",
-      "symbol": "₦",
        "locale": "en-NG",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "₦"
    },
    "NOK": {
        "endPointKey": "NOK",
-      "symbol": "kr",
        "locale": "nb-NO",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "kr"
    },
    "NZD": {
        "endPointKey": "NZD",
-      "symbol": "$",
        "locale": "en-NZ",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "$"
    },
    "OMR": {
        "endPointKey": "OMR",
-      "symbol": "ر.ع.",
        "locale": "ar-OM",
-      "source": "CoinDesk"
-    },
-    "PLN": {
-      "endPointKey": "PLN",
-      "symbol": "zł",
-      "locale": "pl-PL",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "ر.ع."
    },
    "PHP": {
        "endPointKey": "PHP",
-      "symbol": "₱",
        "locale": "en-PH",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "₱"
+    },
+    "PLN": {
+        "endPointKey": "PLN",
+        "locale": "pl-PL",
+        "source": "CoinDesk",
+        "symbol": "zł"
    },
    "QAR": {
        "endPointKey": "QAR",
-      "symbol": "ر.ق.",
        "locale": "ar-QA",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "ر.ق."
    },
    "RUB": {
        "endPointKey": "RUB",
-      "symbol": "₽",
        "locale": "ru-RU",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "₽"
    },
    "SAR": {
        "endPointKey": "SAR",
-      "symbol": "ر.س.",
        "locale": "ar-SA",
-      "source": "CoinDesk"
-    },
-    "SGD": {
-      "endPointKey": "SGD",
-      "symbol": "S$",
-      "locale": "zh-SG",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "ر.س."
    },
    "SEK": {
        "endPointKey": "SEK",
-      "symbol": "kr",
        "locale": "sv-SE",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "kr"
    },
-    "TRY": {
-      "endPointKey": "TRY",
-      "symbol": "₺",
-      "locale": "tr-TR",
-      "source": "CoinDesk"
+    "SGD": {
+        "endPointKey": "SGD",
+        "locale": "zh-SG",
+        "source": "CoinDesk",
+        "symbol": "S$"
    },
    "THB": {
        "endPointKey": "THB",
-      "symbol": "฿",
        "locale": "th-TH",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "฿"
+    },
+    "TRY": {
+        "endPointKey": "TRY",
+        "locale": "tr-TR",
+        "source": "CoinDesk",
+        "symbol": "₺"
    },
    "TWD": {
        "endPointKey": "TWD",
-      "symbol": "NT$",
        "locale": "zh-Hant-TW",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "NT$"
    },
    "TZS": {
        "endPointKey": "TZS",
-      "symbol": "TSh",
        "locale": "en-TZ",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "TSh"
    },
    "UAH": {
        "endPointKey": "UAH",
-      "symbol": "₴",
        "locale": "uk-UA",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "₴"
    },
    "UGX": {
        "endPointKey": "UGX",
-      "symbol": "USh",
        "locale": "en-UG",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "USh"
    },
    "UYU": {
        "endPointKey": "UYU",
-      "symbol": "$",
        "locale": "es-UY",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "$"
    },
    "VEF": {
        "endPointKey": "VEF",
-      "symbol": "Bs.",
        "locale": "es-VE",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "Bs."
    },
    "VES": {
        "endPointKey": "VES",
-      "symbol": "Bs.",
        "locale": "es-VE",
-      "source": "Yadio"
+        "source": "Yadio",
+        "symbol": "Bs."
    },
    "ZAR": {
        "endPointKey": "ZAR",
-      "symbol": "R",
        "locale": "en-ZA",
-      "source": "CoinDesk"
+        "source": "CoinDesk",
+        "symbol": "R"
    }
 }
--- a/tests/integration/Currency.test.js
+++ b/tests/integration/Currency.test.js
@ -35,12 +35,11 @@ describe('currency', () => {
    cur = JSON.parse(await AsyncStorage.getItem(currency.EXCHANGE_RATES));
    assert.ok(cur.BTC_ARS > 0);

-    // test BitcoinduLiban rate source
-    // disabled, because it throws "Service Temporarily Unavailable" on circleci
-    // await currency.setPrefferedCurrency(FiatUnit.LBP);
-    // await currency.init(true);
-    // cur = JSON.parse(await AsyncStorage.getItem(currency.EXCHANGE_RATES));
-    // assert.ok(cur.BTC_LBP > 0);
+    // test YadioConvert rate source
+    await currency.setPrefferedCurrency(FiatUnit.LBP);
+    await currency.init(true);
+    cur = JSON.parse(await AsyncStorage.getItem(currency.EXCHANGE_RATES));
+    assert.ok(cur.BTC_LBP > 0);

    // test Exir rate source
    await currency.setPrefferedCurrency(FiatUnit.IRT);