-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4592 from chimp1984/improve-bisq-setup
Improve bisq setup
- Loading branch information
Showing
3 changed files
with
511 additions
and
269 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,149 @@ | ||
/* | ||
* This file is part of Bisq. | ||
* | ||
* Bisq is free software: you can redistribute it and/or modify it | ||
* under the terms of the GNU Affero General Public License as published by | ||
* the Free Software Foundation, either version 3 of the License, or (at | ||
* your option) any later version. | ||
* | ||
* Bisq is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public | ||
* License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License | ||
* along with Bisq. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
|
||
package bisq.core.app; | ||
|
||
import bisq.core.btc.setup.WalletsSetup; | ||
|
||
import bisq.network.p2p.BootstrapListener; | ||
import bisq.network.p2p.P2PService; | ||
|
||
import javax.inject.Inject; | ||
import javax.inject.Singleton; | ||
|
||
import org.fxmisc.easybind.EasyBind; | ||
import org.fxmisc.easybind.monadic.MonadicBinding; | ||
|
||
import javafx.beans.property.BooleanProperty; | ||
import javafx.beans.property.ReadOnlyBooleanProperty; | ||
import javafx.beans.property.SimpleBooleanProperty; | ||
|
||
import lombok.extern.slf4j.Slf4j; | ||
|
||
/** | ||
* We often need to wait until network and wallet is ready or other combination of startup states. | ||
* To avoid those repeated checks for the state or setting of listeners on different domains we provide here a | ||
* collection of useful states. | ||
*/ | ||
@Slf4j | ||
@Singleton | ||
public class AppStartupState { | ||
// Do not convert to local field as there have been issues observed that the object got GC'ed. | ||
private final MonadicBinding<Boolean> p2pNetworkAndWalletInitialized; | ||
|
||
private final BooleanProperty walletAndNetworkReady = new SimpleBooleanProperty(); | ||
private final BooleanProperty allDomainServicesInitialized = new SimpleBooleanProperty(); | ||
private final BooleanProperty applicationFullyInitialized = new SimpleBooleanProperty(); | ||
private final BooleanProperty updatedDataReceived = new SimpleBooleanProperty(); | ||
private final BooleanProperty isBlockDownloadComplete = new SimpleBooleanProperty(); | ||
private final BooleanProperty hasSufficientPeersForBroadcast = new SimpleBooleanProperty(); | ||
|
||
@Inject | ||
public AppStartupState(WalletsSetup walletsSetup, P2PService p2PService) { | ||
|
||
p2PService.addP2PServiceListener(new BootstrapListener() { | ||
@Override | ||
public void onUpdatedDataReceived() { | ||
updatedDataReceived.set(true); | ||
} | ||
}); | ||
|
||
walletsSetup.downloadPercentageProperty().addListener((observable, oldValue, newValue) -> { | ||
if (walletsSetup.isDownloadComplete()) | ||
isBlockDownloadComplete.set(true); | ||
}); | ||
|
||
walletsSetup.numPeersProperty().addListener((observable, oldValue, newValue) -> { | ||
if (walletsSetup.hasSufficientPeersForBroadcast()) | ||
hasSufficientPeersForBroadcast.set(true); | ||
}); | ||
|
||
p2pNetworkAndWalletInitialized = EasyBind.combine(updatedDataReceived, | ||
isBlockDownloadComplete, | ||
hasSufficientPeersForBroadcast, | ||
allDomainServicesInitialized, | ||
(a, b, c, d) -> { | ||
if (a && b && c) { | ||
walletAndNetworkReady.set(true); | ||
} | ||
return a && b && c && d; | ||
}); | ||
p2pNetworkAndWalletInitialized.subscribe((observable, oldValue, newValue) -> { | ||
if (newValue) { | ||
applicationFullyInitialized.set(true); | ||
} | ||
}); | ||
} | ||
|
||
public void onDomainServicesInitialized() { | ||
allDomainServicesInitialized.set(true); | ||
} | ||
|
||
|
||
/////////////////////////////////////////////////////////////////////////////////////////// | ||
// Getters | ||
/////////////////////////////////////////////////////////////////////////////////////////// | ||
|
||
public boolean isWalletAndNetworkReady() { | ||
return walletAndNetworkReady.get(); | ||
} | ||
|
||
public ReadOnlyBooleanProperty walletAndNetworkReadyProperty() { | ||
return walletAndNetworkReady; | ||
} | ||
|
||
public boolean isAllDomainServicesInitialized() { | ||
return allDomainServicesInitialized.get(); | ||
} | ||
|
||
public ReadOnlyBooleanProperty allDomainServicesInitializedProperty() { | ||
return allDomainServicesInitialized; | ||
} | ||
|
||
public boolean isApplicationFullyInitialized() { | ||
return applicationFullyInitialized.get(); | ||
} | ||
|
||
public ReadOnlyBooleanProperty applicationFullyInitializedProperty() { | ||
return applicationFullyInitialized; | ||
} | ||
|
||
public boolean isUpdatedDataReceived() { | ||
return updatedDataReceived.get(); | ||
} | ||
|
||
public ReadOnlyBooleanProperty updatedDataReceivedProperty() { | ||
return updatedDataReceived; | ||
} | ||
|
||
public boolean isIsBlockDownloadComplete() { | ||
return isBlockDownloadComplete.get(); | ||
} | ||
|
||
public ReadOnlyBooleanProperty isBlockDownloadCompleteProperty() { | ||
return isBlockDownloadComplete; | ||
} | ||
|
||
public boolean isHasSufficientPeersForBroadcast() { | ||
return hasSufficientPeersForBroadcast.get(); | ||
} | ||
|
||
public ReadOnlyBooleanProperty hasSufficientPeersForBroadcastProperty() { | ||
return hasSufficientPeersForBroadcast; | ||
} | ||
|
||
} |
Oops, something went wrong.