AaronFiore/electrum
1
0
Fork 0
Code Activity

fix issue #961

Browse Source
This commit is contained in:
ThomasV
2014-12-25 17:24:49 +01:00
parent ceaa48fd73
commit 477b7c3402
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/transaction.py
View File

@@ -452,7 +452,8 @@ def parse_input(vds):
d = {} d = {}
prevout_hash = hash_encode(vds.read_bytes(32)) prevout_hash = hash_encode(vds.read_bytes(32))
prevout_n = vds.read_uint32() 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() sequence = vds.read_uint32()
if prevout_hash == '00'*32: if prevout_hash == '00'*32:
d['is_coinbase'] = True d['is_coinbase'] = True

2
plugins/trezor.py
View File

@@ -321,7 +321,7 @@ class TrezorWallet(NewWallet):
txinputtype.prev_index = prev_index txinputtype.prev_index = prev_index
if 'scriptSig' in txinput: if 'scriptSig' in txinput:
script_sig = txinput['scriptSig'] script_sig = txinput['scriptSig'].decode('hex')
txinputtype.script_sig = script_sig txinputtype.script_sig = script_sig
if 'sequence' in txinput: if 'sequence' in txinput: