sparrowwallet/hummingbird
1
0
Fork 0
mirror of https://github.com/sparrowwallet/hummingbird.git synced 2024-11-02 18:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

follow up

Browse source
This commit is contained in:
Craig Raw 2023-12-14 11:29:53 +02:00
parent 2ac6c346cd
commit 5aabf3a830
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/com/sparrowwallet/hummingbird/registry/CryptoKeypath.java
View file

@ -19,7 +19,7 @@ public class CryptoKeypath extends RegistryItem {
private final Integer depth; private final Integer depth;
public CryptoKeypath(List<PathComponent> components, byte[] sourceFingerprint) { public CryptoKeypath(List<PathComponent> components, byte[] sourceFingerprint) {
this(components, sourceFingerprint, 0); this(components, sourceFingerprint, null);
} }
public CryptoKeypath(List<PathComponent> components, byte[] sourceFingerprint, Integer depth) { public CryptoKeypath(List<PathComponent> components, byte[] sourceFingerprint, Integer depth) {

4
src/main/java/com/sparrowwallet/hummingbird/registry/URHDKey.java
View file

@ -7,11 +7,11 @@ public class URHDKey extends CryptoHDKey {
super(key, chainCode); super(key, chainCode);
} }
public URHDKey(Boolean privateKey, byte[] key, byte[] chainCode, CryptoCoinInfo useInfo, CryptoKeypath origin, CryptoKeypath children, byte[] parentFingerprint) { public URHDKey(Boolean privateKey, byte[] key, byte[] chainCode, URCoinInfo useInfo, URKeypath origin, URKeypath children, byte[] parentFingerprint) {
super(privateKey, key, chainCode, useInfo, origin, children, parentFingerprint); super(privateKey, key, chainCode, useInfo, origin, children, parentFingerprint);
} }
public URHDKey(Boolean privateKey, byte[] key, byte[] chainCode, CryptoCoinInfo useInfo, CryptoKeypath origin, CryptoKeypath children, byte[] parentFingerprint, String name, String note) { public URHDKey(Boolean privateKey, byte[] key, byte[] chainCode, URCoinInfo useInfo, URKeypath origin, URKeypath children, byte[] parentFingerprint, String name, String note) {
super(privateKey, key, chainCode, useInfo, origin, children, parentFingerprint, name, note); super(privateKey, key, chainCode, useInfo, origin, children, parentFingerprint, name, note);
} }

10
src/main/java/com/sparrowwallet/hummingbird/registry/UROutputDescriptor.java
View file

@ -58,7 +58,15 @@ public class UROutputDescriptor extends RegistryItem {
if(keys != null && !keys.isEmpty()) { if(keys != null && !keys.isEmpty()) {
Array array = new Array(); Array array = new Array();
for(RegistryItem key : keys) { for(RegistryItem key : keys) {
array.add(key.toCbor()); DataItem keyItem = key.toCbor();
if(key instanceof URHDKey) {
keyItem.setTag(RegistryType.HDKEY.getTag());
} else if(key instanceof URECKey) {
keyItem.setTag(RegistryType.ECKEY.getTag());
} else if(key instanceof URAddress) {
keyItem.setTag(RegistryType.ADDRESS.getTag());
}
array.add(keyItem);
} }
map.put(new UnsignedInteger(KEYS), array); map.put(new UnsignedInteger(KEYS), array);
} }