GlcoinCore/specter-desktop
1
0
Fork 0
mirror of https://github.com/cryptoadvance/specter-desktop.git synced 2026-08-13 12:33:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Bugfix: Jade displaying wrong multisig addresses for descriptors using multi() (#2366)

Browse source 
* condition on is_sorted in jade's display_multisig_address

* fix overlay for address confirmation

---------

Co-authored-by: k9ert <k9ert@gmx.de>
This commit is contained in:
Manolis Mandrapilias 2023-09-16 10:32:42 +02:00 • committed by GitHub
parent 23ad11975b
commit 1f40a3b060
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/cryptoadvance/specter/devices/hwi/jade.py
View file

@ -556,10 +556,11 @@ class JadeClient(HardwareWalletClient):
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(
@ -572,7 +573,7 @@ class JadeClient(HardwareWalletClient):
self._network(),
multisig_name,
script_variant,
True, # always use sorted
multisig.is_sorted,
multisig.thresh,
signers,
)

6
src/cryptoadvance/specter/templates/includes/hwi/components/wallet.jinja
View file

@ -1,13 +1,13 @@
{% if wallet is defined %}
<div id="hwi_display_address" class="flex-center flex-column hidden" data-style="overflow-wrap: break-word;">
<div id="hwi_display_address" class="flex-center flex-column hidden p-4 bg-dark-800" data-style="overflow-wrap: break-word;">
<h2>{{ _("Confirm Address") }}</h2><br>
<div>
{{ _("Please confirm address matches on your ")}}<span id="hwi_device_name">{{ _('device')}}</span><br><br>
{{ _("Expected address") }}:<br><span id="expected_address"></span>
</div>
<div class="flex-center">
<img src="{{ url_for('static', filename='img/loader_boxes.svg') }}"/>
<div class="flex justify-center mt-4 ">
<img src="{{ url_for('static', filename='img/loader_boxes.svg') }}" class="w-16 h-16"/>
</div>
</div>