LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-23 17:47:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix 2fa wallet creation via qt gui

Browse source 
closes #5334
This commit is contained in:
SomberNight 2019-05-14 15:32:57 +02:00
parent 7aaac2ee30
commit 003e6c3e79
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
electrum/base_wizard.py
View file

@ -560,11 +560,13 @@ class BaseWizard(Logger):
self.terminate() self.terminate()
def create_storage(self, path): def create_storage(self, path):
if os.path.exists(path):
raise Exception('file already exists at path')
if not self.pw_args: if not self.pw_args:
return return
password, encrypt_storage, storage_enc_version = self.pw_args password, encrypt_storage, storage_enc_version = self.pw_args
storage = WalletStorage(path) storage = WalletStorage(path)
storage.set_keystore_encryption(bool(password)) # and encrypt_keystore) storage.set_keystore_encryption(bool(password))
if encrypt_storage: if encrypt_storage:
storage.set_password(password, enc_version=storage_enc_version) storage.set_password(password, enc_version=storage_enc_version)
for key, value in self.data.items(): for key, value in self.data.items():

9
electrum/plugins/trustedcoin/qt.py
View file

@ -43,6 +43,7 @@ from electrum.i18n import _
from electrum.plugin import hook from electrum.plugin import hook
from electrum.util import is_valid_email from electrum.util import is_valid_email
from electrum.logging import Logger from electrum.logging import Logger
from electrum.base_wizard import GoBack
from .trustedcoin import TrustedCoinPlugin, server from .trustedcoin import TrustedCoinPlugin, server
@ -221,9 +222,13 @@ class Plugin(TrustedCoinPlugin):
_('If you are online, click on "{}" to continue.').format(_('Next')) _('If you are online, click on "{}" to continue.').format(_('Next'))
] ]
msg = '\n\n'.join(msg) msg = '\n\n'.join(msg)
wizard.create_storage(wizard.path)
wizard.reset_stack() wizard.reset_stack()
wizard.confirm_dialog(title='', message=msg, run_next = lambda x: wizard.run('accept_terms_of_use')) try:
wizard.confirm_dialog(title='', message=msg, run_next = lambda x: wizard.run('accept_terms_of_use'))
except GoBack:
# user clicked 'Cancel' and decided to move wallet file manually
wizard.create_storage(wizard.path)
raise
def accept_terms_of_use(self, window): def accept_terms_of_use(self, window):
vbox = QVBoxLayout() vbox = QVBoxLayout()