Update TXO.validAt heights for InstantSend.

firoorg · Oct 18, 2021 · b268044 · b268044
1 parent 7e82601
commit b268044
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/store/modules/Transactions.ts b/src/store/modules/Transactions.ts
@@ -57,12 +57,10 @@ function txosFromTx(tx: Transaction): TXO[] {
         const isPrivate = ['lelantus-mint', 'lelantus-jmint', 'sigma-mint'].includes(txout.scriptType)
 
         let validAt = Infinity;
-        if (!tx.blockHeight) validAt = Infinity;
+        if (!tx.blockHeight && !tx.isInstantSendLocked) validAt = Infinity;
         else if (tx.inputType == "mined") validAt = tx.blockHeight + 101;
-        else if (tx.inputType == 'sigma') validAt = tx.blockHeight + 6;
-        else if (tx.inputType == 'lelantus') validAt = tx.blockHeight + 1;
-        else if (isPrivate) validAt = tx.blockHeight + 1;
-        else if (tx.inputType == 'public' && !isPrivate) validAt = 0;
+        else if (!isPrivate) validAt = 0;
+        else if (isPrivate && tx.blockHeight) validAt = tx.blockHeight + 1;
 
         txos.push({
             blockHash: tx.blockHash,