nihilist/haveno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not resend deposits confirmed message after payout published

Browse Source
This commit is contained in:
woodser 2023-12-09 06:10:31 -05:00
parent 0c149b780f
commit 7bfba15109
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/main/java/haveno/core/trade/protocol/TradeProtocol.java
View File

@ -264,15 +264,10 @@ public abstract class TradeProtocol implements DecryptedDirectMessageListener, D
} }
private void maybeSendDepositsConfirmedMessage() { private void maybeSendDepositsConfirmedMessage() {
if (trade.isDepositsConfirmed()) { new Thread(() -> maybeSendDepositsConfirmedMessages()).start();
EasyBind.subscribe(trade.stateProperty(), state -> {
new Thread(() -> maybeSendDepositsConfirmedMessages()).start(); new Thread(() -> maybeSendDepositsConfirmedMessages()).start();
} else { });
EasyBind.subscribe(trade.stateProperty(), state -> {
if (trade.isDepositsConfirmed()) {
new Thread(() -> maybeSendDepositsConfirmedMessages()).start();
}
});
}
} }
public void maybeReprocessPaymentReceivedMessage(boolean reprocessOnError) { public void maybeReprocessPaymentReceivedMessage(boolean reprocessOnError) {
@ -880,8 +875,8 @@ public abstract class TradeProtocol implements DecryptedDirectMessageListener, D
} }
public void maybeSendDepositsConfirmedMessages() { public void maybeSendDepositsConfirmedMessages() {
if (!trade.isDepositsConfirmed() || trade.isDepositsConfirmedAcked() || trade.isPayoutPublished()) return;
synchronized (trade) { synchronized (trade) {
if (trade.isDepositsConfirmedAcked()) return;
if (!trade.isInitialized() || trade.isShutDownStarted()) return; // skip if shutting down if (!trade.isInitialized() || trade.isShutDownStarted()) return; // skip if shutting down
latchTrade(); latchTrade();
expect(new Condition(trade)) expect(new Condition(trade))