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

initialize wallet after p2p network ready

Browse Source
This commit is contained in:
woodser 2023-03-13 16:03:37 -04:00
parent e369487457
commit cf8de0843e
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -420,13 +420,6 @@ public class HavenoSetup {
havenoSetupListeners.forEach(HavenoSetupListener::onInitP2pNetwork); havenoSetupListeners.forEach(HavenoSetupListener::onInitP2pNetwork);
p2pNetworkReady = p2PNetworkSetup.init(this::initWallet, displayTorNetworkSettingsHandler); p2pNetworkReady = p2PNetworkSetup.init(this::initWallet, displayTorNetworkSettingsHandler);
// We only init wallet service here if not using Tor for bitcoinj.
// When using Tor, wallet init must be deferred until Tor is ready.
// TODO encapsulate below conditional inside getUseTorForBitcoinJ
if (!preferences.getUseTorForBitcoinJ() || localBitcoinNode.shouldBeUsed()) {
initWallet();
}
// need to store it to not get garbage collected // need to store it to not get garbage collected
p2pNetworkAndWalletInitialized = EasyBind.combine(walletInitialized, p2pNetworkReady, p2pNetworkAndWalletInitialized = EasyBind.combine(walletInitialized, p2pNetworkReady,
(a, b) -> { (a, b) -> {

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

@ -146,8 +146,8 @@ public class P2PNetworkSetup {
bootstrapState.set(Res.get("mainView.bootstrapState.torNodeCreated")); bootstrapState.set(Res.get("mainView.bootstrapState.torNodeCreated"));
p2PNetworkIconId.set("image-connection-tor"); p2PNetworkIconId.set("image-connection-tor");
if (preferences.getUseTorForBitcoinJ()) // invoke handler to initialize wallet
initWalletServiceHandler.run(); initWalletServiceHandler.run();
// We want to get early connected to the price relay so we call it already now // We want to get early connected to the price relay so we call it already now
priceFeedService.setCurrencyCodeOnInit(); priceFeedService.setCurrencyCodeOnInit();