@indigo-labs/indigo-sdk 0.3.25 → 0.3.27

package/dist/index.mjs

@@ -1050,7 +1050,7 @@ var mkStabilityPoolValidatorFromSP = (params) => {
 };
 
 // src/contracts/stability-pool/helpers.ts
-var BASE_MAX_TX_FEE = 1000000n;
+var BASE_MAX_TX_FEE = 1250000n;
 var MAX_E2S2S_ENTRIES_COUNT = 5;
 var newScaleMultiplier = 1000000000n;
 var initSumVal = { value: 0n };
@@ -6957,11 +6957,11 @@ var mkGovValidatorFromSP = (params) => {
 import {
   fromText as fromText5,
   Data as Data32,
-  credentialToAddress as credentialToAddress3,
   fromHex as fromHex9,
   toHex as toHex9,
   addAssets as addAssets9,
-  slotToUnixTime as slotToUnixTime7
+  slotToUnixTime as slotToUnixTime7,
+  credentialToAddress as credentialToAddress3
 } from "@lucid-evolution/lucid";
 import {
   adaAssetClass as adaAssetClass4,
@@ -6994,10 +6994,16 @@ async function requestSpAccountCreation(assetAscii, amount, sysParams, lucid) {
     lastRequestProcessingTime: 0n
   };
   return lucid.newTx().pay.ToContract(
-    credentialToAddress3(lucid.config().network, {
-      hash: sysParams.validatorHashes.stabilityPoolHash,
-      type: "Script"
-    }),
+    credentialToAddress3(
+      lucid.config().network,
+      {
+        hash: sysParams.validatorHashes.stabilityPoolHash,
+        type: "Script"
+      },
+      sysParams.stabilityPoolParams.stakeCredential != null ? fromSysParamsCredential(
+        sysParams.stabilityPoolParams.stakeCredential
+      ) : void 0
+    ),
     {
       kind: "inline",
       value: serialiseStabilityPoolDatum({ Account: datum })
@@ -7006,7 +7012,9 @@ async function requestSpAccountCreation(assetAscii, amount, sysParams, lucid) {
       mkAssetsOf7(iassetAssetClass, amount),
       mkLovelacesOf4(
         // TODO: Calculate a more accurate amount to just cover costs.
-        5000000n
+        // This should cover the account creation fee,
+        // the minimum ADA for the account UTxO and the transaction fee.
+        BigInt(sysParams.stabilityPoolParams.accountCreateFeeLovelaces) + 3000000n
       )
     )
   ).addSignerKey(pkh.hash);
@@ -7054,7 +7062,9 @@ async function requestSpAccountAdjustment(amount, accountUtxo, sysParams, lucid)
     addAssets9(
       mkLovelacesOf4(
         // TODO: Calculate a more accurate amount to just cover costs.
-        7000000n
+        // This should cover the minimum ADA for 2 UTxOs (account and
+        // rewards withdrawal) and the transaction fee.
+        5000000n
       ),
       mkAssetsOf7(
         fromSystemParamsAsset(sysParams.stabilityPoolParams.accountToken),
@@ -7107,7 +7117,8 @@ async function requestSpAccountClosure(accountUtxo, sysParams, lucid, maxTxFee =
     addAssets9(
       mkLovelacesOf4(
         // TODO: Calculate a more accurate amount to just cover costs.
-        5000000n
+        // This should cover the minimum ADA for the rewards UTxO and the transaction fee.
+        3000000n
       ),
       mkAssetsOf7(
         fromSystemParamsAsset(sysParams.stabilityPoolParams.accountToken),
@@ -7116,7 +7127,7 @@ async function requestSpAccountClosure(accountUtxo, sysParams, lucid, maxTxFee =
     )
   ).addSignerKey(toHex9(oldAccountDatum.owner));
 }
-async function processSpRequest(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE2s2sSnapshotOrefs, sysParams, lucid, currentSlot) {
+async function processSpRequestAuxiliary(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE2s2sSnapshotOrefs, sysParams, lucid, currentSlot, txFee) {
   const network = lucid.config().network;
   const currentTime = BigInt(slotToUnixTime7(network, currentSlot));
   const stabilityPoolScriptRef = matchSingle3(
@@ -7165,7 +7176,46 @@ async function processSpRequest(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE
       accountUtxo.assets,
       iassetAssetClass
     );
-    const poolAddr = mkStabilityPoolAddr(lucid, sysParams);
+    const poolAddr = credentialToAddress3(
+      lucid.config().network,
+      {
+        hash: sysParams.validatorHashes.stabilityPoolHash,
+        type: "Script"
+      },
+      sysParams.stabilityPoolParams.stakeCredential != null ? fromSysParamsCredential(
+        sysParams.stabilityPoolParams.stakeCredential
+      ) : void 0
+    );
+    const accountOutputAdaAmt = lovelacesAmt2(accountUtxo.assets) - BigInt(sysParams.stabilityPoolParams.accountCreateFeeLovelaces) - txFee;
+    const accountTokenVal = mkAssetsOf7(
+      fromSystemParamsAsset(sysParams.stabilityPoolParams.accountToken),
+      1n
+    );
+    const accountOutputDatum = serialiseStabilityPoolDatum({
+      Account: {
+        owner: accountDatum.owner,
+        iasset: stabilityPoolDatum.iasset,
+        state: {
+          ...stabilityPoolDatum.state,
+          depositVal: mkSPInteger(requestDepositAmt)
+        },
+        assetSums: stabilityPoolDatum.assetStates.map(([key, val]) => [
+          key,
+          val.currentSumVal
+        ]),
+        request: null,
+        lastRequestProcessingTime: currentTime
+      }
+    });
+    const accountOutMinUtxoLovelace = estimateUtxoMinLovelace3(
+      lucid.config().protocolParameters,
+      poolAddr,
+      accountTokenVal,
+      { InlineDatum: { datum: accountOutputDatum } }
+    );
+    if (accountOutputAdaAmt < accountOutMinUtxoLovelace) {
+      throw new Error("Request doesn't have enough ADA to be processed.");
+    }
     tx.readFrom([accountTokenScriptRef]).collectFrom([accountUtxo], {
       kind: "selected",
       inputs: [stabilityPoolUtxo, accountUtxo],
@@ -7177,13 +7227,7 @@ async function processSpRequest(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE
           currentTime
         }
       })
-    }).mintAssets(
-      mkAssetsOf7(
-        fromSystemParamsAsset(sysParams.stabilityPoolParams.accountToken),
-        1n
-      ),
-      Data32.void()
-    ).pay.ToContract(
+    }).mintAssets(accountTokenVal, Data32.void()).pay.ToContract(
       poolAddr,
       {
         kind: "inline",
@@ -7216,31 +7260,10 @@ async function processSpRequest(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE
       poolAddr,
       {
         kind: "inline",
-        value: serialiseStabilityPoolDatum({
-          Account: {
-            owner: accountDatum.owner,
-            iasset: stabilityPoolDatum.iasset,
-            state: {
-              ...stabilityPoolDatum.state,
-              depositVal: mkSPInteger(requestDepositAmt)
-            },
-            assetSums: stabilityPoolDatum.assetStates.map(([key, val]) => [
-              key,
-              val.currentSumVal
-            ]),
-            request: null,
-            lastRequestProcessingTime: currentTime
-          }
-        })
+        value: accountOutputDatum
       },
-      addAssets9(
-        mkAssetsOf7(
-          fromSystemParamsAsset(sysParams.stabilityPoolParams.accountToken),
-          1n
-        ),
-        mkLovelacesOf4(lovelacesAmt2(accountUtxo.assets))
-      )
-    );
+      addAssets9(accountTokenVal, mkLovelacesOf4(accountOutputAdaAmt))
+    ).setMinFee(txFee);
   }).with({ Adjust: P17.select() }, async (adjustContent) => {
     const iassetDatum = parseIAssetDatumOrThrow(
       getInlineDatumOrThrow(iAssetUtxo)
@@ -7364,7 +7387,7 @@ async function processSpRequest(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE
       accountOutputValWithoutAda,
       { InlineDatum: { datum: accountOutputDat } }
     );
-    const accountOutputAdaAmt = lovelacesAmt2(accountUtxo.assets) - extraOwnerOutputLovelacesAmt;
+    const accountOutputAdaAmt = lovelacesAmt2(accountUtxo.assets) - extraOwnerOutputLovelacesAmt - txFee;
     if (accountOutputAdaAmt < accountOutMinUtxoLovelace) {
       throw new Error("Account doesn't have enough ADA to be processed.");
     }
@@ -7385,8 +7408,11 @@ async function processSpRequest(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE
         value: ownerOutputDat
       },
       actualOwnerOutputVal
-    );
+    ).setMinFee(txFee);
   }).with({ Close: P17.select() }, async (closeContent) => {
+    if (txFee > closeContent.maxTxFee) {
+      throw new Error("Account doesn't allow current transaction fee.");
+    }
     const accountTokenScriptRef = matchSingle3(
       await lucid.utxosByOutRef([
         fromSystemParamsScriptRef(
@@ -7483,14 +7509,38 @@ async function processSpRequest(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE
         })
       },
       addAssets9(
-        mkLovelacesOf4(lovelacesAmt2(accountUtxo.assets)),
+        mkLovelacesOf4(lovelacesAmt2(accountUtxo.assets) - txFee),
         reward,
         mkAssetsOf7(iassetAssetClass, withdrawnAmt - withdrawalFeeAmt)
       )
-    );
+    ).setMinFee(txFee);
   }).exhaustive();
   return tx;
 }
+async function processSpRequest(stabilityPoolUtxo, accountUtxo, iAssetUtxo, allE2s2sSnapshotOrefs, sysParams, lucid, currentSlot) {
+  const draftTx = processSpRequestAuxiliary(
+    stabilityPoolUtxo,
+    accountUtxo,
+    iAssetUtxo,
+    allE2s2sSnapshotOrefs,
+    sysParams,
+    lucid,
+    currentSlot,
+    // Placeholder transation fee
+    1n
+  );
+  const fee = (await (await draftTx).complete()).toTransaction().body().fee();
+  return processSpRequestAuxiliary(
+    stabilityPoolUtxo,
+    accountUtxo,
+    iAssetUtxo,
+    allE2s2sSnapshotOrefs,
+    sysParams,
+    lucid,
+    currentSlot,
+    fee
+  );
+}
 async function createE2s2sSnapshots(stabilityPoolOref, sysParams, lucid) {
   const stabilityPoolRefScriptUtxo = matchSingle3(
     await lucid.utxosByOutRef([
@@ -11021,7 +11071,7 @@ function parseStableswapOrderRedeemerOrThrow(redeemerCborHex) {
 
 // src/contracts/stableswap/helpers.ts
 import { Data as Data52 } from "@evolution-sdk/evolution";
-var BASE_MAX_EXECUTION_FEE = 1000000n;
+var BASE_MAX_EXECUTION_FEE = 1620000n;
 function createDestinationDatum(datum, outRef) {
   if (!datum) {
     return serialiseStableswapOutputDatum([
@@ -11364,7 +11414,7 @@ async function batchProcessStableswapOrders(stableswapOrderOrefs, stableswapPool
       stableswapPoolUtxo.assets,
       mkAssetsOf16(collateralAc, collateralAmtChangePool)
     ) : stableswapPoolUtxo.assets
-  ).setMinFee(2055720n);
+  ).setMinFee(stableswapOrderOrefs.length > 1 ? 1498875n : 1030000n);
   if (amountToMint !== 0n) {
     tx.mintAssets(mkAssetsOf16(iassetAc, amountToMint), Data53.void());
   }
@@ -11761,6 +11811,7 @@ export {
   requestSpAccountClosure,
   requestSpAccountCreation,
   rewardSnapshotPrecision,
+  rewardsPerAsset,
   robAmtToSpend,
   robBuyOrderFilledAssets,
   robBuyOrderSummary,

package/package.json

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

package/src/contracts/stability-pool/helpers.ts

@@ -53,7 +53,7 @@ import {
 } from '../../types/system-params';
 import { mkStabilityPoolValidatorFromSP } from './scripts';
 
-export const BASE_MAX_TX_FEE = 1_000_000n;
+export const BASE_MAX_TX_FEE = 1_250_000n;
 
 export const MAX_E2S2S_ENTRIES_COUNT = 5;
 const newScaleMultiplier = 1_000_000_000n;
@@ -437,7 +437,10 @@ function getE2s2sEntry(
     .exhaustive();
 }
 
-function rewardsPerAsset(
+/**
+ * Sp account rewards per collateral asset.
+ */
+export function rewardsPerAsset(
   poolAssetStates: readonly AssetState[],
   e2s2sIdxs: [FindE2S2SIdxResult, O.Option<FindE2S2SIdxResult>][],
   accountAssetSums: readonly (readonly [AssetClass, SPInteger])[],

package/src/contracts/stability-pool/transactions.ts

@@ -4,14 +4,15 @@ import {
   TxBuilder,
   Data,
   UTxO,
-  credentialToAddress,
   fromHex,
   toHex,
   addAssets,
   OutRef,
   slotToUnixTime,
+  credentialToAddress,
 } from '@lucid-evolution/lucid';
 import {
+  fromSysParamsCredential,
   fromSystemParamsAsset,
   fromSystemParamsScriptRef,
   SystemParams,
@@ -23,7 +24,6 @@ import {
   findRelevantE2s2sIdxs,
   initSpState,
   liquidationHelper,
-  mkStabilityPoolAddr,
   partitionEpochToScaleToSums,
   updateAccount,
   updatePoolStateWhenWithdrawalFee,
@@ -88,10 +88,18 @@ export async function requestSpAccountCreation(
   return lucid
     .newTx()
     .pay.ToContract(
-      credentialToAddress(lucid.config().network!, {
-        hash: sysParams.validatorHashes.stabilityPoolHash,
-        type: 'Script',
-      }),
+      credentialToAddress(
+        lucid.config().network!,
+        {
+          hash: sysParams.validatorHashes.stabilityPoolHash,
+          type: 'Script',
+        },
+        sysParams.stabilityPoolParams.stakeCredential != null
+          ? fromSysParamsCredential(
+              sysParams.stabilityPoolParams.stakeCredential,
+            )
+          : undefined,
+      ),
       {
         kind: 'inline',
         value: serialiseStabilityPoolDatum({ Account: datum }),
@@ -100,7 +108,10 @@ export async function requestSpAccountCreation(
         mkAssetsOf(iassetAssetClass, amount),
         mkLovelacesOf(
           // TODO: Calculate a more accurate amount to just cover costs.
-          5_000_000n,
+          // This should cover the account creation fee,
+          // the minimum ADA for the account UTxO and the transaction fee.
+          BigInt(sysParams.stabilityPoolParams.accountCreateFeeLovelaces) +
+            3_000_000n,
         ),
       ),
     )
@@ -163,7 +174,9 @@ export async function requestSpAccountAdjustment(
       addAssets(
         mkLovelacesOf(
           // TODO: Calculate a more accurate amount to just cover costs.
-          7_000_000n,
+          // This should cover the minimum ADA for 2 UTxOs (account and
+          // rewards withdrawal) and the transaction fee.
+          5_000_000n,
         ),
         mkAssetsOf(
           fromSystemParamsAsset(sysParams.stabilityPoolParams.accountToken),
@@ -232,7 +245,8 @@ export async function requestSpAccountClosure(
       addAssets(
         mkLovelacesOf(
           // TODO: Calculate a more accurate amount to just cover costs.
-          5_000_000n,
+          // This should cover the minimum ADA for the rewards UTxO and the transaction fee.
+          3_000_000n,
         ),
         mkAssetsOf(
           fromSystemParamsAsset(sysParams.stabilityPoolParams.accountToken),
@@ -243,7 +257,7 @@ export async function requestSpAccountClosure(
     .addSignerKey(toHex(oldAccountDatum.owner));
 }
 
-export async function processSpRequest(
+async function processSpRequestAuxiliary(
   stabilityPoolUtxo: UTxO,
   accountUtxo: UTxO,
   iAssetUtxo: UTxO,
@@ -254,6 +268,7 @@ export async function processSpRequest(
   sysParams: SystemParams,
   lucid: LucidEvolution,
   currentSlot: number,
+  txFee: bigint,
 ): Promise<TxBuilder> {
   const network = lucid.config().network!;
   const currentTime = BigInt(slotToUnixTime(network, currentSlot));
@@ -320,7 +335,57 @@ export async function processSpRequest(
         iassetAssetClass,
       );
 
-      const poolAddr = mkStabilityPoolAddr(lucid, sysParams);
+      const poolAddr = credentialToAddress(
+        lucid.config().network!,
+        {
+          hash: sysParams.validatorHashes.stabilityPoolHash,
+          type: 'Script',
+        },
+        sysParams.stabilityPoolParams.stakeCredential != null
+          ? fromSysParamsCredential(
+              sysParams.stabilityPoolParams.stakeCredential,
+            )
+          : undefined,
+      );
+
+      const accountOutputAdaAmt =
+        lovelacesAmt(accountUtxo.assets) -
+        BigInt(sysParams.stabilityPoolParams.accountCreateFeeLovelaces) -
+        txFee;
+
+      const accountTokenVal = mkAssetsOf(
+        fromSystemParamsAsset(sysParams.stabilityPoolParams.accountToken),
+        1n,
+      );
+
+      const accountOutputDatum = serialiseStabilityPoolDatum({
+        Account: {
+          owner: accountDatum.owner,
+          iasset: stabilityPoolDatum.iasset,
+          state: {
+            ...stabilityPoolDatum.state,
+            depositVal: mkSPInteger(requestDepositAmt),
+          },
+          assetSums: stabilityPoolDatum.assetStates.map(([key, val]) => [
+            key,
+            val.currentSumVal,
+          ]),
+          request: null,
+          lastRequestProcessingTime: currentTime,
+        },
+      });
+
+      const accountOutMinUtxoLovelace = estimateUtxoMinLovelace(
+        lucid.config().protocolParameters!,
+        poolAddr,
+        accountTokenVal,
+        { InlineDatum: { datum: accountOutputDatum } },
+      );
+
+      // This is to prevent spending ADA from the wallet submitting the request processing Tx.
+      if (accountOutputAdaAmt < accountOutMinUtxoLovelace) {
+        throw new Error("Request doesn't have enough ADA to be processed.");
+      }
 
       tx.readFrom([accountTokenScriptRef])
         .collectFrom([accountUtxo], {
@@ -336,13 +401,7 @@ export async function processSpRequest(
               },
             }),
         })
-        .mintAssets(
-          mkAssetsOf(
-            fromSystemParamsAsset(sysParams.stabilityPoolParams.accountToken),
-            1n,
-          ),
-          Data.void(),
-        )
+        .mintAssets(accountTokenVal, Data.void())
         .pay.ToContract(
           poolAddr,
           {
@@ -377,31 +436,11 @@ export async function processSpRequest(
           poolAddr,
           {
             kind: 'inline',
-            value: serialiseStabilityPoolDatum({
-              Account: {
-                owner: accountDatum.owner,
-                iasset: stabilityPoolDatum.iasset,
-                state: {
-                  ...stabilityPoolDatum.state,
-                  depositVal: mkSPInteger(requestDepositAmt),
-                },
-                assetSums: stabilityPoolDatum.assetStates.map(([key, val]) => [
-                  key,
-                  val.currentSumVal,
-                ]),
-                request: null,
-                lastRequestProcessingTime: currentTime,
-              },
-            }),
+            value: accountOutputDatum,
           },
-          addAssets(
-            mkAssetsOf(
-              fromSystemParamsAsset(sysParams.stabilityPoolParams.accountToken),
-              1n,
-            ),
-            mkLovelacesOf(lovelacesAmt(accountUtxo.assets)),
-          ),
-        );
+          addAssets(accountTokenVal, mkLovelacesOf(accountOutputAdaAmt)),
+        )
+        .setMinFee(txFee);
     })
     .with({ Adjust: P.select() }, async (adjustContent) => {
       const iassetDatum = parseIAssetDatumOrThrow(
@@ -558,9 +597,8 @@ export async function processSpRequest(
         { InlineDatum: { datum: accountOutputDat } },
       );
 
-      // TODO: include Tx fee here.
       const accountOutputAdaAmt =
-        lovelacesAmt(accountUtxo.assets) - extraOwnerOutputLovelacesAmt;
+        lovelacesAmt(accountUtxo.assets) - extraOwnerOutputLovelacesAmt - txFee;
 
       // This is to prevent spending ADA from the wallet submitting the request processing Tx.
       if (accountOutputAdaAmt < accountOutMinUtxoLovelace) {
@@ -586,9 +624,14 @@ export async function processSpRequest(
             value: ownerOutputDat,
           },
           actualOwnerOutputVal,
-        );
+        )
+        .setMinFee(txFee);
     })
     .with({ Close: P.select() }, async (closeContent) => {
+      if (txFee > closeContent.maxTxFee) {
+        throw new Error("Account doesn't allow current transaction fee.");
+      }
+
       const accountTokenScriptRef = matchSingle(
         await lucid.utxosByOutRef([
           fromSystemParamsScriptRef(
@@ -705,17 +748,56 @@ export async function processSpRequest(
             }),
           },
           addAssets(
-            mkLovelacesOf(lovelacesAmt(accountUtxo.assets)),
+            mkLovelacesOf(lovelacesAmt(accountUtxo.assets) - txFee),
             reward,
             mkAssetsOf(iassetAssetClass, withdrawnAmt - withdrawalFeeAmt),
           ),
-        );
+        )
+        .setMinFee(txFee);
     })
     .exhaustive();
 
   return tx;
 }
 
+export async function processSpRequest(
+  stabilityPoolUtxo: UTxO,
+  accountUtxo: UTxO,
+  iAssetUtxo: UTxO,
+  /**
+   * For performance provide only the ones related to the pool's iAsset.
+   */
+  allE2s2sSnapshotOrefs: OutRef[],
+  sysParams: SystemParams,
+  lucid: LucidEvolution,
+  currentSlot: number,
+): Promise<TxBuilder> {
+  const draftTx = processSpRequestAuxiliary(
+    stabilityPoolUtxo,
+    accountUtxo,
+    iAssetUtxo,
+    allE2s2sSnapshotOrefs,
+    sysParams,
+    lucid,
+    currentSlot,
+    // Placeholder transation fee
+    1n,
+  );
+
+  const fee = (await (await draftTx).complete()).toTransaction().body().fee();
+
+  return processSpRequestAuxiliary(
+    stabilityPoolUtxo,
+    accountUtxo,
+    iAssetUtxo,
+    allE2s2sSnapshotOrefs,
+    sysParams,
+    lucid,
+    currentSlot,
+    fee,
+  );
+}
+
 export async function createE2s2sSnapshots(
   stabilityPoolOref: OutRef,
   sysParams: SystemParams,

package/src/contracts/stableswap/helpers.ts

@@ -2,7 +2,7 @@ import { fromHex, fromText, OutRef } from '@lucid-evolution/lucid';
 import { serialiseStableswapOutputDatum } from './types-new';
 import { Data } from '@evolution-sdk/evolution';
 
-export const BASE_MAX_EXECUTION_FEE = 1_000_000n;
+export const BASE_MAX_EXECUTION_FEE = 1_620_000n;
 
 export function createDestinationDatum(
   datum: Data.Data | null,

package/src/contracts/stableswap/transactions.ts

@@ -496,8 +496,9 @@ export async function batchProcessStableswapOrders(
     // This has to be added as otherwise there is the following error:
     // TxBuilderError: { Complete: RedeemerBuilder: Coin selection had to be updated
     // after building redeemers, possibly leading to incorrect indices. Try setting
-    // a minimum fee of 2055720 lovelaces. }
-    .setMinFee(2_055_720n);
+    // a minimum fee of 1761019 lovelaces. }
+    // Trying to set it as low as possible to reduce costs.
+    .setMinFee(stableswapOrderOrefs.length > 1 ? 1_498_875n : 1_030_000n);
 
   if (amountToMint !== 0n) {
     tx.mintAssets(mkAssetsOf(iassetAc, amountToMint), Data.void());