@indigo-labs/indigo-sdk 0.1.15 → 0.1.17

package/dist/index.js

@@ -2901,6 +2901,22 @@ async function redeemLrp(redemptionLrpsData, lrpRefScriptOutRef, priceOracleOutR
         lovelacesForRedemption
       );
       const lrpDatum = parseLrpDatum(getInlineDatumOrThrow(lrpUtxo));
+      const outputLovelacesAmt = lrpUtxo.assets.lovelace - lovelacesForRedemption + reimburstmentLovelaces;
+      const assetUnit = (0, import_lucid34.toUnit)(lrpParams.iassetPolicyId, mainLrpDatum.iasset);
+      console.log(
+        lrpUtxo.address,
+        {
+          kind: "inline",
+          value: serialiseLrpDatum({
+            ...lrpDatum,
+            lovelacesToSpend: lrpDatum.lovelacesToSpend - lovelacesForRedemption
+          })
+        },
+        {
+          lovelace: outputLovelacesAmt,
+          [assetUnit]: redeemIAssetAmt + (lrpUtxo.assets[assetUnit] ?? 0n)
+        }
+      );
       return acc.collectFrom(
         [lrpUtxo],
         serialiseLrpRedeemer(
@@ -2926,17 +2942,10 @@ async function redeemLrp(redemptionLrpsData, lrpRefScriptOutRef, priceOracleOutR
             lovelacesToSpend: lrpDatum.lovelacesToSpend - lovelacesForRedemption
           })
         },
-        (0, import_lucid34.addAssets)(
-          lrpUtxo.assets,
-          mkLovelacesOf(-(lovelacesForRedemption - reimburstmentLovelaces)),
-          mkAssetsOf(
-            {
-              currencySymbol: lrpParams.iassetPolicyId,
-              tokenName: mainLrpDatum.iasset
-            },
-            redeemIAssetAmt
-          )
-        )
+        {
+          lovelace: outputLovelacesAmt,
+          [assetUnit]: redeemIAssetAmt + (lrpUtxo.assets[assetUnit] ?? 0n)
+        }
       );
     }
   )(redemptionLrps);

package/dist/index.mjs

@@ -2731,7 +2731,8 @@ function castLrpParams(params) {
 import {
   addAssets as addAssets3,
   unixTimeToSlot as unixTimeToSlot2,
-  slotToUnixTime as slotToUnixTime3
+  slotToUnixTime as slotToUnixTime3,
+  toUnit as toUnit4
 } from "@lucid-evolution/lucid";
 import { match as match5, P as P5 } from "ts-pattern";
 import { unzip, zip } from "fp-ts/lib/Array";
@@ -2809,6 +2810,22 @@ async function redeemLrp(redemptionLrpsData, lrpRefScriptOutRef, priceOracleOutR
         lovelacesForRedemption
       );
       const lrpDatum = parseLrpDatum(getInlineDatumOrThrow(lrpUtxo));
+      const outputLovelacesAmt = lrpUtxo.assets.lovelace - lovelacesForRedemption + reimburstmentLovelaces;
+      const assetUnit = toUnit4(lrpParams.iassetPolicyId, mainLrpDatum.iasset);
+      console.log(
+        lrpUtxo.address,
+        {
+          kind: "inline",
+          value: serialiseLrpDatum({
+            ...lrpDatum,
+            lovelacesToSpend: lrpDatum.lovelacesToSpend - lovelacesForRedemption
+          })
+        },
+        {
+          lovelace: outputLovelacesAmt,
+          [assetUnit]: redeemIAssetAmt + (lrpUtxo.assets[assetUnit] ?? 0n)
+        }
+      );
       return acc.collectFrom(
         [lrpUtxo],
         serialiseLrpRedeemer(
@@ -2834,17 +2851,10 @@ async function redeemLrp(redemptionLrpsData, lrpRefScriptOutRef, priceOracleOutR
             lovelacesToSpend: lrpDatum.lovelacesToSpend - lovelacesForRedemption
           })
         },
-        addAssets3(
-          lrpUtxo.assets,
-          mkLovelacesOf(-(lovelacesForRedemption - reimburstmentLovelaces)),
-          mkAssetsOf(
-            {
-              currencySymbol: lrpParams.iassetPolicyId,
-              tokenName: mainLrpDatum.iasset
-            },
-            redeemIAssetAmt
-          )
-        )
+        {
+          lovelace: outputLovelacesAmt,
+          [assetUnit]: redeemIAssetAmt + (lrpUtxo.assets[assetUnit] ?? 0n)
+        }
       );
     }
   )(redemptionLrps);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigo-labs/indigo-sdk",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "Indigo SDK for interacting with Indigo endpoints via lucid-evolution",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/contracts/lrp.ts

@@ -9,6 +9,7 @@ import {
   addAssets,
   unixTimeToSlot,
   slotToUnixTime,
+  toUnit,
 } from '@lucid-evolution/lucid';
 import {
   addrDetails,
@@ -158,6 +159,22 @@ export async function redeemLrp(
       );
 
       const lrpDatum = parseLrpDatum(getInlineDatumOrThrow(lrpUtxo));
+      const outputLovelacesAmt = lrpUtxo.assets.lovelace - lovelacesForRedemption + reimburstmentLovelaces;
+      const assetUnit = toUnit(lrpParams.iassetPolicyId, mainLrpDatum.iasset);
+
+      console.log(lrpUtxo.address,
+        {
+          kind: 'inline',
+          value: serialiseLrpDatum({
+            ...lrpDatum,
+            lovelacesToSpend:
+              lrpDatum.lovelacesToSpend - lovelacesForRedemption,
+          }),
+        },
+        {
+          lovelace: outputLovelacesAmt,
+          [assetUnit]: redeemIAssetAmt + (lrpUtxo.assets[assetUnit] ?? 0n),
+        });
 
       return acc
         .collectFrom(
@@ -190,17 +207,10 @@ export async function redeemLrp(
                 lrpDatum.lovelacesToSpend - lovelacesForRedemption,
             }),
           },
-          addAssets(
-            lrpUtxo.assets,
-            mkLovelacesOf(-(lovelacesForRedemption - reimburstmentLovelaces)),
-            mkAssetsOf(
-              {
-                currencySymbol: lrpParams.iassetPolicyId,
-                tokenName: mainLrpDatum.iasset,
-              },
-              redeemIAssetAmt,
-            ),
-          ),
+          {
+            lovelace: outputLovelacesAmt,
+            [assetUnit]: redeemIAssetAmt + (lrpUtxo.assets[assetUnit] ?? 0n),
+          }
         );
     },
   )(redemptionLrps);

package/tests/lrp.test.ts

@@ -495,7 +495,7 @@ describe('LRP', () => {
     );
   });
 
-  it('single redemption and cancel', async () => {
+  it('redeem, redeem again and cancel', async () => {
     const network: Network = 'Custom';
     const account1 = generateEmulatorAccount({
       lovelace: 80_000_000_000n, // 80,000 ADA
@@ -601,15 +601,39 @@ describe('LRP', () => {
 
     const redeemedLrp = await findSingleOwnLrp();
 
+    await runAndAwaitTx(
+      lucid,
+      redeemLrp(
+        [[redeemedLrp, redemptionIAssetAmt]],
+        lrpRefScriptOutRef,
+        await findPriceOracle(
+          lucid,
+          network,
+          testCtx.oracleValHash,
+          testCtx.oracleNft,
+        ),
+        await findIAsset(
+          lucid,
+          testCtx.iassetValHash,
+          testCtx.iassetNft,
+          toText(iassetTokenName),
+        ),
+        lucid,
+        lrpParams,
+        network,
+      ),
+    );
+    
     strictEqual(
       assetClassValueOf(redeemedLrp.assets, redemptionAsset),
       redemptionIAssetAmt,
       'LRP has wrong number of iassets after redemption',
     );
+    const closableLrp = await findSingleOwnLrp();
 
     await runAndAwaitTx(
       lucid,
-      cancelLrp(redeemedLrp, lrpRefScriptOutRef, lucid),
+      cancelLrp(closableLrp, lrpRefScriptOutRef, lucid),
     );
   });