AaronFiore/electrum
1
0
Fork 0
Code Activity

add password when creating imported wallet

Browse Source
This commit is contained in:
ThomasV
2015-01-23 00:06:17 +01:00
parent a378922c05
commit 84fc4574d6
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gui/qt/installwizard.py
View File

@@ -443,7 +443,8 @@ class InstallWizard(QDialog):
elif Wallet.is_address(text):
wallet = Wallet.from_address(text, self.storage)
elif Wallet.is_private_key(text):
wallet = Wallet.from_private_key(text, self.storage)
password = self.password_dialog()
wallet = Wallet.from_private_key(text, password, self.storage)
elif Wallet.is_seed(text):
password = self.password_dialog()
wallet = Wallet.from_seed(text, self.storage)

5
lib/wallet.py
View File

@@ -1728,10 +1728,11 @@ class Wallet(object):
return w
@classmethod
def from_private_key(self, text, storage):
def from_private_key(self, text, password, storage):
w = Imported_Wallet(storage)
w.update_password(None, password)
for x in text.split():
w.import_key(x, None)
w.import_key(x, password)
return w
@classmethod