sys.exit("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'")
+is_local = os.path.dirname(os.path.realpath(__file__)) == os.getcwd()
+is_android = 'ANDROID_DATA' in os.environ
+
+import __builtin__
+__builtin__.use_local_modules = is_local or is_android
+
# load local module as electrum
-if os.path.exists("lib"):
+if __builtin__.use_local_modules:
import imp
- fp, pathname, description = imp.find_module('lib')
- imp.load_module('electrum', fp, pathname, description)
- fp, pathname, description = imp.find_module('gui')
- imp.load_module('electrum_gui', fp, pathname, description)
-
+ imp.load_module('electrum', *imp.find_module('lib'))
+ imp.load_module('electrum_gui', *imp.find_module('gui'))
from electrum import *
-
# get password routine
def prompt_password(prompt, confirm=True):
import getpass
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.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="0.005", help="set tx fee")
+ 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("-c", "--changeaddr", dest="change_addr", default=None, help="set the change address for payto/mktx. default is a spare address, or the source address if it's not in the wallet")
parser.add_option("-s", "--server", dest="server", default=None, help="set server host:port:protocol, where protocol is t or h")
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)
# config is an object passed to the various constructors (wallet, interface, gui)
- if 'ANDROID_DATA' in os.environ:
- config_options = {'wallet_path':"/sdcard/electrum.dat", 'portable':True, 'verbose':True, 'gui':'android'}
+ if is_android:
+ config_options = {'wallet_path':"/sdcard/electrum.dat", 'portable':True, 'verbose':True, 'gui':'android', 'auto_cycle':True}
else:
config_options = eval(str(options))
for k, v in config_options.items():
interface = Interface(config, True)
wallet.interface = interface
- interface.start()
- interface.send([('server.peers.subscribe',[])])
gui = gui.ElectrumGui(wallet, config)
if not found:
a = gui.restore_or_create()
if not a: exit()
- # select a server.
- s = gui.network_dialog()
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()
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 s is None or a == 'create':
- wallet.synchronize()
- if a == 'create':
- # display seed
- gui.show_seed()
+ # 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()
gui.password_dialog()
wallet.save()
- verifier.start()
gui.main(url)
wallet.save()
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.seed = None
wallet.init_sequence(str(seed))
else:
- wallet.seed = str(seed)
- wallet.init_mpk( wallet.seed )
+ wallet.init_seed( str(seed) )
+ wallet.save_seed()
+ interface = Interface(config)
if not options.offline:
- interface = Interface(config)
- interface.start()
- interface.connect_event.wait()
- if not interface.is_connected:
- print_msg("Not connected, aborting.")
+ if not interface.start(wait=True):
+ 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)
print_msg("Recovering wallet...")
else:
print_msg("Warning: Found no history for this wallet")
else:
+ interface.start(wait=False)
wallet.synchronize()
wallet.fill_addressbook()
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)
args = [cmd, options.show_all, options.show_balance, options.show_labels]
elif cmd in ['payto', 'mktx']:
- args = [ 'mktx', args[1], Decimal(args[2]), Decimal(options.tx_fee) if options.tx_fee else None, options.change_addr, options.from_addr ]
+ 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 == 'help':
if len(args) < 2:
sys.exit(1)
if max_args < 0:
- if len(args) > min_args:
+ if len(args) > min_args + 1:
message = ' '.join(args[min_args:])
print_msg("Warning: Final argument was reconstructed from several arguments:", repr(message))
args = args[0:min_args] + [ message ]
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"))
- interface.start()
- # wait until connected
- interface.connect_event.wait()
- if not interface.is_connected:
+ 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()
git://git.novaco.in / electrum-nvc.git / blobdiff