AaronFiore/electrum
1
0
Fork 0
Code Activity

CLI: properly auto-upgrade storage when needed even if storage-encrypted

Browse Source 
previously commands would error if user had an encrypted storage that needed upgrading
This commit is contained in:
SomberNight
2019-12-15 20:12:51 +01:00
parent 2c6a1f55fb
commit 01fc048484
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/json_db.py
View File

@@ -55,12 +55,12 @@ class TxFeesValue(NamedTuple):
class JsonDB(Logger):
def __init__(self, raw, *, manual_upgrades):
def __init__(self, raw, *, manual_upgrades: bool):
Logger.__init__(self)
self.lock = threading.RLock()
self.data = {}
self._modified = False
self.manual_upgrades = manual_upgrades
self._manual_upgrades = manual_upgrades
self._called_after_upgrade_tasks = False
if raw: # loading existing db
self.load_data(raw)
@@ -142,12 +142,12 @@ class JsonDB(Logger):
if not isinstance(self.data, dict):
raise WalletFileException("Malformed wallet file (not dict)")
if not self.manual_upgrades and self.requires_split():
if not self._manual_upgrades and self.requires_split():
raise WalletFileException("This wallet has multiple accounts and must be split")
if not self.requires_upgrade():
self._after_upgrade_tasks()
elif not self.manual_upgrades:
elif not self._manual_upgrades:
self.upgrade()
def requires_split(self):