Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-14 17:35:27 -04:00
Code Issues Projects Releases Packages Wiki Activity

update to monero-java 0.6.0 with api updates & connection manager fixes

Browse source
This commit is contained in:
woodser 2022-01-13 14:03:20 -05:00
parent 800b309a4b
commit 7b6b92d894
4 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

22
core/src/main/java/bisq/core/btc/setup/WalletsSetup.java
View file

@ -100,7 +100,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import monero.daemon.MoneroDaemon;
import monero.daemon.model.MoneroDaemonConnection;
import monero.daemon.model.MoneroPeer;
import monero.wallet.MoneroWallet;
// Setup wallets and use WalletConfig for BitcoinJ wiring.
@ -136,7 +136,7 @@ public class WalletsSetup {
private final int socks5DiscoverMode;
private final IntegerProperty numPeers = new SimpleIntegerProperty(0);
private final LongProperty chainHeight = new SimpleLongProperty(0);
private final ObjectProperty<List<MoneroDaemonConnection>> peerConnections = new SimpleObjectProperty<>();
private final ObjectProperty<List<MoneroPeer>> peers = new SimpleObjectProperty<>();
private final DownloadListener downloadListener = new DownloadListener();
private final List<Runnable> setupCompletedHandlers = new ArrayList<>();
public final BooleanProperty shutDownComplete = new SimpleBooleanProperty();
@ -220,8 +220,8 @@ public class WalletsSetup {
peerGroup.setAddPeersFromAddressMessage(false);
UserThread.runPeriodically(() -> {
peerConnections.set(getPeerConnections());
numPeers.set(peerConnections.get().size());
peers.set(getPeerConnections());
numPeers.set(peers.get().size());
chainHeight.set(vXmrDaemon.getHeight());
}, DAEMON_POLL_INTERVAL_SECONDS);
@ -240,8 +240,8 @@ public class WalletsSetup {
// Map to user thread
UserThread.execute(() -> {
peerConnections.set(getPeerConnections());
numPeers.set(peerConnections.get().size());
peers.set(getPeerConnections());
numPeers.set(peers.get().size());
chainHeight.set(vXmrDaemon.getHeight());
addressEntryList.onWalletReady(walletConfig.btcWallet());
xmrAddressEntryList.onWalletReady(walletConfig.getXmrWallet());
@ -253,9 +253,9 @@ public class WalletsSetup {
UserThread.runAfter(resultHandler::handleResult, 100, TimeUnit.MILLISECONDS);
}
private List<MoneroDaemonConnection> getPeerConnections() {
return vXmrDaemon.getConnections().stream()
.filter(peerConnection -> peerConnection.getPeer().isOnline())
private List<MoneroPeer> getPeerConnections() {
return vXmrDaemon.getPeers().stream()
.filter(peer -> peer.isOnline())
.collect(Collectors.toList());
}
};
@ -506,8 +506,8 @@ public class WalletsSetup {
return numPeers;
}
public ReadOnlyObjectProperty<List<MoneroDaemonConnection>> peerConnectionsProperty() {
return peerConnections;
public ReadOnlyObjectProperty<List<MoneroPeer>> peerConnectionsProperty() {
return peers;
}
public LongProperty chainHeightProperty() {