AaronFiore/electrum
1
0
Fork 0
Code Activity

Turn daemon subcommands into RPCs

Browse Source
This commit is contained in:
ThomasV
2019-08-19 12:46:31 +02:00
parent 4397767a5e
commit 9cfeadea70
4 changed files with 106 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
run_electrum
View File

@@ -159,8 +159,9 @@ def init_cmdline(config_options, server):
print_stderr("In particular, DO NOT use 'redeem private key' services proposed by third parties.")
# commands needing password
if (cmd.requires_wallet and storage.is_encrypted() and server is False)\
or (cmd.requires_password and (storage.get('use_encryption') or storage.is_encrypted())):
if ( (cmd.requires_wallet and storage.is_encrypted() and server is False)\
or (cmdname == 'load_wallet' and storage.is_encrypted())\
or (cmd.requires_password and (storage.is_encrypted() or storage.get('use_encryption')))):
if storage.is_encrypted_with_hw_device():
# this case is handled later in the control flow
password = None
@@ -392,9 +393,6 @@ if __name__ == '__main__':
elif cmdname == 'daemon':
if subcommand in ['load_wallet']:
init_daemon(config_options)
if subcommand in [None, 'start']:
configure_logging(config)
fd = daemon.get_file_descriptor(config)