sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-02 20:36:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add airgap vault to airgapped options (draft)

Browse source
This commit is contained in:
Craig Raw 2023-12-06 08:55:09 +02:00
parent 20b4d5a1b5
commit 4feb4a3a79
9 changed files with 50 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drongo

@ -1 +1 @@
Subproject commit 0bb5b75be52ca4ee9dc771dae30d2b7cb9a49bd2
Subproject commit 579c86b1a748e410c51f637cd79cbb701996b7e3

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

@ -51,7 +51,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
AnchorPane.setRightAnchor(scrollPane, 0.0);
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());
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());
for(KeystoreFileImport importer : keystoreImporters) {
if(!importer.isDeprecated() || Config.get().isShowDeprecatedImportExport()) {
FileWalletKeystoreImportPane importPane = new FileWalletKeystoreImportPane(importer);

35
src/main/java/com/sparrowwallet/sparrow/io/AirGapVault.java Normal file
View file

@ -0,0 +1,35 @@
package com.sparrowwallet.sparrow.io;
import com.sparrowwallet.drongo.wallet.WalletModel;
public class AirGapVault extends KeystoneSinglesig {
@Override
public String getName() {
return "AirGap Vault";
}
@Override
public String getKeystoreImportDescription(int account) {
return "Import QR created on your AirGap Vault, by selecting the Secret > Account > Sparrow Wallet";
}
@Override
public WalletModel getWalletModel() {
return WalletModel.AIRGAP_VAULT;
}
@Override
public boolean isFileFormatAvailable() {
return false;
}
@Override
public boolean isWalletImportFileFormatAvailable() {
return false;
}
@Override
public boolean isDeprecated() {
return true;
}
}

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

@ -25,7 +25,7 @@ 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());
fileImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new Jade(), new KeystoneSinglesig(), new PassportSinglesig(), new SeedSigner(), new GordianSeedTool(), new SpecterDIY(), new Krux(), new AirGapVault());
} else if(getMasterController().getWallet().getPolicyType().equals(PolicyType.MULTI)) {
fileImporters = List.of(new Bip129(), new ColdcardMultisig(), new CoboVaultMultisig(), new Jade(), new KeystoneMultisig(), new PassportMultisig(), new SeedSigner(), new GordianSeedTool(), new SpecterDIY(), new Krux());
}

6
src/main/resources/image/airgapvault-icon-invert.svg Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15px" height="15px" viewBox="0 0 15 15" version="1.1">
<g id="surface1">
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(87.843137%,87.843137%,87.843137%);fill-opacity:1;" d="M 8.144531 13.378906 C 8.074219 13.40625 8.003906 13.355469 8.003906 13.28125 L 8.003906 12.714844 C 8.003906 12.386719 8.003906 10.804688 8.003906 10.804688 C 8.003906 10.535156 7.785156 10.316406 7.515625 10.316406 L 6.714844 10.316406 C 5.800781 10.316406 5.046875 9.585938 5.035156 8.675781 C 5.027344 7.753906 5.773438 7.003906 6.691406 7.003906 L 8.277344 7.003906 C 8.628906 7.003906 8.929688 6.726562 8.9375 6.375 C 8.949219 6.011719 8.65625 5.710938 8.292969 5.710938 L 7.507812 5.714844 C 6.679688 5.714844 6.007812 5.042969 6.007812 4.214844 L 6.007812 3.261719 C 5.671875 3.433594 5.257812 3.632812 4.84375 3.808594 C 4.347656 4.019531 3.761719 4.210938 3.398438 4.324219 C 3.355469 5.085938 3.269531 6.953125 3.414062 8.355469 C 3.5 9.148438 3.871094 9.976562 4.46875 10.6875 C 5.0625 11.394531 5.832031 11.941406 6.644531 12.230469 C 6.847656 12.296875 6.992188 12.488281 6.992188 12.710938 L 6.992188 13.277344 C 6.992188 13.347656 6.921875 13.398438 6.851562 13.375 L 6.320312 13.1875 C 5.335938 12.839844 4.40625 12.183594 3.695312 11.335938 C 2.972656 10.472656 2.515625 9.449219 2.410156 8.460938 C 2.214844 6.574219 2.40625 4.011719 2.414062 3.902344 L 2.441406 3.554688 L 2.78125 3.457031 C 2.789062 3.453125 3.746094 3.179688 4.449219 2.882812 C 5.34375 2.5 6.25 1.984375 6.261719 1.976562 L 6.859375 1.632812 C 6.929688 1.59375 7.015625 1.644531 7.015625 1.726562 L 7.015625 4.214844 C 7.015625 4.484375 7.234375 4.703125 7.503906 4.703125 L 8.292969 4.699219 C 9.210938 4.699219 9.957031 5.453125 9.949219 6.371094 C 9.941406 7.285156 9.183594 8.011719 8.273438 8.011719 L 6.707031 8.011719 C 6.355469 8.011719 6.054688 8.289062 6.046875 8.640625 C 6.035156 9.003906 6.328125 9.304688 6.691406 9.304688 L 7.515625 9.304688 C 8.339844 9.304688 9.015625 9.976562 9.015625 10.804688 C 9.015625 10.804688 9.011719 11.402344 9.011719 11.9375 C 9.574219 11.628906 10.101562 11.195312 10.53125 10.679688 C 11.128906 9.960938 11.503906 9.128906 11.589844 8.332031 C 11.734375 6.933594 11.640625 5.078125 11.589844 4.324219 C 11.226562 4.210938 10.632812 4.019531 10.136719 3.808594 C 9.25 3.429688 8.382812 2.933594 8.25 2.859375 C 8.089844 2.773438 7.980469 2.605469 7.980469 2.414062 L 7.980469 1.71875 C 7.980469 1.636719 8.070312 1.585938 8.140625 1.628906 L 8.738281 1.976562 C 8.75 1.980469 9.644531 2.5 10.53125 2.878906 C 11.230469 3.175781 12.199219 3.453125 12.207031 3.457031 L 12.542969 3.550781 L 12.570312 3.898438 C 12.582031 4.007812 12.789062 6.550781 12.59375 8.4375 C 12.378906 10.464844 10.734375 12.464844 8.675781 13.191406 Z M 8.144531 13.378906 "/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.8 KiB

6
src/main/resources/image/airgapvault-icon.svg Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15px" height="15px" viewBox="0 0 15 15" version="1.1">
<g id="surface1">
<path style=" stroke:none;fill-rule:nonzero;fill:rgb(4.705882%,4.705882%,4.705882%);fill-opacity:1;" d="M 8.144531 13.378906 C 8.074219 13.40625 8.003906 13.355469 8.003906 13.28125 L 8.003906 12.714844 C 8.003906 12.386719 8.003906 10.804688 8.003906 10.804688 C 8.003906 10.535156 7.785156 10.316406 7.515625 10.316406 L 6.714844 10.316406 C 5.800781 10.316406 5.046875 9.585938 5.035156 8.675781 C 5.027344 7.753906 5.773438 7.003906 6.691406 7.003906 L 8.277344 7.003906 C 8.628906 7.003906 8.929688 6.726562 8.9375 6.375 C 8.949219 6.011719 8.65625 5.710938 8.292969 5.710938 L 7.507812 5.714844 C 6.679688 5.714844 6.007812 5.042969 6.007812 4.214844 L 6.007812 3.261719 C 5.671875 3.433594 5.257812 3.632812 4.84375 3.808594 C 4.347656 4.019531 3.761719 4.210938 3.398438 4.324219 C 3.355469 5.085938 3.269531 6.953125 3.414062 8.355469 C 3.5 9.148438 3.871094 9.976562 4.46875 10.6875 C 5.0625 11.394531 5.832031 11.941406 6.644531 12.230469 C 6.847656 12.296875 6.992188 12.488281 6.992188 12.710938 L 6.992188 13.277344 C 6.992188 13.347656 6.921875 13.398438 6.851562 13.375 L 6.320312 13.1875 C 5.335938 12.839844 4.40625 12.183594 3.695312 11.335938 C 2.972656 10.472656 2.515625 9.449219 2.410156 8.460938 C 2.214844 6.574219 2.40625 4.011719 2.414062 3.902344 L 2.441406 3.554688 L 2.78125 3.457031 C 2.789062 3.453125 3.746094 3.179688 4.449219 2.882812 C 5.34375 2.5 6.25 1.984375 6.261719 1.976562 L 6.859375 1.632812 C 6.929688 1.59375 7.015625 1.644531 7.015625 1.726562 L 7.015625 4.214844 C 7.015625 4.484375 7.234375 4.703125 7.503906 4.703125 L 8.292969 4.699219 C 9.210938 4.699219 9.957031 5.453125 9.949219 6.371094 C 9.941406 7.285156 9.183594 8.011719 8.273438 8.011719 L 6.707031 8.011719 C 6.355469 8.011719 6.054688 8.289062 6.046875 8.640625 C 6.035156 9.003906 6.328125 9.304688 6.691406 9.304688 L 7.515625 9.304688 C 8.339844 9.304688 9.015625 9.976562 9.015625 10.804688 C 9.015625 10.804688 9.011719 11.402344 9.011719 11.9375 C 9.574219 11.628906 10.101562 11.195312 10.53125 10.679688 C 11.128906 9.960938 11.503906 9.128906 11.589844 8.332031 C 11.734375 6.933594 11.640625 5.078125 11.589844 4.324219 C 11.226562 4.210938 10.632812 4.019531 10.136719 3.808594 C 9.25 3.429688 8.382812 2.933594 8.25 2.859375 C 8.089844 2.773438 7.980469 2.605469 7.980469 2.414062 L 7.980469 1.71875 C 7.980469 1.636719 8.070312 1.585938 8.140625 1.628906 L 8.738281 1.976562 C 8.75 1.980469 9.644531 2.5 10.53125 2.878906 C 11.230469 3.175781 12.199219 3.453125 12.207031 3.457031 L 12.542969 3.550781 L 12.570312 3.898438 C 12.582031 4.007812 12.789062 6.550781 12.59375 8.4375 C 12.378906 10.464844 10.734375 12.464844 8.675781 13.191406 Z M 8.144531 13.378906 "/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
src/main/resources/image/airgapvault.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
src/main/resources/image/airgapvault@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
src/main/resources/image/airgapvault@3x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.6 KiB