remove potentially stale multisig state on payment received nack

Author: woodser

core/src/main/java/haveno/core/trade/protocol/SellerProtocol.java

@@ -133,6 +133,8 @@ public void onPaymentReceived(ResultHandler resultHandler, ErrorMessageHandler e
                             .using(new TradeTaskRunner(trade, () -> {
                                 stopTimeout();
                                 this.errorMessageHandler = null;
+                                buyerNackedPaymentReceivedMessage = false;
+                                arbitratorNackedPaymentReceivedMessage = false;
                                 handleTaskRunnerSuccess(event);
                                 resultHandler.handleResult();
                             }, (errorMessage) -> {

core/src/main/java/haveno/core/trade/protocol/TradeProtocol.java

@@ -42,7 +42,6 @@
 import haveno.common.handlers.ErrorMessageHandler;
 import haveno.common.proto.network.NetworkEnvelope;
 import haveno.common.taskrunner.Task;
-import haveno.core.network.MessageState;
 import haveno.core.offer.OpenOffer;
 import haveno.core.support.messages.ChatMessage;
 import haveno.core.trade.ArbitratorTrade;
@@ -120,6 +119,8 @@ public abstract class TradeProtocol implements DecryptedDirectMessageListener, D
     private int reprocessPaymentReceivedMessageCount;
     private boolean makerInitTradeRequestHasBeenNacked = false;
     private boolean autoMarkPaymentReceivedOnNack = true;
+    protected boolean arbitratorNackedPaymentReceivedMessage = false;
+    protected boolean buyerNackedPaymentReceivedMessage = false;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -861,6 +862,13 @@ private void onAckMessageAux(AckMessage ackMessage, NodeAddress sender) {
                 // handle nack
                 else {
                     log.warn("We received a NACK for our PaymentReceivedMessage to the buyer for {} {}: {}", trade.getClass().getSimpleName(), trade.getId(), ackMessage.getErrorMessage());
+                    buyerNackedPaymentReceivedMessage = true;
+
+                    // unless nacked, remove arbitrator's multisig state which can be stale
+                    if (!arbitratorNackedPaymentReceivedMessage) {
+                        log.warn("Resetting arbitrator's multisig state after arbitrator NACKed PaymentReceivedMessage for {} {}", trade.getClass().getSimpleName(), trade.getId());
+                        trade.getArbitrator().setUpdatedMultisigHex(null);
+                    }
 
                     // nack includes updated multisig hex since v1.1.1
                     if (ackMessage.getUpdatedMultisigHex() != null) {
@@ -881,6 +889,13 @@ else if (peer == trade.getArbitrator()) {
                 // handle nack
                 if (!ackMessage.isSuccess()) {
                     log.warn("We received a NACK for our PaymentReceivedMessage to the arbitrator for {} {}: {}", trade.getClass().getSimpleName(), trade.getId(), ackMessage.getErrorMessage());
+                    arbitratorNackedPaymentReceivedMessage = true;
+
+                    // unless nacked, remove buyer's multisig state which can be stale
+                    if (!buyerNackedPaymentReceivedMessage) {
+                        log.warn("Resetting buyer's multisig state after arbitrator NACKed PaymentReceivedMessage for {} {}", trade.getClass().getSimpleName(), trade.getId());
+                        trade.getBuyer().setUpdatedMultisigHex(null);
+                    }
 
                     // nack includes updated multisig hex since v1.1.1
                     if (ackMessage.getUpdatedMultisigHex() != null) {