BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

revert 1ecfcea8dc after btchip-python has been fixed

This commit is contained in:
ThomasV 2017-11-08 15:01:25 +01:00
parent bf2c07ff2a
commit ea4d2343d3
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/ledger/ledger.py
View File

@ -354,13 +354,12 @@ class Ledger_KeyStore(Hardware_KeyStore):
tmp += txtmp.outputs[utxo[1]].amount
chipInputs.append({'value' : tmp, 'witness' : True, 'sequence' : sequence})
redeemScripts.append(bfh(utxo[2]))
# FIXME: getTrustedInput fails with native segwit transactions (firmware issue)
#elif not p2shTransaction:
# txtmp = bitcoinTransaction(bfh(utxo[0]))
# trustedInput = self.get_client().getTrustedInput(txtmp, utxo[1])
# trustedInput['sequence'] = sequence
# chipInputs.append(trustedInput)
# redeemScripts.append(txtmp.outputs[utxo[1]].script)
elif not p2shTransaction:
txtmp = bitcoinTransaction(bfh(utxo[0]))
trustedInput = self.get_client().getTrustedInput(txtmp, utxo[1])
trustedInput['sequence'] = sequence
chipInputs.append(trustedInput)
redeemScripts.append(txtmp.outputs[utxo[1]].script)
else:
tmp = bfh(utxo[3])[::-1]
tmp += bfh(int_to_hex(utxo[1], 4))