remove potentially stale multisig info on payment received nack

Author: woodser

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

@@ -42,6 +42,7 @@
 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.trade.ArbitratorTrade;
 import haveno.core.trade.BuyerTrade;
@@ -838,6 +839,12 @@ private void onAckMessage(AckMessage ackMessage, NodeAddress sender) {
                 else {
                     log.warn("We received a NACK for our PaymentReceivedMessage to the buyer for {} {}", trade.getClass().getSimpleName(), trade.getId());
 
+                    // remove arbitrator's multisig which can be stale unless nacked
+                    if (trade.getArbitrator().getPaymentReceivedMessageStateProperty().get() != MessageState.NACKED) {
+                        trade.getArbitrator().setUpdatedMultisigHex(null);
+                    }
+                    trade.getArbitrator().setUpdatedMultisigHex(null);
+
                     // nack includes updated multisig hex since v1.1.1
                     if (ackMessage.getUpdatedMultisigHex() != null) {
                         trade.getBuyer().setUpdatedMultisigHex(ackMessage.getUpdatedMultisigHex());
@@ -857,6 +864,11 @@ else if (peer == trade.getArbitrator()) {
                 if (!ackMessage.isSuccess()) {
                     log.warn("We received a NACK for our PaymentReceivedMessage to the arbitrator for {} {}", trade.getClass().getSimpleName(), trade.getId());
 
+                    // remove buyer's multisig which can be stale unless nacked
+                    if (trade.getBuyer().getPaymentReceivedMessageStateProperty().get() != MessageState.NACKED) {
+                        trade.getBuyer().setUpdatedMultisigHex(null);
+                    }
+
                     // nack includes updated multisig hex since v1.1.1
                     if (ackMessage.getUpdatedMultisigHex() != null) {
                         trade.getArbitrator().setUpdatedMultisigHex(ackMessage.getUpdatedMultisigHex());