import optparse
import os
import re
+import ast
import sys
import time
import traceback
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")
+ 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")
return parser
parser.print_help()
print_msg("Type 'electrum help <command>' 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)
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
-
+ import socket
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 "Daemon not running"
- sys.exit(1)
except Exception:
traceback.print_exc(file=sys.stdout)
sys.exit(1)
util.print_json(result)
+
+
+
+
if __name__ == '__main__':
parser = arg_parser()
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):")
# 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:")
- wallet = Wallet.from_seed(str(seed),storage)
- if not wallet:
- sys.exit("Error: Invalid seed")
- wallet.save_seed(password)
+ 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:")
+ wallet = Wallet.from_seed(str(seed),storage)
+ if not wallet:
+ sys.exit("Error: Invalid seed")
+ wallet.save_seed(password)
+ wallet.create_accounts(password)
+
if not options.offline:
network = Network(config)
network.start()
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.save_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)
args = args[0:cmd.min_args] + [message]
- if cmd.name == 'daemon' and args[1] == 'start':
- 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("Daemon stopped")
-
- sys.exit(0)
# run the command
if cmd.name == 'deseed':
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)