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

swap address entries when app fully initialized

Browse Source
This commit is contained in:
woodser 2023-06-11 10:33:39 -04:00
parent 2ca8ccb1f3
commit 0bbb8a4183
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/haveno/core/app/HavenoSetup.java
View File

@ -779,4 +779,8 @@ public class HavenoSetup {
public BooleanProperty getWalletInitialized() {
return walletInitialized;
}
public AppStartupState getAppStartupState() {
return appStartupState;
}
}

15
core/src/main/java/haveno/core/trade/TradeManager.java
View File

@ -88,7 +88,6 @@ import org.bitcoinj.core.Coin;
import org.bouncycastle.crypto.params.KeyParameter;
import org.fxmisc.easybind.EasyBind;
import org.fxmisc.easybind.Subscription;
import org.fxmisc.easybind.monadic.MonadicBinding;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -450,13 +449,17 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
// process after all wallets initialized
if (HavenoUtils.havenoSetup != null) { // null for seednode
MonadicBinding<Boolean> walletsInitialized = EasyBind.combine(HavenoUtils.havenoSetup.getWalletInitialized(), persistedTradesInitialized, (a, b) -> a && b);
walletsInitialized.subscribe((observable, oldValue, newValue) -> {
if (!newValue) return;
// TODO: this subscription fails to fire about 50% on startup
// MonadicBinding<Boolean> walletsInitialized = EasyBind.combine(HavenoUtils.havenoSetup.getWalletInitialized(), persistedTradesInitialized, (a, b) -> a && b);
// walletsInitialized.subscribe((observable, oldValue, newValue) -> {}
EasyBind.subscribe(HavenoUtils.havenoSetup.getAppStartupState().applicationFullyInitializedProperty(), appInitialized -> {
if (!appInitialized) return;
// thaw unreserved outputs
thawUnreservedOutputs();
// reset any available funded address entries
xmrWalletService.getAddressEntriesForAvailableBalanceStream()
.filter(addressEntry -> addressEntry.getOfferId() != null)