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

improve error message when importing invalid coldcard multisig config

Browse source
This commit is contained in:
Craig Raw 2024-05-09 15:44:47 +02:00
parent 1187925543
commit 87cc28e0a4
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/com/sparrowwallet/sparrow/io/ColdcardMultisig.java
View file

@ -7,10 +7,7 @@ import com.sparrowwallet.drongo.Utils;
import com.sparrowwallet.drongo.policy.Policy; import com.sparrowwallet.drongo.policy.Policy;
import com.sparrowwallet.drongo.policy.PolicyType; import com.sparrowwallet.drongo.policy.PolicyType;
import com.sparrowwallet.drongo.protocol.ScriptType; import com.sparrowwallet.drongo.protocol.ScriptType;
import com.sparrowwallet.drongo.wallet.Keystore; import com.sparrowwallet.drongo.wallet.*;
import com.sparrowwallet.drongo.wallet.KeystoreSource;
import com.sparrowwallet.drongo.wallet.Wallet;
import com.sparrowwallet.drongo.wallet.WalletModel;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -174,8 +171,10 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
wallet.setDefaultPolicy(policy); wallet.setDefaultPolicy(policy);
wallet.setScriptType(scriptType); wallet.setScriptType(scriptType);
if(!wallet.isValid()) { try {
throw new IllegalStateException("This file does not describe a valid wallet. " + getKeystoreImportDescription()); wallet.checkWallet();
} catch(InvalidWalletException e) {
throw new IllegalStateException("This file does not describe a valid wallet: " + e.getMessage());
} }
return wallet; return wallet;