import optparse
import platform
from decimal import Decimal
+import traceback
try:
import ecdsa
return password
def arg_parser():
- usage = "usage: %prog [options] command\nCommands: "+ (', '.join(known_commands))
+ usage = "%prog [options] command"
parser = optparse.OptionParser(prog=usage)
parser.add_option("-g", "--gui", dest="gui", help="User interface: qt, lite, gtk or text")
parser.add_option("-w", "--wallet", dest="wallet_path", help="wallet path (default: electrum.dat)")
parser = arg_parser()
options, args = parser.parse_args()
if options.portable and options.wallet_path is None:
- options.wallet_path = os.path.dirname(os.path.realpath(__file__)) + '/electrum.dat'
+ options.wallet_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum.dat')
set_verbosity(options.verbose)
# config is an object passed to the various constructors (wallet, interface, gui)
util.check_windows_wallet_migration()
config = SimpleConfig(config_options)
- wallet = Wallet(config)
-
if len(args)==0:
url = None
try:
gui = __import__('electrum_gui.gui_' + gui_name, fromlist=['electrum_gui'])
except ImportError:
- sys.exit("Error: Unknown GUI: " + gui_name )
+ traceback.print_exc(file=sys.stdout)
+ sys.exit()
+ #sys.exit("Error: Unknown GUI: " + gui_name )
- interface = Interface(config, True)
- wallet.interface = interface
-
- gui = gui.ElectrumGui(wallet, config)
-
- found = config.wallet_file_exists
- if not found:
- a = gui.restore_or_create()
- if not a: exit()
-
- if a =='create':
- wallet.init_seed(None)
- gui.show_seed()
- if gui.verify_seed():
- wallet.save_seed()
- else:
- exit()
-
- else:
- # ask for seed and gap.
- sg = gui.seed_dialog()
- if not sg: exit()
- seed, gap = sg
- if not seed: exit()
- wallet.gap_limit = gap
- if len(seed) == 128:
- wallet.seed = ''
- wallet.init_sequence(str(seed))
- else:
- wallet.init_seed(str(seed))
- wallet.save_seed()
-
- # select a server.
- s = gui.network_dialog()
-
- interface.start(wait = False)
- interface.send([('server.peers.subscribe',[])])
-
- # generate the first addresses, in case we are offline
- if not found and ( s is None or a == 'create'):
- wallet.synchronize()
-
- verifier = WalletVerifier(interface, config)
- verifier.start()
- wallet.set_verifier(verifier)
- synchronizer = WalletSynchronizer(wallet, config)
- synchronizer.start()
-
- if not found and a == 'restore' and s is not None:
- try:
- keep_it = gui.restore_wallet()
- wallet.fill_addressbook()
- except:
- import traceback
- traceback.print_exc(file=sys.stdout)
- exit()
-
- if not keep_it: exit()
+ # network interface
+ network = Network(config)
+ network.start()
+ #interface.send([('server.peers.subscribe',[])])
- if not found:
- gui.password_dialog()
-
- wallet.save()
+ gui = gui.ElectrumGui(config, network)
gui.main(url)
- wallet.save()
-
- verifier.stop()
- synchronizer.stop()
- interface.stop()
+
+ 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)
+
+ # instanciate wallet for command-line
+ storage = WalletStorage(config)
+ wallet = Wallet(storage)
+
if cmd not in known_commands:
cmd = 'help'
- if not config.wallet_file_exists and cmd not in ['help','create','restore']:
+ if not storage.file_exists and cmd not in ['help','create','restore']:
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)
w_host, w_port, w_protocol = server.split(':')
host = raw_input("server (default:%s):"%w_host)
port = raw_input("port (default:%s):"%w_port)
- protocol = raw_input("protocol [t=tcp;h=http;n=native] (default:%s):"%w_protocol)
+ protocol = raw_input("protocol [t=tcp;h=http] (default:%s):"%w_protocol)
fee = raw_input("fee (default:%s):"%( str(Decimal(wallet.fee)/100000000)) )
gap = raw_input("gap limit (default 5):")
if host: w_host = host
wallet.init_sequence(str(seed))
else:
wallet.init_seed( str(seed) )
+ wallet.save_seed()
+ interface = Interface(config)
if not options.offline:
- interface = Interface(config)
if not interface.start(wait=True):
- print_msg("Not connected, aborting.")
+ print_msg("Not connected, aborting. Try option -o if you want to restore offline.")
sys.exit(1)
- wallet.interface = interface
- verifier = WalletVerifier(interface, config)
- verifier.start()
- wallet.set_verifier(verifier)
+ blockchain = BlockchainVerifier(interface, config)
+ blockchain.start()
+ wallet.start_threads(interface, blockchain)
print_msg("Recovering wallet...")
- WalletSynchronizer(wallet, config).start()
wallet.update()
if wallet.is_found():
print_msg("Recovery successful")
else:
print_msg("Warning: Found no history for this wallet")
else:
+ interface.start(wait=False)
wallet.synchronize()
wallet.fill_addressbook()
- wallet.save()
+ #wallet.save()
print_msg("Wallet saved in '%s'"%wallet.config.path)
else:
wallet.init_seed(None)
+ wallet.save_seed()
wallet.synchronize() # there is no wallet thread
- wallet.save()
print_msg("Your wallet generation seed is: " + wallet.seed)
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:")
elif cmd 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']:
+ 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)
+ 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':
if len(args) < 2:
message = ' '.join(args[min_args:])
print_msg("Warning: Final argument was reconstructed from several arguments:", repr(message))
args = args[0:min_args] + [ message ]
-
-
-
# open session
if cmd not in offline_commands and not options.offline:
interface = Interface(config)
interface.register_callback('connected', lambda: sys.stderr.write("Connected to " + interface.connection_msg + "\n"))
+
if not interface.start(wait=True):
print_msg("Not connected, aborting.")
sys.exit(1)
- wallet.interface = interface
- verifier = WalletVerifier(interface, config)
- verifier.start()
- wallet.set_verifier(verifier)
- synchronizer = WalletSynchronizer(wallet, config)
- synchronizer.start()
+ blockchain = BlockchainVerifier(interface, config)
+ blockchain.start()
+ wallet.start_threads(interface, blockchain)
wallet.update()
- wallet.save()
+
# run the command
if raw_input("Are you sure you want to continue? (y/n) ") in ['y','Y','yes']:
wallet.config.path = ns
wallet.seed = ''
+ wallet.storage.put('seed', '', True)
wallet.use_encryption = False
- wallet.config.set_key('seed','', True)
+ wallet.storage.put('use_encryption', wallet.use_encryption, True)
for k in wallet.imported_keys.keys(): wallet.imported_keys[k] = ''
- wallet.save()
+ wallet.config.set_key('imported_keys',wallet.imported_keys, True)
print_msg("Done.")
else:
print_msg("Action canceled.")
- elif cmd == 'eval':
- print_msg(eval(args[1]))
- wallet.save()
-
elif cmd == 'getconfig':
key = args[1]
- print_msg(wallet.config.get(key))
+ print_msg(config.get(key))
elif cmd == 'setconfig':
key, value = args[1:3]
if key not in ['seed', 'seed_version', 'master_public_key', 'use_encryption']:
- wallet.config.set_key(key, value, True)
+ config.set_key(key, value, True)
print_msg(True)
else:
print_msg(False)
try:
result = func(*args[1:])
except BaseException, e:
- print_msg("Error: " + str(e))
+ import traceback
+ traceback.print_exc(file=sys.stdout)
sys.exit(1)
if type(result) == str:
if cmd not in offline_commands and not options.offline:
- verifier.stop()
- synchronizer.stop()
+ wallet.stop_threads()
interface.stop()
+ blockchain.stop()
time.sleep(0.1)
sys.exit(0)
git://git.novaco.in / electrum-nvc.git / blobdiff