From 3cf99961d39a4f396cd23429f2b656768cc04c62 Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Thu, 25 May 2023 14:48:32 +0200 Subject: [PATCH] improve error message when broadcasting an rbf transaction with insufficient fee, indicate minimum required fee if available --- .../transaction/HeadersController.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java b/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java index 98dddd76..d01a9745 100644 --- a/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java +++ b/src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java @@ -60,6 +60,8 @@ import java.text.SimpleDateFormat; import java.time.*; import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -74,6 +76,9 @@ public class HeadersController extends TransactionFormController implements Init public static final String MAX_LOCKTIME_DATE = "2106-02-07T06:28:15Z"; public static final String MIN_LOCKTIME_DATE = "1985-11-05T00:53:20Z"; + private static final Pattern RBF_INSUFFICIENT_FEE = Pattern.compile("insufficient fee, rejecting replacement.*?(\\d+\\.?\\d*) < (\\d+\\.?\\d*)"); + private static final Pattern RBF_INSUFFICIENT_FEE_RATE = Pattern.compile("insufficient fee, rejecting replacement.*new feerate (\\d+\\.?\\d*)[^\\d]*(\\d+\\.?\\d*)[^\\d]*"); + private HeadersForm headersForm; @FXML @@ -1144,6 +1149,20 @@ public class HeadersController extends TransactionFormController implements Init "You can solve this by recreating the transaction with a slightly increased fee rate."); } else if(failMessage.startsWith("bad-txns-inputs-missingorspent")) { AppServices.showErrorDialog("Error broadcasting transaction", "The server returned an error indicating some or all of the UTXOs this transaction is spending are missing or have already been spent."); + } else if(failMessage.startsWith("insufficient fee, rejecting replacement")) { + Matcher feeMatcher = RBF_INSUFFICIENT_FEE.matcher(failMessage); + Matcher feeRateMatcher = RBF_INSUFFICIENT_FEE_RATE.matcher(failMessage); + if(feeMatcher.matches() && fee.getValue() > 0) { + long currentAdditionalFee = (long)(Double.parseDouble(feeMatcher.group(1)) * Transaction.SATOSHIS_PER_BITCOIN); + long requiredAdditionalFee = (long)(Double.parseDouble(feeMatcher.group(2)) * Transaction.SATOSHIS_PER_BITCOIN); + long requiredFee = fee.getValue() - currentAdditionalFee + requiredAdditionalFee; + AppServices.showErrorDialog("Error broadcasting transaction", "The fee for the replacement transaction was insufficient. Increase the fee to at least " + requiredFee + " sats to try again."); + } else if(feeRateMatcher.matches()) { + double requiredFeeRate = Double.parseDouble(feeRateMatcher.group(2)) * Transaction.SATOSHIS_PER_BITCOIN / 1000; + AppServices.showErrorDialog("Error broadcasting transaction", "The fee rate for the replacement transaction was insufficient. Increase the fee rate to at least " + requiredFeeRate + " sats/vB to try again."); + } else { + AppServices.showErrorDialog("Error broadcasting transaction", "The fee for the replacement transaction was insufficient. Increase the fee to try again."); + } } else { AppServices.showErrorDialog("Error broadcasting transaction", "The server returned an error when broadcasting the transaction. The server response is contained in the log (See Help > Show Log File)."); }