Ecosystem/haveno
Ecosystem/haveno
2
1
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2024-12-31 16:09:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle closing, stopping, deleting native and rpc wallet

Browse source
This commit is contained in:
woodser 2024-04-03 14:49:52 -04:00
parent 01dd6a8af9
commit 60d82520c0
2 changed files with 40 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
core/src/main/java/haveno/core/trade/Trade.java
View file

@ -924,19 +924,10 @@ public abstract class Trade implements Tradable, Model {
}
}
private void stopWallet() {
synchronized (walletLock) {
if (wallet == null) throw new RuntimeException("Trade wallet to close is not open for trade " + getId());
stopPolling();
xmrWalletService.stopWallet(wallet, wallet.getPath(), true);
wallet = null;
}
}
public void forceStopWallet() {
private void forceCloseWallet() {
if (wallet != null) {
log.warn("Force stopping wallet for {} {}", getClass().getSimpleName(), getId());
xmrWalletService.stopWallet(wallet, wallet.getPath(), true);
log.warn("Force closing wallet for {} {}", getClass().getSimpleName(), getId());
xmrWalletService.forceCloseWallet(wallet, wallet.getPath());
wallet = null;
}
}
@ -969,8 +960,8 @@ public abstract class Trade implements Tradable, Model {
throw new IllegalStateException("Refusing to delete wallet for " + getClass().getSimpleName() + " " + getId() + " because it has a balance");
}
// force stop wallet
stopWallet();
// force close wallet
forceCloseWallet();
// delete wallet
log.info("Deleting wallet for {} {}", getClass().getSimpleName(), getId());
@ -1349,11 +1340,10 @@ public abstract class Trade implements Tradable, Model {
ThreadUtils.awaitTasks(shutDownThreads);
}
// save wallet
// save and close
if (wallet != null) {
try {
xmrWalletService.saveWallet(wallet);
stopWallet();
closeWallet();
} catch (Exception e) {
// warning will be logged for main wallet, so skip logging here
//log.warn("Error closing monero-wallet-rpc subprocess for {} {}: {}. Was Haveno stopped manually with ctrl+c?", getClass().getSimpleName(), getId(), e.getMessage());
@ -1368,8 +1358,8 @@ public abstract class Trade implements Tradable, Model {
log.warn("Error shutting down {} {}: {}", getClass().getSimpleName(), getId(), e.getMessage());
e.printStackTrace();
// force stop wallet
forceStopWallet();
// force close wallet
forceCloseWallet();
}
// backup trade wallet if applicable
@ -2222,7 +2212,7 @@ public abstract class Trade implements Tradable, Model {
log.warn("Force restarting trade wallet for {} {}", getClass().getSimpleName(), getId());
if (isShutDownStarted || restartInProgress) return;
restartInProgress = true;
forceStopWallet();
forceCloseWallet();
if (!isShutDownStarted) wallet = getWallet();
restartInProgress = false;
if (!isShutDownStarted) ThreadUtils.execute(() -> tryInitSyncing(), getId());

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

@ -339,12 +339,19 @@ public class XmrWalletService {
}
private MoneroWalletConfig getWalletConfig(String walletName) {
String walletConfigPath = (isNativeLibraryApplied() ? walletDir.getPath() + File.separator : "") + walletName;
MoneroWalletConfig config = new MoneroWalletConfig().setPath(walletConfigPath).setPassword(getWalletPassword());
MoneroWalletConfig config = new MoneroWalletConfig().setPath(getWalletPath(walletName)).setPassword(getWalletPassword());
if (isNativeLibraryApplied()) config.setNetworkType(getMoneroNetworkType());
return config;
}
private String getWalletPath(String walletName) {
return (isNativeLibraryApplied() ? walletDir.getPath() + File.separator : "") + walletName;
}
private static String getWalletName(String walletPath) {
return walletPath.substring(walletPath.lastIndexOf(File.separator) + 1);
}
private boolean isNativeLibraryApplied() {
return useNativeXmrWallet && MoneroUtils.isNativeLibraryLoaded();
}
@ -374,7 +381,7 @@ public class XmrWalletService {
public void saveWallet(MoneroWallet wallet, boolean backup) {
wallet.save();
if (backup) backupWallet(wallet.getPath());
if (backup) backupWallet(getWalletName(wallet.getPath()));
}
public void closeWallet(MoneroWallet wallet, boolean save) {
@ -383,27 +390,26 @@ public class XmrWalletService {
String path = wallet.getPath();
try {
wallet.close(save);
if (save) backupWallet(path);
if (save) backupWallet(getWalletName(path));
} catch (MoneroError e) {
err = e;
}
stopWallet(wallet, path);
// stop wallet rpc instance if applicable
if (wallet instanceof MoneroWalletRpc) MONERO_WALLET_RPC_MANAGER.stopInstance((MoneroWalletRpc) wallet, path, false);
if (err != null) throw err;
}
public void stopWallet(MoneroWallet wallet, String path) {
stopWallet(wallet, path, false);
}
public void stopWallet(MoneroWallet wallet, String path, boolean force) {
// only wallet rpc process needs stopped
public void forceCloseWallet(MoneroWallet wallet, String path) {
if (wallet instanceof MoneroWalletRpc) {
MONERO_WALLET_RPC_MANAGER.stopInstance((MoneroWalletRpc) wallet, path, force);
MONERO_WALLET_RPC_MANAGER.stopInstance((MoneroWalletRpc) wallet, path, true);
} else {
wallet.close(false);
}
}
public void deleteWallet(String walletName) {
assertNotPath(walletName);
log.info("{}.deleteWallet({})", getClass().getSimpleName(), walletName);
if (!walletExists(walletName)) throw new Error("Wallet does not exist at path: " + walletName);
String path = walletDir.toString() + File.separator + walletName;
@ -413,17 +419,23 @@ public class XmrWalletService {
}
public void backupWallet(String walletName) {
assertNotPath(walletName);
FileUtil.rollingBackup(walletDir, walletName, NUM_MAX_WALLET_BACKUPS);
FileUtil.rollingBackup(walletDir, walletName + KEYS_FILE_POSTFIX, NUM_MAX_WALLET_BACKUPS);
FileUtil.rollingBackup(walletDir, walletName + ADDRESS_FILE_POSTFIX, NUM_MAX_WALLET_BACKUPS);
}
public void deleteWalletBackups(String walletName) {
assertNotPath(walletName);
FileUtil.deleteRollingBackup(walletDir, walletName);
FileUtil.deleteRollingBackup(walletDir, walletName + KEYS_FILE_POSTFIX);
FileUtil.deleteRollingBackup(walletDir, walletName + ADDRESS_FILE_POSTFIX);
}
private static void assertNotPath(String name) {
if (name.contains(File.separator)) throw new IllegalArgumentException("Path not expected: " + name);
}
public MoneroTxWallet createTx(List<MoneroDestination> destinations) {
synchronized (walletLock) {
try {
@ -1001,7 +1013,7 @@ public class XmrWalletService {
return walletFull;
} catch (Exception e) {
e.printStackTrace();
if (walletFull != null) stopWallet(walletFull, config.getPath());
if (walletFull != null) forceCloseWallet(walletFull, config.getPath());
throw new IllegalStateException("Could not create wallet '" + config.getPath() + "'");
}
}
@ -1023,7 +1035,7 @@ public class XmrWalletService {
return walletFull;
} catch (Exception e) {
e.printStackTrace();
if (walletFull != null) stopWallet(walletFull, config.getPath());
if (walletFull != null) forceCloseWallet(walletFull, config.getPath());
throw new IllegalStateException("Could not open full wallet '" + config.getPath() + "'");
}
}
@ -1055,7 +1067,7 @@ public class XmrWalletService {
return walletRpc;
} catch (Exception e) {
e.printStackTrace();
if (walletRpc != null) stopWallet(walletRpc, config.getPath());
if (walletRpc != null) forceCloseWallet(walletRpc, config.getPath());
throw new IllegalStateException("Could not create wallet '" + config.getPath() + "'. Please close Haveno, stop all monero-wallet-rpc processes, and restart Haveno.");
}
}
@ -1084,7 +1096,7 @@ public class XmrWalletService {
return walletRpc;
} catch (Exception e) {
e.printStackTrace();
if (walletRpc != null) stopWallet(walletRpc, config.getPath());
if (walletRpc != null) forceCloseWallet(walletRpc, config.getPath());
throw new IllegalStateException("Could not open wallet '" + config.getPath() + "'. Please close Haveno, stop all monero-wallet-rpc processes, and restart Haveno.");
}
}
@ -1203,7 +1215,7 @@ public class XmrWalletService {
wallet = null;
}
} catch (Exception e) {
log.warn("Error closing main monero-wallet-rpc subprocess: {}. Was Haveno stopped manually with ctrl+c?", e.getMessage());
log.warn("Error closing main wallet: {}. Was Haveno stopped manually with ctrl+c?", e.getMessage());
}
}
}