AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #5617

Browse Source
This commit is contained in:
SomberNight
2019-09-04 13:53:38 +02:00
parent a42a773d19
commit 99b83f7527
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
electrum/plugins/trustedcoin/trustedcoin.py
View File

@@ -47,7 +47,7 @@ from electrum.plugin import BasePlugin, hook
from electrum.util import NotEnoughFunds, UserFacingException
from electrum.storage import StorageEncryptionVersion
from electrum.network import Network
from electrum.base_wizard import BaseWizard
from electrum.base_wizard import BaseWizard, WizardWalletPasswordSetting
from electrum.logging import Logger
@@ -594,7 +594,10 @@ class TrustedCoinPlugin(BasePlugin):
k1.update_password(None, password)
wizard.data['x1/'] = k1.dump()
wizard.data['x2/'] = k2.dump()
wizard.pw_args = password, encrypt_storage, StorageEncryptionVersion.USER_PASSWORD
wizard.pw_args = WizardWalletPasswordSetting(password=password,
encrypt_storage=encrypt_storage,
storage_enc_version=StorageEncryptionVersion.USER_PASSWORD,
encrypt_keystore=bool(password))
self.go_online_dialog(wizard)
def restore_wallet(self, wizard):
@@ -642,7 +645,10 @@ class TrustedCoinPlugin(BasePlugin):
xpub3 = make_xpub(get_signing_xpub(xtype), long_user_id)
k3 = keystore.from_xpub(xpub3)
wizard.data['x3/'] = k3.dump()
wizard.pw_args = password, encrypt_storage, StorageEncryptionVersion.USER_PASSWORD
wizard.pw_args = WizardWalletPasswordSetting(password=password,
encrypt_storage=encrypt_storage,
storage_enc_version=StorageEncryptionVersion.USER_PASSWORD,
encrypt_keystore=bool(password))
wizard.terminate()
def create_remote_key(self, email, wizard):