AaronFiore/electrum
1
0
Fork 0
Code Activity

commands: fix: only try to get wallet if wallet_path

Browse Source 
Only try to get wallet from daemon in the `command` decorator if the
wallet_path is available to prevent raising `TypeError` when
`daemon.get_wallet(path=None)` gets called.
Fixes https://github.com/spesmilo/electrum/issues/10012
This commit is contained in:
f321x
2025-07-07 09:56:50 +02:00
parent bbac398d1b
commit 9d0a40deb9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/commands.py
View File

@@ -168,12 +168,12 @@ def command(s):
if 'wallet' in cmd.options: if 'wallet' in cmd.options:
wallet_path = kwargs.pop('wallet_path', None) # unit tests may set wallet and not wallet_path wallet_path = kwargs.pop('wallet_path', None) # unit tests may set wallet and not wallet_path
wallet = kwargs.get('wallet', None) # run_offline_command sets both wallet = kwargs.get('wallet', None) # run_offline_command sets both
if wallet is None: if wallet is None and wallet_path is not None:
wallet = daemon.get_wallet(wallet_path) wallet = daemon.get_wallet(wallet_path)
if wallet is None: if wallet is None:
raise UserFacingException('wallet not loaded') raise UserFacingException('wallet not loaded')
kwargs['wallet'] = wallet kwargs['wallet'] = wallet
if cmd.requires_password and password is None and wallet.has_password(): if cmd.requires_password and password is None and wallet and wallet.has_password():
password = wallet.get_unlocked_password() password = wallet.get_unlocked_password()
if password: if password:
kwargs['password'] = password kwargs['password'] = password