mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add isReadyForTxBroadcast check for dispute messages

Browse source
This commit is contained in:
Manfred Karrer 2018-01-20 08:24:32 -05:00
parent 1c28eb6f5b
commit 33ed6c6d29
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
1 changed files with 36 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
core/src/main/java/io/bisq/core/arbitration/DisputeManager.java
View file

@ -37,6 +37,7 @@ import io.bisq.core.btc.exceptions.TransactionVerificationException;
import io.bisq.core.btc.exceptions.WalletException;
import io.bisq.core.btc.wallet.BtcWalletService;
import io.bisq.core.btc.wallet.TradeWalletService;
import io.bisq.core.btc.wallet.WalletsSetup;
import io.bisq.core.offer.OpenOffer;
import io.bisq.core.offer.OpenOfferManager;
import io.bisq.core.trade.Contract;
@ -65,6 +66,7 @@ public class DisputeManager implements PersistedDataHost {
private final TradeWalletService tradeWalletService;
private final BtcWalletService walletService;
private final WalletsSetup walletsSetup;
private final TradeManager tradeManager;
private final ClosedTradableManager closedTradableManager;
private final OpenOfferManager openOfferManager;
@ -88,6 +90,7 @@ public class DisputeManager implements PersistedDataHost {
public DisputeManager(P2PService p2PService,
TradeWalletService tradeWalletService,
BtcWalletService walletService,
WalletsSetup walletsSetup,
TradeManager tradeManager,
ClosedTradableManager closedTradableManager,
OpenOfferManager openOfferManager,
@ -97,6 +100,7 @@ public class DisputeManager implements PersistedDataHost {
this.p2PService = p2PService;
this.tradeWalletService = tradeWalletService;
this.walletService = walletService;
this.walletsSetup = walletsSetup;
this.tradeManager = tradeManager;
this.closedTradableManager = closedTradableManager;
this.openOfferManager = openOfferManager;
@ -112,13 +116,11 @@ public class DisputeManager implements PersistedDataHost {
// We get first the message handler called then the onBootstrapped
p2PService.addDecryptedDirectMessageListener((decryptedMessageWithPubKey, senderAddress) -> {
decryptedDirectMessageWithPubKeys.add(decryptedMessageWithPubKey);
if (p2PService.isBootstrapped())
applyMessages();
tryApplyMessages();
});
p2PService.addDecryptedMailboxListener((decryptedMessageWithPubKey, senderAddress) -> {
decryptedMailboxMessageWithPubKeys.add(decryptedMessageWithPubKey);
if (p2PService.isBootstrapped())
applyMessages();
tryApplyMessages();
});
}
@ -135,15 +137,24 @@ public class DisputeManager implements PersistedDataHost {
}
public void onAllServicesInitialized() {
if (p2PService.isBootstrapped())
applyMessages();
else
p2PService.addP2PServiceListener(new BootstrapListener() {
@Override
public void onBootstrapComplete() {
applyMessages();
}
});
p2PService.addP2PServiceListener(new BootstrapListener() {
@Override
public void onBootstrapComplete() {
tryApplyMessages();
}
});
walletsSetup.downloadPercentageProperty().addListener((observable, oldValue, newValue) -> {
if(walletsSetup.isDownloadComplete())
tryApplyMessages();
});
walletsSetup.numPeersProperty().addListener((observable, oldValue, newValue) -> {
if(walletsSetup.hasSufficientPeersForBroadcast())
tryApplyMessages();
});
tryApplyMessages();
cleanupDisputes();
}
@ -173,6 +184,18 @@ public class DisputeManager implements PersistedDataHost {
});
}
private void tryApplyMessages() {
if (isReadyForTxBroadcast())
applyMessages();
}
private boolean isReadyForTxBroadcast() {
boolean btcReady = walletsSetup.isBitcoinLocalhostNodeRunning() ?
walletsSetup.isDownloadComplete() :
walletsSetup.hasSufficientPeersForBroadcast();
return p2PService.isBootstrapped() && btcReady;
}
private void applyMessages() {
decryptedDirectMessageWithPubKeys.forEach(decryptedMessageWithPubKey -> {
NetworkEnvelope networkEnvelope = decryptedMessageWithPubKey.getNetworkEnvelope();