LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-28 16:01:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplification

Browse source
This commit is contained in:
ThomasV 2016-09-30 15:01:22 +02:00
parent f26262da0f
commit dfef56491b
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/ledger/ledger.py
View file

@ -263,12 +263,9 @@ class Ledger_KeyStore(Hardware_KeyStore):
for txin in tx.inputs(): for txin in tx.inputs():
if txin.get('is_coinbase'): if txin.get('is_coinbase'):
self.give_error("Coinbase not supported") # should never happen self.give_error("Coinbase not supported") # should never happen
redeemScript = None
if len(txin['pubkeys']) > 1: if len(txin['pubkeys']) > 1:
p2shTransaction = True p2shTransaction = True
if 'redeemScript' in txin:
redeemScript = txin['redeemScript']
for i, x_pubkey in enumerate(txin['x_pubkeys']): for i, x_pubkey in enumerate(txin['x_pubkeys']):
if x_pubkey in derivations: if x_pubkey in derivations:
@ -279,7 +276,7 @@ class Ledger_KeyStore(Hardware_KeyStore):
else: else:
self.give_error("No matching x_key for sign_transaction") # should never happen self.give_error("No matching x_key for sign_transaction") # should never happen
inputs.append([txin['prev_tx'].raw, txin['prevout_n'], redeemScript, txin['prevout_hash'], signingPos ]) inputs.append([txin['prev_tx'].raw, txin['prevout_n'], txin.get('redeemScript'), txin['prevout_hash'], signingPos ])
inputsPaths.append(hwAddress) inputsPaths.append(hwAddress)
pubKeys.append(txin['pubkeys']) pubKeys.append(txin['pubkeys'])