electrum

commit 367b11681b131bb0b36d6715e8058af5e6b646fd
parent 13fbf9904e11a3aa78808dea2d706cefe25fa385
Author: ThomasV <thomasv@gitorious>
Date:   Tue,  8 Oct 2013 19:24:22 +0200

fix offline signing: redeemPubkey was missing

Diffstat:
M
lib/transaction.py
 | 
1
+
M
lib/wallet.py
 | 
3
++-

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/transaction.py b/lib/transaction.py
@@ -722,4 +722,5 @@ class Transaction:
             txin['address'] = item['address']
             txin['scriptPubKey'] = item['scriptPubKey']
             txin['redeemScript'] = item.get('redeemScript')
+            txin['redeemPubkey'] = item.get('redeemPubkey')
             txin['KeyID'] = item.get('KeyID')
diff --git a/lib/wallet.py b/lib/wallet.py
@@ -1207,7 +1207,8 @@ class Wallet:
         tx = self.make_unsigned_transaction(outputs, fee, change_addr, domain)
         keypairs = {}
         self.add_keypairs_from_wallet(tx, keypairs, password)
-        self.sign_transaction(tx, keypairs)
+        if keypairs:
+            self.sign_transaction(tx, keypairs)
         return tx