regularly save wallets after minimum interval of 5 mins

woodser · woodser · commit 8a91464d8794 · 2025-09-22T07:32:38.000-04:00
diff --git a/core/src/main/java/haveno/core/trade/Trade.java b/core/src/main/java/haveno/core/trade/Trade.java
@@ -1000,14 +1000,20 @@ public void changeWalletPassword(String oldPassword, String newPassword) {
     }
 
     @Override
-    public void requestSaveWallet() {
+    public void requestSaveWalletIfAfterInterval() {
+        ThreadUtils.submitToPool(() -> {
+            synchronized (walletLock) {
+                if (walletExists()) saveWalletIfAfterInterval();
+            }
+        });
+    }
 
-        // save wallet off main thread
-        ThreadUtils.execute(() -> {
+    private void requestSaveWallet() {
+        ThreadUtils.submitToPool(() -> {
             synchronized (walletLock) {
                 if (walletExists()) saveWallet();
             }
-         }, getId());
+        });
     }
 
     @Override
@@ -1019,6 +1025,7 @@ public void saveWallet() {
             }
             if (wallet == null) throw new RuntimeException("Trade wallet is not open for trade " + getShortId());
             xmrWalletService.saveWallet(wallet);
+            lastSaveTimeMs = System.currentTimeMillis();
             maybeBackupWallet();
         }
     }
@@ -1447,8 +1454,8 @@ public void processPayoutTx(String payoutTxHex, boolean sign, boolean publish) {
                         if (i == TradeProtocol.MAX_ATTEMPTS - 1) throw e;
                         HavenoUtils.waitFor(TradeProtocol.REPROCESS_DELAY_MS); // wait before retrying
                     } finally {
-                        requestSaveWallet();
-                        requestPersistence();
+                        saveWallet();
+                        persistNow(null);
                     }
                 }
             }
@@ -2965,7 +2972,7 @@ private void doPollWallet(boolean offlinePoll) {
                 }
             }
             wasWalletPolled.set(true);
-            saveWalletWithDelay();
+            requestSaveWalletIfAfterInterval();
         }
     }
 
@@ -3344,7 +3351,7 @@ public void rescanSpent(boolean skipLog) {
                 if (!skipLog) log.info("Rescanning spent outputs for {} {}", getClass().getSimpleName(), getShortId());
                 wallet.rescanSpent();
                 if (!skipLog) log.info("Done rescanning spent outputs for {} {}", getClass().getSimpleName(), getShortId());
-                saveWalletWithDelay();
+                saveWalletIfAfterInterval();
             } catch (Exception e) {
                 log.warn("Error rescanning spent outputs for {} {}, errorMessage={}", getClass().getSimpleName(), getShortId(), e.getMessage());
                 if (HavenoUtils.isUnresponsive(e)) forceRestartTradeWallet(); // wallet can be stuck a while
diff --git a/core/src/main/java/haveno/core/xmr/wallet/XmrWalletBase.java b/core/src/main/java/haveno/core/xmr/wallet/XmrWalletBase.java
@@ -12,6 +12,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import haveno.common.ThreadUtils;
 import haveno.common.Timer;
 import haveno.common.UserThread;
 import haveno.core.api.XmrConnectionService;
@@ -35,8 +36,10 @@ public abstract class XmrWalletBase {
     // constants
     public static final int SYNC_TIMEOUT_SECONDS = 180;
     public static final int DIRECT_SYNC_WITHIN_BLOCKS = 100;
-    public static final int SAVE_WALLET_DELAY_SECONDS = 300;
     private static final String SYNC_PROGRESS_TIMEOUT_MSG = "Sync progress timeout called";
+    private static final long MIN_SAVE_INTERVAL_MS = 300000;
+    protected long lastSaveTimeMs = 0;
+    private Object saveIntervalLock = new Object();
 
     // inherited
     protected MoneroWallet wallet;
@@ -81,6 +84,7 @@ public MoneroSyncResult syncWithTimeout(long timeout) {
 
                 Callable<MoneroSyncResult> task = () -> {
                     MoneroSyncResult result = wallet.sync();
+                    saveWalletIfAfterInterval();
                     walletHeight.set(wallet.getHeight());
                     return result;
                 };
@@ -191,7 +195,7 @@ public void onSyncProgress(long height, long startHeight, long endHeight, double
                 if (wallet != null) { // can become null if interrupted by force close
                     if (syncProgressError == null || !HavenoUtils.isUnresponsive(syncProgressError)) { // TODO: skipping stop sync if unresponsive because wallet will hang. if unresponsive, wallet is assumed to be force restarted by caller, but that should be done internally here instead of externally?
                         wallet.stopSyncing();
-                        saveWallet();
+                        saveWalletIfAfterInterval();
                     }
                 }
                 if (syncProgressError != null) throw new RuntimeException(syncProgressError);
@@ -211,25 +215,26 @@ public boolean requestSwitchToNextBestConnection(MoneroRpcConnection sourceConne
         return false;
     }
 
-    public void saveWalletWithDelay() {
-        // delay writing to disk to avoid frequent write operations
-        if (saveWalletDelayTimer == null) {
-            saveWalletDelayTimer = UserThread.runAfter(() -> {
-                requestSaveWallet();
-                UserThread.execute(() -> saveWalletDelayTimer = null);
-            }, SAVE_WALLET_DELAY_SECONDS, TimeUnit.SECONDS);
+    public void saveWalletIfAfterInterval() {
+        synchronized (saveIntervalLock) {
+            if (System.currentTimeMillis() - lastSaveTimeMs >= MIN_SAVE_INTERVAL_MS) {
+                saveWallet();
+                lastSaveTimeMs = System.currentTimeMillis();
+            }
         }
     }
 
-    // --------------------------------- ABSTRACT -----------------------------
+    public void requestSaveWalletIfAfterInterval() {
+        ThreadUtils.submitToPool(() -> saveWalletIfAfterInterval());
+    }
 
     public static boolean isSyncWithProgressTimeout(Throwable e) {
         return e.getMessage().contains(SYNC_PROGRESS_TIMEOUT_MSG);
     }
 
-    public abstract void saveWallet();
+    // --------------------------------- ABSTRACT -----------------------------
 
-    public abstract void requestSaveWallet();
+    public abstract void saveWallet();
 
     protected abstract void onConnectionChanged(MoneroRpcConnection connection);
 
@@ -242,6 +247,9 @@ private void updateSyncProgress(long height, long targetHeight) {
             resetSyncProgressTimeout();
         }
 
+        // save wallet periodically
+        saveWalletIfAfterInterval();
+
         // set wallet height
         walletHeight.set(height);
 
diff --git a/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java b/core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
@@ -239,7 +239,10 @@ public long getWalletCreationDate() {
 
     @Override
     public void saveWallet() {
-        saveWallet(shouldBackup(wallet));
+        synchronized (walletLock) {
+            saveWallet(shouldBackup(wallet));
+            lastSaveTimeMs = System.currentTimeMillis();
+        }
     }
 
     private boolean shouldBackup(MoneroWallet wallet) {
@@ -252,11 +255,6 @@ public void saveWallet(boolean backup) {
         }
     }
 
-    @Override
-    public void requestSaveWallet() {
-        ThreadUtils.submitToPool(() -> saveWallet()); // save wallet off main thread
-    }
-
     public boolean isWalletAvailable() {
         try {
             return getWallet() != null;
@@ -432,7 +430,7 @@ public MoneroTxWallet createTx(MoneroTxConfig txConfig) {
                 if (Boolean.TRUE.equals(txConfig.getRelay())) {
                     cachedTxs.addFirst(tx);
                     cacheWalletInfo();
-                    requestSaveWallet();
+                    saveWallet();
                 }
                 return tx;
             }
@@ -450,7 +448,7 @@ public List<MoneroTxWallet> createSweepTxs(MoneroTxConfig txConfig) {
                 if (Boolean.TRUE.equals(txConfig.getRelay())) {
                     for (MoneroTxWallet tx : txs) cachedTxs.addFirst(tx);
                     cacheWalletInfo();
-                    requestSaveWallet();
+                    saveWallet();
                 }
                 return txs;
             }
@@ -460,7 +458,7 @@ public List<MoneroTxWallet> createSweepTxs(MoneroTxConfig txConfig) {
     public List<String> relayTxs(List<String> metadatas) {
         synchronized (walletLock) {
             List<String> txIds = wallet.relayTxs(metadatas);
-            requestSaveWallet();
+            saveWallet();
             return txIds;
         }
     }
@@ -554,7 +552,7 @@ public void freezeOutputs(Collection<String> keyImages) {
             for (String keyImage : unfrozenKeyImages) wallet.freezeOutput(keyImage);
             cacheNonPoolTxs();
             cacheWalletInfo();
-            requestSaveWallet();
+            saveWallet();
         }
     }
 
@@ -577,7 +575,7 @@ public void thawOutputs(Collection<String> keyImages) {
             for (String keyImage : frozenKeyImages) wallet.thawOutput(keyImage);
             cacheNonPoolTxs();
             cacheWalletInfo();
-            requestSaveWallet();
+            saveWallet();
         }
     }
 
@@ -2075,7 +2073,7 @@ else if (isWalletConnectedToDaemon()) {
                     pollInProgress = false;
                 }
             }
-            saveWalletWithDelay();
+            saveWalletIfAfterInterval();
 
             // cache wallet info last
             synchronized (walletLock) {

Original file line number	Diff line number	Diff line change
`@@ -1000,14 +1000,20 @@ public void changeWalletPassword(String oldPassword, String newPassword) {`
`1000`	`1000`	`}`
`1001`	`1001`
`1002`	`1002`	`@Override`
`1003`		`- public void requestSaveWallet() {`
	`1003`	`+ public void requestSaveWalletIfAfterInterval() {`
	`1004`	`+ ThreadUtils.submitToPool(() -> {`
	`1005`	`+ synchronized (walletLock) {`
	`1006`	`+ if (walletExists()) saveWalletIfAfterInterval();`
	`1007`	`+ }`
	`1008`	`+ });`
	`1009`	`+ }`
`1004`	`1010`
`1005`		`- // save wallet off main thread`
`1006`		`- ThreadUtils.execute(() -> {`
	`1011`	`+ private void requestSaveWallet() {`
	`1012`	`+ ThreadUtils.submitToPool(() -> {`
`1007`	`1013`	`synchronized (walletLock) {`
`1008`	`1014`	`if (walletExists()) saveWallet();`
`1009`	`1015`	`}`
`1010`		`- }, getId());`
	`1016`	`+ });`
`1011`	`1017`	`}`
`1012`	`1018`
`1013`	`1019`	`@Override`
`@@ -1019,6 +1025,7 @@ public void saveWallet() {`
`1019`	`1025`	`}`
`1020`	`1026`	`if (wallet == null) throw new RuntimeException("Trade wallet is not open for trade " + getShortId());`
`1021`	`1027`	`xmrWalletService.saveWallet(wallet);`
	`1028`	`+ lastSaveTimeMs = System.currentTimeMillis();`
`1022`	`1029`	`maybeBackupWallet();`
`1023`	`1030`	`}`
`1024`	`1031`	`}`
`@@ -1447,8 +1454,8 @@ public void processPayoutTx(String payoutTxHex, boolean sign, boolean publish) {`
`1447`	`1454`	`if (i == TradeProtocol.MAX_ATTEMPTS - 1) throw e;`
`1448`	`1455`	`HavenoUtils.waitFor(TradeProtocol.REPROCESS_DELAY_MS); // wait before retrying`
`1449`	`1456`	`} finally {`
`1450`		`- requestSaveWallet();`
`1451`		`- requestPersistence();`
	`1457`	`+ saveWallet();`
	`1458`	`+ persistNow(null);`
`1452`	`1459`	`}`
`1453`	`1460`	`}`
`1454`	`1461`	`}`
`@@ -2965,7 +2972,7 @@ private void doPollWallet(boolean offlinePoll) {`
`2965`	`2972`	`}`
`2966`	`2973`	`}`
`2967`	`2974`	`wasWalletPolled.set(true);`
`2968`		`- saveWalletWithDelay();`
	`2975`	`+ requestSaveWalletIfAfterInterval();`
`2969`	`2976`	`}`
`2970`	`2977`	`}`
`2971`	`2978`
`@@ -3344,7 +3351,7 @@ public void rescanSpent(boolean skipLog) {`
`3344`	`3351`	`if (!skipLog) log.info("Rescanning spent outputs for {} {}", getClass().getSimpleName(), getShortId());`
`3345`	`3352`	`wallet.rescanSpent();`
`3346`	`3353`	`if (!skipLog) log.info("Done rescanning spent outputs for {} {}", getClass().getSimpleName(), getShortId());`
`3347`		`- saveWalletWithDelay();`
	`3354`	`+ saveWalletIfAfterInterval();`
`3348`	`3355`	`} catch (Exception e) {`
`3349`	`3356`	`log.warn("Error rescanning spent outputs for {} {}, errorMessage={}", getClass().getSimpleName(), getShortId(), e.getMessage());`
`3350`	`3357`	`if (HavenoUtils.isUnresponsive(e)) forceRestartTradeWallet(); // wallet can be stuck a while`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,10 @@ public long getWalletCreationDate() {`
`239`	`239`
`240`	`240`	`@Override`
`241`	`241`	`public void saveWallet() {`
`242`		`- saveWallet(shouldBackup(wallet));`
	`242`	`+ synchronized (walletLock) {`
	`243`	`+ saveWallet(shouldBackup(wallet));`
	`244`	`+ lastSaveTimeMs = System.currentTimeMillis();`
	`245`	`+ }`
`243`	`246`	`}`
`244`	`247`
`245`	`248`	`private boolean shouldBackup(MoneroWallet wallet) {`
`@@ -252,11 +255,6 @@ public void saveWallet(boolean backup) {`
`252`	`255`	`}`
`253`	`256`	`}`
`254`	`257`
`255`		`- @Override`
`256`		`- public void requestSaveWallet() {`
`257`		`- ThreadUtils.submitToPool(() -> saveWallet()); // save wallet off main thread`
`258`		`- }`
`259`		`-`
`260`	`258`	`public boolean isWalletAvailable() {`
`261`	`259`	`try {`
`262`	`260`	`return getWallet() != null;`
`@@ -432,7 +430,7 @@ public MoneroTxWallet createTx(MoneroTxConfig txConfig) {`
`432`	`430`	`if (Boolean.TRUE.equals(txConfig.getRelay())) {`
`433`	`431`	`cachedTxs.addFirst(tx);`
`434`	`432`	`cacheWalletInfo();`
`435`		`- requestSaveWallet();`
	`433`	`+ saveWallet();`
`436`	`434`	`}`
`437`	`435`	`return tx;`
`438`	`436`	`}`
`@@ -450,7 +448,7 @@ public List<MoneroTxWallet> createSweepTxs(MoneroTxConfig txConfig) {`
`450`	`448`	`if (Boolean.TRUE.equals(txConfig.getRelay())) {`
`451`	`449`	`for (MoneroTxWallet tx : txs) cachedTxs.addFirst(tx);`
`452`	`450`	`cacheWalletInfo();`
`453`		`- requestSaveWallet();`
	`451`	`+ saveWallet();`
`454`	`452`	`}`
`455`	`453`	`return txs;`
`456`	`454`	`}`
`@@ -460,7 +458,7 @@ public List<MoneroTxWallet> createSweepTxs(MoneroTxConfig txConfig) {`
`460`	`458`	`public List<String> relayTxs(List<String> metadatas) {`
`461`	`459`	`synchronized (walletLock) {`
`462`	`460`	`List<String> txIds = wallet.relayTxs(metadatas);`
`463`		`- requestSaveWallet();`
	`461`	`+ saveWallet();`
`464`	`462`	`return txIds;`
`465`	`463`	`}`
`466`	`464`	`}`
`@@ -554,7 +552,7 @@ public void freezeOutputs(Collection<String> keyImages) {`
`554`	`552`	`for (String keyImage : unfrozenKeyImages) wallet.freezeOutput(keyImage);`
`555`	`553`	`cacheNonPoolTxs();`
`556`	`554`	`cacheWalletInfo();`
`557`		`- requestSaveWallet();`
	`555`	`+ saveWallet();`
`558`	`556`	`}`
`559`	`557`	`}`
`560`	`558`
`@@ -577,7 +575,7 @@ public void thawOutputs(Collection<String> keyImages) {`
`577`	`575`	`for (String keyImage : frozenKeyImages) wallet.thawOutput(keyImage);`
`578`	`576`	`cacheNonPoolTxs();`
`579`	`577`	`cacheWalletInfo();`
`580`		`- requestSaveWallet();`
	`578`	`+ saveWallet();`
`581`	`579`	`}`
`582`	`580`	`}`
`583`	`581`
`@@ -2075,7 +2073,7 @@ else if (isWalletConnectedToDaemon()) {`
`2075`	`2073`	`pollInProgress = false;`
`2076`	`2074`	`}`
`2077`	`2075`	`}`
`2078`		`- saveWalletWithDelay();`
	`2076`	`+ saveWalletIfAfterInterval();`
`2079`	`2077`
`2080`	`2078`	`// cache wallet info last`
`2081`	`2079`	`synchronized (walletLock) {`