Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-03-14 18:06:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merged seedpeer branch with master branch, cleanup

Browse Source
This commit is contained in:
Steve Myers 2014-10-12 15:21:23 -07:00
parent bec9a68750
commit 7c823714b4
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/io/bitsquare/btc/AddressBasedCoinSelector.java
View File

@ -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) {

14
src/main/resources/bitsquare.properties
View File

@ -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