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("--mpk", dest="mpk", default=False, help="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)
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)
+
if wallet:
wallet.start_threads(cmd_runner.network)
wallet.update()
try:
result = func(*args[1:])
- except socket.error:
- print "Daemon not running"
- sys.exit(1)
except Exception:
+ print "ecxeption"
traceback.print_exc(file=sys.stdout)
sys.exit(1)
util.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__':
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)
+
if not options.offline:
network = Network(config)
network.start()
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':
git://git.novaco.in / electrum-nvc.git / blobdiff