sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-12-25 05:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

constrain mix from and mix to options to match those supported in the whirlpool client

Browse source
This commit is contained in:
Craig Raw 2021-10-14 11:12:31 +02:00
parent eb012f638e
commit 23fd597ca5
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drongo

@ -1 +1 @@
Subproject commit 61b2fd21e6f623850ad8b5df9f0cec4a0c0908cc Subproject commit c04c24945000f8f3c702801cea1c9921cc60cbbd

2
src/main/java/com/sparrowwallet/sparrow/wallet/MixToController.java
View file

@ -1,5 +1,6 @@
package com.sparrowwallet.sparrow.wallet; package com.sparrowwallet.sparrow.wallet;
import com.sparrowwallet.drongo.protocol.ScriptType;
import com.sparrowwallet.drongo.wallet.MixConfig; import com.sparrowwallet.drongo.wallet.MixConfig;
import com.sparrowwallet.drongo.wallet.StandardAccount; import com.sparrowwallet.drongo.wallet.StandardAccount;
import com.sparrowwallet.drongo.wallet.Wallet; import com.sparrowwallet.drongo.wallet.Wallet;
@ -44,6 +45,7 @@ public class MixToController implements Initializable {
allWallets.add(NONE_WALLET); allWallets.add(NONE_WALLET);
List<Wallet> destinationWallets = AppServices.get().getOpenWallets().keySet().stream().filter(openWallet -> openWallet.isValid() List<Wallet> destinationWallets = AppServices.get().getOpenWallets().keySet().stream().filter(openWallet -> openWallet.isValid()
&& (openWallet.getScriptType() == ScriptType.P2WPKH || openWallet.getScriptType() == ScriptType.P2WSH || openWallet.getScriptType() == ScriptType.P2TR)
&& openWallet != wallet && openWallet != wallet.getMasterWallet() && openWallet != wallet && openWallet != wallet.getMasterWallet()
&& (openWallet.getStandardAccountType() == null || !StandardAccount.WHIRLPOOL_ACCOUNTS.contains(openWallet.getStandardAccountType()))).collect(Collectors.toList()); && (openWallet.getStandardAccountType() == null || !StandardAccount.WHIRLPOOL_ACCOUNTS.contains(openWallet.getStandardAccountType()))).collect(Collectors.toList());
allWallets.addAll(destinationWallets); allWallets.addAll(destinationWallets);

2
src/main/java/com/sparrowwallet/sparrow/whirlpool/WhirlpoolServices.java
View file

@ -137,7 +137,7 @@ public class WhirlpoolServices {
&& wallet.getKeystores().get(0).hasSeed() && wallet.getKeystores().get(0).hasSeed()
&& wallet.getKeystores().get(0).getSeed().getType() == DeterministicSeed.Type.BIP39 && wallet.getKeystores().get(0).getSeed().getType() == DeterministicSeed.Type.BIP39
&& wallet.getStandardAccountType() != null && wallet.getStandardAccountType() != null
&& !wallet.isWhirlpoolMixWallet(); && StandardAccount.MIXABLE_ACCOUNTS.contains(wallet.getStandardAccountType());
} }
public static void prepareWhirlpoolWallet(Wallet decryptedWallet, String walletId, Storage storage) { public static void prepareWhirlpoolWallet(Wallet decryptedWallet, String walletId, Storage storage) {