move firmware version utility functions to ColdcardDevice class

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")[1]
+
+    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] == "X"
+
 
 class UnixSimulatorPipe:
     # Use a UNIX pipe to the simulator instead of a real USB connection.

hwilib/devices/coldcard.py

@@ -110,7 +110,7 @@ def is_edge(self):
         """
         if self._is_edge is None:
             try:
-                self._is_edge = self.is_edge_firmware()
+                self._is_edge = self.device.is_edge()
             except:
                 # silent fail, normal firmware is implied
                 pass
@@ -408,21 +408,6 @@ def toggle_passphrase(self) -> bool:
         """
         raise UnavailableActionError('The Coldcard does not support toggling passphrase from the host')
 
-    def firmware_version(self) -> str:
-        return self.device.send_recv(CCProtocolPacker.version()).split("\n")[1]
-
-    def is_edge_firmware(self):
-        """
-        :return: True if this device is running EDGE firmware, False otherwise
-        """
-        if self.device.is_simulator:
-            cmd = "import version; RV.write(str(int(getattr(version, 'is_edge', 0))))"
-            rv = self.device.send_recv(b'EXEC' + cmd.encode('utf-8'), timeout=60000, encrypt=False)
-            return rv == b"1"
-        else:
-            _, ver, _, _, _ = self.device.send_recv(CCProtocolPacker.version()).split("\n")
-            return "X" == self.firmware_version()[-1]
-
     def can_sign_taproot(self) -> bool:
         """
         Only COLDCARD EDGE support taproot.