Merge branch 'edge' of github.com:Coldcard/firmware into edge

external/libngu

@@ -1 +1 @@
-Subproject commit 7bdb03864630ff68b143e3e5b4521ca3ef6588cc
+Subproject commit d8b4e2added17082c0b6cc091a400204c2098c8b

stm32/repro-build.sh

@@ -28,7 +28,6 @@ if ! touch repro-build.sh ; then
     git clone /work/src/.git firmware
     cd firmware/external
     git submodule update --init
-    cd ../stm32
     rsync --ignore-missing-args -av /work/src/releases/20*.dfu ../releases
 fi
 

stm32/shared.mk

@@ -214,7 +214,6 @@ size:
 # one time setup, after repo checkout
 setup:
 	cd $(MPY_TOP) ; git submodule update --init lib/stm32lib
-	cd ../external/libngu/libs/bech32; git apply ../../bech32.patch
 	cd ../external/libngu; make min-one-time
 	cd $(MPY_TOP)/mpy-cross ; make
 	-ln -s $(PORT_TOP) l-port

testing/test_multisig.py

@@ -173,7 +173,7 @@ def import_ms_wallet(dev, make_multisig, offer_ms_import, need_keypress):
                 assert len(derivs) == N
                 key_list = [(xfp, derivs[idx], dd.hwif(as_private=False)) for idx, (xfp, m, dd) in enumerate(keys)]
 
-            if "p2tr" and internal_key is None:
+            if addr_fmt == "p2tr" and internal_key is None:
                 internal_key = "50929b74c1a04954b78b4b6035e97a5e078a5a0f28ec96d547bfee9ace803ac0"
                 addr_fmt = AF_P2TR
             desc = MultisigDescriptor(M=M, N=N, keys=key_list, addr_fmt=addr_fmt, internal_key=internal_key)