sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2025-11-05 11:56:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge cd6d3599c7 into 4774830ce4

Browse source
This commit is contained in:
Michele Balistreri 2025-11-05 14:26:34 +07:00 committed by GitHub
commit 9a05648b7b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 149 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/com/sparrowwallet/sparrow/AppController.java
View file

@ -1234,7 +1234,8 @@ public class AppController implements Initializable {
new CoboVaultSinglesig(), new CoboVaultMultisig(),
new PassportSinglesig(),
new KeystoneSinglesig(), new KeystoneMultisig(),
new CaravanMultisig());
new CaravanMultisig(),
new KeycardShellSinglesig(), new KeycardShellMultisig());
for(WalletImport importer : walletImporters) {
if(importer.isDeprecated() && !Config.get().isShowDeprecatedImportExport()) {
continue;

2
src/main/java/com/sparrowwallet/sparrow/control/WalletImportDialog.java
View file

@ -52,7 +52,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
importAccordion = new Accordion();
List<KeystoreFileImport> keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new Jade(), new KeystoneSinglesig(), new PassportSinglesig(),
new GordianSeedTool(), new SeedSigner(), new SpecterDIY(), new Krux(), new AirGapVault(), new Samourai());
new GordianSeedTool(), new SeedSigner(), new SpecterDIY(), new Krux(), new AirGapVault(), new Samourai(), new KeycardShellSinglesig());
for(KeystoreFileImport importer : keystoreImporters) {
if(!importer.isDeprecated() || Config.get().isShowDeprecatedImportExport()) {
FileWalletKeystoreImportPane importPane = new FileWalletKeystoreImportPane(importer);

53
src/main/java/com/sparrowwallet/sparrow/io/KeycardShellMultisig.java Normal file
View file

@ -0,0 +1,53 @@
package com.sparrowwallet.sparrow.io;
import com.sparrowwallet.drongo.protocol.ScriptType;
import com.sparrowwallet.drongo.wallet.Keystore;
import com.sparrowwallet.drongo.wallet.WalletModel;
import java.io.InputStream;
public class KeycardShellMultisig extends ColdcardMultisig {
@Override
public String getName() {
return "Keycard Shell Multisig";
}
@Override
public String getKeystoreImportDescription(int account) {
return "Import QR created on your Keycard Shell, by selecting Connect software wallet > Bitcoin MultiSig";
}
@Override
public WalletModel getWalletModel() {
return WalletModel.KEYCARD_SHELL;
}
@Override
public Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException {
Keystore keystore = super.getKeystore(scriptType, inputStream, password);
keystore.setLabel("Keycard Shell");
keystore.setWalletModel(getWalletModel());
return keystore;
}
@Override
public boolean isFileFormatAvailable() {
return false;
}
@Override
public boolean isWalletImportFileFormatAvailable() {
return false;
}
@Override
public boolean isWalletImportScannable() {
return false;
}
@Override
public boolean isWalletExportScannable() {
return false;
}
}

43
src/main/java/com/sparrowwallet/sparrow/io/KeycardShellSinglesig.java Normal file
View file

@ -0,0 +1,43 @@
package com.sparrowwallet.sparrow.io;
import com.sparrowwallet.drongo.protocol.ScriptType;
import com.sparrowwallet.drongo.wallet.Keystore;
import com.sparrowwallet.drongo.wallet.WalletModel;
import java.io.InputStream;
public class KeycardShellSinglesig extends KeystoneSinglesig {
@Override
public String getName() {
return "Keycard Shell";
}
@Override
public String getKeystoreImportDescription(int account) {
return "Import QR created on your Keycard Shell, by selecting Connect software wallet > Bitcoin";
}
@Override
public WalletModel getWalletModel() {
return WalletModel.KEYCARD_SHELL;
}
@Override
public Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException {
Keystore keystore = super.getKeystore(scriptType, inputStream, password);
keystore.setLabel("Keycard Shell");
keystore.setWalletModel(getWalletModel());
return keystore;
}
@Override
public boolean isFileFormatAvailable() {
return false;
}
@Override
public boolean isWalletImportFileFormatAvailable() {
return false;
}
}

4
src/main/java/com/sparrowwallet/sparrow/keystoreimport/HwAirgappedController.java
View file

@ -26,9 +26,9 @@ public class HwAirgappedController extends KeystoreImportDetailController {
public void initializeView() {
List<KeystoreFileImport> fileImporters = Collections.emptyList();
if(getMasterController().getWallet().getPolicyType().equals(PolicyType.SINGLE)) {
fileImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new Jade(), new KeystoneSinglesig(), new PassportSinglesig(), new SeedSigner(), new GordianSeedTool(), new SpecterDIY(), new Krux(), new AirGapVault());
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)) {
fileImporters = List.of(new Bip129(), new ColdcardMultisig(), new CoboVaultMultisig(), new JadeMultisig(), new KeystoneMultisig(), new PassportMultisig(), new SeedSigner(), new GordianSeedTool(), new SpecterDIY(), new Krux());
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());
}
for(KeystoreFileImport importer : fileImporters) {

12
src/main/resources/image/walletmodel/keycard-icon-invert.svg Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="Livello_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 15 15">
<!-- Generator: Adobe Illustrator 29.5.1, SVG Export Plug-In . SVG Version: 2.1.0 Build 141) -->
<defs>
<style>
.st0 {
fill: #dddada;
}
</style>
</defs>
<path class="st0" d="M10.12,12.67l-1.65-2.42,1.53-1.74.22-.25h-1.65l-.05.05-1.2,1.38v-2.22c1.18-.33,1.99-1.4,1.99-2.64,0-1.51-1.22-2.74-2.73-2.74s-2.72,1.23-2.72,2.74c0,1.23.84,2.32,2.01,2.64v5.43h1.45v-1.36l.28-.32,1.08,1.61.04.07h1.54l-.16-.24ZM6.6,3.37c.8,0,1.45.66,1.45,1.46s-.65,1.46-1.45,1.46-1.45-.65-1.45-1.46.65-1.46,1.45-1.46Z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 665 B

12
src/main/resources/image/walletmodel/keycard-icon.svg Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="Livello_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 15 15">
<!-- Generator: Adobe Illustrator 29.5.1, SVG Export Plug-In . SVG Version: 2.1.0 Build 141) -->
<defs>
<style>
.st0 {
fill: #1d1d1b;
}
</style>
</defs>
<path class="st0" d="M10.12,12.67l-1.65-2.42,1.53-1.74.22-.25h-1.65l-.05.05-1.2,1.38v-2.22c1.18-.33,1.99-1.4,1.99-2.64,0-1.51-1.22-2.74-2.73-2.74s-2.72,1.23-2.72,2.74c0,1.23.84,2.32,2.01,2.64v5.43h1.45v-1.36l.28-.32,1.08,1.61.04.07h1.54l-.16-.24ZM6.6,3.37c.8,0,1.45.66,1.45,1.46s-.65,1.46-1.45,1.46-1.45-.65-1.45-1.46.65-1.46,1.45-1.46Z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 665 B

12
src/main/resources/image/walletmodel/keycard-invert.svg Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="Livello_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 50 50">
<!-- Generator: Adobe Illustrator 29.5.1, SVG Export Plug-In . SVG Version: 2.1.0 Build 141) -->
<defs>
<style>
.st0 {
fill: #d6d2d2;
}
</style>
</defs>
<path class="st0" d="M34.08,42.14l-5.46-8,5.08-5.76.73-.83h-5.45l-.15.17-3.99,4.56v-7.37c3.91-1.09,6.6-4.63,6.6-8.75,0-5.01-4.05-9.09-9.03-9.09s-9.03,4.08-9.03,9.09c0,4.08,2.78,7.7,6.66,8.76v18h4.8v-4.5l.93-1.05,3.58,5.34.15.22h5.12l-.53-.78ZM22.41,11.32c2.65,0,4.81,2.17,4.81,4.84s-2.16,4.84-4.81,4.84-4.81-2.17-4.81-4.84,2.16-4.84,4.81-4.84Z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 672 B

12
src/main/resources/image/walletmodel/keycard.svg Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="Livello_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 50 50">
<!-- Generator: Adobe Illustrator 29.5.1, SVG Export Plug-In . SVG Version: 2.1.0 Build 141) -->
<defs>
<style>
.st0 {
fill: #1d1d1b;
}
</style>
</defs>
<path class="st0" d="M34.08,42.14l-5.46-8,5.08-5.76.73-.83h-5.45l-.15.17-3.99,4.56v-7.37c3.91-1.09,6.6-4.63,6.6-8.75,0-5.01-4.05-9.09-9.03-9.09s-9.03,4.08-9.03,9.09c0,4.08,2.78,7.7,6.66,8.76v18h4.8v-4.5l.93-1.05,3.58,5.34.15.22h5.12l-.53-.78ZM22.41,11.32c2.65,0,4.81,2.17,4.81,4.84s-2.16,4.84-4.81,4.84-4.81-2.17-4.81-4.84,2.16-4.84,4.81-4.84Z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 672 B