From 7c823714b45182492f266ca27a9627eb80935476 Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Sun, 12 Oct 2014 15:21:23 -0700 Subject: [PATCH] Merged seedpeer branch with master branch, cleanup --- .../io/bitsquare/btc/AddressBasedCoinSelector.java | 13 ++++--------- src/main/resources/bitsquare.properties | 14 +++++++++----- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java b/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java index 3b228a8028..b1260cd2fc 100644 --- a/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java +++ b/src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java @@ -23,6 +23,7 @@ import org.bitcoinj.core.NetworkParameters; import org.bitcoinj.core.Transaction; import org.bitcoinj.core.TransactionConfidence; import org.bitcoinj.core.TransactionOutput; +import org.bitcoinj.params.RegTestParams; import org.bitcoinj.wallet.CoinSelection; import org.bitcoinj.wallet.DefaultCoinSelector; @@ -94,20 +95,14 @@ class AddressBasedCoinSelector extends DefaultCoinSelector { // TODO It might be risky to accept 0 confirmation tx from the network with only > 1 numBroadcastPeers // Need to be tested in testnet and mainnet // We need to handle cases when malleability happens or tx get lost and have not been successful propagated - /* return type.equals(TransactionConfidence.ConfidenceType.BUILDING) || + return type.equals(TransactionConfidence.ConfidenceType.BUILDING) || type.equals(TransactionConfidence.ConfidenceType.PENDING) && // we accept network tx without confirmations and numBroadcastPeers > 0 - //confidence.getSource().equals(TransactionConfidence.Source.SELF) && + /*confidence.getSource().equals(TransactionConfidence.Source.SELF) &&*/ // In regtest mode we expect to have only one peer, so we won't see transactions propagate. // TODO: The value 1 below dates from a time when transactions we broadcast *to* were // counted, set to 0 - (confidence.numBroadcastPeers() > 1 || tx.getParams() == RegTestParams.get());*/ - - log.debug("numBroadcastPeers = " + confidence.numBroadcastPeers()); - // TODO at testnet we got confidence.numBroadcastPeers()=0 -> probably because we use chained unconfirmed tx - // investigate further - return type.equals(TransactionConfidence.ConfidenceType.BUILDING) || - type.equals(TransactionConfidence.ConfidenceType.PENDING); + (confidence.numBroadcastPeers() > 1 || tx.getParams() == RegTestParams.get()); } private static boolean isInBlockChain(Transaction tx) { diff --git a/src/main/resources/bitsquare.properties b/src/main/resources/bitsquare.properties index 75bbb382d4..416874c054 100644 --- a/src/main/resources/bitsquare.properties +++ b/src/main/resources/bitsquare.properties @@ -1,7 +1,11 @@ -seed.0.id=localhost -seed.0.address=127.0.0.1 -seed.0.port=5001 +seed.0.id=digitalocean1.bitsquare.io +seed.0.address=188.226.179.109 +seed.0.port=5000 -seed.1.id=digitalocean.bitsquare.io -seed.1.address=188.226.179.109 +seed.1.id=digitalocean2.bitsquare.io +seed.1.address=128.199.251.106 seed.1.port=5000 + +seed.2.id=localhost +seed.2.address=127.0.0.1 +seed.2.port=5001