Merge branch 'master' into moritzwietersheim-patch-1

src/cryptoadvance/specter/devices/trezor.py

@@ -6,9 +6,9 @@ class Trezor(HWIDevice):
     device_type = "trezor"
     name = "Trezor"
     icon = "img/devices/trezor_icon.svg"
-
     supports_hwi_toggle_passphrase = True
     supports_hwi_multisig_display_address = True
+    taproot_support = True
 
     @classmethod
     def get_client(cls, *args, **kwargs):

src/cryptoadvance/specter/node.py

@@ -725,11 +725,7 @@ class Node(AbstractNode):
     @property
     def taproot_support(self):
         try:
-            # currently only master branch supports tr() descriptors
-            # TODO: replace to 220000
-            return (self.bitcoin_core_version_raw >= 219900) and (
-                self.info.get("softforks", {}).get("taproot", {}).get("active", False)
-            )
+            return self.bitcoin_core_version_raw >= 220000
         except Exception as e:
             logger.exception(e)
             return False