AaronFiore/electrum
1
0
Fork 0
Code Activity

fix #2645: do not call tx.get_fee from plugin

Browse Source
This commit is contained in:
ThomasV
2017-08-31 09:55:44 +02:00
parent 4d985691d6
commit e4659327a1
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/ledger/ledger.py
View File

@@ -389,13 +389,8 @@ class Ledger_KeyStore(Hardware_KeyStore):
while inputIndex < len(inputs): while inputIndex < len(inputs):
self.get_client().startUntrustedTransaction(firstTransaction, inputIndex, self.get_client().startUntrustedTransaction(firstTransaction, inputIndex,
chipInputs, redeemScripts[inputIndex]) chipInputs, redeemScripts[inputIndex])
if not p2shTransaction: outputData = self.get_client().finalizeInputFull(txOutput)
outputData = self.get_client().finalizeInput(output, format_satoshis_plain(outputAmount), outputData['outputData'] = txOutput
format_satoshis_plain(tx.get_fee()), changePath, bfh(rawTx))
else:
outputData = self.get_client().finalizeInputFull(txOutput)
outputData['outputData'] = txOutput
if firstTransaction: if firstTransaction:
transactionOutput = outputData['outputData'] transactionOutput = outputData['outputData']
if outputData['confirmationNeeded']: if outputData['confirmationNeeded']: