From 5b3d521e366770abb08fb395eb87f967203748ee Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 2 Dec 2018 01:18:58 +0100 Subject: [PATCH 1/2] Imprve text and actiavte chainSyncIndicator when not synced --- core/src/main/resources/i18n/displayStrings.properties | 4 ++-- .../main/java/bisq/desktop/main/dao/wallet/tx/BsqTxView.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index b8f360b4f64..02726664158 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -1660,8 +1660,8 @@ dao.wallet.send.send=Send BSQ funds dao.wallet.send.sendBtc=Send BTC funds dao.wallet.send.sendFunds.headline=Confirm withdrawal request dao.wallet.send.sendFunds.details=Sending: {0}\nTo receiving address: {1}.\nRequired transaction fee is: {2} ({3} satoshis/byte)\nTransaction size: {4} Kb\n\nThe recipient will receive: {5}\n\nAre you sure you want to withdraw that amount? -dao.wallet.chainHeightSynced=Synchronized up to block:{0} (latest block: {1}) -dao.wallet.chainHeightSyncing=Synchronizing block: {0} (latest block: {1}) +dao.wallet.chainHeightSynced=Latest verified block: {0} +dao.wallet.chainHeightSyncing=Awaiting blocks... Verified {0} blocks out of {1} dao.wallet.tx.type=Type # suppress inspection "UnusedProperty" diff --git a/desktop/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxView.java b/desktop/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxView.java index a16a9f3d3a4..0eba49dc6e3 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxView.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/wallet/tx/BsqTxView.java @@ -239,8 +239,8 @@ private void onUpdateAnyChainHeight() { final boolean synced = bsqWalletChainHeight == bsqBlockChainHeight; chainSyncIndicator.setVisible(!synced); chainSyncIndicator.setManaged(!synced); - if (bsqBlockChainHeight > 0) - chainSyncIndicator.setProgress((double) bsqBlockChainHeight / (double) bsqWalletChainHeight); + if (bsqBlockChainHeight != bsqWalletChainHeight) + chainSyncIndicator.setProgress(-1); if (synced) { chainHeightLabel.setText(Res.get("dao.wallet.chainHeightSynced", From fe458bce129b1ad7c1013ddd8c4ede0a10ec0fe9 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 2 Dec 2018 13:36:47 +0100 Subject: [PATCH 2/2] Don't use tor for BitcoinJ if testnet --- core/src/main/java/bisq/core/user/Preferences.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/bisq/core/user/Preferences.java b/core/src/main/java/bisq/core/user/Preferences.java index 8a21523c9d9..04e7d378830 100644 --- a/core/src/main/java/bisq/core/user/Preferences.java +++ b/core/src/main/java/bisq/core/user/Preferences.java @@ -692,9 +692,9 @@ public boolean showAgain(String key) { } public boolean getUseTorForBitcoinJ() { - // We override the useTorForBitcoinJ and set to false if we have bitcoinNodes set - // This check includes localhost, so we also override useTorForBitcoinJ - if (BisqEnvironment.getBaseCurrencyNetwork().isRegtest() + // We override the useTorForBitcoinJ and set it to false if we detected a localhost node or if we are not on mainnet. + // At testnet there are very few Bitcoin tor nodes and we don't provide tor nodes. + if (!BisqEnvironment.getBaseCurrencyNetwork().isMainnet() || bisqEnvironment.isBitcoinLocalhostNodeRunning()) return false; else