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("-o", "--offline", action="store_true", dest="offline", default=False, help="remain offline")
+ parser.add_option("-C", "--concealed", action="store_true", dest="concealed", default=False, help="don't echo seed to console when restoring")
parser.add_option("-a", "--all", action="store_true", dest="show_all", default=False, help="show all addresses")
- parser.add_option("-b", "--balance", action="store_true", dest="show_balance", default=False, help="show the balance of listed addresses")
parser.add_option("-l", "--labels", action="store_true", dest="show_labels", default=False, help="show the labels of listed addresses")
parser.add_option("-f", "--fee", dest="tx_fee", default=None, help="set tx fee")
parser.add_option("-F", "--fromaddr", dest="from_addr", default=None, help="set source address for payto/mktx. if it isn't in the wallet, it will ask for the private key unless supplied in the format public_key:private_key. It's not saved in the wallet.")
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):
def run_command(cmd, password = None, args = []):
cmd_runner = Commands(wallet, network)
- func = eval('cmd_runner.' + cmd)
+ func = getattr(cmd_runner, cmd)
cmd_runner.password = password
try:
result = func(*args[1:])
- except BaseException, e:
+ except Exception as e:
import traceback
traceback.print_exc(file=sys.stdout)
sys.exit(1)
parser = arg_parser()
options, args = parser.parse_args()
if options.portable and options.wallet_path is None:
- options.wallet_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum.dat')
- set_verbosity(options.verbose)
+ options.electrum_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum_data')
# config is an object passed to the various constructors (wallet, interface, gui)
if is_android:
- config_options = {'wallet_path':"/sdcard/electrum.dat", '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))
+ config_options = vars(options)
for k, v in config_options.items():
if v is None: config_options.pop(k)
- # Wallet migration on Electrum 1.7
- # Todo: In time we could remove this again
- if platform.system() == "Windows":
- util.check_windows_wallet_migration()
+ set_verbosity(config_options.get('verbose'))
config = SimpleConfig(config_options)
#sys.exit("Error: Unknown GUI: " + gui_name )
# network interface
- network = Network(config)
- network.start()
+ if not options.offline:
+ network = Network(config)
+ network.start()
+ else:
+ network = None
gui = gui.ElectrumGui(config, network)
gui.main(url)
- network.stop()
+ if network:
+ network.stop()
+
# we use daemon threads, their termination is enforced.
# this sleep command gives them time to terminate cleanly.
time.sleep(0.1)
sys.exit(0)
+ if cmd not in known_commands:
+ cmd = 'help'
+
+ cmd = known_commands[cmd]
# instanciate wallet for command-line
storage = WalletStorage(config)
- wallet = Wallet(storage)
- if cmd not in known_commands:
- cmd = 'help'
+ if cmd.requires_wallet:
+ wallet = Wallet(storage)
+ else:
+ wallet = None
- if not storage.file_exists and cmd not in ['help','create','restore']:
+ 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 in ['create', 'restore']:
- if wallet.storage.file_exists:
+ if cmd.name in ['create', 'restore']:
+ if storage.file_exists:
sys.exit("Error: Remove the existing wallet first!")
if options.password != None:
password = options.password
if fee: wallet.set_fee(float(fee)*100000000)
if gap: wallet.change_gap_limit(int(gap))
- if cmd == 'restore':
- seed = raw_input("seed:")
+ 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:
+ except Exception:
print_error("Warning: Not hex, trying decode.")
seed = mnemonic_decode( seed.split(' ') )
if not seed:
wallet.init_seed( str(seed) )
wallet.save_seed()
- 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")
+ 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: Found no history for this wallet")
else:
- print_msg("Warning: Found no history for this wallet")
+ 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.synchronize()
- print_msg("Your wallet generation seed is: " + wallet.seed)
+ print_msg("Your wallet generation seed is:\n\"%s\""% wallet.get_mnemonic(None))
print_msg("Please keep it in a safe place; if you lose it, you will not be able to restore your wallet.")
- print_msg("Equivalently, your wallet seed can be stored and recovered with the following mnemonic code:")
- print_msg("\""+' '.join(mnemonic_encode(wallet.seed))+"\"")
print_msg("Wallet saved in '%s'"%wallet.storage.path)
if password:
- wallet.update_password(wallet.seed, None, password)
+ wallet.update_password(None, password)
# terminate
sys.exit(0)
# important warning
- if cmd in ['dumpprivkey', 'dumpprivkeys']:
+ 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.")
# commands needing password
- if cmd in protected_commands:
+ if cmd.requires_password:
if wallet.use_encryption:
password = prompt_password('Password:', False)
if not password:
exit(1)
# check password
try:
- seed = wallet.decode_seed(password)
- except:
+ seed = wallet.get_seed(password)
+ except Exception:
print_msg("Error: This password does not decode this wallet.")
exit(1)
else:
password = None
- seed = wallet.seed
+ seed = wallet.get_seed(None)
else:
password = None
# add missing arguments, do type conversions
- if cmd == 'importprivkey':
+ 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)
- elif cmd == 'signrawtransaction':
+ 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 []]
- elif cmd == 'createmultisig':
+ elif cmd.name == 'createmultisig':
args = [ cmd, int(args[1]), json.loads(args[2])]
- elif cmd == 'createrawtransaction':
+ elif cmd.name == 'createrawtransaction':
args = [ cmd, json.loads(args[1]), json.loads(args[2])]
- elif cmd == 'listaddresses':
- args = [cmd, options.show_all, options.show_balance, options.show_labels]
+ elif cmd.name == 'listaddresses':
+ args = [cmd, options.show_all, options.show_labels]
- elif cmd in ['payto', 'mktx']:
+ 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 ]
- elif cmd in ['paytomany', 'mksendmanytx']:
+ 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):
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 ]
- elif cmd == 'help':
+ elif cmd.name == 'help':
if len(args) < 2:
print_help(parser)
# check the number of arguments
- min_args, max_args, description, syntax, options_syntax = known_commands[cmd]
- if len(args) - 1 < min_args:
+ if len(args) - 1 < cmd.min_args:
print_msg("Not enough arguments")
- print_msg("Syntax:", syntax)
+ print_msg("Syntax:", cmd.syntax)
sys.exit(1)
- if max_args >= 0 and len(args) - 1 > max_args:
+ if cmd.max_args >= 0 and len(args) - 1 > cmd.max_args:
print_msg("too many arguments", args)
- print_msg("Syntax:", syntax)
+ print_msg("Syntax:", cmd.syntax)
sys.exit(1)
- if max_args < 0:
- if len(args) > min_args + 1:
- message = ' '.join(args[min_args:])
+ if cmd.max_args < 0:
+ 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:min_args] + [ message ]
+ args = args[0:cmd.min_args] + [ message ]
# open session
- if cmd not in offline_commands and not options.offline:
+ if cmd.requires_network and not options.offline:
network = Network(config)
- network.register_callback('connected', lambda: sys.stderr.write("Connected to " + network.interface.connection_msg + "\n"))
if not network.start(wait=True):
print_msg("Not connected, aborting.")
sys.exit(1)
+ print_error("Connected to " + network.interface.connection_msg)
- wallet.start_threads(network)
- wallet.update()
+ if wallet:
+ wallet.start_threads(network)
+ wallet.update()
+ else:
+ network = None
# run the command
- if cmd == 'deseed':
+ if cmd.name == 'deseed':
if not wallet.seed:
print_msg("Error: This wallet has no seed")
else:
- ns = wallet.config.path + '.seedless'
+ 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']:
- wallet.config.path = ns
+ 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.config.set_key('imported_keys',wallet.imported_keys, True)
+ wallet.storage.put('imported_keys',wallet.imported_keys, True)
print_msg("Done.")
else:
print_msg("Action canceled.")
- elif cmd == 'getconfig':
+ elif cmd.name == 'getconfig':
key = args[1]
- print_msg(config.get(key))
+ out = config.get(key)
+ print_msg(out)
- elif cmd == 'setconfig':
+ elif cmd.name == 'setconfig':
key, value = args[1:3]
- if key not in ['seed', 'seed_version', 'master_public_key', 'use_encryption']:
- config.set_key(key, value, True)
- print_msg(True)
- else:
- print_msg(False)
+ config.set_key(key, value, True)
+ print_msg(True)
- elif cmd == 'password':
+ elif cmd.name == 'password':
new_password = prompt_password('New password:')
wallet.update_password(seed, password, new_password)
else:
- run_command(cmd, password, args)
+ run_command(cmd.name, password, args)
- if cmd not in offline_commands and not options.offline:
- wallet.stop_threads()
+ if network:
+ if wallet:
+ wallet.stop_threads()
network.stop()
time.sleep(0.1)
sys.exit(0)
git://git.novaco.in / electrum-nvc.git / blobdiff