Bugfixes: Various bugfixes (#1959)

* missing __init__.py

* Add Device modules to hidden imports

* make cli-arguments work in electron

* Bugfix devices not shown

* additional checks for wallet_import

* Update src/cryptoadvance/specter/util/wallet_importer.py

Co-authored-by: Manolis Mandrapilias <[email protected]>

* Update src/cryptoadvance/specter/util/wallet_importer.py

Co-authored-by: Manolis Mandrapilias <[email protected]>

* Update src/cryptoadvance/specter/util/wallet_importer.py

Co-authored-by: Manolis Mandrapilias <[email protected]>

Co-authored-by: k9ert <[email protected]>
Co-authored-by: Manolis Mandrapilias <[email protected]>

Author: 3 people

.gitlab-ci.yml

@@ -157,6 +157,8 @@ release_electron_linux_windows:
   stage: releasing
   only: 
     - tags
+  dependencies:
+    - release_binary_windows
   before_script:
     - python3 -V  # Print out python version for debugging
     - apt update

pyinstaller/electron/main.js

@@ -348,10 +348,8 @@ function startSpecterd(specterdPath) {
     if (specterdArgs == null) {
       specterdArgs = []
     }
-    let specterdExtraArgs = appSettings.specterdCLIArgs.split('--')
-    specterdExtraArgs = specterdExtraArgs.filter(Boolean)
-    specterdExtraArgs.forEach((arg, index) => specterdExtraArgs[index] = '--' + arg.trim())
-    
+    let specterdExtraArgs = appSettings.specterdCLIArgs.split(' ')
+    specterdExtraArgs.forEach((arg, index) => specterdExtraArgs[index] = arg.trim())
     specterdArgs = specterdArgs.concat(specterdExtraArgs)
   }
 

src/cryptoadvance/specter/commands/psbt_creator.py

@@ -7,7 +7,7 @@
 from cryptoadvance.specter.specter_error import SpecterError
 from cryptoadvance.specter.util.common import str2bool
 
-from ..helpers import is_testnet, normalize_address
+from ..helpers import normalize_address
 from ..util.descriptor import AddChecksum, Descriptor
 
 logger = logging.getLogger(__name__)

src/cryptoadvance/specter/internal_node.py

@@ -4,7 +4,6 @@
 from pathlib import Path
 
 
-from .helpers import is_testnet
 from .specter_error import SpecterError, ExtProcTimeoutException
 from .rpc import (
     get_default_datadir,

src/cryptoadvance/specter/managers/service_manager/service_manager.py

@@ -429,16 +429,37 @@ def get_service_x_dirs(cls, x):
 
     @classmethod
     def get_service_packages(cls):
-        """returns a list of strings containing the service-classes (+ controller/config-classes)
+        """returns a list of strings containing the service-classes (+ controller +config-classes +devices)
         This is used for hiddenimports in pyinstaller
         """
         arr = get_subclasses_for_clazz(Service)
+        logger.info(f"initial arr: {arr}")
         arr.extend(
             get_classlist_of_type_clazz_from_modulelist(
                 Service, ProductionConfig.EXTENSION_LIST
             )
         )
+        logger.info(f"After extending: {arr}")
+        # Before we transform the arr into an array of strings, we iterate through all services to discover
+        # the devices which might be specified in there
+        devices_arr = []
+        for clazz in arr:
+            if hasattr(clazz, "devices"):
+                logger.debug("class {clazz} has devices: {clazz.devices}")
+                for device in clazz.devices:
+                    try:
+                        import_module(device)
+                        devices_arr.append(device)
+                    except ModuleNotFoundError as e:
+                        pass
+
+        # Transform into array of strings
         arr = [clazz.__module__ for clazz in arr]
+
+        # Add the devices
+        arr.extend(devices_arr)
+        logger.debug(f"After transforming + devices: {arr}")
+
         # Controller-Packagages from the services are not imported via the service but via the baseclass
         # Therefore hiddenimport don't find them. We have to do it here.
         cont_arr = [

src/cryptoadvance/specter/node.py

@@ -110,6 +110,10 @@ def bitcoin_core_version_raw(self):
     def network_parameters(self):
         return get_network(self.chain)
 
+    @property
+    def is_testnet(self):
+        return is_testnet(self.chain)
+
     @property
     def is_running(self):
         if self.network_info["version"] == 999999:
@@ -582,10 +586,6 @@ def taproot_support(self):
     def chain(self):
         return self.info["chain"]
 
-    @property
-    def is_testnet(self):
-        return is_testnet(self.chain)
-
     @property
     def asset_labels(self):
         if not self.is_liquid:

src/cryptoadvance/specter/specter.py

@@ -25,7 +25,7 @@
     ServiceUnencryptedStorageManager,
 )
 
-from .helpers import clean_psbt, deep_update, is_liquid, is_testnet, get_asset_label
+from .helpers import clean_psbt, deep_update, is_liquid, get_asset_label
 from .internal_node import InternalNode
 from .liquid.rpc import LiquidRPC
 from .managers.config_manager import ConfigManager

src/cryptoadvance/specter/util/wallet_importer.py

@@ -8,6 +8,8 @@
 from embit.liquid.descriptor import LDescriptor
 from flask_babel import lazy_gettext as _
 
+from cryptoadvance.specter.device import Device
+
 from ..key import Key
 from ..managers.wallet_manager import WalletManager
 from ..server_endpoints import flash
@@ -58,8 +60,36 @@ def __init__(self, wallet_json, specter, device_manager=None):
             self.unknown_cosigners,
             self.unknown_cosigners_types,
         ) = self.parse_signers(device_manager.devices, self.cosigners_types)
+        try:
+            self.check_chain(specter.node)
+        except Exception as e:
+            logger.exception(e)
+            raise SpecterError(f"Invalid chain: {e}")
         self.wallet_type = "multisig" if self.descriptor.is_basic_multisig else "simple"
 
+    def check_chain(self, node):
+
+        cosigner: Device
+        for cosigner in self.cosigners:
+
+            key_chain_list = [key.is_testnet for key in cosigner.keys]
+            logger.debug(key_chain_list)
+            if node.is_testnet not in key_chain_list:
+                raise SpecterError(
+                    f"The device {cosigner} does not have any key for the chain {node.chain}!"
+                )
+        for key, label in self.unknown_cosigners:
+            if key.is_testnet != node.is_testnet:
+                raise SpecterError(
+                    f"The device {label} has at least one key for the chain {key.metadata['chain'] } whereas your node is on the chain: {node.chain}!"
+                )
+        key: Key
+        for key in self.keys:
+            if key.is_testnet != node.is_testnet:
+                raise SpecterError(
+                    f"The key {key} belongs to the chain {key.metadata['chain'] } but your node is on the chain {node.chain}!"
+                )
+
     def check_descriptor(self):
         # Sparrow fix: if all keys have None as allowed derivation - set allowed derivation to [0, None]
         if all(
@@ -86,6 +116,15 @@ def check_descriptor(self):
                 )
 
     def parse_signers(self, devices, cosigners_types):
+        """returns:
+            * keys:
+                * keys which are already existing in the device_manager
+                * keys:[<cryptoadvance.specter.key.Key object at 0x7fda8451e0e0>]
+            # cosigners:
+                * [<cryptoadvance.specter.devices.generic.GenericDevice object at 0x7fda8451fcd0>]
+        # unknown_cosigners:[(<cryptoadvance.specter.key.Key object at 0x7fda8451e830>, 'Signer - K'), (<cryptoadvance.specter.key.Key object at 0x7fda94235570>, 'Signer - Tired no WP')]
+
+        """
         keys = []
         cosigners = []
         unknown_cosigners = []
@@ -119,7 +158,11 @@ def parse_signers(self, devices, cosigners_types):
                     unknown_cosigners_types.append("other")
                 else:
                     unknown_cosigners_types.append(cosigners_types[i]["type"])
-
+        logger.debug("parse_signers returning:")
+        logger.debug(f"keys:{keys}")
+        logger.debug(f"cosigners:{cosigners}")
+        logger.debug(f"unknown_cosigners:{unknown_cosigners}")
+        logger.debug(f"unknown_cosigners_types:{unknown_cosigners_types}")
         return (keys, cosigners, unknown_cosigners, unknown_cosigners_types)
 
     def create_nonexisting_signers(self, device_manager, request_form):

src/cryptoadvance/specterext/electrum/devices/__init__.py

@@ -56,9 +56,12 @@ def test_ServiceManager_get_service_x_dirs(caplog):
         os.chdir("../")
 
 
-def test_ServiceManager_get_service_packages():
+def test_ServiceManager_get_service_packages(caplog):
+    caplog.set_level(logging.DEBUG)
     packages = ServiceManager.get_service_packages()
     assert "cryptoadvance.specterext.swan.service" in packages
+    assert "cryptoadvance.specterext.electrum.service" in packages
+    assert "cryptoadvance.specterext.electrum.devices.electrum" in packages
 
 
 @pytest.fixture