laantungir/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2026-08-10 08:37:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

add all singlesig importers to sp airgapped keystore import

Browse Source
This commit is contained in:
Craig Raw
2026-04-28 09:35:56 +02:00
parent 630ce0f3ed
commit 69aef9c228
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/sparrowwallet/sparrow/io/SpecterDIY.java
+3 -3
View File
@@ -26,16 +26,16 @@ public class SpecterDIY implements KeystoreFileImport, WalletExport {
Wallet wallet = outputDescriptor.toWallet();
if(wallet.getKeystores().size() != 1) {
throw new ImportException("Could not determine keystore from import");
throw new IllegalArgumentException("Could not determine keystore from import");
}
Keystore keystore = wallet.getKeystores().get(0);
Keystore keystore = wallet.getKeystores().getFirst();
keystore.setLabel(getName());
keystore.setWalletModel(getWalletModel());
keystore.setSource(KeystoreSource.HW_AIRGAPPED);
return keystore;
} catch(IOException e) {
} catch(Exception e) {
throw new ImportException("Error getting " + getName() + " keystore", e);
}
}
src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwAirgappedController.java
+2 -7
View File
@@ -26,12 +26,10 @@ public class HwAirgappedController extends KeystoreImportDetailController {
public void initializeView() {
List<KeystoreFileImport> fileImporters = Collections.emptyList();
if(getMasterController().getWallet().getPolicyType().equals(PolicyType.SINGLE_HD)) {
if(getMasterController().getWallet().getPolicyType().equals(PolicyType.SINGLE_HD) || getMasterController().getWallet().getPolicyType().equals(PolicyType.SINGLE_SP)) {
fileImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new Jade(), new KeystoneSinglesig(), new PassportSinglesig(), new SeedSigner(), new GordianSeedTool(), new SpecterDIY(), new Krux(), new AirGapVault(), new KeycardShellSinglesig());
} else if(getMasterController().getWallet().getPolicyType().equals(PolicyType.MULTI_HD)) {
fileImporters = List.of(new Bip129(), new ColdcardMultisig(), new CoboVaultMultisig(), new JadeMultisig(), new KeystoneMultisig(), new PassportMultisig(), new SeedSigner(), new GordianSeedTool(), new SpecterDIY(), new Krux(), new KeycardShellMultisig());
} else if(getMasterController().getWallet().getPolicyType().equals(PolicyType.SINGLE_SP)) {
fileImporters = List.of(new ColdcardSinglesig());
}
for(KeystoreFileImport importer : fileImporters) {
@@ -43,10 +41,7 @@ public class HwAirgappedController extends KeystoreImportDetailController {
}
}
List<KeystoreCardImport> cardImporters = Collections.emptyList();
if(getMasterController().getWallet().getPolicyType().equals(PolicyType.SINGLE_HD) || getMasterController().getWallet().getPolicyType().equals(PolicyType.MULTI_HD)) {
cardImporters = List.of(new Tapsigner(), new Satochip(), new Satschip(), new Keycard());
}
List<KeystoreCardImport> cardImporters = List.of(new Tapsigner(), new Satochip(), new Satschip(), new Keycard());
for(KeystoreCardImport importer : cardImporters) {
if(!importer.isDeprecated() || Config.get().isShowDeprecatedImportExport()) {
CardImportPane importPane = new CardImportPane(getMasterController().getWallet(), importer, getMasterController().getDefaultDerivation(), getMasterController().getRequiredDerivation());