X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=lib%2Fcommands.py;h=f3cf783ad2254a84184bf8d8f271b87ad015ffcb;hb=1bb00ff5af3a7f23f23c92b69cc2ff412731a7f3;hp=7ce758873ecfb385a33ac1559f5e220a371496f8;hpb=9d5f39c2353c816327252addd62816e93f348a98;p=electrum-nvc.git

diff --git a/lib/commands.py b/lib/commands.py
index 7ce7588..f3cf783 100644
--- a/lib/commands.py
+++ b/lib/commands.py
@@ -16,12 +16,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-from util import *
-from bitcoin import *
+import datetime
+import time
+import copy
+from util import print_msg, format_satoshis
+from bitcoin import is_valid, hash_160_to_bc_address, hash_160
 from decimal import Decimal
 import bitcoin
 from transaction import Transaction
 
+
 class Command:
     def __init__(self, name, min_args, max_args, requires_network, requires_wallet, requires_password, description, syntax = '', options_syntax = ''):
         self.name = name
@@ -34,7 +38,10 @@ class Command:
         self.syntax = syntax
         self.options = options_syntax
 
+
 known_commands = {}
+
+
 def register_command(*args):
     global known_commands
     name = args[0]
@@ -62,8 +69,8 @@ register_command('createmultisig',       2, 2, False, True,  False, 'similar to
 register_command('createrawtransaction', 2, 2, False, True,  False, 'similar to bitcoind\'s command')
 register_command('deseed',               0, 0, False, True,  False, 'Remove seed from wallet, creating a seedless, watching-only wallet.')
 register_command('decoderawtransaction', 1, 1, False, False, False, 'similar to bitcoind\'s command')
-register_command('dumpprivkey',          1, 1, False, True,  True,  'Dumps a specified private key for a given address', 'dumpprivkey <bitcoin address>')
-register_command('dumpprivkeys',         0, 0, False, True,  True,  'dump all private keys')
+register_command('getprivatekeys',       1, 1, False, True,  True,  'Get the private keys of a given address', 'getprivatekeys <bitcoin address>')
+register_command('dumpprivkeys',         0, 0, False, True,  True,  'Dump all private keys in your wallet')
 register_command('freeze',               1, 1, False, True,  True,  'Freeze the funds at one of your wallet\'s addresses', 'freeze <address>')
 register_command('getbalance',           0, 1, True,  True,  False, 'Return the balance of your wallet, or of one account in your wallet', 'getbalance [<account>]')
 register_command('getservers',           0, 0, True,  False, False, 'Return the list of available servers')
@@ -90,19 +97,18 @@ register_command('restore',              0, 0, True,  True,  False, 'Restore a w
 register_command('setconfig',            2, 2, False, False, False, 'Set a configuration variable', 'setconfig <name> <value>')
 register_command('setlabel',             2,-1, False, True,  False, 'Assign a label to an item', 'setlabel <tx_hash> <label>')
 register_command('sendrawtransaction',   1, 1, True,  False, False, 'Broadcasts a transaction to the network.', 'sendrawtransaction <tx in hexadecimal>')
-register_command('signrawtransaction',   1, 3, False, True,  True,  'similar to bitcoind\'s command')
+register_command('signrawtransaction',   1, 3, False, True,  True,  'Sign a serailized transaction','signrawtransaction <tx in hexadecimal>')
 register_command('signmessage',          2,-1, False, True,  True,  'Sign a message with a key', signmessage_syntax)
 register_command('unfreeze',             1, 1, False, True,  False, 'Unfreeze the funds at one of your wallet\'s address', 'unfreeze <address>')
 register_command('validateaddress',      1, 1, False, False, False, 'Check that the address is valid', 'validateaddress <address>')
 register_command('verifymessage',        3,-1, False, False, False, 'Verifies a signature', verifymessage_syntax)
 
 register_command('encrypt',              2,-1, False, False, False, 'encrypt a message with pubkey','encrypt <pubkey> <message>')
-register_command('decrypt',              2,-1, False, False, False, 'decrypt a message with privkey','decrypt <privkey> <message>')
-register_command('daemon',               1, 1, True, False, False, 'start/stop daemon')
+register_command('decrypt',              2,-1, False, True, True,   'decrypt a message encrypted with pubkey','decrypt <pubkey> <message>')
+register_command('daemon',               1, 1, True, False, False,  '<stop|status>')
 register_command('getproof',             1, 1, True, False, False, 'get merkle proof', 'getproof <address>')
 register_command('getutxoaddress',       2, 2, True, False, False, 'get the address of an unspent transaction output','getutxoaddress <txid> <pos>')
-
-
+register_command('sweep',                2, 3, True, False, False, 'Sweep a private key.', 'sweep privkey addr [fee]')
 
 
 class Commands:
@@ -113,7 +119,6 @@ class Commands:
         self._callback = callback
         self.password = None
 
-
     def _run(self, method, args, password_getter):
         cmd = known_commands[method]
         if cmd.requires_password and self.wallet.use_encryption:
@@ -125,50 +130,44 @@ class Commands:
             apply(self._callback, ())
         return result
 
-
     def getaddresshistory(self, addr):
         return self.network.synchronous_get([ ('blockchain.address.get_history',[addr]) ])[0]
 
-
     def daemon(self, arg):
         if arg=='stop':
             return self.network.stop()
         elif arg=='status':
-            return { 
-                'server':self.network.main_server(), 
+            return {
+                'server':self.network.main_server(),
                 'connected':self.network.is_connected()
             }
         else:
             return "unknown command \"%s\""% arg
 
-
     def listunspent(self):
-        import copy
         l = copy.deepcopy(self.wallet.get_unspent_coins())
         for i in l: i["value"] = str(Decimal(i["value"])/100000000)
         return l
 
-
     def getaddressunspent(self, addr):
         return self.network.synchronous_get([ ('blockchain.address.listunspent',[addr]) ])[0]
 
-
     def getutxoaddress(self, txid, num):
         r = self.network.synchronous_get([ ('blockchain.utxo.get_address',[txid, num]) ])
-        if r: 
+        if r:
             return {'address':r[0] }
 
-
     def createrawtransaction(self, inputs, outputs):
-        inputs = map(lambda i: {'prevout_hash': i['txid'], 'prevout_n':i['vout']}, inputs )
+        for i in inputs:
+            i['prevout_hash'] = i['txid']
+            i['prevout_n'] = i['vout']
         outputs = map(lambda x: (x[0],int(1e8*x[1])), outputs.items())
         tx = Transaction.from_io(inputs, outputs)
         return tx
 
-
-    def signrawtransaction(self, raw_tx, input_info, private_keys):
+    def signrawtransaction(self, raw_tx, private_keys):
         tx = Transaction(raw_tx)
-        self.wallet.signrawtransaction(tx, input_info, private_keys, self.password)
+        self.wallet.signrawtransaction(tx, private_keys, self.password)
         return tx
 
     def decoderawtransaction(self, raw):
@@ -184,14 +183,14 @@ class Commands:
         redeem_script = Transaction.multisig_script(pubkeys, num)
         address = hash_160_to_bc_address(hash_160(redeem_script.decode('hex')), 5)
         return {'address':address, 'redeemScript':redeem_script}
-    
+
     def freeze(self,addr):
         return self.wallet.freeze(addr)
-        
+
     def unfreeze(self,addr):
         return self.wallet.unfreeze(addr)
 
-    def dumpprivkey(self, addr):
+    def getprivatekeys(self, addr):
         return self.wallet.get_private_key(addr, self.password)
 
     def dumpprivkeys(self, addresses = None):
@@ -207,13 +206,8 @@ class Commands:
         return out
 
     def getpubkeys(self, addr):
-        assert is_valid(addr) and self.wallet.is_mine(addr)
         out = { 'address':addr }
-        account, sequence = self.wallet.get_address_index(addr)
-        if account != -1:
-            a = self.wallet.accounts[account]
-            out['pubkeys'] = a.get_pubkeys( sequence )
-
+        out['pubkeys'] = self.wallet.get_public_keys(addr)
         return out
 
     def getbalance(self, account= None):
@@ -232,7 +226,6 @@ class Commands:
         out["unconfirmed"] =  str(Decimal(out["unconfirmed"])/100000000)
         return out
 
-
     def getproof(self, addr):
         p = self.network.synchronous_get([ ('blockchain.address.get_proof',[addr]) ])[0]
         out = []
@@ -241,19 +234,20 @@ class Commands:
         return out
 
     def getservers(self):
+        while not self.network.is_up_to_date():
+            time.sleep(0.1)
         return self.network.get_servers()
 
     def getversion(self):
-        import electrum 
+        import electrum  # Needs to stay here to prevent ciruclar imports
         return electrum.ELECTRUM_VERSION
- 
+
     def getmpk(self):
-        return self.wallet.get_master_public_key()
+        return self.wallet.get_master_public_keys()
 
     def getseed(self):
         mnemonic = self.wallet.get_mnemonic(self.password)
-        seed = self.wallet.get_seed(self.password)
-        return { 'mnemonic':mnemonic, 'seed':seed, 'version':self.wallet.seed_version }
+        return { 'mnemonic':mnemonic, 'version':self.wallet.seed_version }
 
     def importprivkey(self, sec):
         try:
@@ -263,17 +257,17 @@ class Commands:
             out = "Error: Keypair import failed: " + str(e)
         return out
 
+    def sweep(self, privkey, to_address, fee = 0.0001):
+        fee = int(Decimal(fee)*100000000)
+        return Transaction.sweep([privkey], self.network, to_address, fee)
 
     def signmessage(self, address, message):
         return self.wallet.sign_message(address, message, self.password)
 
-
     def verifymessage(self, address, signature, message):
         return bitcoin.verify_message(address, signature, message)
 
-
     def _mktx(self, outputs, fee = None, change_addr = None, domain = None):
-
         for to_address, amount in outputs:
             if not is_valid(to_address):
                 raise Exception("Invalid Bitcoin address", to_address)
@@ -286,7 +280,7 @@ class Commands:
             for addr in domain:
                 if not is_valid(addr):
                     raise Exception("invalid Bitcoin address", addr)
-            
+
                 if not self.wallet.is_mine(addr):
                     raise Exception("address not in wallet", addr)
 
@@ -303,12 +297,11 @@ class Commands:
                     break
 
             amount = int(100000000*amount)
-            final_outputs.append((to_address, amount))
-            
+            final_outputs.append(('address', to_address, amount))
+
         if fee: fee = int(100000000*fee)
         return self.wallet.mktx(final_outputs, self.password, fee , change_addr, domain)
 
-
     def mktx(self, to_address, amount, fee = None, change_addr = None, domain = None):
         tx = self._mktx([(to_address, amount)], fee, change_addr, domain)
         return tx
@@ -317,7 +310,6 @@ class Commands:
         tx = self._mktx(outputs, fee, change_addr, domain)
         return tx
 
-
     def payto(self, to_address, amount, fee = None, change_addr = None, domain = None):
         tx = self._mktx([(to_address, amount)], fee, change_addr, domain)
         r, h = self.wallet.sendtx( tx )
@@ -328,9 +320,7 @@ class Commands:
         r, h = self.wallet.sendtx( tx )
         return h
 
-
     def history(self):
-        import datetime
         balance = 0
         out = []
         for item in self.wallet.get_tx_history():
@@ -341,26 +331,19 @@ class Commands:
                 time_str = "----"
 
             label, is_default_label = self.wallet.get_label(tx_hash)
-            if not label: label = tx_hash
-            else: label = label + ' '*(64 - len(label) )
 
-            out.append( "%16s"%time_str + "  " + label + "  " + format_satoshis(value)+ "  "+ format_satoshis(balance) )
+            out.append({'txid':tx_hash, 'date':"%16s"%time_str, 'label':label, 'value':format_satoshis(value)})
         return out
 
-
-
     def setlabel(self, key, label):
         self.wallet.set_label(key, label)
 
-            
-
     def contacts(self):
         c = {}
         for addr in self.wallet.addressbook:
             c[addr] = self.wallet.labels.get(addr)
         return c
 
-
     def listaddresses(self, show_all = False, show_label = False):
         out = []
         for addr in self.wallet.addresses(True):
@@ -375,7 +358,7 @@ class Commands:
                     item = addr
                 out.append( item )
         return out
-                         
+
     def help(self, cmd=None):
         if cmd not in known_commands:
             print_msg("\nList of commands:", ', '.join(sorted(known_commands)))
@@ -386,9 +369,7 @@ class Commands:
             if cmd.options: print_msg("options:\n" + cmd.options)
         return None
 
-
     def getrawtransaction(self, tx_hash):
-        import transaction
         if self.wallet:
             tx = self.wallet.transactions.get(tx_hash)
             if tx:
@@ -396,17 +377,12 @@ class Commands:
 
         r = self.network.synchronous_get([ ('blockchain.transaction.get',[tx_hash]) ])[0]
         if r:
-            return transaction.Transaction(r)
+            return Transaction(r)
         else:
             return "unknown transaction"
 
     def encrypt(self, pubkey, message):
-        return EC_KEY.encrypt_message(message, pubkey.decode('hex'))
-
-    def decrypt(self, secret, message):
-        ec = regenerate_key(secret)
-        decrypted = ec.decrypt_message(message)
-        return decrypted[0]
-
-
+        return bitcoin.encrypt_message(message, pubkey)
 
+    def decrypt(self, pubkey, message):
+        return self.wallet.decrypt_message(pubkey, message, self.password)