X-Git-Url: https://git.novaco.in/?p=electrum-nvc.git;a=blobdiff_plain;f=electrum;h=e63803db8f954e5e949961d72d00f61acfaabac3;hp=f6b8506e641294626c48648843a1d004ecc6e388;hb=99a31b0c6a30bad2cb2b8c27a748a1f25a89c107;hpb=be506af2460e47527d03dc7d864ec72a04d8d7e7 diff --git a/electrum b/electrum index f6b8506..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,9 +39,13 @@ 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): import getpass @@ -89,6 +84,10 @@ def arg_parser(): parser.add_option("-G", "--gap", dest="gap_limit", default=None, help="gap limit") 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 @@ -96,7 +95,7 @@ def print_help(parser): parser.print_help() print_msg("Type 'electrum help ' to see the help for a specific command") print_msg("Type 'electrum --help' to see the list of options") - run_command('help') + run_command(known_commands['help']) sys.exit(1) @@ -104,25 +103,26 @@ 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') + 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 socket.error: - print "Network server not found." - sys.exit(1) except Exception: traceback.print_exc(file=sys.stdout) sys.exit(1) @@ -134,9 +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) + + + + if __name__ == '__main__': @@ -210,26 +214,14 @@ if __name__ == '__main__': # instanciate wallet for command-line storage = WalletStorage(config) - if cmd.requires_wallet: - wallet = Wallet(storage) - else: - wallet = None - - if cmd.name not in ['create', 'restore'] and cmd.requires_wallet and not storage.file_exists: - print_msg("Error: Wallet file not found.") - print_msg("Type 'electrum create' to create a new wallet, or provide a path to a wallet with the -w option") - sys.exit(0) - - - - - if cmd.name in ['create', 'restore']: if storage.file_exists: sys.exit("Error: Remove the existing wallet first!") if options.password is not None: password = options.password + elif cmd.name == 'restore' and options.mpk: + password = None else: password = prompt_password("Password (hit return if you do not wish to encrypt your wallet):") @@ -239,35 +231,31 @@ if __name__ == '__main__': if not config.get('server'): config.set_key('server', pick_random_server()) - fee = options.tx_fee if options.tx_fee else raw_input("fee (default:%s):" % (str(Decimal(wallet.fee)/100000000))) - gap = options.gap_limit if options.gap_limit else raw_input("gap limit (default 5):") - - if fee: - wallet.set_fee(float(fee)*100000000) - if gap: - wallet.change_gap_limit(int(gap)) + #fee = options.tx_fee if options.tx_fee else raw_input("fee (default:%s):" % (str(Decimal(wallet.fee)/100000000))) + #gap = options.gap_limit if options.gap_limit else raw_input("gap limit (default 5):") + #if fee: + # wallet.set_fee(float(fee)*100000000) + #if gap: + # wallet.change_gap_limit(int(gap)) if cmd.name == 'restore': - import getpass - seed = getpass.getpass(prompt="seed:", stream=None) if options.concealed else raw_input("seed:") - try: - seed.decode('hex') - except Exception: - print_error("Warning: Not hex, trying decode.") - seed = mnemonic_decode(seed.split(' ')) - if not seed: - sys.exit("Error: No seed") + if options.mpk: + wallet = Wallet.from_mpk(options.mpk, storage) + else: + import getpass + seed = getpass.getpass(prompt="seed:", stream=None) if options.concealed else raw_input("seed:") + if not Wallet.is_seed(seed): + sys.exit("Error: Invalid seed") + wallet = Wallet.from_seed(seed, storage) + wallet.add_seed(seed, password) + wallet.create_accounts(password) - wallet.init_seed(str(seed)) - wallet.save_seed(password) if not options.offline: network = Network(config) network.start() wallet.start_threads(network) - print_msg("Recovering wallet...") wallet.restore(lambda x: x) - if wallet.is_found(): print_msg("Recovery successful") else: @@ -277,22 +265,46 @@ if __name__ == '__main__': print_msg("Warning: This wallet was restored offline. It may contain more addresses than displayed.") else: - 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) # terminate sys.exit(0) + + if cmd.name not in ['create', 'restore'] and cmd.requires_wallet and not storage.file_exists: + print_msg("Error: Wallet file not found.") + print_msg("Type 'electrum create' to create a new wallet, or provide a path to a wallet with the -w option") + sys.exit(0) + + + if cmd.requires_wallet: + wallet = Wallet(storage) + else: + wallet = None + + # 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: @@ -320,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])] @@ -370,40 +382,6 @@ if __name__ == '__main__': args = args[0:cmd.min_args] + [message] - if cmd.name == 'start_network': - pid = os.fork() - if (pid == 0): # The first child. - os.chdir("/") - os.setsid() - os.umask(0) - pid2 = os.fork() - if (pid2 == 0): # Second child - from SimpleXMLRPCServer import SimpleXMLRPCServer - # start the daemon - network = Network(config) - if not network.start(wait=True): - print_msg("Not connected, aborting.") - sys.exit(1) - print_msg("Connected to " + network.interface.connection_msg) - server = SimpleXMLRPCServer(('localhost',8000), allow_none=True, logRequests=False) - 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') - server.running = True - while server.running: - server.handle_request() - print_msg("Server stopped") - sys.exit(0) - else: - sys.exit(0) - else: - sys.exit(0) - # run the command if cmd.name == 'deseed': @@ -432,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)