git://git.novaco.in
/
electrum-nvc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
13fbf99
)
fix offline signing: redeemPubkey was missing
author
ThomasV
<thomasv@gitorious>
Tue, 8 Oct 2013 17:24:22 +0000 (19:24 +0200)
committer
ThomasV
<thomasv@gitorious>
Tue, 8 Oct 2013 17:24:22 +0000 (19:24 +0200)
lib/transaction.py
patch
|
blob
|
history
lib/wallet.py
patch
|
blob
|
history
diff --git
a/lib/transaction.py
b/lib/transaction.py
index
27a9ef1
..
ad64774
100644
(file)
--- 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
index
e86af78
..
2cc2326
100644
(file)
--- 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