@indigo-labs/indigo-sdk 0.1.13 → 0.1.14

package/dist/index.js

@@ -1625,6 +1625,15 @@ var StabilityPoolContract = class {
         action: request
       }
     };
+    let 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(

package/dist/index.mjs

@@ -1504,6 +1504,15 @@ var StabilityPoolContract = class {
         action: request
       }
     };
+    let 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(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigo-labs/indigo-sdk",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "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

@@ -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);
@@ -124,6 +124,19 @@ export class StabilityPoolContract {
       },
     };
 
+    let 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 +156,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);
   }
@@ -211,10 +215,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);
@@ -316,16 +320,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, [])),
       );
@@ -366,7 +370,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) {
@@ -394,9 +398,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(
@@ -418,9 +423,9 @@ export class StabilityPoolContract {
         isDepositOrRewardWithdrawal || newPoolDepositExcludingFee.value === 0n
           ? 0n
           : calculateFeeFromPercentage(
-              iassetDatum.stabilityPoolWithdrawalFeePercentage,
-              -balanceChange,
-            );
+            iassetDatum.stabilityPoolWithdrawalFeePercentage,
+            -balanceChange,
+          );
       const newPoolDeposit = spAdd(
         newPoolDepositExcludingFee,
         mkSPInteger(withdrawalFee),
@@ -429,12 +434,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(
@@ -463,7 +468,6 @@ export class StabilityPoolContract {
       await CollectorContract.feeTx(rewardLovelacesFee, lucid, params, tx);
 
       tx.readFrom([govUtxo, iAssetUtxo, ...refInputs]);
-
       tx.pay.ToContract(
         stabilityPoolUtxo.address,
         {
@@ -484,14 +488,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,
@@ -518,7 +522,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,
         },
       );
 
@@ -543,9 +547,9 @@ export class StabilityPoolContract {
             lovelace: reward - rewardLovelacesFee + 2_000_000n,
             ...(amount < 0n
               ? {
-                  [params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
+                [params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
                   fromText(asset)]: -(amount - withdrawalFee),
-                }
+              }
               : {}),
           },
         );
@@ -584,9 +588,9 @@ export class StabilityPoolContract {
         newPoolDepositExcludingFee.value === 0n
           ? 0n
           : calculateFeeFromPercentage(
-              iassetDatum.stabilityPoolWithdrawalFeePercentage,
-              withdrawnAmt.value,
-            );
+            iassetDatum.stabilityPoolWithdrawalFeePercentage,
+            withdrawnAmt.value,
+          );
 
       const [newPoolDeposit, newPoolProduct] = updatePoolSnapshotWithdrawalFee(
         mkSPInteger(withdrawalFeeAmount),
@@ -611,7 +615,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, [])),
@@ -619,8 +623,8 @@ export class StabilityPoolContract {
 
       const assetOutputAmountForSP =
         stabilityPoolUtxo.assets[
-          params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
-            fromText(asset)
+        params.stabilityPoolParams.assetSymbol.unCurrencySymbol +
+        fromText(asset)
         ] -
         fromSPInteger(withdrawnAmt) -
         withdrawalFeeAmount;
@@ -641,14 +645,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,
-              }
+            }
             : {}),
         },
       );
@@ -673,7 +677,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/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 ({