nihilist/haveno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

delete trade wallet backup if empty and payout unlocked, else schedule

Browse Source
This commit is contained in:
woodser 2024-01-24 06:29:14 -05:00
parent 7658b3a508
commit d0a489198b
1 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
core/src/main/java/haveno/core/trade/Trade.java
View File

@ -903,26 +903,46 @@ public abstract class Trade implements Tradable, Model {
if (walletExists()) { if (walletExists()) {
try { try {
// ensure wallet is initialized
if (wallet == null) {
log.warn("Wallet is not initialized for {} {}, opening", getClass().getSimpleName(), getId());
getWallet();
syncWallet(true);
}
// wallet must be synced
if (!isSyncedWithinTolerance()) {
log.warn("Wallet is not synced for {} {}, syncing", getClass().getSimpleName(), getId());
syncWallet(true);
}
// check if deposits published and payout not unlocked // check if deposits published and payout not unlocked
if (isDepositsPublished() && !isPayoutUnlocked()) { if (isDepositsPublished() && !isPayoutUnlocked()) {
throw new RuntimeException("Refusing to delete wallet for " + getClass().getSimpleName() + " " + getId() + " because the deposit txs have been published but payout tx has not unlocked"); throw new IllegalStateException("Refusing to delete wallet for " + getClass().getSimpleName() + " " + getId() + " because the deposit txs have been published but payout tx has not unlocked");
} }
// check for balance // check for balance
if (wallet != null && wallet.getBalance().compareTo(BigInteger.ZERO) > 0) { if (wallet.getBalance().compareTo(BigInteger.ZERO) > 0) {
throw new RuntimeException("Refusing to delete wallet for " + getClass().getSimpleName() + " " + getId() + " because it has a balance"); throw new IllegalStateException("Refusing to delete wallet for " + getClass().getSimpleName() + " " + getId() + " because it has a balance");
} }
// force stop wallet // force stop wallet
if (wallet != null) stopWallet(); stopWallet();
// delete wallet // delete wallet
log.info("Deleting wallet for {} {}", getClass().getSimpleName(), getId()); log.info("Deleting wallet for {} {}", getClass().getSimpleName(), getId());
xmrWalletService.deleteWallet(getWalletName()); xmrWalletService.deleteWallet(getWalletName());
// record delete height and schedule backup deletion // delete trade wallet backups if empty and payout unlocked, else schedule
if (isPayoutUnlocked() || !isDepositRequested() || isDepositFailed()) {
xmrWalletService.deleteWalletBackups(getWalletName());
} else {
// schedule backup deletion by recording delete height
log.warn("Scheduling to delete backup wallet for " + getClass().getSimpleName() + " " + getId() + " in the small chance it becomes funded");
processModel.setDeleteBackupsHeight(xmrConnectionService.getLastInfo().getHeight() + DELETE_BACKUPS_AFTER_NUM_BLOCKS); processModel.setDeleteBackupsHeight(xmrConnectionService.getLastInfo().getHeight() + DELETE_BACKUPS_AFTER_NUM_BLOCKS);
maybeScheduleDeleteBackups(); maybeScheduleDeleteBackups();
}
} catch (Exception e) { } catch (Exception e) {
log.warn(e.getMessage()); log.warn(e.getMessage());
e.printStackTrace(); e.printStackTrace();
@ -1194,8 +1214,10 @@ public abstract class Trade implements Tradable, Model {
} }
public void clearAndShutDown() { public void clearAndShutDown() {
ThreadUtils.execute(() -> clearProcessData(), getId()); ThreadUtils.execute(() -> {
clearProcessData();
ThreadUtils.submitToPool(() -> shutDown()); // run off trade thread ThreadUtils.submitToPool(() -> shutDown()); // run off trade thread
}, getId());
} }
private void clearProcessData() { private void clearProcessData() {