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 a bit more code out of the giant fee calculation function.

Browse Source
This commit is contained in:
Mike Hearn 2013-06-11 12:29:28 +02:00
parent b865e6a510
commit 80b66a8945
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3170,26 +3170,15 @@ public class Wallet implements Serializable, BlockChainListener {
} }
} }
// Now add unsigned inputs for the selected coins.
for (TransactionOutput output : selection.gathered) { for (TransactionOutput output : selection.gathered) {
TransactionInput input = req.tx.addInput(output); TransactionInput input = req.tx.addInput(output);
// If the scriptBytes don't default to none, our size calculations will be thrown off. // If the scriptBytes don't default to none, our size calculations will be thrown off.
checkState(input.getScriptBytes().length == 0); checkState(input.getScriptBytes().length == 0);
try {
if (output.getScriptPubKey().isSentToAddress()) {
// Send-to-address spends usually take maximum pubkey.length (as it may be compressed or not) + 75 bytes
size += findKeyFromPubHash(output.getScriptPubKey().getPubKeyHash()).getPubKey().length + 75;
} else if (output.getScriptPubKey().isSentToRawPubKey())
size += 74; // Send-to-pubkey spends usually take maximum 74 bytes to spend
else
throw new RuntimeException("Unknown output type returned in coin selection");
} catch (ScriptException e) {
// If this happens it means an output script in a wallet tx could not be understood. That should never
// happen, if it does it means the wallet has got into an inconsistent state.
throw new RuntimeException(e);
}
} }
// Estimate transaction size and loop again if we need more fee per kb // Estimate transaction size and loop again if we need more fee per kb
size += estimateBytesForSpending(selection);
size += req.tx.bitcoinSerialize().length; size += req.tx.bitcoinSerialize().length;
if (size/1000 > minSize/1000 && req.feePerKb.compareTo(BigInteger.ZERO) > 0) { if (size/1000 > minSize/1000 && req.feePerKb.compareTo(BigInteger.ZERO) > 0) {
minSize = size; minSize = size;
@ -3260,6 +3249,26 @@ public class Wallet implements Serializable, BlockChainListener {
} }
} }
private int estimateBytesForSpending(CoinSelection selection) {
int size = 0;
for (TransactionOutput output : selection.gathered) {
try {
if (output.getScriptPubKey().isSentToAddress()) {
// Send-to-address spends usually take maximum pubkey.length (as it may be compressed or not) + 75 bytes
size += findKeyFromPubHash(output.getScriptPubKey().getPubKeyHash()).getPubKey().length + 75;
} else if (output.getScriptPubKey().isSentToRawPubKey())
size += 74; // Send-to-pubkey spends usually take maximum 74 bytes to spend
else
throw new RuntimeException("Unknown output type returned in coin selection");
} catch (ScriptException e) {
// If this happens it means an output script in a wallet tx could not be understood. That should never
// happen, if it does it means the wallet has got into an inconsistent state.
throw new RuntimeException(e);
}
}
return size;
}
private void resetTxInputs(SendRequest req, List<TransactionInput> originalInputs) { private void resetTxInputs(SendRequest req, List<TransactionInput> originalInputs) {
req.tx.clearInputs(); req.tx.clearInputs();
for (TransactionInput input : originalInputs) for (TransactionInput input : originalInputs)