# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import re
-import pkgutil
-import sys, os, time, json
-import optparse
-import platform
from decimal import Decimal
+import json
+import optparse
+import os
+import re
+import sys
+import time
import traceback
try:
- import ecdsa
+ 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
+ import aes # todo: 'aes' imported but unused
except ImportError:
sys.exit("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'")
imp.load_module('electrum', *imp.find_module('lib'))
imp.load_module('electrum_gui', *imp.find_module('gui'))
-from electrum import *
+from electrum import * # todo: import * is generally frowned upon. should import just what is used
+
# get password routine
def prompt_password(prompt, confirm=True):
password = None
return password
+
def arg_parser():
- usage = "%prog [options] command"
- parser = optparse.OptionParser(prog=usage, add_help_option = False)
+ usage = "%prog [options] command"
+ parser = optparse.OptionParser(prog=usage, add_help_option=False)
parser.add_option("-h", "--help", action="callback", callback=print_help_cb, help="show this help text")
parser.add_option("-g", "--gui", dest="gui", help="User interface: qt, lite, gtk, text or stdio")
parser.add_option("-w", "--wallet", dest="wallet_path", help="wallet path (default: electrum.dat)")
parser.add_option("-u", "--usb", dest="bitkey", action="store_true", help="Turn on support for hardware wallets (EXPERIMENTAL)")
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")
return parser
+
def print_help(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)
+ sys.exit(1)
+
def print_help_cb(self, opt, value, parser):
print_help(parser)
-def run_command(cmd, password = None, args = []):
+
+def run_command(cmd, password=None, args=[]):
+ import xmlrpclib, socket
cmd_runner = Commands(wallet, network)
- func = eval('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')
+ if wallet:
+ wallet.start_threads(cmd_runner.network)
+ wallet.update()
+ else:
+ cmd_runner.network = None
+
try:
result = func(*args[1:])
- except BaseException, e:
- import traceback
+ except socket.error:
+ print "Daemon not running"
+ sys.exit(1)
+ except Exception:
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:
# config is an object passed to the various constructors (wallet, interface, gui)
if is_android:
- config_options = {'portable':True, 'verbose':True, 'gui':'android', 'auto_cycle':True}
+ config_options = {
+ 'portable': True,
+ 'verbose': True,
+ 'gui': 'android',
+ 'auto_cycle': True,
+ }
else:
config_options = eval(str(options))
for k, v in config_options.items():
- if v is None: config_options.pop(k)
+ if v is None:
+ config_options.pop(k)
set_verbosity(config_options.get('verbose'))
config = SimpleConfig(config_options)
- if len(args)==0:
+ if len(args) == 0:
url = None
cmd = 'gui'
- elif len(args)==1 and re.match('^bitcoin:', args[0]):
+ elif len(args) == 1 and re.match('^bitcoin:', args[0]):
url = args[0]
cmd = 'gui'
else:
cmd = args[0]
-
if cmd == 'gui':
- gui_name = config.get('gui','classic')
- if gui_name in ['lite', 'classic']: gui_name = 'qt'
+ gui_name = config.get('gui', 'classic')
+ if gui_name in ['lite', 'classic']:
+ gui_name = 'qt'
try:
gui = __import__('electrum_gui.' + gui_name, fromlist=['electrum_gui'])
except ImportError:
traceback.print_exc(file=sys.stdout)
sys.exit()
#sys.exit("Error: Unknown GUI: " + gui_name )
-
+
# network interface
if not options.offline:
network = Network(config)
gui = gui.ElectrumGui(config, network)
gui.main(url)
-
+
if network:
network.stop()
# we use daemon threads, their termination is enforced.
- # this sleep command gives them time to terminate cleanly.
+ # this sleep command gives them time to terminate cleanly.
time.sleep(0.1)
sys.exit(0)
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 != None:
+ if options.password is not None:
password = options.password
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)) )
+ 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 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:")
+ seed = getpass.getpass(prompt="seed:", stream=None) if options.concealed else raw_input("seed:")
try:
seed.decode('hex')
- except:
+ except Exception:
print_error("Warning: Not hex, trying decode.")
- seed = mnemonic_decode( seed.split(' ') )
+ seed = mnemonic_decode(seed.split(' '))
if not seed:
sys.exit("Error: No seed")
- wallet.init_seed( str(seed) )
- wallet.save_seed()
+ wallet.init_seed(str(seed))
+ wallet.save_seed(password)
if not options.offline:
network = Network(config)
network.start()
else:
print_msg("Warning: Found no history for this wallet")
else:
- wallet.create_accounts()
wallet.synchronize()
print_msg("Warning: This wallet was restored offline. It may contain more addresses than displayed.")
else:
wallet.init_seed(None)
- wallet.save_seed()
- wallet.create_accounts()
+ 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)
+ print_msg("Wallet saved in '%s'" % wallet.storage.path)
# terminate
sys.exit(0)
-
-
# 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:
+ 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)
else:
password = None
-
# add missing arguments, do type conversions
if cmd.name == 'importprivkey':
# See if they specificed a key on the cmd line, if not prompt
args[1] = 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 [], json.loads(args[3]) if len(args) > 3 else []]
elif cmd.name == 'createmultisig':
- args = [ cmd, int(args[1]), json.loads(args[2])]
+ args = [cmd, int(args[1]), json.loads(args[2])]
elif cmd.name == 'createrawtransaction':
- args = [ cmd, json.loads(args[1]), json.loads(args[2])]
+ args = [cmd, json.loads(args[1]), json.loads(args[2])]
elif cmd.name == 'listaddresses':
args = [cmd, options.show_all, options.show_labels]
elif cmd.name in ['payto', 'mktx']:
domain = [options.from_addr] if options.from_addr else None
- args = [ 'mktx', args[1], Decimal(args[2]), Decimal(options.tx_fee) if options.tx_fee else None, options.change_addr, domain ]
-
+ args = ['mktx', args[1], Decimal(args[2]), Decimal(options.tx_fee) if options.tx_fee else None, options.change_addr, domain]
+
elif cmd.name in ['paytomany', 'mksendmanytx']:
domain = [options.from_addr] if options.from_addr else None
outputs = []
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 ]
+ args = ['mksendmanytx', outputs, Decimal(options.tx_fee) if options.tx_fee else None, options.change_addr, domain]
elif cmd.name == 'help':
if len(args) < 2:
print_help(parser)
-
-
# check the number of arguments
if len(args) - 1 < cmd.min_args:
print_msg("Not enough arguments")
if len(args) > cmd.min_args + 1:
message = ' '.join(args[cmd.min_args:])
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
-
+ 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':
if not wallet.seed:
print_msg("Error: This wallet has no seed")
else:
ns = wallet.storage.path + '.seedless'
- print_msg("Warning: you are going to create a seedless wallet'\nIt will be saved in '%s'"%ns)
- if raw_input("Are you sure you want to continue? (y/n) ") in ['y','Y','yes']:
+ print_msg("Warning: you are going to create a seedless wallet'\nIt will be saved in '%s'" % ns)
+ if raw_input("Are you sure you want to continue? (y/n) ") in ['y', 'Y', 'yes']:
wallet.storage.path = ns
wallet.seed = ''
wallet.storage.put('seed', '', True)
wallet.use_encryption = False
wallet.storage.put('use_encryption', wallet.use_encryption, True)
- for k in wallet.imported_keys.keys(): wallet.imported_keys[k] = ''
- wallet.storage.put('imported_keys',wallet.imported_keys, True)
+ for k in wallet.imported_keys.keys():
+ wallet.imported_keys[k] = ''
+ wallet.storage.put('imported_keys', wallet.imported_keys, True)
print_msg("Done.")
else:
print_msg("Action canceled.")
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