tMerge pull request #6517 from aaronisme/master - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit ad7588ec57ba8e768b030eb499938b98706f3bfe
DIR parent 9b416b577edfa2e4f4a62956b64262a1fcd52afa
HTML Author: ghost43 <somber.night@protonmail.com>
Date: Thu, 20 Aug 2020 14:23:49 +0000
Merge pull request #6517 from aaronisme/master
fix the coldcard multi-sig show address issue
Diffstat:
M electrum/plugins/coldcard/coldcard… | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
DIR diff --git a/electrum/plugins/coldcard/coldcard.py b/electrum/plugins/coldcard/coldcard.py
t@@ -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)