Merge pull request bisq-network#5885 from jmacxx/use_fresh_address_fo…

…r_multi_sig Always use fresh address for MULTI_SIG context
stejbac · Dec 4, 2021 · e576829 · e576829
2 parents b9fa9d6 + 32f057b
commit e576829
Showing 1 changed file with 2 additions and 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
@@ -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));