Merge pull request #7258 from cparke2/same-bank-blank-bic

Improve exception msg and handling when 'Same Bank' BIC/SWIFT blank
bisq-network · Sep 26, 2024 · 68f5625 · 68f5625
2 parents 1480fe2 + 7aa61fb
commit 68f5625
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/core/src/main/java/bisq/core/offer/OfferUtil.java b/core/src/main/java/bisq/core/offer/OfferUtil.java
@@ -30,6 +30,8 @@
 import bisq.core.payment.CashByMailAccount;
 import bisq.core.payment.F2FAccount;
 import bisq.core.payment.PaymentAccount;
+import bisq.core.payment.SameBankAccount;
+import bisq.core.payment.SpecificBanksAccount;
 import bisq.core.payment.payload.PaymentMethod;
 import bisq.core.provider.fee.FeeService;
 import bisq.core.provider.price.MarketPrice;
@@ -60,6 +62,7 @@
 import javax.inject.Singleton;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
@@ -389,7 +392,8 @@ public Map<String, String> getExtraDataMap(PaymentAccount paymentAccount,
     public void validateOfferData(double buyerSecurityDeposit,
                                   PaymentAccount paymentAccount,
                                   String currencyCode,
-                                  Coin makerFeeAsCoin) {
+                                  Coin makerFeeAsCoin,
+                                  List<String> acceptedBanks) {
         validateBasicOfferData(paymentAccount.getPaymentMethod(), currencyCode);
         checkNotNull(makerFeeAsCoin, "makerFee must not be null");
         checkArgument(buyerSecurityDeposit <= getMaxBuyerSecurityDepositAsPercent(),
@@ -398,6 +402,9 @@ public void validateOfferData(double buyerSecurityDeposit,
         checkArgument(buyerSecurityDeposit >= getMinBuyerSecurityDepositAsPercent(),
                 "securityDeposit must not be less than " +
                         getMinBuyerSecurityDepositAsPercent());
+        if ((paymentAccount instanceof SameBankAccount) || (paymentAccount instanceof SpecificBanksAccount) ) {
+            checkArgument(!acceptedBanks.contains(null), "acceptedBanks must not be null for SAME_BANK or SPECIFIC_BANKS accounts");
+        }
     }
 
     public void validateBasicOfferData(PaymentMethod paymentMethod, String currencyCode) {

diff --git a/core/src/main/java/bisq/core/offer/bisq_v1/CreateOfferService.java b/core/src/main/java/bisq/core/offer/bisq_v1/CreateOfferService.java
@@ -177,7 +177,8 @@ public Offer createAndGetOffer(String offerId,
                 buyerSecurityDepositAsDouble,
                 paymentAccount,
                 currencyCode,
-                makerFeeAsCoin);
+                makerFeeAsCoin,
+                acceptedBanks);
 
         OfferPayload offerPayload = new OfferPayload(offerId,
                 creationTime,