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

diff --git a/electrum b/electrum
index e834e08..e63803d 100755
--- a/electrum
+++ b/electrum
@@ -26,16 +26,6 @@ import sys
 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
@@ -49,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
+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):
@@ -93,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
 
 
@@ -108,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()
@@ -140,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)
 
 
 
@@ -250,10 +244,10 @@ if __name__ == '__main__':
             else:
                 import getpass
                 seed = getpass.getpass(prompt="seed:", stream=None) if options.concealed else raw_input("seed:")
-                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:
@@ -273,15 +267,16 @@ if __name__ == '__main__':
         else:
             if not config.get('2of3'):
                 wallet = Wallet(storage)
-                wallet.init_seed(None)
-                wallet.save_seed(password)
+                seed = wallet.make_seed()
+                wallet.add_seed(seed, password)
+                wallet.create_accounts(password)
                 wallet.synchronize()
-                print_msg("Your wallet generation seed is:\n\"%s\"" % wallet.get_mnemonic(password))
+                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.init_cold_seed()
-                wallet.save_cold_seed()
+                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.")
@@ -307,9 +302,9 @@ if __name__ == '__main__':
 
     # important warning
     if cmd.name in ['dumpprivkey', 'dumpprivkeys']:
-        print_msg("WARNING: ALL your private keys are secret.")
-        print_msg("Exposing a single private key can compromise your entire wallet!")
-        print_msg("In particular, DO NOT use 'redeem private key' services proposed by third parties.")
+        print_stderr("WARNING: ALL your private keys are secret.")
+        print_stderr("Exposing a single private key can compromise your entire wallet!")
+        print_stderr("In particular, DO NOT use 'redeem private key' services proposed by third parties.")
 
     # commands needing password
     if cmd.requires_password:
@@ -337,10 +332,10 @@ if __name__ == '__main__':
     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])]