sparrowwallet/drongo
1
0
Fork 0
mirror of https://github.com/sparrowwallet/drongo.git synced 2024-12-27 02:26:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add child key support to from wallet creation, add option to hide key origin

Browse source
This commit is contained in:
Craig Raw 2020-12-17 08:33:48 +02:00
parent 0567409742
commit 68f7c6850e
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/main/java/com/sparrowwallet/drongo/OutputDescriptor.java
View file

@ -252,12 +252,20 @@ public class OutputDescriptor {
} }
public static OutputDescriptor getOutputDescriptor(Wallet wallet) { public static OutputDescriptor getOutputDescriptor(Wallet wallet) {
Map<ExtendedKey, KeyDerivation> extendedKeyDerivationMap = new LinkedHashMap<>(); return getOutputDescriptor(wallet, null);
for(Keystore keystore : wallet.getKeystores()) {
extendedKeyDerivationMap.put(keystore.getExtendedPublicKey(), keystore.getKeyDerivation());
} }
return new OutputDescriptor(wallet.getScriptType(), wallet.getDefaultPolicy().getNumSignaturesRequired(), extendedKeyDerivationMap); public static OutputDescriptor getOutputDescriptor(Wallet wallet, KeyPurpose keyPurpose) {
Map<ExtendedKey, KeyDerivation> extendedKeyDerivationMap = new LinkedHashMap<>();
Map<ExtendedKey, String> extendedKeyChildDerivationMap = new LinkedHashMap<>();
for(Keystore keystore : wallet.getKeystores()) {
extendedKeyDerivationMap.put(keystore.getExtendedPublicKey(), keystore.getKeyDerivation());
if(keyPurpose != null) {
extendedKeyChildDerivationMap.put(keystore.getExtendedPublicKey(), keyPurpose.getPathIndex().num() + "/*");
}
}
return new OutputDescriptor(wallet.getScriptType(), wallet.getDefaultPolicy().getNumSignaturesRequired(), extendedKeyDerivationMap, extendedKeyChildDerivationMap);
} }
// See https://github.com/bitcoin/bitcoin/blob/master/doc/descriptors.md // See https://github.com/bitcoin/bitcoin/blob/master/doc/descriptors.md
@ -404,6 +412,10 @@ public class OutputDescriptor {
} }
public String toString(boolean addChecksum) { public String toString(boolean addChecksum) {
return toString(true, addChecksum);
}
public String toString(boolean addKeyOrigin, boolean addChecksum) {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append(scriptType.getDescriptor()); builder.append(scriptType.getDescriptor());
@ -412,14 +424,14 @@ public class OutputDescriptor {
StringJoiner joiner = new StringJoiner(","); StringJoiner joiner = new StringJoiner(",");
joiner.add(Integer.toString(multisigThreshold)); joiner.add(Integer.toString(multisigThreshold));
for(ExtendedKey pubKey : extendedPublicKeys.keySet()) { for(ExtendedKey pubKey : extendedPublicKeys.keySet()) {
String extKeyString = toString(pubKey); String extKeyString = toString(pubKey, addKeyOrigin);
joiner.add(extKeyString); joiner.add(extKeyString);
} }
builder.append(joiner.toString()); builder.append(joiner.toString());
builder.append(ScriptType.MULTISIG.getCloseDescriptor()); builder.append(ScriptType.MULTISIG.getCloseDescriptor());
} else { } else {
ExtendedKey extendedPublicKey = getSingletonExtendedPublicKey(); ExtendedKey extendedPublicKey = getSingletonExtendedPublicKey();
builder.append(toString(extendedPublicKey)); builder.append(toString(extendedPublicKey, addKeyOrigin));
} }
builder.append(scriptType.getCloseDescriptor()); builder.append(scriptType.getCloseDescriptor());
@ -432,10 +444,10 @@ public class OutputDescriptor {
return builder.toString(); return builder.toString();
} }
private String toString(ExtendedKey pubKey) { private String toString(ExtendedKey pubKey, boolean addKeyOrigin) {
StringBuilder keyBuilder = new StringBuilder(); StringBuilder keyBuilder = new StringBuilder();
KeyDerivation keyDerivation = extendedPublicKeys.get(pubKey); KeyDerivation keyDerivation = extendedPublicKeys.get(pubKey);
if(keyDerivation != null && keyDerivation.getDerivationPath() != null) { if(keyDerivation != null && keyDerivation.getDerivationPath() != null && addKeyOrigin) {
keyBuilder.append("["); keyBuilder.append("[");
if(keyDerivation.getMasterFingerprint() != null) { if(keyDerivation.getMasterFingerprint() != null) {
keyBuilder.append(keyDerivation.getMasterFingerprint()); keyBuilder.append(keyDerivation.getMasterFingerprint());