coldcard/HWI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use descriptor class in getkeypool

Browse Source
This commit is contained in:
Andrew Chow 2019-02-17 17:46:45 -05:00
parent f2aff4d642
commit c2ff20bf61
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hwilib/commands.py
View File

@ -139,15 +139,9 @@ def getkeypool(client, path, start, end, internal=False, keypool=False, account=
import_data = []
this_import = {}
descriptor_open = 'pkh('
descriptor_close = ')'
if wpkh == True:
descriptor_open = 'wpkh('
elif sh_wpkh == True:
descriptor_open = 'sh(wpkh('
descriptor_close = '))'
desc = Descriptor(master_fpr, path_base.replace('m', ''), base_key, path_suffix, client.is_testnet, sh_wpkh, wpkh)
this_import['desc'] = descriptor_open + '[' + master_fpr + path_base.replace('m', '') + ']' + base_key + path_suffix + descriptor_close
this_import['desc'] = desc.serialize()
this_import['range'] = {'start': start, 'end': end}
this_import['timestamp'] = 'now'
this_import['internal'] = internal