From b59a65dcfed797429a92f853eb1bfb1029dd78fc Mon Sep 17 00:00:00 2001 From: Craig Raw Date: Fri, 10 May 2024 09:54:33 +0200 Subject: [PATCH] export electrum wallets with only usb capable hardware wallets as hardware keystore types --- drongo | 2 +- src/main/java/com/sparrowwallet/sparrow/io/Electrum.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drongo b/drongo index 33bf35e3..571db325 160000 --- a/drongo +++ b/drongo @@ -1 +1 @@ -Subproject commit 33bf35e3c4fdaed6e6b0d598efaa3f8f0406c266 +Subproject commit 571db3257466827d33aa75dbd911288388f838c3 diff --git a/src/main/java/com/sparrowwallet/sparrow/io/Electrum.java b/src/main/java/com/sparrowwallet/sparrow/io/Electrum.java index 13eb0694..9286769c 100644 --- a/src/main/java/com/sparrowwallet/sparrow/io/Electrum.java +++ b/src/main/java/com/sparrowwallet/sparrow/io/Electrum.java @@ -328,8 +328,12 @@ public void exportWallet(Wallet wallet, OutputStream outputStream, String passwo ek.derivation = keystore.getKeyDerivation().getDerivationPath(); ek.root_fingerprint = keystore.getKeyDerivation().getMasterFingerprint(); ek.xpub = keystore.getExtendedPublicKey().toString(xpubHeader); - ek.type = "hardware"; - ek.hw_type = keystore.getWalletModel().getType(); + if(keystore.getWalletModel().hasUsb()) { + ek.type = "hardware"; + ek.hw_type = keystore.getWalletModel().getType(); + } else { + ek.type = "bip32"; + } ew.use_encryption = false; } else if(keystore.getSource() == KeystoreSource.SW_SEED) { ek.type = "bip32";