coldcard/firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Coldcard/firmware

Browse Source
This commit is contained in:
Peter D. Gray 2024-09-09 15:36:50 -04:00
commit 8de49876b4
No known key found for this signature in database
GPG Key ID: A2DCD558C2BE5D7C
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
shared/multisig.py
View File

@ -1605,8 +1605,6 @@ async def validate_xpub_for_ms(obj, af_str, deriv, chain, my_xfp, xpubs):
ln = obj.get(af_str)
if not deriv:
deriv = n_deriv
else:
assert deriv == n_deriv, "wrong derivation: %s != %s" % (deriv, n_deriv)
return MultisigWallet.check_xpub(xfp, ln, deriv, chain.ctype, my_xfp, xpubs), deriv
@ -1734,10 +1732,11 @@ async def ondevice_multisig_create(mode='p2wsh', addr_fmt=AF_P2WSH, is_qr=False)
await ux_show_story(msg)
return
# add myself if not included already
# add myself if not included already ?
if not num_mine:
if await ux_show_story("Add current Coldcard with above XFP ?",
title="[%s]" % xfp2str(my_xfp)):
ch = await ux_show_story("Add current Coldcard with above XFP ?",
title="[%s]" % xfp2str(my_xfp))
if ch == "y":
dis.fullscreen("Wait...")
with stash.SensitiveValues() as sv:
node = sv.derive_path(deriv)
@ -1745,12 +1744,11 @@ async def ondevice_multisig_create(mode='p2wsh', addr_fmt=AF_P2WSH, is_qr=False)
N = len(xpubs)
if N > MAX_SIGNERS:
await ux_show_story("Too many signers, max is %d." % MAX_SIGNERS)
if (N > MAX_SIGNERS) or (N < 2):
await ux_show_story("Invalid number of signers,min is 2 max is %d." % MAX_SIGNERS)
return
# pick useful M value to start
assert N >= 2
M = await ux_enter_number("How many need to sign?(M)", N, can_cancel=True)
if not M:
await ux_dramatic_pause('Aborted.', 2)