Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-05-22 00:11:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

update payout unlocked state if trade wallet missing

Browse source
This commit is contained in:
woodser 2023-05-27 14:28:15 -04:00
parent 882f0d355f
commit 69b0d54c7e
4 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
core/src/main/java/haveno/core/trade/Trade.java
View file

@ -436,7 +436,7 @@ public abstract class Trade implements Tradable, Model {
transient Boolean makerDepositLocked; // null when unknown, true while locked, false when unlocked
transient Boolean takerDepositLocked;
@Nullable
transient private MoneroTxWallet payoutTx;
transient private MoneroTx payoutTx;
@Getter
@Setter
private String payoutTxId;
@ -667,7 +667,16 @@ public abstract class Trade implements Tradable, Model {
// sync wallet if applicable
if (!isDepositRequested() || isPayoutUnlocked()) return;
if (!walletExists()) throw new IllegalStateException("Missing trade wallet for " + getClass().getSimpleName() + " " + getId());
if (!walletExists()) {
MoneroTx payoutTx = getPayoutTx();
if (payoutTx != null && payoutTx.getNumConfirmations() >= 10) {
log.warn("Payout state for {} {} is {} but payout is unlocked, updating state", getClass().getSimpleName(), getId(), getPayoutState());
setPayoutStateUnlocked();
return;
} else {
throw new IllegalStateException("Missing trade wallet for " + getClass().getSimpleName() + " " + getId());
}
}
if (xmrWalletService.getConnectionsService().getConnection() == null || Boolean.FALSE.equals(xmrWalletService.getConnectionsService().isConnected())) return;
updateSyncing();
}
@ -1631,8 +1640,10 @@ public abstract class Trade implements Tradable, Model {
}
@Nullable
public MoneroTxWallet getPayoutTx() {
if (payoutTx == null) payoutTx = payoutTxId == null ? null : xmrWalletService.getWallet().getTx(payoutTxId);
public MoneroTx getPayoutTx() {
if (payoutTx == null) {
payoutTx = payoutTxId == null ? null : (this instanceof ArbitratorTrade) ? xmrWalletService.getTxWithCache(payoutTxId) : xmrWalletService.getWallet().getTx(payoutTxId);
}
return payoutTx;
}