Browse Source

cli: load_wallet now auto-upgrades the WalletStorage when needed

previously it would bail out and just return False
master
SomberNight 6 years ago
parent
commit
420b1a6636
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
  1. 2
      electrum/commands.py
  2. 4
      electrum/daemon.py

2
electrum/commands.py

@ -199,7 +199,7 @@ class Commands:
@command('n')
async def load_wallet(self, wallet_path=None, password=None):
"""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:
run_hook('load_wallet', wallet, None)
response = wallet is not None

4
electrum/daemon.py

@ -376,13 +376,13 @@ class Daemon(Logger):
response = "Error: Electrum is running in daemon mode. Please stop the daemon first."
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)
# wizard will be launched if we return
if path in self._wallets:
wallet = self._wallets[path]
return wallet
storage = WalletStorage(path, manual_upgrades=True)
storage = WalletStorage(path, manual_upgrades=manual_upgrades)
if not storage.file_exists():
return
if storage.is_encrypted():

Loading…
Cancel
Save