2of3 accounts

diff --git a/lib/account.py b/lib/account.py
index 1b59ef0..cee9c00 100644 (file)
--- a/lib/account.py
+++ b/lib/account.py
@@ -215,18 +215,44 @@ class BIP32_Account_2of2(BIP32_Account):
             K, K_compressed, chain = CKD_prime(K, chain, i)
         return K_compressed.encode('hex')
 
+    def redeem_script(self, sequence):
+        chain, i = sequence
+        pubkey1 = self.get_pubkey(chain, i)
+        pubkey2 = self.get_pubkey2(chain, i)
+        return Transaction.multisig_script([pubkey1, pubkey2], 2)
+
     def get_address(self, for_change, n):
-        pubkey1 = self.get_pubkey(for_change, n)
-        pubkey2 = self.get_pubkey2(for_change, n)
-        address = Transaction.multisig_script([pubkey1, pubkey2], 2)["address"]
+        address = hash_160_to_bc_address(hash_160(self.redeem_script((for_change, n)).decode('hex')), 5)
         return address
 
-    def get_input_info(self, sequence):
+
+class BIP32_Account_2of3(BIP32_Account_2of2):
+
+    def __init__(self, v):
+        BIP32_Account_2of2.__init__(self, v)
+        self.c3 = v['c3'].decode('hex')
+        self.K3 = v['K3'].decode('hex')
+        self.cK3 = v['cK3'].decode('hex')
+
+    def dump(self):
+        d = BIP32_Account_2of2.dump(self)
+        d['c3'] = self.c3.encode('hex')
+        d['K3'] = self.K3.encode('hex')
+        d['cK3'] = self.cK3.encode('hex')
+        return d
+
+    def get_pubkey3(self, for_change, n):
+        K = self.K3
+        chain = self.c3
+        for i in [for_change, n]:
+            K, K_compressed, chain = CKD_prime(K, chain, i)
+        return K_compressed.encode('hex')
+
+    def get_redeem_script(self, sequence):
         chain, i = sequence
         pubkey1 = self.get_pubkey(chain, i)
         pubkey2 = self.get_pubkey2(chain, i)
-        # fixme
-        pk_addr = None # public_key_to_bc_address( pubkey1 ) # we need to return that address to get the right private key
-        redeemScript = Transaction.multisig_script([pubkey1, pubkey2], 2)['redeemScript']
-        return pk_addr, redeemScript
+        pubkey3 = self.get_pubkey3(chain, i)
+        return Transaction.multisig_script([pubkey1, pubkey2, pubkey3], 3)
+
 

diff --git a/lib/bitcoin.py b/lib/bitcoin.py
index b068baa..c4f12b5 100644 (file)
--- a/lib/bitcoin.py
+++ b/lib/bitcoin.py
@@ -508,8 +508,7 @@ class Transaction:
             raise
         s += 'ae'
 
-        out = { "address": hash_160_to_bc_address(hash_160(s.decode('hex')), 5), "redeemScript":s }
-        return out
+        return s
 
     @classmethod
     def serialize( klass, inputs, outputs, for_sig = None ):

diff --git a/lib/wallet.py b/lib/wallet.py
index 8303e14..fc27ecc 100644 (file)
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -172,21 +172,33 @@ class Wallet:
 
         master_k, master_c, master_K, master_cK = bip32_init(self.seed)
         
+        # normal accounts
         k0, c0, K0, cK0 = bip32_private_derivation(master_k, master_c, "m/", "m/0'/")
+        # p2sh 2 of 2
         k1, c1, K1, cK1 = bip32_private_derivation(master_k, master_c, "m/", "m/1'/")
         k2, c2, K2, cK2 = bip32_private_derivation(master_k, master_c, "m/", "m/2'/")
+        # p2sh 2 of 3
+        k3, c3, K3, cK3 = bip32_private_derivation(master_k, master_c, "m/", "m/3'/")
+        k4, c4, K4, cK4 = bip32_private_derivation(master_k, master_c, "m/", "m/4'/")
+        k5, c5, K5, cK5 = bip32_private_derivation(master_k, master_c, "m/", "m/5'/")
 
         self.master_public_keys = {
             "m/0'/": (c0, K0, cK0),
             "m/1'/": (c1, K1, cK1),
-            "m/2'/": (c2, K2, cK2)
+            "m/2'/": (c2, K2, cK2),
+            "m/3'/": (c3, K3, cK3),
+            "m/4'/": (c4, K4, cK4),
+            "m/5'/": (c5, K5, cK5)
             }
         
         self.master_private_keys = {
             "m/0'/": k0,
-            "m/1'/": k1
+            "m/1'/": k1,
+            "m/2'/": k2,
+            "m/3'/": k3,
+            "m/4'/": k4,
+            "m/5'/": k5
             }
-        # send k2 to service
         
         self.config.set_key('master_public_keys', self.master_public_keys, True)
         self.config.set_key('master_private_keys', self.master_private_keys, True)
@@ -902,16 +914,11 @@ class Wallet:
                 pk_addresses.append(address)
                 continue
             account, sequence = self.get_address_index(address)
-
             txin['KeyID'] = (account, 'BIP32', sequence) # used by the server to find the key
-
-            _, redeemScript = self.accounts[account].get_input_info(sequence)
-            
+            redeemScript = self.accounts[account].redeem_script(sequence)
             if redeemScript: txin['redeemScript'] = redeemScript
             pk_addresses.append(address)
 
-        print "pk_addresses", pk_addresses
-
         # get all private keys at once.
         if self.seed:
             private_keys = self.get_private_keys(pk_addresses, password)