import time
import traceback
-try:
- 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 # todo: 'aes' imported but unused
-except ImportError:
- 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
imp.load_module('electrum', *imp.find_module('lib'))
imp.load_module('electrum_gui', *imp.find_module('gui'))
-from electrum import * # todo: import * is generally frowned upon. should import just what is used
-from electrum.util import print_msg, print_stderr
+if is_local:
+ sys.path.append('packages')
+
+
+from electrum import SimpleConfig, Network, Wallet, WalletStorage, NetworkProxy, Commands, known_commands, pick_random_server
+from electrum.util import print_msg, print_stderr, print_json, set_verbosity
# get password routine
def prompt_password(prompt, confirm=True):
parser.add_option("--bip32", action="store_true", dest="bip32", default=False, help="bip32 (not final)")
parser.add_option("--2of3", action="store_true", dest="2of3", default=False, help="create 2of3 wallet")
parser.add_option("--mpk", dest="mpk", default=False, help="restore from master public key")
+ parser.add_option("-m", action="store_true", dest="hide_gui", default=False, help="hide GUI on startup")
return parser
print_help(parser)
-def run_command(cmd, password=None, args=[]):
- import socket
+def run_command(cmd, password=None, args=None):
+ if args is None:
+ args = [] # Do not use mutables as default values!
if cmd.requires_network and not options.offline:
network = NetworkProxy(config)
if not network.start(start_daemon= (True if cmd.name!='daemon' else False)):
print "Daemon not running"
sys.exit(1)
-
-
if wallet:
wallet.start_threads(network)
wallet.update()
if type(result) == str:
- util.print_msg(result)
+ print_msg(result)
elif result is not None:
- util.print_json(result)
+ print_json(result)
else:
import getpass
seed = getpass.getpass(prompt="seed:", stream=None) if options.concealed else raw_input("seed:")
- if not seed:
- sys.exit("Error: Seed cannot be empty")
- wallet = Wallet.from_seed(str(seed),storage)
- if not wallet:
+ if not Wallet.is_seed(seed):
sys.exit("Error: Invalid seed")
- wallet.save_seed(password)
+ wallet = Wallet.from_seed(seed, storage)
+ wallet.add_seed(seed, password)
wallet.create_accounts(password)
if not options.offline:
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)
+ args.append(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 [] ]
elif cmd.name == 'createmultisig':
args = [cmd, int(args[1]), json.loads(args[2])]