Merge pull request #4406 from cd2357/xchange-integration-gui-label-ad…

…justments

Update GUI labels to reflect multiple rate providers

core/src/main/java/bisq/core/provider/price/PriceFeedService.java

@@ -83,7 +83,7 @@ public class PriceFeedService {
     private String currencyCode;
     private final StringProperty currencyCodeProperty = new SimpleStringProperty();
     private final IntegerProperty updateCounter = new SimpleIntegerProperty(0);
-    private long epochInSecondAtLastRequest;
+    private long epochInMillisAtLastRequest;
     private Map<String, Long> timeStampMap = new HashMap<>();
     private long retryDelay = 1;
     private long requestTs;
@@ -280,24 +280,8 @@ public ReadOnlyIntegerProperty updateCounterProperty() {
         return updateCounter;
     }
 
-    public Date getLastRequestTimeStampBtcAverage() {
-        return new Date(epochInSecondAtLastRequest);
-    }
-
-    public Date getLastRequestTimeStampPoloniex() {
-        Long ts = timeStampMap.get("btcAverageTs");
-        if (ts != null) {
-            return new Date(ts);
-        } else
-            return new Date();
-    }
-
-    public Date getLastRequestTimeStampCoinmarketcap() {
-        Long ts = timeStampMap.get("coinmarketcapTs");
-        if (ts != null) {
-            return new Date(ts);
-        } else
-            return new Date();
+    public Date getLastRequestTimeStamp() {
+        return new Date(epochInMillisAtLastRequest);
     }
 
     public void applyLatestBisqMarketPrice(Set<TradeStatistics2> tradeStatisticsSet) {
@@ -400,7 +384,12 @@ public void onSuccess(@Nullable Tuple2<Map<String, Long>, Map<String, MarketPric
                 UserThread.execute(() -> {
                     checkNotNull(result, "Result must not be null at requestAllPrices");
                     timeStampMap = result.first;
-                    epochInSecondAtLastRequest = timeStampMap.get("btcAverageTs");
+
+                    // Each currency rate has a different timestamp, depending on when
+                    // the pricenode aggregate rate was calculated
+                    // However, the request timestamp is when the pricenode was queried
+                    epochInMillisAtLastRequest = System.currentTimeMillis();
+
                     final Map<String, MarketPrice> priceMap = result.second;
 
                     cache.putAll(priceMap);

core/src/main/resources/i18n/displayStrings.properties

@@ -243,7 +243,6 @@ mainView.marketPrice.bisqInternalPrice=Price of latest Bisq trade
 mainView.marketPrice.tooltip.bisqInternalPrice=There is no market price from external price feed providers available.\n\
   The displayed price is the latest Bisq trade price for that currency.
 mainView.marketPrice.tooltip=Market price is provided by {0}{1}\nLast update: {2}\nProvider node URL: {3}
-mainView.marketPrice.tooltip.altcoinExtra=If the altcoin is not available at Poloniex we use https://coinmarketcap.com
 mainView.balance.available=Available balance
 mainView.balance.reserved=Reserved in offers
 mainView.balance.locked=Locked in trades
@@ -1163,10 +1162,9 @@ setting.about.support=Support Bisq
 setting.about.def=Bisq is not a company—it is a project open to the community. If you want to participate or support Bisq please follow the links below.
 setting.about.contribute=Contribute
 setting.about.providers=Data providers
-setting.about.apisWithFee=Bisq uses 3rd party APIs for Fiat and Altcoin market prices as well as for mining fee estimation.
-setting.about.apis=Bisq uses 3rd party APIs for Fiat and Altcoin market prices.
++setting.about.apisWithFee=Bisq uses Bisq Price Indices for Fiat and Altcoin market prices, and Bisq Mempool Nodes for mining fee estimation.
++setting.about.apis=Bisq uses Bisq Price Indices for Fiat and Altcoin market prices.
 setting.about.pricesProvided=Market prices provided by
-setting.about.pricesProviders={0}, {1} and {2}
 setting.about.feeEstimation.label=Mining fee estimation provided by
 setting.about.versionDetails=Version details
 setting.about.version=Application version

core/src/main/resources/i18n/displayStrings_de.properties

@@ -242,7 +242,6 @@ mainView.marketPriceWithProvider.label=Marktpreis von {0}
 mainView.marketPrice.bisqInternalPrice=Preis des letzten Bisq-Handels
 mainView.marketPrice.tooltip.bisqInternalPrice=Es ist kein Marktpreis von externen Marktpreis-Anbietern verfügbar.\nDer angezeigte Preis, ist der letzte Bisq-Handelspreis für diese Währung.
 mainView.marketPrice.tooltip=Marktpreis bereitgestellt von {0}{1}\nLetzte Aktualisierung: {2}\nURL des Knoten-Anbieters: {3}
-mainView.marketPrice.tooltip.altcoinExtra=Falls der Altcoin nicht auf Poloniex verfügbar ist nutzen wir https://coinmarketcap.com
 mainView.balance.available=Verfügbarer Betrag
 mainView.balance.reserved=In Angeboten reserviert
 mainView.balance.locked=In Trades gesperrt
@@ -1015,7 +1014,6 @@ setting.about.providers=Datenanbieter
 setting.about.apisWithFee=Bisq nutzt für Fiatgeld- und Altcoin-Marktpreise sowie geschätzte Mining-Gebühren die APIs 3tr.
 setting.about.apis=Bisq nutzt für Fiatgeld- und Altcoin-Marktpreise die APIs 3tr.
 setting.about.pricesProvided=Marktpreise zur Verfügung gestellt von
-setting.about.pricesProviders={0}, {1} und {2}
 setting.about.feeEstimation.label=Geschätzte Mining-Gebühr bereitgestellt von
 setting.about.versionDetails=Versionsdetails
 setting.about.version=Anwendungsversion

core/src/main/resources/i18n/displayStrings_es.properties

@@ -242,7 +242,6 @@ mainView.marketPriceWithProvider.label=Precio de mercado por {0}
 mainView.marketPrice.bisqInternalPrice=Precio del último intercambio en Bisq
 mainView.marketPrice.tooltip.bisqInternalPrice=No existe un precio de mercado disponible proveniente de fuentes externas.\nEl precio mostrado es el último precio de intercambio en Bisq para esa moneda.
 mainView.marketPrice.tooltip=Precio de mercado ofrecido por {0}{1}\nÚltima actualización: {2}\nURL del nodo proveedor: {3}
-mainView.marketPrice.tooltip.altcoinExtra=Si la altcoin no está disponible en Poloniex usamos https://coinmarketcap.com
 mainView.balance.available=Saldo disponible
 mainView.balance.reserved=Reservado en ofertas
 mainView.balance.locked=Bloqueado en intercambios
@@ -1015,7 +1014,6 @@ setting.about.providers=Proveedores de datos
 setting.about.apisWithFee=Bisq usa APIs de terceros para los precios de los mercados Fiat y Altcoin así como para la estimación de tasas de minado.
 setting.about.apis=Bisq utiliza APIs de terceros para los precios de mercado de Fiat y Altcoin.
 setting.about.pricesProvided=Precios de mercado proporcionados por:
-setting.about.pricesProviders={0}, {1} y {2}
 setting.about.feeEstimation.label=Estimación de comisión de minería proporcionada por:
 setting.about.versionDetails=Detalles de la versión
 setting.about.version=Versión de la aplicación:

core/src/main/resources/i18n/displayStrings_fa.properties

@@ -242,7 +242,6 @@ mainView.marketPriceWithProvider.label=قیمت بازار بر اساس {0}
 mainView.marketPrice.bisqInternalPrice=قیمت آخرین معامله‌ی Bisq
 mainView.marketPrice.tooltip.bisqInternalPrice=قیمت بازارهای خارجی موجود نیست.\nقیمت نمایش داده شده، از آخرین معامله‌ی Bisq برای ارز موردنظر اتخاذ شده است.
 mainView.marketPrice.tooltip=قیمت بازار توسط {0}{1} ارائه شده است\nآخرین به روز رسانی: {2}\nURL لینک Node ارائه دهنده: {3}
-mainView.marketPrice.tooltip.altcoinExtra=در صورتی که آلتکوین در Poloniex موجود نباشد، از نرخ https://coinmarketcap.com استفاده می کنیم.
 mainView.balance.available=موجودی در دسترس
 mainView.balance.reserved=رزرو شده در پیشنهادها
 mainView.balance.locked=قفل شده در معاملات
@@ -1015,7 +1014,6 @@ setting.about.providers=ارائه دهندگان داده
 setting.about.apisWithFee=Bisq از APIهای شخص ثالث 3rd party برای قیمت های روز فیات و آلت کوین و همچنین برای برآورد هزینه تراکنش شبکه استفاده می کند.
 setting.about.apis=Bisq از APIهای شخص ثالث 3rd party برای قیمت های روز فیات و آلت کوین استفاده می کند.
 setting.about.pricesProvided=قیمت‌های بازار ارائه شده توسط
-setting.about.pricesProviders={0}, {1} و {2}
 setting.about.feeEstimation.label=برآورد کارمزد استخراج ارائه شده توسط
 setting.about.versionDetails=جزئیات نسخه
 setting.about.version=نسخه برنامه

core/src/main/resources/i18n/displayStrings_fr.properties

@@ -242,7 +242,6 @@ mainView.marketPriceWithProvider.label=Prix du marché par {0}
 mainView.marketPrice.bisqInternalPrice=Cours de la dernière transaction Bisq
 mainView.marketPrice.tooltip.bisqInternalPrice=Il n'y a pas de cours de marché disponible depuis une source externe.\nLe cours affiché est celui de la dernière transaction Bisq pour cette devise.
 mainView.marketPrice.tooltip=Le prix de marché est fourni par {0}{1}\nDernière mise à jour: {2}\nURL du noeud: {3}
-mainView.marketPrice.tooltip.altcoinExtra=Si l'altcoin n'est pas disponible sur Poloniex nous utilisons https://coinmarketcap.com
 mainView.balance.available=Solde disponible
 mainView.balance.reserved=Réservé en ordres
 mainView.balance.locked=Bloqué en transactions
@@ -1015,7 +1014,6 @@ setting.about.providers=Fournisseurs de données
 setting.about.apisWithFee=Bisq utilise des APIs tierces ou 3rd party pour le taux de change des devises nationales et des cryptomonnaies, aussi bien que pour obtenir une estimation des frais de minage.
 setting.about.apis=Bisq utilise des APIs tierces ou 3rd party pour le taux de change des devises nationales et des cryptomonnaies.
 setting.about.pricesProvided=Prix de marché fourni par
-setting.about.pricesProviders={0}, {1} et {2}
 setting.about.feeEstimation.label=Estimation des frais de minage fournie par
 setting.about.versionDetails=Détails sur la version
 setting.about.version=Version de l'application

core/src/main/resources/i18n/displayStrings_ja.properties

@@ -242,7 +242,6 @@ mainView.marketPriceWithProvider.label={0} による市場価格
 mainView.marketPrice.bisqInternalPrice=Bisqにおける最新の取引価格
 mainView.marketPrice.tooltip.bisqInternalPrice=利用可能な外部価格フィードプロバイダーからの市場価格がありません。\n表示されている価格は、その通貨の最新のBisq取引価格です。
 mainView.marketPrice.tooltip=市場価格は{0}{1}に提供されています\n最終更新: {2}\n提供者のノードのURL: {3}
-mainView.marketPrice.tooltip.altcoinExtra=アルトコインがPoloniexで利用可能でない場合、https://coinmarketcap.com を利用します
 mainView.balance.available=利用可能残高
 mainView.balance.reserved=オファーのために予約済み
 mainView.balance.locked=トレードにロック中
@@ -1015,7 +1014,6 @@ setting.about.providers=データプロバイダー
 setting.about.apisWithFee=Bisqは、法定通貨とアルトコインの市場価格や、マイニング料金の推定にサードパーティAPIを使用します。
 setting.about.apis=Bisqは法定通貨とアルトコインの市場価格の為にサードパーティAPIを使用します。
 setting.about.pricesProvided=市場価格を提供している：
-setting.about.pricesProviders={0}, {1} と {2}
 setting.about.feeEstimation.label=推定マイニング手数料の提供:
 setting.about.versionDetails=バージョン詳細
 setting.about.version=アプリのバージョン

core/src/main/resources/i18n/displayStrings_pt-br.properties

@@ -242,7 +242,6 @@ mainView.marketPriceWithProvider.label=Preço de mercado por {0}
 mainView.marketPrice.bisqInternalPrice=Preço da última negociação Bisq
 mainView.marketPrice.tooltip.bisqInternalPrice=Não foi encontrado preço de mercado nos provedores externos.\nO preço exibido corresponde ao último preço de negociação no Bisq para essa moeda.
 mainView.marketPrice.tooltip=Preço de Mercado fornecido por {0}{1}\nÚltima atualização: {2}\nURL do provedor: {3}
-mainView.marketPrice.tooltip.altcoinExtra=Se a altcoin não estiver disponível na Poloniex, usaremos https://coinmarketcap.com
 mainView.balance.available=Saldo disponível
 mainView.balance.reserved=Reservado em ofertas
 mainView.balance.locked=Travado em negociações
@@ -1015,7 +1014,6 @@ setting.about.providers=Provedores de dados
 setting.about.apisWithFee=O Bisq utiliza APIs de terceiros para obter os preços de moedas fiduciárias e de altcoins, assim como para estimar a taxa de mineração.
 setting.about.apis=Bisq utiliza APIs de terceiros para os preços de moedas fiduciárias e altcoins.
 setting.about.pricesProvided=Preços de mercado fornecidos por
-setting.about.pricesProviders={0}, {1} e {2}
 setting.about.feeEstimation.label=Estimativa da taxa de mineração fornecida por
 setting.about.versionDetails=Detalhes da versão
 setting.about.version=Versão do programa

core/src/main/resources/i18n/displayStrings_pt.properties

@@ -242,7 +242,6 @@ mainView.marketPriceWithProvider.label=Preço de mercado por {0}
 mainView.marketPrice.bisqInternalPrice=Preço do último negócio do Bisq
 mainView.marketPrice.tooltip.bisqInternalPrice=Não há preço de mercado de fornecedores de feed de preço externos disponíveis.\nO preço exibido é o mais recente preço de negócio do Bisq para essa moeda.
 mainView.marketPrice.tooltip=O preço de mercado é fornecido por {0} {1}\nÚltima atualização: {2}\nURL do nó do provedor: {3}
-mainView.marketPrice.tooltip.altcoinExtra=Se a altcoin não estiver disponível na Poloniex, usaremos https://coinmarketcap.com
 mainView.balance.available=Saldo disponível
 mainView.balance.reserved=Reservado em ofertas
 mainView.balance.locked=Bloqueado em negócios
@@ -1015,7 +1014,6 @@ setting.about.providers=Provedores de dados
 setting.about.apisWithFee=A Bisq usa APIs de terceiros para os preços de mercado de moedas fiduciárias e Altcoin, bem como para estimativas de taxas de mineração.
 setting.about.apis=Bisq utiliza APIs de terceiros para os preços de moedas fiduciárias e altcoins.
 setting.about.pricesProvided=Preços de mercado fornecidos por
-setting.about.pricesProviders={0}, {1} e {2}
 setting.about.feeEstimation.label=Taxa de mineração fornecida por
 setting.about.versionDetails=Detalhes da versão
 setting.about.version=Versão do programa

core/src/main/resources/i18n/displayStrings_ru.properties

@@ -242,7 +242,6 @@ mainView.marketPriceWithProvider.label=Рыночный курс {0}
 mainView.marketPrice.bisqInternalPrice=Курс последней сделки в Bisq
 mainView.marketPrice.tooltip.bisqInternalPrice=Нет данных от источника рыночного курса.\nПредоставлен курс последней сделки в Bisq для этой валютной пары.
 mainView.marketPrice.tooltip=Рыночный курс предоставлен {0}{1}\nОбновление: {2}\nURL источника данных: {3}
-mainView.marketPrice.tooltip.altcoinExtra=Если альткойн недоступен на Poloniex, используется https://coinmarketcap.com
 mainView.balance.available=Доступный баланс
 mainView.balance.reserved=Выделено на предложения
 mainView.balance.locked=Используется в сделках
@@ -1015,7 +1014,6 @@ setting.about.providers=Источники данных
 setting.about.apisWithFee=Bisq использует сторонние API для определения рыночного курса валют и альткойнов, а также расчёта комиссии майнера.
 setting.about.apis=Bisq использует сторонние API для определения рыночного курса валют и альткойнов.
 setting.about.pricesProvided=Рыночный курс предоставлен
-setting.about.pricesProviders={0}, {1} и {2}
 setting.about.feeEstimation.label=Расчёт комиссии майнера предоставлен
 setting.about.versionDetails=Подробности версии
 setting.about.version=Версия приложения

core/src/main/resources/i18n/displayStrings_th.properties

@@ -242,7 +242,6 @@ mainView.marketPriceWithProvider.label=ราคาตลาดโดย {0}
 mainView.marketPrice.bisqInternalPrice=ราคาของการซื้อขาย Bisq ล่าสุด
 mainView.marketPrice.tooltip.bisqInternalPrice=ไม่มีราคาตลาดจากผู้ให้บริการด้านราคาภายนอก\nราคาที่แสดงเป็นราคาล่าสุดของ Bisq สำหรับสกุลเงินนั้น
 mainView.marketPrice.tooltip=ราคาตลาดจัดทำโดย {0} {1} \nอัปเดตล่าสุด: {2} \nnode URL ของผู้ให้บริการ: {3}
-mainView.marketPrice.tooltip.altcoinExtra=หาก altcoin ไม่สามารถใช้งานได้ที่ Poloniex ทางเราใช้ https://coinmarketcap.com
 mainView.balance.available=ยอดคงเหลือที่พร้อมใช้งาน
 mainView.balance.reserved=ข้อเสนอได้รับการจองแล้ว
 mainView.balance.locked=ล็อคในการซื้อขาย
@@ -1015,7 +1014,6 @@ setting.about.providers=ผู้ให้บริการข้อมูล
 setting.about.apisWithFee=Bisq ใช้ APIs ของบุคคลที่ 3 สำหรับราคาตลาดของ Fiat และ Altcoin ตลอดจนการประมาณค่าการขุด
 setting.about.apis=Bisq ใช้ APIs ของบุคคลที่ 3 สำหรับ Fiat และ Altcoin ในราคาตลาด
 setting.about.pricesProvided=ราคาตลาดจัดโดย
-setting.about.pricesProviders={0}, {1} และ {2}
 setting.about.feeEstimation.label=การประมาณค่าธรรมเนียมการขุดโดย
 setting.about.versionDetails=รายละเอียดของเวอร์ชั่น
 setting.about.version=เวอร์ชั่นของแอปพลิเคชั่น

core/src/main/resources/i18n/displayStrings_vi.properties

@@ -242,7 +242,6 @@ mainView.marketPriceWithProvider.label=Giá thị trường theo {0}
 mainView.marketPrice.bisqInternalPrice=Giá giao dịch Bisq gần nhất
 mainView.marketPrice.tooltip.bisqInternalPrice=Không có giá thị trường từ nhà cung cấp bên ngoài.\nGiá hiển thị là giá giao dịch Bisq gần nhất với đồng tiền này.
 mainView.marketPrice.tooltip=Giá thị trường được cung cấp bởi {0}{1}\nCập nhật mới nhất: {2}\nURL nút nhà cung cấp: {3}
-mainView.marketPrice.tooltip.altcoinExtra=Nếu altcoin không có trên Poloniex, sử dụng https://coinmarketcap.com
 mainView.balance.available=Số dư hiện có
 mainView.balance.reserved=Phần được bảo lưu trong báo giá
 mainView.balance.locked=Khóa trong giao dịch
@@ -1015,7 +1014,6 @@ setting.about.providers=Nhà cung cấp dữ liệu
 setting.about.apisWithFee=Bisq sử dụng API bên thứ 3 để ước tính giá thị trường Fiat và Altcoin cũng như phí đào.
 setting.about.apis=Bisq sử dụng API bên thứ 3 để ước tính giá thị trường Fiat và Altcoin.
 setting.about.pricesProvided=Giá thị trường cung cấp bởi
-setting.about.pricesProviders={0}, {1} và {2}
 setting.about.feeEstimation.label=Ước tính phí đào cung cấp bởi
 setting.about.versionDetails=Thông tin về phiên bản
 setting.about.version=Phiên bản ứng dụng

core/src/main/resources/i18n/displayStrings_zh-hans.properties

@@ -242,7 +242,6 @@ mainView.marketPriceWithProvider.label=交易所价格提供商：{0}
 mainView.marketPrice.bisqInternalPrice=最新 Bisq 交易的价格
 mainView.marketPrice.tooltip.bisqInternalPrice=外部交易所供应商没有可用的市场价格。\n显示的价格是该货币的最新 Bisq 交易价格。
 mainView.marketPrice.tooltip=交易所价格提供者 {0}{1}\n最后更新：{2}\n提供者节点 URL：{3}
-mainView.marketPrice.tooltip.altcoinExtra=如果数字货币在 Poloniex 不可用，我们使用 https://coinmarketcap.com
 mainView.balance.available=可用余额
 mainView.balance.reserved=保证金
 mainView.balance.locked=冻结余额
@@ -1015,7 +1014,6 @@ setting.about.providers=数据提供商
 setting.about.apisWithFee=Bisq 使用第三方 API 获取法定货币与虚拟币的市场价以及矿工手续费的估价。
 setting.about.apis=Bisq 使用第三方 API 获取法定货币与虚拟币的市场价。
 setting.about.pricesProvided=交易所价格提供商
-setting.about.pricesProviders={0}、{1} 和 {2}
 setting.about.feeEstimation.label=矿工手续费估算提供商
 setting.about.versionDetails=版本详情
 setting.about.version=应用程序版本