Skip to content

rpc: handle passing wallet path as 'wallet' argument #10105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

rpc: handle passing wallet path as 'wallet' argument #10105

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions electrum/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,12 @@ async def func_wrapper(*args, **kwargs):
cmd = known_commands[name] # type: Command
password = kwargs.get('password')
daemon = cmd_runner.daemon
if isinstance(kwargs.get('wallet'), str):
# a wallet path has been passed as 'wallet' arg (instead of 'wallet_path')
wallet_str = kwargs.pop('wallet')
# still prioritize 'wallet_path' over a 'wallet' str
if 'wallet_path' not in kwargs:
kwargs['wallet_path'] = wallet_str
if daemon:
if 'wallet_path' in cmd.options or cmd.requires_wallet:
kwargs['wallet_path'] = daemon.config.maybe_complete_wallet_path(kwargs.get('wallet_path'))
Expand Down