From c019428b027db352202d11b27e22652b97d94f2f Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Fri, 16 Aug 2013 12:27:26 +0200
Subject: [PATCH] fix for non-p2sh addresses

---
 lib/account.py |   14 ++------------
 lib/bitcoin.py |    2 +-
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/lib/account.py b/lib/account.py
index e31a706..6d8defc 100644
--- a/lib/account.py
+++ b/lib/account.py
@@ -171,19 +171,9 @@ class BIP32_Account(Account):
             K, K_compressed, chain = CKD_prime(K, chain, i)
         return K_compressed.encode('hex')
 
+    def redeem_script(self, sequence):
+        return None
 
-    def get_private_keys(self, sequence_list, seed):
-        return [ self.get_private_key( sequence, seed) for sequence in sequence_list]
-
-    def check_seed(self, seed):
-        master_secret, master_chain, master_public_key, master_public_key_compressed = bip32_init(seed)
-        assert self.mpk == (master_public_key.encode('hex'), master_chain.encode('hex'))
-
-    def get_input_info(self, sequence):
-        chain, i = sequence
-        pk_addr = self.get_address(chain, i)
-        redeemScript = None
-        return pk_addr, redeemScript
 
 
 
diff --git a/lib/bitcoin.py b/lib/bitcoin.py
index ae3a3ad..e03f39b 100644
--- a/lib/bitcoin.py
+++ b/lib/bitcoin.py
@@ -642,7 +642,7 @@ class Transaction:
                 is_complete = is_complete and (len(signatures) == num)
 
             else:
-                sec = private_keys[txin['address']]
+                sec = private_keys[txin['address']][0]
                 compressed = is_compressed(sec)
                 pkey = regenerate_key(sec)
                 secexp = pkey.secret
-- 
1.7.1