AaronFiore/electrum
1
0
Fork 0
Code Activity

cli: load_wallet now auto-upgrades the WalletStorage when needed

Browse Source 
previously it would bail out and just return False
This commit is contained in:
SomberNight
2019-11-22 15:54:34 +01:00
parent 3d88d6870c
commit 420b1a6636
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/commands.py
View File

@@ -199,7 +199,7 @@ class Commands:
@command('n') @command('n')
async def load_wallet(self, wallet_path=None, password=None): async def load_wallet(self, wallet_path=None, password=None):
"""Open wallet in daemon""" """Open wallet in daemon"""
wallet = self.daemon.load_wallet(wallet_path, password) wallet = self.daemon.load_wallet(wallet_path, password, manual_upgrades=False)
if wallet is not None: if wallet is not None:
run_hook('load_wallet', wallet, None) run_hook('load_wallet', wallet, None)
response = wallet is not None response = wallet is not None

4
electrum/daemon.py
View File

@@ -376,13 +376,13 @@ class Daemon(Logger):
response = "Error: Electrum is running in daemon mode. Please stop the daemon first." response = "Error: Electrum is running in daemon mode. Please stop the daemon first."
return response return response
def load_wallet(self, path, password) -> Optional[Abstract_Wallet]: def load_wallet(self, path, password, *, manual_upgrades=True) -> Optional[Abstract_Wallet]:
path = standardize_path(path) path = standardize_path(path)
# wizard will be launched if we return # wizard will be launched if we return
if path in self._wallets: if path in self._wallets:
wallet = self._wallets[path] wallet = self._wallets[path]
return wallet return wallet
storage = WalletStorage(path, manual_upgrades=True) storage = WalletStorage(path, manual_upgrades=manual_upgrades)
if not storage.file_exists(): if not storage.file_exists():
return return
if storage.is_encrypted(): if storage.is_encrypted():