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

add support for creating output descriptors without rendering xpubs

Browse source
This commit is contained in:
Craig Raw 2023-02-08 08:02:22 +02:00
parent b487396417
commit d48054ac6b
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -479,6 +479,10 @@ public class OutputDescriptor {
} }
public String toString(boolean addKeyOrigin, boolean addChecksum) { public String toString(boolean addKeyOrigin, boolean addChecksum) {
return toString(addKeyOrigin, true, addChecksum);
}
public String toString(boolean addKeyOrigin, boolean addKey, boolean addChecksum) {
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append(scriptType.getDescriptor()); builder.append(scriptType.getDescriptor());
@ -487,14 +491,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 : sortExtendedPubKeys(extendedPublicKeys.keySet())) { for(ExtendedKey pubKey : sortExtendedPubKeys(extendedPublicKeys.keySet())) {
String extKeyString = toString(pubKey, addKeyOrigin); String extKeyString = toString(pubKey, addKeyOrigin, addKey);
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, addKeyOrigin)); builder.append(toString(extendedPublicKey, addKeyOrigin, addKey));
} }
builder.append(scriptType.getCloseDescriptor()); builder.append(scriptType.getCloseDescriptor());
@ -548,7 +552,7 @@ public class OutputDescriptor {
} }
} }
private String toString(ExtendedKey pubKey, boolean addKeyOrigin) { private String toString(ExtendedKey pubKey, boolean addKeyOrigin, boolean addKey) {
StringBuilder keyBuilder = new StringBuilder(); StringBuilder keyBuilder = new StringBuilder();
KeyDerivation keyDerivation = extendedPublicKeys.get(pubKey); KeyDerivation keyDerivation = extendedPublicKeys.get(pubKey);
if(keyDerivation != null && keyDerivation.getDerivationPath() != null && addKeyOrigin) { if(keyDerivation != null && keyDerivation.getDerivationPath() != null && addKeyOrigin) {
@ -561,17 +565,19 @@ public class OutputDescriptor {
keyBuilder.append("]"); keyBuilder.append("]");
} }
if(pubKey != null) { if(addKey) {
keyBuilder.append(pubKey.toString()); if(pubKey != null) {
} keyBuilder.append(pubKey.toString());
String childDerivation = mapChildrenDerivations.get(pubKey);
if(childDerivation != null) {
if(!childDerivation.startsWith("/")) {
keyBuilder.append("/");
} }
keyBuilder.append(childDerivation); String childDerivation = mapChildrenDerivations.get(pubKey);
if(childDerivation != null) {
if(!childDerivation.startsWith("/")) {
keyBuilder.append("/");
}
keyBuilder.append(childDerivation);
}
} }
return keyBuilder.toString(); return keyBuilder.toString();

2
src/main/java/com/sparrowwallet/drongo/wallet/WalletModel.java
View file

@ -4,7 +4,7 @@ import java.util.Locale;
public enum WalletModel { public enum WalletModel {
SEED, SPARROW, BITCOIN_CORE, ELECTRUM, TREZOR_1, TREZOR_T, COLDCARD, LEDGER_NANO_S, LEDGER_NANO_X, DIGITALBITBOX_01, KEEPKEY, SPECTER_DESKTOP, COBO_VAULT, SEED, SPARROW, BITCOIN_CORE, ELECTRUM, TREZOR_1, TREZOR_T, COLDCARD, LEDGER_NANO_S, LEDGER_NANO_X, DIGITALBITBOX_01, KEEPKEY, SPECTER_DESKTOP, COBO_VAULT,
BITBOX_02, SPECTER_DIY, PASSPORT, BLUE_WALLET, KEYSTONE, SEEDSIGNER, CARAVAN, GORDIAN_SEED_TOOL, JADE, LEDGER_NANO_S_PLUS, EPS, TAPSIGNER, SATSCARD; BITBOX_02, SPECTER_DIY, PASSPORT, BLUE_WALLET, KEYSTONE, SEEDSIGNER, CARAVAN, GORDIAN_SEED_TOOL, JADE, LEDGER_NANO_S_PLUS, EPS, TAPSIGNER, SATSCARD, LABELS;
public static WalletModel getModel(String model) { public static WalletModel getModel(String model) {
return valueOf(model.toUpperCase(Locale.ROOT)); return valueOf(model.toUpperCase(Locale.ROOT));