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

use default key origin information when importing a descriptor without key origin info

Browse source
This commit is contained in:
Craig Raw 2025-02-25 10:55:37 +02:00
parent 2253a1bb97
commit 07a6818823
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/com/sparrowwallet/sparrow/io/Descriptor.java
View file

@ -1,9 +1,12 @@
package com.sparrowwallet.sparrow.io; package com.sparrowwallet.sparrow.io;
import com.sparrowwallet.drongo.KeyDerivation;
import com.sparrowwallet.drongo.KeyPurpose; import com.sparrowwallet.drongo.KeyPurpose;
import com.sparrowwallet.drongo.OutputDescriptor; import com.sparrowwallet.drongo.OutputDescriptor;
import com.sparrowwallet.drongo.wallet.Keystore;
import com.sparrowwallet.drongo.wallet.Wallet; import com.sparrowwallet.drongo.wallet.Wallet;
import com.sparrowwallet.drongo.wallet.WalletModel; import com.sparrowwallet.drongo.wallet.WalletModel;
import com.sparrowwallet.sparrow.wallet.KeystoreController;
import java.io.*; import java.io.*;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@ -92,7 +95,7 @@ public class Descriptor implements WalletImport, WalletExport {
InputStream secondClone = new ByteArrayInputStream(baos.toByteArray()); InputStream secondClone = new ByteArrayInputStream(baos.toByteArray());
try { try {
return PdfUtils.getOutputDescriptor(firstClone).toWallet(); return ensureKeyDerivations(PdfUtils.getOutputDescriptor(firstClone).toWallet());
} catch(Exception e) { } catch(Exception e) {
//ignore //ignore
} }
@ -100,7 +103,7 @@ public class Descriptor implements WalletImport, WalletExport {
List<String> paragraphs = getParagraphs(secondClone); List<String> paragraphs = getParagraphs(secondClone);
for(String paragraph : paragraphs) { for(String paragraph : paragraphs) {
OutputDescriptor descriptor = OutputDescriptor.getOutputDescriptor(paragraph); OutputDescriptor descriptor = OutputDescriptor.getOutputDescriptor(paragraph);
return descriptor.toWallet(); return ensureKeyDerivations(descriptor.toWallet());
} }
throw new ImportException("Could not find an output descriptor in the file"); throw new ImportException("Could not find an output descriptor in the file");
@ -116,7 +119,7 @@ public class Descriptor implements WalletImport, WalletExport {
BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)); BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
for(String line : reader.lines().map(String::trim).toArray(String[]::new)) { for(String line : reader.lines().map(String::trim).toArray(String[]::new)) {
if(line.isEmpty()) { if(line.isEmpty()) {
if(paragraph.length() > 0) { if(!paragraph.isEmpty()) {
paragraphs.add(paragraph.toString()); paragraphs.add(paragraph.toString());
paragraph.setLength(0); paragraph.setLength(0);
} }
@ -127,13 +130,23 @@ public class Descriptor implements WalletImport, WalletExport {
} }
} }
if(paragraph.length() > 0) { if(!paragraph.isEmpty()) {
paragraphs.add(paragraph.toString()); paragraphs.add(paragraph.toString());
} }
return paragraphs; return paragraphs;
} }
private static Wallet ensureKeyDerivations(Wallet wallet) {
for(Keystore keystore : wallet.getKeystores()) {
if(keystore.getKeyDerivation().getMasterFingerprint() == null || keystore.getKeyDerivation().getDerivationPath() == null) {
keystore.setKeyDerivation(new KeyDerivation(KeystoreController.DEFAULT_WATCH_ONLY_FINGERPRINT, wallet.getScriptType().getDefaultDerivationPath()));
}
}
return wallet;
}
@Override @Override
public boolean isWalletImportScannable() { public boolean isWalletImportScannable() {
return true; return true;