Merge branch 'spesmilo:master' into master

Author: bnetsera92-stack

electrum/chains/mainnet/servers.json

@@ -249,11 +249,11 @@
         "t": "50001",
         "version": "1.4"
     },
-    "electrum.jochen-hoenicke.de": {
+    "electrum.jhoenicke.de": {
         "pruning": "-",
-        "s": "50006",
-        "t": "50099",
-        "version": "1.4.5"
+        "s": "50002",
+        "t": "50001",
+        "version": "1.6"
     },
     "electrum.pabu.io": {
         "pruning": "-",

electrum/gui/common_qt/util.py

@@ -1,5 +1,6 @@
 import queue
 import sys
+from functools import wraps
 from typing import Optional, NamedTuple, Callable
 import os.path
 
@@ -10,6 +11,7 @@
 
 from electrum.i18n import _
 from electrum.logging import Logger
+from electrum.util import EventListener, event_listener
 
 _cached_font_ids: dict[str, int] = {}
 
@@ -190,3 +192,33 @@ def stop(self):
         self.tasks.put(None)  # in case the thread is still waiting on the queue
         self.exit()
         self.wait()
+
+
+class QtEventListener(EventListener):
+    qt_callback_signal = pyqtSignal(tuple)
+
+    def register_callbacks(self):
+        self.qt_callback_signal.connect(self.on_qt_callback_signal)
+        EventListener.register_callbacks(self)
+
+    def unregister_callbacks(self):
+        try:
+            self.qt_callback_signal.disconnect()
+        except (RuntimeError, TypeError):  # wrapped Qt object might be deleted
+            # "TypeError: disconnect() failed between 'qt_callback_signal' and all its connections"
+            pass
+        EventListener.unregister_callbacks(self)
+
+    def on_qt_callback_signal(self, args):
+        func = args[0]
+        return func(self, *args[1:])
+
+
+# decorator for members of the QtEventListener class
+def qt_event_listener(func):
+    func = event_listener(func)
+
+    @wraps(func)
+    def decorator(self, *args):
+        self.qt_callback_signal.emit((func,) + args)
+    return decorator

electrum/gui/qml/qeaddresslistmodel.py

@@ -5,10 +5,12 @@
 
 from electrum.logging import get_logger
 from electrum.util import Satoshis
-from .qeconfig import QEConfig
 
+from electrum.gui.common_qt.util import QtEventListener, qt_event_listener
+
+from .qeconfig import QEConfig
 from .qetypes import QEAmount
-from .util import qt_event_listener, QtEventListener
+
 
 if TYPE_CHECKING:
     from electrum.wallet import Abstract_Wallet

electrum/gui/qml/qechanneldetails.py

@@ -9,12 +9,13 @@
 from electrum.logging import get_logger
 from electrum.lnutil import LOCAL, REMOTE
 from electrum.lnchannel import ChanCloseOption, ChannelState, AbstractChannel, Channel, ChannelBackup
-from electrum.util import format_short_id
+from electrum.util import format_short_id, event_listener
+
+from electrum.gui.common_qt.util import QtEventListener
 
 from .auth import AuthMixin, auth_protect
 from .qewallet import QEWallet
 from .qetypes import QEAmount
-from .util import QtEventListener, event_listener
 
 if TYPE_CHECKING:
     from electrum.wallet import Abstract_Wallet

electrum/gui/qml/qechannellistmodel.py

@@ -7,8 +7,9 @@
 from electrum.util import Satoshis
 from electrum.gui import messages
 
+from electrum.gui.common_qt.util import qt_event_listener, QtEventListener
+
 from .qetypes import QEAmount
-from .util import QtEventListener, qt_event_listener
 from .qemodelfilter import QEFilterProxyModel
 
 

electrum/gui/qml/qefx.py

@@ -7,9 +7,11 @@
 from electrum.exchange_rate import FxThread
 from electrum.logging import get_logger
 from electrum.simple_config import SimpleConfig
+from electrum.util import event_listener
+
+from electrum.gui.common_qt.util import QtEventListener
 
 from .qetypes import QEAmount
-from .util import QtEventListener, event_listener
 
 
 class QEFX(QObject, QtEventListener):

electrum/gui/qml/qeinvoice.py

@@ -19,10 +19,13 @@
 from electrum.paymentrequest import PaymentRequest
 from electrum.payment_identifier import PaymentIdentifier, PaymentIdentifierState, PaymentIdentifierType
 from electrum.network import Network
+from electrum.util import event_listener
+
+from electrum.gui.common_qt.util import QtEventListener
 
 from .qetypes import QEAmount
 from .qewallet import QEWallet
-from .util import status_update_timer_interval, QtEventListener, event_listener
+from .util import status_update_timer_interval
 from ...util import InvoiceError
 
 

electrum/gui/qml/qeinvoicelistmodel.py

@@ -8,7 +8,9 @@
 from electrum.util import Satoshis, format_time
 from electrum.invoices import BaseInvoice, PR_EXPIRED, LN_EXPIRY_NEVER, Invoice, Request, PR_PAID
 
-from .util import QtEventListener, qt_event_listener, status_update_timer_interval
+from electrum.gui.common_qt.util import QtEventListener, qt_event_listener
+
+from .util import status_update_timer_interval
 from .qetypes import QEAmount
 
 if TYPE_CHECKING:

electrum/gui/qml/qenetwork.py

@@ -7,8 +7,10 @@
 from electrum.network import ProxySettings
 from electrum.interface import ServerAddr
 from electrum.fee_policy import FEERATE_DEFAULT_RELAY
+from electrum.util import event_listener
+
+from electrum.gui.common_qt.util import QtEventListener
 
-from .util import QtEventListener, event_listener
 from .qeconfig import QEConfig
 from .qeserverlistmodel import QEServerListModel
 

electrum/gui/qml/qerequestdetails.py

@@ -14,9 +14,11 @@
 from electrum.i18n import _
 from electrum.network import Network
 
+from electrum.gui.common_qt.util import QtEventListener, qt_event_listener
+
 from .qewallet import QEWallet
 from .qetypes import QEAmount
-from .util import QtEventListener, qt_event_listener, status_update_timer_interval
+from .util import status_update_timer_interval
 
 
 class QERequestDetails(QObject, QtEventListener):