@indigo-labs/indigo-sdk 0.3.24 → 0.3.26

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,
@@ -79,7 +79,7 @@ export async function requestSpAccountCreation(
   const datum: AccountContent = {
     owner: fromHex(pkh.hash),
     iasset: iasset,
-    state: initSpState,
+    state: { ...initSpState, depositVal: mkSPInteger(amount) },
     assetSums: [],
     request: 'Create',
     lastRequestProcessingTime: 0n,
@@ -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());