diff --git a/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java b/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java index 3dabc209df..7d2104fe55 100644 --- a/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java +++ b/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java @@ -110,7 +110,7 @@ public class BootstrapNodes { } public Node getRandomDiscoverNode() { - return bootstrapNodes.get(new Random().nextInt(rawBootstrapNodes.size())); + return bootstrapNodes.get(new Random().nextInt(bootstrapNodes.size())); } public List getBootstrapNodes() { diff --git a/core/src/main/java/io/bitsquare/trade/offer/tomp2p/TomP2POfferBookService.java b/core/src/main/java/io/bitsquare/trade/offer/tomp2p/TomP2POfferBookService.java index 9dd2dc4719..fc2e7fa520 100644 --- a/core/src/main/java/io/bitsquare/trade/offer/tomp2p/TomP2POfferBookService.java +++ b/core/src/main/java/io/bitsquare/trade/offer/tomp2p/TomP2POfferBookService.java @@ -52,7 +52,8 @@ import org.slf4j.LoggerFactory; public class TomP2POfferBookService extends TomP2PDHTService implements OfferBookService { private static final Logger log = LoggerFactory.getLogger(TomP2POfferBookService.class); - private static final int TTL = 30 * 24 * 60 * 60; // the offer is default 30 days valid + //private static final int TTL = 30 * 24 * 60 * 60; // the offer is default 30 days valid + private static final int TTL = 2 * 60 * 60; // for testing the offer is only 2 hour valid private final List offerRepositoryListeners = new ArrayList<>(); private final LongProperty invalidationTimestamp = new SimpleLongProperty(0); diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java index 7be53a49d7..e74fdcf791 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java @@ -166,7 +166,7 @@ class MainViewModel implements ViewModel { Utilities.setTimeout(2000, () -> setBitcoinNetworkSyncProgress(walletService.downloadPercentageProperty().get())); walletService.numPeersProperty().addListener((observable, oldValue, newValue) -> { - + log.debug("Bitcoin peers " + newValue); numBTCPeers.set(String.valueOf(newValue) + " peers"); if ((int) newValue < 1) { if (lostBTCConnectionTimeoutTimer != null) diff --git a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java index a935dc616a..85f0aa47d6 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/funds/withdrawal/WithdrawalView.java @@ -112,7 +112,6 @@ public class WithdrawalView extends ActivatableViewAndModel { withdrawFromTextField.textProperty(), amountTextField.textProperty(), withdrawToTextField.textProperty())); table.getSelectionModel().selectedItemProperty().addListener((observableValue, oldValue, newValue) -> { if (newValue != null) { - if (Coin.ZERO.compareTo(newValue.getBalance()) <= 0) { amountTextField.setText(newValue.getBalance().toPlainString()); withdrawFromTextField.setText(newValue.getAddressEntry().getAddressString()); diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java index 9e6e905666..5929dd7d2f 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/PendingTradesViewModel.java @@ -403,6 +403,9 @@ public class PendingTradesViewModel extends ActivatableWithDataModel