tfollow-up 88bb5309c4d74adb7ba1ac24e5bcb05ef34b2bf9 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 2464b3ab8115e3098047252404afed6c9a25daf5
DIR parent 7bcb59ffb5a30d3a116b086c9ae291bf4bb788f3
HTML Author: ThomasV <thomasv@electrum.org>
Date: Sat, 6 Jun 2020 12:08:36 +0200
follow-up 88bb5309c4d74adb7ba1ac24e5bcb05ef34b2bf9
Diffstat:
M electrum/gui/kivy/uix/dialogs/pass… | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
---
DIR diff --git a/electrum/gui/kivy/uix/dialogs/password_dialog.py b/electrum/gui/kivy/uix/dialogs/password_dialog.py
t@@ -9,8 +9,9 @@ from decimal import Decimal
from kivy.clock import Clock
from electrum.util import InvalidPassword
-from electrum.wallet import WalletStorage
+from electrum.wallet import WalletStorage, Wallet
from electrum.gui.kivy.i18n import _
+from electrum.wallet_db import WalletDB
from .wallets import WalletDialog
t@@ -347,7 +348,8 @@ class OpenWalletDialog(PasswordDialog):
else:
# it is a bit wasteful load the wallet here and load it again in main_window,
# but that is fine, because we are progressively enforcing storage encryption.
- wallet = self.app.daemon.load_wallet(path, None)
+ db = WalletDB(self.storage.read(), manual_upgrades=False)
+ wallet = Wallet(db, self.storage, config=self.app.electrum_config)
self.require_password = wallet.has_password()
self.pw_check = wallet.check_password
self.message = self.enter_pw_message if self.require_password else _('Wallet not encrypted')