From 32f057b2ad3a37dcd86cc587dacbe3972b844581 Mon Sep 17 00:00:00 2001
From: jmacxx <47253594+jmacxx@users.noreply.github.com>
Date: Wed, 1 Dec 2021 13:27:43 -0600
Subject: [PATCH] Always use fresh address for MULTI_SIG context

---
 core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java b/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java
index 2437b2b8f3d..64151d47162 100644
--- a/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java
+++ b/core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java
@@ -644,7 +644,8 @@ public AddressEntry getOrCreateAddressEntry(String offerId, AddressEntry.Context
                     .filter(e -> isAddressUnused(e.getAddress()))
                     .filter(e -> Script.ScriptType.P2WPKH.equals(e.getAddress().getOutputScriptType()))
                     .findAny();
-            if (emptyAvailableAddressEntry.isPresent()) {
+            if (emptyAvailableAddressEntry.isPresent() &&
+                    context != AddressEntry.Context.MULTI_SIG) {    // always use fresh address for MULTI_SIG GH#5880
                 return addressEntryList.swapAvailableToAddressEntryWithOfferId(emptyAvailableAddressEntry.get(), context, offerId);
             } else {
                 DeterministicKey key = (DeterministicKey) wallet.findKeyFromAddress(wallet.freshReceiveAddress(Script.ScriptType.P2WPKH));