From b95911e2d7df558a21baa5a5faecd534a0dea616 Mon Sep 17 00:00:00 2001
From: ecdsa <ecdsa@github>
Date: Sat, 2 Mar 2013 23:35:43 +0100
Subject: [PATCH] check if address is imported before index lookup

---
 lib/wallet.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/wallet.py b/lib/wallet.py
index 5d577d5f..24cbff93 100644
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -785,10 +785,12 @@ class Wallet:
         pk_addresses = []
         for i in range(len(tx.inputs)):
             txin = tx.inputs[i]
-            account, is_change, n = self.get_address_index(txin['address'])
+            address = txin['address']
+            if address in self.imported_keys.keys(): continue
+            account, is_change, n = self.get_address_index(address)
+            txin['electrumKeyID'] = (account, is_change, n) # used by the server to find the key
             pk_addr, redeemScript = self.sequences[account].get_input_info(is_change, n)
             txin['redeemScript'] = redeemScript
-            txin['electrumKeyID'] = (account, is_change, n) # used by the server to find the key
             pk_addresses.append(pk_addr)
 
         # get all private keys at once.