@ -24,7 +24,7 @@ public class ColdcardSinglesig implements KeystoreFileImport {
@Override
publicStringgetKeystoreImportDescription(){
return"Import file created by using the Advanced > MicroSD > Export Wallet > Generic JSON feature on your Coldcard";
return"Import file created by using the Advanced > MicroSD > Export Wallet > Generic JSON feature on your Coldcard. Note this requires firmware version 3.1.3 or later.";
@ -33,7 +30,7 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
@Override
publicStringgetKeystoreImportDescription(){
return"Import a single keystore from an Electrum wallet (use File > Import > Electrum to import a multisig wallet)";
return"Import a single keystore from an Electrum wallet (use File > Import > Electrum to import a multisig wallet).";
}
@Override
@ -46,7 +43,7 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
if(!wallet.getScriptType().equals(scriptType)){
//TODO: Derive appropriate ScriptType keystore from xprv if present
thrownewImportException("Wallet has an incompatible script type of "+wallet.getScriptType()+", and the correct script type cannot be derived without the master private key");
thrownewImportException("Wallet has an incompatible script type of "+wallet.getScriptType()+", and the correct script type cannot be derived without the master private key.");
}
returnwallet.getKeystores().get(0);
@ -105,11 +102,12 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
thrownewImportException("Wallet has keystore of unknown hardware wallet type \""+ek.hw_type+"\"");
thrownewImportException("Wallet has keystore of unknown hardware wallet type \""+ek.hw_type+"\".");
}
}elseif("bip32".equals(ek.type)){
if(ek.xprv!=null&&ek.seed==null){
thrownewImportException("Electrum does not support exporting BIP39 derived seeds.");
thrownewImportException("Electrum does not support exporting BIP39 derived seeds, as it does not store the mnemonic words. Only seeds created with its native Electrum Seed Version System are exportable. "+
"If you have the mnemonic words, create a new wallet with a BIP39 keystore.");
}elseif(ek.seed!=null){
keystore.setSource(KeystoreSource.SW_SEED);
Stringmnemonic=ek.seed;
@ -181,7 +179,7 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
@Override
publicStringgetWalletImportDescription(){
return"Import an Electrum wallet";
return"Import an Electrum wallet.";
}
@Override
@ -268,12 +266,25 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport