commit 2d835ed0c0533447b333a93149934a84212a8493
parent 99a269fcf5977f519bab9dc9faf72fc7724ee3aa
Author: ThomasV <thomasv@gitorious>
Date: Sun, 6 Nov 2011 11:13:58 +0100
use random seed; do not trust the user for entropy
Diffstat:
| M | client/electrum.py | | | 87 | +++++++++++++++++++++++++++++++++++++++++++++++++------------------------------ |
| M | client/gui.py | | | 209 | +++++++++++++++++++++++++++++++++++++++++++++++++------------------------------ |
2 files changed, 184 insertions(+), 112 deletions(-)
diff --git a/client/electrum.py b/client/electrum.py
@@ -171,8 +171,6 @@ oid_secp256k1 = (1,3,132,0,10)
SECP256k1 = ecdsa.curves.Curve("SECP256k1", curve_secp256k1, generator_secp256k1, oid_secp256k1 )
-no_wallet_message = "Wallet file not found.\nPlease provide a seed and a password. The seed will be to generate Bitcoin addresses. It should be long and random, and nobody should be able to guess it. Memorize it, or write it down and keep it in a vault. The password will be used to encrypt your local wallet file. You will need to enter your password everytime you use your wallet. If you lose your password, you can still recover your wallet with the seed."
-
def filter(s):
out = re.sub('( [^\n]*|)\n','',s)
out = out.replace(' ','')
@@ -228,6 +226,7 @@ class Wallet:
self.host = 'ecdsa.org'
self.port = 50000
self.fee = 0.005
+ self.version = 1
# saved fields
self.use_encryption = False
@@ -245,6 +244,10 @@ class Wallet:
self.message = ''
self.tx_history = {}
+ def new_seed(self, password):
+ seed = "%032x"%ecdsa.util.randrange( pow(2,128) )
+ self.seed = wallet.pw_encode( seed, password)
+
def is_mine(self, address):
return address in self.addresses
@@ -260,6 +263,10 @@ class Wallet:
def create_new_address(self, for_change, password):
seed = self.pw_decode( self.seed, password)
+ # strenghtening
+ for i in range(100000):
+ oldseed = seed
+ seed = hashlib.sha512(seed + oldseed).digest()
i = len( self.addresses ) - len(self.change_addresses) if not for_change else len(self.change_addresses)
seed = Hash( "%d:%d:"%(i,for_change) + seed )
order = generator_secp256k1.order()
@@ -283,23 +290,30 @@ class Wallet:
def recover(self, password):
seed = self.pw_decode( self.seed, password)
+
# todo: recover receiving addresses from tx
- num_gap = 0
+ is_found = False
while True:
addr = self.create_new_address(True, password)
- print "recovering", addr
- if self.status[addr] is None: break
+ #print "recovering", addr
+ if self.status[addr] is not None:
+ is_found = True
+ else:
+ break
num_gap = 0
while True:
addr = self.create_new_address(False, password)
- print "recovering", addr
+ #print "recovering", addr
if self.status[addr] is None:
num_gap += 1
if num_gap == self.gap_limit: break
else:
+ is_found = True
num_gap = 0
+ if not is_found: return False
+
# remove limit-1 addresses. [ this is ok, because change addresses are at the beginning of the list]
n = self.gap_limit
self.addresses = self.addresses[:-n]
@@ -316,9 +330,10 @@ class Wallet:
self.addressbook.append(i)
# redo labels
self.update_tx_labels()
+ return True
def save(self):
- s = repr( (self.use_encryption, self.fee, self.host, self.blocks,
+ s = repr( (self.version, self.use_encryption, self.fee, self.host, self.blocks,
self.seed, self.addresses, self.private_keys,
self.change_addresses, self.status, self.history,
self.labels, self.addressbook) )
@@ -334,11 +349,13 @@ class Wallet:
except:
return False
try:
- (self.use_encryption, self.fee, self.host, self.blocks,
+ sequence = ast.literal_eval( data )
+ (self.version, self.use_encryption, self.fee, self.host, self.blocks,
self.seed, self.addresses, self.private_keys,
self.change_addresses, self.status, self.history,
- self.labels, self.addressbook) = ast.literal_eval( data )
+ self.labels, self.addressbook) = sequence
except:
+ if len(sequence) == 12: raise BaseException("version error.")
return False
self.update_tx_history()
return True
@@ -572,6 +589,10 @@ class Wallet:
return True, tx_hash
+
+
+
+
if __name__ == '__main__':
try:
cmd = sys.argv[1]
@@ -591,11 +612,7 @@ if __name__ == '__main__':
gui.main()
if not wallet.read():
- print no_wallet_message
- seed = raw_input("Enter seed: ")
- if len(seed)<20:
- print "Seed too short. Please at least 20 characters"
- exit(1)
+
if has_encryption:
password = getpass.getpass("Password (hit return if you do not wish to encrypt your wallet):")
if password:
@@ -607,26 +624,30 @@ if __name__ == '__main__':
password = None
print "in order to use wallet encryption, please install pycrypto (sudo easy_install pycrypto)"
- wallet.seed = wallet.pw_encode( seed, password)
-
- print "server name and port number (default: ecdsa.org:50000)"
- host = raw_input("server:")
- if not host: host = 'ecdsa.org'
-
- port = raw_input("port:")
- if not port: port = 50000
- else: port = int(port)
-
- print "default fee for transactions (default 0.005)"
- fee = raw_input("default fee:")
- if not fee: fee = 0.005
-
- wallet.fee = fee
+ host = raw_input("server (default:ecdsa.org):")
+ port = raw_input("port (default:50000):")
+ fee = raw_input("fee (default 0.005):")
+ if fee: wallet.fee = float(fee)
+ if host: wallet.host = host
+ if port: wallet.port = int(port)
+ seed = raw_input("if you are restoring an existing wallet, enter the seed. otherwise just press enter: ")
wallet.gap_limit = 5
- wallet.host = host
- wallet.port = port
- wallet.recover(password)
- wallet.save()
+ if seed:
+ gap = raw_input("gap limit (default 5):")
+ if gap: wallet.gap_limit = int(gap)
+ print "recovering wallet..."
+ r = wallet.recover(password)
+ if r:
+ print "recovery successful"
+ wallet.save()
+ else:
+ print "no wallet found"
+ else:
+ wallet.new_seed(None)
+ print "Your seed is", wallet.seed
+ print "Please store it safely"
+ # generate first key
+ wallet.create_new_address(False, None)
wallet.new_session()
wallet.update()
diff --git a/client/gui.py b/client/gui.py
@@ -39,79 +39,116 @@ def numbify(entry, is_int = False):
def init_wallet(wallet):
if not wallet.read():
- seed = None
- while not seed:
+
+ # ask if the user wants to create a new wallet, or recover from a seed.
+ # if he wants to recover, and nothing is found, do not create wallet
+ dialog = gtk.Dialog("electrum", parent=None,
+ flags=gtk.DIALOG_MODAL|gtk.DIALOG_NO_SEPARATOR,
+ buttons= ("create", 0, "restore",1, "cancel",2) )
+
+ label = gtk.Label("Wallet file not found.\nDo you want to create a new wallet,\n or to restore an existing one?" )
+ label.show()
+ dialog.vbox.pack_start(label)
+ dialog.show()
+ r = dialog.run()
+ dialog.destroy()
+ if r==2:
+ exit(1)
+
+ is_recovery = (r==1)
+
+ if not is_recovery:
+
+ wallet.new_seed(None)
+
+ # ask for the server.
+ run_settings_dialog(wallet, is_create=True, is_recovery=False)
+
+ # generate first key
+ wallet.create_new_address(False, None)
+
+ # run a dialog indicating the seed, ask the user to remember it
dialog = gtk.MessageDialog(
parent = None,
flags = gtk.DIALOG_MODAL,
- buttons = gtk.BUTTONS_OK_CANCEL,
- message_format = "Wallet not found. Please enter a seed to create or recover your wallet. Minimum length: 20 characters" )
-
- p_box = gtk.HBox()
- p_label = gtk.Label('Seed:')
- p_label.show()
- p_box.pack_start(p_label)
- p_entry = gtk.Entry()
- p_entry.show()
- p_box.pack_start(p_entry)
- p_box.show()
- dialog.vbox.pack_start(p_box, False, True, 0)
+ buttons = gtk.BUTTONS_OK,
+ message_format = "Your secret seed is:\n"+ wallet.seed+ "\n\nPlease keep it in a safe place; if you lose it, you will not be able to restore your wallet." )
+
+ dialog.show()
+ r = dialog.run()
+ dialog.destroy()
+ #ask for password
+ change_password_dialog(wallet, None)
+
+ else:
+ # ask for the server, seed and gap.
+ run_settings_dialog(wallet, is_create=True, is_recovery=True)
+
+ dialog = gtk.MessageDialog(
+ parent = None,
+ flags = gtk.DIALOG_MODAL,
+ buttons = gtk.BUTTONS_CANCEL,
+ message_format = "Please wait..." )
dialog.show()
+
+ def recover_thread( wallet, dialog, password ):
+ wallet.is_found = wallet.recover( password )
+ if wallet.is_found:
+ wallet.save()
+ gobject.idle_add( dialog.destroy )
+
+ thread.start_new_thread( recover_thread, ( wallet, dialog, None ) ) # no password
r = dialog.run()
- seed = p_entry.get_text()
dialog.destroy()
if r==gtk.RESPONSE_CANCEL: exit(1)
- if len(seed) < 20:
- print len(seed)
- seed = None
+ if not wallet.is_found:
+ show_message("No transactions found for this seed")
- # disable password during recovery
- # change_password_dialog(None, wallet)
- wallet.seed = seed
-
- run_settings_dialog( None, wallet, True)
+def settings_dialog(wallet, is_create, is_recovery):
+ if is_create:
dialog = gtk.MessageDialog(
parent = None,
flags = gtk.DIALOG_MODAL,
- buttons = gtk.BUTTONS_CANCEL,
- message_format = "Please wait..." )
- dialog.show()
-
- def recover_thread( wallet, dialog, password ):
- wallet.recover( password )
- wallet.save()
- gobject.idle_add( dialog.destroy )
-
- thread.start_new_thread( recover_thread, ( wallet, dialog, None ) ) # no password
- r = dialog.run()
- dialog.destroy()
- if r==gtk.RESPONSE_CANCEL: exit(1)
-
-def settings_dialog(wallet, is_recover):
-
- dialog = gtk.MessageDialog(
- parent = None,
- flags = gtk.DIALOG_MODAL,
- buttons = gtk.BUTTONS_OK_CANCEL,
- message_format = "Please indicate the server, and the gap limit if you are recovering a lost wallet." if is_recover else 'Settings')
+ buttons = gtk.BUTTONS_OK_CANCEL,
+ message_format = "Please indicate the server and port number" if not is_recovery else 'Please enter the seed, the server and gap')
+ else:
+ dialog = gtk.Dialog("settings", parent=None,
+ flags=gtk.DIALOG_MODAL|gtk.DIALOG_NO_SEPARATOR,
+ buttons= ("cancel", 0, "ok", 1) )
+ vbox = dialog.vbox
dialog.set_default_response(gtk.RESPONSE_OK)
- gap = gtk.HBox()
- gap_label = gtk.Label('Max. gap:')
- gap_label.set_size_request(100,10)
- gap_label.show()
- gap.pack_start(gap_label,False, False, 10)
- gap_entry = gtk.Entry()
- gap_entry.set_text("%d"%wallet.gap_limit)
- gap_entry.connect('changed', numbify, True)
- gap_entry.show()
- gap.pack_start(gap_entry,False,False, 10)
- add_help_button(gap, 'The maximum gap that is allowed between unused addresses in your wallet. During wallet recovery, this parameter is used to decide when to stop the recovery process. If you increase this value, you will need to remember it in order to be able to recover your wallet from seed.')
- gap.show()
+ if is_recovery:
+ # ask seed, server and gap in the same dialog
+
+ seed_box = gtk.HBox()
+ seed_label = gtk.Label('Seed:')
+ seed_label.show()
+ seed_box.pack_start(seed_label)
+ seed_entry = gtk.Entry()
+ seed_entry.show()
+ seed_box.pack_start(seed_entry)
+ seed_box.show()
+ vbox.pack_start(seed_box, False, False, 5)
+
+ if is_recovery or (not is_create):
+ gap = gtk.HBox()
+ gap_label = gtk.Label('Max. gap:')
+ gap_label.set_size_request(100,10)
+ gap_label.show()
+ gap.pack_start(gap_label,False, False, 10)
+ gap_entry = gtk.Entry()
+ gap_entry.set_text("%d"%wallet.gap_limit)
+ gap_entry.connect('changed', numbify, True)
+ gap_entry.show()
+ gap.pack_start(gap_entry,False,False, 10)
+ add_help_button(gap, 'The maximum gap that is allowed between unused addresses in your wallet. During wallet recovery, this parameter is used to decide when to stop the recovery process. If you increase this value, you will need to remember it in order to be able to recover your wallet from seed.')
+ gap.show()
+ vbox.pack_start(gap, False,False, 5)
host = gtk.HBox()
host_label = gtk.Label('Server:')
@@ -124,10 +161,11 @@ def settings_dialog(wallet, is_recover):
host.pack_start(host_entry,False,False, 10)
add_help_button(host, 'The name and port number of your Bitcoin server, separated by a colon. Example: ecdsa.org:50000')
host.show()
+ vbox.pack_start(host, False,False, 5)
- fee = gtk.HBox()
- fee_entry = gtk.Entry()
- if not is_recover:
+ if not is_create:
+ fee = gtk.HBox()
+ fee_entry = gtk.Entry()
fee_label = gtk.Label('Tx. fee:')
fee_label.set_size_request(100,10)
fee_label.show()
@@ -138,33 +176,41 @@ def settings_dialog(wallet, is_recover):
fee.pack_start(fee_entry,False,False, 10)
add_help_button(fee, 'Transaction fee. Recommended value:0.005')
fee.show()
+ vbox.pack_start(fee, False,False, 5)
+
+ if not is_create:
+ return dialog, fee_entry, gap_entry, host_entry
+ elif is_recovery:
+ return dialog, seed_entry, gap_entry, host_entry
+ else:
+ return dialog, host_entry
- vbox = dialog.vbox
- vbox.pack_start(host, False,False, 5)
- vbox.pack_start(gap, False,False, 5)
- vbox.pack_start(fee, False, False, 5)
- return dialog, gap_entry, host_entry, fee_entry
+def run_settings_dialog( wallet, is_create, is_recovery):
+
+ if not is_create:
+ dialog, fee_entry, gap_entry, host_entry = settings_dialog(wallet, is_create, is_recovery)
+ elif is_recovery:
+ dialog, seed_entry, gap_entry, host_entry = settings_dialog(wallet, is_create, is_recovery)
+ else:
+ dialog, host_entry, = settings_dialog(wallet, is_create, is_recovery)
-def run_settings_dialog( widget, wallet, is_recovery):
- dialog, gap_entry, host_entry, fee_entry = settings_dialog(wallet, is_recovery)
dialog.show()
r = dialog.run()
- gap = gap_entry.get_text()
hh = host_entry.get_text()
- fee = fee_entry.get_text()
+ if is_recovery:
+ gap = gap_entry.get_text()
+ seed = seed_entry.get_text()
dialog.destroy()
if r==-6:
- if is_recovery:
- exit(1)
- else:
- return
+ exit(1)
try:
a, b = hh.split(':')
- wallet.gap_limit = int(gap)
wallet.host = a
wallet.port = int(b)
- wallet.fee = float(fee)
+ if is_recovery:
+ wallet.seed = seed
+ wallet.gap_limit = int(gap)
except:
pass
@@ -205,9 +251,14 @@ def password_dialog():
dialog.destroy()
if result: return pw
-def change_password_dialog(button, wallet, icon):
- dialog = gtk.MessageDialog( None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_QUESTION, gtk.BUTTONS_OK_CANCEL,
- 'Your wallet is encrypted' if wallet.use_encryption else 'Your wallet is not encrypted')
+def change_password_dialog(wallet, icon):
+ if icon:
+ msg = 'Your wallet is encrypted' if wallet.use_encryption else 'Your wallet is not encrypted'
+ else:
+ msg = "Please choose a password to encrypt your wallet keys"
+
+ dialog = gtk.MessageDialog( None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_QUESTION, gtk.BUTTONS_OK_CANCEL, msg)
+
if wallet.use_encryption:
current_pw, current_pw_entry = password_line('Current password:')
dialog.vbox.pack_start(current_pw, False, True, 0)
@@ -308,7 +359,7 @@ class BitcoinGUI:
settings_icon.show()
prefs_button = gtk.Button()
- prefs_button.connect("clicked", run_settings_dialog, self.wallet, False)
+ prefs_button.connect("clicked", lambda x: run_settings_dialog(self.wallet, False, False) )
prefs_button.add(settings_icon)
prefs_button.set_tooltip_text("Settings")
prefs_button.set_relief(gtk.RELIEF_NONE)
@@ -322,7 +373,7 @@ class BitcoinGUI:
pw_icon.show()
password_button = gtk.Button()
- password_button.connect("clicked", change_password_dialog, self.wallet, pw_icon)
+ password_button.connect("clicked", lambda x: change_password_dialog(self.wallet, pw_icon))
password_button.add(pw_icon)
password_button.set_relief(gtk.RELIEF_NONE)
password_button.show()
