sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2025-01-25 01:41:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

deduplicate output descriptors for bwt

Browse source
This commit is contained in:
Craig Raw 2021-04-12 12:22:51 +02:00
parent 31fb527218
commit 3b3e46983f
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drongo

@ -1 +1 @@
Subproject commit 49654b7c82d104f7898eff95f0ac3cec96fbc0ec Subproject commit 428054d375b638bb7e08133fdffe6f1dd438cca9

6
src/main/java/com/sparrowwallet/sparrow/net/Bwt.java
View file

@ -58,7 +58,7 @@ public class Bwt {
private void start(Collection<Wallet> wallets, CallbackNotifier callback) { private void start(Collection<Wallet> wallets, CallbackNotifier callback) {
List<Wallet> validWallets = wallets.stream().filter(Wallet::isValid).collect(Collectors.toList()); List<Wallet> validWallets = wallets.stream().filter(Wallet::isValid).collect(Collectors.toList());
List<String> outputDescriptors = new ArrayList<>(); Set<String> outputDescriptors = new LinkedHashSet<>();
for(Wallet wallet : validWallets) { for(Wallet wallet : validWallets) {
OutputDescriptor receiveOutputDescriptor = OutputDescriptor.getOutputDescriptor(wallet, KeyPurpose.RECEIVE); OutputDescriptor receiveOutputDescriptor = OutputDescriptor.getOutputDescriptor(wallet, KeyPurpose.RECEIVE);
outputDescriptors.add(receiveOutputDescriptor.toString(false, false)); outputDescriptors.add(receiveOutputDescriptor.toString(false, false));
@ -89,7 +89,7 @@ public class Bwt {
* @param gapLimit desired gap limit beyond last used address * @param gapLimit desired gap limit beyond last used address
* @param callback object receiving notifications * @param callback object receiving notifications
*/ */
private void start(List<String> outputDescriptors, Integer rescanSince, Boolean forceRescan, Integer gapLimit, CallbackNotifier callback) { private void start(Collection<String> outputDescriptors, Integer rescanSince, Boolean forceRescan, Integer gapLimit, CallbackNotifier callback) {
BwtConfig bwtConfig = new BwtConfig(); BwtConfig bwtConfig = new BwtConfig();
bwtConfig.network = Network.get() == Network.MAINNET ? "bitcoin" : Network.get().getName(); bwtConfig.network = Network.get() == Network.MAINNET ? "bitcoin" : Network.get().getName();
@ -188,7 +188,7 @@ public class Bwt {
public Boolean createWalletIfMissing; public Boolean createWalletIfMissing;
@SerializedName("descriptors") @SerializedName("descriptors")
public List<String> descriptors; public Collection<String> descriptors;
@SerializedName("xpubs") @SerializedName("xpubs")
public String xpubs; public String xpubs;