From 141f1fd2dbf73038e55cb084232d73575237f99b Mon Sep 17 00:00:00 2001 From: woodser Date: Mon, 31 Jul 2023 10:53:31 -0400 Subject: [PATCH] replace 'btc' with 'xmr' in protobuf definition --- .../main/java/haveno/core/filter/Filter.java | 40 +++++++++---------- .../haveno/core/filter/FilterManager.java | 2 +- .../resources/i18n/displayStrings.properties | 4 +- .../i18n/displayStrings_cs.properties | 4 +- .../i18n/displayStrings_de.properties | 4 +- .../i18n/displayStrings_es.properties | 4 +- .../i18n/displayStrings_fa.properties | 4 +- .../i18n/displayStrings_fr.properties | 4 +- .../i18n/displayStrings_it.properties | 4 +- .../i18n/displayStrings_ja.properties | 4 +- .../i18n/displayStrings_pt-br.properties | 4 +- .../i18n/displayStrings_pt.properties | 4 +- .../i18n/displayStrings_ru.properties | 4 +- .../i18n/displayStrings_th.properties | 4 +- .../i18n/displayStrings_vi.properties | 4 +- .../i18n/displayStrings_zh-hans.properties | 4 +- .../i18n/displayStrings_zh-hant.properties | 4 +- .../main/overlays/windows/FilterWindow.java | 16 ++++---- .../settings/network/NetworkSettingsView.java | 14 +++---- proto/src/main/proto/pb.proto | 4 +- 20 files changed, 68 insertions(+), 68 deletions(-) diff --git a/core/src/main/java/haveno/core/filter/Filter.java b/core/src/main/java/haveno/core/filter/Filter.java index 7b43dd5940..ae6602639f 100644 --- a/core/src/main/java/haveno/core/filter/Filter.java +++ b/core/src/main/java/haveno/core/filter/Filter.java @@ -52,7 +52,7 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload { private final List arbitrators; private final List seedNodes; private final List priceRelayNodes; - private final boolean preventPublicBtcNetwork; + private final boolean preventPublicXmrNetwork; private final List xmrNodes; // SignatureAsBase64 is not set initially as we use the serialized data for signing. We set it after signature is // created by cloning the object with a non-null sig. @@ -69,7 +69,7 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload { private final List bannedAccountWitnessSignerPubKeys; - private final List btcFeeReceiverAddresses; + private final List xmrFeeReceiverAddresses; private final long creationDate; @@ -103,13 +103,13 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload { filter.getArbitrators(), filter.getSeedNodes(), filter.getPriceRelayNodes(), - filter.isPreventPublicBtcNetwork(), + filter.isPreventPublicXmrNetwork(), filter.getXmrNodes(), filter.getDisableTradeBelowVersion(), filter.getMediators(), filter.getRefundAgents(), filter.getBannedAccountWitnessSignerPubKeys(), - filter.getBtcFeeReceiverAddresses(), + filter.getXmrFeeReceiverAddresses(), filter.getOwnerPubKeyBytes(), filter.getCreationDate(), filter.getExtraDataMap(), @@ -133,13 +133,13 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload { filter.getArbitrators(), filter.getSeedNodes(), filter.getPriceRelayNodes(), - filter.isPreventPublicBtcNetwork(), + filter.isPreventPublicXmrNetwork(), filter.getXmrNodes(), filter.getDisableTradeBelowVersion(), filter.getMediators(), filter.getRefundAgents(), filter.getBannedAccountWitnessSignerPubKeys(), - filter.getBtcFeeReceiverAddresses(), + filter.getXmrFeeReceiverAddresses(), filter.getOwnerPubKeyBytes(), filter.getCreationDate(), filter.getExtraDataMap(), @@ -161,13 +161,13 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload { List arbitrators, List seedNodes, List priceRelayNodes, - boolean preventPublicBtcNetwork, + boolean preventPublicXmrNetwork, List xmrNodes, String disableTradeBelowVersion, List mediators, List refundAgents, List bannedAccountWitnessSignerPubKeys, - List btcFeeReceiverAddresses, + List xmrFeeReceiverAddresses, PublicKey ownerPubKey, String signerPubKeyAsHex, List bannedPrivilegedDevPubKeys, @@ -184,13 +184,13 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload { arbitrators, seedNodes, priceRelayNodes, - preventPublicBtcNetwork, + preventPublicXmrNetwork, xmrNodes, disableTradeBelowVersion, mediators, refundAgents, bannedAccountWitnessSignerPubKeys, - btcFeeReceiverAddresses, + xmrFeeReceiverAddresses, Sig.getPublicKeyBytes(ownerPubKey), System.currentTimeMillis(), null, @@ -218,13 +218,13 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload { List arbitrators, List seedNodes, List priceRelayNodes, - boolean preventPublicBtcNetwork, + boolean preventPublicXmrNetwork, List xmrNodes, String disableTradeBelowVersion, List mediators, List refundAgents, List bannedAccountWitnessSignerPubKeys, - List btcFeeReceiverAddresses, + List xmrFeeReceiverAddresses, byte[] ownerPubKeyBytes, long creationDate, @Nullable Map extraDataMap, @@ -244,13 +244,13 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload { this.arbitrators = arbitrators; this.seedNodes = seedNodes; this.priceRelayNodes = priceRelayNodes; - this.preventPublicBtcNetwork = preventPublicBtcNetwork; + this.preventPublicXmrNetwork = preventPublicXmrNetwork; this.xmrNodes = xmrNodes; this.disableTradeBelowVersion = disableTradeBelowVersion; this.mediators = mediators; this.refundAgents = refundAgents; this.bannedAccountWitnessSignerPubKeys = bannedAccountWitnessSignerPubKeys; - this.btcFeeReceiverAddresses = btcFeeReceiverAddresses; + this.xmrFeeReceiverAddresses = xmrFeeReceiverAddresses; this.ownerPubKeyBytes = ownerPubKeyBytes; this.creationDate = creationDate; this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap); @@ -285,13 +285,13 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload { .addAllArbitrators(arbitrators) .addAllSeedNodes(seedNodes) .addAllPriceRelayNodes(priceRelayNodes) - .setPreventPublicBtcNetwork(preventPublicBtcNetwork) + .setPreventPublicXmrNetwork(preventPublicXmrNetwork) .addAllXmrNodes(xmrNodes) .setDisableTradeBelowVersion(disableTradeBelowVersion) .addAllMediators(mediators) .addAllRefundAgents(refundAgents) .addAllBannedSignerPubKeys(bannedAccountWitnessSignerPubKeys) - .addAllBtcFeeReceiverAddresses(btcFeeReceiverAddresses) + .addAllXmrFeeReceiverAddresses(xmrFeeReceiverAddresses) .setOwnerPubKeyBytes(ByteString.copyFrom(ownerPubKeyBytes)) .setSignerPubKeyAsHex(signerPubKeyAsHex) .setCreationDate(creationDate) @@ -322,13 +322,13 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload { ProtoUtil.protocolStringListToList(proto.getArbitratorsList()), ProtoUtil.protocolStringListToList(proto.getSeedNodesList()), ProtoUtil.protocolStringListToList(proto.getPriceRelayNodesList()), - proto.getPreventPublicBtcNetwork(), + proto.getPreventPublicXmrNetwork(), ProtoUtil.protocolStringListToList(proto.getXmrNodesList()), proto.getDisableTradeBelowVersion(), ProtoUtil.protocolStringListToList(proto.getMediatorsList()), ProtoUtil.protocolStringListToList(proto.getRefundAgentsList()), ProtoUtil.protocolStringListToList(proto.getBannedSignerPubKeysList()), - ProtoUtil.protocolStringListToList(proto.getBtcFeeReceiverAddressesList()), + ProtoUtil.protocolStringListToList(proto.getXmrFeeReceiverAddressesList()), proto.getOwnerPubKeyBytes().toByteArray(), proto.getCreationDate(), CollectionUtils.isEmpty(proto.getExtraDataMap()) ? null : proto.getExtraDataMap(), @@ -365,7 +365,7 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload { ",\n arbitrators=" + arbitrators + ",\n seedNodes=" + seedNodes + ",\n priceRelayNodes=" + priceRelayNodes + - ",\n preventPublicBtcNetwork=" + preventPublicBtcNetwork + + ",\n preventPublicXmrNetwork=" + preventPublicXmrNetwork + ",\n xmrNodes=" + xmrNodes + ",\n signatureAsBase64='" + signatureAsBase64 + '\'' + ",\n signerPubKeyAsHex='" + signerPubKeyAsHex + '\'' + @@ -374,7 +374,7 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload { ",\n mediators=" + mediators + ",\n refundAgents=" + refundAgents + ",\n bannedAccountWitnessSignerPubKeys=" + bannedAccountWitnessSignerPubKeys + - ",\n btcFeeReceiverAddresses=" + btcFeeReceiverAddresses + + ",\n xmrFeeReceiverAddresses=" + xmrFeeReceiverAddresses + ",\n creationDate=" + creationDate + ",\n bannedPrivilegedDevPubKeys=" + bannedPrivilegedDevPubKeys + ",\n extraDataMap=" + extraDataMap + diff --git a/core/src/main/java/haveno/core/filter/FilterManager.java b/core/src/main/java/haveno/core/filter/FilterManager.java index 169b209443..0c835e3ee9 100644 --- a/core/src/main/java/haveno/core/filter/FilterManager.java +++ b/core/src/main/java/haveno/core/filter/FilterManager.java @@ -507,7 +507,7 @@ public class FilterManager { providersRepository.applyBannedNodes(priceRelayNodes); //TODO should be moved to client with listening on onFilterAdded - if (newFilter.isPreventPublicBtcNetwork() && + if (newFilter.isPreventPublicXmrNetwork() && preferences.getMoneroNodesOptionOrdinal() == XmrNodes.MoneroNodesOption.PUBLIC.ordinal()) { preferences.setMoneroNodesOptionOrdinal(XmrNodes.MoneroNodesOption.PROVIDED.ordinal()); } diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index bea948144a..2b624c4a1f 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -1916,13 +1916,13 @@ filterWindow.refundAgents=Filtered refund agents (comma sep. onion addresses) filterWindow.seedNode=Filtered seed nodes (comma sep. onion addresses) filterWindow.priceRelayNode=Filtered price relay nodes (comma sep. onion addresses) filterWindow.xmrNode=Filtered Monero nodes (comma sep. addresses + port) -filterWindow.preventPublicBtcNetwork=Prevent usage of public Monero network +filterWindow.preventPublicXmrNetwork=Prevent usage of public Monero network filterWindow.disableAutoConf=Disable auto-confirm filterWindow.autoConfExplorers=Filtered auto-confirm explorers (comma sep. addresses) filterWindow.disableTradeBelowVersion=Min. version required for trading filterWindow.add=Add filter filterWindow.remove=Remove filter -filterWindow.btcFeeReceiverAddresses=BTC fee receiver addresses +filterWindow.xmrFeeReceiverAddresses=BTC fee receiver addresses filterWindow.disableApi=Disable API filterWindow.disableMempoolValidation=Disable Mempool Validation diff --git a/core/src/main/resources/i18n/displayStrings_cs.properties b/core/src/main/resources/i18n/displayStrings_cs.properties index 37dbea6a82..1b64222179 100644 --- a/core/src/main/resources/i18n/displayStrings_cs.properties +++ b/core/src/main/resources/i18n/displayStrings_cs.properties @@ -1421,13 +1421,13 @@ filterWindow.refundAgents=Filtrovaní rozhodci pro vrácení peněz (onion adres filterWindow.seedNode=Filtrované seed nody (onion adresy oddělené čárkami) filterWindow.priceRelayNode=Filtrované cenové relay nody (onion adresy oddělené čárkami) filterWindow.xmrNode=Filtrované Bitcoinové nody (adresy+porty oddělené čárkami) -filterWindow.preventPublicBtcNetwork=Zabraňte použití veřejné bitcoinové sítě +filterWindow.preventPublicXmrNetwork=Zabraňte použití veřejné bitcoinové sítě filterWindow.disableAutoConf=Zakázat automatické potvrzení filterWindow.autoConfExplorers=Filtrované průzkumníky s automatickým potvrzením (adresy oddělené čárkami) filterWindow.disableTradeBelowVersion=Min. verze nutná pro obchodování filterWindow.add=Přidat filtr filterWindow.remove=Zrušit filtr -filterWindow.btcFeeReceiverAddresses=Adresy příjemců poplatků BTC +filterWindow.xmrFeeReceiverAddresses=Adresy příjemců poplatků BTC filterWindow.disableApi=Deaktivovat API filterWindow.disableMempoolValidation=Deaktivovat validaci mempoolu diff --git a/core/src/main/resources/i18n/displayStrings_de.properties b/core/src/main/resources/i18n/displayStrings_de.properties index 1b799b5e2a..e2ea913d52 100644 --- a/core/src/main/resources/i18n/displayStrings_de.properties +++ b/core/src/main/resources/i18n/displayStrings_de.properties @@ -1421,13 +1421,13 @@ filterWindow.refundAgents=Gefilterte Rückerstattungsagenten (mit Komma getr. On filterWindow.seedNode=Gefilterte Seed-Knoten (Komma getr. Onion-Adressen) filterWindow.priceRelayNode=Gefilterte Preisrelais Knoten (Komma getr. Onion-Adressen) filterWindow.xmrNode=Gefilterte Bitcoinknoten (Komma getr. Adresse + Port) -filterWindow.preventPublicBtcNetwork=Nutzung des öffentlichen Bitcoin-Netzwerks verhindern +filterWindow.preventPublicXmrNetwork=Nutzung des öffentlichen Bitcoin-Netzwerks verhindern filterWindow.disableAutoConf=Automatische Bestätigung deaktivieren filterWindow.autoConfExplorers=Gefilterter Explorer mit Auto-Bestätigung (Adressen mit Komma separiert) filterWindow.disableTradeBelowVersion=Min. zum Handeln erforderliche Version filterWindow.add=Filter hinzufügen filterWindow.remove=Filter entfernen -filterWindow.btcFeeReceiverAddresses=BTC Gebühr Empfänger-Adressen +filterWindow.xmrFeeReceiverAddresses=BTC Gebühr Empfänger-Adressen filterWindow.disableApi=API deaktivieren filterWindow.disableMempoolValidation=Disable Mempool Validation diff --git a/core/src/main/resources/i18n/displayStrings_es.properties b/core/src/main/resources/i18n/displayStrings_es.properties index c2c211a5b3..edfa783fe7 100644 --- a/core/src/main/resources/i18n/displayStrings_es.properties +++ b/core/src/main/resources/i18n/displayStrings_es.properties @@ -1421,13 +1421,13 @@ filterWindow.refundAgents=Agentes de devolución de fondos filtrados (direccione filterWindow.seedNode=Nodos semilla filtrados (direcciones onion separadas por coma) filterWindow.priceRelayNode=nodos de retransmisión de precio filtrados (direcciones onion separadas por coma) filterWindow.xmrNode=Nodos Bitcoin filtrados (direcciones + puerto separadas por coma) -filterWindow.preventPublicBtcNetwork=Prevenir uso de la red Bitcoin pública +filterWindow.preventPublicXmrNetwork=Prevenir uso de la red Bitcoin pública filterWindow.disableAutoConf=Deshabilitar autoconfirmación filterWindow.autoConfExplorers=Exploradores de autoconfirmación filtrados (direcciones separadas por coma) filterWindow.disableTradeBelowVersion=Versión mínima requerida para intercambios. filterWindow.add=Añadir filtro filterWindow.remove=Eliminar filtro -filterWindow.btcFeeReceiverAddresses=Direcciones de recepción de la tasa BTC +filterWindow.xmrFeeReceiverAddresses=Direcciones de recepción de la tasa BTC filterWindow.disableApi=Deshabilitar API filterWindow.disableMempoolValidation=Deshabilitar validación de Mempool diff --git a/core/src/main/resources/i18n/displayStrings_fa.properties b/core/src/main/resources/i18n/displayStrings_fa.properties index 09fb690edd..ceda1d4c66 100644 --- a/core/src/main/resources/i18n/displayStrings_fa.properties +++ b/core/src/main/resources/i18n/displayStrings_fa.properties @@ -1421,13 +1421,13 @@ filterWindow.refundAgents=Filtered refund agents (comma sep. onion addresses) filterWindow.seedNode=گره های seed فیلتر شده (آدرس های Onion جدا شده با ویرگول) filterWindow.priceRelayNode=گره های رله قیمت فیلترشده (آدرس های Onion جدا شده با ویرگول) filterWindow.xmrNode=گره‌های بیت‌کوین فیلترشده (آدرس + پورت جدا شده با ویرگول) -filterWindow.preventPublicBtcNetwork=جلوگیری از استفاده ازشبکه عمومی بیت‌کوین +filterWindow.preventPublicXmrNetwork=جلوگیری از استفاده ازشبکه عمومی بیت‌کوین filterWindow.disableAutoConf=Disable auto-confirm filterWindow.autoConfExplorers=Filtered auto-confirm explorers (comma sep. addresses) filterWindow.disableTradeBelowVersion=Min. version required for trading filterWindow.add=افزودن فیلتر filterWindow.remove=حذف فیلتر -filterWindow.btcFeeReceiverAddresses=BTC fee receiver addresses +filterWindow.xmrFeeReceiverAddresses=BTC fee receiver addresses filterWindow.disableApi=Disable API filterWindow.disableMempoolValidation=Disable Mempool Validation diff --git a/core/src/main/resources/i18n/displayStrings_fr.properties b/core/src/main/resources/i18n/displayStrings_fr.properties index fb9541a99c..b06f3fe34d 100644 --- a/core/src/main/resources/i18n/displayStrings_fr.properties +++ b/core/src/main/resources/i18n/displayStrings_fr.properties @@ -1422,13 +1422,13 @@ filterWindow.refundAgents=Agents de remboursement filtrés (adresses onion sep. filterWindow.seedNode=Nœuds de seed filtrés (adresses onion séparées par une virgule) filterWindow.priceRelayNode=Nœuds relais avec prix filtrés (adresses onion séparées par une virgule) filterWindow.xmrNode=Nœuds Bitcoin filtrés (adresses séparées par une virgule + port) -filterWindow.preventPublicBtcNetwork=Empêcher l'utilisation du réseau public Bitcoin +filterWindow.preventPublicXmrNetwork=Empêcher l'utilisation du réseau public Bitcoin filterWindow.disableAutoConf=Désactiver la confirmation automatique filterWindow.autoConfExplorers=Explorateur d'auto-confirmations filtrés (addresses à virgule de séparation) filterWindow.disableTradeBelowVersion=Version min. nécessaire pour pouvoir échanger filterWindow.add=Ajouter le filtre filterWindow.remove=Retirer le filtre -filterWindow.btcFeeReceiverAddresses=Adresse de réception des frais BTC +filterWindow.xmrFeeReceiverAddresses=Adresse de réception des frais BTC filterWindow.disableApi=Désactiver l'API filterWindow.disableMempoolValidation=Désactiver la validation du Mempool diff --git a/core/src/main/resources/i18n/displayStrings_it.properties b/core/src/main/resources/i18n/displayStrings_it.properties index d2290f5427..89800c86ba 100644 --- a/core/src/main/resources/i18n/displayStrings_it.properties +++ b/core/src/main/resources/i18n/displayStrings_it.properties @@ -1421,13 +1421,13 @@ filterWindow.refundAgents=Agenti di rimborso filtrati (virgola sep. indirizzi on filterWindow.seedNode=Nodi seme filtrati (separati con una virgola) filterWindow.priceRelayNode=Prezzo filtrato dai nodi relay (virgola sep. indirizzi onion) filterWindow.xmrNode=Nodi Bitcoin filtrati (indirizzo + porta separati con una virgola) -filterWindow.preventPublicBtcNetwork=Impedisci l'utilizzo della rete pubblica Bitcoin +filterWindow.preventPublicXmrNetwork=Impedisci l'utilizzo della rete pubblica Bitcoin filterWindow.disableAutoConf=Disable auto-confirm filterWindow.autoConfExplorers=Filtered auto-confirm explorers (comma sep. addresses) filterWindow.disableTradeBelowVersion=Versione minima richiesta per il trading filterWindow.add=Aggiungi filtro filterWindow.remove=Rimuovi filtro -filterWindow.btcFeeReceiverAddresses=BTC fee receiver addresses +filterWindow.xmrFeeReceiverAddresses=BTC fee receiver addresses filterWindow.disableApi=Disable API filterWindow.disableMempoolValidation=Disable Mempool Validation diff --git a/core/src/main/resources/i18n/displayStrings_ja.properties b/core/src/main/resources/i18n/displayStrings_ja.properties index 5659e28e8d..3f6429c207 100644 --- a/core/src/main/resources/i18n/displayStrings_ja.properties +++ b/core/src/main/resources/i18n/displayStrings_ja.properties @@ -1421,13 +1421,13 @@ filterWindow.refundAgents=フィルター済仲裁人（コンマ区切り onion filterWindow.seedNode=フィルター済シードノード（コンマ区切り onionアドレス） filterWindow.priceRelayNode=フィルター済価格中継ノード（コンマ区切り onionアドレス） filterWindow.xmrNode=フィルター済ビットコインノード（コンマ区切り アドレス＋ポート） -filterWindow.preventPublicBtcNetwork=パブリックビットコインネットワークの使用を防止 +filterWindow.preventPublicXmrNetwork=パブリックビットコインネットワークの使用を防止 filterWindow.disableAutoConf=自動確認を無効にする filterWindow.autoConfExplorers=フィルター済自動確認エクスプローラ（コンマ区切りアドレス） filterWindow.disableTradeBelowVersion=トレードに必要な最低バージョン filterWindow.add=フィルターを追加 filterWindow.remove=フィルターを削除 -filterWindow.btcFeeReceiverAddresses=BTC手数料受信アドレス +filterWindow.xmrFeeReceiverAddresses=BTC手数料受信アドレス filterWindow.disableApi=APIを無効化 filterWindow.disableMempoolValidation=Disable Mempool Validation diff --git a/core/src/main/resources/i18n/displayStrings_pt-br.properties b/core/src/main/resources/i18n/displayStrings_pt-br.properties index 0949476ec2..e28a24a08b 100644 --- a/core/src/main/resources/i18n/displayStrings_pt-br.properties +++ b/core/src/main/resources/i18n/displayStrings_pt-br.properties @@ -1426,13 +1426,13 @@ filterWindow.refundAgents=Agentes de reembolso filtrados (endereços onion separ filterWindow.seedNode=Nós de semente filtrados (endereços onion sep. por vírgula) filterWindow.priceRelayNode=Nós de transmissão de preço filtrados (endereços onion sep. por vírgula) filterWindow.xmrNode=Nós de Bitcoin filtrados (endereços + portas sep. por vírgula) -filterWindow.preventPublicBtcNetwork=Prevenir uso da rede de Bitcoin pública +filterWindow.preventPublicXmrNetwork=Prevenir uso da rede de Bitcoin pública filterWindow.disableAutoConf=Disable auto-confirm filterWindow.autoConfExplorers=Filtered auto-confirm explorers (comma sep. addresses) filterWindow.disableTradeBelowVersion=Versão mínima necessária para negociação filterWindow.add=Adicionar filtro filterWindow.remove=Remover filtro -filterWindow.btcFeeReceiverAddresses=BTC fee receiver addresses +filterWindow.xmrFeeReceiverAddresses=BTC fee receiver addresses filterWindow.disableApi=Disable API filterWindow.disableMempoolValidation=Disable Mempool Validation diff --git a/core/src/main/resources/i18n/displayStrings_pt.properties b/core/src/main/resources/i18n/displayStrings_pt.properties index 4b79d526f9..35f8258c29 100644 --- a/core/src/main/resources/i18n/displayStrings_pt.properties +++ b/core/src/main/resources/i18n/displayStrings_pt.properties @@ -1421,13 +1421,13 @@ filterWindow.refundAgents=Agentes de reembolso filtrados (endereços onion sep. filterWindow.seedNode=Nós de semente filtrados (endereços onion sep. por vírgula) filterWindow.priceRelayNode=Nós de transmissão de preço filtrados (endereços onion sep. por vírgula) filterWindow.xmrNode=Nós de Bitcoin filtrados (endereços + portas sep. por vírgula) -filterWindow.preventPublicBtcNetwork=Prevenir uso da rede de Bitcoin pública +filterWindow.preventPublicXmrNetwork=Prevenir uso da rede de Bitcoin pública filterWindow.disableAutoConf=Disable auto-confirm filterWindow.autoConfExplorers=Filtered auto-confirm explorers (comma sep. addresses) filterWindow.disableTradeBelowVersion=Mín. versão necessária para negociação filterWindow.add=Adicionar filtro filterWindow.remove=Remover filtro -filterWindow.btcFeeReceiverAddresses=BTC fee receiver addresses +filterWindow.xmrFeeReceiverAddresses=BTC fee receiver addresses filterWindow.disableApi=Disable API filterWindow.disableMempoolValidation=Disable Mempool Validation diff --git a/core/src/main/resources/i18n/displayStrings_ru.properties b/core/src/main/resources/i18n/displayStrings_ru.properties index 3d9cb4b1ac..9800da3d27 100644 --- a/core/src/main/resources/i18n/displayStrings_ru.properties +++ b/core/src/main/resources/i18n/displayStrings_ru.properties @@ -1421,13 +1421,13 @@ filterWindow.refundAgents=Filtered refund agents (comma sep. onion addresses) filterWindow.seedNode=Отфильтрованные исходные узлы (onion-адреса через запят.) filterWindow.priceRelayNode=Отфильтрованные ретрансляторы курса (onion-адреса через запят.) filterWindow.xmrNode=Отфильтрованные узлы Биткойн (адреса + порты через запят.) -filterWindow.preventPublicBtcNetwork=Не использовать общедоступную сеть Биткойн +filterWindow.preventPublicXmrNetwork=Не использовать общедоступную сеть Биткойн filterWindow.disableAutoConf=Disable auto-confirm filterWindow.autoConfExplorers=Filtered auto-confirm explorers (comma sep. addresses) filterWindow.disableTradeBelowVersion=Мин. версия, необходимая для торговли filterWindow.add=Добавить фильтр filterWindow.remove=Удалить фильтр -filterWindow.btcFeeReceiverAddresses=BTC fee receiver addresses +filterWindow.xmrFeeReceiverAddresses=BTC fee receiver addresses filterWindow.disableApi=Disable API filterWindow.disableMempoolValidation=Disable Mempool Validation diff --git a/core/src/main/resources/i18n/displayStrings_th.properties b/core/src/main/resources/i18n/displayStrings_th.properties index 25e56abab1..33258bbc9d 100644 --- a/core/src/main/resources/i18n/displayStrings_th.properties +++ b/core/src/main/resources/i18n/displayStrings_th.properties @@ -1421,13 +1421,13 @@ filterWindow.refundAgents=Filtered refund agents (comma sep. onion addresses) filterWindow.seedNode=แหล่งข้อมูลในโหนดเครือข่ายที่ได้รับการกรอง (คั่นด้วยเครื่องหมายจุลภาค ที่อยู่ onion) filterWindow.priceRelayNode=โหนดผลัดเปลี่ยนราคาที่ได้รับการกรอง (คั่นด้วยเครื่องหมายจุลภาค ที่อยู่ onion) filterWindow.xmrNode=โหนด Bitcoin ที่ได้รับการกรองแล้ว (คั่นด้วยเครื่องหมายจุลภาค ที่อยู่ + พอร์ต) -filterWindow.preventPublicBtcNetwork=ป้องกันการใช้เครือข่าย Bitcoin สาธารณะ +filterWindow.preventPublicXmrNetwork=ป้องกันการใช้เครือข่าย Bitcoin สาธารณะ filterWindow.disableAutoConf=Disable auto-confirm filterWindow.autoConfExplorers=Filtered auto-confirm explorers (comma sep. addresses) filterWindow.disableTradeBelowVersion=Min. version required for trading filterWindow.add=เพิ่มตัวกรอง filterWindow.remove=ลบตัวกรอง -filterWindow.btcFeeReceiverAddresses=BTC fee receiver addresses +filterWindow.xmrFeeReceiverAddresses=BTC fee receiver addresses filterWindow.disableApi=Disable API filterWindow.disableMempoolValidation=Disable Mempool Validation diff --git a/core/src/main/resources/i18n/displayStrings_vi.properties b/core/src/main/resources/i18n/displayStrings_vi.properties index c169d98579..ba3f4ed148 100644 --- a/core/src/main/resources/i18n/displayStrings_vi.properties +++ b/core/src/main/resources/i18n/displayStrings_vi.properties @@ -1423,13 +1423,13 @@ filterWindow.refundAgents=Filtered refund agents (comma sep. onion addresses) filterWindow.seedNode=Node cung cấp thông tin đã lọc (địa chỉ onion cách nhau bằng dấu phẩy) filterWindow.priceRelayNode=nút rơle giá đã lọc (địa chỉ onion cách nhau bằng dấu phẩy) filterWindow.xmrNode=nút Bitcoin đã lọc (địa chỉ cách nhau bằng dấu phẩy + cửa) -filterWindow.preventPublicBtcNetwork=Ngăn sử dụng mạng Bitcoin công cộng +filterWindow.preventPublicXmrNetwork=Ngăn sử dụng mạng Bitcoin công cộng filterWindow.disableAutoConf=Disable auto-confirm filterWindow.autoConfExplorers=Filtered auto-confirm explorers (comma sep. addresses) filterWindow.disableTradeBelowVersion=Phiên bản tối thiể yêu cầu cho giao dịch filterWindow.add=Thêm bộ lọc filterWindow.remove=Gỡ bỏ bộ lọc -filterWindow.btcFeeReceiverAddresses=BTC fee receiver addresses +filterWindow.xmrFeeReceiverAddresses=BTC fee receiver addresses filterWindow.disableApi=Disable API filterWindow.disableMempoolValidation=Disable Mempool Validation diff --git a/core/src/main/resources/i18n/displayStrings_zh-hans.properties b/core/src/main/resources/i18n/displayStrings_zh-hans.properties index 90ce2deba8..1955068872 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hans.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hans.properties @@ -1422,13 +1422,13 @@ filterWindow.refundAgents=筛选后的退款助理（用逗号“,”隔开的 filterWindow.seedNode=筛选后的种子节点（用逗号“,”隔开的洋葱地址） filterWindow.priceRelayNode=筛选后的价格中继节点（用逗号“,”隔开的洋葱地址） filterWindow.xmrNode=筛选后的比特币节点（用逗号“,”隔开的地址+端口） -filterWindow.preventPublicBtcNetwork=禁止使用公共比特币网络 +filterWindow.preventPublicXmrNetwork=禁止使用公共比特币网络 filterWindow.disableAutoConf=禁用自动确认 filterWindow.autoConfExplorers=已过滤自动确认浏览器（逗号分隔地址） filterWindow.disableTradeBelowVersion=交易最低所需要的版本 filterWindow.add=添加筛选 filterWindow.remove=移除筛选 -filterWindow.btcFeeReceiverAddresses=比特币手续费接收地址 +filterWindow.xmrFeeReceiverAddresses=比特币手续费接收地址 filterWindow.disableApi=Disable API filterWindow.disableMempoolValidation=Disable Mempool Validation diff --git a/core/src/main/resources/i18n/displayStrings_zh-hant.properties b/core/src/main/resources/i18n/displayStrings_zh-hant.properties index 6dd97b9f21..7c4fcdeee8 100644 --- a/core/src/main/resources/i18n/displayStrings_zh-hant.properties +++ b/core/src/main/resources/i18n/displayStrings_zh-hant.properties @@ -1422,13 +1422,13 @@ filterWindow.refundAgents=篩選後的退款助理（用逗號“,”隔開的 filterWindow.seedNode=篩選後的種子節點（用逗號“,”隔開的洋葱地址） filterWindow.priceRelayNode=篩選後的價格中繼節點（用逗號“,”隔開的洋葱地址） filterWindow.xmrNode=篩選後的比特幣節點（用逗號“,”隔開的地址+端口） -filterWindow.preventPublicBtcNetwork=禁止使用公共比特幣網絡 +filterWindow.preventPublicXmrNetwork=禁止使用公共比特幣網絡 filterWindow.disableAutoConf=禁用自動確認 filterWindow.autoConfExplorers=已過濾自動確認瀏覽器（逗號分隔地址） filterWindow.disableTradeBelowVersion=交易最低所需要的版本 filterWindow.add=添加篩選 filterWindow.remove=移除篩選 -filterWindow.btcFeeReceiverAddresses=比特幣手續費接收地址 +filterWindow.xmrFeeReceiverAddresses=比特幣手續費接收地址 filterWindow.disableApi=Disable API filterWindow.disableMempoolValidation=Disable Mempool Validation diff --git a/desktop/src/main/java/haveno/desktop/main/overlays/windows/FilterWindow.java b/desktop/src/main/java/haveno/desktop/main/overlays/windows/FilterWindow.java index 57cad82c6b..e0a3a7ec53 100644 --- a/desktop/src/main/java/haveno/desktop/main/overlays/windows/FilterWindow.java +++ b/desktop/src/main/java/haveno/desktop/main/overlays/windows/FilterWindow.java @@ -139,16 +139,16 @@ public class FilterWindow extends Overlay { Res.get("filterWindow.mediators")); InputTextField refundAgentsTF = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.refundAgents")); - InputTextField btcFeeReceiverAddressesTF = addInputTextField(gridPane, ++rowIndex, - Res.get("filterWindow.btcFeeReceiverAddresses")); + InputTextField xmrFeeReceiverAddressesTF = addInputTextField(gridPane, ++rowIndex, + Res.get("filterWindow.xmrFeeReceiverAddresses")); InputTextField seedNodesTF = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.seedNode")); InputTextField priceRelayNodesTF = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.priceRelayNode")); InputTextField xmrNodesTF = addInputTextField(gridPane, ++rowIndex, Res.get("filterWindow.xmrNode")); - CheckBox preventPublicBtcNetworkCheckBox = addLabelCheckBox(gridPane, ++rowIndex, - Res.get("filterWindow.preventPublicBtcNetwork")); + CheckBox preventPublicXmrNetworkCheckBox = addLabelCheckBox(gridPane, ++rowIndex, + Res.get("filterWindow.preventPublicXmrNetwork")); CheckBox disableAutoConfCheckBox = addLabelCheckBox(gridPane, ++rowIndex, Res.get("filterWindow.disableAutoConf")); InputTextField disableTradeBelowVersionTF = addInputTextField(gridPane, ++rowIndex, @@ -174,14 +174,14 @@ public class FilterWindow extends Overlay { setupFieldFromList(arbitratorsTF, filter.getArbitrators()); setupFieldFromList(mediatorsTF, filter.getMediators()); setupFieldFromList(refundAgentsTF, filter.getRefundAgents()); - setupFieldFromList(btcFeeReceiverAddressesTF, filter.getBtcFeeReceiverAddresses()); + setupFieldFromList(xmrFeeReceiverAddressesTF, filter.getXmrFeeReceiverAddresses()); setupFieldFromList(seedNodesTF, filter.getSeedNodes()); setupFieldFromList(priceRelayNodesTF, filter.getPriceRelayNodes()); setupFieldFromList(xmrNodesTF, filter.getXmrNodes()); setupFieldFromList(bannedPrivilegedDevPubKeysTF, filter.getBannedPrivilegedDevPubKeys()); setupFieldFromList(autoConfExplorersTF, filter.getBannedAutoConfExplorers()); - preventPublicBtcNetworkCheckBox.setSelected(filter.isPreventPublicBtcNetwork()); + preventPublicXmrNetworkCheckBox.setSelected(filter.isPreventPublicXmrNetwork()); disableAutoConfCheckBox.setSelected(filter.isDisableAutoConf()); disableTradeBelowVersionTF.setText(filter.getDisableTradeBelowVersion()); disableMempoolValidationCheckBox.setSelected(filter.isDisableMempoolValidation()); @@ -205,13 +205,13 @@ public class FilterWindow extends Overlay { readAsList(arbitratorsTF), readAsList(seedNodesTF), readAsList(priceRelayNodesTF), - preventPublicBtcNetworkCheckBox.isSelected(), + preventPublicXmrNetworkCheckBox.isSelected(), readAsList(xmrNodesTF), disableTradeBelowVersionTF.getText(), readAsList(mediatorsTF), readAsList(refundAgentsTF), readAsList(bannedAccountWitnessSignerPubKeysTF), - readAsList(btcFeeReceiverAddressesTF), + readAsList(xmrFeeReceiverAddressesTF), filterManager.getOwnerPubKey(), signerPubKeyAsHex, readAsList(bannedPrivilegedDevPubKeysTF), diff --git a/desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.java b/desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.java index cc9ce3bee6..9fdb89f802 100644 --- a/desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.java +++ b/desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.java @@ -251,7 +251,7 @@ public class NetworkSettingsView extends ActivatableView { showShutDownPopup(); } }; - filterPropertyListener = (observable, oldValue, newValue) -> applyPreventPublicBtcNetwork(); + filterPropertyListener = (observable, oldValue, newValue) -> applyPreventPublicXmrNetwork(); //TODO sorting needs other NetworkStatisticListItem as columns type /* creationDateColumn.setComparator((o1, o2) -> @@ -267,7 +267,7 @@ public class NetworkSettingsView extends ActivatableView { moneroPeersToggleGroup.selectedToggleProperty().addListener(moneroPeersToggleGroupListener); if (filterManager.getFilter() != null) - applyPreventPublicBtcNetwork(); + applyPreventPublicXmrNetwork(); filterManager.filterProperty().addListener(filterPropertyListener); @@ -358,7 +358,7 @@ public class NetworkSettingsView extends ActivatableView { private boolean isPreventPublicXmrNetwork() { return filterManager.getFilter() != null && - filterManager.getFilter().isPreventPublicBtcNetwork(); + filterManager.getFilter().isPreventPublicXmrNetwork(); } private void selectMoneroPeersToggle() { @@ -450,10 +450,10 @@ public class NetworkSettingsView extends ActivatableView { } - private void applyPreventPublicBtcNetwork() { - final boolean preventPublicBtcNetwork = isPreventPublicXmrNetwork(); - usePublicNodesRadio.setDisable(localBitcoinNode.shouldBeUsed() || preventPublicBtcNetwork); - if (preventPublicBtcNetwork && selectedMoneroNodesOption == XmrNodes.MoneroNodesOption.PUBLIC) { + private void applyPreventPublicXmrNetwork() { + final boolean preventPublicXmrNetwork = isPreventPublicXmrNetwork(); + usePublicNodesRadio.setDisable(localBitcoinNode.shouldBeUsed() || preventPublicXmrNetwork); + if (preventPublicXmrNetwork && selectedMoneroNodesOption == XmrNodes.MoneroNodesOption.PUBLIC) { selectedMoneroNodesOption = XmrNodes.MoneroNodesOption.PROVIDED; preferences.setMoneroNodesOptionOrdinal(selectedMoneroNodesOption.ordinal()); selectMoneroPeersToggle(); diff --git a/proto/src/main/proto/pb.proto b/proto/src/main/proto/pb.proto index dea63c2b91..9c00dbd359 100644 --- a/proto/src/main/proto/pb.proto +++ b/proto/src/main/proto/pb.proto @@ -562,13 +562,13 @@ message Filter { repeated string arbitrators = 9; repeated string seed_nodes = 10; repeated string price_relay_nodes = 11; - bool prevent_public_btc_network = 12; + bool prevent_public_xmr_network = 12; repeated string xmr_nodes = 13; string disable_trade_below_version = 14; repeated string mediators = 15; repeated string refundAgents = 16; repeated string bannedSignerPubKeys = 17; - repeated string btc_fee_receiver_addresses = 18; + repeated string xmr_fee_receiver_addresses = 18; int64 creation_date = 19; string signer_pub_key_as_hex = 20; repeated string bannedPrivilegedDevPubKeys = 21;