separate blockchain and network
[electrum-nvc.git] / electrum
index 07c9ed8..d123fae 100755 (executable)
--- a/electrum
+++ b/electrum
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import re
-import sys, os, time, ast
+import pkgutil
+import sys, os, time, json
 import optparse
 import platform
+from decimal import Decimal
+import traceback
 
 try:
     import ecdsa  
@@ -31,91 +34,20 @@ try:
 except ImportError:
     sys.exit("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'")
 
-try:
-    from lib import *
-except ImportError:
-    from electrum import *
-
-from decimal import Decimal
-
-known_commands = {
-    'help':'Prints this help',
-    'validateaddress':'Check that the address is valid', 
-    'balance': "Display the balance of your wallet or of an address.\nSyntax: balance [<address>]", 
-    'contacts': "Show your list of contacts", 
-    'create':'Create a wallet', 
-    'restore':'Restore a wallet', 
-    'payto':"""Create and broadcast a transaction.
-Syntax: payto <recipient> <amount> [label]
-<recipient> can be a bitcoin address or a label
-options:\n  --fee, -f: set transaction fee\n  --fromaddr, -s: send from address -\n  --changeaddr, -c: send change to address
-            """,
-    'sendtx':
-            'Broadcasts a transaction to the network. \nSyntax: sendtx <tx>\n<tx> must be in hexadecimal.',
-    'password': 
-            "Changes your password",
-    'addresses':  
-            """Shows your list of addresses.
-options:
-  -a: show all addresses, including change addresses
-  -k: show private keys
-  -b: show the balance of addresses""",
-
-    'history':"Shows the transaction history",
-    'label':'Assign a label to an item\nSyntax: label <tx_hash> <label>',
-    'mktx':
-        """Create a signed transaction, password protected.
-Syntax: mktx <recipient> <amount> [label]
-options:\n  --fee, -f: set transaction fee\n  --fromaddr, -s: send from address -\n  --changeaddr, -c: send change to address
-        """,
-    'seed':
-            "Print the generation seed of your wallet.",
-    'importprivkey': 
-            'Import a private key\nSyntax: importprivkey <privatekey>',
-    'signmessage':
-            'Signs a message with a key\nSyntax: signmessage <address> <message>\nIf you want to lead or end a message with spaces, or want double spaces inside the message make sure you quote the string. I.e. " Hello  This is a weird String "',
-    'verifymessage':
-             'Verifies a signature\nSyntax: verifymessage <address> <signature> <message>\nIf you want to lead or end a message with spaces, or want double spaces inside the message make sure you quote the string. I.e. " Hello  This is a weird String "',
-    'eval':  
-             "Run python eval() on an object\nSyntax: eval <expression>\nExample: eval \"wallet.aliases\"",
-    'get': 
-             "Get config parameter.",
-    'set': 
-             "Set config parameter.",
-    'deseed':
-            "Remove seed from the wallet. The seed is stored in a file that has the name of the wallet plus '.seed'",
-    'reseed':
-            "Restore seed of the wallet. The wallet must have no seed, and the seed must match the wallet's master public key.",
-    'freeze':'',
-    'unfreeze':'',
-    'prioritize':'',
-    'unprioritize':'',
-    'dumpprivkey':'similar to bitcoind\'s command',
-    'listunspent':'similar to bitcoind\'s command',
-    'createmultisig':'similar to bitcoind\'s command',
-    'createrawtransaction':'similar to bitcoind\'s command',
-    'decoderawtransaction':'similar to bitcoind\'s command',
-    'signrawtransaction':'similar to bitcoind\'s command',
-    
-    }
-
 
+is_local = os.path.dirname(os.path.realpath(__file__)) == os.getcwd()
+is_android = 'ANDROID_DATA' in os.environ
 
-offline_commands = [ 'password', 'mktx',
-                     'label', 'contacts',
-                     'help', 'validateaddress',
-                     'signmessage', 'verifymessage',
-                     'eval', 'set', 'get', 'create', 'addresses',
-                     'importprivkey', 'seed',
-                     'deseed','reseed',
-                     'freeze','unfreeze',
-                     'prioritize','unprioritize',
-                     'dumpprivkey','listunspent',
-                     'createmultisig', 'createrawtransaction', 'decoderawtransaction', 'signrawtransaction'
-                     ]
+import __builtin__
+__builtin__.use_local_modules = is_local or is_android
 
+# load local module as electrum
+if __builtin__.use_local_modules:
+    import imp
+    imp.load_module('electrum', *imp.find_module('lib'))
+    imp.load_module('electrum_gui', *imp.find_module('gui'))
 
-protected_commands = ['payto', 'password', 'mktx', 'seed', 'importprivkey','signmessage', 'signrawtransaction','dumpprivkey' ]
+from electrum import *
 
 # get password routine
 def prompt_password(prompt, confirm=True):
@@ -133,15 +65,15 @@ def prompt_password(prompt, confirm=True):
     return password
 
 def arg_parser():
-    usage = "usage: %prog [options] command\nCommands: "+ (', '.join(known_commands))
+    usage = "%prog [options] command" 
     parser = optparse.OptionParser(prog=usage)
     parser.add_option("-g", "--gui", dest="gui", help="User interface: qt, lite, gtk or text")
     parser.add_option("-w", "--wallet", dest="wallet_path", help="wallet path (default: electrum.dat)")
     parser.add_option("-o", "--offline", action="store_true", dest="offline", default=False, help="remain offline")
     parser.add_option("-a", "--all", action="store_true", dest="show_all", default=False, help="show all addresses")
-    parser.add_option("-b", "--balance", action="store_true", dest="show_balance", default=False, help="show the balance at listed addresses")
-    parser.add_option("-k", "--keys",action="store_true", dest="show_keys",default=False, help="show the private keys of listed addresses")
-    parser.add_option("-f", "--fee", dest="tx_fee", default="0.005", help="set tx fee")
+    parser.add_option("-b", "--balance", action="store_true", dest="show_balance", default=False, help="show the balance of listed addresses")
+    parser.add_option("-l", "--labels", action="store_true", dest="show_labels", default=False, help="show the labels of listed addresses")
+    parser.add_option("-f", "--fee", dest="tx_fee", default=None, help="set tx fee")
     parser.add_option("-F", "--fromaddr", dest="from_addr", default=None, help="set source address for payto/mktx. if it isn't in the wallet, it will ask for the private key unless supplied in the format public_key:private_key. It's not saved in the wallet.")
     parser.add_option("-c", "--changeaddr", dest="change_addr", default=None, help="set the change address for payto/mktx. default is a spare address, or the source address if it's not in the wallet")
     parser.add_option("-s", "--server", dest="server", default=None, help="set server host:port:protocol, where protocol is t or h")
@@ -157,11 +89,13 @@ if __name__ == '__main__':
 
     parser = arg_parser()
     options, args = parser.parse_args()
+    if options.portable and options.wallet_path is None:
+        options.wallet_path = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'electrum.dat')
     set_verbosity(options.verbose)
 
     # config is an object passed to the various constructors (wallet, interface, gui)
-    if 'ANDROID_DATA' in os.environ:
-        config_options = {'wallet_path':"/sdcard/electrum.dat", 'portable':True, 'verbose':True, 'gui':'android'}
+    if is_android:
+        config_options = {'wallet_path':"/sdcard/electrum.dat", 'portable':True, 'verbose':True, 'gui':'android', 'auto_cycle':True}
     else:
         config_options = eval(str(options))
         for k, v in config_options.items():
@@ -173,7 +107,6 @@ if __name__ == '__main__':
         util.check_windows_wallet_migration()
 
     config = SimpleConfig(config_options)
-    wallet = Wallet(config)
 
     if len(args)==0:
         url = None
@@ -183,118 +116,41 @@ if __name__ == '__main__':
         cmd = 'gui'
     else:
         cmd = args[0]
-        firstarg = args[1] if len(args) > 1 else ''
        
-    #this entire if/else block is just concerned with importing the 
-    #right GUI toolkit based the GUI command line option given 
-    if cmd == 'gui':
-        pref_gui = config.get('gui','classic')
-
-        if pref_gui == 'gtk':
-            try:
-                import lib.gui as gui
-            except ImportError:
-                import electrum.gui as gui
-        elif pref_gui in ['classic', 'qt']:
-            try:
-                import lib.gui_qt as gui
-            except ImportError:
-                import electrum.gui_qt as gui
-        elif pref_gui == 'lite':
-              try:
-                  import lib.gui_lite as gui
-              except ImportError:
-                  import electrum.gui_lite as gui
-        elif pref_gui == 'text':
-              try:
-                  import lib.gui_text as gui
-              except ImportError:
-                  import electrum.gui_text as gui
-        elif pref_gui == 'android':
-              try:
-                  import lib.gui_android as gui
-              except ImportError:
-                  import electrum.gui_android as gui
-        else:
-            sys.exit("Error: Unknown GUI: " + pref_gui )
 
+    if cmd == 'gui':
+        gui_name = config.get('gui','classic')
+        try:
+            gui = __import__('electrum_gui.gui_' + gui_name, fromlist=['electrum_gui'])
+        except ImportError:
+            traceback.print_exc(file=sys.stdout)
+            sys.exit()
+            #sys.exit("Error: Unknown GUI: " + gui_name )
         
-        interface = Interface(config, True)
-        wallet.interface = interface
-        interface.start()
-        if interface.is_connected:
-            interface.send([('server.peers.subscribe',[])])
-
-        set_language(config.get('language'))
-        gui = gui.ElectrumGui(wallet, config)
-
-        found = config.wallet_file_exists
-        if not found:
-            a = gui.restore_or_create()
-            if not a: exit()
-            # select a server.
-            s = gui.network_dialog()
-
-            if a =='create':
-                wallet.init_seed(None)
-            else:
-                # ask for seed and gap.
-                sg = gui.seed_dialog()
-                if not sg: exit()
-                seed, gap = sg
-                if not seed: exit()
-                wallet.gap_limit = gap
-                if len(seed) == 128:
-                    wallet.seed = ''
-                    wallet.sequence.master_public_key = seed
-                else:
-                    wallet.init_seed(str(seed))
-            
+        # network interface
+        network = Network(config)
+        network.start()
+        #interface.send([('server.peers.subscribe',[])])
 
-            # generate the first addresses, in case we are offline
-            if s is None or a == 'create':
-                wallet.synchronize()
-            if a == 'create':
-                # display seed
-                gui.show_seed()
-
-        verifier = WalletVerifier(interface, config)
-        wallet.set_verifier(verifier)
-        synchronizer = WalletSynchronizer(wallet, config)
-        synchronizer.start()
-
-        if not found and a == 'restore' and s is not None:
-            try:
-                keep_it = gui.restore_wallet()
-                wallet.fill_addressbook()
-            except:
-                import traceback
-                traceback.print_exc(file=sys.stdout)
-                exit()
-
-            if not keep_it: exit()
-
-        if not found:
-            gui.password_dialog()
-
-        wallet.save()
-        verifier.start()
+        gui = gui.ElectrumGui(config, network)
         gui.main(url)
-        wallet.save()
-
-        verifier.stop()
-        synchronizer.stop()
-        interface.stop()
+        
+        network.stop()
 
         # we use daemon threads, their termination is enforced.
         # this sleep command gives them time to terminate cleanly. 
         time.sleep(0.1)
         sys.exit(0)
 
+
+    # instanciate wallet for command-line
+    storage = WalletStorage(config)
+    wallet = Wallet(storage)
+
     if cmd not in known_commands:
         cmd = 'help'
 
-    if not config.wallet_file_exists and cmd not in ['help','create','restore']:
+    if not storage.file_exists and cmd not in ['help','create','restore']:
         print_msg("Error: Wallet file not found.")
         print_msg("Type 'electrum create' to create a new wallet, or provide a path to a wallet with the -w option")
         sys.exit(0)
@@ -309,7 +165,7 @@ if __name__ == '__main__':
         w_host, w_port, w_protocol = server.split(':')
         host = raw_input("server (default:%s):"%w_host)
         port = raw_input("port (default:%s):"%w_port)
-        protocol = raw_input("protocol [t=tcp;h=http;n=native] (default:%s):"%w_protocol)
+        protocol = raw_input("protocol [t=tcp;h=http] (default:%s):"%w_protocol)
         fee = raw_input("fee (default:%s):"%( str(Decimal(wallet.fee)/100000000)) )
         gap = raw_input("gap limit (default 5):")
         if host: w_host = host
@@ -331,35 +187,36 @@ if __name__ == '__main__':
 
             if len(seed) == 128:
                 wallet.seed = None
-                wallet.sequence.master_public_key = seed
+                wallet.init_sequence(str(seed))
             else:
-                wallet.seed = str(seed)
-                wallet.init_mpk( wallet.seed )
+                wallet.init_seed( str(seed) )
+                wallet.save_seed()
 
+            interface = Interface(config)
             if not options.offline:
-                interface = Interface(config)
-                interface.start()
-                wallet.interface = interface
-
-                verifier = WalletVerifier(interface, config)
-                wallet.set_verifier(verifier)
+                if not interface.start(wait=True):
+                    print_msg("Not connected, aborting. Try option -o if you want to restore offline.")
+                    sys.exit(1)
 
+                blockchain = BlockchainVerifier(interface, config)
+                blockchain.start()
+                wallet.start_threads(interface, blockchain)
                 print_msg("Recovering wallet...")
-                WalletSynchronizer(wallet, config).start()
                 wallet.update()
                 if wallet.is_found():
                     print_msg("Recovery successful")
                 else:
                     print_msg("Warning: Found no history for this wallet")
             else:
+                interface.start(wait=False)
                 wallet.synchronize()
             wallet.fill_addressbook()
-            wallet.save()
+            #wallet.save()
             print_msg("Wallet saved in '%s'"%wallet.config.path)
         else:
             wallet.init_seed(None)
+            wallet.save_seed()
             wallet.synchronize() # there is no wallet thread 
-            wallet.save()
             print_msg("Your wallet generation seed is: " + wallet.seed)
             print_msg("Please keep it in a safe place; if you lose it, you will not be able to restore your wallet.")
             print_msg("Equivalently, your wallet seed can be stored and recovered with the following mnemonic code:")
@@ -369,47 +226,20 @@ if __name__ == '__main__':
         if password:
             wallet.update_password(wallet.seed, None, password)
 
-    # check syntax
-    if cmd in ['payto', 'mktx']:
-        try:
-            to_address = args[1]
-            amount = int( 100000000 * Decimal(args[2]) )
-            change_addr = None
-            label = ' '.join(args[3:])
-            if options.tx_fee: 
-                options.tx_fee = int( 100000000 * Decimal(options.tx_fee) )
-        except:
-            firstarg = cmd
-            cmd = 'help'
+        # terminate
+        sys.exit(0)
+
+
 
-    # open session
-    if cmd not in offline_commands and not options.offline:
-        interface = Interface(config)
-        interface.register_callback('connected', lambda: sys.stderr.write("Connected to " + interface.connection_msg + "\n"))
-        interface.start()
-        wallet.interface = interface
-        synchronizer = WalletSynchronizer(wallet, config)
-        synchronizer.start()
-        wallet.update()
-        wallet.save()
-
-    # check if --from_addr not in wallet (for mktx/payto)
-    is_temporary = False
-    from_addr = None
-    if options.from_addr:
-        from_addr = options.from_addr
-        if from_addr not in wallet.all_addresses():
-            is_temporary = True
-                
     # important warning
-    if cmd=='addresses' and options.show_keys:
+    if cmd 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.")
 
     # commands needing password
-    if cmd in protected_commands or ( cmd=='addresses' and options.show_keys):
-        if wallet.use_encryption and not is_temporary:
+    if cmd in protected_commands:
+        if wallet.use_encryption:
             password = prompt_password('Password:', False)
             if not password:
                 print_msg("Error: Password required")
@@ -423,378 +253,142 @@ if __name__ == '__main__':
         else:
             password = None
             seed = wallet.seed
+    else:
+        password = None
+
 
+    # add missing arguments, do type conversions
     if cmd == 'importprivkey':
         # See if they specificed a key on the cmd line, if not prompt
-        if len(args) > 1:
-            sec = args[1]
-        else:
-            sec = prompt_password('Enter PrivateKey (will not echo):', False)
-        try:
-            addr = wallet.import_key(sec,password)
-            wallet.save()
-            print_msg("Keypair imported: ", addr)
-        except BaseException as e:
-            print_msg("Error: Keypair import failed: " + str(e))
-
-    if cmd == 'help':
-        cmd2 = firstarg
-        if cmd2 not in known_commands:
+        if len(args) == 1:
+            args[1] = prompt_password('Enter PrivateKey (will not echo):', False)
+
+    elif cmd == 'signrawtransaction':
+        args = [ cmd, args[1], json.loads(args[2]) if len(args)>2 else [], json.loads(args[3]) if len(args)>3 else []]
+
+    elif cmd == 'createmultisig':
+        args = [ cmd, int(args[1]), json.loads(args[2])]
+
+    elif cmd == 'createrawtransaction':
+        args = [ cmd, json.loads(args[1]), json.loads(args[2])]
+
+    elif cmd == 'listaddresses':
+        args = [cmd, options.show_all, options.show_balance, options.show_labels]
+
+    elif cmd in ['payto', 'mktx']:
+        domain = [options.from_addr] if options.from_addr else None
+        args = [ 'mktx', args[1], Decimal(args[2]), Decimal(options.tx_fee) if options.tx_fee else None, options.change_addr, domain ]
+        
+    elif cmd in ['paytomany', 'mksendmanytx']:
+        domain = [options.from_addr] if options.from_addr else None
+        outputs = []
+        for i in range(1, len(args), 2):
+            if len(args) < i+2:
+                print_msg("Error: Mismatched arguments.")
+                exit(1)
+            outputs.append((args[i], Decimal(args[i+1])))
+        args = [ 'mksendmanytx', outputs, Decimal(options.tx_fee) if options.tx_fee else None, options.change_addr, domain ]        
+
+    elif cmd == 'help':
+        if len(args) < 2:
             parser.print_help()
             print_msg("Type 'electrum help <command>' to see the help for a specific command")
             print_msg("Type 'electrum --help' to see the list of options")
-            print_msg("List of commands:", ', '.join(known_commands))
-        else:
-            print_msg(known_commands[cmd2])
 
-    elif cmd == 'seed':
-        print_msg(seed + ' "' + ' '.join(mnemonic_encode(seed)) + '"')
 
-    elif cmd == 'deseed':
+                
+
+    # check the number of arguments
+    min_args, max_args, description, syntax, options_syntax = known_commands[cmd]
+    if len(args) - 1 < min_args:
+        print_msg("Not enough arguments")
+        print_msg("Syntax:", syntax)
+        sys.exit(1)
+
+    if max_args >= 0 and len(args) - 1 > max_args:
+        print_msg("too many arguments", args)
+        print_msg("Syntax:", syntax)
+        sys.exit(1)
+
+    if max_args < 0:
+        if len(args) > min_args + 1:
+            message = ' '.join(args[min_args:])
+            print_msg("Warning: Final argument was reconstructed from several arguments:", repr(message))
+            args = args[0:min_args] + [ message ]
+
+
+    # open session
+    if cmd not in offline_commands and not options.offline:
+        interface = Interface(config)
+        interface.register_callback('connected', lambda: sys.stderr.write("Connected to " + interface.connection_msg + "\n"))
+
+        if not interface.start(wait=True):
+            print_msg("Not connected, aborting.")
+            sys.exit(1)
+        blockchain = BlockchainVerifier(interface, config)
+        blockchain.start()
+        wallet.start_threads(interface, blockchain)
+        wallet.update()
+
+
+
+    # run the command
+
+    if cmd == 'deseed':
         if not wallet.seed:
             print_msg("Error: This wallet has no seed")
-        elif wallet.use_encryption:
-            print_msg("Error: This wallet is encrypted")
         else:
-            ns = wallet.config.path + '.seed'
-            print_msg("Warning: you are going to extract the seed from '%s'\nThe seed will be saved in '%s'"%(wallet.config.path,ns))
+            ns = wallet.config.path + '.seedless'
+            print_msg("Warning: you are going to create a seedless wallet'\nIt will be saved in '%s'"%ns)
             if raw_input("Are you sure you want to continue? (y/n) ") in ['y','Y','yes']:
-                f = open(ns,'w')
-                f.write(repr({'seed':wallet.seed, 'imported_keys':wallet.imported_keys})+"\n")
-                f.close()
+                wallet.config.path = ns
                 wallet.seed = ''
-                wallet.config.set_key('seed','', True)
+                wallet.storage.put('seed', '', True)
+                wallet.use_encryption = False
+                wallet.storage.put('use_encryption', wallet.use_encryption, True)
                 for k in wallet.imported_keys.keys(): wallet.imported_keys[k] = ''
-                wallet.save()
+                wallet.config.set_key('imported_keys',wallet.imported_keys, True)
                 print_msg("Done.")
             else:
                 print_msg("Action canceled.")
 
-    elif cmd == 'reseed':
-        if wallet.seed:
-            print_msg("Warning: This wallet already has a seed", wallet.seed)
-        else:
-            ns = wallet.config.path + '.seed'
-            try:
-                f = open(ns,'r')
-                data = f.read()
-                f.close()
-            except IOError:
-                sys.exit("Error: Seed file not found")
-            try:
-                d = ast.literal_eval( data )
-                seed = d['seed']
-                imported_keys = d.get('imported_keys',{})
-            except:
-                sys.exit("Error: Error with seed file")
-
-            mpk = wallet.get_master_public_key()
-            wallet.seed = seed
-            wallet.imported_keys = imported_keys
-            wallet.use_encryption = False
-            wallet.init_mpk(seed)
-            if mpk == wallet.get_master_public_key():
-                wallet.save()
-                print_msg("Done: " + wallet.config.path)
-            else:
-                print_msg("Error: Master public key does not match")
-
-    elif cmd == 'validateaddress':
-        addr = args[1]
-        is_valid = wallet.is_valid(addr)
-        out = { 'isvalid':is_valid }
-        if is_valid:
-            is_mine = wallet.is_mine(addr)
-            out['address'] = addr
-            out['ismine'] = is_mine
-            if is_mine:
-                out['pubkey'] = wallet.get_public_key(addr)
-            
-        print_json(out)
-
-    elif cmd == 'balance':
-        try:
-            addrs = args[1:]
-        except:
-            pass
-        if addrs == []:
-            c, u = wallet.get_balance()
-            if u:
-                print_msg(Decimal( c ) / 100000000 , Decimal( u ) / 100000000)
-            else:
-                print_msg(Decimal( c ) / 100000000)
-        else:
-            for addr in addrs:
-                c, u = wallet.get_addr_balance(addr)
-                if u:
-                    print_msg("%s %s, %s" % (addr, str(Decimal(c)/100000000), str(Decimal(u)/100000000)))
-                else:
-                    print_msg("%s %s" % (addr, str(Decimal(c)/100000000)))
-
-    elif cmd in [ 'contacts']:
-        for addr in wallet.addressbook:
-            print_msg(addr, "   ", wallet.labels.get(addr))
-
-    elif cmd == 'eval':
-        print_msg(eval(args[1]))
-        wallet.save()
-
-    elif cmd == 'get':
+    elif cmd == 'getconfig':
         key = args[1]
-        print_msg(wallet.config.get(key))
+        print_msg(config.get(key))
 
-    elif cmd == 'set':
+    elif cmd == 'setconfig':
         key, value = args[1:3]
         if key not in ['seed', 'seed_version', 'master_public_key', 'use_encryption']:
-            wallet.config.set_key(key, value, True)
+            config.set_key(key, value, True)
             print_msg(True)
         else:
             print_msg(False)
 
-    elif cmd in [ 'addresses']:
-        for addr in wallet.all_addresses():
-            if options.show_all or not wallet.is_change(addr):
-
-                flags = wallet.get_address_flags(addr)
-                label = wallet.labels.get(addr,'')
-                
-                if label: label = "\"%s\""%label
-
-                if options.show_balance:
-                    h = wallet.history.get(addr,[])
-                    #ni = no = 0
-                    #for item in h:
-                    #    if item['is_input']:  ni += 1
-                    #    else:              no += 1
-                    b = format_satoshis(wallet.get_addr_balance(addr)[0])
-                else: b=''
-                m_addr = "%34s"%addr
-                if options.show_keys:
-                    m_addr += ':' + str(wallet.get_private_key(addr, password))
-                print_msg(flags, m_addr, b, label)
-
-    if cmd == 'history':
-        import datetime
-        balance = 0
-        for item in wallet.get_tx_history():
-            tx_hash, conf, is_mine, value, fee, balance, timestamp = item
-            try:
-                time_str = datetime.datetime.fromtimestamp( timestamp).isoformat(' ')[:-3]
-            except:
-                time_str = "----"
-
-            label, is_default_label = wallet.get_label(tx_hash)
-            if not label: label = tx_hash
-            else: label = label + ' '*(64 - len(label) )
-
-            print_msg("%17s"%time_str, "  " + label + "  " + format_satoshis(value)+ "  "+ format_satoshis(balance))
-        print_msg("# balance: ", format_satoshis(balance))
-
-    elif cmd == 'label':
-        try:
-            tx = args[1]
-            label = ' '.join(args[2:])
-        except:
-            print_msg("Error. Syntax:  label <tx_hash> <text>")
-            sys.exit(1)
-        wallet.labels[tx] = label
-        wallet.save()
-            
-    elif cmd in ['payto', 'mktx']:
-        if from_addr and is_temporary:
-            if from_addr.find(":") == -1:
-                keypair = from_addr + ":" + prompt_password('Private key:', False)
-            else:
-                keypair = from_addr
-                from_addr = keypair.split(':')[0]
-            if not wallet.import_key(keypair,password):
-                print_msg("Error: Invalid key pair")
-                exit(1)
-            wallet.history[from_addr] = interface.retrieve_history(from_addr)
-            wallet.update_tx_history()
-            change_addr = from_addr
-
-        if options.change_addr:
-            change_addr = options.change_addr
-
-        for k, v in wallet.labels.items():
-            if v == to_address:
-                to_address = k
-                print_msg("alias", to_address)
-                break
-            if change_addr and v == change_addr:
-                change_addr = k
-        try:
-            tx = wallet.mktx( [(to_address, amount)], label, password,
-                fee = options.tx_fee, change_addr = change_addr, from_addr = from_addr )
-        except:
-            import traceback
-            traceback.print_exc(file=sys.stdout)
-            tx = None
-
-        if tx and cmd=='payto': 
-            r, h = wallet.sendtx( tx )
-            print_msg(h)
-        else:
-            out = {"hex":str(tx), "complete":tx.is_complete}
-            if not tx.is_complete: 
-                import json
-                out['input_info'] = repr(tx.input_info).replace(' ','')
-            print_json(out)
-
-        if is_temporary:
-            wallet.imported_keys.pop(from_addr)
-            del(wallet.history[from_addr])
-        wallet.save()
-
-    elif cmd == 'sendtx':
-        tx = args[1]
-        r, h = wallet.sendtx( tx )
-        print_msg(h)
-
     elif cmd == 'password':
         new_password = prompt_password('New password:')
         wallet.update_password(seed, password, new_password)
 
-    elif cmd == 'signmessage':
-        if len(args) < 3:
-            print_msg("Error: Invalid usage of signmessage.")
-            print_msg(known_commands[cmd])
-            sys.exit(1)
-        address = args[1]
-        message = ' '.join(args[2:])
-        if len(args) > 3:
-            print_msg("Warning: Message was reconstructed from several arguments:", repr(message))
-
-        print_msg(wallet.sign_message(address, message, password))
-
-    elif cmd == 'verifymessage':
+    else:
+        cmd_runner = Commands(wallet, interface)
+        func = eval('cmd_runner.' + cmd)
+        cmd_runner.password = password
         try:
-            address = args[1]
-            signature = args[2]
-            message = ' '.join(args[3:])
-        except:
-            print_msg("Error: Not all parameters were given, displaying help instead.")
-            print_msg(known_commands[cmd])
+            result = func(*args[1:])
+        except BaseException, e:
+            import traceback
+            traceback.print_exc(file=sys.stdout)
             sys.exit(1)
-        if len(args) > 4:
-            print_msg("Warning: Message was reconstructed from several arguments:", repr(message))
-        EC_KEY.verify_message(address, signature, message)
-        try:
-            EC_KEY.verify_message(address, signature, message)
-            print_msg(True)
-        except BaseException as e:
-            print_error("Verification error: {0}".format(e))
-            print_msg(False)
-
-    elif cmd == 'freeze':
-        addr = args[1]
-        print_msg(wallet.freeze(addr))
-        
-    elif cmd == 'unfreeze':
-        addr = args[1]
-        print_msg(wallet.unfreeze(addr))
-
-    elif cmd == 'prioritize':
-        addr = args[1]
-        print_msg(wallet.prioritize(addr))
-
-    elif cmd == 'unprioritize':
-        addr = args[1]
-        print_msg(wallet.unprioritize(addr))
-
-
-    elif cmd == 'dumpprivkey':
-        addr = args[1]
-        sec = wallet.get_private_key(addr, password)
-        print_msg( sec )
-
-        
-    elif cmd == 'createmultisig':
-        num = int(args[1])
-        pubkeys = ast.literal_eval(args[2])
-        assert isinstance(pubkeys,list)
-        print_json( Transaction.multisig_script(pubkeys, num) )
-    
-
-    elif cmd == 'createrawtransaction':
-        inputs = ast.literal_eval(args[1])
-        outputs = ast.literal_eval(args[2])
-        # convert to own format
-        for i in inputs:
-            i['tx_hash'] = i['txid']
-            i['index'] = i['vout']
-        outputs = map(lambda x: (x[0],int(1e8*x[1])), outputs.items())
-        tx = Transaction.from_io(inputs, outputs)
-        print_msg( tx )
-
-
-    elif cmd == 'decoderawtransaction':
-        tx = Transaction(args[1])
-        print_json( tx.deserialize() )
-
-
-    elif cmd == 'signrawtransaction':
-        tx = Transaction(args[1])
-        input_info = ast.literal_eval(args[2]) if len(args)>2 else []
-        private_keys = ast.literal_eval(args[3]) if len(args)>3 else []
-        unspent_coins = wallet.get_unspent_coins()
-
-        # convert private_keys to dict 
-        pk = {}
-        for sec in private_keys:
-            address = bitcoin.address_from_private_key(sec)
-            pk[address] = sec
-        private_keys = pk
-
-        for txin in tx.inputs:
-            # convert to own format
-            txin['tx_hash'] = txin['prevout_hash']
-            txin['index'] = txin['prevout_n']
-
-            for item in input_info:
-                if item.get('txid') == txin['tx_hash'] and item.get('vout') == txin['index']:
-                    txin['raw_output_script'] = item['scriptPubKey']
-                    txin['redeemScript'] = item.get('redeemScript')
-                    txin['electrumKeyID'] = item.get('electrumKeyID')
-                    break
-            else:
-                for item in unspent_coins:
-                    if txin['tx_hash'] == item['tx_hash'] and txin['index'] == item['index']:
-                        txin['raw_output_script'] = item['raw_output_script']
-                        break
-                else:
-                    # if neither, we might want to get it from the server..
-                    raise
-
-            # find the address:
-            from lib import deserialize
-            if txin.get('electrumKeyID'):
-                n, for_change = txin.get('electrumKeyID')
-                sec = wallet.sequence.get_private_key(n, for_change, seed)
-                address = bitcoin.address_from_private_key(sec)
-                txin['address'] = address
-                private_keys[address] = sec
-
-            elif txin.get("redeemScript"):
-                txin['address'] = bitcoin.hash_160_to_bc_address(bitcoin.hash_160(txin.get("redeemScript").decode('hex')), 5)
-
-            elif txin.get("raw_output_script"):
-                addr = deserialize.get_address_from_output_script(txin.get("raw_output_script").decode('hex'))
-                sec = wallet.get_private_key(addr, password)
-                if sec: 
-                    private_keys[addr] = sec
-                    txin['address'] = addr
-
-        tx.sign( private_keys )
-        print_json({ "hex":str(tx),"complete":tx.is_complete})
-
-
-    elif cmd == 'listunspent':
-        print_json(wallet.get_unspent_coins())
+            
+        if type(result) == str:
+            util.print_msg(result)
+        elif result is not None:
+            util.print_json(result)
+            
         
 
     if cmd not in offline_commands and not options.offline:
-        synchronizer.stop()
-
-
+        wallet.stop_threads()
+        interface.stop()
+        blockchain.stop()
+        time.sleep(0.1)
+        sys.exit(0)