diff --git a/drongo b/drongo index 729c3a14..5e8a1467 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit 729c3a1435ccf3f47db456a04c964cacd853a770 +Subproject commit 5e8a14678d264dfc5e30cc594f60a6f7f87292ef diff --git a/src/main/java/com/sparrowwallet/sparrow/control/WalletImportDialog.java b/src/main/java/com/sparrowwallet/sparrow/control/WalletImportDialog.java index aa511b91..1a384509 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/WalletImportDialog.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/WalletImportDialog.java @@ -47,7 +47,7 @@ public class WalletImportDialog extends Dialog { AnchorPane.setRightAnchor(scrollPane, 0.0); importAccordion = new Accordion(); - List keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new KeystoneSinglesig(), new PassportSinglesig()); + List keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new KeystoneSinglesig(), new PassportSinglesig(), new SeedSigner(), new SpecterDIY()); for(KeystoreFileImport importer : keystoreImporters) { FileWalletKeystoreImportPane importPane = new FileWalletKeystoreImportPane(importer); importAccordion.getPanes().add(importPane); diff --git a/src/main/java/com/sparrowwallet/sparrow/io/SeedSigner.java b/src/main/java/com/sparrowwallet/sparrow/io/SeedSigner.java new file mode 100644 index 00000000..b5a11250 --- /dev/null +++ b/src/main/java/com/sparrowwallet/sparrow/io/SeedSigner.java @@ -0,0 +1,20 @@ +package com.sparrowwallet.sparrow.io; + +import com.sparrowwallet.drongo.wallet.WalletModel; + +public class SeedSigner extends SpecterDIY { + @Override + public String getName() { + return "SeedSigner"; + } + + @Override + public String getKeystoreImportDescription() { + return "Import QR created on your SeedSigner by selecting Generate XPUB in the Signing Tools menu. Note that SeedSigner currently only supports P2WSH Multisig wallets."; + } + + @Override + public WalletModel getWalletModel() { + return WalletModel.SEEDSIGNER; + } +} diff --git a/src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwAirgappedController.java b/src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwAirgappedController.java index 16432a65..3d8cfb4a 100644 --- a/src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwAirgappedController.java +++ b/src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwAirgappedController.java @@ -16,9 +16,9 @@ public class HwAirgappedController extends KeystoreImportDetailController { public void initializeView() { List importers = Collections.emptyList(); if(getMasterController().getWallet().getPolicyType().equals(PolicyType.SINGLE)) { - importers = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new KeystoneSinglesig(), new PassportSinglesig(), new SpecterDIY()); + importers = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new KeystoneSinglesig(), new PassportSinglesig(), new SeedSigner(), new SpecterDIY()); } else if(getMasterController().getWallet().getPolicyType().equals(PolicyType.MULTI)) { - importers = List.of(new ColdcardMultisig(), new CoboVaultMultisig(), new KeystoneMultisig(), new PassportMultisig(), new SpecterDIY()); + importers = List.of(new ColdcardMultisig(), new CoboVaultMultisig(), new KeystoneMultisig(), new PassportMultisig(), new SeedSigner(), new SpecterDIY()); } for(KeystoreImport importer : importers) { diff --git a/src/main/resources/image/seedsigner.png b/src/main/resources/image/seedsigner.png new file mode 100644 index 00000000..6aabf31c Binary files /dev/null and b/src/main/resources/image/seedsigner.png differ diff --git a/src/main/resources/image/seedsigner@2x.png b/src/main/resources/image/seedsigner@2x.png new file mode 100644 index 00000000..c7898a1a Binary files /dev/null and b/src/main/resources/image/seedsigner@2x.png differ diff --git a/src/main/resources/image/seedsigner@3x.png b/src/main/resources/image/seedsigner@3x.png new file mode 100644 index 00000000..7fd7465e Binary files /dev/null and b/src/main/resources/image/seedsigner@3x.png differ