Reduce initial request size

assets/src/main/resources/META-INF/services/bisq.asset.Asset

@@ -104,8 +104,6 @@ bisq.asset.coins.Spectrecoin
 bisq.asset.coins.Starwels
 bisq.asset.coins.SUB1X
 bisq.asset.coins.TEO
-bisq.asset.coins.TetherUSDLiquid
-bisq.asset.coins.TetherUSDOmni
 bisq.asset.coins.TurtleCoin
 bisq.asset.coins.UnitedCommunityCoin
 bisq.asset.coins.Unobtanium
@@ -125,7 +123,6 @@ bisq.asset.coins.ZeroClassic
 bisq.asset.tokens.AugmintEuro
 bisq.asset.tokens.DaiStablecoin
 bisq.asset.tokens.EtherStone
-bisq.asset.tokens.TetherUSDERC20
 bisq.asset.tokens.TrueUSD
 bisq.asset.tokens.USDCoin
 bisq.asset.tokens.VectorspaceAI

build.gradle

@@ -376,7 +376,7 @@ configure(project(':desktop')) {
     apply plugin: 'witness'
     apply from: '../gradle/witness/gradle-witness.gradle'
 
-    version = '1.3.7'
+    version = '1.3.8'
 
     mainClassName = 'bisq.desktop.app.BisqAppMain'
 

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;
@@ -27,7 +30,18 @@ public class Version {
     // VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update
     // Therefore all sub versions start again with 1
     // We use semantic versioning with major, minor and patch
-    public static final String VERSION = "1.3.7";
+    public static final String VERSION = "1.3.8";
+
+    /**
+     * Holds a list of historical versions.
+     *
+     * Has been introduced with version 1.3.2. Prior versions did not need the history.
+     *
+     * The history of versions is used in the differential data store solution which
+     * was introduced to eliminate the need to rewrite all data to disk every time the
+     * data changes.
+     */
+    public static final List<String> history = Arrays.asList("1.3.5", "1.3.6", "1.3.7");
 
     public static int getMajorVersion(String version) {
         return getSubVersion(version, 0);

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

@@ -20,6 +20,7 @@
 import bisq.network.p2p.storage.P2PDataStorage;
 import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
 import bisq.network.p2p.storage.persistence.MapStoreService;
+import bisq.network.p2p.storage.persistence.SplitStoreService;
 
 import bisq.common.config.Config;
 import bisq.common.storage.Storage;
@@ -36,7 +37,7 @@
 import static com.google.common.base.Preconditions.checkArgument;
 
 @Slf4j
-public class SignedWitnessStorageService extends MapStoreService<SignedWitnessStore, PersistableNetworkPayload> {
+public class SignedWitnessStorageService extends SplitStoreService<SignedWitnessStore> {
     private static final String FILE_NAME = "SignedWitnessStore";
 
 
@@ -59,11 +60,6 @@ public String getFileName() {
         return FILE_NAME;
     }
 
-    @Override
-    public Map<P2PDataStorage.ByteArray, PersistableNetworkPayload> getMap() {
-        return store.getMap();
-    }
-
     @Override
     public boolean canHandle(PersistableNetworkPayload payload) {
         return payload instanceof SignedWitness;
@@ -78,12 +74,4 @@ public boolean canHandle(PersistableNetworkPayload payload) {
     protected SignedWitnessStore createStore() {
         return new SignedWitnessStore();
     }
-
-    @Override
-    protected void readStore() {
-        super.readStore();
-        checkArgument(store instanceof SignedWitnessStore,
-                "Store is not instance of SignedWitnessStore. That can happen if the ProtoBuffer " +
-                        "file got changed. We cleared the data store and recreated it again.");
-    }
 }

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.SplitStore;
 
 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,10 +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 SplitStore {
     SignedWitnessStore() {
     }
 

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

@@ -17,9 +17,8 @@
 
 package bisq.core.account.witness;
 
-import bisq.network.p2p.storage.P2PDataStorage;
 import bisq.network.p2p.storage.payload.PersistableNetworkPayload;
-import bisq.network.p2p.storage.persistence.MapStoreService;
+import bisq.network.p2p.storage.persistence.SplitStoreService;
 
 import bisq.common.config.Config;
 import bisq.common.storage.Storage;
@@ -29,14 +28,10 @@
 
 import java.io.File;
 
-import java.util.Map;
-
 import lombok.extern.slf4j.Slf4j;
 
-import static com.google.common.base.Preconditions.checkArgument;
-
 @Slf4j
-public class AccountAgeWitnessStorageService extends MapStoreService<AccountAgeWitnessStore, PersistableNetworkPayload> {
+public class AccountAgeWitnessStorageService extends SplitStoreService<AccountAgeWitnessStore> {
     private static final String FILE_NAME = "AccountAgeWitnessStore";
 
 
@@ -59,11 +54,6 @@ public String getFileName() {
         return FILE_NAME;
     }
 
-    @Override
-    public Map<P2PDataStorage.ByteArray, PersistableNetworkPayload> getMap() {
-        return store.getMap();
-    }
-
     @Override
     public boolean canHandle(PersistableNetworkPayload payload) {
         return payload instanceof AccountAgeWitness;
@@ -78,12 +68,4 @@ public boolean canHandle(PersistableNetworkPayload payload) {
     protected AccountAgeWitnessStore createStore() {
         return new AccountAgeWitnessStore();
     }
-
-    @Override
-    protected void readStore() {
-        super.readStore();
-        checkArgument(store instanceof AccountAgeWitnessStore,
-                "Store is not instance of AccountAgeWitnessStore. That can happen if the ProtoBuffer " +
-                        "file got changed. We cleared the data store and recreated it again.");
-    }
 }

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.SplitStore;
 
 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,10 +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 SplitStore {
     AccountAgeWitnessStore() {
     }
 

core/src/main/java/bisq/core/app/BisqExecutable.java

@@ -26,6 +26,7 @@
 import bisq.core.setup.CoreSetup;
 import bisq.core.support.dispute.arbitration.arbitrator.ArbitratorManager;
 import bisq.core.trade.TradeManager;
+import bisq.core.trade.txproof.xmr.XmrTxProofService;
 
 import bisq.network.p2p.P2PService;
 
@@ -164,7 +165,6 @@ protected void applyInjector() {
 
     protected void setupDevEnv() {
         DevEnv.setDevMode(config.useDevMode);
-        DevEnv.setDevMode(config.useDevModeHeader);
         DevEnv.setDaoActivated(config.daoActivated);
     }
 
@@ -221,6 +221,7 @@ public void gracefulShutDown(ResultHandler resultHandler) {
         try {
             injector.getInstance(ArbitratorManager.class).shutDown();
             injector.getInstance(TradeManager.class).shutDown();
+            injector.getInstance(XmrTxProofService.class).shutDown();
             injector.getInstance(DaoSetup.class).shutDown();
             injector.getInstance(AvoidStandbyModeService.class).shutDown();
             injector.getInstance(OpenOfferManager.class).shutDown(() -> {

core/src/main/java/bisq/core/app/BisqSetup.java

@@ -59,6 +59,7 @@
 import bisq.core.trade.TradeManager;
 import bisq.core.trade.TradeTxException;
 import bisq.core.trade.statistics.TradeStatisticsManager;
+import bisq.core.trade.txproof.xmr.XmrTxProofService;
 import bisq.core.user.Preferences;
 import bisq.core.user.User;
 import bisq.core.util.FormattingUtils;
@@ -113,6 +114,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 import ch.qos.logback.classic.Level;
 
@@ -167,6 +169,7 @@ default void onRequestWalletPassword() {
     private final PrivateNotificationManager privateNotificationManager;
     private final FilterManager filterManager;
     private final TradeStatisticsManager tradeStatisticsManager;
+    private final XmrTxProofService xmrTxProofService;
     private final ClockWatcher clockWatcher;
     private final FeeService feeService;
     private final DaoSetup daoSetup;
@@ -263,6 +266,7 @@ public BisqSetup(P2PNetworkSetup p2PNetworkSetup,
                      PrivateNotificationManager privateNotificationManager,
                      FilterManager filterManager,
                      TradeStatisticsManager tradeStatisticsManager,
+                     XmrTxProofService xmrTxProofService,
                      ClockWatcher clockWatcher,
                      FeeService feeService,
                      DaoSetup daoSetup,
@@ -308,6 +312,7 @@ public BisqSetup(P2PNetworkSetup p2PNetworkSetup,
         this.privateNotificationManager = privateNotificationManager;
         this.filterManager = filterManager;
         this.tradeStatisticsManager = tradeStatisticsManager;
+        this.xmrTxProofService = xmrTxProofService;
         this.clockWatcher = clockWatcher;
         this.feeService = feeService;
         this.daoSetup = daoSetup;
@@ -686,6 +691,7 @@ private void initDomainServices() {
         traderChatManager.onAllServicesInitialized();
 
         tradeManager.onAllServicesInitialized();
+        xmrTxProofService.onAllServicesInitialized();
 
         if (walletsSetup.downloadPercentageProperty().get() == 1) {
             checkForLockedUpFunds();
@@ -846,7 +852,13 @@ private void initDomainServices() {
         priceAlert.onAllServicesInitialized();
         marketAlerts.onAllServicesInitialized();
 
-        user.onAllServicesInitialized(revolutAccountsUpdateHandler);
+        if (revolutAccountsUpdateHandler != null) {
+            revolutAccountsUpdateHandler.accept(user.getPaymentAccountsAsObservable().stream()
+                    .filter(paymentAccount -> paymentAccount instanceof RevolutAccount)
+                    .map(paymentAccount -> (RevolutAccount) paymentAccount)
+                    .filter(RevolutAccount::userNameNotSet)
+                    .collect(Collectors.toList()));
+        }
 
         allBasicServicesInitialized = true;
     }