Fix input blinding data (#309)

* fix error detecting if input is confidential * fix error where two inputs from same tx (but different vout) would clash * Update transaction.ts Co-authored-by: Louis Singer <[email protected]>
vulpemventures · Feb 11, 2022 · 401e76a · 401e76a
1 parent 146e86d
commit 401e76a
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/application/utils/transaction.ts b/src/application/utils/transaction.ts
@@ -18,6 +18,7 @@ import {
   getAsset,
   NetworkString,
   IdentityInterface,
+  isConfidentialOutput,
 } from 'ldk';
 import { confidential, networks, payments, Psbt } from 'liquidjs-lib';
 import { isConfidentialAddress } from './address';
@@ -62,12 +63,12 @@ function inputBlindingDataMap(
   let index = -1;
   for (const input of psetToUnsignedTx(pset).ins) {
     index++;
-    const utxo = utxos.find((u) => txidToBuffer(u.txid).equals(input.hash));
+    const utxo = utxos.find(
+      (u) => txidToBuffer(u.txid).equals(input.hash) && u.vout === input.index
+    );
 
-    // if the input is confidential, unblindData will be defined
-    // in that case, we need to add it to the blinding data map
-    // this let to ignore unconfidential inputs
-    if (utxo?.unblindData) {
+    // only add unblind data if the prevout of the input is confidential
+    if (utxo && utxo.unblindData && isConfidentialOutput(utxo.prevout)) {
       inputBlindingData.set(index, utxo.unblindData);
     }
   }