electrum

commit 79bda98ba254f021ca154d8265a1ed2a2ece1f89
parent 9140c1fc8946a10966d767a727ca6e0150a7d203
Author: ThomasV <thomasv@electrum.org>
Date:   Tue, 18 Apr 2017 10:47:11 +0200

cleanup unused code

Diffstat:
M
lib/transaction.py
 | 
3
---
M
plugins/ledger/ledger.py
 | 
2
--

2 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/lib/transaction.py b/lib/transaction.py
@@ -724,10 +724,7 @@ class Transaction:
             outpoint = self.serialize_outpoint(txin)
             pubkey = txin['pubkeys'][0]
             pkh = bitcoin.hash_160(pubkey.decode('hex')).encode('hex')
-            redeemScript = '00' + push_script(pkh)
             scriptCode = push_script('76a9' + push_script(pkh) + '88ac')
-            script_hash = bitcoin.hash_160(redeemScript.decode('hex')).encode('hex')
-            scriptPubKey = 'a9' + push_script(script_hash) + '87'
             amount = int_to_hex(txin['value'], 8)
             nSequence = int_to_hex(txin.get('sequence', 0xffffffff), 4)
             preimage = nVersion + hashPrevouts + hashSequence + outpoint + scriptCode + amount + nSequence + hashOutputs + nLocktime + nHashType
diff --git a/plugins/ledger/ledger.py b/plugins/ledger/ledger.py
@@ -273,7 +273,6 @@ class Ledger_KeyStore(Hardware_KeyStore):
         outputAmount = None
         p2shTransaction = False
         segwitTransaction = False
-    	reorganize = False
         pin = ""
         self.get_client() # prompt for the PIN before displaying the dialog if necessary
 
@@ -400,7 +399,6 @@ class Ledger_KeyStore(Hardware_KeyStore):
                     if not p2shTransaction:
                         outputData = self.get_client().finalizeInput(output, format_satoshis_plain(outputAmount),
                             format_satoshis_plain(tx.get_fee()), changePath, bytearray(rawTx.decode('hex')))
-                        reorganize = True
                     else:
                         outputData = self.get_client().finalizeInputFull(txOutput)
                         outputData['outputData'] = txOutput