seller automatically marks payment received again on nack once

Author: woodser

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

@@ -117,6 +117,7 @@ public abstract class TradeProtocol implements DecryptedDirectMessageListener, D
     private int reprocessPaymentSentMessageCount;
     private int reprocessPaymentReceivedMessageCount;
     private boolean makerInitTradeRequestNacked = false;
+    private boolean autoMarkPaymentReceivedOnNack = true;
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
@@ -746,6 +747,7 @@ public final FluentProtocol.Setup tasks(Class<? extends Task<Trade>>... tasks) {
     // ACK msg
     ///////////////////////////////////////////////////////////////////////////////////////////
 
+    // TODO: this has grown in complexity over time and could use refactoring
     private void onAckMessage(AckMessage ackMessage, NodeAddress sender) {
 
         // ignore if trade is completely finished
@@ -818,6 +820,7 @@ private void onAckMessage(AckMessage ackMessage, NodeAddress sender) {
             // ack message from buyer
             if (peer == trade.getBuyer()) {
                 trade.getBuyer().setPaymentReceivedAckMessage(ackMessage);
+                processModel.getTradeManager().requestPersistence();
 
                 // handle successful ack
                 if (ackMessage.isSuccess()) {
@@ -827,24 +830,21 @@ private void onAckMessage(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());
-                    
+
                     // 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();
-                        }
+                        processModel.getTradeManager().requestPersistence();
+                        boolean autoResent = handlePaymentReceivedNack(ackMessage);
+                        if (autoResent) return; // skip remaining processing if auto resent
                     }
                 }
-                processModel.getTradeManager().requestPersistence();
             }
 
             // ack message from arbitrator
             else if (peer == trade.getArbitrator()) {
                 trade.getArbitrator().setPaymentReceivedAckMessage(ackMessage);
+                processModel.getTradeManager().requestPersistence();
 
                 // handle nack
                 if (!ackMessage.isSuccess()) {
@@ -853,15 +853,11 @@ else if (peer == trade.getArbitrator()) {
                     // 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();
-                        }
+                        processModel.getTradeManager().requestPersistence();
+                        boolean autoResent = handlePaymentReceivedNack(ackMessage);
+                        if (autoResent) return; // skip remaining processing if auto resent
                     }
                 }
-                processModel.getTradeManager().requestPersistence();
             } else {
                 log.warn("Received AckMessage from unexpected peer for {}, sender={}, trade={} {}, messageUid={}, success={}, errorMsg={}", ackMessage.getSourceMsgClassName(), sender, trade.getClass().getSimpleName(), trade.getId(), ackMessage.getSourceUid(), ackMessage.isSuccess(), ackMessage.getErrorMessage());
                 return;
@@ -886,6 +882,26 @@ else if (peer == trade.getArbitrator()) {
         trade.onAckMessage(ackMessage, sender);
     }
 
+    private boolean handlePaymentReceivedNack(AckMessage ackMessage) {
+        synchronized (trade.getLock()) {
+            if (trade.isPaymentReceived() && !trade.isPayoutPublished() && !isPaymentReceivedMessageAckedByEither()) {
+                log.warn("Resetting state to payment sent for {} {}", trade.getClass().getSimpleName(), trade.getId());
+                trade.resetToPaymentSentState();
+
+                // automatically mark payment received again once on nack
+                if (autoMarkPaymentReceivedOnNack) {
+                    autoMarkPaymentReceivedOnNack = false;
+                    log.warn("Automatically marking payment received on NACK for {} {} after error={}", trade.getClass().getSimpleName(), trade.getId(), ackMessage.getErrorMessage());
+                    UserThread.execute(() -> {
+                        ((SellerProtocol) this).onPaymentReceived(null, null);
+                    });
+                    return true;
+                }
+            }
+            return false;
+        }
+    }
+
     private void handleFirstMakerInitTradeRequestNack(AckMessage ackMessage) {
         log.warn("Maker received NACK to InitTradeRequest from arbitrator for {} {}, messageUid={}, errorMessage={}", trade.getClass().getSimpleName(), trade.getId(), ackMessage.getSourceUid(), ackMessage.getErrorMessage());
         ThreadUtils.execute(() -> {