Block API attempt swap BSQ if !sufficient funds

This API bug was relying on the UI purposed TaskRunner to bubble up an insufficient funds error to the client, but it cannot do that. This change blocks the takeoffer attempt if sufficient funds are not found after the swap model calculates the taker's trade amounts. Related: bisq-network#6221 Based on bisq-network#6250. Based on branch `add-api-price-service-getaverageprice`.
ghubstan · Jun 20, 2022 · 2893ec2 · 2893ec2
1 parent 2c043b4
commit 2893ec2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/core/src/main/java/bisq/core/api/CoreTradesService.java b/core/src/main/java/bisq/core/api/CoreTradesService.java
@@ -124,6 +124,12 @@ void takeBsqSwapOffer(Offer offer,
         bsqSwapTakeOfferModel.initWithData(offer);
         bsqSwapTakeOfferModel.applyAmount(offer.getAmount());
 
+        // Block attempt to take swap offer if there are insufficient funds for the trade.
+        var missingCoin = bsqSwapTakeOfferModel.getMissingFundsAsCoin();
+        if (missingCoin.value > 0)
+            throw new NotAvailableException(
+                    format("wallet has insufficient funds to take offer with id '%s'", offer.getId()));
+
         log.info("Initiating take {} offer, {}",
                 offer.isBuyOffer() ? "buy" : "sell",
                 bsqSwapTakeOfferModel);
@@ -155,6 +161,7 @@ void takeOffer(Offer offer,
                 offer.isBuyOffer() ? "buy" : "sell",
                 takeOfferModel);
 
+        // Block attempt to take swap offer if there are insufficient funds for the trade.
         if (!takeOfferModel.isBtcWalletFunded())
             throw new NotAvailableException(
                     format("wallet has insufficient btc to take offer with id '%s'", offer.getId()));

diff --git a/core/src/main/java/bisq/core/offer/bsq_swap/BsqSwapOfferModel.java b/core/src/main/java/bisq/core/offer/bsq_swap/BsqSwapOfferModel.java
@@ -54,6 +54,8 @@
 
 import javax.annotation.Nullable;
 
+import static org.bitcoinj.core.Coin.ZERO;
+
 @Slf4j
 public class BsqSwapOfferModel {
     public final static String BSQ = "BSQ";
@@ -90,7 +92,7 @@ public class BsqSwapOfferModel {
     @Getter
     private final ObjectProperty<Coin> payoutAmountAsCoin = new SimpleObjectProperty<>();
     @Getter
-    private final ObjectProperty<Coin> missingFunds = new SimpleObjectProperty<>(Coin.ZERO);
+    private final ObjectProperty<Coin> missingFunds = new SimpleObjectProperty<>(ZERO);
     @Nullable
     private Coin txFee;
     @Getter
@@ -380,6 +382,10 @@ public long getMaxTradeLimit() {
         return PaymentMethod.BSQ_SWAP.getMaxTradeLimitAsCoin(BSQ).getValue();
     }
 
+    public Coin getMissingFundsAsCoin() {
+        // This extra getter is needed for API CoreTradesService, which avoids importing JFX dependencies.
+        return missingFunds.get().isPositive() ? missingFunds.get() : ZERO;
+    }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Utils
@@ -398,6 +404,6 @@ private void applyTxFeePerVbyte() {
 
     private void resetTxFeeAndMissingFunds() {
         txFee = null;
-        missingFunds.set(Coin.ZERO);
+        missingFunds.set(ZERO);
     }
 }