reset state before nacking payment received message

Author: woodser

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

@@ -1285,7 +1285,7 @@ public MoneroTxWallet createPayoutTx() {
                     MoneroRpcConnection sourceConnection = xmrConnectionService.getConnection();
                     try {
                         MoneroTxWallet unsignedPayoutTx = doCreatePayoutTx();
-                        log.info("Created unsigned payout tx for {} {}");
+                        log.info("Done creating unsigned payout tx for {} {}", getClass().getSimpleName(), getShortId());
                         return unsignedPayoutTx;
                     } catch (IllegalArgumentException | IllegalStateException e) {
                         throw e;
@@ -2873,6 +2873,10 @@ else if (hasFailedTx && isPayoutPublished()) {
         }
     }
 
+    public boolean onPayoutError(boolean syncAndPoll) {
+        return onPayoutError(syncAndPoll, false);
+    }
+
     /**
      * Handle a payout error due to NACK or the transaction failing (e.g. due to reorg).
      * 
@@ -2883,15 +2887,21 @@ else if (hasFailedTx && isPayoutPublished()) {
     public boolean onPayoutError(boolean syncAndPoll, boolean autoMarkPaymentReceived) {
         log.warn("Handling payout error for {} {}", getClass().getSimpleName(), getId());
         if (isPayoutPublished()) return false;
-        if (syncAndPoll) syncAndPollWallet();
+        if (syncAndPoll) {
+            try {
+                syncAndPollWallet();
+            } catch (Exception e) {
+                log.warn("Error syncing and polling wallet for {} {}: {}", getClass().getSimpleName(), getId(), e.getMessage());
+            }
+        }
         if (isPayoutPublished() || !isPaymentReceived()) return false;
 
         // reset trade state
-        log.warn("Resetting state to payment sent for {} {}", getClass().getSimpleName(), getId());
+        log.warn("Resetting state to PAYMENT_SENT for {} {}", getClass().getSimpleName(), getId());
         resetToPaymentSentState();
         getProcessModel().setPaymentSentPayoutTxStale(true);
         getSelf().setUnsignedPayoutTxHex(null);
-        requestPersistence();
+        persistNow(null);
 
         // automatically mark payment received
         if (autoMarkPaymentReceived) {

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;
@@ -683,7 +682,12 @@ private void handle(PaymentReceivedMessage message, NodeAddress peer, boolean re
                                             }, trade.getReprocessDelayInSeconds(reprocessPaymentReceivedMessageCount));
                                         }
                                     } else {
-                                        trade.exportMultisigHex(); // export fresh multisig info for nack
+
+                                        // export fresh multisig info for nack
+                                        trade.exportMultisigHex();
+
+                                        // handle payout error
+                                        trade.onPayoutError(false, false);
                                         handleTaskRunnerFault(peer, message, null, errorMessage, trade.getSelf().getUpdatedMultisigHex()); // send nack
                                     }
                                     unlatchTrade();