comments

releases/Next-ChangeLog.md

@@ -31,6 +31,7 @@ Spending policies for "Single Signers" adds new spending policy options:
 - Bugfix: Fix filesystem initialization after Wife LFS or Destroy Seed.
 - Bugfix: Fix MicroSD selftest code.
 - Bugfix: NFC loop exporting secrets would not work after first value exported.
+- Bugfix: Multisig address format handling.
 - Bugfix: Ownership check failing to find addresses near max (~760), needed to be re-run to succeed
 
 # Mk4 Specific Changes

shared/chains.py

@@ -463,19 +463,22 @@ def parse_addr_fmt_str(addr_fmt):
 
 
 def af_to_bip44_purpose(addr_fmt):
-    # single signature only
+    # Address format to BIP-44 "purpose" number
+    # - single signature only
     return {AF_CLASSIC: 44,
             AF_P2WPKH_P2SH: 49,
             AF_P2WPKH: 84}[addr_fmt]
 
 
 def addr_fmt_label(addr_fmt):
+    # Text used in menus
     return {AF_CLASSIC: "Classic P2PKH",
             AF_P2WPKH_P2SH: "P2SH-Segwit",
             AF_P2WPKH: "Segwit P2WPKH"}[addr_fmt]
 
 
 def addr_fmt_str(addr_fmt):
+    # Short string codes used for address format (industry standard)
     return {AF_CLASSIC: "p2pkh",
             AF_P2SH: "p2sh",
             AF_P2WPKH: "p2wpkh",

shared/usb.py

@@ -233,7 +233,7 @@ class USBHandler:
                 except CCBusyError:
                     # auth UX is doing something else
                     resp = b'busy'
-                except SpendPolicyViolation as e:
+                except SpendPolicyViolation:
                     resp = b'err_Spending policy in effect'
                 except HSMDenied:
                     resp = b'err_Not allowed in HSM mode'
@@ -256,10 +256,9 @@ class USBHandler:
                     raise exc
                 except Exception as exc:
                     # catch bugs and fuzzing too
-                    # sys.print_exception(exc)
                     if is_simulator() or is_devmode:
                         print("USB request caused this: ", end='')
-                        # sys.print_exception(exc)
+                        sys.print_exception(exc)
                     resp = b'err_Confused ' + problem_file_line(exc)
 
                 if not success: