From cdb99a9cfb89ddd68b46544cffc7112b11800113 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Thu, 7 Nov 2024 10:47:54 -0500
Subject: [PATCH] support opening dispute with corrupt trade wallet

---
 .../haveno/core/support/dispute/DisputeManager.java   |  8 +++++++-
 .../pendingtrades/PendingTradesDataModel.java         | 11 +++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

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 eb49e0c509..6fca89f8ea 100644
--- a/core/src/main/java/haveno/core/support/dispute/DisputeManager.java
+++ b/core/src/main/java/haveno/core/support/dispute/DisputeManager.java
@@ -393,8 +393,14 @@ public abstract class DisputeManager<T extends DisputeList<Dispute>> extends Sup
                 chatMessage.setSystemMessage(true);
                 dispute.addAndPersistChatMessage(chatMessage);
 
+                // export latest multisig hex
+                try {
+                    trade.exportMultisigHex();
+                } catch (Exception e) {
+                    log.error("Failed to export multisig hex", e);
+                }
+
                 // create dispute opened message
-                trade.exportMultisigHex();
                 NodeAddress agentNodeAddress = getAgentNodeAddress(dispute);
                 DisputeOpenedMessage disputeOpenedMessage = new DisputeOpenedMessage(dispute,
                         p2PService.getAddress(),
diff --git a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
index 944c977b11..8119166996 100644
--- a/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
+++ b/desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
@@ -548,10 +548,17 @@ public class PendingTradesDataModel extends ActivatableDataModel {
             sendDisputeOpenedMessage(dispute, disputeManager);
             tradeManager.requestPersistence();
         } else if (useArbitration) {
-          // Only if we have completed mediation we allow arbitration
           disputeManager = arbitrationManager;
           Dispute dispute = disputesService.createDisputeForTrade(trade, offer, pubKeyRingProvider.get(), isMaker, isSupportTicket);
-          trade.exportMultisigHex();
+
+          // export latest multisig hex
+          try {
+            trade.exportMultisigHex();
+          } catch (Exception e) {
+            log.error("Failed to export multisig hex", e);
+          }
+
+          // send dispute opened message
           sendDisputeOpenedMessage(dispute, disputeManager);
           tradeManager.requestPersistence();
         } else {