tMerge pull request #808 from chrisrico/master - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 107a0bd2787838a14248de8e8b585fa2e94b7c9e
DIR parent 5f4a28a2bb36a8b9bbda55614a2f4d2e22ca0402
HTML Author: ThomasV <thomasv1@gmx.de>
Date: Thu, 28 Aug 2014 22:33:41 +0200
Merge pull request #808 from chrisrico/master
Trezor plugin fixes
Diffstat:
M plugins/trezor.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
---
DIR diff --git a/plugins/trezor.py b/plugins/trezor.py
t@@ -262,17 +262,17 @@ class TrezorWallet(NewWallet):
for txinput in tx.inputs:
txinputtype = types.TxInputType()
- address = txinput['address']
- try:
- address_path = self.address_id(address)
- address_n = self.get_client().expand_path(address_path)
- txinputtype.address_n.extend(address_n)
- except: pass
-
if ('is_coinbase' in txinput and txinput['is_coinbase']):
prev_hash = "\0"*32
prev_index = 0xffffffff # signed int -1
else:
+ address = txinput['address']
+ try:
+ address_path = self.address_id(address)
+ address_n = self.get_client().expand_path(address_path)
+ txinputtype.address_n.extend(address_n)
+ except: pass
+
prev_hash = unhexlify(txinput['prevout_hash'])
prev_index = txinput['prevout_n']