# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import re, sys
+import re
+import sys
+import optparse
+
+try:
+ from lib.util import print_error
+except ImportError:
+ from electrum.util import print_error
try:
import ecdsa
-except:
- sys.stderr.write("Error: python-ecdsa does not seem to be installed. Try 'sudo pip install ecdsa'\n")
- sys.stderr.flush()
- sys.exit(1)
+except ImportError:
+ sys.exit("Error: python-ecdsa does not seem to be installed. Try 'sudo pip install ecdsa'")
try:
import aes
-except:
- sys.stderr.write("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'\n")
- sys.stderr.flush()
- sys.exit(1)
+except ImportError:
+ sys.exit("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'")
try:
- from lib import Wallet, WalletSynchronizer, format_satoshis, mnemonic, prompt_password
+ from lib import Wallet, Interface, WalletSynchronizer, WalletVerifier, format_satoshis, mnemonic, SimpleConfig, pick_random_server
except ImportError:
- from electrum import Wallet, WalletSynchronizer, format_satoshis, mnemonic, prompt_password
-
-from optparse import OptionParser
+ from electrum import Wallet, Interface, WalletSynchronizer, WalletVerifier, format_satoshis, mnemonic, SimpleConfig, pick_random_server
+
from decimal import Decimal
known_commands = {
'import':
'Imports a key pair\nSyntax: import <address>:<privatekey>',
'signmessage':
- 'Signs a message with a key\nSyntax: signmessage <address> <message>',
+ 'Signs a message with a key\nSyntax: signmessage <address> <message>\nIf you want to lead or end a message with spaces, or want double spaces inside the message make sure you quote the string. I.e. " Hello This is a weird String "',
'verifymessage':
- 'Verifies a signature\nSyntax: verifymessage <address> <signature> <message>',
+ 'Verifies a signature\nSyntax: verifymessage <address> <signature> <message>\nIf you want to lead or end a message with spaces, or want double spaces inside the message make sure you quote the string. I.e. " Hello This is a weird String "',
'eval':
"Run python eval() on an object\nSyntax: eval <expression>\nExample: eval \"wallet.aliases\"",
+ 'set':
+ "Set wallet parameter. (gui)",
'deseed':
"Remove seed from the wallet. The seed is stored in a file that has the name of the wallet plus '.seed'",
'reseed':
-offline_commands = [ 'password', 'mktx', 'label', 'contacts', 'help', 'validateaddress', 'signmessage', 'verifymessage', 'eval', 'create', 'addresses', 'import', 'seed','deseed','reseed','freeze','unfreeze','prioritize','unprioritize']
+offline_commands = [ 'password', 'mktx',
+ 'label', 'contacts',
+ 'help', 'validateaddress',
+ 'signmessage', 'verifymessage',
+ 'eval', 'set', 'create', 'addresses',
+ 'import', 'seed',
+ 'deseed','reseed',
+ 'freeze','unfreeze',
+ 'prioritize','unprioritize']
+
protected_commands = ['payto', 'password', 'mktx', 'seed', 'import','signmessage' ]
+# get password routine
+def prompt_password(prompt, confirm=True):
+ import getpass
+ if sys.stdin.isatty():
+ password = getpass.getpass(prompt)
+ if password and confirm:
+ password2 = getpass.getpass("Confirm: ")
+ if password != password2:
+ sys.exit("Error: Passwords do not match.")
+ else:
+ password = raw_input(prompt)
+ if not password:
+ password = None
+ return password
+
+
+
if __name__ == '__main__':
usage = "usage: %prog [options] command\nCommands: "+ (', '.join(known_commands))
- parser = OptionParser(usage=usage)
- parser.add_option("-g", "--gui", dest="gui", default="lite", help="gui")
+ parser = optparse.OptionParser(prog=usage)
+ parser.add_option("-g", "--gui", dest="gui", help="User interface: qt, lite, gtk or text")
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("-a", "--all", action="store_true", dest="show_all", default=False, help="show all addresses")
parser.add_option("-b", "--balance", action="store_true", dest="show_balance", default=False, help="show the balance at listed addresses")
parser.add_option("-k", "--keys",action="store_true", dest="show_keys",default=False, help="show the private keys of listed addresses")
parser.add_option("-f", "--fee", dest="tx_fee", default="0.005", help="set tx fee")
- parser.add_option("-s", "--fromaddr", dest="from_addr", default=None, help="set source address for payto/mktx. if it isn't in the wallet, it will ask for the private key unless supplied in the format public_key:private_key. It's not saved in the wallet.")
+ parser.add_option("-F", "--fromaddr", dest="from_addr", default=None, help="set source address for payto/mktx. if it isn't in the wallet, it will ask for the private key unless supplied in the format public_key:private_key. It's not saved in the wallet.")
parser.add_option("-c", "--changeaddr", dest="change_addr", default=None, help="set the change address for payto/mktx. default is a spare address, or the source address if it's not in the wallet")
- parser.add_option("-r", "--remote", dest="remote_url", default=None, help="URL of a remote wallet")
+ parser.add_option("-s", "--server", dest="server", default=None, help="set server host:port:protocol, where protocol is t or h")
+ parser.add_option("-p", "--proxy", dest="proxy", default=None, help="set proxy [type:]host[:port], where type is socks4,socks5 or http")
options, args = parser.parse_args()
- wallet = Wallet()
- wallet.set_path(options.wallet_path)
- wallet.read()
- wallet.remote_url = options.remote_url
+ # config is an object passed to the various constructors (wallet, interface, gui)
+ config = SimpleConfig(options)
+ wallet = Wallet(config)
if len(args)==0:
url = None
else:
cmd = args[0]
firstarg = args[1] if len(args) > 1 else ''
-
+
+ #this entire if/else block is just concerned with importing the
+ #right GUI toolkit based the GUI command line option given
if cmd == 'gui':
- if options.gui=='gtk':
+ pref_gui = config.get('gui','classic')
+ if pref_gui == 'gtk':
try:
import lib.gui as gui
except ImportError:
import electrum.gui as gui
- elif options.gui=='qt':
+ elif pref_gui in ['classic', 'qt']:
try:
import lib.gui_qt as gui
except ImportError:
import electrum.gui_qt as gui
- elif options.gui == 'lite':
- try:
- import lib.gui_lite as gui
- except ImportError:
- import electrum.gui_lite as gui
+ elif pref_gui == 'lite':
+ try:
+ import lib.gui_lite as gui
+ except ImportError:
+ import electrum.gui_lite as gui
+ elif pref_gui == 'text':
+ try:
+ import lib.gui_text as gui
+ except ImportError:
+ import electrum.gui_text as gui
else:
- sys.stderr.write("Error: Unknown GUI: " + options.gui + "\n")
- sys.stderr.flush()
- exit(1)
+ sys.exit("Error: Unknown GUI: " + pref_gui )
+
+ gui = gui.ElectrumGui(wallet, config)
+ interface = Interface(config, True)
+ interface.register_callback('peers', gui.server_list_changed)
+ interface.start()
+ wallet.interface = interface
- gui = gui.ElectrumGui(wallet)
- WalletSynchronizer(wallet,True).start()
+ WalletSynchronizer(wallet, config).start()
+ WalletVerifier(wallet, config).start()
try:
- found = wallet.file_exists
+ found = config.wallet_file_exists
if not found:
found = gui.restore_or_create()
except SystemExit, e:
if cmd not in known_commands:
cmd = 'help'
- if not wallet.file_exists and cmd not in ['help','create','restore']:
- sys.stderr.write("Error: Wallet file not found.\n")
- sys.stderr.write("Type 'electrum create' to create a new wallet, or provide a path to a wallet with the -w option\n")
- sys.stderr.flush()
+ if not config.wallet_file_exists and cmd not in ['help','create','restore']:
+ print "Error: Wallet file not found."
+ print "Type 'electrum create' to create a new wallet, or provide a path to a wallet with the -w option"
sys.exit(0)
if cmd in ['create', 'restore']:
- if wallet.file_exists:
- sys.stderr.write("Error: Remove the existing wallet first!\n")
- sys.stderr.flush()
- sys.exit(0)
+ if config.wallet_file_exists:
+ sys.exit("Error: Remove the existing wallet first!")
password = prompt_password("Password (hit return if you do not wish to encrypt your wallet):")
- w_host, w_port, w_protocol = wallet.server.split(':')
+ server = config.get('server')
+ if not server: server = pick_random_server()
+ w_host, w_port, w_protocol = server.split(':')
host = raw_input("server (default:%s):"%w_host)
port = raw_input("port (default:%s):"%w_port)
protocol = raw_input("protocol [t=tcp;h=http;n=native] (default:%s):"%w_protocol)
if host: w_host = host
if port: w_port = port
if protocol: w_protocol = protocol
- wallet.server = w_host + ':' + w_port + ':' +w_protocol
+ wallet.config.set_key('server', w_host + ':' + w_port + ':' +w_protocol)
if fee: wallet.fee = float(fee)
if gap: wallet.gap_limit = int(gap)
try:
seed.decode('hex')
except:
- sys.stderr.write("Warning: Not hex, trying decode.\n")
- sys.stderr.flush()
+ print_error("Warning: Not hex, trying decode.")
seed = mnemonic.mn_decode( seed.split(' ') )
if not seed:
- sys.stderr.write("Error: No seed\n")
- sys.stderr.flush()
- sys.exit(1)
+ sys.exit("Error: No seed")
wallet.seed = str(seed)
wallet.init_mpk( wallet.seed )
if not options.offline:
- WalletSynchronizer(wallet).start()
+ WalletSynchronizer(wallet, config).start()
print "Recovering wallet..."
wallet.up_to_date_event.clear()
wallet.up_to_date = False
if wallet.is_found():
print "Recovery successful"
else:
- sys.stderr.write("Warning: Found no history for this wallet\n")
- sys.stderr.flush()
+ print_error("Warning: Found no history for this wallet")
+ else:
+ wallet.synchronize()
wallet.fill_addressbook()
wallet.save()
- sys.stderr.write("Wallet saved in '" + wallet.path + "'\n")
- sys.stderr.flush()
+ print_error("Wallet saved in '" + wallet.path)
else:
wallet.new_seed(None)
wallet.init_mpk( wallet.seed )
print "Please keep it in a safe place; if you lose it, you will not be able to restore your wallet."
print "Equivalently, your wallet seed can be stored and recovered with the following mnemonic code:"
print "\""+' '.join(mnemonic.mn_encode(wallet.seed))+"\""
- print "Wallet saved in '%s'"%wallet.path
+ print "Wallet saved in '%s'"%wallet.config.path
if password:
wallet.update_password(wallet.seed, None, password)
# open session
if cmd not in offline_commands and not options.offline:
- WalletSynchronizer(wallet).start()
+ interface = Interface(config)
+ interface.register_callback('connected', lambda: print_error("Connected to " + interface.connection_msg))
+ interface.start()
+ wallet.interface = interface
+ WalletSynchronizer(wallet, config).start()
wallet.update()
wallet.save()
if from_addr not in wallet.all_addresses():
is_temporary = True
+ # important warning
+ if cmd=='addresses' and options.show_keys:
+ print "WARNING: ALL your private keys are secret."
+ print "Exposing a single private key can compromise your entire wallet!"
+ print "In particular, DO NOT use 'redeem private key' services proposed by third parties."
+
# commands needing password
if cmd in protected_commands or ( cmd=='addresses' and options.show_keys):
- password = prompt_password('Password:') if wallet.use_encryption and not is_temporary else None
+ password = prompt_password('Password:', False) if wallet.use_encryption and not is_temporary else None
# check password
try:
wallet.pw_decode( wallet.seed, password)
except:
- sys.stderr.write("Error: This password does not decode this wallet.\n")
- sys.stderr.flush()
+ print_error("Error: This password does not decode this wallet.")
exit(1)
if cmd == 'import':
- keypair = args[1]
+ # See if they specificed a key on the cmd line, if not prompt
+ if len(args) > 1:
+ keypair = args[1]
+ else:
+ keypair = prompt_password('Enter Address:PrivateKey (will not echo):', False)
try:
wallet.import_key(keypair,password)
wallet.save()
print "Keypair imported"
except BaseException, e:
- sys.stderr.write("Error: Keypair import failed: " + str(e) + "\n")
- sys.stderr.flush()
+ print_error("Error: Keypair import failed: " + str(e))
- if cmd=='help':
+ if cmd == 'help':
cmd2 = firstarg
if cmd2 not in known_commands:
+ parser.print_help()
print "Type 'electrum help <command>' to see the help for a specific command"
print "Type 'electrum --help' to see the list of options"
print "List of commands:", ', '.join(known_commands)
elif cmd == 'deseed':
if not wallet.seed:
- sys.stderr.write("Error: This wallet has no seed\n")
- sys.stderr.flush()
+ print_error("Error: This wallet has no seed")
elif wallet.use_encryption:
- sys.stderr.write("Error: This wallet is encrypted\n")
- sys.stderr.flush()
+ print_error("Error: This wallet is encrypted")
else:
ns = wallet.path + '.seed'
print "Warning: you are going to extract the seed from '%s'\nThe seed will be saved in '%s'"%(wallet.path,ns)
wallet.save()
print "Done."
else:
- sys.stderr.write("Action canceled.\n")
- sys.stderr.flush()
+ print_error("Action canceled.")
elif cmd == 'reseed':
if wallet.seed:
f = open(ns,'r')
data = f.read()
f.close()
- except:
- sys.stderr.write("Error: Seed file not found\n")
- sys.stderr.flush()
- sys.exit()
+ except IOError:
+ sys.exit("Error: Seed file not found")
try:
import ast
d = ast.literal_eval( data )
seed = d['seed']
imported_keys = d.get('imported_keys',{})
except:
- sys.stderr.write("Error: Error with seed file\n")
- sys.stderr.flush()
- sys.exit(1)
+ sys.exit("Error: Error with seed file")
mpk = wallet.master_public_key
wallet.seed = seed
wallet.save()
print "Done: " + wallet.path
else:
- sys.stderr.write("Error: Master public key does not match\n")
- sys.stderr.flush()
+ print_error("Error: Master public key does not match")
elif cmd == 'validateaddress':
addr = args[1]
print eval(args[1])
wallet.save()
+ elif cmd == 'set':
+ key, value = args[1:3]
+ if key in ['gui', 'server', 'proxy', 'fee', 'gap_limit', 'use_change']:
+ wallet.config.set_key(key, value, True)
+ print True
+ else:
+ print False
+
elif cmd in [ 'addresses']:
for addr in wallet.all_addresses():
if options.show_all or not wallet.is_change(addr):
tx = args[1]
label = ' '.join(args[2:])
except:
- sys.stderr.write("Error. Syntax: label <tx_hash> <text>\n")
- sys.stderr.flush()
+ print_error("Error. Syntax: label <tx_hash> <text>")
sys.exit(1)
wallet.labels[tx] = label
wallet.save()
keypair = from_addr
from_addr = keypair.split(':')[0]
if not wallet.import_key(keypair,password):
- sys.stderr.write("Error: Invalid key pair\n")
- sys.stderr.flush()
+ print_error("Error: Invalid key pair")
exit(1)
wallet.history[from_addr] = interface.retrieve_history(from_addr)
wallet.update_tx_history()
elif cmd == 'password':
try:
seed = wallet.pw_decode( wallet.seed, password)
- except:
- sys.stderr.write("Error: Password does not decrypt this wallet.\n")
- sys.stderr.flush()
- sys.exit(1)
+ except ValueError:
+ sys.exit("Error: Password does not decrypt this wallet.")
new_password = prompt_password('New password:')
wallet.update_password(seed, password, new_password)
elif cmd == 'signmessage':
+ if len(args) < 3:
+ print_error("Error: Invalid usage of signmessage.")
+ print known_commands[cmd]
+ sys.exit(1)
address = args[1]
message = ' '.join(args[2:])
if len(args) > 3:
signature = args[2]
message = ' '.join(args[3:])
except:
- sys.stderr.write("Error: Not all parameters were given, displaying help instead.\n")
- sys.stderr.flush()
+ print_error("Error: Not all parameters were given, displaying help instead.")
print known_commands[cmd]
sys.exit(1)
if len(args) > 4:
try:
wallet.verify_message(address, signature, message)
print True
- except:
+ except BaseException as e:
+ print "Verification error: {0}".format(e)
print False
elif cmd == 'freeze':
addr = args[1]
- print self.wallet.freeze(addr)
+ print wallet.freeze(addr)
elif cmd == 'unfreeze':
addr = args[1]
- print self.wallet.unfreeze(addr)
+ print wallet.unfreeze(addr)
elif cmd == 'prioritize':
addr = args[1]
- print self.wallet.prioritize(addr)
+ print wallet.prioritize(addr)
elif cmd == 'unprioritize':
addr = args[1]
- print self.wallet.unprioritize(addr)
+ print wallet.unprioritize(addr)
git://git.novaco.in / electrum-nvc.git / blobdiff