Route bitcoinj over jtoryproxy

common/src/main/java/io/bitsquare/common/OptionKeys.java → common/src/main/java/io/bitsquare/common/CommonOptionKeys.java

@@ -1,6 +1,6 @@
 package io.bitsquare.common;
 
-public class OptionKeys {
+public class CommonOptionKeys {
     public static final String LOG_LEVEL_KEY = "logLevel";
     public static final String IGNORE_DEV_MSG_KEY = "ignoreDevMsg";
 }

core/src/main/java/io/bitsquare/alert/AlertManager.java

@@ -19,7 +19,7 @@
 
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import io.bitsquare.common.OptionKeys;
+import io.bitsquare.common.CommonOptionKeys;
 import io.bitsquare.common.crypto.KeyRing;
 import io.bitsquare.p2p.P2PService;
 import io.bitsquare.p2p.storage.HashMapChangedListener;
@@ -56,7 +56,7 @@ public class AlertManager {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public AlertManager(P2PService p2PService, KeyRing keyRing, User user, @Named(OptionKeys.IGNORE_DEV_MSG_KEY) boolean ignoreDevMsg) {
+    public AlertManager(P2PService p2PService, KeyRing keyRing, User user, @Named(CommonOptionKeys.IGNORE_DEV_MSG_KEY) boolean ignoreDevMsg) {
         this.p2PService = p2PService;
         this.keyRing = keyRing;
         this.user = user;

core/src/main/java/io/bitsquare/alert/PrivateNotificationManager.java

@@ -19,7 +19,7 @@
 
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import io.bitsquare.common.OptionKeys;
+import io.bitsquare.common.CommonOptionKeys;
 import io.bitsquare.common.crypto.KeyRing;
 import io.bitsquare.crypto.DecryptedMsgWithPubKey;
 import io.bitsquare.p2p.Message;
@@ -58,7 +58,7 @@ public class PrivateNotificationManager {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    public PrivateNotificationManager(P2PService p2PService, KeyRing keyRing, @Named(OptionKeys.IGNORE_DEV_MSG_KEY) boolean ignoreDevMsg) {
+    public PrivateNotificationManager(P2PService p2PService, KeyRing keyRing, @Named(CommonOptionKeys.IGNORE_DEV_MSG_KEY) boolean ignoreDevMsg) {
         this.p2PService = p2PService;
         this.keyRing = keyRing;
 

core/src/main/java/io/bitsquare/app/BitsquareEnvironment.java

@@ -20,11 +20,13 @@
 import ch.qos.logback.classic.Level;
 import io.bitsquare.BitsquareException;
 import io.bitsquare.btc.BitcoinNetwork;
+import io.bitsquare.btc.BtcOptionKeys;
 import io.bitsquare.btc.UserAgent;
 import io.bitsquare.btc.WalletService;
+import io.bitsquare.common.CommonOptionKeys;
 import io.bitsquare.common.crypto.KeyStorage;
 import io.bitsquare.common.util.Utilities;
-import io.bitsquare.network.OptionKeys;
+import io.bitsquare.network.NetworkOptionKeys;
 import io.bitsquare.storage.Storage;
 import io.bitsquare.util.spring.JOptCommandLinePropertySource;
 import joptsimple.OptionSet;
@@ -82,8 +84,7 @@ public static void setDefaultAppName(String defaultAppName) {
     private final String btcNetworkDir;
     private final String logLevel;
     private BitcoinNetwork bitcoinNetwork;
-    private final String seedNodes, ignoreDevMsg;
-    private final String myAddress, banList;
+    private final String btcSeedNodes, seedNodes, ignoreDevMsg, useTorForBtc, myAddress, banList;
 
     public BitsquareEnvironment(OptionSet options) {
         this(new JOptCommandLinePropertySource(BITSQUARE_COMMANDLINE_PROPERTY_SOURCE_NAME, checkNotNull(
@@ -132,25 +133,34 @@ protected BitsquareEnvironment(PropertySource commandLineProperties) {
                 (String) commandLineProperties.getProperty(APP_DATA_DIR_KEY) :
                 appDataDir(userDataDir, appName);
 
-        logLevel = commandLineProperties.containsProperty(io.bitsquare.common.OptionKeys.LOG_LEVEL_KEY) ?
-                (String) commandLineProperties.getProperty(io.bitsquare.common.OptionKeys.LOG_LEVEL_KEY) :
+        logLevel = commandLineProperties.containsProperty(CommonOptionKeys.LOG_LEVEL_KEY) ?
+                (String) commandLineProperties.getProperty(CommonOptionKeys.LOG_LEVEL_KEY) :
                 LOG_LEVEL_DEFAULT;
 
-        seedNodes = commandLineProperties.containsProperty(OptionKeys.SEED_NODES_KEY) ?
-                (String) commandLineProperties.getProperty(OptionKeys.SEED_NODES_KEY) :
+        seedNodes = commandLineProperties.containsProperty(NetworkOptionKeys.SEED_NODES_KEY) ?
+                (String) commandLineProperties.getProperty(NetworkOptionKeys.SEED_NODES_KEY) :
                 "";
 
-        myAddress = commandLineProperties.containsProperty(OptionKeys.MY_ADDRESS) ?
-                (String) commandLineProperties.getProperty(OptionKeys.MY_ADDRESS) :
+        myAddress = commandLineProperties.containsProperty(NetworkOptionKeys.MY_ADDRESS) ?
+                (String) commandLineProperties.getProperty(NetworkOptionKeys.MY_ADDRESS) :
                 "";
-        banList = commandLineProperties.containsProperty(OptionKeys.BAN_LIST) ?
-                (String) commandLineProperties.getProperty(OptionKeys.BAN_LIST) :
+        banList = commandLineProperties.containsProperty(NetworkOptionKeys.BAN_LIST) ?
+                (String) commandLineProperties.getProperty(NetworkOptionKeys.BAN_LIST) :
                 "";
 
-        ignoreDevMsg = commandLineProperties.containsProperty(io.bitsquare.common.OptionKeys.IGNORE_DEV_MSG_KEY) ?
-                (String) commandLineProperties.getProperty(io.bitsquare.common.OptionKeys.IGNORE_DEV_MSG_KEY) :
+        ignoreDevMsg = commandLineProperties.containsProperty(CommonOptionKeys.IGNORE_DEV_MSG_KEY) ?
+                (String) commandLineProperties.getProperty(CommonOptionKeys.IGNORE_DEV_MSG_KEY) :
                 "";
 
+        btcSeedNodes = commandLineProperties.containsProperty(BtcOptionKeys.BTC_SEED_NODES) ?
+                (String) commandLineProperties.getProperty(BtcOptionKeys.BTC_SEED_NODES) :
+                "";
+
+        useTorForBtc = commandLineProperties.containsProperty(BtcOptionKeys.USE_TOR_FOR_BTC) ?
+                (String) commandLineProperties.getProperty(BtcOptionKeys.USE_TOR_FOR_BTC) :
+                "";
+
+
         MutablePropertySources propertySources = this.getPropertySources();
         propertySources.addFirst(commandLineProperties);
         try {
@@ -206,12 +216,15 @@ private PropertySource<?> defaultProperties() {
 
             {
                 setProperty(APP_DATA_DIR_KEY, appDataDir);
-                setProperty(io.bitsquare.common.OptionKeys.LOG_LEVEL_KEY, logLevel);
+                setProperty(CommonOptionKeys.LOG_LEVEL_KEY, logLevel);
+
+                setProperty(NetworkOptionKeys.SEED_NODES_KEY, seedNodes);
+                setProperty(NetworkOptionKeys.MY_ADDRESS, myAddress);
+                setProperty(NetworkOptionKeys.BAN_LIST, banList);
+                setProperty(CommonOptionKeys.IGNORE_DEV_MSG_KEY, ignoreDevMsg);
 
-                setProperty(OptionKeys.SEED_NODES_KEY, seedNodes);
-                setProperty(OptionKeys.MY_ADDRESS, myAddress);
-                setProperty(OptionKeys.BAN_LIST, banList);
-                setProperty(io.bitsquare.common.OptionKeys.IGNORE_DEV_MSG_KEY, ignoreDevMsg);
+                setProperty(BtcOptionKeys.BTC_SEED_NODES, btcSeedNodes);
+                setProperty(BtcOptionKeys.USE_TOR_FOR_BTC, useTorForBtc);
 
                 setProperty(APP_NAME_KEY, appName);
                 setProperty(USER_DATA_DIR_KEY, userDataDir);
@@ -223,9 +236,9 @@ private PropertySource<?> defaultProperties() {
 
                 setProperty(Storage.DIR_KEY, Paths.get(btcNetworkDir, "db").toString());
                 setProperty(KeyStorage.DIR_KEY, Paths.get(btcNetworkDir, "keys").toString());
-                setProperty(OptionKeys.TOR_DIR, Paths.get(btcNetworkDir, "tor").toString());
+                setProperty(NetworkOptionKeys.TOR_DIR, Paths.get(btcNetworkDir, "tor").toString());
 
-                setProperty(OptionKeys.NETWORK_ID, String.valueOf(bitcoinNetwork.ordinal()));
+                setProperty(NetworkOptionKeys.NETWORK_ID, String.valueOf(bitcoinNetwork.ordinal()));
             }
         });
     }

core/src/main/java/io/bitsquare/app/BitsquareExecutable.java

@@ -19,8 +19,10 @@
 
 import io.bitsquare.BitsquareException;
 import io.bitsquare.btc.BitcoinNetwork;
+import io.bitsquare.btc.BtcOptionKeys;
 import io.bitsquare.btc.RegTestHost;
-import io.bitsquare.network.OptionKeys;
+import io.bitsquare.common.CommonOptionKeys;
+import io.bitsquare.network.NetworkOptionKeys;
 import io.bitsquare.p2p.P2PService;
 import io.bitsquare.util.joptsimple.EnumValueConverter;
 import joptsimple.OptionException;
@@ -74,29 +76,34 @@ protected void customizeOptionParsing(OptionParser parser) {
                 .withRequiredArg();
         parser.accepts(APP_DATA_DIR_KEY, description("Application data directory", DEFAULT_APP_DATA_DIR))
                 .withRequiredArg();
-        parser.accepts(io.bitsquare.common.OptionKeys.LOG_LEVEL_KEY, description("Log level [OFF, ALL, ERROR, WARN, INFO, DEBUG, TRACE]", LOG_LEVEL_DEFAULT))
+        parser.accepts(CommonOptionKeys.LOG_LEVEL_KEY, description("Log level [OFF, ALL, ERROR, WARN, INFO, DEBUG, TRACE]", LOG_LEVEL_DEFAULT))
                 .withRequiredArg();
 
-        parser.accepts(OptionKeys.SEED_NODES_KEY, description("Override hard coded seed nodes as comma separated list: E.g. rxdkppp3vicnbgqt.onion:8002, mfla72c4igh5ta2t.onion:8002", ""))
+        parser.accepts(NetworkOptionKeys.SEED_NODES_KEY, description("Override hard coded seed nodes as comma separated list: E.g. rxdkppp3vicnbgqt.onion:8002, mfla72c4igh5ta2t.onion:8002", ""))
                 .withRequiredArg();
-        parser.accepts(OptionKeys.MY_ADDRESS, description("My own onion address (used for botstrap nodes to exclude itself)", ""))
+        parser.accepts(NetworkOptionKeys.MY_ADDRESS, description("My own onion address (used for botstrap nodes to exclude itself)", ""))
                 .withRequiredArg();
-        parser.accepts(OptionKeys.BAN_LIST, description("Nodes to exclude from network connections.", ""))
+        parser.accepts(NetworkOptionKeys.BAN_LIST, description("Nodes to exclude from network connections.", ""))
                 .withRequiredArg();
 
-        parser.accepts(io.bitsquare.common.OptionKeys.IGNORE_DEV_MSG_KEY, description("If set to true all signed messages from Bitsquare developers are ignored " +
+        parser.accepts(CommonOptionKeys.IGNORE_DEV_MSG_KEY, description("If set to true all signed messages from Bitsquare developers are ignored " +
                 "(Global alert, Version update alert, Filters for offers, nodes or payment account data)", false))
                 .withRequiredArg()
                 .ofType(boolean.class);
 
+        parser.accepts(BtcOptionKeys.BTC_SEED_NODES, description("Custom seed nodes used for BitcoinJ.", ""))
+                .withRequiredArg();
+        parser.accepts(BtcOptionKeys.USE_TOR_FOR_BTC, description("If set to true BitcoinJ is routed over our native Tor instance.", ""))
+                .withRequiredArg();
+
         // use a fixed port as arbitrator use that for his ID
-        parser.accepts(OptionKeys.PORT_KEY, description("Port to listen on", 9999))
+        parser.accepts(NetworkOptionKeys.PORT_KEY, description("Port to listen on", 9999))
                 .withRequiredArg()
                 .ofType(int.class);
-        parser.accepts(OptionKeys.USE_LOCALHOST, description("Use localhost network for development", false))
+        parser.accepts(NetworkOptionKeys.USE_LOCALHOST, description("Use localhost network for development", false))
                 .withRequiredArg()
                 .ofType(boolean.class);
-        parser.accepts(OptionKeys.MAX_CONNECTIONS, description("Max. connections a peer will try to keep", P2PService.MAX_CONNECTIONS_DEFAULT))
+        parser.accepts(NetworkOptionKeys.MAX_CONNECTIONS, description("Max. connections a peer will try to keep", P2PService.MAX_CONNECTIONS_DEFAULT))
                 .withRequiredArg()
                 .ofType(int.class);
         parser.accepts(BitcoinNetwork.KEY, description("Bitcoin network", BitcoinNetwork.DEFAULT))

core/src/main/java/io/bitsquare/btc/BitcoinModule.java

@@ -48,6 +48,9 @@ protected void configure() {
         File walletDir = new File(env.getRequiredProperty(WalletService.DIR_KEY));
         bind(File.class).annotatedWith(named(WalletService.DIR_KEY)).toInstance(walletDir);
 
+        bindConstant().annotatedWith(named(BtcOptionKeys.BTC_SEED_NODES)).to(env.getRequiredProperty(BtcOptionKeys.BTC_SEED_NODES));
+        bindConstant().annotatedWith(named(BtcOptionKeys.USE_TOR_FOR_BTC)).to(env.getRequiredProperty(BtcOptionKeys.USE_TOR_FOR_BTC));
+
         bind(AddressEntryList.class).in(Singleton.class);
         bind(TradeWalletService.class).in(Singleton.class);
         bind(WalletService.class).in(Singleton.class);

core/src/main/java/io/bitsquare/btc/BtcOptionKeys.java

@@ -0,0 +1,6 @@
+package io.bitsquare.btc;
+
+public class BtcOptionKeys {
+    public static final String BTC_SEED_NODES = "btcSeedNodes";
+    public static final String USE_TOR_FOR_BTC = "useTorForBtc";
+}

core/src/main/java/io/bitsquare/btc/ProxySocketFactory.java

@@ -0,0 +1,94 @@
+
+/**
+ * Copyright (C) 2010-2014 Leon Blakey <lord.quackstar at gmail.com>
+ *
+ * This file is part of PircBotX.
+ *
+ * PircBotX is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * PircBotX is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * PircBotX. If not, see <http://www.gnu.org/licenses/>.
+ */
+package io.bitsquare.btc;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import javax.net.SocketFactory;
+
+/**
+ * A basic SocketFactory for creating sockets that connect through the specified
+ * proxy.
+ *
+ * @author Leon Blakey
+ */
+public class ProxySocketFactory extends SocketFactory {
+    protected final Proxy proxy;
+
+    /**
+     * Create all sockets with the specified proxy.
+     *
+     * @param proxy An existing proxy
+     */
+    public ProxySocketFactory(Proxy proxy) {
+        this.proxy = proxy;
+    }
+
+    /**
+     * A convenience constructor for creating a proxy with the specified host
+     * and port.
+     *
+     * @param proxyType The type of proxy were connecting to
+     * @param hostname The hostname of the proxy server
+     * @param port The port of the proxy server
+     */
+    public ProxySocketFactory(Proxy.Type proxyType, String hostname, int port) {
+        this.proxy = new Proxy(proxyType, new InetSocketAddress(hostname, port));
+    }
+
+    @Override
+    public Socket createSocket() throws IOException {
+        Socket socket = new Socket(proxy);
+        return socket;
+    }    
+
+    @Override
+    public Socket createSocket(String string, int i) throws IOException, UnknownHostException {
+        Socket socket = new Socket(proxy);
+        socket.connect(new InetSocketAddress(string, i));
+        return socket;
+    }
+
+    @Override
+    public Socket createSocket(String string, int i, InetAddress localAddress, int localPort) throws IOException, UnknownHostException {
+        Socket socket = new Socket(proxy);
+        socket.bind(new InetSocketAddress(localAddress, localPort));
+        socket.connect(new InetSocketAddress(string, i));
+        return socket;
+    }
+
+    @Override
+    public Socket createSocket(InetAddress ia, int i) throws IOException {
+        Socket socket = new Socket(proxy);
+        socket.connect(new InetSocketAddress(ia, i));
+        return socket;
+    }
+
+    @Override
+    public Socket createSocket(InetAddress ia, int i, InetAddress localAddress, int localPort) throws IOException {
+        Socket socket = new Socket(proxy);
+        socket.bind(new InetSocketAddress(localAddress, localPort));
+        socket.connect(new InetSocketAddress(ia, i));
+        return socket;
+    }
+}