AaronFiore/electrum
1
0
Fork 0
Code Activity

keystore: change derive_pubkey API to return bytes

Browse Source
This commit is contained in:
SomberNight
2019-12-10 20:41:47 +01:00
parent ea62027599
commit fcd9752f19
4 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/plugins/coldcard/coldcard.py
View File

@@ -610,15 +610,15 @@ class ColdcardPlugin(HW_PluginBase):
# all those keys
pubkey_deriv_info = wallet.get_public_keys_with_deriv_info(address)
pubkeys = sorted([pk for pk in list(pubkey_deriv_info)])
pubkey_hexes = sorted([pk.hex() for pk in list(pubkey_deriv_info)])
xfp_paths = []
for pubkey_hex in pubkey_deriv_info:
ks, der_suffix = pubkey_deriv_info[pubkey_hex]
for pubkey in pubkey_deriv_info:
ks, der_suffix = pubkey_deriv_info[pubkey]
fp_bytes, der_full = ks.get_fp_and_derivation_to_be_used_in_partial_tx(der_suffix, only_der_suffix=False)
xfp_int = xfp_int_from_xfp_bytes(fp_bytes)
xfp_paths.append([xfp_int] + list(der_full))
script = bfh(wallet.pubkeys_to_scriptcode(pubkeys))
script = bfh(wallet.pubkeys_to_scriptcode(pubkey_hexes))
keystore.show_p2sh_address(wallet.m, script, xfp_paths, txin_type)