Skip to content

Commit

Permalink
condition on is_sorted in jade's display_multisig_address
Browse files Browse the repository at this point in the history
  • Loading branch information
moneymanolis committed Aug 18, 2023
1 parent bc4a51b commit cb25fcf
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/cryptoadvance/specter/devices/hwi/jade.py
Original file line number Diff line number Diff line change
Expand Up @@ -556,10 +556,11 @@ def display_multisig_address(
paths.append(parse_path(path))

# sort origins, signers and paths according to origins (like in _get_multisig_name)
signer_origins, signers, paths = [
list(a) for a in zip(*sorted(zip(signer_origins, signers, paths)))
]

# But, only sort if sorted_multi is used (and thus the order of xpubs is not relevant)
if multisig.is_sorted:
signer_origins, signers, paths = [
list(a) for a in zip(*sorted(zip(signer_origins, signers, paths)))
]
# Get a deterministic name for this multisig wallet
script_variant = self._convertAddrType(addr_type, multisig=True)
multisig_name = self._get_multisig_name(
Expand All @@ -572,7 +573,7 @@ def display_multisig_address(
self._network(),
multisig_name,
script_variant,
True, # always use sorted
multisig.is_sorted,
multisig.thresh,
signers,
)
Expand Down

0 comments on commit cb25fcf

Please sign in to comment.