electrum

commit 8df60928eace1d9ee3f42c07d53f29a3fdd906c2
parent b95911e2d7df558a21baa5a5faecd534a0dea616
Author: ecdsa <ecdsa@github>
Date:   Sat,  2 Mar 2013 23:49:32 +0100

mktx fix: add address for imported keys

Diffstat:
M
lib/wallet.py
 | 
6
++++--

1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/wallet.py b/lib/wallet.py
@@ -786,11 +786,13 @@ class Wallet:
         for i in range(len(tx.inputs)):
             txin = tx.inputs[i]
             address = txin['address']
-            if address in self.imported_keys.keys(): continue
+            if address in self.imported_keys.keys(): 
+                pk_addresses.append(address)
+                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
+            if redeemScript: txin['redeemScript'] = redeemScript
             pk_addresses.append(pk_addr)
 
         # get all private keys at once.