X-Git-Url: https://git.novaco.in/?p=electrum-nvc.git;a=blobdiff_plain;f=electrum;h=e63803db8f954e5e949961d72d00f61acfaabac3;hp=aeb1b88c8093b1b3ed97fe75c7430ed2944fb1ab;hb=99a31b0c6a30bad2cb2b8c27a748a1f25a89c107;hpb=31226b8a34c92b3e6c71cf4fab7c56bf73fe54e0

diff --git a/electrum b/electrum
index aeb1b88..e63803d 100755
--- a/electrum
+++ b/electrum
@@ -39,8 +39,12 @@ if __builtin__.use_local_modules:
     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):
@@ -83,6 +87,7 @@ def arg_parser():
     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
 
 
@@ -98,16 +103,15 @@ def print_help_cb(self, opt, value, 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()
@@ -130,9 +134,9 @@ def run_command(cmd, password=None, args=[]):
 
 
     if type(result) == str:
-        util.print_msg(result)
+        print_msg(result)
     elif result is not None:
-        util.print_json(result)
+        print_json(result)
 
 
 
@@ -331,7 +335,7 @@ if __name__ == '__main__':
             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])]