fix fixed price inversion bug

Author: woodser

core/src/main/java/haveno/core/api/CoreOffersService.java

@@ -353,8 +353,7 @@ private boolean offerMatchesDirectionAndCurrency(Offer offer,
         if ("".equals(direction)) direction = null;
         if ("".equals(currencyCode)) currencyCode = null;
         var offerOfWantedDirection = direction == null || offer.getDirection().name().equalsIgnoreCase(direction);
-        var counterAssetCode = offer.currenciesInverted() ? offer.getOfferPayload().getBaseCurrencyCode() : offer.getOfferPayload().getCounterCurrencyCode();
-        var offerInWantedCurrency = currencyCode == null || counterAssetCode.equalsIgnoreCase(currencyCode);
+        var offerInWantedCurrency = currencyCode == null || offer.getCounterCurrencyCode().equalsIgnoreCase(currencyCode);
         return offerOfWantedDirection && offerInWantedCurrency;
     }
 

core/src/main/java/haveno/core/offer/Offer.java

@@ -39,6 +39,7 @@
 import haveno.core.provider.price.MarketPrice;
 import haveno.core.provider.price.PriceFeedService;
 import haveno.core.trade.HavenoUtils;
+import haveno.core.util.PriceUtil;
 import haveno.core.util.VolumeUtil;
 import haveno.network.p2p.NodeAddress;
 import javafx.beans.property.ObjectProperty;
@@ -175,7 +176,7 @@ public void cancelAvailabilityRequest() {
     public Price getPrice() {
         String counterCurrencyCode = getCounterCurrencyCode();
         if (!offerPayload.isUseMarketBasedPrice()) {
-            return Price.valueOf(counterCurrencyCode, offerPayload.getPrice());
+            return Price.valueOf(counterCurrencyCode, currenciesInverted() ? PriceUtil.invertLongPrice(offerPayload.getPrice(), counterCurrencyCode) : offerPayload.getPrice());
         }
 
         checkNotNull(priceFeedService, "priceFeed must not be null");
@@ -508,9 +509,7 @@ public String getCountryCode() {
     }
 
     public String getBaseCurrencyCode() {
-        if (currencyCode != null) return currencyCode;
-        currencyCode = currenciesInverted() ? offerPayload.getCounterCurrencyCode() : offerPayload.getBaseCurrencyCode(); // legacy offers inverted crypto
-        return currencyCode;
+        return currenciesInverted() ? offerPayload.getCounterCurrencyCode() : offerPayload.getBaseCurrencyCode(); // legacy offers inverted crypto
     }
 
     public String getCounterCurrencyCode() {

core/src/main/java/haveno/core/offer/OpenOfferManager.java

@@ -78,7 +78,6 @@
 import haveno.core.user.Preferences;
 import haveno.core.user.User;
 import haveno.core.util.JsonUtil;
-import haveno.core.util.PriceUtil;
 import haveno.core.util.Validator;
 import haveno.core.xmr.model.XmrAddressEntry;
 import haveno.core.xmr.wallet.BtcWalletService;
@@ -2014,7 +2013,7 @@ private void maybeUpdatePersistedOffers() {
                         ownerNodeAddress,
                         originalOfferPayload.getPubKeyRing(),
                         originalOfferPayload.getDirection(),
-                        originalOffer.currenciesInverted() && originalOfferPayload.getPrice() != 0 ? PriceUtil.invertLongPrice(originalOfferPayload.getPrice(), originalOffer.getCounterCurrencyCode()) : originalOfferPayload.getPrice(),
+                        originalOffer.getPrice().getValue(),
                         originalOfferPayload.getMarketPriceMarginPct(),
                         originalOfferPayload.isUseMarketBasedPrice(),
                         originalOfferPayload.getAmount(),
@@ -2024,8 +2023,8 @@ private void maybeUpdatePersistedOffers() {
                         originalOfferPayload.getPenaltyFeePct(),
                         originalOfferPayload.getBuyerSecurityDepositPct(),
                         originalOfferPayload.getSellerSecurityDepositPct(),
-                        originalOffer.currenciesInverted() ? originalOfferPayload.getCounterCurrencyCode() : originalOfferPayload.getBaseCurrencyCode(),
-                        originalOffer.currenciesInverted() ? originalOfferPayload.getBaseCurrencyCode() : originalOfferPayload.getCounterCurrencyCode(),
+                        originalOffer.getBaseCurrencyCode(),
+                        originalOffer.getCounterCurrencyCode(),
                         originalOfferPayload.getPaymentMethodId(),
                         originalOfferPayload.getMakerPaymentAccountId(),
                         originalOfferPayload.getCountryCode(),