Set active currencies as high chargeback risk

core/src/main/java/bisq/core/account/sign/SignedWitnessService.java

@@ -26,6 +26,7 @@
 import bisq.core.arbitration.DisputeResult;
 import bisq.core.payment.ChargeBackRisk;
 import bisq.core.payment.payload.PaymentAccountPayload;
+import bisq.core.payment.payload.PaymentMethod;
 
 import bisq.network.p2p.P2PService;
 import bisq.network.p2p.storage.P2PDataStorage;
@@ -147,7 +148,10 @@ public List<Long> getVerifiedWitnessAgeList(AccountAgeWitness accountAgeWitness)
     }
 
     // Arbitrators sign with EC key
-    public SignedWitness signAccountAgeWitness(Coin tradeAmount, AccountAgeWitness accountAgeWitness, ECKey key, PublicKey peersPubKey) {
+    public SignedWitness signAccountAgeWitness(Coin tradeAmount,
+                                               AccountAgeWitness accountAgeWitness,
+                                               ECKey key,
+                                               PublicKey peersPubKey) {
         String accountAgeWitnessHashAsHex = Utilities.encodeToHex(accountAgeWitness.getHash());
         String signatureBase64 = key.signMessage(accountAgeWitnessHashAsHex);
         SignedWitness signedWitness = new SignedWitness(true,
@@ -162,7 +166,9 @@ public SignedWitness signAccountAgeWitness(Coin tradeAmount, AccountAgeWitness a
     }
 
     // Any peer can sign with DSA key
-    public SignedWitness signAccountAgeWitness(Coin tradeAmount, AccountAgeWitness accountAgeWitness, PublicKey peersPubKey) throws CryptoException {
+    public SignedWitness signAccountAgeWitness(Coin tradeAmount,
+                                               AccountAgeWitness accountAgeWitness,
+                                               PublicKey peersPubKey) throws CryptoException {
         byte[] signature = Sig.sign(keyRing.getSignatureKeyPair().getPrivate(), accountAgeWitness.getHash());
         SignedWitness signedWitness = new SignedWitness(false,
                 accountAgeWitness.getHash(),
@@ -238,7 +244,8 @@ public Set<SignedWitness> getTrustedPeerSignedWitnessSet(AccountAgeWitness accou
 
     // We go one level up by using the signer Key to lookup for SignedWitness objects which contain the signerKey as
     // witnessOwnerPubKey
-    public Set<SignedWitness> getSignedWitnessSetByOwnerPubKey(byte[] ownerPubKey, Stack<P2PDataStorage.ByteArray> excluded) {
+    public Set<SignedWitness> getSignedWitnessSetByOwnerPubKey(byte[] ownerPubKey,
+                                                               Stack<P2PDataStorage.ByteArray> excluded) {
         return signedWitnessMap.values().stream()
                 .filter(e -> Arrays.equals(e.getWitnessOwnerPubKey(), ownerPubKey))
                 .filter(e -> !excluded.contains(new P2PDataStorage.ByteArray(e.getSignerPubKey())))
@@ -270,7 +277,9 @@ public boolean isValidAccountAgeWitness(AccountAgeWitness accountAgeWitness) {
      * @param excludedPubKeys stack to prevent recursive loops
      * @return true if signedWitness is valid, false otherwise.
      */
-    private boolean isValidSignedWitnessInternal(SignedWitness signedWitness, long childSignedWitnessDateMillis, Stack<P2PDataStorage.ByteArray> excludedPubKeys) {
+    private boolean isValidSignedWitnessInternal(SignedWitness signedWitness,
+                                                 long childSignedWitnessDateMillis,
+                                                 Stack<P2PDataStorage.ByteArray> excludedPubKeys) {
         if (!verifySignature(signedWitness)) {
             return false;
         }
@@ -323,8 +332,9 @@ private void publishSignedWitness(SignedWitness signedWitness) {
     }
 
     // Arbitrator signing
-    public List<BuyerDataItem> getBuyerPaymentAccounts(long safeDate) {
+    public List<BuyerDataItem> getBuyerPaymentAccounts(long safeDate, PaymentMethod paymentMethod) {
         return disputeManager.getDisputesAsObservableList().stream()
+                .filter(dispute -> dispute.getContract().getPaymentMethodId().equals(paymentMethod.getId()))
                 .filter(this::hasChargebackRisk)
                 .filter(this::isBuyerWinner)
                 .map(this::getBuyerData)
@@ -335,7 +345,8 @@ public List<BuyerDataItem> getBuyerPaymentAccounts(long safeDate) {
     }
 
     private boolean hasChargebackRisk(Dispute dispute) {
-        return chargeBackRisk.hasChargebackRisk(dispute.getContract().getPaymentMethodId());
+        return chargeBackRisk.hasChargebackRisk(dispute.getContract().getPaymentMethodId(),
+                dispute.getContract().getOfferPayload().getCurrencyCode());
     }
 
     private boolean isBuyerWinner(Dispute dispute) {

core/src/main/java/bisq/core/account/witness/AccountAgeRestrictions.java

@@ -55,7 +55,7 @@ public static long getMyTradeLimitAtCreateOffer(AccountAgeWitnessService account
                                                     String currencyCode,
                                                     OfferPayload.Direction direction) {
         if (direction == OfferPayload.Direction.BUY &&
-                PaymentMethod.hasChargebackRisk(paymentAccount.getPaymentMethod()) &&
+                PaymentMethod.hasChargebackRisk(paymentAccount.getPaymentMethod(), currencyCode) &&
                 AccountAgeRestrictions.isMyAccountAgeImmature(accountAgeWitnessService, paymentAccount)) {
             return OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT.value;
         } else {
@@ -68,11 +68,13 @@ public static long getMyTradeLimitAtTakeOffer(AccountAgeWitnessService accountAg
                                                   Offer offer,
                                                   String currencyCode,
                                                   OfferPayload.Direction direction) {
-        if (direction == OfferPayload.Direction.BUY && PaymentMethod.hasChargebackRisk(paymentAccount.getPaymentMethod()) &&
+        if (direction == OfferPayload.Direction.BUY &&
+                PaymentMethod.hasChargebackRisk(paymentAccount.getPaymentMethod(), currencyCode) &&
                 AccountAgeRestrictions.isMakersAccountAgeImmature(accountAgeWitnessService, offer)) {
             // Taker is seller
             return OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT.value;
-        } else if (direction == OfferPayload.Direction.SELL && PaymentMethod.hasChargebackRisk(paymentAccount.getPaymentMethod()) &&
+        } else if (direction == OfferPayload.Direction.SELL &&
+                PaymentMethod.hasChargebackRisk(paymentAccount.getPaymentMethod(), currencyCode) &&
                 AccountAgeRestrictions.isMyAccountAgeImmature(accountAgeWitnessService, paymentAccount)) {
             // Taker is buyer
             return OfferRestrictions.TOLERATED_SMALL_TRADE_AMOUNT.value;

core/src/main/java/bisq/core/locale/CurrencyUtil.java

@@ -295,6 +295,19 @@ public static List<TradeCurrency> getAllRevolutCurrencies() {
         return currencies;
     }
 
+    public static List<TradeCurrency> getMatureMarketCurrencies() {
+        ArrayList<TradeCurrency> currencies = new ArrayList<>(Arrays.asList(
+                new FiatCurrency("EUR"),
+                new FiatCurrency("USD"),
+                new FiatCurrency("GBP"),
+                new FiatCurrency("CAD"),
+                new FiatCurrency("AUD"),
+                new FiatCurrency("BRL")
+        ));
+        currencies.sort(Comparator.comparing(TradeCurrency::getCode));
+        return currencies;
+    }
+
     public static boolean isFiatCurrency(String currencyCode) {
         try {
             return currencyCode != null

core/src/main/java/bisq/core/offer/OfferRestrictions.java

@@ -28,13 +28,13 @@ public class OfferRestrictions {
     public static boolean isOfferRisky(Offer offer) {
         return offer != null &&
                 offer.isBuyOffer() &&
-                PaymentMethod.hasChargebackRisk(offer.getPaymentMethod()) &&
+                PaymentMethod.hasChargebackRisk(offer.getPaymentMethod(), offer.getCurrencyCode()) &&
                 isMinTradeAmountRisky(offer);
     }
 
     public static boolean isSellOfferRisky(Offer offer) {
         return offer != null &&
-                PaymentMethod.hasChargebackRisk(offer.getPaymentMethod()) &&
+                PaymentMethod.hasChargebackRisk(offer.getPaymentMethod(), offer.getCurrencyCode()) &&
                 isMinTradeAmountRisky(offer);
     }
 
@@ -44,7 +44,7 @@ public static boolean isTradeRisky(Trade trade) {
 
         Offer offer = trade.getOffer();
         return offer != null &&
-                PaymentMethod.hasChargebackRisk(offer.getPaymentMethod()) &&
+                PaymentMethod.hasChargebackRisk(offer.getPaymentMethod(), offer.getCurrencyCode()) &&
                 trade.getTradeAmount() != null &&
                 isAmountRisky(trade.getTradeAmount());
     }

core/src/main/java/bisq/core/payment/ChargeBackRisk.java

@@ -23,7 +23,7 @@
 
 @Singleton
 public class ChargeBackRisk {
-    public boolean hasChargebackRisk(String id) {
-        return PaymentMethod.hasChargebackRisk(id);
+    public boolean hasChargebackRisk(String id, String currencyCode) {
+        return PaymentMethod.hasChargebackRisk(id, currencyCode);
     }
 }

core/src/main/java/bisq/core/payment/PaymentAccountUtil.java

@@ -67,7 +67,7 @@ public static boolean isSellOfferAndAllTakerPaymentAccountsForOfferImmature(Offe
     private static boolean isTakerAccountForOfferMature(Offer offer,
                                                         PaymentAccount takerPaymentAccount,
                                                         AccountAgeWitnessService accountAgeWitnessService) {
-        return !PaymentMethod.hasChargebackRisk(offer.getPaymentMethod()) ||
+        return !PaymentMethod.hasChargebackRisk(offer.getPaymentMethod(), offer.getCurrencyCode()) ||
                 !OfferRestrictions.isMinTradeAmountRisky(offer) ||
                 (isTakerPaymentAccountValidForOffer(offer, takerPaymentAccount) &&
                         !AccountAgeRestrictions.isMyAccountAgeImmature(accountAgeWitnessService, takerPaymentAccount));
@@ -84,7 +84,10 @@ public static boolean hasMakerAnyMatureAccountForBuyOffer(Collection<PaymentAcco
 
     private static boolean hasMyMatureAccountForBuyOffer(PaymentAccount myPaymentAccount,
                                                          AccountAgeWitnessService accountAgeWitnessService) {
-        return !PaymentMethod.hasChargebackRisk(myPaymentAccount.getPaymentMethod()) ||
+        if (myPaymentAccount.selectedTradeCurrency == null)
+            return false;
+        return !PaymentMethod.hasChargebackRisk(myPaymentAccount.getPaymentMethod(),
+                myPaymentAccount.selectedTradeCurrency.getCode()) ||
                 !AccountAgeRestrictions.isMyAccountAgeImmature(accountAgeWitnessService, myPaymentAccount);
     }
 

core/src/main/java/bisq/core/payment/payload/PaymentMethod.java

@@ -17,6 +17,7 @@
 
 package bisq.core.payment.payload;
 
+import bisq.core.locale.CurrencyUtil;
 import bisq.core.locale.Res;
 import bisq.core.payment.TradeLimits;
 
@@ -316,15 +317,18 @@ public boolean isAsset() {
         return this.equals(BLOCK_CHAINS_INSTANT) || this.equals(BLOCK_CHAINS);
     }
 
-    public static boolean hasChargebackRisk(PaymentMethod paymentMethod) {
+    public static boolean hasChargebackRisk(PaymentMethod paymentMethod, String currencyCode) {
         if (paymentMethod == null)
             return false;
 
         String id = paymentMethod.getId();
-        return hasChargebackRisk(id);
+        return hasChargebackRisk(id, currencyCode);
     }
 
-    public static boolean hasChargebackRisk(String id) {
+    public static boolean hasChargebackRisk(String id, String currencyCode) {
+        if (CurrencyUtil.getMatureMarketCurrencies().stream()
+            .noneMatch(c -> c.getCode().equals(currencyCode)))
+            return false;
         return id.equals(PaymentMethod.SEPA_ID) ||
                 id.equals(PaymentMethod.SEPA_INSTANT_ID) ||
                 id.equals(PaymentMethod.INTERAC_E_TRANSFER_ID) ||