use single character flag in trade stats, always provide fixed prices

Author: woodser

core/src/main/java/haveno/core/trade/Trade.java

@@ -65,6 +65,7 @@
 import haveno.core.trade.protocol.TradeListener;
 import haveno.core.trade.protocol.TradePeer;
 import haveno.core.trade.protocol.TradeProtocol;
+import haveno.core.util.PriceUtil;
 import haveno.core.util.VolumeUtil;
 import haveno.core.xmr.model.XmrAddressEntry;
 import haveno.core.xmr.wallet.XmrWalletBase;
@@ -2360,7 +2361,10 @@ public BigInteger getReservedAmount() {
     }
 
     public Price getPrice() {
-        return Price.valueOf(offer.getCurrencyCode(), price);
+
+        // return uninverted price
+        boolean isInverted = getOffer().currenciesInverted();
+        return Price.valueOf(offer.getCurrencyCode(), isInverted ? PriceUtil.invertLongPrice(price, offer.getCurrencyCode()) : price);
     }
 
     @Nullable

core/src/main/java/haveno/core/trade/statistics/TradeStatistics3.java

@@ -69,6 +69,8 @@
 public final class TradeStatistics3 implements ProcessOncePersistableNetworkPayload, PersistableNetworkPayload,
         CapabilityRequiringPayload, DateSortedTruncatablePayload {
 
+    private static final String VERSION_KEY = "v"; // single character key which can be used for versioning if needed
+
     @JsonExclude
     private transient static final ZoneId ZONE_ID = ZoneId.systemDefault();
 
@@ -94,10 +96,11 @@ private static TradeStatistics3 from(Trade trade,
             extraDataMap.put(OfferPayload.REFERRAL_ID, referralId);
         }
 
-        // Store protocol version in order to invert prices of legacy crypto stats.
-        // This can be removed in the future after all trades use trade protocol version 3+,
-        // then invert only stats which are missing this field prior to then.
-        extraDataMap.put(Trade.PROTOCOL_VERSION, trade.getOffer().getOfferPayload().getProtocolVersion() + "");
+        // Store a key to indicate that crypto prices are not inverted in this version.
+        // This can be removed in the future after all stats are expected to not be inverted,
+        // then only stats which are missing this field prior to then need to be uninverted.
+        boolean isCryptoCurrency = CurrencyUtil.isCryptoCurrency(trade.getOffer().getCurrencyCode());
+        if (isCryptoCurrency) extraDataMap.put(VERSION_KEY, ""); // value is not currently needed
 
         NodeAddress arbitratorNodeAddress = checkNotNull(trade.getArbitrator().getNodeAddress(), "Arbitrator address is null", trade.getClass().getSimpleName(), trade.getId());
 
@@ -416,8 +419,7 @@ public Price getTradePrice() {
     public long getPrice() {
         boolean isInverted = CurrencyUtil.isCryptoCurrency(currency) && 
                 (extraDataMap == null ||
-                !extraDataMap.containsKey(Trade.PROTOCOL_VERSION) ||
-                Integer.parseInt(extraDataMap.get(Trade.PROTOCOL_VERSION)) < 3);
+                !extraDataMap.containsKey(VERSION_KEY)); // price is inverted if missing key
         return isInverted ? PriceUtil.invertLongPrice(price, currency) : price;
     }