@indigo-labs/indigo-sdk 0.4.3 → 0.5.0

package/tests/rob/transactions-mutated.ts

@@ -5,7 +5,6 @@ import {
   getInputIndices,
   LucidEvolution,
   OutRef,
-  slotToUnixTime,
   toHex,
   TxBuilder,
 } from '@lucid-evolution/lucid';
@@ -55,12 +54,9 @@ export async function testRedeemRob(
   iassetOutRef: OutRef,
   collateralAssetOutRef: OutRef,
   lucid: LucidEvolution,
-  currentSlot: number,
   sysParams: SystemParams,
   pythMessage?: string,
 ): Promise<TxBuilder> {
-  const network = lucid.config().network!;
-
   const robScriptRefUtxo = matchSingle(
     await lucid.utxosByOutRef([
       fromSystemParamsScriptRef(sysParams.scriptReferences.robValidatorRef),
@@ -131,7 +127,7 @@ export async function testRedeemRob(
 
   const transaction = lucid
     .newTx()
-    .validTo(slotToUnixTime(network, currentSlot))
+    .validTo(lucid.slotToUnixTime(lucid.currentSlot()))
     .readFrom(allRefInputs)
     .compose(tx);
 
@@ -154,10 +150,9 @@ export async function redeemWithCdpCreate(
   interestOracleOref: OutRef,
   treasuryOref: OutRef,
   lucid: LucidEvolution,
-  currentSlot: number,
 ): Promise<TxBuilder> {
   const network = lucid.config().network!;
-  const currentTime = BigInt(slotToUnixTime(network, currentSlot));
+  const currentTime = BigInt(lucid.slotToUnixTime(lucid.currentSlot()));
 
   const [pkh, skh] = await addrDetails(lucid);
 
@@ -301,10 +296,9 @@ export async function redeemWithCdpCreate(
   );
 
   const txValidity = oracleExpirationAwareValidity(
-    currentSlot,
+    lucid,
     Number(sysParams.cdpCreatorParams.biasTime),
     Number(priceOracleDatum.expirationTime),
-    network,
   );
 
   tx.validFrom(txValidity.validFrom)
@@ -400,10 +394,8 @@ export async function redeemWithCdpClose(
   interestCollectorOref: OutRef,
   sysParams: SystemParams,
   lucid: LucidEvolution,
-  currentSlot: number,
 ): Promise<TxBuilder> {
-  const network = lucid.config().network!;
-  const currentTime = BigInt(slotToUnixTime(network, currentSlot));
+  const currentTime = BigInt(lucid.slotToUnixTime(lucid.currentSlot()));
 
   const robScriptRefUtxo = matchSingle(
     await lucid.utxosByOutRef([
@@ -539,7 +531,7 @@ export async function redeemWithCdpClose(
     { OracleRefInputIdx: refInputIdxs[2] },
   );
 
-  const validateFrom = slotToUnixTime(network, currentSlot - 1);
+  const validateFrom = lucid.slotToUnixTime(lucid.currentSlot() - 1);
   const validateTo = Math.min(
     Number(BigInt(validateFrom) + sysParams.cdpParams.biasTime / 2n),
     Number(priceOracleDatum.expirationTime - 1n * 1000n),
@@ -610,12 +602,10 @@ export async function redeemWithCdpAdjust(
   interestOracleOref: OutRef,
   treasuryOref: OutRef,
   interestCollectorOref: OutRef,
-  currentSlot: number,
   lucid: LucidEvolution,
   sysParams: SystemParams,
 ): Promise<TxBuilder> {
-  const network = lucid.config().network!;
-  const currentTime = BigInt(slotToUnixTime(network, currentSlot));
+  const currentTime = BigInt(lucid.slotToUnixTime(lucid.currentSlot()));
 
   const robScriptRefUtxo = matchSingle(
     await lucid.utxosByOutRef([
@@ -764,10 +754,9 @@ export async function redeemWithCdpAdjust(
   );
 
   const txValidity = oracleExpirationAwareValidity(
-    currentSlot,
+    lucid,
     Number(sysParams.cdpCreatorParams.biasTime),
     Number(priceOracleDatum.expirationTime),
-    network,
   );
 
   tx.validFrom(txValidity.validFrom)

package/tests/stability-pool/actions.ts

@@ -1,8 +1,9 @@
 import { AssetClass } from '@3rd-eye-labs/cardano-offchain-common';
 import {
+  fromHex,
+  fromText,
   LucidEvolution,
   TxBuilder,
-  unixTimeToSlot,
 } from '@lucid-evolution/lucid';
 import {
   addrDetails,
@@ -15,16 +16,15 @@ import {
   openCdp,
   processSpRequest,
   SystemParams,
+  findStabilityPool,
+  findStabilityPoolAccount,
+  findE2s2sSnapshots,
 } from '../../src';
 import {
   findAllNecessaryOrefs,
   findPriceOracleFromCollateralAsset,
 } from '../cdp/cdp-queries';
-import {
-  findE2s2sSnapshots,
-  findStabilityPool,
-  findStabilityPoolAccount,
-} from '../queries/stability-pool-queries';
+
 import { LucidContext, runAndAwaitTx } from '../test-helpers';
 import { expect } from 'vitest';
 import { findIAsset } from '../queries/iasset-queries';
@@ -90,7 +90,6 @@ export async function runOpenCdpAndCreateSPAccount(
       orefs.interestOracleUtxo,
       orefs.treasuryUtxo,
       context.lucid,
-      context.emulator.slot,
     ),
   );
 
@@ -113,20 +112,19 @@ async function waitForAccountCooldown(
     context.lucid,
     sysParams,
     pkh,
-    asset,
+    fromHex(fromText(asset)),
   );
 
   if (accountUtxo.datum.lastRequestProcessingTime !== 0n) {
-    const targetSlot = unixTimeToSlot(
-      context.lucid.config().network!,
+    const targetSlot = context.lucid.unixTimeToSlot(
       Number(accountUtxo.datum.lastRequestProcessingTime) +
         sysParams.stabilityPoolParams.accountProcessingCooldownMs,
     );
 
-    if (targetSlot > context.emulator.slot) {
-      expect(targetSlot).toBeGreaterThan(context.emulator.slot);
+    if (targetSlot > context.lucid.currentSlot()) {
+      expect(targetSlot).toBeGreaterThan(context.lucid.currentSlot());
 
-      context.emulator.awaitSlot(targetSlot - context.emulator.slot + 2);
+      context.emulator.awaitSlot(targetSlot - context.lucid.currentSlot() + 2);
     }
   }
 }
@@ -138,7 +136,11 @@ export async function runProcessSpRequest(
   // Request owner
   pkh: string,
 ): Promise<TxBuilder> {
-  const sp = await findStabilityPool(context.lucid, sysParams, asset);
+  const sp = await findStabilityPool(
+    context.lucid,
+    sysParams,
+    fromHex(fromText(asset)),
+  );
 
   const ia = await findIAsset(
     context.lucid,
@@ -151,7 +153,7 @@ export async function runProcessSpRequest(
     context.lucid,
     sysParams,
     pkh,
-    asset,
+    fromHex(fromText(asset)),
   );
 
   await waitForAccountCooldown(context, sysParams, asset, pkh);
@@ -160,12 +162,15 @@ export async function runProcessSpRequest(
     sp.utxo,
     accountUtxo.utxo,
     ia.utxo,
-    (await findE2s2sSnapshots(context.lucid, sysParams, asset)).map(
-      (res) => res.utxo,
-    ),
+    (
+      await findE2s2sSnapshots(
+        context.lucid,
+        sysParams,
+        fromHex(fromText(asset)),
+      )
+    ).map((res) => res.utxo),
     sysParams,
     context.lucid,
-    context.emulator.slot,
   );
 }
 
@@ -181,7 +186,7 @@ export async function runCreateAdjustRequest(
     lucid,
     sysParams,
     pkh.hash,
-    asset,
+    fromHex(fromText(asset)),
   );
 
   return requestSpAccountAdjustment(
@@ -203,7 +208,7 @@ export async function runCreateCloseRequest(
     lucid,
     sysParams,
     pkh.hash,
-    asset,
+    fromHex(fromText(asset)),
   );
 
   return requestSpAccountClosure(accountUtxo.utxo, sysParams, lucid);
@@ -214,7 +219,11 @@ export async function runCreateE2s2sSnapshots(
   sysParams: SystemParams,
   asset: string,
 ): Promise<TxBuilder> {
-  const spUtxo = await findStabilityPool(context.lucid, sysParams, asset);
+  const spUtxo = await findStabilityPool(
+    context.lucid,
+    sysParams,
+    fromHex(fromText(asset)),
+  );
 
   return createE2s2sSnapshots(spUtxo.utxo, sysParams, context.lucid);
 }