From dee80eef3ab1f372a857918966e2153667c21043 Mon Sep 17 00:00:00 2001 From: scgbckbone Date: Mon, 9 Sep 2024 18:21:28 +0200 Subject: [PATCH] remove same account constraint --- shared/multisig.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shared/multisig.py b/shared/multisig.py index 76368529..b5b7ce51 100644 --- a/shared/multisig.py +++ b/shared/multisig.py @@ -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 @@ -1756,6 +1754,9 @@ async def ondevice_multisig_create(mode='p2wsh', addr_fmt=AF_P2WSH, is_qr=False) await ux_dramatic_pause('Aborted.', 2) return # user cancel + # create appropriate object + assert 1 <= M <= N <= MAX_SIGNERS + name = 'CC-%d-of-%d' % (M, N) ms = MultisigWallet(name, (M, N), xpubs, chain_type=chain.ctype, addr_fmt=addr_fmt)