# 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 traceback
try:
import ecdsa
except ImportError:
sys.exit("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'")
-try:
- from lib import *
-except ImportError:
- from electrum import *
-from decimal import Decimal
+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 __builtin__.use_local_modules:
+ import imp
+ 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):
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():
util.check_windows_wallet_migration()
config = SimpleConfig(config_options)
- wallet = Wallet(config)
if len(args)==0:
url = None
cmd = 'gui'
else:
cmd = args[0]
- firstarg = args[1] if len(args) > 1 else ''
- #this entire if/else block is just concerned with importing the
- #right GUI toolkit based the GUI command line option given
- if cmd == 'gui':
- pref_gui = config.get('gui','classic')
-
- if pref_gui == 'gtk':
- try:
- import lib.gui as gui
- except ImportError:
- import electrum.gui as gui
- elif pref_gui in ['classic', 'qt']:
- try:
- import lib.gui_qt as gui
- except ImportError:
- import electrum.gui_qt as gui
- elif pref_gui == 'lite':
- try:
- import lib.gui_lite as gui
- except ImportError:
- import electrum.gui_lite as gui
- elif pref_gui == 'text':
- try:
- import lib.gui_text as gui
- except ImportError:
- import electrum.gui_text as gui
- elif pref_gui == 'android':
- try:
- import lib.gui_android as gui
- except ImportError:
- import electrum.gui_android as gui
- else:
- sys.exit("Error: Unknown GUI: " + pref_gui )
+ if cmd == 'gui':
+ gui_name = config.get('gui','classic')
+ try:
+ gui = __import__('electrum_gui.gui_' + gui_name, fromlist=['electrum_gui'])
+ except ImportError:
+ traceback.print_exc(file=sys.stdout)
+ sys.exit()
+ #sys.exit("Error: Unknown GUI: " + gui_name )
- interface = Interface(config, True)
- wallet.interface = interface
- interface.start()
- if interface.is_connected:
- interface.send([('server.peers.subscribe',[])])
-
- set_language(config.get('language'))
- gui = gui.ElectrumGui(wallet, config)
-
- found = config.wallet_file_exists
- 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)
- 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.sequence.master_public_key = seed
- else:
- wallet.init_seed(str(seed))
-
-
- # 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()
-
- verifier = WalletVerifier(interface, config)
- 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()
+ # network interface
+ network = Network(config)
+ network.start()
+ #interface.send([('server.peers.subscribe',[])])
- if not keep_it: exit()
-
- if not found:
- gui.password_dialog()
-
- wallet.save()
- verifier.start()
+ 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
if len(seed) == 128:
wallet.seed = None
- wallet.sequence.master_public_key = seed
+ 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()
- wallet.interface = interface
-
- verifier = WalletVerifier(interface, config)
- wallet.set_verifier(verifier)
+ if not interface.start(wait=True):
+ print_msg("Not connected, aborting. Try option -o if you want to restore offline.")
+ sys.exit(1)
+ 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:")
sys.exit(0)
-
+
# important warning
if cmd in ['dumpprivkey', 'dumpprivkeys']:
print_msg("WARNING: ALL your private keys are secret.")
password = None
- # add missing arguments
+ # add missing arguments, do type conversions
if cmd == 'importprivkey':
# See if they specificed a key on the cmd line, if not prompt
if len(args) == 1:
elif cmd == 'createrawtransaction':
args = [ cmd, json.loads(args[1]), json.loads(args[2])]
- elif cmd=='listaddresses':
+ elif cmd == 'listaddresses':
args = [cmd, options.show_all, options.show_balance, options.show_labels]
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 ]
- #is_temporary = False
- from_addr = None
- if options.from_addr:
- from_addr = options.from_addr
- if from_addr not in wallet.all_addresses():
- #is_temporary = True
- raise BaseException("address not in wallet")
-
- try:
- to_address = args[1]
- amount = Decimal(args[2])
- change_addr = None
- label = ' '.join(args[3:])
- if options.tx_fee:
- options.tx_fee = Decimal(options.tx_fee)
- except:
- firstarg = cmd
- cmd = 'help'
-
- #if from_addr and is_temporary:
- # if from_addr.find(":") == -1:
- # keypair = from_addr + ":" + prompt_password('Private key:', False)
- # else:
- # keypair = from_addr
- # from_addr = keypair.split(':')[0]
- # if not wallet.import_key(keypair,password):
- # print_msg("Error: Invalid key pair")
- # exit(1)
- # wallet.history[from_addr] = interface.retrieve_history(from_addr)
- # wallet.update_tx_history()
- # change_addr = from_addr
-
- if options.change_addr:
- change_addr = options.change_addr
-
- args = [ 'mktx', to_address, amount, options.tx_fee, options.change_addr, from_addr ]
+ elif cmd == 'help':
+ if len(args) < 2:
+ 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")
- #if is_temporary:
- # wallet.imported_keys.pop(from_addr)
- # del(wallet.history[from_addr])
- #wallet.save()
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 ]
-
-
-
-
-
# 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"))
- interface.start()
- wallet.interface = interface
- verifier = WalletVerifier(interface, config)
- wallet.set_verifier(verifier)
- synchronizer = WalletSynchronizer(wallet, config)
- synchronizer.start()
+
+ if not interface.start(wait=True):
+ print_msg("Not connected, aborting.")
+ sys.exit(1)
+ blockchain = BlockchainVerifier(interface, config)
+ blockchain.start()
+ wallet.start_threads(interface, blockchain)
wallet.update()
- wallet.save()
+
# run the command
- if cmd == 'help':
- cmd2 = firstarg
- if cmd2 not in known_commands:
- 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")
- print_msg("List of commands:", ', '.join(known_commands))
- else:
- _, _, description, syntax, options_syntax = known_commands[cmd2]
- print_msg(description)
- if syntax: print_msg("Syntax: " + syntax)
- if options_syntax: print_msg("options:\n" + options_syntax)
- elif cmd == 'deseed':
+ if cmd == 'deseed':
if not wallet.seed:
print_msg("Error: This wallet has no seed")
else:
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 == 'get':
+ elif cmd == 'getconfig':
key = args[1]
- print_msg(wallet.config.get(key))
+ print_msg(config.get(key))
- elif cmd == 'set':
+ 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)
-
elif cmd == 'password':
new_password = prompt_password('New password:')
wallet.update_password(seed, password, new_password)
-
-
else:
cmd_runner = Commands(wallet, interface)
func = eval('cmd_runner.' + cmd)
cmd_runner.password = password
- result = func(*args[1:])
+ try:
+ result = func(*args[1:])
+ except BaseException, e:
+ import traceback
+ traceback.print_exc(file=sys.stdout)
+ sys.exit(1)
+
if type(result) == str:
util.print_msg(result)
- else:
+ elif result is not None:
util.print_json(result)
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