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

do not backup trade wallet if arbitrator for space saving

Browse source
This commit is contained in:
woodser 2024-01-25 06:34:20 -05:00
parent 8776fecef0
commit 221a63077c
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/src/main/java/haveno/common/file/FileUtil.java
View file

@ -39,6 +39,7 @@ import java.util.List;
@Slf4j @Slf4j
public class FileUtil { public class FileUtil {
public static void rollingBackup(File dir, String fileName, int numMaxBackupFiles) { public static void rollingBackup(File dir, String fileName, int numMaxBackupFiles) {
if (numMaxBackupFiles <= 0) return;
if (dir.exists()) { if (dir.exists()) {
File backupDir = new File(Paths.get(dir.getAbsolutePath(), "backup").toString()); File backupDir = new File(Paths.get(dir.getAbsolutePath(), "backup").toString());
if (!backupDir.exists()) if (!backupDir.exists())

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

@ -875,7 +875,7 @@ public abstract class Trade implements Tradable, Model {
public void saveWallet() { public void saveWallet() {
synchronized (walletLock) { synchronized (walletLock) {
if (wallet == null) throw new RuntimeException("Trade wallet is not open for trade " + getId()); if (wallet == null) throw new RuntimeException("Trade wallet is not open for trade " + getId());
xmrWalletService.saveWallet(wallet, true); xmrWalletService.saveWallet(wallet, !isArbitrator()); // skip backup if arbitrator
} }
} }

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

@ -107,7 +107,7 @@ public class XmrWalletService {
private static final String MONERO_WALLET_NAME = "haveno_XMR"; private static final String MONERO_WALLET_NAME = "haveno_XMR";
private static final String KEYS_FILE_POSTFIX = ".keys"; private static final String KEYS_FILE_POSTFIX = ".keys";
private static final String ADDRESS_FILE_POSTFIX = ".address.txt"; private static final String ADDRESS_FILE_POSTFIX = ".address.txt";
private static final int NUM_MAX_BACKUP_WALLETS = 1; private static final int NUM_MAX_WALLET_BACKUPS = 1;
private static final int MONERO_LOG_LEVEL = 0; private static final int MONERO_LOG_LEVEL = 0;
private static final int MAX_SYNC_ATTEMPTS = 3; private static final int MAX_SYNC_ATTEMPTS = 3;
private static final boolean PRINT_STACK_TRACE = false; private static final boolean PRINT_STACK_TRACE = false;
@ -361,9 +361,9 @@ public class XmrWalletService {
} }
public void backupWallet(String walletName) { public void backupWallet(String walletName) {
FileUtil.rollingBackup(walletDir, walletName, NUM_MAX_BACKUP_WALLETS); FileUtil.rollingBackup(walletDir, walletName, NUM_MAX_WALLET_BACKUPS);
FileUtil.rollingBackup(walletDir, walletName + KEYS_FILE_POSTFIX, NUM_MAX_BACKUP_WALLETS); FileUtil.rollingBackup(walletDir, walletName + KEYS_FILE_POSTFIX, NUM_MAX_WALLET_BACKUPS);
FileUtil.rollingBackup(walletDir, walletName + ADDRESS_FILE_POSTFIX, NUM_MAX_BACKUP_WALLETS); FileUtil.rollingBackup(walletDir, walletName + ADDRESS_FILE_POSTFIX, NUM_MAX_WALLET_BACKUPS);
} }
public void deleteWalletBackups(String walletName) { public void deleteWalletBackups(String walletName) {