haveno-network/haveno-core
haveno-network/haveno-core
1
0
Fork 1
Code Issues 4 Pull requests Projects 5 Releases 1 Packages Wiki Activity Actions

preserve old behavior when nack does not include updated multisig

Browse source
This commit is contained in:
woodser 2025-04-25 17:54:44 -04:00 committed by woodser
parent 350aa10839
commit 0b8e43b7a8
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -804,15 +804,15 @@ public abstract class TradeProtocol implements DecryptedDirectMessageListener, D
else {
log.warn("We received a NACK for our PaymentReceivedMessage to the buyer for {} {}", trade.getClass().getSimpleName(), trade.getId());
// update multisig hex
// nack includes updated multisig hex since v1.1.1
if (ackMessage.getUpdatedMultisigHex() != null) {
trade.getBuyer().setUpdatedMultisigHex(ackMessage.getUpdatedMultisigHex());
}
// reset state if not processed
if (trade.isPaymentReceived() && !trade.isPayoutPublished() && !isPaymentReceivedMessageAckedByEither()) {
log.warn("Resetting state to payment sent for {} {}", trade.getClass().getSimpleName(), trade.getId());
trade.resetToPaymentSentState();
// reset state if not processed
if (trade.isPaymentReceived() && !trade.isPayoutPublished() && !isPaymentReceivedMessageAckedByEither()) {
log.warn("Resetting state to payment sent for {} {}", trade.getClass().getSimpleName(), trade.getId());
trade.resetToPaymentSentState();
}
}
}
processModel.getTradeManager().requestPersistence();
@ -826,15 +826,15 @@ public abstract class TradeProtocol implements DecryptedDirectMessageListener, D
if (!ackMessage.isSuccess()) {
log.warn("We received a NACK for our PaymentReceivedMessage to the arbitrator for {} {}", trade.getClass().getSimpleName(), trade.getId());
// update multisig hex
// nack includes updated multisig hex since v1.1.1
if (ackMessage.getUpdatedMultisigHex() != null) {
trade.getArbitrator().setUpdatedMultisigHex(ackMessage.getUpdatedMultisigHex());
}
// reset state if not processed
if (trade.isPaymentReceived() && !trade.isPayoutPublished() && !isPaymentReceivedMessageAckedByEither()) {
log.warn("Resetting state to payment sent for {} {}", trade.getClass().getSimpleName(), trade.getId());
trade.resetToPaymentSentState();
// reset state if not processed
if (trade.isPaymentReceived() && !trade.isPayoutPublished() && !isPaymentReceivedMessageAckedByEither()) {
log.warn("Resetting state to payment sent for {} {}", trade.getClass().getSimpleName(), trade.getId());
trade.resetToPaymentSentState();
}
}
}
processModel.getTradeManager().requestPersistence();