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

Set ineetAddress for BTC onion peers in PeerAddress to avoid nullpointer at wallet persistance

Browse source
This commit is contained in:
Manfred Karrer 2017-11-14 17:19:23 -05:00
parent 8f57a95976
commit e9193316df
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
core/src/main/java/io/bisq/core/btc/wallet/WalletsSetup.java
View file

@ -39,6 +39,7 @@ import javafx.beans.property.*;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.bitcoinj.core.*; import org.bitcoinj.core.*;
import org.bitcoinj.core.listeners.DownloadProgressTracker; import org.bitcoinj.core.listeners.DownloadProgressTracker;
import org.bitcoinj.net.OnionCat;
import org.bitcoinj.params.RegTestParams; import org.bitcoinj.params.RegTestParams;
import org.bitcoinj.utils.Threading; import org.bitcoinj.utils.Threading;
import org.bitcoinj.wallet.DeterministicSeed; import org.bitcoinj.wallet.DeterministicSeed;
@ -297,7 +298,22 @@ public class WalletsSetup {
if (btcNode.isHiddenService()) { if (btcNode.isHiddenService()) {
// no DNS lookup for onion addresses // no DNS lookup for onion addresses
log.info("We add a onion node with btcNode={}", btcNode); log.info("We add a onion node with btcNode={}", btcNode);
peerAddressList.add(new PeerAddress(btcNode.getHostName(), btcNode.getPort())); final String hostName = btcNode.getHostName();
if (hostName != null) {
try {
// OnionCat.onionHostToInetAddress converts onion to ipv6 representation
final InetAddress inetAddress = OnionCat.onionHostToInetAddress(hostName);
final PeerAddress peerAddress = new PeerAddress(hostName, btcNode.getPort());
// inetAddress is not used but required for wallet persistence. Throws nullpointer if not set.
peerAddress.setAddr(inetAddress);
peerAddressList.add(peerAddress);
} catch (UnknownHostException e) {
log.error("OnionCat.onionHostToInetAddress() failed with btcNode={}, error={}", btcNode.toString(), e.toString());
e.printStackTrace();
}
} else {
log.error("hostName is null for btcNode={}", btcNode.toString());
}
} else { } else {
try { try {
// We use DnsLookupTor to not leak with DNS lookup // We use DnsLookupTor to not leak with DNS lookup