nihilist/haveno-reto
1
0
Fork 0
mirror of https://github.com/retoaccess1/haveno-reto.git synced 2024-11-10 13:13:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

synchronize on wallet during restart

Browse Source
This commit is contained in:
woodser 2023-07-10 15:27:58 -04:00
parent 2b84c44ef7
commit 290912c333
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
View File

@ -840,8 +840,10 @@ public class XmrWalletService {
if (wallet == null) maybeInitMainWallet();
else if (wallet instanceof MoneroWalletRpc && !StringUtils.equals(oldProxyUri, newProxyUri)) {
log.info("Restarting main wallet since proxy URI has changed");
closeMainWallet(true);
maybeInitMainWallet();
synchronized (wallet) {
closeMainWallet(true);
maybeInitMainWallet();
}
} else {
wallet.setDaemonConnection(connection);
if (connection != null) {
@ -1126,19 +1128,29 @@ public class XmrWalletService {
}
public BigInteger getBalanceForSubaddress(int subaddressIndex) {
return wallet.getBalance(0, subaddressIndex);
synchronized (wallet) {
return wallet.getBalance(0, subaddressIndex);
}
}
public BigInteger getAvailableBalanceForSubaddress(int subaddressIndex) {
return wallet.getUnlockedBalance(0, subaddressIndex);
synchronized (wallet) {
return wallet.getUnlockedBalance(0, subaddressIndex);
}
}
public BigInteger getBalance() {
return wallet != null ? wallet.getBalance(0) : BigInteger.valueOf(0);
if (wallet == null) return BigInteger.valueOf(0);
synchronized (wallet) {
return wallet.getBalance(0);
}
}
public BigInteger getAvailableBalance() {
return wallet != null ? wallet.getUnlockedBalance(0) : BigInteger.valueOf(0);
if (wallet == null) return BigInteger.valueOf(0);
synchronized (wallet) {
return wallet.getUnlockedBalance(0);
}
}
public Stream<XmrAddressEntry> getAddressEntriesForAvailableBalanceStream() {