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

Added initial implementation of BtcNodeConverter class

Browse source
This commit is contained in:
Sergey Rozhnov 2018-02-06 17:17:10 +04:00
parent 88e7fddc58
commit b899304613
2 changed files with 55 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
core/src/main/java/io/bisq/core/btc/wallet/BtcNodeConverter.java Normal file
View file

@ -0,0 +1,41 @@
package io.bisq.core.btc.wallet;
import io.bisq.core.btc.BitcoinNodes.BtcNode;
import org.bitcoinj.core.PeerAddress;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Nullable;
import java.net.InetSocketAddress;
class BtcNodeConverter {
private static final Logger log = LoggerFactory.getLogger(BtcNodeConverter.class);
@Nullable
PeerAddress convertClearNode(BtcNode node) {
int port = node.getPort();
PeerAddress result = create(node.getHostNameOrAddress(), port);
if (result == null) {
String address = node.getAddress();
if (address != null) {
result = create(address, port);
} else {
log.warn("Lookup failed, no ip address for node", node);
}
}
return result;
}
@Nullable
private static PeerAddress create(String hostName, int port) {
try {
InetSocketAddress address = new InetSocketAddress(hostName, port);
return new PeerAddress(address.getAddress(), address.getPort());
} catch (Throwable t) {
log.error("Failed to create peer address", t);
return null;
}
}
}

36
core/src/main/java/io/bisq/core/btc/wallet/ConfigPeerNodes.java
View file

@ -13,11 +13,15 @@ import org.bitcoinj.params.MainNetParams;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.annotation.Nullable;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static com.google.common.base.Preconditions.checkNotNull;
@ -32,6 +36,7 @@ class ConfigPeerNodes {
private final int socks5DiscoverMode;
private final boolean useAllProvidedNodes;
private final BitcoinNodes bitcoinNodes;
private final BtcNodeConverter btcNodeConverter;
private void configPeerNodes(Socks5Proxy socks5Proxy) {
List<BitcoinNodes.BtcNode> btcNodeList = getBtcNodes();
@ -145,30 +150,17 @@ class ConfigPeerNodes {
});
}
} else {
btcNodeList.stream()
.filter(BitcoinNodes.BtcNode::hasClearNetAddress)
.forEach(btcNode -> {
try {
InetSocketAddress address = new InetSocketAddress(btcNode.getHostNameOrAddress(), btcNode.getPort());
log.info("We add a clear net node (no tor is used) with host={}, btcNode.getPort()={}", btcNode.getHostNameOrAddress(), btcNode.getPort());
peerAddressList.add(new PeerAddress(address.getAddress(), address.getPort()));
} catch (Throwable t) {
if (btcNode.getAddress() != null) {
log.warn("Dns lookup failed. We try with provided IP address. BtcNode: {}", btcNode);
try {
InetSocketAddress address = new InetSocketAddress(btcNode.getAddress(), btcNode.getPort());
log.info("We add a clear net node (no tor is used) with host={}, btcNode.getPort()={}", btcNode.getHostNameOrAddress(), btcNode.getPort());
peerAddressList.add(new PeerAddress(address.getAddress(), address.getPort()));
} catch (Throwable t2) {
log.warn("Failed to create InetSocketAddress from btcNode {}", btcNode);
}
} else {
log.warn("Dns lookup failed. No IP address is provided. BtcNode: {}", btcNode);
}
}
});
peerAddressList = btcNodeList.stream()
.flatMap(btcNode -> nullableAsStream(btcNodeConverter.convertClearNode(btcNode)))
.collect(Collectors.toList());
}
return peerAddressList;
}
private static <T> Stream<T> nullableAsStream(@Nullable T item) {
return Optional.ofNullable(item)
.map(Stream::of)
.orElse(Stream.empty());
}
}