mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enable reusing unused AVAILABLE entries

Browse Source
This commit is contained in:
Oscar Guindzberg 2020-10-01 11:54:20 -03:00
parent 78a2a43d48
commit 01455d2b20
No known key found for this signature in database
GPG Key ID: 209796BF2E1D4F75
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java
View File

@ -579,20 +579,20 @@ public class BtcWalletService extends WalletService {
if (addressEntry.isPresent()) {
return addressEntry.get();
} else {
// Disable reusing unused AVAILABLE entries until segwit support in mandatory in Bisq
// We try to use available and not yet used entries
// Optional<AddressEntry> emptyAvailableAddressEntry = getAddressEntryListAsImmutableList().stream()
// .filter(e -> AddressEntry.Context.AVAILABLE == e.getContext())
// .filter(e -> isAddressUnused(e.getAddress()))
// .findAny();
// if (emptyAvailableAddressEntry.isPresent()) {
// return addressEntryList.swapAvailableToAddressEntryWithOfferId(emptyAvailableAddressEntry.get(), context, offerId);
// } else {
Optional<AddressEntry> emptyAvailableAddressEntry = getAddressEntryListAsImmutableList().stream()
.filter(e -> AddressEntry.Context.AVAILABLE == e.getContext())
.filter(e -> isAddressUnused(e.getAddress()))
.filter(e -> Script.ScriptType.P2PKH.equals(e.getAddress().getOutputScriptType()))
.findAny();
if (emptyAvailableAddressEntry.isPresent()) {
return addressEntryList.swapAvailableToAddressEntryWithOfferId(emptyAvailableAddressEntry.get(), context, offerId);
} else {
DeterministicKey key = (DeterministicKey) wallet.findKeyFromAddress(wallet.freshReceiveAddress(Script.ScriptType.P2PKH));
AddressEntry entry = new AddressEntry(key, context, offerId, false);
addressEntryList.addAddressEntry(entry);
return entry;
// }
}
}
}