From 858b0b41d5097ed47e8f0584ea6478e917fff838 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sun, 27 Mar 2016 13:16:58 +0200 Subject: [PATCH] Make sure payment channels heed Context.isEnsureMinRequiredFee(). --- .../protocols/channels/PaymentChannelV1ClientState.java | 2 +- .../protocols/channels/PaymentChannelV2ClientState.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ClientState.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ClientState.java index 483a6fa1..b8b97d19 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ClientState.java +++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV1ClientState.java @@ -153,7 +153,7 @@ public class PaymentChannelV1ClientState extends PaymentChannelClientState { refundTx = new Transaction(params); refundTx.addInput(multisigOutput).setSequenceNumber(0); // Allow replacement when it's eventually reactivated. refundTx.setLockTime(expiryTime); - if (totalValue.compareTo(Coin.CENT) < 0) { + if (totalValue.compareTo(Coin.CENT) < 0 && Context.get().isEnsureMinRequiredFee()) { // Must pay min fee. final Coin valueAfterFee = totalValue.subtract(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE); if (Transaction.MIN_NONDUST_OUTPUT.compareTo(valueAfterFee) > 0) diff --git a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ClientState.java b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ClientState.java index d51bdd29..94300d68 100644 --- a/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ClientState.java +++ b/core/src/main/java/org/bitcoinj/protocols/channels/PaymentChannelV2ClientState.java @@ -127,7 +127,7 @@ public class PaymentChannelV2ClientState extends PaymentChannelClientState { refundTx = new Transaction(params); refundTx.addInput(contract.getOutput(0)).setSequenceNumber(0); // Allow replacement when it's eventually reactivated. refundTx.setLockTime(expiryTime); - if (totalValue.compareTo(Coin.CENT) < 0) { + if (totalValue.compareTo(Coin.CENT) < 0 && Context.get().isEnsureMinRequiredFee()) { // Must pay min fee. final Coin valueAfterFee = totalValue.subtract(Transaction.REFERENCE_DEFAULT_MIN_TX_FEE); if (Transaction.MIN_NONDUST_OUTPUT.compareTo(valueAfterFee) > 0)