From bec9a6875083908dc4ec6a9a4ed4ce602f1e19e6 Mon Sep 17 00:00:00 2001 From: Steve Myers 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) 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;