Merge pull request #6517 from aaronisme/master

fix the coldcard multi-sig show address issue
This commit is contained in:
ghost43 2020-08-20 14:23:49 +00:00 committed by GitHub
commit ad7588ec57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -608,7 +608,8 @@ class ColdcardPlugin(HW_PluginBase):
pubkey_deriv_info = wallet.get_public_keys_with_deriv_info(address)
pubkey_hexes = sorted([pk.hex() for pk in list(pubkey_deriv_info)])
xfp_paths = []
for pubkey in pubkey_deriv_info:
for pubkey_hex in pubkey_hexes:
pubkey = bytes.fromhex(pubkey_hex)
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)