mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 23:18:17 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5885 from jmacxx/use_fresh_address_for_multi_sig

Browse source 
Always use fresh address for MULTI_SIG context
This commit is contained in:
Christoph Atteneder 2021-12-04 19:48:43 +01:00 • committed by GitHub
commit e57682929b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java
View file

@ -644,7 +644,8 @@ public class BtcWalletService extends WalletService {
.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));