mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 15:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3783 from ripcurlx/only-connect-to-localhost-when-detected

Browse source 
Not allow bitcoinj to auto connect to localhost when localhost was not detected by client
This commit is contained in:
sqrrm 2019-12-16 15:03:38 +01:00 • committed by GitHub
commit 65d3dd3c93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/main/java/bisq/core/btc/setup/WalletConfig.java
View file

@ -216,8 +216,6 @@ public class WalletConfig extends AbstractIdleService {
// no proxy case.
if (socks5Proxy == null) {
peerGroup = new PeerGroup(params, vChain);
// For dao testnet (server side regtest) we prevent to connect to a localhost node to avoid confusion
// if local btc node is not synced with our dao testnet master node.
} else {
// proxy case (tor).
Proxy proxy = new Proxy(Proxy.Type.SOCKS,
@ -238,7 +236,9 @@ public class WalletConfig extends AbstractIdleService {
// For dao testnet (server side regtest) we prevent to connect to a localhost node to avoid confusion
// if local btc node is not synced with our dao testnet master node.
if (BisqEnvironment.getBaseCurrencyNetwork().isDaoRegTest() || BisqEnvironment.getBaseCurrencyNetwork().isDaoTestNet())
if (BisqEnvironment.getBaseCurrencyNetwork().isDaoRegTest() ||
BisqEnvironment.getBaseCurrencyNetwork().isDaoTestNet() ||
!bisqEnvironment.isBitcoinLocalhostNodeRunning())
peerGroup.setUseLocalhostPeerWhenPossible(false);
return peerGroup;