mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-03-13 11:36:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Wallet: extract common code into private estimateFees() method

Browse source
This commit is contained in:
Sean Gilligan 2023-08-05 19:40:29 -07:00 • committed by Andreas Schildbach
parent 97cd7d44fb
commit 781bd56b55
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/src/main/java/org/bitcoinj/wallet/Wallet.java
View file

@ -4766,10 +4766,7 @@ public class Wallet extends BaseTaggableObject
*/
private boolean adjustOutputDownwardsForFee(Transaction tx, CoinSelection coinSelection, Coin feePerKb,
boolean ensureMinRequiredFee) {
if (ensureMinRequiredFee && feePerKb.compareTo(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE) < 0)
feePerKb = Transaction.REFERENCE_DEFAULT_MIN_TX_FEE;
final int vsize = tx.getVsize() + estimateVirtualBytesForSigning(coinSelection);
Coin fee = feePerKb.multiply(vsize).divide(1000);
Coin fee = estimateFees(tx, coinSelection, feePerKb, ensureMinRequiredFee);
TransactionOutput output = tx.getOutput(0);
output.setValue(output.getValue().subtract(fee));
return !output.isDust();
@ -5518,12 +5515,7 @@ public class Wallet extends BaseTaggableObject
checkState(!input.hasWitness());
}
Coin feePerKb = (needAtLeastReferenceFee && req.feePerKb.compareTo(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE) < 0)
? Transaction.REFERENCE_DEFAULT_MIN_TX_FEE
: req.feePerKb;
final int vsize = tx.getVsize() + estimateVirtualBytesForSigning(selection);
Coin feeNeeded = feePerKb.multiply(vsize).divide(1000);
Coin feeNeeded = estimateFees(tx, selection, req.feePerKb, needAtLeastReferenceFee);
if (!fee.isLessThan(feeNeeded)) {
// Done, enough fee included.
@ -5542,6 +5534,14 @@ public class Wallet extends BaseTaggableObject
tx.addInput(TransactionInput.read(ByteBuffer.wrap(input.bitcoinSerialize()), tx));
}
private Coin estimateFees(Transaction tx, CoinSelection coinSelection, Coin requestedFeePerKb, boolean ensureMinRequiredFee) {
Coin feePerKb = (ensureMinRequiredFee && requestedFeePerKb.isLessThan(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE))
? Transaction.REFERENCE_DEFAULT_MIN_TX_FEE
: requestedFeePerKb;
int vSize = tx.getVsize() + estimateVirtualBytesForSigning(coinSelection);
return feePerKb.multiply(vSize).divide(1000);
}
private int estimateVirtualBytesForSigning(CoinSelection selection) {
int vsize = 0;
for (TransactionOutput output : selection.outputs()) {