tadd password when creating imported wallet - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 84fc4574d6709788b685dcd801c25401676c04e0
DIR parent a378922c058784007ce7b627df9f72b0bba4c341
HTML Author: ThomasV <thomasv@gitorious>
Date: Fri, 23 Jan 2015 00:06:17 +0100
add password when creating imported wallet
Diffstat:
M gui/qt/installwizard.py | 3 ++-
M lib/wallet.py | 5 +++--
2 files changed, 5 insertions(+), 3 deletions(-)
---
DIR diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
t@@ -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)
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -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