AaronFiore/electrum
1
0
Fork 0
Code Activity

add segwit to get_preimage_script

Browse Source
This commit is contained in:
ThomasV
2017-04-18 11:12:46 +02:00
parent 79bda98ba2
commit f7096010f0
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/ledger/ledger.py
View File

@@ -298,14 +298,7 @@ class Ledger_KeyStore(Hardware_KeyStore):
else:
self.give_error("No matching x_key for sign_transaction") # should never happen
redeemScript = txin.get('redeemScript')
if not redeemScript:
if segwitTransaction:
pkh = bitcoin.hash_160(pubkeys[0].decode('hex')).encode('hex')
redeemScript = '76a9' + push_script(pkh) + '88ac'
elif p2shTransaction:
redeemScript = Transaction.get_preimage_script(txin)
redeemScript = Transaction.get_preimage_script(txin)
inputs.append([txin['prev_tx'].raw, txin['prevout_n'], redeemScript, txin['prevout_hash'], signingPos, txin.get('sequence', 0xffffffff) ])
inputsPaths.append(hwAddress)
pubKeys.append(pubkeys)