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

updates for ledger plugin

Browse source
This commit is contained in:
ThomasV 2017-03-02 08:38:06 +01:00
parent 1763b5fcdc
commit f9e948ebc1
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plugins/ledger/ledger.py
View file

@ -278,10 +278,11 @@ class Ledger_KeyStore(Hardware_KeyStore):
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
if len(txin['pubkeys']) > 1: if txin['type'] in ['p2sh']:
p2shTransaction = True p2shTransaction = True
for i, x_pubkey in enumerate(txin['x_pubkeys']): pubkeys, x_pubkeys = tx.get_sorted_pubkeys(txin)
for i, x_pubkey in enumerate(x_pubkeys):
if x_pubkey in derivations: if x_pubkey in derivations:
signingPos = i signingPos = i
s = derivations.get(x_pubkey) s = derivations.get(x_pubkey)
@ -292,12 +293,12 @@ class Ledger_KeyStore(Hardware_KeyStore):
inputs.append([txin['prev_tx'].raw, txin['prevout_n'], txin.get('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(pubkeys)
# Sanity check # Sanity check
if p2shTransaction: if p2shTransaction:
for txinput in tx.inputs(): for txin in tx.inputs():
if len(txinput['pubkeys']) < 2: if txin['type'] != 'p2sh':
self.give_error("P2SH / regular input mixed in same transaction not supported") # should never happen self.give_error("P2SH / regular input mixed in same transaction not supported") # should never happen
txOutput = var_int(len(tx.outputs())) txOutput = var_int(len(tx.outputs()))