Qortal/altcoinj
3
0
Fork 0
mirror of https://github.com/Qortal/altcoinj.git synced 2025-01-31 23:32:16 +00:00
Code Issues Projects Releases Wiki Activity

Split some selection logic into a static method of DefaultCoinSelector. Resolves issue 322.

Browse Source
This commit is contained in:
Mike Hearn 2013-03-06 12:13:34 +01:00
parent 27a49655fb
commit e57068451d
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
core/src/main/java/com/google/bitcoin/core/Wallet.java
View File

@ -244,6 +244,17 @@ public class Wallet implements Serializable, BlockChainListener {
// bit over (excessive value will be change). // bit over (excessive value will be change).
for (TransactionOutput output : sortedOutputs) { for (TransactionOutput output : sortedOutputs) {
if (total >= target) break; if (total >= target) break;
// Only pick chain-included transactions, or transactions that are ours and pending.
if (!isSelectable(output)) continue;
selected.add(output);
total += output.getValue().longValue();
}
// Total may be lower than target here, if the given candidates were insufficient to create to requested
// transaction.
return new CoinSelection(BigInteger.valueOf(total), selected);
}
public static boolean isSelectable(TransactionOutput output) {
// Only pick chain-included transactions, or transactions that are ours and pending. // Only pick chain-included transactions, or transactions that are ours and pending.
TransactionConfidence confidence = output.parentTransaction.getConfidence(); TransactionConfidence confidence = output.parentTransaction.getConfidence();
ConfidenceType type = confidence.getConfidenceType(); ConfidenceType type = confidence.getConfidenceType();
@ -252,19 +263,14 @@ public class Wallet implements Serializable, BlockChainListener {
boolean confirmed = type.equals(ConfidenceType.BUILDING); boolean confirmed = type.equals(ConfidenceType.BUILDING);
if (!confirmed) { if (!confirmed) {
// If the transaction is still pending ... // If the transaction is still pending ...
if (!pending) continue; if (!pending) return false;
// And it was created by us ... // And it was created by us ...
if (!confidence.getSource().equals(TransactionConfidence.Source.SELF)) continue; if (!confidence.getSource().equals(TransactionConfidence.Source.SELF)) return false;
// And it's been seen by the network and propagated ... // And it's been seen by the network and propagated ...
if (confidence.numBroadcastPeers() <= 1) continue; if (confidence.numBroadcastPeers() <= 1) return false;
// Then it's OK to select. // Then it's OK to select.
} }
selected.add(output); return true;
total += output.getValue().longValue();
}
// Total may be lower than target here, if the given candidates were insufficient to create to requested
// transaction.
return new CoinSelection(BigInteger.valueOf(total), selected);
} }
} }
@ -570,7 +576,6 @@ public class Wallet implements Serializable, BlockChainListener {
* @param delayTime How many time units to wait until saving the wallet on a background thread. * @param delayTime How many time units to wait until saving the wallet on a background thread.
* @param timeUnit the unit of measurement for delayTime. * @param timeUnit the unit of measurement for delayTime.
* @param eventListener callback to be informed when the auto-save thread does things, or null * @param eventListener callback to be informed when the auto-save thread does things, or null
* @throws IOException
*/ */
public synchronized void autosaveToFile(File f, long delayTime, TimeUnit timeUnit, public synchronized void autosaveToFile(File f, long delayTime, TimeUnit timeUnit,
AutosaveEventListener eventListener) { AutosaveEventListener eventListener) {