EDGE do not re-sign PSBT

Author: scgbckbone

hwilib/devices/ckcc/client.py

@@ -333,6 +333,18 @@ def hash_password(self, text_password, v3=False):
 
         return pbkdf2_hmac('sha256' if v3 else 'sha512', text_password, salt, PBKDF2_ITER_COUNT)[:32]
 
+    def firmware_version(self):
+        return self.send_recv(CCProtocolPacker.version()).split("\n")
+
+    def is_edge(self):
+        # returns True if device is running EDGE firmware version
+        if self.is_simulator:
+            cmd = "import version; RV.write(str(int(getattr(version, 'is_edge', 0))))"
+            rv = self.send_recv(b'EXEC' + cmd.encode('utf-8'), timeout=60000, encrypt=False)
+            return rv == b"1"
+
+        return self.firmware_version()[1][-1] == "X"
+
 
 class UnixSimulatorPipe:
     # Use a UNIX pipe to the simulator instead of a real USB connection.

hwilib/devices/coldcard.py

@@ -100,6 +100,23 @@ def __init__(self, path: str, password: Optional[str] = None, expert: bool = Fal
             device.open_path(path.encode())
             self.device = ColdcardDevice(dev=device)
 
+        self._is_edge = None
+
+    @property
+    def is_edge(self):
+        """
+        Cached property, no need to ask device more than once
+        :return: bool
+        """
+        if self._is_edge is None:
+            try:
+                self._is_edge = self.device.is_edge()
+            except:
+                # silent fail, normal firmware is implied
+                pass
+
+        return self._is_edge
+
     @coldcard_exception
     def get_pubkey_at_path(self, path: str) -> ExtendedKey:
         self.device.check_mitm()
@@ -132,14 +149,15 @@ def sign_tx(self, tx: PSBT) -> PSBT:
 
         # For multisigs, we may need to do multiple passes if we appear in an input multiple times
         passes = 1
-        for psbt_in in tx.inputs:
-            our_keys = 0
-            for key in psbt_in.hd_keypaths.keys():
-                keypath = psbt_in.hd_keypaths[key]
-                if keypath.fingerprint == master_fp and key not in psbt_in.partial_sigs:
-                    our_keys += 1
-            if our_keys > passes:
-                passes = our_keys
+        if not self.is_edge:
+            for psbt_in in tx.inputs:
+                our_keys = 0
+                for key in psbt_in.hd_keypaths.keys():
+                    keypath = psbt_in.hd_keypaths[key]
+                    if keypath.fingerprint == master_fp and key not in psbt_in.partial_sigs:
+                        our_keys += 1
+                if our_keys > passes:
+                    passes = our_keys
 
         for _ in range(passes):
             # Get psbt in hex and then make binary
@@ -392,11 +410,10 @@ def toggle_passphrase(self) -> bool:
 
     def can_sign_taproot(self) -> bool:
         """
-        The Coldard does not support Taproot yet.
-
-        :returns: False, always
+        Only COLDCARD EDGE support taproot.
+        :returns: Whether Taproot is supported
         """
-        return False
+        return self.is_edge
 
 
 def enumerate(password: Optional[str] = None, expert: bool = False, chain: Chain = Chain.MAIN, allow_emulators: bool = True) -> List[Dict[str, Any]]:
@@ -422,6 +439,9 @@ def enumerate(password: Optional[str] = None, expert: bool = False, chain: Chain
         with handle_errors(common_err_msgs["enumerate"], d_data):
             try:
                 client = ColdcardClient(path)
+                if client.is_edge:
+                    d_data['label'] = 'edge'
+                    d_data['model'] = 'edge_' + d_data['model']
                 d_data['fingerprint'] = client.get_master_fingerprint().hex()
             except RuntimeError as e:
                 # Skip the simulator if it's not there