improve reliability of requesting persistence including trade state

Author: woodser

common/src/main/java/haveno/common/persistence/PersistenceManager.java

@@ -433,12 +433,14 @@ public void requestPersistence() {
     private void maybeStartTimerForPersistence() {
         // We write to disk with a delay to avoid frequent write operations. Depending on the priority those delays
         // can be rather long.
-        if (timer == null) {
-            timer = UserThread.runAfter(() -> {
-                persistNow(null);
-                UserThread.execute(() -> timer = null);
-            }, source.delay, TimeUnit.MILLISECONDS);
-        }
+        UserThread.execute(() -> {
+            if (timer == null) {
+                timer = UserThread.runAfter(() -> {
+                    persistNow(null);
+                    UserThread.execute(() -> timer = null);
+                }, source.delay, TimeUnit.MILLISECONDS);
+            }
+        });
     }
 
     public void forcePersistNow() {

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

@@ -1098,7 +1098,6 @@ public MoneroTxWallet createTx(MoneroTxConfig txConfig) {
             synchronized (HavenoUtils.getWalletFunctionLock()) {
                 MoneroTxWallet tx = wallet.createTx(txConfig);
                 exportMultisigHex();
-                saveWallet();
                 return tx;
             }
         }
@@ -1107,7 +1106,7 @@ public MoneroTxWallet createTx(MoneroTxConfig txConfig) {
     public void exportMultisigHex() {
         synchronized (walletLock) {
             getSelf().setUpdatedMultisigHex(wallet.exportMultisigHex());
-            requestPersistence();
+            saveWallet();
         }
     }
 
@@ -1888,7 +1887,7 @@ public void setState(State state) {
         }
 
         this.state = state;
-        requestPersistence();
+        persistNow(null);
         UserThread.execute(() -> {
             stateProperty.set(state);
             phaseProperty.set(state.getPhase());
@@ -1920,7 +1919,7 @@ public void setPayoutState(PayoutState payoutState) {
         }
 
         this.payoutState = payoutState;
-        requestPersistence();
+        persistNow(null);
         UserThread.execute(() -> payoutStateProperty.set(payoutState));
     }
 
@@ -1936,6 +1935,7 @@ public void setDisputeState(DisputeState disputeState) {
         }
 
         this.disputeState = disputeState;
+        persistNow(null);
         UserThread.execute(() -> {
             disputeStateProperty.set(disputeState);
         });