tfix #1961 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 43272c63a84f28be11aa0a4bc9843f4c280273d0
DIR parent 2e2f4c17e0cbc363b21e5b0fcb878eeb9d3ef3f6
HTML Author: ThomasV <thomasv@electrum.org>
Date: Sun, 9 Oct 2016 09:20:32 +0200
fix #1961
Diffstat:
M plugins/ledger/ledger.py | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
---
DIR diff --git a/plugins/ledger/ledger.py b/plugins/ledger/ledger.py
t@@ -326,11 +326,17 @@ class Ledger_KeyStore(Hardware_KeyStore):
# Sign all inputs
firstTransaction = True
inputIndex = 0
+ rawTx = tx.serialize()
while inputIndex < len(inputs):
self.get_client().startUntrustedTransaction(firstTransaction, inputIndex,
chipInputs, redeemScripts[inputIndex])
- outputData = self.get_client().finalizeInputFull(txOutput)
- outputData['outputData'] = txOutput
+ if not p2shTransaction:
+ outputData = self.get_client().finalizeInput(output, format_satoshis_plain(outputAmount),
+ format_satoshis_plain(tx.get_fee()), changePath, bytearray(rawTx.decode('hex')))
+ else:
+ outputData = self.get_client().finalizeInputFull(txOutput)
+ outputData['outputData'] = txOutput
+
if firstTransaction:
transactionOutput = outputData['outputData']
if outputData['confirmationNeeded']: