electrum

commit 477b7c340256d399fc485d4c4aa67ca361470a4a
parent ceaa48fd73cb57035a721f25624a76f408be0e46
Author: ThomasV <thomasv@gitorious>
Date:   Thu, 25 Dec 2014 17:24:49 +0100

fix issue #961

Diffstat:
M
lib/transaction.py
 | 
3
++-
M
plugins/trezor.py
 | 
2
+-

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/transaction.py b/lib/transaction.py
@@ -452,7 +452,8 @@ def parse_input(vds):
     d = {}
     prevout_hash = hash_encode(vds.read_bytes(32))
     prevout_n = vds.read_uint32()
-    d['scriptSig'] = scriptSig = vds.read_bytes(vds.read_compact_size())
+    scriptSig = vds.read_bytes(vds.read_compact_size())
+    d['scriptSig'] = scriptSig.encode('hex')
     sequence = vds.read_uint32()
     if prevout_hash == '00'*32:
         d['is_coinbase'] = True
diff --git a/plugins/trezor.py b/plugins/trezor.py
@@ -321,7 +321,7 @@ class TrezorWallet(NewWallet):
             txinputtype.prev_index = prev_index
 
             if 'scriptSig' in txinput:
-                script_sig = txinput['scriptSig']
+                script_sig = txinput['scriptSig'].decode('hex')
                 txinputtype.script_sig = script_sig
 
             if 'sequence' in txinput: