remove third peer's stale multisig state on payment received nack

Author: woodser

core/src/main/java/haveno/core/trade/Trade.java

@@ -2289,6 +2289,14 @@ public boolean isPaymentSent() {
         return getState().getPhase().ordinal() >= Phase.PAYMENT_SENT.ordinal() && getState() != State.BUYER_SEND_FAILED_PAYMENT_SENT_MSG;
     }
 
+    public boolean isPaymentMarkedSent() {
+        return getState().getPhase().ordinal() >= Phase.PAYMENT_SENT.ordinal();
+    }
+
+    public boolean isPaymentMarkedReceived() {
+        return getState().getPhase().ordinal() >= Phase.PAYMENT_RECEIVED.ordinal();
+    }
+
     public boolean hasPaymentReceivedMessage() {
         return (isSeller() ? getBuyer() : getSeller()).getPaymentReceivedMessage() != null; // seller stores message to buyer and arbitrator, peers store message from seller
     }

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

@@ -802,7 +802,7 @@ private void onAckMessage(AckMessage ackMessage, NodeAddress sender) {
         }
 
         // handle ack message for PaymentSentMessage, which automatically re-sends if not ACKed in a certain time
-        if (ackMessage.getSourceMsgClassName().equals(PaymentSentMessage.class.getSimpleName())) {
+        if (trade.isPaymentMarkedSent() && ackMessage.getSourceMsgClassName().equals(PaymentSentMessage.class.getSimpleName())) {
             if (peer == trade.getSeller()) {
                 trade.getSeller().setPaymentSentAckMessage(ackMessage);
                 if (ackMessage.isSuccess()) trade.setStateIfValidTransitionTo(Trade.State.SELLER_RECEIVED_PAYMENT_SENT_MSG);
@@ -818,7 +818,7 @@ private void onAckMessage(AckMessage ackMessage, NodeAddress sender) {
         }
 
         // handle ack message for PaymentReceivedMessage, which automatically re-sends if not ACKed in a certain time
-        if (ackMessage.getSourceMsgClassName().equals(PaymentReceivedMessage.class.getSimpleName())) {
+        if (trade.isPaymentMarkedReceived() && ackMessage.getSourceMsgClassName().equals(PaymentReceivedMessage.class.getSimpleName())) {
 
             // ack message from buyer
             if (peer == trade.getBuyer()) {
@@ -835,6 +835,9 @@ 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
+                    trade.getArbitrator().setUpdatedMultisigHex(null);
+
                     // nack includes updated multisig hex since v1.1.1
                     if (ackMessage.getUpdatedMultisigHex() != null) {
                         trade.getBuyer().setUpdatedMultisigHex(ackMessage.getUpdatedMultisigHex());
@@ -854,6 +857,9 @@ 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
+                    trade.getArbitrator().setUpdatedMultisigHex(null);
+
                     // nack includes updated multisig hex since v1.1.1
                     if (ackMessage.getUpdatedMultisigHex() != null) {
                         trade.getArbitrator().setUpdatedMultisigHex(ackMessage.getUpdatedMultisigHex());