X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=electrum;h=e63803db8f954e5e949961d72d00f61acfaabac3;hb=7338ac3c5417d037b5c7a4fed4f66bdc20a322e9;hp=0db82b826b248acb612912b29c8eb080b75ac00e;hpb=fd2228feabadf9b3650e2376df573507a6d8e447;p=electrum-nvc.git

diff --git a/electrum b/electrum
index 0db82b8..e63803d 100755
--- a/electrum
+++ b/electrum
@@ -39,8 +39,11 @@ if __builtin__.use_local_modules:
     imp.load_module('electrum', *imp.find_module('lib'))
     imp.load_module('electrum_gui', *imp.find_module('gui'))
 
+if is_local:
+    sys.path.append('packages')
 
-from electrum import SimpleConfig, Network, Wallet, WalletStorage, NetworkProxy, Commands, known_commands
+
+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
@@ -84,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
 
 
@@ -99,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()
@@ -332,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])]