From 6e087950cfc4a453ef222ee447bf20953fb83bf5 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@electrum.org>
Date: Thu, 10 Apr 2025 10:13:24 +0200
Subject: [PATCH] move hw_wallet.py from plugins to electrum library

---
 electrum/{plugins => }/hw_wallet/__init__.py            | 0
 electrum/{plugins => }/hw_wallet/cmdline.py             | 0
 electrum/{plugins => }/hw_wallet/plugin.py              | 0
 electrum/{plugins => }/hw_wallet/qt.py                  | 0
 electrum/{plugins => }/hw_wallet/trezor_qt_pinmatrix.py | 0
 electrum/plugin.py                                      | 2 +-
 electrum/plugins/bitbox02/bitbox02.py                   | 2 +-
 electrum/plugins/bitbox02/qt.py                         | 4 ++--
 electrum/plugins/coldcard/cmdline.py                    | 2 +-
 electrum/plugins/coldcard/coldcard.py                   | 4 ++--
 electrum/plugins/coldcard/qt.py                         | 4 ++--
 electrum/plugins/digitalbitbox/cmdline.py               | 2 +-
 electrum/plugins/digitalbitbox/digitalbitbox.py         | 4 ++--
 electrum/plugins/digitalbitbox/qt.py                    | 4 ++--
 electrum/plugins/jade/cmdline.py                        | 2 +-
 electrum/plugins/jade/jade.py                           | 4 ++--
 electrum/plugins/jade/qt.py                             | 4 ++--
 electrum/plugins/keepkey/clientbase.py                  | 2 +-
 electrum/plugins/keepkey/cmdline.py                     | 2 +-
 electrum/plugins/keepkey/keepkey.py                     | 4 ++--
 electrum/plugins/keepkey/qt.py                          | 6 +++---
 electrum/plugins/ledger/cmdline.py                      | 3 ++-
 electrum/plugins/ledger/ledger.py                       | 6 +++---
 electrum/plugins/ledger/qt.py                           | 4 ++--
 electrum/plugins/safe_t/clientbase.py                   | 2 +-
 electrum/plugins/safe_t/cmdline.py                      | 3 ++-
 electrum/plugins/safe_t/qt.py                           | 6 +++---
 electrum/plugins/safe_t/safe_t.py                       | 4 ++--
 electrum/plugins/trezor/clientbase.py                   | 2 +-
 electrum/plugins/trezor/cmdline.py                      | 3 ++-
 electrum/plugins/trezor/qt.py                           | 6 +++---
 electrum/plugins/trezor/trezor.py                       | 4 ++--
 32 files changed, 49 insertions(+), 46 deletions(-)
 rename electrum/{plugins => }/hw_wallet/__init__.py (100%)
 rename electrum/{plugins => }/hw_wallet/cmdline.py (100%)
 rename electrum/{plugins => }/hw_wallet/plugin.py (100%)
 rename electrum/{plugins => }/hw_wallet/qt.py (100%)
 rename electrum/{plugins => }/hw_wallet/trezor_qt_pinmatrix.py (100%)

diff --git a/electrum/plugins/hw_wallet/__init__.py b/electrum/hw_wallet/__init__.py
similarity index 100%
rename from electrum/plugins/hw_wallet/__init__.py
rename to electrum/hw_wallet/__init__.py
diff --git a/electrum/plugins/hw_wallet/cmdline.py b/electrum/hw_wallet/cmdline.py
similarity index 100%
rename from electrum/plugins/hw_wallet/cmdline.py
rename to electrum/hw_wallet/cmdline.py
diff --git a/electrum/plugins/hw_wallet/plugin.py b/electrum/hw_wallet/plugin.py
similarity index 100%
rename from electrum/plugins/hw_wallet/plugin.py
rename to electrum/hw_wallet/plugin.py
diff --git a/electrum/plugins/hw_wallet/qt.py b/electrum/hw_wallet/qt.py
similarity index 100%
rename from electrum/plugins/hw_wallet/qt.py
rename to electrum/hw_wallet/qt.py
diff --git a/electrum/plugins/hw_wallet/trezor_qt_pinmatrix.py b/electrum/hw_wallet/trezor_qt_pinmatrix.py
similarity index 100%
rename from electrum/plugins/hw_wallet/trezor_qt_pinmatrix.py
rename to electrum/hw_wallet/trezor_qt_pinmatrix.py
diff --git a/electrum/plugin.py b/electrum/plugin.py
index 8ee89cb1e..5b296ca73 100644
--- a/electrum/plugin.py
+++ b/electrum/plugin.py
@@ -51,7 +51,7 @@ from .logging import get_logger, Logger
 from .crypto import sha256
 
 if TYPE_CHECKING:
-    from .plugins.hw_wallet import HW_PluginBase, HardwareClientBase, HardwareHandlerBase
+    from .hw_wallet import HW_PluginBase, HardwareClientBase, HardwareHandlerBase
     from .keystore import Hardware_KeyStore, KeyStore
     from .wallet import Abstract_Wallet
 
diff --git a/electrum/plugins/bitbox02/bitbox02.py b/electrum/plugins/bitbox02/bitbox02.py
index f6a372a80..2f3b5bfa2 100644
--- a/electrum/plugins/bitbox02/bitbox02.py
+++ b/electrum/plugins/bitbox02/bitbox02.py
@@ -21,7 +21,7 @@ from electrum.bitcoin import OnchainOutputType
 
 import electrum.bitcoin as bitcoin
 
-from ..hw_wallet import HW_PluginBase, HardwareClientBase, HardwareHandlerBase
+from electrum.hw_wallet import HW_PluginBase, HardwareClientBase, HardwareHandlerBase
 
 if TYPE_CHECKING:
     from electrum.wizard import NewWalletWizard
diff --git a/electrum/plugins/bitbox02/qt.py b/electrum/plugins/bitbox02/qt.py
index 88261ad5f..1ed04a600 100644
--- a/electrum/plugins/bitbox02/qt.py
+++ b/electrum/plugins/bitbox02/qt.py
@@ -10,8 +10,8 @@ from electrum.plugin import hook
 from electrum.util import UserCancelled, UserFacingException
 
 from .bitbox02 import BitBox02Plugin
-from ..hw_wallet.qt import QtHandlerBase, QtPluginBase
-from ..hw_wallet.plugin import only_hook_if_libraries_available, OperationCancelled
+from electrum.hw_wallet.qt import QtHandlerBase, QtPluginBase
+from electrum.hw_wallet.plugin import only_hook_if_libraries_available, OperationCancelled
 
 from electrum.gui.qt.wizard.wallet import WCScriptAndDerivation, WCHWUnlock, WCHWUninitialized, WCHWXPub
 from electrum.gui.qt.util import WindowModalDialog, OkButton, ButtonsTextEdit
diff --git a/electrum/plugins/coldcard/cmdline.py b/electrum/plugins/coldcard/cmdline.py
index 4f246ec77..79920e12e 100644
--- a/electrum/plugins/coldcard/cmdline.py
+++ b/electrum/plugins/coldcard/cmdline.py
@@ -2,7 +2,7 @@ from electrum.plugin import hook
 from electrum.util import print_msg, raw_input, print_stderr
 from electrum.logging import get_logger
 
-from ..hw_wallet.cmdline import CmdLineHandler
+from electrum.hw_wallet.cmdline import CmdLineHandler
 
 from .coldcard import ColdcardPlugin
 
diff --git a/electrum/plugins/coldcard/coldcard.py b/electrum/plugins/coldcard/coldcard.py
index 5193f1eba..2fa5f4bcd 100644
--- a/electrum/plugins/coldcard/coldcard.py
+++ b/electrum/plugins/coldcard/coldcard.py
@@ -17,8 +17,8 @@ from electrum.wallet import Standard_Wallet, Multisig_Wallet, Abstract_Wallet
 from electrum.util import bfh, versiontuple, UserFacingException
 from electrum.logging import get_logger
 
-from ..hw_wallet import HW_PluginBase, HardwareClientBase
-from ..hw_wallet.plugin import LibraryFoundButUnusable, only_hook_if_libraries_available
+from electrum.hw_wallet import HW_PluginBase, HardwareClientBase
+from electrum.hw_wallet.plugin import LibraryFoundButUnusable, only_hook_if_libraries_available
 
 if TYPE_CHECKING:
     from electrum.plugin import DeviceInfo
diff --git a/electrum/plugins/coldcard/qt.py b/electrum/plugins/coldcard/qt.py
index f20831d39..f89041090 100644
--- a/electrum/plugins/coldcard/qt.py
+++ b/electrum/plugins/coldcard/qt.py
@@ -12,8 +12,8 @@ from electrum.plugin import hook
 from electrum.wallet import Multisig_Wallet
 
 from .coldcard import ColdcardPlugin, xfp2str
-from ..hw_wallet.qt import QtHandlerBase, QtPluginBase
-from ..hw_wallet.plugin import only_hook_if_libraries_available
+from electrum.hw_wallet.qt import QtHandlerBase, QtPluginBase
+from electrum.hw_wallet.plugin import only_hook_if_libraries_available
 from electrum.gui.qt.wizard.wallet import WCScriptAndDerivation, WCHWXPub, WCHWUninitialized, WCHWUnlock
 
 if TYPE_CHECKING:
diff --git a/electrum/plugins/digitalbitbox/cmdline.py b/electrum/plugins/digitalbitbox/cmdline.py
index cf5d4005a..0c49e8f01 100644
--- a/electrum/plugins/digitalbitbox/cmdline.py
+++ b/electrum/plugins/digitalbitbox/cmdline.py
@@ -1,6 +1,6 @@
 from electrum.plugin import hook
 from .digitalbitbox import DigitalBitboxPlugin
-from ..hw_wallet import CmdLineHandler
+from electrum.hw_wallet import CmdLineHandler
 
 class Plugin(DigitalBitboxPlugin):
     handler = CmdLineHandler()
diff --git a/electrum/plugins/digitalbitbox/digitalbitbox.py b/electrum/plugins/digitalbitbox/digitalbitbox.py
index bc2e6f9f1..aafffb275 100644
--- a/electrum/plugins/digitalbitbox/digitalbitbox.py
+++ b/electrum/plugins/digitalbitbox/digitalbitbox.py
@@ -34,8 +34,8 @@ from electrum.network import Network
 from electrum.logging import get_logger
 from electrum.plugin import runs_in_hwd_thread, run_in_hwd_thread
 
-from ..hw_wallet import HW_PluginBase, HardwareClientBase, HardwareHandlerBase
-from ..hw_wallet.plugin import OperationCancelled
+from electrum.hw_wallet import HW_PluginBase, HardwareClientBase, HardwareHandlerBase
+from electrum.hw_wallet.plugin import OperationCancelled
 
 if TYPE_CHECKING:
     from electrum.plugin import DeviceInfo
diff --git a/electrum/plugins/digitalbitbox/qt.py b/electrum/plugins/digitalbitbox/qt.py
index 10ee5a621..f7947a5bb 100644
--- a/electrum/plugins/digitalbitbox/qt.py
+++ b/electrum/plugins/digitalbitbox/qt.py
@@ -9,8 +9,8 @@ from electrum.plugin import hook
 from electrum.wallet import Standard_Wallet, Abstract_Wallet
 from electrum.util import UserCancelled, UserFacingException
 
-from electrum.plugins.hw_wallet.qt import QtHandlerBase, QtPluginBase
-from electrum.plugins.hw_wallet.plugin import only_hook_if_libraries_available, OperationCancelled
+from electrum.hw_wallet.qt import QtHandlerBase, QtPluginBase
+from electrum.hw_wallet.plugin import only_hook_if_libraries_available, OperationCancelled
 
 from electrum.gui.qt.wizard.wallet import WCScriptAndDerivation, WCHWXPub, WCHWUnlock
 
diff --git a/electrum/plugins/jade/cmdline.py b/electrum/plugins/jade/cmdline.py
index 00aa988c0..a592f922b 100644
--- a/electrum/plugins/jade/cmdline.py
+++ b/electrum/plugins/jade/cmdline.py
@@ -1,6 +1,6 @@
 from electrum.plugin import hook
 from .jade import JadePlugin
-from ..hw_wallet import CmdLineHandler
+from electrum.hw_wallet import CmdLineHandler
 
 class Plugin(JadePlugin):
     handler = CmdLineHandler()
diff --git a/electrum/plugins/jade/jade.py b/electrum/plugins/jade/jade.py
index 1a40db1e3..16a65e235 100644
--- a/electrum/plugins/jade/jade.py
+++ b/electrum/plugins/jade/jade.py
@@ -14,8 +14,8 @@ from electrum.logging import get_logger
 from electrum.plugin import runs_in_hwd_thread, Device
 from electrum.network import Network
 
-from electrum.plugins.hw_wallet import HW_PluginBase, HardwareClientBase
-from electrum.plugins.hw_wallet.plugin import OutdatedHwFirmwareException
+from electrum.hw_wallet import HW_PluginBase, HardwareClientBase
+from electrum.hw_wallet.plugin import OutdatedHwFirmwareException
 
 if TYPE_CHECKING:
     from electrum.plugin import DeviceInfo
diff --git a/electrum/plugins/jade/qt.py b/electrum/plugins/jade/qt.py
index 73d5b8de8..034e28e20 100644
--- a/electrum/plugins/jade/qt.py
+++ b/electrum/plugins/jade/qt.py
@@ -7,8 +7,8 @@ from electrum.i18n import _
 from electrum.plugin import hook
 from electrum.wallet import Standard_Wallet
 
-from electrum.plugins.hw_wallet.qt import QtHandlerBase, QtPluginBase
-from electrum.plugins.hw_wallet import plugin
+from electrum.hw_wallet.qt import QtHandlerBase, QtPluginBase
+from electrum.hw_wallet import plugin
 from electrum.gui.qt.wizard.wallet import WCScriptAndDerivation, WCHWUnlock, WCHWXPub, WCHWUninitialized
 
 from .jade import JadePlugin
diff --git a/electrum/plugins/keepkey/clientbase.py b/electrum/plugins/keepkey/clientbase.py
index a9040db57..e81c4a8a3 100644
--- a/electrum/plugins/keepkey/clientbase.py
+++ b/electrum/plugins/keepkey/clientbase.py
@@ -10,7 +10,7 @@ from electrum.keystore import bip39_normalize_passphrase
 from electrum.bip32 import BIP32Node, convert_bip32_strpath_to_intpath
 from electrum.logging import Logger
 from electrum.plugin import runs_in_hwd_thread
-from electrum.plugins.hw_wallet.plugin import HardwareClientBase, HardwareHandlerBase
+from electrum.hw_wallet.plugin import HardwareClientBase, HardwareHandlerBase
 
 
 class GuiMixin(object):
diff --git a/electrum/plugins/keepkey/cmdline.py b/electrum/plugins/keepkey/cmdline.py
index 7cbad274e..1b25b9b75 100644
--- a/electrum/plugins/keepkey/cmdline.py
+++ b/electrum/plugins/keepkey/cmdline.py
@@ -1,6 +1,6 @@
 from electrum.plugin import hook
+from electrum.hw_wallet import CmdLineHandler
 from .keepkey import KeepKeyPlugin
-from ..hw_wallet import CmdLineHandler
 
 class Plugin(KeepKeyPlugin):
     handler = CmdLineHandler()
diff --git a/electrum/plugins/keepkey/keepkey.py b/electrum/plugins/keepkey/keepkey.py
index 6dbd7b819..7a1a960b7 100644
--- a/electrum/plugins/keepkey/keepkey.py
+++ b/electrum/plugins/keepkey/keepkey.py
@@ -9,8 +9,8 @@ from electrum.transaction import Transaction, PartialTransaction, PartialTxInput
 from electrum.keystore import Hardware_KeyStore
 from electrum.plugin import Device, runs_in_hwd_thread
 
-from ..hw_wallet import HW_PluginBase
-from ..hw_wallet.plugin import is_any_tx_output_on_change_branch, trezor_validate_op_return_output_and_get_data
+from electrum.hw_wallet import HW_PluginBase
+from electrum.hw_wallet.plugin import is_any_tx_output_on_change_branch, trezor_validate_op_return_output_and_get_data
 
 if TYPE_CHECKING:
     import usb1
diff --git a/electrum/plugins/keepkey/qt.py b/electrum/plugins/keepkey/qt.py
index 5ef9aa79b..432ba7674 100644
--- a/electrum/plugins/keepkey/qt.py
+++ b/electrum/plugins/keepkey/qt.py
@@ -15,9 +15,9 @@ from electrum.i18n import _
 from electrum.plugin import hook
 from electrum.logging import Logger
 
-from electrum.plugins.hw_wallet.qt import QtHandlerBase, QtPluginBase
-from electrum.plugins.hw_wallet.trezor_qt_pinmatrix import PinMatrixWidget
-from electrum.plugins.hw_wallet.plugin import only_hook_if_libraries_available
+from electrum.hw_wallet.qt import QtHandlerBase, QtPluginBase
+from electrum.hw_wallet.trezor_qt_pinmatrix import PinMatrixWidget
+from electrum.hw_wallet.plugin import only_hook_if_libraries_available
 
 from .keepkey import KeepKeyPlugin, TIM_NEW, TIM_RECOVER, TIM_MNEMONIC, TIM_PRIVKEY
 
diff --git a/electrum/plugins/ledger/cmdline.py b/electrum/plugins/ledger/cmdline.py
index 3e8101697..1d587b538 100644
--- a/electrum/plugins/ledger/cmdline.py
+++ b/electrum/plugins/ledger/cmdline.py
@@ -1,6 +1,7 @@
 from electrum.plugin import hook
+from electrum.hw_wallet import CmdLineHandler
+
 from .ledger import LedgerPlugin
-from ..hw_wallet import CmdLineHandler
 
 class Plugin(LedgerPlugin):
     handler = CmdLineHandler()
diff --git a/electrum/plugins/ledger/ledger.py b/electrum/plugins/ledger/ledger.py
index 68efb6971..60ffeaa7a 100644
--- a/electrum/plugins/ledger/ledger.py
+++ b/electrum/plugins/ledger/ledger.py
@@ -21,9 +21,9 @@ from electrum.transaction import PartialTransaction, Transaction, PartialTxInput
 from electrum.util import bfh, UserFacingException, versiontuple
 from electrum.wallet import Standard_Wallet
 
-from ..hw_wallet import HardwareClientBase, HW_PluginBase
-from ..hw_wallet.plugin import is_any_tx_output_on_change_branch, validate_op_return_output, LibraryFoundButUnusable
-from ..hw_wallet.plugin import HardwareClientDummy
+from electrum.hw_wallet import HardwareClientBase, HW_PluginBase
+from electrum.hw_wallet.plugin import is_any_tx_output_on_change_branch, validate_op_return_output, LibraryFoundButUnusable
+from electrum.hw_wallet.plugin import HardwareClientDummy
 
 if TYPE_CHECKING:
     from electrum.plugin import DeviceInfo
diff --git a/electrum/plugins/ledger/qt.py b/electrum/plugins/ledger/qt.py
index e36d38a13..950d51345 100644
--- a/electrum/plugins/ledger/qt.py
+++ b/electrum/plugins/ledger/qt.py
@@ -7,10 +7,10 @@ from PyQt6.QtWidgets import QInputDialog, QLineEdit
 from electrum.i18n import _
 from electrum.plugin import hook
 from electrum.wallet import Standard_Wallet
+from electrum.hw_wallet.qt import QtHandlerBase, QtPluginBase
+from electrum.hw_wallet.plugin import only_hook_if_libraries_available
 
 from .ledger import LedgerPlugin, Ledger_Client
-from ..hw_wallet.qt import QtHandlerBase, QtPluginBase
-from ..hw_wallet.plugin import only_hook_if_libraries_available
 from electrum.gui.qt.wizard.wallet import WCScriptAndDerivation, WCHWUninitialized, WCHWUnlock, WCHWXPub
 
 if TYPE_CHECKING:
diff --git a/electrum/plugins/safe_t/clientbase.py b/electrum/plugins/safe_t/clientbase.py
index dbcaf46f5..450f3f1ae 100644
--- a/electrum/plugins/safe_t/clientbase.py
+++ b/electrum/plugins/safe_t/clientbase.py
@@ -10,7 +10,7 @@ from electrum.keystore import bip39_normalize_passphrase
 from electrum.bip32 import BIP32Node, convert_bip32_strpath_to_intpath
 from electrum.logging import Logger
 from electrum.plugin import runs_in_hwd_thread
-from electrum.plugins.hw_wallet.plugin import HardwareClientBase, HardwareHandlerBase
+from electrum.hw_wallet.plugin import HardwareClientBase, HardwareHandlerBase
 
 
 class GuiMixin(object):
diff --git a/electrum/plugins/safe_t/cmdline.py b/electrum/plugins/safe_t/cmdline.py
index 9c6346d3b..0664086f7 100644
--- a/electrum/plugins/safe_t/cmdline.py
+++ b/electrum/plugins/safe_t/cmdline.py
@@ -1,6 +1,7 @@
 from electrum.plugin import hook
+from electrum.hw_wallet import CmdLineHandler
+
 from .safe_t import SafeTPlugin
-from ..hw_wallet import CmdLineHandler
 
 class Plugin(SafeTPlugin):
     handler = CmdLineHandler()
diff --git a/electrum/plugins/safe_t/qt.py b/electrum/plugins/safe_t/qt.py
index dcba42f2d..36e68dd49 100644
--- a/electrum/plugins/safe_t/qt.py
+++ b/electrum/plugins/safe_t/qt.py
@@ -15,9 +15,9 @@ from electrum.i18n import _
 from electrum.plugin import hook
 from electrum.logging import Logger
 
-from electrum.plugins.hw_wallet.qt import QtHandlerBase, QtPluginBase
-from electrum.plugins.hw_wallet.trezor_qt_pinmatrix import PinMatrixWidget
-from electrum.plugins.hw_wallet.plugin import only_hook_if_libraries_available
+from electrum.hw_wallet.qt import QtHandlerBase, QtPluginBase
+from electrum.hw_wallet.trezor_qt_pinmatrix import PinMatrixWidget
+from electrum.hw_wallet.plugin import only_hook_if_libraries_available
 
 from .safe_t import SafeTPlugin, TIM_NEW, TIM_RECOVER, TIM_MNEMONIC, TIM_PRIVKEY
 
diff --git a/electrum/plugins/safe_t/safe_t.py b/electrum/plugins/safe_t/safe_t.py
index baeba7984..2e32017ac 100644
--- a/electrum/plugins/safe_t/safe_t.py
+++ b/electrum/plugins/safe_t/safe_t.py
@@ -9,8 +9,8 @@ from electrum.plugin import Device, runs_in_hwd_thread
 from electrum.transaction import Transaction, PartialTransaction, PartialTxInput, Sighash
 from electrum.keystore import Hardware_KeyStore
 
-from ..hw_wallet import HW_PluginBase
-from ..hw_wallet.plugin import is_any_tx_output_on_change_branch, trezor_validate_op_return_output_and_get_data
+from electrum.hw_wallet import HW_PluginBase
+from electrum.hw_wallet.plugin import is_any_tx_output_on_change_branch, trezor_validate_op_return_output_and_get_data
 
 if TYPE_CHECKING:
     from .client import SafeTClient
diff --git a/electrum/plugins/trezor/clientbase.py b/electrum/plugins/trezor/clientbase.py
index e50bd7686..71caf3675 100644
--- a/electrum/plugins/trezor/clientbase.py
+++ b/electrum/plugins/trezor/clientbase.py
@@ -9,7 +9,7 @@ from electrum.keystore import bip39_normalize_passphrase
 from electrum.bip32 import BIP32Node, convert_bip32_strpath_to_intpath as parse_path
 from electrum.logging import Logger
 from electrum.plugin import runs_in_hwd_thread
-from electrum.plugins.hw_wallet.plugin import OutdatedHwFirmwareException, HardwareClientBase
+from electrum.hw_wallet.plugin import OutdatedHwFirmwareException, HardwareClientBase
 
 from trezorlib.client import TrezorClient, PASSPHRASE_ON_DEVICE
 from trezorlib.exceptions import TrezorFailure, Cancelled, OutdatedFirmwareError
diff --git a/electrum/plugins/trezor/cmdline.py b/electrum/plugins/trezor/cmdline.py
index 5a7ee1596..585f12c7b 100644
--- a/electrum/plugins/trezor/cmdline.py
+++ b/electrum/plugins/trezor/cmdline.py
@@ -1,8 +1,9 @@
 from electrum.plugin import hook
 from electrum.i18n import _
 from electrum.util import print_stderr
+from electrum.hw_wallet import CmdLineHandler
+
 from .trezor import TrezorPlugin, PASSPHRASE_ON_DEVICE
-from ..hw_wallet import CmdLineHandler
 
 class TrezorCmdLineHandler(CmdLineHandler):
     def __init__(self):
diff --git a/electrum/plugins/trezor/qt.py b/electrum/plugins/trezor/qt.py
index cdd983ab9..0ea4220b6 100644
--- a/electrum/plugins/trezor/qt.py
+++ b/electrum/plugins/trezor/qt.py
@@ -13,9 +13,9 @@ from electrum.logging import Logger
 from electrum.plugin import hook
 from electrum.keystore import ScriptTypeNotSupported
 
-from electrum.plugins.hw_wallet.qt import QtHandlerBase, QtPluginBase
-from electrum.plugins.hw_wallet.trezor_qt_pinmatrix import PinMatrixWidget
-from electrum.plugins.hw_wallet.plugin import only_hook_if_libraries_available, OutdatedHwFirmwareException
+from electrum.hw_wallet.qt import QtHandlerBase, QtPluginBase
+from electrum.hw_wallet.trezor_qt_pinmatrix import PinMatrixWidget
+from electrum.hw_wallet.plugin import only_hook_if_libraries_available, OutdatedHwFirmwareException
 
 from electrum.gui.qt.util import (WindowModalDialog, WWLabel, Buttons, CancelButton,
                                   OkButton, CloseButton, PasswordLineEdit, getOpenFileName, ChoiceWidget)
diff --git a/electrum/plugins/trezor/trezor.py b/electrum/plugins/trezor/trezor.py
index 8eb702052..456cd2563 100644
--- a/electrum/plugins/trezor/trezor.py
+++ b/electrum/plugins/trezor/trezor.py
@@ -10,8 +10,8 @@ from electrum.transaction import Transaction, PartialTransaction, PartialTxInput
 from electrum.keystore import Hardware_KeyStore
 from electrum.logging import get_logger
 
-from electrum.plugins.hw_wallet import HW_PluginBase
-from electrum.plugins.hw_wallet.plugin import is_any_tx_output_on_change_branch, \
+from electrum.hw_wallet import HW_PluginBase
+from electrum.hw_wallet.plugin import is_any_tx_output_on_change_branch, \
     trezor_validate_op_return_output_and_get_data, LibraryFoundButUnusable, OutdatedHwFirmwareException
 
 if TYPE_CHECKING: