Return address params only in ordinary txs

vacuumlabs · Oct 28, 2021 · 6d42857 · 6d42857
1 parent e30e6b7
commit 6d42857
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/crypto-providers/ledgerCryptoProvider.ts b/src/crypto-providers/ledgerCryptoProvider.ts
@@ -169,16 +169,17 @@ export const LedgerCryptoProvider: () => Promise<CryptoProvider> = async () => {
 
   const prepareOutput = (
     output: _Output,
-    changeOutputFiles: HwSigningData[],
     network: Network,
+    changeOutputFiles: HwSigningData[],
+    signingMode: SigningMode,
   ): LedgerTypes.TxOutput => {
     const changeAddressParams = getAddressParameters(changeOutputFiles, output.address, network)
-    const amount = output.coins
     const tokenBundle = prepareTokenBundle(output.tokenBundle)
 
-    if (changeAddressParams) {
-      return prepareChangeOutput(amount, changeAddressParams, tokenBundle)
+    if (changeAddressParams && signingMode === SigningMode.ORDINARY_TRANSACTION) {
+      return prepareChangeOutput(output.coins, changeAddressParams, tokenBundle)
     }
+
     return {
       destination: {
         type: LedgerTypes.TxOutputDestinationType.THIRD_PARTY,
@@ -526,7 +527,7 @@ export const LedgerCryptoProvider: () => Promise<CryptoProvider> = async () => {
       (input, i) => prepareInput(signingMode, input, getSigningPath(paymentSigningFiles, i)),
     )
     const outputs = unsignedTxParsed.outputs.map(
-      (output) => prepareOutput(output, changeOutputFiles, network),
+      (output) => prepareOutput(output, network, changeOutputFiles, signingMode),
     )
     const certificates = unsignedTxParsed.certificates.map(
       (certificate) => prepareCertificate(

diff --git a/src/crypto-providers/trezorCryptoProvider.ts b/src/crypto-providers/trezorCryptoProvider.ts
@@ -211,11 +211,12 @@ const TrezorCryptoProvider: () => Promise<CryptoProvider> = async () => {
     output: _Output,
     network: Network,
     changeOutputFiles: HwSigningData[],
+    signingMode: SigningMode,
   ): TrezorTypes.CardanoOutput => {
     const changeAddressParams = getAddressParameters(changeOutputFiles, output.address, network)
     const tokenBundle = prepareTokenBundle(output.tokenBundle, false)
 
-    if (changeAddressParams) {
+    if (changeAddressParams && signingMode === SigningMode.ORDINARY_TRANSACTION) {
       return prepareChangeOutput(output.coins, changeAddressParams, tokenBundle)
     }
 
@@ -472,7 +473,7 @@ const TrezorCryptoProvider: () => Promise<CryptoProvider> = async () => {
       (input: _Input, i: number) => prepareInput(input, getSigningPath(paymentSigningFiles, i)),
     )
     const outputs = unsignedTxParsed.outputs.map(
-      (output: _Output) => prepareOutput(output, network, changeOutputFiles),
+      (output: _Output) => prepareOutput(output, network, changeOutputFiles, signingMode),
     )
     const certificates = unsignedTxParsed.certificates.map(
       (certificate: _Certificate) => prepareCertificate(certificate, stakeSigningFiles),