Add UI info for P2P network

gui/src/main/java/io/bitsquare/app/BitsquareAppModule.java

@@ -66,7 +66,6 @@ class BitsquareAppModule extends AppModule {
         bind(File.class).annotatedWith(named(KeyStorage.DIR_KEY)).toInstance(keyStorageDir);
 
         bind(BitsquareEnvironment.class).toInstance((BitsquareEnvironment) env);
-        bind(UpdateProcess.class).in(Singleton.class);
 
         // ordering is used for shut down sequence
         install(tradeModule());

gui/src/main/java/io/bitsquare/app/UpdateProcess.java

@@ -1,164 +0,0 @@
-/*
- * This file is part of Bitsquare.
- *
- * Bitsquare is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at
- * your option) any later version.
- *
- * Bitsquare 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 Affero General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package io.bitsquare.app;
-
-import com.google.inject.Inject;
-import io.bitsquare.common.handlers.ResultHandler;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import org.reactfx.util.Timer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-// TODO
-// Deactivated for the moment.
-// UpdateFX use https for getting the version nr./jars, which we want to avoid with the Tor P2p network
-// We need to wait until tor is setup and then request from a hidden service the version and jars
-public class UpdateProcess {
-    private static final Logger log = LoggerFactory.getLogger(UpdateProcess.class);
-
-    // private static final List<ECPoint> UPDATE_SIGNING_KEYS = Crypto.decode("029EF2D0D33A2546CB15FB10D969B7D65CAFB811CB3AC902E8D9A46BE847B1DA21");
-    // private static final String UPDATES_BASE_URL = "https://bitsquare.io/updateFX/v03";
-    private static final int UPDATE_SIGNING_THRESHOLD = 1;
-    // private static final Path ROOT_CLASS_PATH = UpdateFX.findCodePath(BitsquareAppMain.class);
-
-    private final BitsquareEnvironment environment;
-    private ResultHandler resultHandler;
-
-    public enum State {
-        INIT,
-        CHECK_FOR_UPDATES,
-        UPDATE_AVAILABLE,
-        UP_TO_DATE,
-        NEW_RELEASE, // if a new minor release is out we inform the user to download the new binary
-        FAILURE
-    }
-
-    public final ObjectProperty<State> state = new SimpleObjectProperty<>(State.INIT);
-
-    private String releaseUrl;
-    private Timer timeoutTimer;
-
-    @Inject
-    public UpdateProcess(BitsquareEnvironment environment) {
-        this.environment = environment;
-    }
-
-    public void restart() {
-        // UpdateFX.restartApp();
-    }
-
-    public void setResultHandler(ResultHandler resultHandler) {
-        this.resultHandler = resultHandler;
-
-        resultHandler.handleResult();
-    }
-
-    public void init() {
-
-
-        //log.info("UpdateFX checking for patch version " + Version.PATCH_VERSION);
-
-        // process.timeout() will cause an error state back but we don't want to break startup in case of an timeout
-       /* timeoutTimer = FxTimer.runLater(Duration.ofMillis(10000), () -> {
-            log.error("Timeout reached for UpdateFX");
-            resultHandler.handleResult();
-        });
-        String userAgent = environment.getProperty(BitsquareEnvironment.APP_NAME_KEY) + Version.VERSION;
-*/
-        // Check if there is a new minor version release out. The release_url should be empty if no release is available, otherwise the download url.
-     /*   try {
-            releaseUrl = Utilities.readTextFileFromServer(UPDATES_BASE_URL + "/release_url", userAgent);
-            if (releaseUrl != null && releaseUrl.length() > 0) {
-                log.info("New release available at: " + releaseUrl);
-                state.set(State.NEW_RELEASE);
-                timeoutTimer.stop();
-                return;
-            }
-            else {
-                // All ok. Empty file if we have no new release.
-            }
-        } catch (IOException e) {
-            // ignore. File might be missing
-        }*/
-
-     /*   Updater updater = new Updater(UPDATES_BASE_URL, userAgent, Version.PATCH_VERSION,
-                Paths.get(environment.getProperty(BitsquareEnvironment.APP_DATA_DIR_KEY)),
-                ROOT_CLASS_PATH, UPDATE_SIGNING_KEYS, UPDATE_SIGNING_THRESHOLD) {
-            @Override
-            protected void updateProgress(long workDone, long max) {
-                //log.trace("updateProgress " + workDone + "/" + max);
-                super.updateProgress(workDone, max);
-            }
-        };*/
-
-       /* updater.progressProperty().addListener((observableValue, oldValue, newValue) -> {
-            log.trace("progressProperty newValue = " + newValue);
-        });*/
-
-       /* updater.setOnSucceeded(event -> {
-            try {
-                UpdateSummary summary = updater.get();
-                //log.info("summary " + summary.toString());
-                if (summary.descriptions != null && summary.descriptions.size() > 0) {
-                    log.info("One liner: {}", summary.descriptions.get(0).getOneLiner());
-                    log.info("{}", summary.descriptions.get(0).getDescription());
-                }
-                if (summary.highestVersion > Version.PATCH_VERSION) {
-                    log.info("UPDATE_AVAILABLE");
-                    state.set(State.UPDATE_AVAILABLE);
-                    // We stop the timeout and treat it not completed. 
-                    // The user should click the restart button manually if there are updates available.
-                    timeoutTimer.stop();
-                }
-                else if (summary.highestVersion == Version.PATCH_VERSION) {
-                    log.info("UP_TO_DATE");
-                    state.set(State.UP_TO_DATE);
-                    timeoutTimer.stop();
-                    resultHandler.handleResult();
-                }
-            } catch (Throwable e) {
-                log.error("Exception at processing UpdateSummary: " + e.getMessage());
-
-                // we treat errors as update not as critical errors to prevent startup, 
-                // so we use state.onCompleted() instead of state.onError()
-                state.set(State.FAILURE);
-                timeoutTimer.stop();
-                resultHandler.handleResult();
-            }
-        });
-        updater.setOnFailed(event -> {
-            log.error("Update failed: " + updater.getException());
-            updater.getException().printStackTrace();
-
-            // we treat errors as update not as critical errors to prevent startup, 
-            // so we use state.onCompleted() instead of state.onError()
-            state.set(State.FAILURE);
-            timeoutTimer.stop();
-            resultHandler.handleResult();
-        });
-
-        Thread thread = new Thread(updater, "Online update check");
-        thread.setDaemon(true);
-        thread.start();*/
-    }
-
-    public String getReleaseUrl() {
-        return releaseUrl;
-    }
-}

gui/src/main/java/io/bitsquare/gui/images.css

@@ -129,6 +129,10 @@
 }
 
 /* connection state*/
+#image-connection-tor {
+    -fx-image: url("../../../images/connection/tor.png");
+}
+
 #image-connection-direct {
     -fx-image: url("../../../images/connection/direct.png");
 }

gui/src/main/java/io/bitsquare/gui/main/MainView.java

@@ -20,7 +20,6 @@ package io.bitsquare.gui.main;
 import io.bitsquare.BitsquareException;
 import io.bitsquare.common.UserThread;
 import io.bitsquare.common.util.Tuple2;
-import io.bitsquare.common.util.Utilities;
 import io.bitsquare.gui.Navigation;
 import io.bitsquare.gui.common.view.*;
 import io.bitsquare.gui.components.SystemNotification;
@@ -79,19 +78,14 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
     private final String title;
     private ChangeListener<String> walletServiceErrorMsgListener;
     private ChangeListener<String> blockchainSyncIconIdListener;
-    private ChangeListener<String> bootstrapErrorMsgListener;
+    private ChangeListener<String> splashP2PNetworkErrorMsgListener;
-    private ChangeListener<String> bootstrapIconIdListener;
+    private ChangeListener<String> splashP2PNetworkIconIdListener;
-    private ChangeListener<Number> bootstrapProgressListener;
+    private ChangeListener<Number> splashP2PNetworkProgressListener;
-    private ChangeListener<String> updateIconIdListener;
+    private ProgressIndicator splashP2PNetworkIndicator;
-    private Button restartButton;
+    private Label splashP2PNetworkLabel;
-    private Button downloadButton;
-    private ProgressIndicator bootstrapIndicator;
-    private Label bootstrapStateLabel;
     private ProgressBar blockchainSyncIndicator;
     private Label blockchainSyncLabel;
-    private Label updateInfoLabel;
     private List<String> persistedFilesCorrupted;
-    private Tooltip downloadButtonTooltip;
     private static BorderPane baseApplicationContainer;
 
     @Inject
@@ -269,116 +263,68 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
                 blockchainSyncIcon, bitcoinNetworkLabel);
 
 
-        // createP2PNetworkBox
+        // create P2PNetworkBox
-        bootstrapStateLabel = new Label();
+        splashP2PNetworkLabel = new Label();
-        bootstrapStateLabel.setWrapText(true);
+        splashP2PNetworkLabel.setWrapText(true);
-        bootstrapStateLabel.setMaxWidth(500);
+        splashP2PNetworkLabel.setMaxWidth(500);
-        bootstrapStateLabel.setTextAlignment(TextAlignment.CENTER);
+        splashP2PNetworkLabel.setTextAlignment(TextAlignment.CENTER);
-        bootstrapStateLabel.textProperty().bind(model.bootstrapInfo);
+        splashP2PNetworkLabel.textProperty().bind(model.splashP2PNetworkInfo);
 
-        bootstrapIndicator = new ProgressIndicator();
+        splashP2PNetworkIndicator = new ProgressIndicator();
-        bootstrapIndicator.setMaxSize(24, 24);
+        splashP2PNetworkIndicator.setMaxSize(24, 24);
-        bootstrapIndicator.progressProperty().bind(model.bootstrapProgress);
+        splashP2PNetworkIndicator.progressProperty().bind(model.splashP2PNetworkProgress);
 
-        bootstrapErrorMsgListener = (ov, oldValue, newValue) -> {
+        splashP2PNetworkErrorMsgListener = (ov, oldValue, newValue) -> {
-            bootstrapStateLabel.setId("splash-error-state-msg");
+            splashP2PNetworkLabel.setId("splash-error-state-msg");
-            bootstrapIndicator.setVisible(false);
+            splashP2PNetworkIndicator.setVisible(false);
         };
-        model.bootstrapErrorMsg.addListener(bootstrapErrorMsgListener);
+        model.p2PNetworkErrorMsg.addListener(splashP2PNetworkErrorMsgListener);
 
-        ImageView bootstrapIcon = new ImageView();
-        bootstrapIcon.setVisible(false);
-        bootstrapIcon.setManaged(false);
 
-        bootstrapIconIdListener = (ov, oldValue, newValue) -> {
+        ImageView splashP2PNetworkIcon = new ImageView();
-            bootstrapIcon.setId(newValue);
+        splashP2PNetworkIcon.setId("image-connection-tor");
-            bootstrapIcon.setVisible(true);
+        splashP2PNetworkIcon.setVisible(false);
-            bootstrapIcon.setManaged(true);
+        splashP2PNetworkIcon.setManaged(false);
+        HBox.setMargin(splashP2PNetworkIcon, new Insets(0, 0, 5, 0));
+
+        splashP2PNetworkIconIdListener = (ov, oldValue, newValue) -> {
+            splashP2PNetworkIcon.setId(newValue);
+            splashP2PNetworkIcon.setVisible(true);
+            splashP2PNetworkIcon.setManaged(true);
         };
-        model.bootstrapIconId.addListener(bootstrapIconIdListener);
+        model.p2PNetworkIconId.addListener(splashP2PNetworkIconIdListener);
 
-        bootstrapProgressListener = (ov, oldValue, newValue) -> {
+        splashP2PNetworkProgressListener = (ov, oldValue, newValue) -> {
             if ((double) newValue >= 1) {
-                bootstrapIndicator.setVisible(false);
+                splashP2PNetworkIndicator.setVisible(false);
-                bootstrapIndicator.setManaged(false);
+                splashP2PNetworkIndicator.setManaged(false);
             }
         };
-        model.bootstrapProgress.addListener(bootstrapProgressListener);
+        model.splashP2PNetworkProgress.addListener(splashP2PNetworkProgressListener);
 
-        HBox bootstrapBox = new HBox();
+        HBox splashP2PNetworkBox = new HBox();
-        bootstrapBox.setSpacing(10);
+        splashP2PNetworkBox.setSpacing(10);
-        bootstrapBox.setAlignment(Pos.CENTER);
+        splashP2PNetworkBox.setAlignment(Pos.CENTER);
-        bootstrapBox.setPrefHeight(50);
+        splashP2PNetworkBox.setPrefHeight(50);
-        bootstrapBox.getChildren().addAll(bootstrapStateLabel, bootstrapIndicator, bootstrapIcon);
+        splashP2PNetworkBox.getChildren().addAll(splashP2PNetworkLabel, splashP2PNetworkIndicator, splashP2PNetworkIcon);
 
-
+        vBox.getChildren().addAll(logo, blockchainSyncBox, splashP2PNetworkBox);
-        // createUpdateBox
-        updateInfoLabel = new Label();
-        updateInfoLabel.setTextAlignment(TextAlignment.RIGHT);
-        updateInfoLabel.textProperty().bind(model.updateInfo);
-
-        restartButton = new Button("Restart");
-        restartButton.setDefaultButton(true);
-        restartButton.visibleProperty().bind(model.showRestartButton);
-        restartButton.managedProperty().bind(model.showRestartButton);
-        restartButton.setOnAction(e -> model.restart());
-
-        downloadButton = new Button("Download");
-        downloadButton.setDefaultButton(true);
-        downloadButton.visibleProperty().bind(model.showDownloadButton);
-        downloadButton.managedProperty().bind(model.showDownloadButton);
-        downloadButtonTooltip = new Tooltip();
-        downloadButtonTooltip.textProperty().bind(model.newReleaseUrl);
-        downloadButton.setTooltip(downloadButtonTooltip);
-        downloadButton.setOnAction(e -> {
-            try {
-                Utilities.openWebPage(model.newReleaseUrl.get());
-            } catch (Exception e1) {
-                e1.printStackTrace();
-                log.error(e1.getMessage());
-            }
-        });
-
-        ImageView updateIcon = new ImageView();
-        String id = model.updateIconId.get();
-        if (id != null && !id.equals(""))
-            updateIcon.setId(id);
-
-        updateIconIdListener = (ov, oldValue, newValue) -> {
-            updateIcon.setId(newValue);
-            updateIcon.setVisible(true);
-            updateIcon.setManaged(true);
-        };
-        model.updateIconId.addListener(updateIconIdListener);
-
-        HBox updateBox = new HBox();
-        updateBox.setSpacing(10);
-        updateBox.setAlignment(Pos.CENTER);
-        updateBox.setPrefHeight(20);
-        updateBox.getChildren().addAll(updateInfoLabel, restartButton, downloadButton, updateIcon);
-
-        vBox.getChildren().addAll(logo, blockchainSyncBox, bootstrapBox, updateBox);
         return vBox;
     }
 
     private void disposeSplashScreen() {
         model.walletServiceErrorMsg.removeListener(walletServiceErrorMsgListener);
         model.blockchainSyncIconId.removeListener(blockchainSyncIconIdListener);
-        model.bootstrapErrorMsg.removeListener(bootstrapErrorMsgListener);
+
-        model.bootstrapIconId.removeListener(bootstrapIconIdListener);
+        model.p2PNetworkErrorMsg.removeListener(splashP2PNetworkErrorMsgListener);
-        model.bootstrapProgress.removeListener(bootstrapProgressListener);
+        model.p2PNetworkIconId.removeListener(splashP2PNetworkIconIdListener);
-        model.updateIconId.removeListener(updateIconIdListener);
+        model.splashP2PNetworkProgress.removeListener(splashP2PNetworkProgressListener);
 
         blockchainSyncLabel.textProperty().unbind();
         blockchainSyncIndicator.progressProperty().unbind();
-        bootstrapStateLabel.textProperty().unbind();
+
-        bootstrapIndicator.progressProperty().unbind();
+        splashP2PNetworkLabel.textProperty().unbind();
-        updateInfoLabel.textProperty().unbind();
+        splashP2PNetworkIndicator.progressProperty().unbind();
-        restartButton.visibleProperty().unbind();
-        restartButton.managedProperty().unbind();
-        downloadButton.visibleProperty().unbind();
-        downloadButton.managedProperty().unbind();
-        downloadButtonTooltip.textProperty().unbind();
 
         model.onSplashScreenRemoved();
     }
@@ -446,37 +392,31 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
         setBottomAnchor(versionLabel, 7d);
 
 
-        // P2P
+        // P2P Network
-        Label bootstrapLabel = new Label();
+        Label p2PNetworkLabel = new Label();
-        bootstrapLabel.setId("footer-pane");
+        p2PNetworkLabel.setId("footer-pane");
-        setRightAnchor(bootstrapLabel, 100d);
+        setRightAnchor(p2PNetworkLabel, 33d);
-        setBottomAnchor(bootstrapLabel, 7d);
+        setBottomAnchor(p2PNetworkLabel, 7d);
-        bootstrapLabel.textProperty().bind(model.p2pNetworkInfoFooter);
+        p2PNetworkLabel.textProperty().bind(model.p2PNetworkInfo);
 
-        ImageView bootstrapIcon = new ImageView();
+        ImageView p2PNetworkIcon = new ImageView();
-        setRightAnchor(bootstrapIcon, 60d);
+        setRightAnchor(p2PNetworkIcon, 10d);
-        setBottomAnchor(bootstrapIcon, 9d);
+        setBottomAnchor(p2PNetworkIcon, 7d);
-        bootstrapIcon.idProperty().bind(model.bootstrapIconId);
+        p2PNetworkIcon.idProperty().bind(model.p2PNetworkIconId);
 
-        Label numPeersLabel = new Label();
+        model.p2PNetworkErrorMsg.addListener((ov, oldValue, newValue) -> {
-        numPeersLabel.setId("footer-num-peers");
-        setRightAnchor(numPeersLabel, 10d);
-        setBottomAnchor(numPeersLabel, 7d);
-        numPeersLabel.textProperty().bind(model.numP2PNetworkPeers);
-        model.bootstrapErrorMsg.addListener((ov, oldValue, newValue) -> {
             if (newValue != null) {
-                bootstrapLabel.setId("splash-error-state-msg");
+                p2PNetworkLabel.setId("splash-error-state-msg");
-                bootstrapLabel.textProperty().unbind();
+                p2PNetworkLabel.textProperty().unbind();
-                bootstrapLabel.setText("Not connected");
                 new Popup().error("Connecting to the P2P network failed. \n" + newValue
                         + "\nPlease check your internet connection.").show();
             } else {
-                bootstrapLabel.setId("footer-pane");
+                p2PNetworkLabel.setId("footer-pane");
-                bootstrapLabel.textProperty().bind(model.p2pNetworkInfoFooter);
+                p2PNetworkLabel.textProperty().bind(model.p2PNetworkInfo);
             }
         });
 
-        AnchorPane footerContainer = new AnchorPane(separator, blockchainSyncBox, versionLabel, bootstrapLabel, bootstrapIcon, numPeersLabel) {{
+        AnchorPane footerContainer = new AnchorPane(separator, blockchainSyncBox, versionLabel, p2PNetworkLabel, p2PNetworkIcon) {{
             setId("footer-pane");
             setMinHeight(30);
             setMaxHeight(30);

gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java

@@ -21,7 +21,6 @@ import com.google.inject.Inject;
 import io.bitsquare.alert.Alert;
 import io.bitsquare.alert.AlertManager;
 import io.bitsquare.app.BitsquareApp;
-import io.bitsquare.app.UpdateProcess;
 import io.bitsquare.app.Version;
 import io.bitsquare.arbitration.ArbitratorManager;
 import io.bitsquare.arbitration.Dispute;
@@ -51,7 +50,6 @@ import org.bitcoinj.core.*;
 import org.bitcoinj.store.BlockStoreException;
 import org.fxmisc.easybind.EasyBind;
 import org.fxmisc.easybind.monadic.MonadicBinding;
-import org.jetbrains.annotations.NotNull;
 import org.reactfx.util.FxTimer;
 import org.reactfx.util.Timer;
 import org.slf4j.Logger;
@@ -80,10 +78,8 @@ class MainViewModel implements ViewModel {
     private final OpenOfferManager openOfferManager;
     private final DisputeManager disputeManager;
     private final Preferences preferences;
-    private final KeyRing keyRing;
     private final AlertManager alertManager;
     private final WalletPasswordPopup walletPasswordPopup;
-    private final UpdateProcess updateProcess;
     private final BSFormatter formatter;
 
     // BTC network
@@ -97,22 +93,15 @@ class MainViewModel implements ViewModel {
     private final StringProperty numBTCPeers = new SimpleStringProperty();
 
     // P2P network
-    final StringProperty bootstrapInfo = new SimpleStringProperty("Connecting to P2P network...");
+    final StringProperty splashP2PNetworkInfo = new SimpleStringProperty();
-    final StringProperty p2pNetworkInfoFooter = new SimpleStringProperty("Setting up Tor hidden service...");
+    final StringProperty p2PNetworkInfo = new SimpleStringProperty();
-    final DoubleProperty bootstrapProgress = new SimpleDoubleProperty(-1);
+    final DoubleProperty splashP2PNetworkProgress = new SimpleDoubleProperty(-1);
-    final StringProperty bootstrapErrorMsg = new SimpleStringProperty();
+    final StringProperty p2PNetworkErrorMsg = new SimpleStringProperty();
-    final StringProperty bootstrapIconId = new SimpleStringProperty();
+    final StringProperty p2PNetworkIconId = new SimpleStringProperty();
-    final StringProperty numP2PNetworkPeers = new SimpleStringProperty();
 
     // software update
-    final StringProperty updateInfo = new SimpleStringProperty();
     final String version = "v." + Version.VERSION;
 
-    final BooleanProperty showRestartButton = new SimpleBooleanProperty(false);
-    final BooleanProperty showDownloadButton = new SimpleBooleanProperty(false);
-    final StringProperty newReleaseUrl = new SimpleStringProperty();
-    final StringProperty updateIconId = new SimpleStringProperty();
-
     final BooleanProperty showAppScreen = new SimpleBooleanProperty();
     final StringProperty numPendingTradesAsString = new SimpleStringProperty();
     final BooleanProperty showPendingTradesNotification = new SimpleBooleanProperty();
@@ -139,7 +128,7 @@ class MainViewModel implements ViewModel {
                          OpenOfferManager openOfferManager, DisputeManager disputeManager, Preferences preferences,
                          KeyRing keyRing, User user,
                          AlertManager alertManager,
-                         WalletPasswordPopup walletPasswordPopup, UpdateProcess updateProcess, BSFormatter formatter) {
+                         WalletPasswordPopup walletPasswordPopup, BSFormatter formatter) {
         this.user = user;
         log.debug("in");
         this.walletService = walletService;
@@ -150,16 +139,12 @@ class MainViewModel implements ViewModel {
         this.openOfferManager = openOfferManager;
         this.disputeManager = disputeManager;
         this.preferences = preferences;
-        this.keyRing = keyRing;
         this.alertManager = alertManager;
         this.walletPasswordPopup = walletPasswordPopup;
-        this.updateProcess = updateProcess;
         this.formatter = formatter;
 
         bitcoinNetworkAsString = formatter.formatBitcoinNetwork(preferences.getBitcoinNetwork());
 
-        updateProcess.state.addListener((observableValue, oldValue, newValue) -> applyUpdateState(newValue));
-        applyUpdateState(updateProcess.state.get());
         TxIdTextField.setPreferences(preferences);
         TxIdTextField.setWalletService(walletService);
         BalanceTextField.setWalletService(walletService);
@@ -178,22 +163,14 @@ class MainViewModel implements ViewModel {
     // API
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    public void restart() {
-        updateProcess.restart();
-    }
-
     public void initializeAllServices() {
         log.trace("initializeAllServices");
 
-        p2pNetworkInfoFooter.set("Connecting to tor network...");
-
-        BooleanProperty updateProcessDone = initUpdateFx();
         BooleanProperty walletInitialized = initBitcoinWallet();
         BooleanProperty bootstrapDone = initP2PNetwork();
 
         // need to store it to not get garbage collected
-        allServicesDone = EasyBind.combine(updateProcessDone, walletInitialized, bootstrapDone,
+        allServicesDone = EasyBind.combine(walletInitialized, bootstrapDone, (a, b) -> a && b);
-                (a, b, c) -> a.booleanValue() && b.booleanValue() && c.booleanValue());
         allServicesDone.subscribe((observable, oldValue, newValue) -> {
             if (newValue)
                 onAllServicesInitialized();
@@ -206,37 +183,41 @@ class MainViewModel implements ViewModel {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     private BooleanProperty initP2PNetwork() {
-        final BooleanProperty p2pNetworkReady = new SimpleBooleanProperty();
+        final BooleanProperty initialDataReady = new SimpleBooleanProperty();
+        splashP2PNetworkInfo.set("Connecting to Tor network...");
         p2PService.start(new P2PServiceListener() {
             @Override
             public void onTorNodeReady() {
-                p2pNetworkInfoFooter.set("Tor node created.");
+                splashP2PNetworkInfo.set("Publishing Tor Hidden Service...");
-            }
+                p2PNetworkIconId.set("image-connection-tor");
-
-            @Override
-            public void onRequestingDataCompleted() {
-                p2pNetworkInfoFooter.set("Data received from peer.");
-                p2pNetworkReady.set(true);
-            }
-
-            @Override
-            public void onFirstPeerAuthenticated() {
-                p2pNetworkInfoFooter.set("Authenticated in P2P network.");
             }
 
             @Override
             public void onHiddenServicePublished() {
-                p2pNetworkInfoFooter.set("Tor hidden service available.");
+                splashP2PNetworkInfo.set("Authenticating to a seed node...");
             }
 
+            @Override
+            public void onRequestingDataCompleted() {
+                p2PNetworkInfo.set("Publishing Tor Hidden Service...");
+                initialDataReady.set(true);
+            }
+
+            @Override
+            public void onFirstPeerAuthenticated() {
+                updateP2pNetworkInfo();
+                splashP2PNetworkProgress.set(1);
+            }
+
+
             @Override
             public void onSetupFailed(Throwable throwable) {
-                bootstrapErrorMsg.set("Error at starting P2P network. " + throwable.getMessage());
+                p2PNetworkErrorMsg.set("Connecting to the P2P network failed. " + throwable.getMessage());
-                bootstrapInfo.set("Connecting to the P2P network failed.");
+                splashP2PNetworkProgress.set(0);
-                bootstrapProgress.set(0);
             }
         });
-        return p2pNetworkReady;
+
+        return initialDataReady;
     }
 
     private BooleanProperty initBitcoinWallet() {
@@ -281,17 +262,6 @@ class MainViewModel implements ViewModel {
         return walletInitialized;
     }
 
-    @NotNull
-    private BooleanProperty initUpdateFx() {
-        updateProcess.init();
-        final BooleanProperty updateProcessDone = new SimpleBooleanProperty();
-        updateProcess.setResultHandler(() -> {
-            log.trace("updateProcess completed");
-            updateProcessDone.set(true);
-        });
-        return updateProcessDone;
-    }
-
     private void onAllServicesInitialized() {
         log.trace("onAllServicesInitialized");
 
@@ -371,10 +341,17 @@ class MainViewModel implements ViewModel {
             new TacPopup().url(WebViewPopup.getLocalUrl("tac.html")).onAgree(() -> preferences.setTacAccepted(true)).show();
 
 
+        // update nr of peers in footer
+        p2PService.numAuthenticatedPeers.addListener((observable, oldValue, newValue) -> updateP2pNetworkInfo());
+
         // now show app
         showAppScreen.set(true);
     }
 
+    private void updateP2pNetworkInfo() {
+        p2PNetworkInfo.set("Nr. of authenticated connections: " + p2PService.numAuthenticatedPeers.get());
+    }
+
     private void displayAlertIfPresent(Alert alert) {
         boolean alreadyDisplayed = alert != null && alert.equals(user.getDisplayedAlert());
         user.setDisplayedAlert(alert);
@@ -436,74 +413,6 @@ class MainViewModel implements ViewModel {
     // Apply states
     ///////////////////////////////////////////////////////////////////////////////////////////
 
-    private void applyUpdateState(UpdateProcess.State state) {
-        switch (state) {
-            case INIT:
-                updateInfo.set("");
-                updateIconId.set(null);
-                break;
-            case CHECK_FOR_UPDATES:
-                updateInfo.set("Check for updates...");
-                updateIconId.set("image-update-in-progress");
-                break;
-            case UPDATE_AVAILABLE:
-                updateInfo.set("New update available. Please restart!");
-                updateIconId.set("image-update-available");
-                showRestartButton.set(true);
-                break;
-            case UP_TO_DATE:
-                updateInfo.set("Software is up to date. Version: " + Version.VERSION);
-                updateIconId.set("image-update-up-to-date");
-                break;
-            case NEW_RELEASE:
-                updateInfo.set("A new release is available.");
-                updateIconId.set("image-update-available");
-                newReleaseUrl.set(updateProcess.getReleaseUrl());
-                showDownloadButton.setValue(true);
-                break;
-            case FAILURE:
-                updateInfo.set("Check for updates failed.");
-                updateIconId.set("image-update-failed");
-                break;
-        }
-    }
-
-  /*  private void setBootstrapState(TomP2PNetworkInfo.State state) {
-        switch (state) {
-            case DISCOVERY_DIRECT_SUCCEEDED:
-                bootstrapIconId.set("image-connection-direct");
-                bootstrapInfoFooter.set("Direct connection");
-                break;
-            case DISCOVERY_MANUAL_PORT_FORWARDING_SUCCEEDED:
-            case DISCOVERY_AUTO_PORT_FORWARDING_SUCCEEDED:
-                bootstrapIconId.set("image-connection-nat");
-                bootstrapInfoFooter.set("Connected with port forwarding");
-                break;
-            case RELAY_SUCCEEDED:
-                bootstrapIconId.set("image-connection-relay");
-                bootstrapInfoFooter.set("Connected with relay node");
-                break;
-            default:
-                break;
-        }
-
-        switch (state) {
-            case DISCOVERY_DIRECT_SUCCEEDED:
-            case DISCOVERY_MANUAL_PORT_FORWARDING_SUCCEEDED:
-            case DISCOVERY_AUTO_PORT_FORWARDING_SUCCEEDED:
-            case RELAY_SUCCEEDED:
-                bootstrapInfo.set(state.getMessage());
-                bootstrapProgress.set(-1);
-                break;
-            case BOOT_STRAP_SUCCEEDED:
-                bootstrapProgress.set(1);
-                break;
-            default:
-                bootstrapProgress.set(-1);
-                break;
-        }
-    }*/
-
     private void applyTradePeriodState() {
         updateTradePeriodState();
         tradeWalletService.addBlockChainListener(new BlockChainListener() {

gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml

@@ -62,31 +62,20 @@
         </GridPane.margin>
     </TitledGroupBg>
 
-    <Label text="P2P network connection:" GridPane.rowIndex="3">
+    <Label text="My onion address:" GridPane.rowIndex="3">
         <GridPane.margin>
             <Insets top="50.0"/>
         </GridPane.margin>
     </Label>
-    <TextField fx:id="connectionType" GridPane.rowIndex="3" GridPane.columnIndex="1"
+    <TextField fx:id="onionAddress" GridPane.rowIndex="3" GridPane.columnIndex="1"
                mouseTransparent="true" focusTraversable="false">
         <GridPane.margin>
             <Insets top="50.0"/>
         </GridPane.margin>
     </TextField>
 
-    <Label text="Use UPnP:" GridPane.rowIndex="4"/>
+    <Label text="Authenticated peers:" GridPane.rowIndex="5"/>
-    <CheckBox fx:id="useUPnP" onAction="#onSelectUPnP" GridPane.rowIndex="4" GridPane.columnIndex="1"/>
+    <TextArea fx:id="authenticatedPeersTextArea" GridPane.rowIndex="7" GridPane.columnIndex="1"
-
-    <Label text="P2P network connected peers:" GridPane.rowIndex="5"/>
-    <TextField fx:id="connectedPeersP2P" GridPane.rowIndex="5" GridPane.columnIndex="1"
-               mouseTransparent="true" focusTraversable="false"/>
-
-    <Label text="My external visible P2P network address:" GridPane.rowIndex="6"/>
-    <TextField fx:id="nodeAddress" GridPane.rowIndex="6" GridPane.columnIndex="1"
-               mouseTransparent="true" focusTraversable="false"/>
-
-    <Label text="P2P seed node addresses:" GridPane.rowIndex="7" GridPane.valignment="TOP"/>
-    <TextArea fx:id="seedNodeNodeAddress" GridPane.rowIndex="7" GridPane.columnIndex="1"
               mouseTransparent="true" focusTraversable="false"/>
 
     <columnConstraints>

gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java

@@ -21,50 +21,60 @@ import io.bitsquare.app.BitsquareApp;
 import io.bitsquare.btc.BitcoinNetwork;
 import io.bitsquare.btc.WalletService;
 import io.bitsquare.common.UserThread;
+import io.bitsquare.gui.common.model.Activatable;
+import io.bitsquare.gui.common.view.ActivatableViewAndModel;
 import io.bitsquare.gui.common.view.FxmlView;
-import io.bitsquare.gui.common.view.InitializableView;
 import io.bitsquare.gui.popups.Popup;
 import io.bitsquare.gui.util.BSFormatter;
+import io.bitsquare.p2p.Address;
 import io.bitsquare.p2p.P2PService;
+import io.bitsquare.p2p.P2PServiceListener;
+import io.bitsquare.p2p.network.TorNetworkNode;
 import io.bitsquare.p2p.seed.SeedNodesRepository;
 import io.bitsquare.user.Preferences;
+import javafx.beans.value.ChangeListener;
 import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
-import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
+import javafx.scene.layout.GridPane;
 
 import javax.inject.Inject;
+import java.util.Set;
 
 import static javafx.beans.binding.Bindings.createStringBinding;
 
 @FxmlView
-public class NetworkSettingsView extends InitializableView {
+public class NetworkSettingsView extends ActivatableViewAndModel<GridPane, Activatable> {
 
     private final String bitcoinNetworkString;
     private final WalletService walletService;
-    private final SeedNodesRepository bootstrapNodes;
     private final Preferences preferences;
     private final P2PService p2PService;
 
     @FXML
-    TextField bitcoinNetwork, connectionType, nodeAddress, connectedPeersBTC, connectedPeersP2P;
+    TextField bitcoinNetwork, onionAddress, connectedPeersBTC;
-    @FXML
-    CheckBox useUPnP;
     @FXML
     ComboBox<BitcoinNetwork> netWorkComboBox;
     @FXML
-    TextArea seedNodeNodeAddress;
+    TextArea authenticatedPeersTextArea;
+    private P2PServiceListener p2PServiceListener;
+    private ChangeListener<Number> numAuthenticatedPeersChangeListener;
+    private Set<Address> seedNodeAddresses;
 
     @Inject
-    public NetworkSettingsView(WalletService walletService, P2PService p2PService, SeedNodesRepository bootstrapNodes, Preferences preferences, BSFormatter
+    public NetworkSettingsView(WalletService walletService, P2PService p2PService, SeedNodesRepository seedNodesRepository, Preferences preferences, BSFormatter
             formatter) {
         this.walletService = walletService;
-        this.bootstrapNodes = bootstrapNodes;
         this.preferences = preferences;
         this.bitcoinNetworkString = formatter.formatBitcoinNetwork(preferences.getBitcoinNetwork());
         this.p2PService = p2PService;
+
+        if (p2PService.getNetworkNode() instanceof TorNetworkNode)
+            this.seedNodeAddresses = seedNodesRepository.getTorSeedNodeAddresses();
+        else
+            this.seedNodeAddresses = seedNodesRepository.getLocalhostSeedNodeAddresses();
     }
 
     public void initialize() {
@@ -72,29 +82,64 @@ public class NetworkSettingsView extends InitializableView {
         connectedPeersBTC.textProperty().bind(createStringBinding(() -> String.valueOf(walletService.numPeersProperty().get()), walletService
                 .numPeersProperty()));
 
-       /* if (networkService.getNetworkInfo() instanceof TomP2PNetworkInfo) {
-            TomP2PNetworkInfo networkInfo = (TomP2PNetworkInfo) networkService.getNetworkInfo();
-            connectionType.setText(networkInfo.getConnectionType().toString());
-            connectedPeersP2P.textProperty().bind(createStringBinding(() -> String.valueOf(networkInfo.numPeersProperty().get()), networkInfo.numPeersProperty()));
-            nodeAddress.setText(networkInfo.getClientNodeInfo());
-        }*/
-
-        /*List<NodeSpec> bootstrapNodeSpecs = bootstrapNodes.getBootstrapNodes();
-        String bootstrapNodesText = bootstrapNodeSpecs.stream().map(e -> e.toString() + "\n").collect(Collectors.toList()).toString()
-                .replace(", ", "").replace("[", "").replace("\n]", "");
-        bootstrapNodeAddress.setPrefRowCount(bootstrapNodeSpecs.size());
-        bootstrapNodeAddress.setText(bootstrapNodesText);*/
-
-        useUPnP.setSelected(preferences.getUseUPnP());
-
         netWorkComboBox.setItems(FXCollections.observableArrayList(BitcoinNetwork.values()));
         netWorkComboBox.getSelectionModel().select(preferences.getBitcoinNetwork());
         netWorkComboBox.setOnAction(e -> onSelectNetwork());
     }
 
-    @FXML
+    @Override
-    void onSelectUPnP() {
+    public void activate() {
-        preferences.setUseUPnP(useUPnP.isSelected());
+        Address address = p2PService.getAddress();
+        if (address == null) {
+            p2PServiceListener = new P2PServiceListener() {
+                @Override
+                public void onRequestingDataCompleted() {
+                }
+
+                @Override
+                public void onFirstPeerAuthenticated() {
+                }
+
+                @Override
+                public void onTorNodeReady() {
+                }
+
+                @Override
+                public void onHiddenServicePublished() {
+                    onionAddress.setText(p2PService.getAddress().getFullAddress());
+                }
+
+                @Override
+                public void onSetupFailed(Throwable throwable) {
+                }
+            };
+            p2PService.addP2PServiceListener(p2PServiceListener);
+        } else {
+            onionAddress.setText(address.getFullAddress());
+        }
+
+        numAuthenticatedPeersChangeListener = (observable, oldValue, newValue) -> updateAuthenticatedPeersTextArea();
+        p2PService.numAuthenticatedPeers.addListener(numAuthenticatedPeersChangeListener);
+        updateAuthenticatedPeersTextArea();
+    }
+
+    @Override
+    public void deactivate() {
+        if (p2PServiceListener != null)
+            p2PService.removeP2PServiceListener(p2PServiceListener);
+        if (numAuthenticatedPeersChangeListener != null)
+            p2PService.numAuthenticatedPeers.removeListener(numAuthenticatedPeersChangeListener);
+    }
+
+    private void updateAuthenticatedPeersTextArea() {
+        authenticatedPeersTextArea.clear();
+        p2PService.getAuthenticatedPeerAddresses().stream().forEach(e -> {
+            if (authenticatedPeersTextArea.getText().length() > 0)
+                authenticatedPeersTextArea.appendText("\n");
+            authenticatedPeersTextArea.appendText(e.getFullAddress());
+            if (seedNodeAddresses.contains(e))
+                authenticatedPeersTextArea.appendText(" (Seed node)");
+        });
     }
 
     private void onSelectNetwork() {

jtorproxy/pom.xml

@@ -15,13 +15,14 @@
         <dependency>
             <groupId>io.bitsquare</groupId>
             <artifactId>jsocks</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>io.bitsquare</groupId>
             <artifactId>jtorctl</artifactId>
-            <version>0.3.2-SNAPSHOT</version>
+            <version>${project.parent.version}</version>
         </dependency>
+
     </dependencies>
     <build>
         <plugins>

network/src/main/java/io/bitsquare/p2p/NetworkStatistics.java

@@ -1,14 +0,0 @@
-package io.bitsquare.p2p;
-
-import com.google.inject.Inject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class NetworkStatistics {
-    private static final Logger log = LoggerFactory.getLogger(NetworkStatistics.class);
-
-    @Inject
-    public NetworkStatistics() {
-
-    }
-}

network/src/main/java/io/bitsquare/p2p/P2PService.java

@@ -28,7 +28,9 @@ import io.bitsquare.p2p.storage.data.ProtectedMailboxData;
 import io.bitsquare.p2p.storage.messages.GetDataRequest;
 import io.bitsquare.p2p.storage.messages.GetDataResponse;
 import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleIntegerProperty;
 import org.fxmisc.easybind.EasyBind;
 import org.fxmisc.easybind.monadic.MonadicBinding;
 import org.jetbrains.annotations.NotNull;
@@ -60,7 +62,6 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
     private final EncryptionService encryptionService;
     private final KeyRing keyRing;
     private final File storageDir;
-    private final NetworkStatistics networkStatistics;
 
     private NetworkNode networkNode;
     private PeerGroup peerGroup;
@@ -78,6 +79,7 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
     private final BooleanProperty requestingDataCompleted = new SimpleBooleanProperty();
     private final BooleanProperty authenticated = new SimpleBooleanProperty();
     private MonadicBinding<Boolean> readyForAuthentication;
+    public final IntegerProperty numAuthenticatedPeers = new SimpleIntegerProperty(0);
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -101,8 +103,6 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
         this.keyRing = keyRing;
         this.storageDir = storageDir;
 
-        networkStatistics = new NetworkStatistics();
-
         init();
     }
 
@@ -120,7 +120,7 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
 
         // peer group 
         peerGroup = new PeerGroup(networkNode, seedNodeAddresses);
-        if (useLocalhost) PeerGroup.setSimulateAuthTorNode(1 * 1000);
+        if (useLocalhost) PeerGroup.setSimulateAuthTorNode(2 * 1000);
 
         // storage 
         dataStorage = new ProtectedExpirableDataStorage(peerGroup, storageDir);
@@ -216,6 +216,8 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
         authenticated.set(true);
 
         p2pServiceListeners.stream().forEach(e -> e.onFirstPeerAuthenticated());
+
+        numAuthenticatedPeers.set(authenticatedPeerAddresses.size());
     }
 
     @Override
@@ -223,6 +225,8 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
         Log.traceCall();
         if (connection.isAuthenticated())
             authenticatedPeerAddresses.remove(connection.getPeerAddress());
+
+        numAuthenticatedPeers.set(authenticatedPeerAddresses.size());
     }
 
     @Override
@@ -506,8 +510,8 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
                     }
                 });
             } catch (CryptoException e) {
-                e.printStackTrace();
                 log.error("sendEncryptedMessage failed");
+                e.printStackTrace();
                 sendMailboxMessageListener.onFault();
             }
         }
@@ -652,9 +656,8 @@ public class P2PService implements SetupListener, MessageListener, ConnectionLis
         return networkNode.getAddress();
     }
 
-    public NetworkStatistics getNetworkStatistics() {
+    public Set<Address> getAuthenticatedPeerAddresses() {
-        Log.traceCall();
+        return authenticatedPeerAddresses;
-        return networkStatistics;
     }
 
 

network/src/main/java/io/bitsquare/p2p/network/Connection.java

@@ -5,7 +5,6 @@ import com.google.common.util.concurrent.Uninterruptibles;
 import io.bitsquare.app.Log;
 import io.bitsquare.common.ByteArrayUtils;
 import io.bitsquare.common.UserThread;
-import io.bitsquare.common.util.Utilities;
 import io.bitsquare.p2p.Address;
 import io.bitsquare.p2p.Message;
 import io.bitsquare.p2p.Utils;
@@ -19,13 +18,8 @@ import java.net.Socket;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.util.Date;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Connection is created by the server thread or by sendMessage from NetworkNode.
@@ -137,16 +131,6 @@ public class Connection implements MessageListener {
         Log.traceCall();
         if (!stopped) {
             try {
-                Timer timeoutTimer = new Timer();
-                timeoutTimer.schedule(new TimerTask() {
-                    @Override
-                    public void run() {
-                        Utilities.setThreadName("SendMessageTimerTask");
-                        throw new RuntimeException("Timeout occurred: Send message " + message
-                                + " on connection with port " + portInfo + " failed.");
-                    }
-                }, SEND_MESSAGE_TIMEOUT);
-
                 log.info("writeObject " + message + " on connection with port " + portInfo);
                 Object objectToWrite;
                 if (useCompression) {
@@ -166,7 +150,6 @@ public class Connection implements MessageListener {
                     }
                     sharedSpace.updateLastActivityDate();
                 }
-                timeoutTimer.cancel();
             } catch (IOException e) {
                 // an exception lead to a shutdown
                 sharedSpace.handleConnectionException(e);
@@ -271,8 +254,8 @@ public class Connection implements MessageListener {
                         // TODO increase delay
                         Uninterruptibles.sleepUninterruptibly(200, TimeUnit.MILLISECONDS);
                     } catch (Throwable t) {
-                        t.printStackTrace();
                         log.error(t.getMessage());
+                        t.printStackTrace();
                     } finally {
                         UserThread.execute(() -> continueShutDown(shutDownCompleteHandler));
                     }
@@ -302,8 +285,8 @@ public class Connection implements MessageListener {
         } catch (SocketException e) {
             log.trace("SocketException at shutdown might be expected " + e.getMessage());
         } catch (IOException e) {
-            e.printStackTrace();
             log.error("Exception at shutdown. " + e.getMessage());
+            e.printStackTrace();
         } finally {
             MoreExecutors.shutdownAndAwaitTermination(singleThreadExecutor, 500, TimeUnit.MILLISECONDS);
 
@@ -412,7 +395,7 @@ public class Connection implements MessageListener {
                     shutDownReason = ConnectionListener.Reason.SOCKET_CLOSED;
                 else
                     shutDownReason = ConnectionListener.Reason.RESET;
-            } else if (e instanceof SocketTimeoutException) {
+            } else if (e instanceof SocketTimeoutException || e instanceof TimeoutException) {
                 shutDownReason = ConnectionListener.Reason.TIMEOUT;
             } else if (e instanceof EOFException) {
                 shutDownReason = ConnectionListener.Reason.PEER_DISCONNECTED;

network/src/main/java/io/bitsquare/p2p/network/LocalhostNetworkNode.java

@@ -27,8 +27,8 @@ import java.util.function.Consumer;
 public class LocalhostNetworkNode extends NetworkNode {
     private static final Logger log = LoggerFactory.getLogger(LocalhostNetworkNode.class);
 
-    private static volatile int simulateTorDelayTorNode = 1 * 100;
+    private static volatile int simulateTorDelayTorNode = 2 * 1000;
-    private static volatile int simulateTorDelayHiddenService = 1 * 100;
+    private static volatile int simulateTorDelayHiddenService = 2 * 1000;
     private Address address;
 
     public static void setSimulateTorDelayTorNode(int simulateTorDelayTorNode) {
@@ -144,7 +144,7 @@ public class LocalhostNetworkNode extends NetworkNode {
                     Uninterruptibles.sleepUninterruptibly(simulateTorDelayHiddenService, TimeUnit.MILLISECONDS);
 
                 log.info("\n\n############################################################\n" +
-                        "Hidden service created [simulation]:" +
+                        "Hidden service published [simulation]:" +
                         "\nTook " + (System.currentTimeMillis() - ts) + " ms"
                         + "\n############################################################\n");
                 // as we are simulating we return null

network/src/main/java/io/bitsquare/p2p/network/NetworkNode.java

@@ -26,6 +26,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
 public abstract class NetworkNode implements MessageListener, ConnectionListener {
     private static final Logger log = LoggerFactory.getLogger(NetworkNode.class);
 
+    private static final int CREATE_SOCKET_TIMEOUT = 1 * 1000;        // 10 sec.
+
     protected final int servicePort;
 
     private final CopyOnWriteArraySet<Connection> inBoundConnections = new CopyOnWriteArraySet<>();

network/src/main/java/io/bitsquare/p2p/network/Server.java

@@ -61,8 +61,8 @@ class Server implements Runnable {
                     e.printStackTrace();
             }
         } catch (Throwable t) {
-            t.printStackTrace();
             log.error("Executing task failed. " + t.getMessage());
+            t.printStackTrace();
         }
     }
 
@@ -78,8 +78,8 @@ class Server implements Runnable {
             } catch (SocketException e) {
                 log.warn("SocketException at shutdown might be expected " + e.getMessage());
             } catch (IOException e) {
-                e.printStackTrace();
                 log.error("Exception at shutdown. " + e.getMessage());
+                e.printStackTrace();
             } finally {
                 log.info("Server shutdown complete");
             }

network/src/main/java/io/bitsquare/p2p/network/TorNetworkNode.java

@@ -149,8 +149,8 @@ public class TorNetworkNode extends NetworkNode {
                 });
             } catch (Throwable e) {
                 UserThread.execute(() -> {
-                    e.printStackTrace();
                     log.error("Shutdown torNode failed with exception: " + e.getMessage());
+                    e.printStackTrace();
                     // We want to switch to UserThread
                     shutDownExecutorService();
                 });
@@ -175,8 +175,8 @@ public class TorNetworkNode extends NetworkNode {
                 log.info("Shutdown completed");
                 shutDownCompleteHandler.run();
             } catch (Throwable t) {
-                t.printStackTrace();
                 log.error("Shutdown executorService failed with exception: " + t.getMessage());
+                t.printStackTrace();
                 shutDownCompleteHandler.run();
             }
         }).start();

network/src/main/java/io/bitsquare/p2p/peers/PeerGroup.java

@@ -185,8 +185,8 @@ public class PeerGroup implements MessageListener, ConnectionListener {
 
             @Override
             public void onFailure(@NotNull Throwable throwable) {
-                throwable.printStackTrace();
                 log.error("AuthenticationHandshake failed. " + throwable.getMessage());
+                throwable.printStackTrace();
                 removePeer(connection.getPeerAddress());
             }
         });
@@ -229,8 +229,8 @@ public class PeerGroup implements MessageListener, ConnectionListener {
 
             @Override
             public void onFailure(@NotNull Throwable throwable) {
-                throwable.printStackTrace();
                 log.error("AuthenticationHandshake failed. " + throwable.getMessage());
+                throwable.printStackTrace();
                 removePeer(peerAddress);
 
                 // If we fail we try again with the remaining set
@@ -291,8 +291,8 @@ public class PeerGroup implements MessageListener, ConnectionListener {
 
             @Override
             public void onFailure(@NotNull Throwable throwable) {
-                throwable.printStackTrace();
                 log.error("AuthenticationHandshake failed. " + throwable.getMessage());
+                throwable.printStackTrace();
                 removePeer(peerAddress);
 
                 log.info("Authentication failed. Lets try again with the remaining reported peer addresses.");
@@ -338,8 +338,8 @@ public class PeerGroup implements MessageListener, ConnectionListener {
 
             @Override
             public void onFailure(@NotNull Throwable throwable) {
-                throwable.printStackTrace();
                 log.error("AuthenticationHandshake failed. " + throwable.getMessage());
+                throwable.printStackTrace();
                 removePeer(peerAddress);
                 if (faultHandler != null)
                     faultHandler.run();
@@ -394,8 +394,8 @@ public class PeerGroup implements MessageListener, ConnectionListener {
                         pingPeers();
                     });
                 } catch (Throwable t) {
-                    t.printStackTrace();
                     log.error("Executing task failed. " + t.getMessage());
+                    t.printStackTrace();
                 }
             }
         }, SEND_PING_INTERVAL, SEND_PING_INTERVAL);
@@ -407,8 +407,8 @@ public class PeerGroup implements MessageListener, ConnectionListener {
                 try {
                     UserThread.execute(() -> trySendGetPeersRequest());
                 } catch (Throwable t) {
-                    t.printStackTrace();
                     log.error("Executing task failed. " + t.getMessage());
+                    t.printStackTrace();
                 }
             }
         }, GET_PEERS_INTERVAL, GET_PEERS_INTERVAL);

network/src/main/java/io/bitsquare/p2p/storage/ProtectedExpirableDataStorage.java

@@ -77,8 +77,8 @@ public class ProtectedExpirableDataStorage implements MessageListener {
                                               Utilities.setThreadName("RemoveExpiredEntriesTimer");
                                               UserThread.execute(() -> removeExpiredEntries());
                                           } catch (Throwable t) {
-                                              t.printStackTrace();
                                               log.error("Executing task failed. " + t.getMessage());
+                                              t.printStackTrace();
                                           }
                                       }
                                   },

network/src/main/java/io/bitsquare/p2p/storage/data/ProtectedData.java

@@ -37,6 +37,7 @@ public class ProtectedData implements Serializable {
             date = new Date();
 
         } catch (Throwable t) {
+            log.error("Exception at readObject: " + t.getMessage());
             t.printStackTrace();
         }
     }

network/src/main/java/io/bitsquare/p2p/storage/data/ProtectedMailboxData.java

@@ -35,6 +35,7 @@ public class ProtectedMailboxData extends ProtectedData {
             date = new Date();
 
         } catch (Throwable t) {
+            log.error("Exception at readObject: " + t.getMessage());
             t.printStackTrace();
         }
     }

package/instructions.txt

@@ -1,24 +0,0 @@
-Binary build instructions with Update FX:
-
-Binary build:
-
-1. Set version numbers in UpdateProcess, BitsquareAppMain and pom files. Check in changes.
-2. Remove previous build files under core/updatefx. Use wallet file form backup if not there. Run setup.sh. Key in UpdateProcess must be same as reported in 
-console.
-3. Run create_app.sh
-4. Upload index to server
-5. Build windows binary. Copy wallet file from backup if not there. Clean all before. Edit version numbers (not automated in win bat file)
-6. Build Linux binary.
-
-Update new jar file:
-1. Change build version number in UpdateProcess and pom files. Check in changes.
-2. Run update.sh
-3. Upload bpatch file and index to server
-4. Run update at windows and linux
-
-
-Todo: 
-- Support 32bit builds
-- Make version handling in bat and linux.sh file automatic (regex from mac file fails on ubuntu)
-- Signing
-- Threshold signature for updates

package/linux/create_app.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 cd ../../
+mkdir gui/deploy
 
 set -e
 
@@ -22,7 +23,7 @@ $JAVA_HOME/bin/javapackager \
     -title Bitsquare \
     -vendor Bitsquare \
     -outdir gui/deploy \
-    -srcfiles gui/updatefx/builds/processed/1.jar \
+    -srcfiles gui/deploy/Bitsquare.jar \
     -srcfiles package/linux/LICENSE \
     -appclass io.bitsquare.app.BitsquareAppMain \
     -outfile Bitsquare

package/linux/setup.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# setup dirs
-cd ../../
-
-mkdir gui/updatefx
-mkdir gui/updatefx/builds
-mkdir gui/updatefx/builds/processed
-mkdir gui/deploy
-
-cd package/linux

package/mac/Info.plist

@@ -44,7 +44,7 @@
         <key>JVMAppClasspath</key>
         <string></string>
         <key>JVMMainJarName</key>
-        <string>1.jar</string>
+        <string>2.jar</string>
         <key>JVMPreferencesID</key>
         <string>bitsquare</string>
         <key>JVMOptions</key>

package/mac/create_app.sh

@@ -1,21 +1,21 @@
 #!/bin/bash
 
 cd ../../
+mkdir gui/deploy
 
 set -e
 
 # Extract the version numbers. 
-majorVersion=$( sed -n 's/^.*final int MAJOR_VERSION = //p' core/src/main/java/io/bitsquare/app/Version.java )
+majorVersion=$( sed -n 's/^.*final int MAJOR_VERSION = //p' common/src/main/java/io/bitsquare/app/Version.java )
-minorVersion=$( sed -n 's/^.*final int MINOR_VERSION = //p' core/src/main/java/io/bitsquare/app/Version.java )
+minorVersion=$( sed -n 's/^.*final int MINOR_VERSION = //p' common/src/main/java/io/bitsquare/app/Version.java )
-# PatchVersion is used for ever increasing integer at UpdateFX. fullVersion contains major and minor version + patchVersion 
+patchVersion=$( sed -n 's/^.*final int PATCH_VERSION = //p' common/src/main/java/io/bitsquare/app/Version.java )
-patchVersion=$( sed -n 's/^.*final int PATCH_VERSION = //p' core/src/main/java/io/bitsquare/app/Version.java )
 
 # remove trailing;
 majorVersion="${majorVersion:0:${#majorVersion}-1}"
 minorVersion="${minorVersion:0:${#minorVersion}-1}"
 patchVersion="${patchVersion:0:${#patchVersion}-1}"
 
-fullVersion=$( sed -n 's/^.*final String VERSION = "//p' core/src/main/java/io/bitsquare/app/Version.java )
+fullVersion=$( sed -n 's/^.*final String VERSION = "//p' common/src/main/java/io/bitsquare/app/Version.java )
 # remove trailing ";
 fullVersion=$majorVersion.$minorVersion.$patchVersion
 
@@ -29,9 +29,7 @@ sed "s|JAR_NAME_STRING_GOES_HERE|$patchVersion.jar|" package/mac/Info.template.p
 
 
 mvn clean package -DskipTests -Dmaven.javadoc.skip=true
-cp gui/target/shaded.jar gui/updatefx/builds/$patchVersion.jar
+cp gui/target/shaded.jar gui/deploy/Bitsquare.jar
-
-java -jar ./updatefx/updatefx-app-1.3-SNAPSHOT.jar --url=http://bitsquare.io/updateFX/v03 gui/updatefx
 
 $JAVA_HOME/bin/javapackager \
     -deploy \
@@ -45,7 +43,7 @@ $JAVA_HOME/bin/javapackager \
     -title Bitsquare \
     -vendor Bitsquare \
     -outdir gui/deploy \
-    -srcfiles gui/updatefx/builds/processed/$patchVersion.jar \
+    -srcfiles gui/target/shaded.jar \
     -appclass io.bitsquare.app.BitsquareAppMain \
     -outfile Bitsquare \
     -BjvmProperties=-Djava.net.preferIPv4Stack=true

package/mac/setup.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# setup dirs
-cd ../../
-mkdir gui/updatefx
-mkdir gui/updatefx/builds
-mkdir gui/updatefx/builds/processed
-mkdir gui/updatefx/site
-mkdir gui/deploy
-
-# create key/wallet. Copy wallet key to UpdateProcess and use wallet for other OS builds
-java -jar ./updatefx/updatefx-app-1.3-SNAPSHOT.jar --url=http://bitsquare.io/updateFX/v03 gui/updatefx
-
-cd package/mac
-
-# create icons
-# iconutil -c icns package/bitsquare.iconset

package/mac/update.sh

@@ -1,31 +0,0 @@
-#!/bin/bash
-
-cd ../../
-
-set -e
-
-# Extract the version numbers. 
-majorVersion=$( sed -n 's/^.*final int MAJOR_VERSION = //p' core/src/main/java/io/bitsquare/app/Version.java )
-minorVersion=$( sed -n 's/^.*final int MINOR_VERSION = //p' core/src/main/java/io/bitsquare/app/Version.java )
-# PatchVersion is used for ever increasing integer at UpdateFX. fullVersion contains major and minor version + patchVersion 
-patchVersion=$( sed -n 's/^.*final int PATCH_VERSION = //p' core/src/main/java/io/bitsquare/app/Version.java )
-
-# remove trailing;
-majorVersion="${majorVersion:0:${#majorVersion}-1}"
-minorVersion="${minorVersion:0:${#minorVersion}-1}"
-patchVersion="${patchVersion:0:${#patchVersion}-1}"
-
-fullVersion=$( sed -n 's/^.*final String VERSION = "//p' core/src/main/java/io/bitsquare/app/Version.java )
-# remove trailing ";
-fullVersion=$majorVersion.$minorVersion.$patchVersion
-
-echo majorVersion = $majorVersion
-echo minorVersion = $minorVersion
-echo patchVersion = $patchVersion
-echo fullVersion = $fullVersion
-
-mvn clean package -DskipTests -Dmaven.javadoc.skip=true
-cp gui/target/shaded.jar gui/updatefx/builds/$patchVersion.jar
-java -jar ./updatefx/updatefx-app-1.3-SNAPSHOT.jar --url=http://bitsquare.io/updateFX/v03 gui/updatefx
-
-cd package/mac

package/windows/create_app.bat

@@ -1,16 +1,17 @@
 cd ..\..\
+mkdir gui\deploy
 
-:: edit iss file -> AppVersion=0.3.1
+:: edit iss file -> AppVersion=0.3.2
 
-:: Copy jar file from mac build (1.jar from processed folder) to windows
+:: Copy gui/deploy.Bitsquare.jar file from mac build to windows
-:: edit -> -BappVersion=0.3.1 and -srcfiles
+:: edit -> -BappVersion=0.3.2 and -srcfiles
 
 :: 64 bit build
 :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
 :: Build with jdk1.8.0_40 fails but jdk1.8.0_3 works
-call "C:\Program Files\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.3.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\updatefx\builds\processed\1.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_31\jre"
+call "C:\Program Files\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.3.2 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\deploy\Bitsquare.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_31\jre"
 
 :: 32 bit build
-:: call "C:\Program Files (x86)\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.3.1 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\updatefx\builds\processed\1.jar" -outfile Bitsquare -Bruntime="C:\Program Files (x86)\Java\jdk1.8.0_31\jre"
+:: call "C:\Program Files (x86)\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.3.2 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\deploy\Bitsquare.jar" -outfile Bitsquare -Bruntime="C:\Program Files (x86)\Java\jdk1.8.0_31\jre"
 
 cd package\windows

package/windows/setup.bat

@@ -1,9 +0,0 @@
-cd ..\..\
-
-:: setup dirs
-mkdir gui\updatefx
-mkdir gui\updatefx\builds
-mkdir gui\updatefx\builds\processed
-mkdir gui\deploy
-
-cd package\windows

seednode/src/main/java/io/bitsquare/p2p/seed/SeedNodeMain.java

@@ -51,8 +51,8 @@ public class SeedNodeMain {
                 seedNode.processArgs(args);
                 seedNode.createAndStartP2PService();
             } catch (Throwable t) {
-                t.printStackTrace();
                 log.error("Executing task failed. " + t.getMessage());
+                t.printStackTrace();
             }
         });
         listenForExitCommand();