[WIP] New trade stats

common/src/main/java/bisq/common/app/Capability.java

@@ -40,5 +40,6 @@ public enum Capability {
     SIGNED_ACCOUNT_AGE_WITNESS,         // Supports the signed account age witness feature
     MEDIATION,                          // Supports mediation feature
     REFUND_AGENT,                       // Supports refund agents
-    TRADE_STATISTICS_HASH_UPDATE        // We changed the hash method in 1.2.0 and that requires update to 1.2.2 for handling it correctly, otherwise the seed nodes have to process too much data.
+    TRADE_STATISTICS_HASH_UPDATE,       // We changed the hash method in 1.2.0 and that requires update to 1.2.2 for handling it correctly, otherwise the seed nodes have to process too much data.
+    TRADE_STATISTICS_3                  // We used a new reduced trade statistics model from v1.4.0 on
 }

common/src/main/java/bisq/common/app/Version.java

@@ -17,6 +17,9 @@
 
 package bisq.common.app;
 
+import java.util.Arrays;
+import java.util.List;
+
 import lombok.extern.slf4j.Slf4j;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -29,6 +32,11 @@ public class Version {
     // We use semantic versioning with major, minor and patch
     public static final String VERSION = "1.3.9";
 
+    /**
+     * Holds a list of the versions of tagged resource files for optimizing the getData requests.
+     */
+    public static final List<String> HISTORY = Arrays.asList("1.4.0");
+
     public static int getMajorVersion(String version) {
         return getSubVersion(version, 0);
     }
@@ -45,7 +53,7 @@ public static boolean isNewVersion(String newVersion) {
         return isNewVersion(newVersion, VERSION);
     }
 
-    static boolean isNewVersion(String newVersion, String currentVersion) {
+    public static boolean isNewVersion(String newVersion, String currentVersion) {
         if (newVersion.equals(currentVersion))
             return false;
         else if (getMajorVersion(newVersion) > getMajorVersion(currentVersion))

common/src/main/java/bisq/common/storage/Storage.java

@@ -77,12 +77,17 @@ public Storage(@Named(Config.STORAGE_DIR) File dir,
         this.corruptedDatabaseFilesHandler = corruptedDatabaseFilesHandler;
     }
 
+    @Nullable
+    public T getPersisted(String fileName) {
+        return getPersisted(new File(dir, fileName));
+    }
+
     @Nullable
     public T initAndGetPersistedWithFileName(String fileName, long delay) {
         this.fileName = fileName;
         storageFile = new File(dir, fileName);
         fileManager = new FileManager<>(dir, storageFile, delay, persistenceProtoResolver);
-        return getPersisted();
+        return getPersisted(storageFile);
     }
 
     @Nullable
@@ -96,7 +101,7 @@ public T initAndGetPersisted(T persistable, String fileName, long delay) {
         this.fileName = fileName;
         storageFile = new File(dir, fileName);
         fileManager = new FileManager<>(dir, storageFile, delay, persistenceProtoResolver);
-        return getPersisted();
+        return getPersisted(storageFile);
     }
 
     public void queueUpForSave() {
@@ -144,7 +149,7 @@ public void remove(String fileName) {
     // We do the file read on the UI thread to avoid problems from multi threading.
     // Data are small and read is done only at startup, so it is no performance issue.
     @Nullable
-    private T getPersisted() {
+    private T getPersisted(File storageFile) {
         if (storageFile.exists()) {
             long now = System.currentTimeMillis();
             try {

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

@@ -24,8 +24,8 @@
 import bisq.common.config.Config;
 import bisq.common.storage.Storage;
 
-import javax.inject.Named;
 import javax.inject.Inject;
+import javax.inject.Named;
 
 import java.io.File;
 

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

@@ -19,18 +19,13 @@
 
 
 import bisq.network.p2p.storage.P2PDataStorage;
-import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
-
-import bisq.common.proto.persistable.ThreadedPersistableEnvelope;
+import bisq.network.p2p.storage.persistence.PersistableNetworkPayloadStore;
 
 import com.google.protobuf.Message;
 
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
-import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
 
@@ -40,9 +35,7 @@
  * definition and provide a hashMap for the domain access.
  */
 @Slf4j
-public class SignedWitnessStore implements ThreadedPersistableEnvelope {
-    @Getter
-    private Map<P2PDataStorage.ByteArray, PersistableNetworkPayload> map = new ConcurrentHashMap<>();
+public class SignedWitnessStore extends PersistableNetworkPayloadStore {
 
     SignedWitnessStore() {
     }

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

@@ -24,8 +24,8 @@
 import bisq.common.config.Config;
 import bisq.common.storage.Storage;
 
-import javax.inject.Named;
 import javax.inject.Inject;
+import javax.inject.Named;
 
 import java.io.File;
 

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

@@ -18,18 +18,13 @@
 package bisq.core.account.witness;
 
 import bisq.network.p2p.storage.P2PDataStorage;
-import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
-
-import bisq.common.proto.persistable.ThreadedPersistableEnvelope;
+import bisq.network.p2p.storage.persistence.PersistableNetworkPayloadStore;
 
 import com.google.protobuf.Message;
 
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
-import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
 
@@ -39,9 +34,7 @@
  * definition and provide a hashMap for the domain access.
  */
 @Slf4j
-public class AccountAgeWitnessStore implements ThreadedPersistableEnvelope {
-    @Getter
-    private Map<P2PDataStorage.ByteArray, PersistableNetworkPayload> map = new ConcurrentHashMap<>();
+public class AccountAgeWitnessStore extends PersistableNetworkPayloadStore {
 
     AccountAgeWitnessStore() {
     }

core/src/main/java/bisq/core/api/CoreApi.java

@@ -23,7 +23,7 @@
 import bisq.core.offer.OfferPayload;
 import bisq.core.payment.PaymentAccount;
 import bisq.core.trade.handlers.TransactionResultHandler;
-import bisq.core.trade.statistics.TradeStatistics2;
+import bisq.core.trade.statistics.TradeStatistics3;
 import bisq.core.trade.statistics.TradeStatisticsManager;
 
 import bisq.common.app.Version;
@@ -189,7 +189,7 @@ public void removeWalletPassword(String password) {
         walletsService.removeWalletPassword(password);
     }
 
-    public List<TradeStatistics2> getTradeStatistics() {
+    public List<TradeStatistics3> getTradeStatistics() {
         return new ArrayList<>(tradeStatisticsManager.getObservableTradeStatisticsSet());
     }
 

core/src/main/java/bisq/core/dao/governance/asset/AssetService.java

@@ -154,10 +154,10 @@ public void updateAssetStates() {
         // TradeAmountDateTuple object holding only the data we need.
         Map<String, List<TradeAmountDateTuple>> lookupMap = new HashMap<>();
         tradeStatisticsManager.getObservableTradeStatisticsSet().stream()
-                .filter(e -> CurrencyUtil.isCryptoCurrency(e.getBaseCurrency()))
+                .filter(e -> CurrencyUtil.isCryptoCurrency(e.getCurrency()))
                 .forEach(e -> {
-                    lookupMap.putIfAbsent(e.getBaseCurrency(), new ArrayList<>());
-                    lookupMap.get(e.getBaseCurrency()).add(new TradeAmountDateTuple(e.getTradeAmount().getValue(), e.getTradeDate().getTime()));
+                    lookupMap.putIfAbsent(e.getCurrency(), new ArrayList<>());
+                    lookupMap.get(e.getCurrency()).add(new TradeAmountDateTuple(e.getAmount(), e.getDate()));
                 });
 
         getStatefulAssets().stream()

core/src/main/java/bisq/core/dao/governance/blindvote/storage/BlindVoteStore.java

@@ -18,18 +18,13 @@
 package bisq.core.dao.governance.blindvote.storage;
 
 import bisq.network.p2p.storage.P2PDataStorage;
-import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
-
-import bisq.common.proto.persistable.ThreadedPersistableEnvelope;
+import bisq.network.p2p.storage.persistence.PersistableNetworkPayloadStore;
 
 import com.google.protobuf.Message;
 
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
-import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
 
@@ -39,9 +34,7 @@
  * definition and provide a hashMap for the domain access.
  */
 @Slf4j
-public class BlindVoteStore implements ThreadedPersistableEnvelope {
-    @Getter
-    private Map<P2PDataStorage.ByteArray, PersistableNetworkPayload> map = new ConcurrentHashMap<>();
+public class BlindVoteStore extends PersistableNetworkPayloadStore {
 
     BlindVoteStore() {
     }

core/src/main/java/bisq/core/dao/governance/proposal/ProposalService.java

@@ -216,6 +216,7 @@ private void fillListFromProtectedStore() {
         p2PService.getDataMap().values().forEach(e -> onProtectedDataAdded(e, false));
     }
 
+    //todo use proposalStorageService
     private void fillListFromAppendOnlyDataStore() {
         p2PService.getP2PDataStorage().getAppendOnlyDataStoreMap().values().forEach(e -> onAppendOnlyDataAdded(e, false));
     }

core/src/main/java/bisq/core/dao/governance/proposal/storage/appendonly/ProposalStore.java

@@ -18,18 +18,13 @@
 package bisq.core.dao.governance.proposal.storage.appendonly;
 
 import bisq.network.p2p.storage.P2PDataStorage;
-import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
-
-import bisq.common.proto.persistable.ThreadedPersistableEnvelope;
+import bisq.network.p2p.storage.persistence.PersistableNetworkPayloadStore;
 
 import com.google.protobuf.Message;
 
 import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
-import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
 
@@ -39,9 +34,7 @@
  * definition and provide a hashMap for the domain access.
  */
 @Slf4j
-public class ProposalStore implements ThreadedPersistableEnvelope {
-    @Getter
-    private Map<P2PDataStorage.ByteArray, PersistableNetworkPayload> map = new ConcurrentHashMap<>();
+public class ProposalStore extends PersistableNetworkPayloadStore {
 
     ProposalStore() {
     }

core/src/main/java/bisq/core/offer/availability/DisputeAgentSelection.java

@@ -19,7 +19,7 @@
 
 import bisq.core.support.dispute.agent.DisputeAgent;
 import bisq.core.support.dispute.agent.DisputeAgentManager;
-import bisq.core.trade.statistics.TradeStatistics2;
+import bisq.core.trade.statistics.TradeStatistics3;
 import bisq.core.trade.statistics.TradeStatisticsManager;
 
 import bisq.common.util.Tuple2;
@@ -30,7 +30,6 @@
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -46,22 +45,22 @@ public static <T extends DisputeAgent> T getLeastUsedMediator(TradeStatisticsMan
                                                                   DisputeAgentManager<T> disputeAgentManager) {
         return getLeastUsedDisputeAgent(tradeStatisticsManager,
                 disputeAgentManager,
-                TradeStatistics2.MEDIATOR_ADDRESS);
+                true);
     }
 
     public static <T extends DisputeAgent> T getLeastUsedRefundAgent(TradeStatisticsManager tradeStatisticsManager,
                                                                      DisputeAgentManager<T> disputeAgentManager) {
         return getLeastUsedDisputeAgent(tradeStatisticsManager,
                 disputeAgentManager,
-                TradeStatistics2.REFUND_AGENT_ADDRESS);
+                false);
     }
 
     private static <T extends DisputeAgent> T getLeastUsedDisputeAgent(TradeStatisticsManager tradeStatisticsManager,
                                                                        DisputeAgentManager<T> disputeAgentManager,
-                                                                       String extraMapKey) {
+                                                                       boolean isMediator) {
         // We take last 100 entries from trade statistics
-        List<TradeStatistics2> list = new ArrayList<>(tradeStatisticsManager.getObservableTradeStatisticsSet());
-        list.sort(Comparator.comparing(TradeStatistics2::getTradeDate));
+        List<TradeStatistics3> list = new ArrayList<>(tradeStatisticsManager.getObservableTradeStatisticsSet());
+        list.sort(Comparator.comparing(TradeStatistics3::getDate));
         Collections.reverse(list);
         if (!list.isEmpty()) {
             int max = Math.min(list.size(), 100);
@@ -70,9 +69,7 @@ private static <T extends DisputeAgent> T getLeastUsedDisputeAgent(TradeStatisti
 
         // We stored only first 4 chars of disputeAgents onion address
         List<String> lastAddressesUsedInTrades = list.stream()
-                .filter(tradeStatistics2 -> tradeStatistics2.getExtraDataMap() != null)
-                .map(tradeStatistics2 -> tradeStatistics2.getExtraDataMap().get(extraMapKey))
-                .filter(Objects::nonNull)
+                .map(stat -> isMediator ? stat.getMediator() : stat.getRefundAgent())
                 .collect(Collectors.toList());
 
         Set<String> disputeAgents = disputeAgentManager.getObservableMap().values().stream()

core/src/main/java/bisq/core/proto/CoreProtoResolver.java

@@ -54,6 +54,7 @@
 import bisq.core.payment.payload.WeChatPayAccountPayload;
 import bisq.core.payment.payload.WesternUnionAccountPayload;
 import bisq.core.trade.statistics.TradeStatistics2;
+import bisq.core.trade.statistics.TradeStatistics3;
 
 import bisq.common.proto.ProtoResolver;
 import bisq.common.proto.ProtobufferRuntimeException;
@@ -178,6 +179,8 @@ public PersistablePayload fromProto(protobuf.PersistableNetworkPayload proto) {
                     return BlindVotePayload.fromProto(proto.getBlindVotePayload());
                 case SIGNED_WITNESS:
                     return SignedWitness.fromProto(proto.getSignedWitness());
+                case TRADE_STATISTICS3:
+                    return TradeStatistics3.fromProto(proto.getTradeStatistics3());
                 default:
                     throw new ProtobufferRuntimeException("Unknown proto message case (PB.PersistableNetworkPayload). messageCase=" + proto.getMessageCase());
             }

core/src/main/java/bisq/core/proto/persistable/CorePersistenceProtoResolver.java

@@ -39,6 +39,7 @@
 import bisq.core.support.dispute.refund.RefundDisputeList;
 import bisq.core.trade.TradableList;
 import bisq.core.trade.statistics.TradeStatistics2Store;
+import bisq.core.trade.statistics.TradeStatistics3Store;
 import bisq.core.user.PreferencesPayload;
 import bisq.core.user.UserPayload;
 
@@ -148,6 +149,8 @@ public PersistableEnvelope fromProto(protobuf.PersistableEnvelope proto) {
                     return UnconfirmedBsqChangeOutputList.fromProto(proto.getUnconfirmedBsqChangeOutputList());
                 case SIGNED_WITNESS_STORE:
                     return SignedWitnessStore.fromProto(proto.getSignedWitnessStore());
+                case TRADE_STATISTICS3_STORE:
+                    return TradeStatistics3Store.fromProto(proto.getTradeStatistics3Store());
 
                 default:
                     throw new ProtobufferRuntimeException("Unknown proto message case(PB.PersistableEnvelope). " +

core/src/main/java/bisq/core/provider/ProvidersRepository.java

@@ -79,11 +79,12 @@ public void applyBannedNodes(@Nullable List<String> bannedNodes) {
         fillProviderList();
         selectNextProviderBaseUrl();
 
-        if (bannedNodes == null)
+        if (bannedNodes == null) {
             log.info("Selected provider baseUrl={}, providerList={}", baseUrl, providerList);
-        else
+        } else if (!bannedNodes.isEmpty()) {
             log.warn("We have banned provider nodes: bannedNodes={}, selected provider baseUrl={}, providerList={}",
                     bannedNodes, baseUrl, providerList);
+        }
     }
 
     public void selectNextProviderBaseUrl() {