electrum

commit dfef56491b7af5ded0b646f145a84a5b2fbe909d
parent f26262da0f151589a270cb196042f035321f983f
Author: ThomasV <thomasv@electrum.org>
Date:   Fri, 30 Sep 2016 15:01:22 +0200

simplification

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

1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/plugins/ledger/ledger.py b/plugins/ledger/ledger.py
@@ -263,12 +263,9 @@ class Ledger_KeyStore(Hardware_KeyStore):
         for txin in tx.inputs():
             if txin.get('is_coinbase'):
                 self.give_error("Coinbase not supported")     # should never happen
-            redeemScript = None
 
             if len(txin['pubkeys']) > 1:
                 p2shTransaction = True
-            if 'redeemScript' in txin:
-                redeemScript = txin['redeemScript']
 
             for i, x_pubkey in enumerate(txin['x_pubkeys']):
                 if x_pubkey in derivations:
@@ -279,7 +276,7 @@ class Ledger_KeyStore(Hardware_KeyStore):
             else:
                 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)
             pubKeys.append(txin['pubkeys'])