Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-02 11:46:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merged seedpeer branch with master branch, cleanup

Browse source
This commit is contained in:
Steve Myers 2014-10-12 15:43:45 -07:00
parent 7c823714b4
commit 5a3cd72b80
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,6 @@ import org.bitcoinj.core.NetworkParameters;
import org.bitcoinj.core.Transaction; import org.bitcoinj.core.Transaction;
import org.bitcoinj.core.TransactionConfidence; import org.bitcoinj.core.TransactionConfidence;
import org.bitcoinj.core.TransactionOutput; import org.bitcoinj.core.TransactionOutput;
import org.bitcoinj.params.RegTestParams;
import org.bitcoinj.wallet.CoinSelection; import org.bitcoinj.wallet.CoinSelection;
import org.bitcoinj.wallet.DefaultCoinSelector; import org.bitcoinj.wallet.DefaultCoinSelector;
@ -95,14 +94,20 @@ class AddressBasedCoinSelector extends DefaultCoinSelector {
// TODO It might be risky to accept 0 confirmation tx from the network with only > 1 numBroadcastPeers // 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 // 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 // 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) && type.equals(TransactionConfidence.ConfidenceType.PENDING) &&
// we accept network tx without confirmations and numBroadcastPeers > 0 // 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. // 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 // TODO: The value 1 below dates from a time when transactions we broadcast *to* were
// counted, set to 0 // counted, set to 0
(confidence.numBroadcastPeers() > 1 || tx.getParams() == RegTestParams.get()); (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);
} }
private static boolean isInBlockChain(Transaction tx) { private static boolean isInBlockChain(Transaction tx) {