From 502d72c1673d4d764af82b6bfabaa504c58b0eab Mon Sep 17 00:00:00 2001 From: SomberNight Date: Sat, 24 Mar 2018 00:00:22 +0100 Subject: [PATCH] ledger: send derivation for change output --- plugins/ledger/ledger.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/plugins/ledger/ledger.py b/plugins/ledger/ledger.py index e6c42d155..598f92f1e 100644 --- a/plugins/ledger/ledger.py +++ b/plugins/ledger/ledger.py @@ -418,7 +418,12 @@ class Ledger_KeyStore(Hardware_KeyStore): if segwitTransaction: self.get_client().startUntrustedTransaction(True, inputIndex, chipInputs, redeemScripts[inputIndex]) - outputData = self.get_client().finalizeInputFull(txOutput) + if changePath: + # we don't set meaningful outputAddress, amount and fees + # as we only care about the alternateEncoding==True branch + outputData = self.get_client().finalizeInput(b'', 0, 0, changePath, bfh(rawTx)) + else: + outputData = self.get_client().finalizeInputFull(txOutput) outputData['outputData'] = txOutput transactionOutput = outputData['outputData'] if outputData['confirmationNeeded']: @@ -441,7 +446,12 @@ class Ledger_KeyStore(Hardware_KeyStore): while inputIndex < len(inputs): self.get_client().startUntrustedTransaction(firstTransaction, inputIndex, chipInputs, redeemScripts[inputIndex]) - outputData = self.get_client().finalizeInputFull(txOutput) + if changePath: + # we don't set meaningful outputAddress, amount and fees + # as we only care about the alternateEncoding==True branch + outputData = self.get_client().finalizeInput(b'', 0, 0, changePath, bfh(rawTx)) + else: + outputData = self.get_client().finalizeInputFull(txOutput) outputData['outputData'] = txOutput if firstTransaction: transactionOutput = outputData['outputData']