boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2024-12-22 20:19:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix bug restoring wrong wallet cache

Browse source
This commit is contained in:
woodser 2024-11-07 11:56:56 -05:00
parent 1af87b2db9
commit 466e1f048e
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
View file

@ -1482,18 +1482,18 @@ public class XmrWalletService extends XmrWalletBase {
try { try {
// rename wallet cache to backup // rename wallet cache to backup
String cachePath = walletDir.toString() + File.separator + MONERO_WALLET_NAME; String cachePath = walletDir.toString() + File.separator + getWalletName(config.getPath());
File originalCacheFile = new File(cachePath); File originalCacheFile = new File(cachePath);
if (originalCacheFile.exists()) originalCacheFile.renameTo(new File(cachePath + ".backup")); if (originalCacheFile.exists()) originalCacheFile.renameTo(new File(cachePath + ".backup"));
// copy latest wallet cache backup to main folder // copy latest wallet cache backup to main folder
File backupCacheFile = FileUtil.getLatestBackupFile(walletDir, MONERO_WALLET_NAME); File backupCacheFile = FileUtil.getLatestBackupFile(walletDir, getWalletName(config.getPath()));
if (backupCacheFile != null) FileUtil.copyFile(backupCacheFile, new File(cachePath)); if (backupCacheFile != null) FileUtil.copyFile(backupCacheFile, new File(cachePath));
// retry opening wallet without original cache // retry opening wallet without original cache
try { try {
walletFull = MoneroWalletFull.openWallet(config); walletFull = MoneroWalletFull.openWallet(config);
log.info("Successfully opened full wallet using backup cache"); log.warn("Successfully opened full wallet using backup cache");
retrySuccessful = true; retrySuccessful = true;
} catch (Exception e2) { } catch (Exception e2) {
// ignore // ignore
@ -1587,18 +1587,18 @@ public class XmrWalletService extends XmrWalletBase {
try { try {
// rename wallet cache to backup // rename wallet cache to backup
String cachePath = walletDir.toString() + File.separator + MONERO_WALLET_NAME; String cachePath = walletDir.toString() + File.separator + config.getPath();
File originalCacheFile = new File(cachePath); File originalCacheFile = new File(cachePath);
if (originalCacheFile.exists()) originalCacheFile.renameTo(new File(cachePath + ".backup")); if (originalCacheFile.exists()) originalCacheFile.renameTo(new File(cachePath + ".backup"));
// copy latest wallet cache backup to main folder // copy latest wallet cache backup to main folder
File backupCacheFile = FileUtil.getLatestBackupFile(walletDir, MONERO_WALLET_NAME); File backupCacheFile = FileUtil.getLatestBackupFile(walletDir, config.getPath());
if (backupCacheFile != null) FileUtil.copyFile(backupCacheFile, new File(cachePath)); if (backupCacheFile != null) FileUtil.copyFile(backupCacheFile, new File(cachePath));
// retry opening wallet without original cache // retry opening wallet without original cache
try { try {
walletRpc.openWallet(config); walletRpc.openWallet(config);
log.info("Successfully opened RPC wallet using backup cache"); log.warn("Successfully opened RPC wallet using backup cache");
retrySuccessful = true; retrySuccessful = true;
} catch (Exception e2) { } catch (Exception e2) {
// ignore // ignore