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 (not final)")
+ 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')
- exit(1)
+ run_command(known_commands['help'])
+ sys.exit(1)
def print_help_cb(self, opt, value, parser):
def run_command(cmd, password=None, args=[]):
+ import xmlrpclib, socket
cmd_runner = Commands(wallet, network)
- func = getattr(cmd_runner, cmd)
+ func = getattr(cmd_runner, cmd.name)
cmd_runner.password = password
+
+ 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()
+ else:
+ cmd_runner.network = None
+
try:
result = func(*args[1:])
except Exception:
+ print "ecxeption"
traceback.print_exc(file=sys.stdout)
sys.exit(1)
+
+ if cmd.requires_network and not options.offline:
+ if wallet:
+ wallet.stop_threads()
+
+
if type(result) == str:
util.print_msg(result)
elif result is not None:
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()
# 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):")
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:")
+ wallet = Wallet.from_seed(str(seed),storage)
+ if not wallet:
+ sys.exit("Error: Invalid seed")
+ wallet.save_seed(password)
- wallet.init_seed(str(seed))
- wallet.save_seed()
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:
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()
+ wallet.save_seed(password)
wallet.synchronize()
- print_msg("Your wallet generation seed is:\n\"%s\"" % wallet.get_mnemonic(None))
+ 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.")
print_msg("Wallet saved in '%s'" % wallet.storage.path)
- if password:
- wallet.update_password(None, password)
-
# 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.")
# commands needing password
if cmd.requires_password:
- if wallet.use_encryption:
+ if wallet.seed == '':
+ seed = ''
+ password = None
+ elif wallet.use_encryption:
password = prompt_password('Password:', False)
if not password:
print_msg("Error: Password required")
- exit(1)
+ sys.exit(1)
# check password
try:
seed = wallet.get_seed(password)
except Exception:
print_msg("Error: This password does not decode this wallet.")
- exit(1)
+ sys.exit(1)
else:
password = None
seed = wallet.get_seed(None)
for i in range(1, len(args), 2):
if len(args) < i+2:
print_msg("Error: Mismatched arguments.")
- exit(1)
+ sys.exit(1)
outputs.append((args[i], Decimal(args[i+1])))
args = ['mksendmanytx', outputs, Decimal(options.tx_fee) if options.tx_fee else None, options.change_addr, domain]
print_msg("Warning: Final argument was reconstructed from several arguments:", repr(message))
args = args[0:cmd.min_args] + [message]
- # open session
- if cmd.requires_network and not options.offline:
- network = Network(config)
- if not network.start(wait=True):
- print_msg("Not connected, aborting.")
- sys.exit(1)
- print_error("Connected to " + network.interface.connection_msg)
- if wallet:
- wallet.start_threads(network)
- wallet.update()
- else:
- network = None
# 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)
elif cmd.name == 'password':
new_password = prompt_password('New password:')
- wallet.update_password(seed, password, new_password)
+ wallet.update_password(password, new_password)
else:
- run_command(cmd.name, password, args)
+ run_command(cmd, password, args)
- if network:
- if wallet:
- wallet.stop_threads()
- network.stop()
- time.sleep(0.1)
- sys.exit(0)
+
+ time.sleep(0.1)
+ sys.exit(0)
git://git.novaco.in / electrum-nvc.git / blobdiff