@indigo-labs/indigo-sdk 0.1.14 → 0.1.16

package/dist/index.js

@@ -1625,7 +1625,7 @@ var StabilityPoolContract = class {
         action: request
       }
     };
-    let value = {
+    const value = {
       lovelace: BigInt(
         params.stabilityPoolParams.requestCollateralLovelaces + params.stabilityPoolParams.accountAdjustmentFeeLovelaces
       ),
@@ -1833,7 +1833,7 @@ var StabilityPoolContract = class {
       );
       const isDepositOrRewardWithdrawal = amount > 0n;
       const bigIntMax = (...args) => args.reduce((m, e) => e > m ? e : m);
-      const balanceChange = isDepositOrRewardWithdrawal ? amount : bigIntMax(amount, fromSPInteger(updatedAccountSnapshot.depositVal));
+      const balanceChange = isDepositOrRewardWithdrawal ? amount : bigIntMax(amount, -fromSPInteger(updatedAccountSnapshot.depositVal));
       const newAccountSnapshot = {
         ...updatedAccountSnapshot,
         depositVal: spAdd(
@@ -2817,7 +2817,7 @@ function serialiseLrpDatum(datum) {
   return import_lucid33.Data.to(datum, LRPDatum);
 }
 function serialiseLrpRedeemer(redeemer) {
-  return import_lucid33.Data.to(redeemer, LRPRedeemer);
+  return import_lucid33.Data.to(redeemer, LRPRedeemer, { canonical: true });
 }
 function castLrpParams(params) {
   return import_lucid33.Data.castTo(params, LRPParams);
@@ -2901,6 +2901,8 @@ 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);
       return acc.collectFrom(
         [lrpUtxo],
         serialiseLrpRedeemer(
@@ -2926,17 +2928,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

@@ -1504,7 +1504,7 @@ var StabilityPoolContract = class {
         action: request
       }
     };
-    let value = {
+    const value = {
       lovelace: BigInt(
         params.stabilityPoolParams.requestCollateralLovelaces + params.stabilityPoolParams.accountAdjustmentFeeLovelaces
       ),
@@ -1712,7 +1712,7 @@ var StabilityPoolContract = class {
       );
       const isDepositOrRewardWithdrawal = amount > 0n;
       const bigIntMax = (...args) => args.reduce((m, e) => e > m ? e : m);
-      const balanceChange = isDepositOrRewardWithdrawal ? amount : bigIntMax(amount, fromSPInteger(updatedAccountSnapshot.depositVal));
+      const balanceChange = isDepositOrRewardWithdrawal ? amount : bigIntMax(amount, -fromSPInteger(updatedAccountSnapshot.depositVal));
       const newAccountSnapshot = {
         ...updatedAccountSnapshot,
         depositVal: spAdd(
@@ -2721,7 +2721,7 @@ function serialiseLrpDatum(datum) {
   return Data20.to(datum, LRPDatum);
 }
 function serialiseLrpRedeemer(redeemer) {
-  return Data20.to(redeemer, LRPRedeemer);
+  return Data20.to(redeemer, LRPRedeemer, { canonical: true });
 }
 function castLrpParams(params) {
   return Data20.castTo(params, LRPParams);
@@ -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,8 @@ 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);
       return acc.collectFrom(
         [lrpUtxo],
         serialiseLrpRedeemer(
@@ -2834,17 +2837,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.14",
+  "version": "0.1.16",
   "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,8 @@ export async function redeemLrp(
       );
 
       const lrpDatum = parseLrpDatum(getInlineDatumOrThrow(lrpUtxo));
+      const outputLovelacesAmt = lrpUtxo.assets.lovelace - lovelacesForRedemption + reimburstmentLovelaces;
+      const assetUnit = toUnit(lrpParams.iassetPolicyId, mainLrpDatum.iasset);
 
       return acc
         .collectFrom(
@@ -190,17 +193,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/src/contracts/stability-pool.ts

@@ -51,7 +51,7 @@ export class StabilityPoolContract {
     const [pkh, _skh] = await addrDetails(lucid);
     const minLovelaces = BigInt(
       params.stabilityPoolParams.accountCreateFeeLovelaces +
-      params.stabilityPoolParams.requestCollateralLovelaces,
+        params.stabilityPoolParams.requestCollateralLovelaces,
     );
     const datum: StabilityPoolDatum = {
       Account: {
@@ -83,7 +83,7 @@ export class StabilityPoolContract {
         {
           lovelace: minLovelaces,
           [params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
-            fromText(asset)]: amount,
+          fromText(asset)]: amount,
         },
       )
       .addSignerKey(pkh.hash);
@@ -113,6 +113,7 @@ export class StabilityPoolContract {
     const oldAccountDatum: AccountContent = parseAccountDatum(
       accountUtxo.datum,
     );
+
     const newAccountDatum: AccountContent = {
       ...oldAccountDatum,
       request,
@@ -124,17 +125,20 @@ export class StabilityPoolContract {
       },
     };
 
-    let value = {
+    const value = {
       lovelace: BigInt(
         params.stabilityPoolParams.requestCollateralLovelaces +
-        params.stabilityPoolParams.accountAdjustmentFeeLovelaces,
+          params.stabilityPoolParams.accountAdjustmentFeeLovelaces,
       ),
       [params.stabilityPoolParams.accountToken[0].unCurrencySymbol +
-        fromText(params.stabilityPoolParams.accountToken[1].unTokenName)]: 1n,
+      fromText(params.stabilityPoolParams.accountToken[1].unTokenName)]: 1n,
     };
 
     if (amount > 0n) {
-      value[params.stabilityPoolParams.assetSymbol.unCurrencySymbol + fromText(asset)] = amount;
+      value[
+        params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
+          fromText(asset)
+      ] = amount;
     }
 
     return lucid
@@ -156,7 +160,7 @@ export class StabilityPoolContract {
             },
           }),
         },
-        value
+        value,
       )
       .addSignerKey(pkh.hash);
   }
@@ -215,10 +219,10 @@ export class StabilityPoolContract {
         {
           lovelace: BigInt(
             params.stabilityPoolParams.requestCollateralLovelaces +
-            params.stabilityPoolParams.accountAdjustmentFeeLovelaces,
+              params.stabilityPoolParams.accountAdjustmentFeeLovelaces,
           ),
           [params.stabilityPoolParams.accountToken[0].unCurrencySymbol +
-            fromText(params.stabilityPoolParams.accountToken[1].unTokenName)]: 1n,
+          fromText(params.stabilityPoolParams.accountToken[1].unTokenName)]: 1n,
         },
       )
       .addSignerKey(pkh.hash);
@@ -320,16 +324,16 @@ export class StabilityPoolContract {
           stabilityPoolUtxo.assets.lovelace +
           BigInt(params.stabilityPoolParams.accountCreateFeeLovelaces),
         [params.stabilityPoolParams.stabilityPoolToken[0].unCurrencySymbol +
-          fromText(params.stabilityPoolParams.stabilityPoolToken[1].unTokenName)]:
+        fromText(params.stabilityPoolParams.stabilityPoolToken[1].unTokenName)]:
           1n,
         [params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
-          fromText(asset)]: stabilityPoolAssetToken + reqAmount,
+        fromText(asset)]: stabilityPoolAssetToken + reqAmount,
       };
 
       tx.mintAssets(
         {
           [params.stabilityPoolParams.accountToken[0].unCurrencySymbol +
-            fromText(params.stabilityPoolParams.accountToken[1].unTokenName)]: 1n,
+          fromText(params.stabilityPoolParams.accountToken[1].unTokenName)]: 1n,
         },
         Data.to(new Constr(0, [])),
       );
@@ -370,7 +374,7 @@ export class StabilityPoolContract {
             accountUtxo.assets.lovelace -
             BigInt(params.stabilityPoolParams.accountCreateFeeLovelaces),
           [params.stabilityPoolParams.accountToken[0].unCurrencySymbol +
-            fromText(params.stabilityPoolParams.accountToken[1].unTokenName)]: 1n,
+          fromText(params.stabilityPoolParams.accountToken[1].unTokenName)]: 1n,
         },
       );
     } else if ('Adjust' in accountDatum.request) {
@@ -401,7 +405,7 @@ export class StabilityPoolContract {
 
       const balanceChange: bigint = isDepositOrRewardWithdrawal
         ? amount
-        : bigIntMax(amount, fromSPInteger(updatedAccountSnapshot.depositVal));
+        : bigIntMax(amount, -fromSPInteger(updatedAccountSnapshot.depositVal));
       const newAccountSnapshot: StabilityPoolSnapshot = {
         ...updatedAccountSnapshot,
         depositVal: spAdd(
@@ -423,9 +427,9 @@ export class StabilityPoolContract {
         isDepositOrRewardWithdrawal || newPoolDepositExcludingFee.value === 0n
           ? 0n
           : calculateFeeFromPercentage(
-            iassetDatum.stabilityPoolWithdrawalFeePercentage,
-            -balanceChange,
-          );
+              iassetDatum.stabilityPoolWithdrawalFeePercentage,
+              -balanceChange,
+            );
       const newPoolDeposit = spAdd(
         newPoolDepositExcludingFee,
         mkSPInteger(withdrawalFee),
@@ -434,12 +438,12 @@ export class StabilityPoolContract {
         withdrawalFee === 0n
           ? stabilityPoolDatum.snapshot.productVal
           : spMul(
-            stabilityPoolDatum.snapshot.productVal,
-            spAdd(
-              mkSPInteger(1n),
-              spDiv(mkSPInteger(withdrawalFee), newPoolDepositExcludingFee),
-            ),
-          );
+              stabilityPoolDatum.snapshot.productVal,
+              spAdd(
+                mkSPInteger(1n),
+                spDiv(mkSPInteger(withdrawalFee), newPoolDepositExcludingFee),
+              ),
+            );
       const newPoolSum = spAdd(
         stabilityPoolDatum.snapshot.sumVal,
         spDiv(
@@ -488,14 +492,14 @@ export class StabilityPoolContract {
             BigInt(params.stabilityPoolParams.accountAdjustmentFeeLovelaces) -
             reward,
           [params.stabilityPoolParams.stabilityPoolToken[0].unCurrencySymbol +
-            fromText(
-              params.stabilityPoolParams.stabilityPoolToken[1].unTokenName,
-            )]: 1n,
+          fromText(
+            params.stabilityPoolParams.stabilityPoolToken[1].unTokenName,
+          )]: 1n,
           [params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
-            fromText(asset)]:
+          fromText(asset)]:
             stabilityPoolUtxo.assets[
-            params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
-            fromText(asset)
+              params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
+                fromText(asset)
             ] +
             balanceChange +
             withdrawalFee,
@@ -522,7 +526,7 @@ export class StabilityPoolContract {
             BigInt(params.stabilityPoolParams.accountAdjustmentFeeLovelaces) -
             2_000_000n,
           [params.stabilityPoolParams.accountToken[0].unCurrencySymbol +
-            fromText(params.stabilityPoolParams.accountToken[1].unTokenName)]: 1n,
+          fromText(params.stabilityPoolParams.accountToken[1].unTokenName)]: 1n,
         },
       );
 
@@ -547,9 +551,9 @@ export class StabilityPoolContract {
             lovelace: reward - rewardLovelacesFee + 2_000_000n,
             ...(amount < 0n
               ? {
-                [params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
+                  [params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
                   fromText(asset)]: -(amount - withdrawalFee),
-              }
+                }
               : {}),
           },
         );
@@ -588,9 +592,9 @@ export class StabilityPoolContract {
         newPoolDepositExcludingFee.value === 0n
           ? 0n
           : calculateFeeFromPercentage(
-            iassetDatum.stabilityPoolWithdrawalFeePercentage,
-            withdrawnAmt.value,
-          );
+              iassetDatum.stabilityPoolWithdrawalFeePercentage,
+              withdrawnAmt.value,
+            );
 
       const [newPoolDeposit, newPoolProduct] = updatePoolSnapshotWithdrawalFee(
         mkSPInteger(withdrawalFeeAmount),
@@ -615,7 +619,7 @@ export class StabilityPoolContract {
       tx.mintAssets(
         {
           [params.stabilityPoolParams.accountToken[0].unCurrencySymbol +
-            fromText(params.stabilityPoolParams.accountToken[1].unTokenName)]:
+          fromText(params.stabilityPoolParams.accountToken[1].unTokenName)]:
             -1n,
         },
         Data.to(new Constr(0, [])),
@@ -623,8 +627,8 @@ export class StabilityPoolContract {
 
       const assetOutputAmountForSP =
         stabilityPoolUtxo.assets[
-        params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
-        fromText(asset)
+          params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
+            fromText(asset)
         ] -
         fromSPInteger(withdrawnAmt) -
         withdrawalFeeAmount;
@@ -645,14 +649,14 @@ export class StabilityPoolContract {
         {
           lovelace: stabilityPoolUtxo.assets.lovelace - reward,
           [params.stabilityPoolParams.stabilityPoolToken[0].unCurrencySymbol +
-            fromText(
-              params.stabilityPoolParams.stabilityPoolToken[1].unTokenName,
-            )]: 1n,
+          fromText(
+            params.stabilityPoolParams.stabilityPoolToken[1].unTokenName,
+          )]: 1n,
           ...(assetOutputAmountForSP > 0n
             ? {
-              [params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
+                [params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
                 fromText(asset)]: assetOutputAmountForSP,
-            }
+              }
             : {}),
         },
       );
@@ -677,7 +681,7 @@ export class StabilityPoolContract {
           {
             lovelace: accountUtxo.assets.lovelace + reward - rewardLovelacesFee,
             [params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
-              fromText(asset)]: fromSPInteger(withdrawnAmt) - withdrawalFeeAmount,
+            fromText(asset)]: fromSPInteger(withdrawnAmt) - withdrawalFeeAmount,
           },
         );
       }

package/src/types/indigo/lrp.ts

@@ -51,7 +51,7 @@ export function serialiseLrpDatum(datum: LRPDatum): Datum {
 }
 
 export function serialiseLrpRedeemer(redeemer: LRPRedeemer): Redeemer {
-  return Data.to<LRPRedeemer>(redeemer, LRPRedeemer);
+  return Data.to<LRPRedeemer>(redeemer, LRPRedeemer, {canonical: true});
 }
 
 export function castLrpParams(params: LRPParams): Data {

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),
     );
   });