coldcard: update multisig patch

Manually re-applied the patch after the original code seems to have
moved around a bit.

Author: Sjors

test/data/coldcard-multisig.patch

@@ -27,21 +27,21 @@ index 2706fb4..f9b533d 100644
 -- 
 2.38.1
 
+From 8b4323c1e393d79d46248dd822ca9aaaeb2b2bc3 Mon Sep 17 00:00:00 2001
+From: Sjors Provoost <[email protected]>
+Date: Wed, 23 Jul 2025 10:16:22 +0200
+Subject: [PATCH] Allow multisigs to share master fingerprint
 
-From 04aecb1005d997783e63bd6cd830c4a98f099cb8 Mon Sep 17 00:00:00 2001
-From: Andrew Chow <[email protected]>
-Date: Wed, 27 Jan 2021 21:50:22 -0500
-Subject: [PATCH 3/3] Allow multisigs to share master fingerprint
-
+Co-Authored-By: Ava Chow <[email protected]>
 ---
- shared/multisig.py | 40 +++++++++++++++++++++++++---------------
- 1 file changed, 25 insertions(+), 15 deletions(-)
+ shared/multisig.py | 37 ++++++++++++++++++++++++-------------
+ 1 file changed, 24 insertions(+), 13 deletions(-)
 
 diff --git a/shared/multisig.py b/shared/multisig.py
-index 6f26644..6e190b5 100644
+index 446998a2..cabb2003 100644
 --- a/shared/multisig.py
 +++ b/shared/multisig.py
-@@ -144,9 +144,9 @@ class MultisigWallet:
+@@ -144,9 +144,9 @@ class MultisigWallet(WalletABC):
          # calc useful cache value: numeric xfp+subpath, with lookup
          self.xfp_paths = {}
          for xfp, deriv, xpub in self.xpubs:
@@ -53,7 +53,7 @@ index 6f26644..6e190b5 100644
 
      @classmethod
      def render_addr_fmt(cls, addr_fmt):
-@@ -245,7 +245,11 @@ class MultisigWallet:
+@@ -270,7 +270,11 @@ class MultisigWallet(WalletABC):
 
      def get_xfp_paths(self):
          # return list of lists [xfp, *deriv]
@@ -66,7 +66,7 @@ index 6f26644..6e190b5 100644
 
      @classmethod
      def find_match(cls, M, N, xfp_paths, addr_fmt=None):
-@@ -280,24 +284,30 @@ class MultisigWallet:
+@@ -305,24 +309,31 @@ class MultisigWallet(WalletABC):
          # the same prefix path per-each xfp, as indicated 
          # xfp_paths (unordered)?
          # - could also check non-prefix part is all non-hardened
@@ -79,22 +79,16 @@ index 6f26644..6e190b5 100644
              if x[0] not in self.xfp_paths:
                  return False
 -            prefix = self.xfp_paths[x[0]]
--
--            if len(x) < len(prefix):
--                # PSBT specs a path shorter than wallet's xpub
--                #print('path len: %d vs %d' % (len(prefix), len(x)))
--                return False
--
--            comm = len(prefix)
--            if tuple(prefix[:comm]) != tuple(x[:comm]):
--                # xfp => maps to wrong path
--                #print('path mismatch:\n%r\n%r\ncomm=%d' % (prefix[:comm], x[:comm], comm))
 +            for prefix in self.xfp_paths[x[0]]:
 +                if len(x) < len(prefix):
 +                    # PSBT specs a path shorter than wallet's xpub
 +                    #print('path len: %d vs %d' % (len(prefix), len(x)))
 +                    return False
-+
+ 
+-            if len(x) < len(prefix):
+-                # PSBT specs a path shorter than wallet's xpub
+-                #print('path len: %d vs %d' % (len(prefix), len(x)))
+-                return False
 +                comm = len(prefix)
 +                if tuple(prefix[:comm]) != tuple(x[:comm]):
 +                    # xfp => maps to wrong path
@@ -106,9 +100,14 @@ index 6f26644..6e190b5 100644
 +                    break
 +            else:
 +                # No match was found
+ 
+-            comm = len(prefix)
+-            if tuple(prefix[:comm]) != tuple(x[:comm]):
+-                # xfp => maps to wrong path
+-                #print('path mismatch:\n%r\n%r\ncomm=%d' % (prefix[:comm], x[:comm], comm))
                  return False
 
          return True
 -- 
-2.38.1
+2.39.5 (Apple Git-154)