electrum

commit ea4d2343d3d0cb0b69a8641428129004f742a819
parent bf2c07ff2a7eb4051558ef77980d623472bde023
Author: ThomasV <thomasv@electrum.org>
Date:   Wed,  8 Nov 2017 15:01:25 +0100

revert 1ecfcea8dcfe37df4c6dceeaf071f19c7660c44b after btchip-python has been fixed

Diffstat:
M
plugins/ledger/ledger.py
 | 
13
++++++-------

1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/plugins/ledger/ledger.py b/plugins/ledger/ledger.py
@@ -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))