Skip to content

Commit ea4d234

Browse files
committed
revert 1ecfcea after btchip-python has been fixed
1 parent bf2c07f commit ea4d234

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

plugins/ledger/ledger.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -354,13 +354,12 @@ def sign_transaction(self, tx, password):
354354
tmp += txtmp.outputs[utxo[1]].amount
355355
chipInputs.append({'value' : tmp, 'witness' : True, 'sequence' : sequence})
356356
redeemScripts.append(bfh(utxo[2]))
357-
# FIXME: getTrustedInput fails with native segwit transactions (firmware issue)
358-
#elif not p2shTransaction:
359-
# txtmp = bitcoinTransaction(bfh(utxo[0]))
360-
# trustedInput = self.get_client().getTrustedInput(txtmp, utxo[1])
361-
# trustedInput['sequence'] = sequence
362-
# chipInputs.append(trustedInput)
363-
# redeemScripts.append(txtmp.outputs[utxo[1]].script)
357+
elif not p2shTransaction:
358+
txtmp = bitcoinTransaction(bfh(utxo[0]))
359+
trustedInput = self.get_client().getTrustedInput(txtmp, utxo[1])
360+
trustedInput['sequence'] = sequence
361+
chipInputs.append(trustedInput)
362+
redeemScripts.append(txtmp.outputs[utxo[1]].script)
364363
else:
365364
tmp = bfh(utxo[3])[::-1]
366365
tmp += bfh(int_to_hex(utxo[1], 4))

0 commit comments

Comments
 (0)