nihilist/haveno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace 'btc' with 'xmr' in protobuf definition

Browse Source
This commit is contained in:
woodser 2023-07-31 10:53:31 -04:00
parent 2a3c52b943
commit 141f1fd2db
20 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
core/src/main/java/haveno/core/filter/Filter.java
View File

@ -52,7 +52,7 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload {
private final List<String> arbitrators;
private final List<String> seedNodes;
private final List<String> priceRelayNodes;
private final boolean preventPublicBtcNetwork;
private final boolean preventPublicXmrNetwork;
private final List<String> 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<String> bannedAccountWitnessSignerPubKeys;
private final List<String> btcFeeReceiverAddresses;
private final List<String> 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<String> arbitrators,
List<String> seedNodes,
List<String> priceRelayNodes,
boolean preventPublicBtcNetwork,
boolean preventPublicXmrNetwork,
List<String> xmrNodes,
String disableTradeBelowVersion,
List<String> mediators,
List<String> refundAgents,
List<String> bannedAccountWitnessSignerPubKeys,
List<String> btcFeeReceiverAddresses,
List<String> xmrFeeReceiverAddresses,
PublicKey ownerPubKey,
String signerPubKeyAsHex,
List<String> 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<String> arbitrators,
List<String> seedNodes,
List<String> priceRelayNodes,
boolean preventPublicBtcNetwork,
boolean preventPublicXmrNetwork,
List<String> xmrNodes,
String disableTradeBelowVersion,
List<String> mediators,
List<String> refundAgents,
List<String> bannedAccountWitnessSignerPubKeys,
List<String> btcFeeReceiverAddresses,
List<String> xmrFeeReceiverAddresses,
byte[] ownerPubKeyBytes,
long creationDate,
@Nullable Map<String, String> 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 +

2
core/src/main/java/haveno/core/filter/FilterManager.java
View File

@ -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());
}

4
core/src/main/resources/i18n/displayStrings.properties
View File

@ -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

4
core/src/main/resources/i18n/displayStrings_cs.properties
View File

@ -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

4
core/src/main/resources/i18n/displayStrings_de.properties
View File

@ -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

4
core/src/main/resources/i18n/displayStrings_es.properties
View File

@ -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

4
core/src/main/resources/i18n/displayStrings_fa.properties
View File

@ -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

4
core/src/main/resources/i18n/displayStrings_fr.properties
View File

@ -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

4
core/src/main/resources/i18n/displayStrings_it.properties
View File

@ -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

4
core/src/main/resources/i18n/displayStrings_ja.properties
View File

@ -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

4
core/src/main/resources/i18n/displayStrings_pt-br.properties
View File

@ -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

4
core/src/main/resources/i18n/displayStrings_pt.properties
View File

@ -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

4
core/src/main/resources/i18n/displayStrings_ru.properties
View File

@ -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

4
core/src/main/resources/i18n/displayStrings_th.properties
View File

@ -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

4
core/src/main/resources/i18n/displayStrings_vi.properties
View File

@ -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

4
core/src/main/resources/i18n/displayStrings_zh-hans.properties
View File

@ -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

4
core/src/main/resources/i18n/displayStrings_zh-hant.properties
View File

@ -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

16
desktop/src/main/java/haveno/desktop/main/overlays/windows/FilterWindow.java
View File

@ -139,16 +139,16 @@ public class FilterWindow extends Overlay<FilterWindow> {
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<FilterWindow> {
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<FilterWindow> {
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),

14
desktop/src/main/java/haveno/desktop/main/settings/network/NetworkSettingsView.java
View File

@ -251,7 +251,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
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<GridPane, Void> {
moneroPeersToggleGroup.selectedToggleProperty().addListener(moneroPeersToggleGroupListener);
if (filterManager.getFilter() != null)
applyPreventPublicBtcNetwork();
applyPreventPublicXmrNetwork();
filterManager.filterProperty().addListener(filterPropertyListener);
@ -358,7 +358,7 @@ public class NetworkSettingsView extends ActivatableView<GridPane, Void> {
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<GridPane, Void> {
}
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();

4
proto/src/main/proto/pb.proto
View File

@ -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;