Add block explorer setting for "view online"

[electrum-nvc.git] / electrum

diff --git a/electrum b/electrum
index f3b05f5..b98acec 100755 (executable)
--- a/electrum
+++ b/electrum
@@ -91,6 +91,7 @@ def arg_parser():
     parser.add_option("-W", "--password", dest="password", default=None, help="set password for usage with commands (currently only implemented for create command, do not use it for longrunning gui session since the password is visible in /proc)")
     parser.add_option("-1", "--oneserver", action="store_true", dest="oneserver", default=False, help="connect to one server only")
     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")
     return parser
 
@@ -108,37 +109,27 @@ def print_help_cb(self, opt, value, parser):
 
 
 def run_command(cmd, password=None, args=[]):
-    import xmlrpclib, socket
-    cmd_runner = Commands(wallet, network)
-    func = getattr(cmd_runner, cmd.name)
-    cmd_runner.password = password
-
+    import socket
     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)
+
 
-        while True:
-            try:
-                cmd_runner.network = NetworkProxy(config)
-                cmd_runner.network.start()
-                break
-            except socket.error:
-                if cmd.name != 'daemon':
-                    print "Starting daemon [%s]"%config.get('server')
-                    start_daemon(config)
-                else:
-                    print "Daemon not running"
-                    sys.exit(1)
 
         if wallet:
-            wallet.start_threads(cmd_runner.network)
+            wallet.start_threads(network)
             wallet.update()
     else:
-        cmd_runner.network = None
-
+        network = None
 
+    cmd_runner = Commands(wallet, network)
+    func = getattr(cmd_runner, cmd.name)
+    cmd_runner.password = password
     try:
         result = func(*args[1:])
     except Exception:
-        print "ecxeption"
         traceback.print_exc(file=sys.stdout)
         sys.exit(1)
 
@@ -263,6 +254,7 @@ if __name__ == '__main__':
                 if not wallet:
                     sys.exit("Error: Invalid seed")
                 wallet.save_seed(password)
+                wallet.create_accounts(password)
 
             if not options.offline:
                 network = Network(config)
@@ -279,12 +271,22 @@ if __name__ == '__main__':
                 print_msg("Warning: This wallet was restored offline. It may contain more addresses than displayed.")
 
         else:
-            wallet = Wallet(storage)
-            wallet.init_seed(None)
-            wallet.save_seed(password)
-            wallet.synchronize()
-            print_msg("Your wallet generation seed is:\n\"%s\"" % wallet.get_mnemonic(password))
-            print_msg("Please keep it in a safe place; if you lose it, you will not be able to restore your wallet.")
+            if not config.get('2of3'):
+                wallet = Wallet(storage)
+                seed = wallet.make_seed()
+                wallet.save_seed(seed, password)
+                wallet.create_accounts(password)
+                wallet.synchronize()
+                print_msg("Your wallet generation seed is:\n\"%s\"" % seed)
+                print_msg("Please keep it in a safe place; if you lose it, you will not be able to restore your wallet.")
+            else:
+                wallet = Wallet_2of3(storage)
+                cold_seed = wallet.make_seed()
+                #wallet.save_seed()
+                print_msg("Your cold seed is:\n\"%s\"" % cold_seed)
+                print_msg("Please store it on paper. ")
+                print_msg("Open this file on your online computer to complete your wallet creation.")
+
 
         print_msg("Wallet saved in '%s'" % wallet.storage.path)