Connect bitcoinj to hidden services This commit adds a few small modi…

…fications to PeerAddress to make it easier for bitcoinj to connect to Tor hidden services when using the Orchid TorClient.

core/src/main/java/org/bitcoinj/core/Peer.java

@@ -440,7 +440,7 @@ private void processVersionMessage(VersionMessage m) throws ProtocolException {
         PeerAddress peerAddress = getAddress();
         long peerTime = vPeerVersionMessage.time * 1000;
         log.info("Connected to {}: version={}, subVer='{}', services=0x{}, time={}, blocks={}",
-                peerAddress == null ? "Peer" : peerAddress.getAddr().getHostAddress(),
+                peerAddress == null ? "Peer" : (peerAddress.getAddr() == null ? peerAddress.getHostname() : peerAddress.getAddr().getHostAddress()),
                 peerVersion,
                 vPeerVersionMessage.subVer,
                 vPeerVersionMessage.localServices,

core/src/main/java/org/bitcoinj/core/PeerAddress.java

@@ -39,6 +39,7 @@ public class PeerAddress extends ChildMessage {
     static final int MESSAGE_SIZE = 30;
 
     private InetAddress addr;
+    private String hostname; // Used for .onion addresses
     private int port;
     private BigInteger services;
     private long time;
@@ -96,8 +97,20 @@ public PeerAddress(InetAddress addr) {
         this(addr, MainNetParams.get().getPort());
     }
 
+    /**
+     * Constructs a peer address from an {@link InetSocketAddress}. An InetSocketAddress can take in as parameters an
+     * InetAddress or a String hostname. If you want to connect to a .onion, set the hostname to the .onion address.
+     */
     public PeerAddress(InetSocketAddress addr) {
-        this(addr.getAddress(), addr.getPort());
+        if (addr.getHostName() == null || !addr.getHostName().toLowerCase().endsWith(".onion")) {
+            this.addr = checkNotNull(addr.getAddress());
+        } else {
+            this.hostname = addr.getHostName();
+        }
+        this.port = addr.getPort();
+        this.protocolVersion = NetworkParameters.PROTOCOL_VERSION;
+        this.services = BigInteger.ZERO;
+        length = protocolVersion > 31402 ? MESSAGE_SIZE : MESSAGE_SIZE - 4;
     }
 
     public static PeerAddress localhost(NetworkParameters params) {
@@ -162,6 +175,11 @@ public int getMessageSize() {
         return length;
     }
 
+    public String getHostname() {
+        maybeParse();
+        return hostname;
+    }
+
     public InetAddress getAddr() {
         maybeParse();
         return addr;
@@ -215,6 +233,9 @@ public void setTime(long time) {
 
     @Override
     public String toString() {
+        if (hostname != null) {
+            return "[" + hostname + "]:" + port;
+        }
         return "[" + addr.getHostAddress() + "]:" + port;
     }
 
@@ -236,6 +257,11 @@ public int hashCode() {
     }
 
     public InetSocketAddress toSocketAddress() {
-        return new InetSocketAddress(addr, port);
+        // Reconstruct the InetSocketAddress properly
+        if (hostname != null) {
+            return InetSocketAddress.createUnresolved(hostname, port);
+        } else {
+            return new InetSocketAddress(addr, port);
+        }
     }
 }