support for OP_RETURN
[electrum-nvc.git] / lib / transaction.py
index 18f4733..a4c3646 100644 (file)
@@ -33,6 +33,8 @@ import struct
 import StringIO
 import mmap
 
+NO_SIGNATURE = 'ff'
+
 class SerializationError(Exception):
     """ Thrown when there's a problem deserializing or serializing """
 
@@ -303,12 +305,21 @@ def parse_sig(x_sig):
         if sig[-2:] == '01':
             s.append(sig[:-2])
         else:
-            assert sig == 'ff'
+            assert sig == NO_SIGNATURE
+            s.append(None)
     return s
 
 def is_extended_pubkey(x_pubkey):
     return x_pubkey[0:2] in ['fe', 'ff']
 
+def x_to_xpub(x_pubkey):
+    if x_pubkey[0:2] == 'ff':
+        from account import BIP32_Account
+        xpub, s = BIP32_Account.parse_xpubkey(x_pubkey)
+        return xpub
+
+        
+
 def parse_xpub(x_pubkey):
     if x_pubkey[0:2] == 'ff':
         from account import BIP32_Account
@@ -385,6 +396,7 @@ def parse_scriptSig(d, bytes):
     d['x_pubkeys'] = x_pubkeys
     pubkeys = map(parse_xpub, x_pubkeys)
     d['pubkeys'] = pubkeys
+
     redeemScript = Transaction.multisig_script(pubkeys,2)
     d['redeemScript'] = redeemScript
     d['address'] = hash_160_to_bc_address(hash_160(redeemScript.decode('hex')), 5)
@@ -415,8 +427,11 @@ def get_address_from_output_script(bytes):
     return False, "(None)"
 
 
+
+push_script = lambda x: op_push(len(x)/2) + x
+
 class Transaction:
-    
+
     def __init__(self, raw):
         self.raw = raw
         self.deserialize()
@@ -491,16 +506,17 @@ class Transaction:
 
     @classmethod
     def pay_script(self, addr):
+        if addr.startswith('OP_RETURN:'):
+            h = addr[10:].encode('hex')
+            return '6a' + push_script(h)
         addrtype, hash_160 = bc_address_to_hash_160(addr)
         if addrtype == 0:
             script = '76a9'                                      # op_dup, op_hash_160
-            script += '14'                                       # push 0x14 bytes
-            script += hash_160.encode('hex')
+            script += push_script(hash_160.encode('hex'))
             script += '88ac'                                     # op_equalverify, op_checksig
         elif addrtype == 5:
             script = 'a9'                                        # op_hash_160
-            script += '14'                                       # push 0x14 bytes
-            script += hash_160.encode('hex')
+            script += push_script(hash_160.encode('hex'))
             script += '87'                                       # op_equal
         else:
             raise
@@ -510,9 +526,6 @@ class Transaction:
     @classmethod
     def serialize( klass, inputs, outputs, for_sig = None ):
 
-        NO_SIGNATURE = 'ff'
-
-        push_script = lambda x: op_push(len(x)/2) + x
         s  = int_to_hex(1,4)                                         # version
         s += var_int( len(inputs) )                                  # number of inputs
         for i in range(len(inputs)):
@@ -522,34 +535,34 @@ class Transaction:
             s += int_to_hex(txin['prevout_n'],4)                          # prev index
 
             p2sh = txin.get('redeemScript') is not None
-            n_sig = 2 if p2sh else 1
-
-            pubkeys = txin['pubkeys'] # pubkeys should always be known
+            num_sig = txin['num_sig']
             address = txin['address']
 
-            if for_sig is None:
+            x_signatures = txin['signatures']
+            signatures = filter(lambda x: x is not None, x_signatures)
+            is_complete = len(signatures) == num_sig
 
-                # list of signatures
-                signatures = txin.get('signatures',[])
+            if for_sig is None:
+                # if we have enough signatures, we use the actual pubkeys
+                # use extended pubkeys (with bip32 derivation)
                 sig_list = []
-                for signature in signatures:
-                    sig_list.append(signature + '01')
-                if len(sig_list) > n_sig:
-                    sig_list = sig_list[:n_sig]
-                while len(sig_list) < n_sig:
-                    sig_list.append(NO_SIGNATURE)
-                sig_list = ''.join( map( lambda x: push_script(x), sig_list))
-
-                # extended pubkeys (with bip32 derivation)
-                x_pubkeys = txin['x_pubkeys']
+                if is_complete:
+                    pubkeys = txin['pubkeys']
+                    for signature in signatures:
+                        sig_list.append(signature + '01')
+                else:
+                    pubkeys = txin['x_pubkeys']
+                    for signature in x_signatures:
+                        sig_list.append((signature + '01') if signature is not None else NO_SIGNATURE)
 
+                sig_list = ''.join( map( lambda x: push_script(x), sig_list))
                 if not p2sh:
                     script = sig_list
-                    script += push_script(x_pubkeys[0])
+                    script += push_script(pubkeys[0])
                 else:
                     script = '00'                                    # op_0
                     script += sig_list
-                    redeem_script = klass.multisig_script(x_pubkeys,2)
+                    redeem_script = klass.multisig_script(pubkeys,2)
                     script += push_script(redeem_script)
 
             elif for_sig==i:
@@ -581,30 +594,59 @@ class Transaction:
         return Hash(self.raw.decode('hex') )[::-1].encode('hex')
 
     def add_signature(self, i, pubkey, sig):
+        print_error("adding signature for", pubkey)
         txin = self.inputs[i]
-        signatures = txin.get("signatures",[])
-        if sig not in signatures:
-            signatures.append(sig)
-        txin["signatures"] = signatures
+        pubkeys = txin['pubkeys']
+        ii = pubkeys.index(pubkey)
+        txin['signatures'][ii] = sig
+        txin['x_pubkeys'][ii] = pubkey
         self.inputs[i] = txin
-        print_error("adding signature for", pubkey)
-        # replace x_pubkey
-        i = txin['pubkeys'].index(pubkey)
-        txin['x_pubkeys'][i] = pubkey
+        self.raw = self.serialize(self.inputs, self.outputs)
 
-        self.raw = self.serialize( self.inputs, self.outputs )
+
+    def signature_count(self):
+        r = 0
+        s = 0
+        for txin in self.inputs:
+            signatures = filter(lambda x: x is not None, txin['signatures'])
+            s += len(signatures)
+            r += txin['num_sig']
+        return s, r
 
 
     def is_complete(self):
-        for i, txin in enumerate(self.inputs):
-            pubkeys = txin['pubkeys']
-            signatures = txin.get("signatures",{})
+        s, r = self.signature_count()
+        return r == s
+
+
+    def inputs_to_sign(self):
+        from account import BIP32_Account, OldAccount
+        xpub_list = []
+        addr_list = set()
+        for txin in self.inputs:
+            x_signatures = txin['signatures']
+            signatures = filter(lambda x: x is not None, x_signatures)
+
             if len(signatures) == txin['num_sig']:
+                # input is complete
                 continue
-            else:
-                return False
-        return True
 
+            for k, x_pubkey in enumerate(txin['x_pubkeys']):
+
+                if x_signatures[k] is not None:
+                    # this pubkey already signed
+                    continue
+
+                if x_pubkey[0:2] == 'ff':
+                    xpub, sequence = BIP32_Account.parse_xpubkey(x_pubkey)
+                    xpub_list.append((xpub,sequence))
+                elif x_pubkey[0:2] == 'fe':
+                    xpub, sequence = OldAccount.parse_xpubkey(x_pubkey)
+                    xpub_list.append((xpub,sequence))
+                else:
+                    addr_list.add(txin['address'])
+
+        return addr_list, xpub_list
 
 
     def sign(self, keypairs):
@@ -612,15 +654,13 @@ class Transaction:
 
         for i, txin in enumerate(self.inputs):
 
-            redeem_pubkeys = txin['pubkeys']
-            num = len(redeem_pubkeys)
-
-            # get list of already existing signatures
-            signatures = txin.get("signatures",{})
             # continue if this txin is complete
+            signatures = filter(lambda x: x is not None, txin['signatures'])
+            num = txin['num_sig']
             if len(signatures) == num:
                 continue
 
+            redeem_pubkeys = txin['pubkeys']
             for_sig = Hash(self.tx_for_sig(i).decode('hex'))
             for pubkey in redeem_pubkeys:
                 if pubkey in keypairs.keys():