boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2025-03-16 16:42:07 +00:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

initialize trades when all services initialized and p2p bootstrapped

Browse source
This commit is contained in:
woodser 2023-07-26 10:29:59 -04:00
parent c548fdaf29
commit aa36518f69
2 changed files with 38 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
core/src/main/java/haveno/core/trade/TradeManager.java
View file

@ -202,13 +202,6 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
p2PService.addDecryptedDirectMessageListener(this); p2PService.addDecryptedDirectMessageListener(this);
failedTradesManager.setUnFailTradeCallback(this::unFailTrade); failedTradesManager.setUnFailTradeCallback(this::unFailTrade);
// initialize trades when connected to p2p network
p2PService.addP2PServiceListener(new BootstrapListener() {
public void onUpdatedDataReceived() {
initPersistedTrades();
}
});
} }
@ -259,6 +252,16 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
public void onAllServicesInitialized() { public void onAllServicesInitialized() {
if (p2PService.isBootstrapped()) {
initPersistedTrades();
} else {
p2PService.addP2PServiceListener(new BootstrapListener() {
@Override
public void onUpdatedDataReceived() {
initPersistedTrades();
}
});
}
// listen for account updates // listen for account updates
accountService.addListener(new AccountServiceListener() { accountService.addListener(new AccountServiceListener() {
@ -443,62 +446,46 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
if (trade.isIdling()) HavenoUtils.submitTask(() -> trade.syncWallet()); if (trade.isIdling()) HavenoUtils.submitTask(() -> trade.syncWallet());
} }
getObservableList().addListener((ListChangeListener<Trade>) change -> onTradesChanged());
onTradesChanged();
xmrWalletService.setTradeManager(this); xmrWalletService.setTradeManager(this);
// process after all wallets initialized // process after all wallets initialized
if (HavenoUtils.havenoSetup != null) { // null for seednode if (HavenoUtils.havenoSetup != null) { // null for seednode
// TODO: this subscription fails to fire about 50% on startup // maybe remove trades on error
// MonadicBinding<Boolean> walletsInitialized = EasyBind.combine(HavenoUtils.havenoSetup.getWalletInitialized(), persistedTradesInitialized, (a, b) -> a && b); for (Trade trade : tradesToMaybeRemoveOnError) {
// walletsInitialized.subscribe((observable, oldValue, newValue) -> {} maybeRemoveTradeOnError(trade);
}
EasyBind.subscribe(HavenoUtils.havenoSetup.getAppStartupState().applicationFullyInitializedProperty(), appInitialized -> { // thaw unreserved outputs
if (!appInitialized) return; thawUnreservedOutputs();
// maybe remove trades on error // reset any available funded address entries
for (Trade trade : tradesToMaybeRemoveOnError) { xmrWalletService.getAddressEntriesForAvailableBalanceStream()
maybeRemoveTradeOnError(trade); .filter(addressEntry -> addressEntry.getOfferId() != null)
} .forEach(addressEntry -> {
log.warn("Swapping pending {} entries at startup. offerId={}", addressEntry.getContext(), addressEntry.getOfferId());
// thaw unreserved outputs xmrWalletService.swapAddressEntryToAvailable(addressEntry.getOfferId(), addressEntry.getContext());
thawUnreservedOutputs(); });
// reset any available funded address entries
xmrWalletService.getAddressEntriesForAvailableBalanceStream()
.filter(addressEntry -> addressEntry.getOfferId() != null)
.forEach(addressEntry -> {
log.warn("Swapping pending {} entries at startup. offerId={}", addressEntry.getContext(), addressEntry.getOfferId());
xmrWalletService.swapAddressEntryToAvailable(addressEntry.getOfferId(), addressEntry.getContext());
});
onTradesInitiailizedAndAppFullyInitialized();
});
} else {
onTradesInitiailizedAndAppFullyInitialized();
} }
// notify that persisted trades initialized
persistedTradesInitialized.set(true);
getObservableList().addListener((ListChangeListener<Trade>) change -> onTradesChanged());
onTradesChanged();
// We do not include failed trades as they should not be counted anyway in the trade statistics
// TODO: remove stats?
Set<Trade> nonFailedTrades = new HashSet<>(closedTradableManager.getClosedTrades());
nonFailedTrades.addAll(tradableList.getList());
String referralId = referralIdService.getOptionalReferralId().orElse(null);
boolean isTorNetworkNode = p2PService.getNetworkNode() instanceof TorNetworkNode;
tradeStatisticsManager.maybeRepublishTradeStatistics(nonFailedTrades, referralId, isTorNetworkNode);
}).start(); }).start();
// allow execution to start // allow execution to start
GenUtils.waitFor(100); GenUtils.waitFor(100);
} }
private void onTradesInitiailizedAndAppFullyInitialized() {
// notify that persisted trades initialized
persistedTradesInitialized.set(true);
// We do not include failed trades as they should not be counted anyway in the trade statistics
// TODO: remove stats?
Set<Trade> nonFailedTrades = new HashSet<>(closedTradableManager.getClosedTrades());
nonFailedTrades.addAll(tradableList.getList());
String referralId = referralIdService.getOptionalReferralId().orElse(null);
boolean isTorNetworkNode = p2PService.getNetworkNode() instanceof TorNetworkNode;
tradeStatisticsManager.maybeRepublishTradeStatistics(nonFailedTrades, referralId, isTorNetworkNode);
}
private void initPersistedTrade(Trade trade) { private void initPersistedTrade(Trade trade) {
if (isShutDown) return; if (isShutDown) return;
if (getTradeProtocol(trade) != null) return; if (getTradeProtocol(trade) != null) return;

6
core/src/main/java/haveno/core/trade/protocol/TradeProtocol.java
View file

@ -246,10 +246,8 @@ public abstract class TradeProtocol implements DecryptedDirectMessageListener, D
// listen for direct messages unless completed // listen for direct messages unless completed
if (!trade.isCompleted()) processModel.getP2PService().addDecryptedDirectMessageListener(this); if (!trade.isCompleted()) processModel.getP2PService().addDecryptedDirectMessageListener(this);
// initialize trade with lock // initialize trade
synchronized (trade) { trade.initialize(processModel.getProvider());
trade.initialize(processModel.getProvider());
}
// process mailbox messages // process mailbox messages
MailboxMessageService mailboxMessageService = processModel.getP2PService().getMailboxMessageService(); MailboxMessageService mailboxMessageService = processModel.getP2PService().getMailboxMessageService();