fix watchonly
This commit is contained in:
parent
16679c0d65
commit
05bb502bf5
|
@ -19,6 +19,7 @@ def parse_key(masterpub: str) -> Tuple[Descriptor, Optional[dict]]:
|
||||||
To create addresses use descriptor.derive(num).address(network=network)
|
To create addresses use descriptor.derive(num).address(network=network)
|
||||||
"""
|
"""
|
||||||
network = None
|
network = None
|
||||||
|
desc = None
|
||||||
# probably a single key
|
# probably a single key
|
||||||
if "(" not in masterpub:
|
if "(" not in masterpub:
|
||||||
k = Key.from_string(masterpub)
|
k = Key.from_string(masterpub)
|
||||||
|
@ -36,7 +37,6 @@ def parse_key(masterpub: str) -> Tuple[Descriptor, Optional[dict]]:
|
||||||
k.allowed_derivation = AllowedDerivation.default()
|
k.allowed_derivation = AllowedDerivation.default()
|
||||||
# get version bytes
|
# get version bytes
|
||||||
version = k.key.version
|
version = k.key.version
|
||||||
desc = Descriptor()
|
|
||||||
for network_name in NETWORKS:
|
for network_name in NETWORKS:
|
||||||
net = NETWORKS[network_name]
|
net = NETWORKS[network_name]
|
||||||
# not found in this network
|
# not found in this network
|
||||||
|
@ -52,6 +52,8 @@ def parse_key(masterpub: str) -> Tuple[Descriptor, Optional[dict]]:
|
||||||
# we didn't find correct version
|
# we didn't find correct version
|
||||||
if not network:
|
if not network:
|
||||||
raise ValueError("Unknown master public key version")
|
raise ValueError("Unknown master public key version")
|
||||||
|
if not desc:
|
||||||
|
raise ValueError("descriptor not found, because version did not match")
|
||||||
|
|
||||||
else:
|
else:
|
||||||
desc = Descriptor.from_string(masterpub)
|
desc = Descriptor.from_string(masterpub)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user