mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-25 07:07:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Wallet.completeTx: Harmonize logging of requested and effective fee/fee rate.

Browse source
This commit is contained in:
Andreas Schildbach 2016-10-27 22:34:50 +02:00
parent 9cfa0a35a1
commit 2f14c76fb8
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3929,8 +3929,8 @@ public class Wallet extends BaseTaggableObject
value = value.add(output.getValue()); value = value.add(output.getValue());
} }
log.info("Completing send tx with {} outputs totalling {} (not including fees)", log.info("Completing send tx with {} outputs totalling {} and a fee of {}/kB", req.tx.getOutputs().size(),
req.tx.getOutputs().size(), value.toFriendlyString()); value.toFriendlyString(), req.feePerKb.toFriendlyString());
// If any inputs have already been added, we don't need to get their value from wallet // If any inputs have already been added, we don't need to get their value from wallet
Coin totalInput = Coin.ZERO; Coin totalInput = Coin.ZERO;
@ -4007,12 +4007,6 @@ public class Wallet extends BaseTaggableObject
if (size > Transaction.MAX_STANDARD_TX_SIZE) if (size > Transaction.MAX_STANDARD_TX_SIZE)
throw new ExceededMaxTransactionSize(); throw new ExceededMaxTransactionSize();
final Coin calculatedFee = req.tx.getFee();
if (calculatedFee != null)
log.info(" with a fee of {}/kB, {} for {} bytes",
calculatedFee.multiply(1000).divide(size).toFriendlyString(), calculatedFee.toFriendlyString(),
size);
// Label the transaction as being self created. We can use this later to spend its change output even before // Label the transaction as being self created. We can use this later to spend its change output even before
// the transaction is confirmed. We deliberately won't bother notifying listeners here as there's not much // the transaction is confirmed. We deliberately won't bother notifying listeners here as there's not much
// point - the user isn't interested in a confidence transition they made themselves. // point - the user isn't interested in a confidence transition they made themselves.