X-Git-Url: https://git.novaco.in/?p=electrum-nvc.git;a=blobdiff_plain;f=electrum;h=e63803db8f954e5e949961d72d00f61acfaabac3;hp=6fb6665e2fcc89d5166023437650a91e9caebe50;hb=99a31b0c6a30bad2cb2b8c27a748a1f25a89c107;hpb=2070672ac7478ea6c3f4982fa56a11f481c1f588 diff --git a/electrum b/electrum index 6fb6665..e63803d 100755 --- a/electrum +++ b/electrum @@ -21,20 +21,11 @@ import json import optparse import os import re +import ast import sys import time import traceback -try: - import ecdsa # todo: 'ecdsa' imported but unused -except ImportError: - sys.exit("Error: python-ecdsa does not seem to be installed. Try 'sudo pip install ecdsa'") - -try: - import aes # todo: 'aes' imported but unused -except ImportError: - sys.exit("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'") - is_local = os.path.dirname(os.path.realpath(__file__)) == os.getcwd() is_android = 'ANDROID_DATA' in os.environ @@ -48,8 +39,12 @@ if __builtin__.use_local_modules: imp.load_module('electrum', *imp.find_module('lib')) imp.load_module('electrum_gui', *imp.find_module('gui')) -from electrum import * # todo: import * is generally frowned upon. should import just what is used +if is_local: + sys.path.append('packages') + +from electrum import SimpleConfig, Network, Wallet, WalletStorage, NetworkProxy, Commands, known_commands, pick_random_server +from electrum.util import print_msg, print_stderr, print_json, set_verbosity # get password routine def prompt_password(prompt, confirm=True): @@ -90,7 +85,9 @@ def arg_parser(): parser.add_option("-W", "--password", dest="password", default=None, help="set password for usage with commands (currently only implemented for create command, do not use it for longrunning gui session since the password is visible in /proc)") parser.add_option("-1", "--oneserver", action="store_true", dest="oneserver", default=False, help="connect to one server only") parser.add_option("--bip32", action="store_true", dest="bip32", default=False, help="bip32 (not final)") + parser.add_option("--2of3", action="store_true", dest="2of3", default=False, help="create 2of3 wallet") parser.add_option("--mpk", dest="mpk", default=False, help="restore from master public key") + parser.add_option("-m", action="store_true", dest="hide_gui", default=False, help="hide GUI on startup") return parser @@ -106,36 +103,27 @@ def print_help_cb(self, opt, value, parser): print_help(parser) -def run_command(cmd, password=None, args=[]): - import xmlrpclib, socket - cmd_runner = Commands(wallet, network) - func = getattr(cmd_runner, cmd.name) - cmd_runner.password = password - +def run_command(cmd, password=None, args=None): + if args is None: + args = [] # Do not use mutables as default values! if cmd.requires_network and not options.offline: - cmd_runner.network = xmlrpclib.ServerProxy('http://localhost:8000') - - while True: - try: - if cmd_runner.network.ping() == 'pong': - break - except socket.error: - if cmd.name != 'daemon': - start_daemon() - else: - print "Daemon not running" - sys.exit(1) + network = NetworkProxy(config) + if not network.start(start_daemon= (True if cmd.name!='daemon' else False)): + print "Daemon not running" + sys.exit(1) if wallet: - wallet.start_threads(cmd_runner.network) + wallet.start_threads(network) wallet.update() else: - cmd_runner.network = None + network = None + cmd_runner = Commands(wallet, network) + func = getattr(cmd_runner, cmd.name) + cmd_runner.password = password try: result = func(*args[1:]) except Exception: - print "ecxeption" traceback.print_exc(file=sys.stdout) sys.exit(1) @@ -146,56 +134,13 @@ def run_command(cmd, password=None, args=[]): if type(result) == str: - util.print_msg(result) + print_msg(result) elif result is not None: - util.print_json(result) + print_json(result) -def start_server(): - network = Network(config) - if not network.start(wait=True): - print_msg("Not connected, aborting.") - sys.exit(1) - print_msg("Network daemon connected to " + network.interface.connection_msg) - from SimpleXMLRPCServer import SimpleXMLRPCServer - server = SimpleXMLRPCServer(('localhost',8000), allow_none=True, logRequests=False) - server.network = network - server.register_function(lambda: 'pong', 'ping') - server.register_function(network.synchronous_get, 'synchronous_get') - server.register_function(network.get_servers, 'get_servers') - server.register_function(network.main_server, 'main_server') - server.register_function(network.send, 'send') - server.register_function(network.subscribe, 'subscribe') - server.register_function(network.is_connected, 'is_connected') - server.register_function(network.is_up_to_date, 'is_up_to_date') - server.register_function(lambda: setattr(server,'running', False), 'stop') - return server - -def start_daemon(): - pid = os.fork() - if (pid == 0): # The first child. - os.chdir("/") - os.setsid() - os.umask(0) - pid2 = os.fork() - if (pid2 == 0): # Second child - server = start_server() - server.running = True - timeout = 60 - t0 = time.time() - server.socket.settimeout(timeout) - while server.running: - server.handle_request() - t = time.time() - if t - t0 > 0.9*timeout: - break - if not server.network.is_connected(): - break - t0 = t - sys.exit(0) - time.sleep(2) if __name__ == '__main__': @@ -299,10 +244,11 @@ if __name__ == '__main__': else: import getpass seed = getpass.getpass(prompt="seed:", stream=None) if options.concealed else raw_input("seed:") - wallet = Wallet.from_seed(str(seed),storage) - if not wallet: + if not Wallet.is_seed(seed): sys.exit("Error: Invalid seed") - wallet.save_seed(password) + wallet = Wallet.from_seed(seed, storage) + wallet.add_seed(seed, password) + wallet.create_accounts(password) if not options.offline: network = Network(config) @@ -319,12 +265,22 @@ if __name__ == '__main__': print_msg("Warning: This wallet was restored offline. It may contain more addresses than displayed.") else: - wallet = Wallet(storage) - wallet.init_seed(None) - wallet.save_seed(password) - wallet.synchronize() - print_msg("Your wallet generation seed is:\n\"%s\"" % wallet.get_mnemonic(password)) - print_msg("Please keep it in a safe place; if you lose it, you will not be able to restore your wallet.") + if not config.get('2of3'): + wallet = Wallet(storage) + seed = wallet.make_seed() + wallet.add_seed(seed, password) + wallet.create_accounts(password) + wallet.synchronize() + print_msg("Your wallet generation seed is:\n\"%s\"" % seed) + print_msg("Please keep it in a safe place; if you lose it, you will not be able to restore your wallet.") + else: + wallet = Wallet_2of3(storage) + cold_seed = wallet.make_seed() + #wallet.save_seed() + print_msg("Your cold seed is:\n\"%s\"" % cold_seed) + print_msg("Please store it on paper. ") + print_msg("Open this file on your online computer to complete your wallet creation.") + print_msg("Wallet saved in '%s'" % wallet.storage.path) @@ -346,9 +302,9 @@ if __name__ == '__main__': # important warning if cmd.name in ['dumpprivkey', 'dumpprivkeys']: - print_msg("WARNING: ALL your private keys are secret.") - print_msg("Exposing a single private key can compromise your entire wallet!") - print_msg("In particular, DO NOT use 'redeem private key' services proposed by third parties.") + print_stderr("WARNING: ALL your private keys are secret.") + print_stderr("Exposing a single private key can compromise your entire wallet!") + print_stderr("In particular, DO NOT use 'redeem private key' services proposed by third parties.") # commands needing password if cmd.requires_password: @@ -376,10 +332,10 @@ if __name__ == '__main__': if cmd.name == 'importprivkey': # See if they specificed a key on the cmd line, if not prompt if len(args) == 1: - args[1] = prompt_password('Enter PrivateKey (will not echo):', False) + args.append(prompt_password('Enter PrivateKey (will not echo):', False)) elif cmd.name == 'signrawtransaction': - args = [cmd, args[1], json.loads(args[2]) if len(args) > 2 else [], json.loads(args[3]) if len(args) > 3 else []] + args = [cmd, args[1], json.loads(args[2]) if len(args) > 2 else [] ] elif cmd.name == 'createmultisig': args = [cmd, int(args[1]), json.loads(args[2])] @@ -454,6 +410,10 @@ if __name__ == '__main__': elif cmd.name == 'setconfig': key, value = args[1:3] + try: + value = ast.literal_eval(value) + except: + pass config.set_key(key, value, True) print_msg(True)