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 passport multisig to wallet import menu

Browse source
This commit is contained in:
Craig Raw 2024-09-02 12:40:54 +02:00
parent 65f1fa7cf8
commit c2b5b24702
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
} }
List<WalletImport> walletImporters = new ArrayList<>(List.of(new Bip129(), new CaravanMultisig(), new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), List<WalletImport> walletImporters = new ArrayList<>(List.of(new Bip129(), new CaravanMultisig(), new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(),
new KeystoneMultisig(), new Descriptor(), new SpecterDesktop(), new BlueWalletMultisig(), new Sparrow(), new JadeMultisig())); new KeystoneMultisig(), new Descriptor(), new SpecterDesktop(), new BlueWalletMultisig(), new Sparrow(), new JadeMultisig(), new PassportMultisig()));
if(!selectedWalletForms.isEmpty()) { if(!selectedWalletForms.isEmpty()) {
walletImporters.add(new WalletLabels(selectedWalletForms)); walletImporters.add(new WalletLabels(selectedWalletForms));
} }

22
src/main/java/com/sparrowwallet/sparrow/io/PassportMultisig.java
View file

@ -2,6 +2,7 @@ package com.sparrowwallet.sparrow.io;
import com.sparrowwallet.drongo.protocol.ScriptType; import com.sparrowwallet.drongo.protocol.ScriptType;
import com.sparrowwallet.drongo.wallet.Keystore; import com.sparrowwallet.drongo.wallet.Keystore;
import com.sparrowwallet.drongo.wallet.Wallet;
import com.sparrowwallet.drongo.wallet.WalletModel; import com.sparrowwallet.drongo.wallet.WalletModel;
import java.io.InputStream; import java.io.InputStream;
@ -45,4 +46,25 @@ public class PassportMultisig extends ColdcardMultisig {
public boolean isWalletExportScannable() { public boolean isWalletExportScannable() {
return true; return true;
} }
@Override
public boolean isWalletImportScannable() {
return true;
}
@Override
public String getWalletImportDescription() {
return "Import file or QR created by using Settings > Bitcoin > Multisig > [Wallet Detail] > Export via QR/microSD on your Passport.";
}
@Override
public Wallet importWallet(InputStream inputStream, String password) throws ImportException {
Wallet wallet = super.importWallet(inputStream, password);
for(Keystore keystore : wallet.getKeystores()) {
keystore.setLabel(keystore.getLabel().replace("Coldcard", "Passport"));
keystore.setWalletModel(WalletModel.PASSPORT);
}
return wallet;
}
} }