From 2d0f200aa1131303bb77c460fbb5fa30781dfc0b Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Wed, 21 Aug 2024 10:04:12 -0400
Subject: [PATCH] do not reprocess error on submit multisig tx w/o enough
 signers #1227

---
 .../core/support/dispute/arbitration/ArbitrationManager.java  | 1 +
 core/src/main/java/haveno/core/trade/HavenoUtils.java         | 4 ++++
 core/src/main/java/haveno/core/trade/Trade.java               | 2 ++
 3 files changed, 7 insertions(+)

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 0ac6aa43..8082aad4 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
@@ -511,6 +511,7 @@ public final class ArbitrationManager extends DisputeManager<ArbitrationDisputeL
                 break;
             } catch (Exception e) {
                 if (trade.isPayoutPublished()) throw new IllegalStateException("Payout tx already published for " + trade.getClass().getSimpleName() + " " + trade.getShortId());
+                if (HavenoUtils.isNotEnoughSigners(e)) throw new IllegalArgumentException(e);
                 log.warn("Failed to submit dispute payout tx, tradeId={}, attempt={}/{}, error={}", trade.getShortId(), i + 1, TradeProtocol.MAX_ATTEMPTS, e.getMessage());
                 if (i == TradeProtocol.MAX_ATTEMPTS - 1) throw e;
                 if (trade.getXmrConnectionService().isConnected()) trade.requestSwitchToNextBestConnection(sourceConnection);
diff --git a/core/src/main/java/haveno/core/trade/HavenoUtils.java b/core/src/main/java/haveno/core/trade/HavenoUtils.java
index 5b9386af..065d587f 100644
--- a/core/src/main/java/haveno/core/trade/HavenoUtils.java
+++ b/core/src/main/java/haveno/core/trade/HavenoUtils.java
@@ -521,4 +521,8 @@ public class HavenoUtils {
     public static boolean isUnresponsive(Exception e) {
         return isConnectionRefused(e) || isReadTimeout(e);
     }
+
+    public static boolean isNotEnoughSigners(Exception e) {
+        return e != null && e.getMessage().contains("Not enough signers");
+    }
 }
diff --git a/core/src/main/java/haveno/core/trade/Trade.java b/core/src/main/java/haveno/core/trade/Trade.java
index 143f000f..ca3df853 100644
--- a/core/src/main/java/haveno/core/trade/Trade.java
+++ b/core/src/main/java/haveno/core/trade/Trade.java
@@ -1381,6 +1381,8 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
                 wallet.submitMultisigTxHex(payoutTxHex);
                 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);
             }
         }