From bec9a6875083908dc4ec6a9a4ed4ce602f1e19e6 Mon Sep 17 00:00:00 2001
From: Steve Myers <steven.myers@gmail.com>
Date: Sun, 12 Oct 2014 14:56:52 -0700
Subject: [PATCH] Merged seedpeer branch with master branch, cleanup

---
 .../java/io/bitsquare/di/BitSquareModule.java | 13 ++++-----
 .../java/io/bitsquare/gui/main/MainModel.java | 27 ++++---------------
 .../io/bitsquare/msg/SeedNodeAddress.java     |  5 ++--
 3 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/src/main/java/io/bitsquare/di/BitSquareModule.java b/src/main/java/io/bitsquare/di/BitSquareModule.java
index 2ac1ce63df..eacc591a28 100644
--- a/src/main/java/io/bitsquare/di/BitSquareModule.java
+++ b/src/main/java/io/bitsquare/di/BitSquareModule.java
@@ -119,14 +119,15 @@ class StaticSeedNodeAddressesProvider implements Provider<SeedNodeAddress.Static
         String seedNodeFromConfig = BitSquareModule.properties.getProperty("defaultSeedNode");
 
         // Set default 
-        SeedNodeAddress.StaticSeedNodeAddresses seedNode = SeedNodeAddress.StaticSeedNodeAddresses.LOCALHOST;
-        // SeedNodeAddress.StaticSeedNodeAddresses seedNode = SeedNodeAddress.StaticSeedNodeAddresses.DIGITAL_OCEAN;
+        //SeedNodeAddress.StaticSeedNodeAddresses seedNode = SeedNodeAddress.StaticSeedNodeAddresses.LOCALHOST;
+         SeedNodeAddress.StaticSeedNodeAddresses seedNode = SeedNodeAddress.StaticSeedNodeAddresses.DIGITAL_OCEAN1;
 
         // if defined in config we override the above
-        if (seedNodeFromConfig != null)
-            seedNode = seedNodeFromConfig.equals("localhost") ?
-                    SeedNodeAddress.StaticSeedNodeAddresses.LOCALHOST :
-                    SeedNodeAddress.StaticSeedNodeAddresses.DIGITAL_OCEAN;
+//        if (seedNodeFromConfig != null)
+//            seedNode = seedNodeFromConfig.equals("localhost") ?
+//                    SeedNodeAddress.StaticSeedNodeAddresses.LOCALHOST :
+//                    SeedNodeAddress.StaticSeedNodeAddresses.DIGITAL_OCEAN;
+
         return seedNode;
     }
 }
diff --git a/src/main/java/io/bitsquare/gui/main/MainModel.java b/src/main/java/io/bitsquare/gui/main/MainModel.java
index ffbb51e607..89a6ace254 100644
--- a/src/main/java/io/bitsquare/gui/main/MainModel.java
+++ b/src/main/java/io/bitsquare/gui/main/MainModel.java
@@ -21,9 +21,7 @@ import io.bitsquare.bank.BankAccount;
 import io.bitsquare.btc.WalletFacade;
 import io.bitsquare.gui.UIModel;
 import io.bitsquare.gui.util.Profiler;
-import io.bitsquare.msg.DHTSeedService;
 import io.bitsquare.msg.MessageFacade;
-import io.bitsquare.msg.actor.event.PeerInitialized;
 import io.bitsquare.msg.listeners.BootstrapListener;
 import io.bitsquare.persistence.Persistence;
 import io.bitsquare.trade.Trade;
@@ -54,7 +52,6 @@ class MainModel extends UIModel {
     private static final Logger log = LoggerFactory.getLogger(MainModel.class);
 
     private final User user;
-    private final DHTSeedService dhtSeedService;
     private final WalletFacade walletFacade;
     private final MessageFacade messageFacade;
     private final TradeManager tradeManager;
@@ -73,10 +70,9 @@ class MainModel extends UIModel {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     @Inject
-    private MainModel(User user, DHTSeedService dhtSeedService, WalletFacade walletFacade, MessageFacade messageFacade,
+    private MainModel(User user, WalletFacade walletFacade, MessageFacade messageFacade,
                       TradeManager tradeManager, Persistence persistence) {
         this.user = user;
-        this.dhtSeedService = dhtSeedService;
         this.walletFacade = walletFacade;
         this.messageFacade = messageFacade;
         this.tradeManager = tradeManager;
@@ -185,31 +181,18 @@ class MainModel extends UIModel {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     private void onFacadesInitialised() {
-        // TODO Consider to use version sync notification pane from Mike Hearn
-        walletFacade.addDownloadListener(new WalletFacade.DownloadListener() {
-            @Override
-            public void progress(double percent) {
-                networkSyncProgress.set(percent);
-            }
-
-            @Override
-            public void downloadComplete() {
-                networkSyncComplete.set(true);
-            }
-        });
-
         tradeManager.getPendingTrades().addListener((MapChangeListener<String,
                 Trade>) change -> updateNumPendingTrades());
         updateNumPendingTrades();
 
-        backendInited.set(true);
+        facadesInitialised = true;
+
+        if (networkSyncProgress.get() >= 1.0)
+            backendReady.set(true);
     }
 
     private void updateNumPendingTrades() {
         numPendingTrades.set(tradeManager.getPendingTrades().size());
     }
 
-   /* private void updateBalance(Coin balance) {
-        this.balance.set(balance);
-    }*/
 }
diff --git a/src/main/java/io/bitsquare/msg/SeedNodeAddress.java b/src/main/java/io/bitsquare/msg/SeedNodeAddress.java
index 0469c59a84..02374a885b 100644
--- a/src/main/java/io/bitsquare/msg/SeedNodeAddress.java
+++ b/src/main/java/io/bitsquare/msg/SeedNodeAddress.java
@@ -55,8 +55,9 @@ public class SeedNodeAddress {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     public enum StaticSeedNodeAddresses {
-        LOCALHOST("localhost", "127.0.0.1", 5001),
-        DIGITAL_OCEAN("digitalocean.bitsquare.io", "188.226.179.109", 5000);
+        DIGITAL_OCEAN1("digitalocean1.bitsquare.io", "188.226.179.109", 5000),
+        DIGITAL_OCEAN2("digitalocean2.bitsquare.io", "128.199.251.106", 5000),
+        LOCALHOST("localhost", "127.0.0.1", 5001);
 
         private final String id;
         private final String ip;