new wizard Qt desktop client

electrum/gui/qml/plugins.py → electrum/gui/common_qt/plugins.py

@@ -1,8 +1,8 @@
-from PyQt5.QtCore import pyqtSignal, pyqtSlot, pyqtProperty, QObject
+from PyQt5.QtCore import pyqtSignal, pyqtProperty, QObject
 
-from electrum.i18n import _
 from electrum.logging import get_logger
 
+
 class PluginQObject(QObject):
     logger = get_logger(__name__)
 
@@ -24,6 +24,8 @@ def name(self): return self._name
     @pyqtProperty(bool, notify=busyChanged)
     def busy(self): return self._busy
 
+    # below only used for QML, not compatible yet with Qt
+
     @pyqtProperty(bool, notify=pluginEnabledChanged)
     def pluginEnabled(self): return self.plugin.is_enabled()
 

electrum/gui/qml/components/WalletMainView.qml

@@ -317,10 +317,6 @@ Item {
         function onOtpRequested() {
             console.log('OTP requested')
             var dialog = otpDialog.createObject(mainView)
-            dialog.accepted.connect(function() {
-                console.log('accepted ' + dialog.otpauth)
-                Daemon.currentWallet.finish_otp(dialog.otpauth)
-            })
             dialog.open()
         }
         function onBroadcastFailed(txid, code, message) {

electrum/gui/qml/components/wizard/WCCosignerKeystore.qml

@@ -19,7 +19,9 @@ WizardComponent {
     function apply() {
         wizard_data['cosigner_keystore_type'] = keystoregroup.checkedButton.keystoretype
         wizard_data['multisig_current_cosigner'] = cosigner
-        wizard_data['multisig_cosigner_data'][cosigner.toString()] = {}
+        wizard_data['multisig_cosigner_data'][cosigner.toString()] = {
+            'keystore_type': keystoregroup.checkedButton.keystoretype
+        }
     }
 
     ButtonGroup {
@@ -80,13 +82,13 @@ WizardComponent {
         }
         ElRadioButton {
             ButtonGroup.group: keystoregroup
-            property string keystoretype: 'key'
+            property string keystoretype: 'masterkey'
             checked: true
             text: qsTr('Cosigner key')
         }
         ElRadioButton {
             ButtonGroup.group: keystoregroup
-            property string keystoretype: 'seed'
+            property string keystoretype: 'haveseed'
             text: qsTr('Cosigner seed')
         }
     }

electrum/gui/qml/components/wizard/WCCreateSeed.qml

@@ -9,7 +9,7 @@ import "../controls"
 WizardComponent {
     securePage: true
 
-    valid: seedtext.text != ''
+    valid: seedtext.text != '' && extendcb.checked ? customwordstext.text != '' : true
 
     function apply() {
         wizard_data['seed'] = seedtext.text

electrum/gui/qml/components/wizard/WCHaveSeed.qml

@@ -68,6 +68,9 @@ WizardComponent {
         valid = false
         validationtext.text = ''
 
+        if (extendcb.checked && customwordstext.text == '')
+            return
+
         var validSeed = bitcoin.verifySeed(seedtext.text, seed_variant_cb.currentValue, wizard_data['wallet_type'])
         if (!cosigner || !validSeed) {
             valid = validSeed

electrum/gui/qml/qeapp.py

@@ -5,10 +5,9 @@
 import sys
 import html
 import threading
-import asyncio
 from typing import TYPE_CHECKING, Set
 
-from PyQt5.QtCore import (pyqtSlot, pyqtSignal, pyqtProperty, QObject, QUrl, QLocale,
+from PyQt5.QtCore import (pyqtSlot, pyqtSignal, pyqtProperty, QObject,
                           qInstallMessageHandler, QTimer, QSortFilterProxyModel)
 from PyQt5.QtGui import QGuiApplication, QFontDatabase
 from PyQt5.QtQml import qmlRegisterType, qmlRegisterUncreatableType, QQmlApplicationEngine
@@ -61,6 +60,7 @@
 
 notification = None
 
+
 class QEAppController(BaseCrashReporter, QObject):
     _dummy = pyqtSignal()
     userNotify = pyqtSignal(str, str)
@@ -319,6 +319,7 @@ def secureWindow(self, secure):
             self._secureWindow = secure
             self.secureWindowChanged.emit()
 
+
 class ElectrumQmlApplication(QGuiApplication):
 
     _valid = True
@@ -376,7 +377,7 @@ def __init__(self, args, *, config: 'SimpleConfig', daemon: 'Daemon', plugins: '
         self.plugins = plugins
         self._qeconfig = QEConfig(config)
         self._qenetwork = QENetwork(daemon.network, self._qeconfig)
-        self.daemon = QEDaemon(daemon)
+        self.daemon = QEDaemon(daemon, self.plugins)
         self.appController = QEAppController(self, self.daemon, self.plugins)
         self._maxAmount = QEAmount(is_max=True)
         self.context.setContextProperty('AppController', self.appController)
@@ -413,6 +414,7 @@ def message_handler(self, line, funct, file):
             return
         self.logger.warning(file)
 
+
 class Exception_Hook(QObject, Logger):
     _report_exception = pyqtSignal(object, object, object, object)
 

electrum/gui/qml/qedaemon.py

@@ -1,23 +1,27 @@
 import os
 import threading
+from typing import TYPE_CHECKING
 
 from PyQt5.QtCore import Qt, QAbstractListModel, QModelIndex
 from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject
 
 from electrum.i18n import _
 from electrum.logging import get_logger
 from electrum.util import WalletFileException, standardize_path
-from electrum.wallet import Abstract_Wallet
 from electrum.plugin import run_hook
 from electrum.lnchannel import ChannelState
-from electrum.daemon import Daemon
 
 from .auth import AuthMixin, auth_protect
 from .qefx import QEFX
 from .qewallet import QEWallet
 from .qewalletdb import QEWalletDB
 from .qewizard import QENewWalletWizard, QEServerConnectWizard
 
+if TYPE_CHECKING:
+    from electrum.daemon import Daemon
+    from electrum.plugin import Plugins
+
+
 # wallet list model. supports both wallet basenames (wallet file basenames)
 # and whole Wallet instances (loaded wallets)
 class QEWalletListModel(QAbstractListModel):
@@ -108,6 +112,7 @@ def updateWallet(self, path):
                 return
             i += 1
 
+
 class QEDaemon(AuthMixin, QObject):
     _logger = get_logger(__name__)
 
@@ -135,9 +140,10 @@ class QEDaemon(AuthMixin, QObject):
     walletOpenError = pyqtSignal([str], arguments=["error"])
     walletDeleteError = pyqtSignal([str,str], arguments=['code', 'message'])
 
-    def __init__(self, daemon: 'Daemon', parent=None):
+    def __init__(self, daemon: 'Daemon', plugins: 'Plugins', parent=None):
         super().__init__(parent)
         self.daemon = daemon
+        self.plugins = plugins
         self.qefx = QEFX(daemon.fx, daemon.config)
 
         self._backendWalletLoaded.connect(self._on_backend_wallet_loaded)
@@ -334,7 +340,7 @@ def setPassword(self, password):
     @pyqtProperty(QENewWalletWizard, notify=newWalletWizardChanged)
     def newWalletWizard(self):
         if not self._new_wallet_wizard:
-            self._new_wallet_wizard = QENewWalletWizard(self)
+            self._new_wallet_wizard = QENewWalletWizard(self, self.plugins)
 
         return self._new_wallet_wizard
 

electrum/gui/qml/qewalletdb.py

@@ -3,6 +3,7 @@
 
 from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject
 
+from electrum.i18n import _
 from electrum.logging import get_logger
 from electrum.storage import WalletStorage, StorageEncryptionVersion
 from electrum.wallet_db import WalletDB
@@ -189,7 +190,7 @@ def _load_db(self):
             return
         if self._db.get_action():
             self._logger.warning('action pending. QML version doesn\'t support continuation of wizard')
-            return
+            raise WalletFileException(_('This wallet has an action pending. This is currently not supported on mobile'))
 
         if self._db.requires_upgrade():
             self._logger.warning('wallet requires upgrade, upgrading')

electrum/gui/qml/qewizard.py

@@ -1,12 +1,16 @@
 import os
+from typing import TYPE_CHECKING
 
 from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject
-from PyQt5.QtQml import QQmlApplicationEngine
 
 from electrum.logging import get_logger
 from electrum import mnemonic
 from electrum.wizard import NewWalletWizard, ServerConnectWizard
 
+if TYPE_CHECKING:
+    from electrum.gui.qml.qedaemon import QEDaemon
+    from electrum.plugin import Plugins
+
 
 class QEAbstractWizard(QObject):
     _logger = get_logger(__name__)
@@ -26,7 +30,6 @@ def viewToComponent(self, view):
     @pyqtSlot('QJSValue', result='QVariant')
     def submit(self, wizard_data):
         wdata = wizard_data.toVariant()
-        self.log_state(wdata)
         view = self.resolve_next(self._current.view, wdata)
         return { 'view': view.view, 'wizard_data': view.wizard_data }
 
@@ -46,10 +49,10 @@ class QENewWalletWizard(NewWalletWizard, QEAbstractWizard):
     createError = pyqtSignal([str], arguments=["error"])
     createSuccess = pyqtSignal()
 
-    def __init__(self, daemon, parent = None):
-        NewWalletWizard.__init__(self, daemon)
+    def __init__(self, daemon: 'QEDaemon', plugins: 'Plugins', parent = None):
+        NewWalletWizard.__init__(self, daemon.daemon, plugins)
         QEAbstractWizard.__init__(self, parent)
-        self._daemon = daemon
+        self._qedaemon = daemon
 
         # attach view names and accept handlers
         self.navmap_merge({
@@ -59,13 +62,13 @@ def __init__(self, daemon, parent = None):
             'create_seed': { 'gui': 'WCCreateSeed' },
             'confirm_seed': { 'gui': 'WCConfirmSeed' },
             'have_seed': { 'gui': 'WCHaveSeed' },
-            'bip39_refine': { 'gui': 'WCBIP39Refine' },
+            'script_and_derivation': { 'gui': 'WCScriptAndDerivation' },
             'have_master_key': { 'gui': 'WCHaveMasterKey' },
             'multisig': { 'gui': 'WCMultisig' },
             'multisig_cosigner_keystore': { 'gui': 'WCCosignerKeystore' },
             'multisig_cosigner_key': { 'gui': 'WCHaveMasterKey' },
             'multisig_cosigner_seed': { 'gui': 'WCHaveSeed' },
-            'multisig_cosigner_bip39_refine': { 'gui': 'WCBIP39Refine' },
+            'multisig_cosigner_script_and_derivation': { 'gui': 'WCBIP39Refine' },
             'imported': { 'gui': 'WCImport' },
             'wallet_password': { 'gui': 'WCWalletPassword' }
         })
@@ -81,7 +84,7 @@ def path(self, path):
         self.pathChanged.emit()
 
     def is_single_password(self):
-        return self._daemon.singlePasswordEnabled
+        return self._qedaemon.singlePasswordEnabled
 
     @pyqtSlot('QJSValue', result=bool)
     def hasDuplicateMasterKeys(self, js_data):
@@ -108,7 +111,7 @@ def createStorage(self, js_data, single_password_enabled, single_password):
             data['encrypt'] = True
             data['password'] = single_password
 
-        path = os.path.join(os.path.dirname(self._daemon.daemon.config.get_wallet_path()), data['wallet_name'])
+        path = os.path.join(os.path.dirname(self._qedaemon.daemon.config.get_wallet_path()), data['wallet_name'])
 
         try:
             self.create_storage(path, data)
@@ -125,10 +128,9 @@ def createStorage(self, js_data, single_password_enabled, single_password):
 
 class QEServerConnectWizard(ServerConnectWizard, QEAbstractWizard):
 
-    def __init__(self, daemon, parent = None):
-        ServerConnectWizard.__init__(self, daemon)
+    def __init__(self, daemon: 'QEDaemon', parent=None):
+        ServerConnectWizard.__init__(self, daemon.daemon)
         QEAbstractWizard.__init__(self, parent)
-        self._daemon = daemon
 
         # attach view names
         self.navmap_merge({