commit adcda6153dcf29317573ca66b9364a5a25d82c94
parent 30934b69db6a5e6ae2059dc09b539c47f1d5549d
Author: ThomasV <thomasv@gitorious>
Date: Sat, 9 Nov 2013 08:15:51 +0100
Merge branch 'master' of git://github.com/spesmilo/electrum
Diffstat:
4 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/electrum b/electrum
@@ -71,6 +71,7 @@ def arg_parser():
parser.add_option("-g", "--gui", dest="gui", help="User interface: qt, lite, gtk, text or stdio")
parser.add_option("-w", "--wallet", dest="wallet_path", help="wallet path (default: electrum.dat)")
parser.add_option("-o", "--offline", action="store_true", dest="offline", default=False, help="remain offline")
+ parser.add_option("-C", "--concealed", action="store_true", dest="concealed", default=False, help="don't echo seed to console when restoring")
parser.add_option("-a", "--all", action="store_true", dest="show_all", default=False, help="show all addresses")
parser.add_option("-l", "--labels", action="store_true", dest="show_labels", default=False, help="show the labels of listed addresses")
parser.add_option("-f", "--fee", dest="tx_fee", default=None, help="set tx fee")
@@ -209,7 +210,8 @@ if __name__ == '__main__':
if gap: wallet.change_gap_limit(int(gap))
if cmd.name == 'restore':
- seed = raw_input("seed:")
+ import getpass
+ seed = getpass.getpass(prompt = "seed:", stream = None) if options.concealed else raw_input("seed:")
try:
seed.decode('hex')
except:
diff --git a/gui/gtk.py b/gui/gtk.py
@@ -242,8 +242,9 @@ def run_network_dialog( network, parent ):
import random
status = "Please choose a server.\nSelect cancel if you are offline."
- server = interface.server
- host, port, protocol = server.split(':')
+ if network.is_connected():
+ server = interface.server
+ host, port, protocol = server.split(':')
servers = network.get_servers()
@@ -261,7 +262,10 @@ def run_network_dialog( network, parent ):
host_box.pack_start(host_label, False, False, 10)
host_entry = gtk.Entry()
host_entry.set_size_request(200,-1)
- host_entry.set_text(server)
+ if network.is_connected():
+ host_entry.set_text(server)
+ else:
+ host_entry.set_text("Not Connected")
host_entry.show()
host_box.pack_start(host_entry, False, False, 10)
add_help_button(host_box, 'The name, port number and protocol of your Electrum server, separated by a colon. Example: "ecdsa.org:50002:s". Some servers allow you to connect through http (port 80) or https (port 443)')
@@ -286,7 +290,7 @@ def run_network_dialog( network, parent ):
def current_line():
return unicode(host_entry.get_text()).split(':')
-
+
def set_combobox(protocol):
combobox.set_active('tshg'.index(protocol))
@@ -300,7 +304,8 @@ def run_network_dialog( network, parent ):
host_entry.set_text( host + ':' + port + ':' + protocol)
combobox.connect("changed", lambda x:set_protocol('tshg'[combobox.get_active()]))
- set_combobox(protocol)
+ if network.is_connected():
+ set_combobox(protocol)
server_list = gtk.ListStore(str)
for host in servers.keys():
@@ -898,8 +903,7 @@ class ElectrumWindow:
cell.set_property('editable', True)
def edited_cb(cell, path, new_text, h_list):
tx = h_list.get_value( h_list.get_iter(path), 0)
- self.wallet.labels[tx] = new_text
- self.wallet.save()
+ self.wallet.set_label(tx,new_text)
self.update_history_tab()
cell.connect('edited', edited_cb, self.history_list)
def editing_started(cell, entry, path, h_list):
@@ -942,7 +946,7 @@ class ElectrumWindow:
def create_recv_tab(self):
- self.recv_list = gtk.ListStore(str, str, str)
+ self.recv_list = gtk.ListStore(str, str, str, str)
self.add_tab( self.make_address_list(True), 'Receive')
self.update_receiving_tab()
@@ -974,8 +978,7 @@ class ElectrumWindow:
cell.set_property('editable', True)
def edited_cb2(cell, path, new_text, liststore):
address = liststore.get_value( liststore.get_iter(path), 0)
- self.wallet.labels[address] = new_text
- self.wallet.save()
+ self.wallet.set_label(address, new_text)
self.update_receiving_tab()
self.update_sending_tab()
self.update_history_tab()
@@ -989,6 +992,13 @@ class ElectrumWindow:
tvcolumn.pack_start(cell, True)
tvcolumn.add_attribute(cell, 'text', 2)
+ if is_recv:
+ tvcolumn = gtk.TreeViewColumn('Type')
+ treeview.append_column(tvcolumn)
+ cell = gtk.CellRendererText()
+ tvcolumn.pack_start(cell, True)
+ tvcolumn.add_attribute(cell, 'text', 3)
+
scroll = gtk.ScrolledWindow()
scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
scroll.add(treeview)
@@ -1102,12 +1112,16 @@ class ElectrumWindow:
def update_receiving_tab(self):
self.recv_list.clear()
for address in self.wallet.addresses(True):
- if self.wallet.is_change(address):continue
+ Type = "R"
+ if self.wallet.is_change(address): Type = "C"
+ if address in self.wallet.imported_keys.keys(): Type = "I"
+ if address in self.wallet.frozen_addresses: Type = Type + "F"
+ if address in self.wallet.prioritized_addresses: Type = Type + "P"
label = self.wallet.labels.get(address)
h = self.wallet.history.get(address,[])
n = len(h)
- tx = "None" if n==0 else "%d"%n
- self.recv_list.append((address, label, tx ))
+ tx = "0" if n==0 else "%d"%n
+ self.recv_list.append((address, label, tx, Type ))
def update_sending_tab(self):
# detect addresses that are not mine in history, add them here...
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -1124,8 +1124,9 @@ class ElectrumWindow(QMainWindow):
menu.addAction(_("Copy to clipboard"), lambda: self.app.clipboard().setText(addr))
menu.addAction(_("QR code"), lambda: self.show_qrcode("bitcoin:" + addr, _("Address")) )
menu.addAction(_("Edit label"), lambda: self.edit_label(True))
- menu.addAction(_("Private key"), lambda: self.show_private_key(addr))
- menu.addAction(_("Sign message"), lambda: self.sign_message(addr))
+ if self.wallet.seed:
+ menu.addAction(_("Private key"), lambda: self.show_private_key(addr))
+ menu.addAction(_("Sign message"), lambda: self.sign_message(addr))
if addr in self.wallet.imported_keys:
menu.addAction(_("Remove from wallet"), lambda: self.delete_imported_key(addr))
diff --git a/lib/wallet.py b/lib/wallet.py
@@ -347,6 +347,7 @@ class Wallet:
if not c0:
self.seed_version = 4
+ self.storage.put('seed_version', self.seed_version, True)
self.create_old_account(K0)
return
@@ -355,6 +356,7 @@ class Wallet:
"m/0'/": (c0, K0, cK0),
}
self.storage.put('master_public_keys', self.master_public_keys, True)
+ self.storage.put('seed_version', self.seed_version, True)
self.create_account('1','Main account')
