Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-01 21:17:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Transaction.getFee(): Do not determine fee on incomplete transactions.

Browse Source
This commit is contained in:
Andreas Schildbach
2017-06-02 15:32:42 +02:00
parent 40bcc7fbc3
commit adec67eac2
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/bitcoinj/core/Transaction.java
View File

@@ -414,6 +414,8 @@ public class Transaction extends ChildMessage {
*/ */
public Coin getFee() { public Coin getFee() {
Coin fee = Coin.ZERO; Coin fee = Coin.ZERO;
if (inputs.isEmpty() || outputs.isEmpty()) // Incomplete transaction
return null;
for (TransactionInput input : inputs) { for (TransactionInput input : inputs) {
if (input.getValue() == null) if (input.getValue() == null)
return null; return null;

2
core/src/test/java/org/bitcoinj/wallet/WalletTest.java
View File

@@ -2922,8 +2922,8 @@ public class WalletTest extends TestWithWallet {
wallet.receiveFromBlock(tx, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, 0); wallet.receiveFromBlock(tx, block, AbstractBlockChain.NewBlockType.BEST_CHAIN, 0);
try { try {
request = SendRequest.emptyWallet(OTHER_ADDRESS); request = SendRequest.emptyWallet(OTHER_ADDRESS);
assertEquals(ZERO, request.tx.getFee());
wallet.completeTx(request); wallet.completeTx(request);
assertEquals(ZERO, request.tx.getFee());
fail(); fail();
} catch (Wallet.CouldNotAdjustDownwards e) {} } catch (Wallet.CouldNotAdjustDownwards e) {}
} }