AaronFiore/electrum
1
0
Fork 0
Code Activity

storage: call load_plugins in decrypt

Browse Source
This commit is contained in:
ThomasV
2019-02-28 15:50:37 +01:00
parent 1e519f2dd0
commit d8c4bf5662
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
electrum/storage.py
View File

@@ -63,12 +63,12 @@ class WalletStorage(PrintError):
self._encryption_version = self._init_encryption_version() self._encryption_version = self._init_encryption_version()
if not self.is_encrypted(): if not self.is_encrypted():
self.db = DB_Class(self.raw, manual_upgrades=manual_upgrades) self.db = DB_Class(self.raw, manual_upgrades=manual_upgrades)
self.load_plugins()
else: else:
self._encryption_version = STO_EV_PLAINTEXT self._encryption_version = STO_EV_PLAINTEXT
# avoid new wallets getting 'upgraded' # avoid new wallets getting 'upgraded'
self.db = DB_Class('', manual_upgrades=False) self.db = DB_Class('', manual_upgrades=False)
self.load_plugins()
def load_plugins(self): def load_plugins(self):
wallet_type = self.db.get('wallet_type') wallet_type = self.db.get('wallet_type')
@@ -179,6 +179,7 @@ class WalletStorage(PrintError):
self.pubkey = ec_key.get_public_key_hex() self.pubkey = ec_key.get_public_key_hex()
s = s.decode('utf8') s = s.decode('utf8')
self.db = JsonDB(s, manual_upgrades=True) self.db = JsonDB(s, manual_upgrades=True)
self.load_plugins()
def encrypt_before_writing(self, plaintext: str) -> str: def encrypt_before_writing(self, plaintext: str) -> str:
s = plaintext s = plaintext