@indigo-labs/indigo-sdk 0.1.13 → 0.1.15

package/dist/index.js

@@ -1625,6 +1625,15 @@ var StabilityPoolContract = class {
         action: request
       }
     };
+    const value = {
+      lovelace: BigInt(
+        params.stabilityPoolParams.requestCollateralLovelaces + params.stabilityPoolParams.accountAdjustmentFeeLovelaces
+      ),
+      [params.stabilityPoolParams.accountToken[0].unCurrencySymbol + (0, import_lucid17.fromText)(params.stabilityPoolParams.accountToken[1].unTokenName)]: 1n
+    };
+    if (amount > 0n) {
+      value[params.stabilityPoolParams.assetSymbol.unCurrencySymbol + (0, import_lucid17.fromText)(asset)] = amount;
+    }
     return lucid.newTx().readFrom([stabilityPoolScriptRef]).collectFrom([accountUtxo], serialiseStabilityPoolRedeemer(redeemer)).pay.ToContract(
       (0, import_lucid17.credentialToAddress)(lucid.config().network, {
         hash: (0, import_lucid17.validatorToScriptHash)(
@@ -1640,13 +1649,7 @@ var StabilityPoolContract = class {
           }
         })
       },
-      {
-        lovelace: BigInt(
-          params.stabilityPoolParams.requestCollateralLovelaces + params.stabilityPoolParams.accountAdjustmentFeeLovelaces
-        ),
-        [params.stabilityPoolParams.accountToken[0].unCurrencySymbol + (0, import_lucid17.fromText)(params.stabilityPoolParams.accountToken[1].unTokenName)]: 1n,
-        [params.stabilityPoolParams.assetSymbol.unCurrencySymbol + (0, import_lucid17.fromText)(asset)]: amount
-      }
+      value
     ).addSignerKey(pkh.hash);
   }
   static async closeAccount(accountUtxo, params, lucid) {
@@ -1830,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(accountDatum.snapshot.depositVal));
+      const balanceChange = isDepositOrRewardWithdrawal ? amount : bigIntMax(amount, -fromSPInteger(updatedAccountSnapshot.depositVal));
       const newAccountSnapshot = {
         ...updatedAccountSnapshot,
         depositVal: spAdd(
@@ -2814,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);

package/dist/index.mjs

@@ -1504,6 +1504,15 @@ var StabilityPoolContract = class {
         action: request
       }
     };
+    const value = {
+      lovelace: BigInt(
+        params.stabilityPoolParams.requestCollateralLovelaces + params.stabilityPoolParams.accountAdjustmentFeeLovelaces
+      ),
+      [params.stabilityPoolParams.accountToken[0].unCurrencySymbol + fromText6(params.stabilityPoolParams.accountToken[1].unTokenName)]: 1n
+    };
+    if (amount > 0n) {
+      value[params.stabilityPoolParams.assetSymbol.unCurrencySymbol + fromText6(asset)] = amount;
+    }
     return lucid.newTx().readFrom([stabilityPoolScriptRef]).collectFrom([accountUtxo], serialiseStabilityPoolRedeemer(redeemer)).pay.ToContract(
       credentialToAddress4(lucid.config().network, {
         hash: validatorToScriptHash4(
@@ -1519,13 +1528,7 @@ var StabilityPoolContract = class {
           }
         })
       },
-      {
-        lovelace: BigInt(
-          params.stabilityPoolParams.requestCollateralLovelaces + params.stabilityPoolParams.accountAdjustmentFeeLovelaces
-        ),
-        [params.stabilityPoolParams.accountToken[0].unCurrencySymbol + fromText6(params.stabilityPoolParams.accountToken[1].unTokenName)]: 1n,
-        [params.stabilityPoolParams.assetSymbol.unCurrencySymbol + fromText6(asset)]: amount
-      }
+      value
     ).addSignerKey(pkh.hash);
   }
   static async closeAccount(accountUtxo, params, lucid) {
@@ -1709,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(accountDatum.snapshot.depositVal));
+      const balanceChange = isDepositOrRewardWithdrawal ? amount : bigIntMax(amount, -fromSPInteger(updatedAccountSnapshot.depositVal));
       const newAccountSnapshot = {
         ...updatedAccountSnapshot,
         depositVal: spAdd(
@@ -2718,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);

package/package.json

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

package/src/contracts/stability-pool.ts

@@ -113,6 +113,7 @@ export class StabilityPoolContract {
     const oldAccountDatum: AccountContent = parseAccountDatum(
       accountUtxo.datum,
     );
+
     const newAccountDatum: AccountContent = {
       ...oldAccountDatum,
       request,
@@ -124,6 +125,22 @@ export class StabilityPoolContract {
       },
     };
 
+    const value = {
+      lovelace: BigInt(
+        params.stabilityPoolParams.requestCollateralLovelaces +
+          params.stabilityPoolParams.accountAdjustmentFeeLovelaces,
+      ),
+      [params.stabilityPoolParams.accountToken[0].unCurrencySymbol +
+      fromText(params.stabilityPoolParams.accountToken[1].unTokenName)]: 1n,
+    };
+
+    if (amount > 0n) {
+      value[
+        params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
+          fromText(asset)
+      ] = amount;
+    }
+
     return lucid
       .newTx()
       .readFrom([stabilityPoolScriptRef])
@@ -143,16 +160,7 @@ export class StabilityPoolContract {
             },
           }),
         },
-        {
-          lovelace: BigInt(
-            params.stabilityPoolParams.requestCollateralLovelaces +
-              params.stabilityPoolParams.accountAdjustmentFeeLovelaces,
-          ),
-          [params.stabilityPoolParams.accountToken[0].unCurrencySymbol +
-          fromText(params.stabilityPoolParams.accountToken[1].unTokenName)]: 1n,
-          [params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
-          fromText(asset)]: amount,
-        },
+        value,
       )
       .addSignerKey(pkh.hash);
   }
@@ -394,9 +402,10 @@ export class StabilityPoolContract {
       const isDepositOrRewardWithdrawal: boolean = amount > 0n;
       const bigIntMax = (...args: bigint[]): bigint =>
         args.reduce((m, e) => (e > m ? e : m));
+
       const balanceChange: bigint = isDepositOrRewardWithdrawal
         ? amount
-        : bigIntMax(amount, fromSPInteger(accountDatum.snapshot.depositVal));
+        : bigIntMax(amount, -fromSPInteger(updatedAccountSnapshot.depositVal));
       const newAccountSnapshot: StabilityPoolSnapshot = {
         ...updatedAccountSnapshot,
         depositVal: spAdd(
@@ -463,7 +472,6 @@ export class StabilityPoolContract {
       await CollectorContract.feeTx(rewardLovelacesFee, lucid, params, tx);
 
       tx.readFrom([govUtxo, iAssetUtxo, ...refInputs]);
-
       tx.pay.ToContract(
         stabilityPoolUtxo.address,
         {

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/stability-pool.test.ts

@@ -253,6 +253,62 @@ test<LucidContext>('Stability Pool - Adjust Account', async ({
       lucid,
     ),
   );
+
+  // Withdraw 10n iUSD from the stability pool account.
+  lucid.selectWallet.fromSeed(users.user.seedPhrase);
+
+  stabilityPoolUtxo = await findStabilityPool(
+    lucid,
+    systemParams.validatorHashes.stabilityPoolHash,
+    {
+      currencySymbol:
+        systemParams.stabilityPoolParams.stabilityPoolToken[0].unCurrencySymbol,
+      tokenName: fromText(
+        systemParams.stabilityPoolParams.stabilityPoolToken[1].unTokenName,
+      ),
+    },
+    'iUSD',
+  );
+
+  accountUtxo = await findStabilityPoolAccount(
+    lucid,
+    systemParams.validatorHashes.stabilityPoolHash,
+    pkh.hash,
+    'iUSD',
+  );
+
+  await runAndAwaitTx(
+    lucid,
+    StabilityPoolContract.adjustAccount(
+      'iUSD',
+      -10n,
+      accountUtxo,
+      systemParams,
+      lucid,
+    ),
+  );
+  lucid.selectWallet.fromSeed(users.admin.seedPhrase);
+
+  accountUtxo = await findStabilityPoolAccount(
+    lucid,
+    systemParams.validatorHashes.stabilityPoolHash,
+    pkh.hash,
+    'iUSD',
+  );
+
+  await runAndAwaitTx(
+    lucid,
+    StabilityPoolContract.processRequest(
+      'iUSD',
+      stabilityPoolUtxo,
+      accountUtxo,
+      govUtxo,
+      assetUtxo,
+      undefined,
+      systemParams,
+      lucid,
+    ),
+  );
 });
 
 test<LucidContext>('Stability Pool - Close Account', async ({