From 86610fa0f2cc08c60c83b21676d7de7f7831d22b Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Wed, 25 Sep 2024 09:41:25 -0400
Subject: [PATCH] fix not enough signers on process payout tx

---
 .../haveno/core/support/SupportManager.java   |  2 +-
 .../core/support/dispute/DisputeManager.java  |  2 +-
 .../arbitration/ArbitrationManager.java       |  2 +-
 .../java/haveno/core/trade/HavenoUtils.java   | 16 ++++++++++----
 .../main/java/haveno/core/trade/Trade.java    | 21 ++++++++++---------
 .../tasks/ProcessPaymentReceivedMessage.java  |  3 ++-
 .../SellerPreparePaymentReceivedMessage.java  |  4 ++--
 7 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/core/src/main/java/haveno/core/support/SupportManager.java b/core/src/main/java/haveno/core/support/SupportManager.java
index d76154485d..10cbfdafaf 100644
--- a/core/src/main/java/haveno/core/support/SupportManager.java
+++ b/core/src/main/java/haveno/core/support/SupportManager.java
@@ -199,7 +199,7 @@ public abstract class SupportManager {
                                             if (dispute.isClosed()) dispute.reOpen();
                                             trade.advanceDisputeState(Trade.DisputeState.DISPUTE_OPENED);
                                         } else if (dispute.isClosed()) {
-                                            trade.pollWalletNormallyForMs(30000); // sync to check for payout
+                                            trade.pollWalletNormallyForMs(60000); // sync to check for payout
                                         }
                                     }
                                 }
diff --git a/core/src/main/java/haveno/core/support/dispute/DisputeManager.java b/core/src/main/java/haveno/core/support/dispute/DisputeManager.java
index bd124fda1f..eb49e0c509 100644
--- a/core/src/main/java/haveno/core/support/dispute/DisputeManager.java
+++ b/core/src/main/java/haveno/core/support/dispute/DisputeManager.java
@@ -854,7 +854,7 @@ public abstract class DisputeManager<T extends DisputeList<Dispute>> extends Sup
                             // the state, as that is displayed to the user and we only persist that msg
                             disputeResult.getChatMessage().setArrived(true);
                             trade.advanceDisputeState(Trade.DisputeState.ARBITRATOR_SAW_ARRIVED_DISPUTE_CLOSED_MSG);
-                            trade.pollWalletNormallyForMs(30000);
+                            trade.pollWalletNormallyForMs(60000);
                             requestPersistence(trade);
                             resultHandler.handleResult();
                         }
diff --git a/core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationManager.java b/core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationManager.java
index 719ac46284..50be387c76 100644
--- a/core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationManager.java
+++ b/core/src/main/java/haveno/core/support/dispute/arbitration/ArbitrationManager.java
@@ -361,7 +361,7 @@ public final class ArbitrationManager extends DisputeManager<ArbitrationDisputeL
                     requestPersistence(trade);
 
                     // nack bad message and do not reprocess
-                    if (e instanceof IllegalArgumentException || e instanceof IllegalStateException) {
+                    if (HavenoUtils.isIllegal(e)) {
                         trade.getArbitrator().setDisputeClosedMessage(null); // message is processed
                         trade.setDisputeState(Trade.DisputeState.DISPUTE_CLOSED);
                         String warningMsg = "Error processing dispute closed message: " +  e.getMessage() + "\n\nOpen another dispute to try again (ctrl+o).";
diff --git a/core/src/main/java/haveno/core/trade/HavenoUtils.java b/core/src/main/java/haveno/core/trade/HavenoUtils.java
index 065d587f5a..deb1408623 100644
--- a/core/src/main/java/haveno/core/trade/HavenoUtils.java
+++ b/core/src/main/java/haveno/core/trade/HavenoUtils.java
@@ -510,19 +510,27 @@ public class HavenoUtils {
         havenoSetup.getTopErrorMsg().set(msg);
     }
 
-    public static boolean isConnectionRefused(Exception e) {
+    public static boolean isConnectionRefused(Throwable e) {
         return e != null && e.getMessage().contains("Connection refused");
     }
 
-    public static boolean isReadTimeout(Exception e) {
+    public static boolean isReadTimeout(Throwable e) {
         return e != null && e.getMessage().contains("Read timed out");
     }
 
-    public static boolean isUnresponsive(Exception e) {
+    public static boolean isUnresponsive(Throwable e) {
         return isConnectionRefused(e) || isReadTimeout(e);
     }
 
-    public static boolean isNotEnoughSigners(Exception e) {
+    public static boolean isNotEnoughSigners(Throwable e) {
         return e != null && e.getMessage().contains("Not enough signers");
     }
+
+    public static boolean isTransactionRejected(Throwable e) {
+        return e != null && e.getMessage().contains("was rejected");
+    }
+
+    public static boolean isIllegal(Throwable e) {
+        return e instanceof IllegalArgumentException || e instanceof IllegalStateException;
+    }
 }
diff --git a/core/src/main/java/haveno/core/trade/Trade.java b/core/src/main/java/haveno/core/trade/Trade.java
index 12bbc5882b..d3919919f3 100644
--- a/core/src/main/java/haveno/core/trade/Trade.java
+++ b/core/src/main/java/haveno/core/trade/Trade.java
@@ -1158,7 +1158,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
 
     private void handleWalletError(Exception e, MoneroRpcConnection sourceConnection) {
         if (HavenoUtils.isUnresponsive(e)) forceCloseWallet(); // wallet can be stuck a while
-        if (xmrConnectionService.isConnected()) requestSwitchToNextBestConnection(sourceConnection);
+        if (!HavenoUtils.isIllegal(e) && xmrConnectionService.isConnected()) requestSwitchToNextBestConnection(sourceConnection);
         getWallet(); // re-open wallet
     }
 
@@ -1278,7 +1278,7 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
                     } catch (IllegalArgumentException | IllegalStateException e) {
                         throw e;
                     } catch (Exception e) {
-                        log.warn("Failed to process payout tx, tradeId={}, attempt={}/{}, error={}", getShortId(), i + 1, TradeProtocol.MAX_ATTEMPTS, e.getMessage());
+                        log.warn("Failed to process payout tx, tradeId={}, attempt={}/{}, error={}", getShortId(), i + 1, TradeProtocol.MAX_ATTEMPTS, e.getMessage(), e);
                         handleWalletError(e, sourceConnection);
                         if (i == TradeProtocol.MAX_ATTEMPTS - 1) throw e;
                         HavenoUtils.waitFor(TradeProtocol.REPROCESS_DELAY_MS); // wait before retrying
@@ -1350,14 +1350,13 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
             try {
                 MoneroMultisigSignResult result = wallet.signMultisigTxHex(payoutTxHex);
                 if (result.getSignedMultisigTxHex() == null) throw new IllegalArgumentException("Error signing payout tx, signed multisig hex is null");
-                payoutTxHex = result.getSignedMultisigTxHex();
-                setPayoutTxHex(payoutTxHex);
+                setPayoutTxHex(result.getSignedMultisigTxHex());
             } catch (Exception e) {
                 throw new IllegalStateException(e);
             }
 
             // describe result
-            describedTxSet = wallet.describeMultisigTxSet(payoutTxHex);
+            describedTxSet = wallet.describeMultisigTxSet(getPayoutTxHex());
             payoutTx = describedTxSet.getTxs().get(0);
             updatePayout(payoutTx);
 
@@ -1377,14 +1376,16 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
         requestPersistence();
 
         // submit payout tx
-        if (publish) {
+        boolean doPublish = publish && !isPayoutPublished();
+        if (doPublish) {
             try {
-                wallet.submitMultisigTxHex(payoutTxHex);
+                wallet.submitMultisigTxHex(getPayoutTxHex());
                 setPayoutStatePublished();
             } catch (Exception e) {
-                if (isPayoutPublished()) throw new IllegalStateException("Payout tx already published for " + getClass().getSimpleName() + " " + getShortId());
-                if (HavenoUtils.isNotEnoughSigners(e)) throw new IllegalArgumentException(e);
-                throw new RuntimeException("Failed to submit payout tx for " + getClass().getSimpleName() + " " + getId(), e);
+                if (!isPayoutPublished()) {
+                    if (HavenoUtils.isTransactionRejected(e) || HavenoUtils.isNotEnoughSigners(e)) throw new IllegalArgumentException(e);
+                    throw new RuntimeException("Failed to submit payout tx for " + getClass().getSimpleName() + " " + getId() + ", error=" + e.getMessage(), e);
+                }
             }
         }
     }
diff --git a/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessPaymentReceivedMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessPaymentReceivedMessage.java
index d8de68dab1..03ff6bd0d3 100644
--- a/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessPaymentReceivedMessage.java
+++ b/core/src/main/java/haveno/core/trade/protocol/tasks/ProcessPaymentReceivedMessage.java
@@ -120,7 +120,7 @@ public class ProcessPaymentReceivedMessage extends TradeTask {
         } catch (Throwable t) {
 
             // do not reprocess illegal argument
-            if (t instanceof IllegalArgumentException) {
+            if (HavenoUtils.isIllegal(t)) {
                 trade.getSeller().setPaymentReceivedMessage(null); // do not reprocess
                 trade.requestPersistence();
             }
@@ -151,6 +151,7 @@ public class ProcessPaymentReceivedMessage extends TradeTask {
             boolean deferSignAndPublish = trade instanceof ArbitratorTrade && !isSigned && message.isDeferPublishPayout();
             if (deferSignAndPublish) {
                 log.info("Deferring signing and publishing payout tx for {} {}", trade.getClass().getSimpleName(), trade.getId());
+                trade.pollWalletNormallyForMs(60000);
                 for (int i = 0; i < 5; i++) {
                     if (trade.isPayoutPublished()) break;
                     HavenoUtils.waitFor(Trade.DEFER_PUBLISH_MS / 5);
diff --git a/core/src/main/java/haveno/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java b/core/src/main/java/haveno/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java
index bf0a4df025..a483026a6e 100644
--- a/core/src/main/java/haveno/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java
+++ b/core/src/main/java/haveno/core/trade/protocol/tasks/SellerPreparePaymentReceivedMessage.java
@@ -65,10 +65,10 @@ public class SellerPreparePaymentReceivedMessage extends TradeTask {
                             trade.processPayoutTx(trade.getPayoutTxHex(), false, true);
                         }
                     } catch (IllegalArgumentException | IllegalStateException e) {
-                        log.warn("Illegal state or argument verifying, signing, and publishing payout tx for {} {}: {}. Creating new unsigned payout tx", trade.getClass().getSimpleName(), trade.getId(), e.getMessage());
+                        log.warn("Illegal state or argument verifying, signing, and publishing payout tx for {} {}: {}. Creating new unsigned payout tx", trade.getClass().getSimpleName(), trade.getId(), e.getMessage(), e);
                         createUnsignedPayoutTx();
                     } catch (Exception e) {
-                        log.warn("Error verifying, signing, and publishing payout tx for trade {}: {}", trade.getId(), e.getMessage());
+                        log.warn("Error verifying, signing, and publishing payout tx for trade {}: {}", trade.getId(), e.getMessage(), e);
                         throw e;
                     }
                 }