Browse Source

cleanup unused code

2.9.x
ThomasV 8 years ago
parent
commit
79bda98ba2
  1. 3
      lib/transaction.py
  2. 2
      plugins/ledger/ledger.py

3
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

2
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

Loading…
Cancel
Save