@indigo-labs/indigo-sdk 0.4.4 → 0.5.0

package/tests/indigo-test-helpers.ts

@@ -82,7 +82,6 @@ export async function createIndigoTestContext(
   const [systemParams, assetConfigs] = await init(
     context.lucid,
     [iusdInitialAssetCfg()],
-    context.emulator.slot,
     () => [],
     {
       foundationMultisig: {

package/tests/initialize.test.ts

@@ -40,29 +40,24 @@ beforeEach<MyContext>(async (context: MyContext) => {
 test<MyContext>('Initialize Protocol - can initialize', async ({
   lucid,
   users,
-  emulator,
 }: MyContext) => {
   lucid.selectWallet.fromSeed(users.admin.seedPhrase);
 
-  await init(
-    lucid,
-    [
-      iusdInitialAssetCfg(DEFAULT_INTEREST, [
-        {
-          collateralAsset: EXAMPLE_TOKEN_1,
-          collateralToIassetRatio: rationalFromInt(1n),
-          feeManager: undefined,
-          minMintOrderAmount: 0n,
-          minRedemptionOrderAmount: 0n,
-          mintingEnabled: true,
-          redemptionEnabled: true,
-          mintingFeeRatio: { numerator: 1n, denominator: 100n },
-          redemptionFeeRatio: { numerator: 1n, denominator: 100n },
-        },
-      ]),
-    ],
-    emulator.slot,
-  );
+  await init(lucid, [
+    iusdInitialAssetCfg(DEFAULT_INTEREST, [
+      {
+        collateralAsset: EXAMPLE_TOKEN_1,
+        collateralToIassetRatio: rationalFromInt(1n),
+        feeManager: undefined,
+        minMintOrderAmount: 0n,
+        minRedemptionOrderAmount: 0n,
+        mintingEnabled: true,
+        redemptionEnabled: true,
+        mintingFeeRatio: { numerator: 1n, denominator: 100n },
+        redemptionFeeRatio: { numerator: 1n, denominator: 100n },
+      },
+    ]),
+  ]);
 });
 
 test<MyContext>('Validate Lucid protocol parameters match Mainnet', ({

package/tests/interest-collection/interest-collection.test.ts

@@ -314,7 +314,6 @@ describe('Interest Collection', () => {
         priceOracleUtxo!,
         rationalFromInt(1n),
         iAssetConfig.collateralAssets[0].oracleParams!,
-        context.emulator.slot,
       ),
     );
 
@@ -327,7 +326,6 @@ describe('Interest Collection', () => {
         cdpsInfo.map((cdp) => cdp.utxo),
         context.systemParams,
         context.lucid,
-        context.emulator.slot,
       ),
       context.lucid,
       context.emulator,
@@ -406,7 +404,6 @@ describe('Interest Collection', () => {
         priceOracleUtxo!,
         rationalFromInt(1n),
         iAssetConfig.collateralAssets[0].oracleParams!,
-        context.emulator.slot,
       ),
     );
 
@@ -419,7 +416,6 @@ describe('Interest Collection', () => {
         cdpsInfo.map((cdp) => cdp.utxo),
         context.systemParams,
         context.lucid,
-        context.emulator.slot,
       ),
     );
   });

package/tests/interest-oracle.test.ts

@@ -86,14 +86,7 @@ test<InterestOracleTestContext>('Interest Oracle - Update', async ({
 
   await benchmarkAndAwaitTx(
     'Interest Oracle - Update',
-    await feedInterestOracle(
-      interestParams,
-      500_000n,
-      lucid,
-      emulator.slot,
-      undefined,
-      utxo,
-    ),
+    await feedInterestOracle(interestParams, 500_000n, lucid, undefined, utxo),
     lucid,
     emulator,
   );

package/tests/price-oracle/actions.ts

@@ -16,7 +16,6 @@ import {
 } from '../cdp/cdp-queries';
 import { feedPriceOracleTx } from '../../src/contracts/price-oracle/transactions';
 import { findCollateralAsset } from '../queries/iasset-queries';
-import { unixTimeToSlot } from '@lucid-evolution/lucid';
 import { findPriceOracle } from './price-oracle-queries';
 import { match, P } from 'ts-pattern';
 import { parsePriceOracleDatum } from '../../src/contracts/price-oracle/types-new';
@@ -65,7 +64,6 @@ export async function runFeedPriceToOracle(
       priceOracleUtxo!,
       price,
       collateralInfo.oracleParams!,
-      context.emulator.slot,
     ),
   );
 
@@ -120,7 +118,6 @@ export async function refreshPriceOracle(
       priceOracleUtxo!,
       price,
       collateralInfo.oracleParams!,
-      context.emulator.slot,
     ),
   );
 
@@ -147,15 +144,16 @@ export async function waitForOracleExpiration(
 
       const oracle = parsePriceOracleDatum(getInlineDatumOrThrow(priceOracle));
 
-      const targetSlot = unixTimeToSlot(
-        context.lucid.config().network!,
+      const targetSlot = context.lucid.unixTimeToSlot(
         Number(oracle.expirationTime),
       );
 
-      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 + 5);
+        context.emulator.awaitSlot(
+          targetSlot - context.lucid.currentSlot() + 5,
+        );
       }
     })
     // otherwise no need to await

package/tests/price-oracle/price-oracle.test.ts

@@ -52,7 +52,6 @@ describe('Rational Price Oracle', () => {
       'ORACLE_NFT',
       rationalFromInt(1n),
       params,
-      context.emulator.slot,
     );
 
     await runAndAwaitTxBuilder(context.lucid, tx);
@@ -70,7 +69,6 @@ describe('Rational Price Oracle', () => {
       'ORACLE_NFT',
       rationalFromInt(1n),
       params,
-      context.emulator.slot,
     );
 
     const startTxHash = await runAndAwaitTxBuilder(context.lucid, startTx);
@@ -80,7 +78,6 @@ describe('Rational Price Oracle', () => {
       { txHash: startTxHash, outputIndex: 0 },
       rationalFromInt(2n),
       params,
-      context.emulator.slot,
     );
 
     await runAndAwaitTxBuilder(context.lucid, feedTx);
@@ -98,7 +95,6 @@ describe('Rational Price Oracle', () => {
       'ORACLE_NFT',
       rationalFromInt(1n),
       params,
-      context.emulator.slot,
     );
 
     const startTxHash = await runAndAwaitTxBuilder(context.lucid, startTx);
@@ -110,7 +106,6 @@ describe('Rational Price Oracle', () => {
         { txHash: startTxHash, outputIndex: 0 },
         rationalFromInt(-2n),
         params,
-        context.emulator.slot,
       ),
     );
   });
@@ -127,7 +122,6 @@ describe('Rational Price Oracle', () => {
       'ORACLE_NFT',
       rationalFromInt(1n),
       params,
-      context.emulator.slot,
     );
 
     const startTxHash = await runAndAwaitTxBuilder(context.lucid, startTx);
@@ -139,7 +133,6 @@ describe('Rational Price Oracle', () => {
         { txHash: startTxHash, outputIndex: 0 },
         rationalFromInt(2n),
         params,
-        context.emulator.slot,
       ),
     );
   });
@@ -156,7 +149,6 @@ describe('Rational Price Oracle', () => {
       'ORACLE_NFT',
       rationalFromInt(1n),
       params,
-      context.emulator.slot,
     );
 
     const startTxHash = await runAndAwaitTxBuilder(context.lucid, startTx);
@@ -168,7 +160,6 @@ describe('Rational Price Oracle', () => {
         { txHash: startTxHash, outputIndex: 0 },
         { numerator: 2n, denominator: 0n },
         params,
-        context.emulator.slot,
       ),
     );
   });
@@ -185,7 +176,6 @@ describe('Rational Price Oracle', () => {
       'ORACLE_NFT',
       rationalFromInt(1n),
       params,
-      context.emulator.slot,
     );
 
     const startTxHash = await runAndAwaitTxBuilder(context.lucid, startTx);
@@ -201,7 +191,6 @@ describe('Rational Price Oracle', () => {
           denominator: BigInt(Number.MAX_SAFE_INTEGER),
         },
         params,
-        context.emulator.slot,
       ),
     );
   });
@@ -218,7 +207,6 @@ describe('Rational Price Oracle', () => {
       'ORACLE_NFT',
       rationalFromInt(1n),
       params,
-      context.emulator.slot,
     );
 
     const startTxHash = await runAndAwaitTxBuilder(context.lucid, startTx);
@@ -230,7 +218,7 @@ describe('Rational Price Oracle', () => {
         { txHash: startTxHash, outputIndex: 0 },
         rationalFromInt(1n),
         params,
-        context.emulator.slot,
+
         Core.Data.fromCBORHex(
           'd8799f1b0180e51d1ae19514d8799f1a00030d40ff1b00000194ce33c598ff',
         ),

package/tests/price-oracle/transactions-mutated.ts

@@ -2,7 +2,6 @@ import {
   Data,
   LucidEvolution,
   OutRef,
-  slotToUnixTime,
   TxBuilder,
 } from '@lucid-evolution/lucid';
 import {
@@ -22,10 +21,8 @@ export async function feedPriceOracleTxStealNft(
   oracleOref: OutRef,
   newPrice: Rational,
   oracleParams: PriceOracleParams,
-  currentSlot: number,
 ): Promise<TxBuilder> {
-  const network = lucid.config().network!;
-  const currentTime = BigInt(slotToUnixTime(network, currentSlot));
+  const currentTime = BigInt(lucid.slotToUnixTime(lucid.currentSlot()));
 
   const priceOracleUtxo = matchSingle(
     await lucid.utxosByOutRef([oracleOref]),

package/tests/pyth/pyth-indigo.test.ts

@@ -14,7 +14,6 @@ import {
   generateEmulatorAccount,
   generateEmulatorAccountFromPrivateKey,
   Lucid,
-  slotToUnixTime,
   toHex,
 } from '@lucid-evolution/lucid';
 import {
@@ -89,7 +88,6 @@ describe('Pyth > Indigo', () => {
     const [systemParams, assetConfigs] = await init(
       context.lucid,
       [],
-      context.emulator.slot,
       (pythStateNft: AssetClass) => [
         iusdInitialAssetCfgWithPyth(pythStateNft, (pythStatePolicyId) => [
           mkBaseCollateralAsset(
@@ -142,7 +140,7 @@ describe('Pyth > Indigo', () => {
 
   test('Open CDP - Direct Price Value (ada collateral)', async (context: IndigoTestContext) => {
     const currentTime = BigInt(
-      slotToUnixTime(context.lucid.config().network!, context.emulator.slot),
+      context.lucid.slotToUnixTime(context.lucid.currentSlot()),
     );
 
     const iUsdFeed: ParsedFeedPayload = {
@@ -170,7 +168,7 @@ describe('Pyth > Indigo', () => {
 
   test('Open CDP - Direct Price Value (non-ADA collateral)', async (context: IndigoTestContext) => {
     const currentTime = BigInt(
-      slotToUnixTime(context.lucid.config().network!, context.emulator.slot),
+      context.lucid.slotToUnixTime(context.lucid.currentSlot()),
     );
 
     const iEthFeed: ParsedFeedPayload = {
@@ -199,7 +197,7 @@ describe('Pyth > Indigo', () => {
 
   test('Open CDP - Divide Price Value', async (context: IndigoTestContext) => {
     const currentTime = BigInt(
-      slotToUnixTime(context.lucid.config().network!, context.emulator.slot),
+      context.lucid.slotToUnixTime(context.lucid.currentSlot()),
     );
 
     const feed1: ParsedFeedPayload = {
@@ -235,7 +233,7 @@ describe('Pyth > Indigo', () => {
 
   test('Open CDP - Fails if missing feed price', async (context: IndigoTestContext) => {
     const currentTime = BigInt(
-      slotToUnixTime(context.lucid.config().network!, context.emulator.slot),
+      context.lucid.slotToUnixTime(context.lucid.currentSlot()),
     );
 
     // This feed doesn't include a price for feedId 2, which is used by the iBTC asset
@@ -261,7 +259,7 @@ describe('Pyth > Indigo', () => {
 
   test('Withdraw CDP - Direct Price Value', async (context: IndigoTestContext) => {
     const currentTime = BigInt(
-      slotToUnixTime(context.lucid.config().network!, context.emulator.slot),
+      context.lucid.slotToUnixTime(context.lucid.currentSlot()),
     );
 
     const iUsdFeed: ParsedFeedPayload = {
@@ -302,7 +300,7 @@ describe('Pyth > Indigo', () => {
 
   test('Freeze CDP - Direct Price Value', async (context: IndigoTestContext) => {
     const currentTime = BigInt(
-      slotToUnixTime(context.lucid.config().network!, context.emulator.slot),
+      context.lucid.slotToUnixTime(context.lucid.currentSlot()),
     );
     {
       const iUsdFeed: ParsedFeedPayload = {
@@ -355,7 +353,7 @@ describe('Pyth > Indigo', () => {
     const [ownPkh, _] = await addrDetails(context.lucid);
 
     const currentTime = BigInt(
-      slotToUnixTime(context.lucid.config().network!, context.emulator.slot),
+      context.lucid.slotToUnixTime(context.lucid.currentSlot()),
     );
     const iUsdFeed: ParsedFeedPayload = {
       priceFeedId: 1,
@@ -413,7 +411,6 @@ describe('Pyth > Indigo', () => {
         [[robUtxo, redemptionIAssetAmt]],
         'iUSD',
         adaAssetClass,
-        context.emulator.slot,
         toHex(message),
       ),
       context.lucid,
@@ -425,7 +422,7 @@ describe('Pyth > Indigo', () => {
     const [ownPkh, _] = await addrDetails(context.lucid);
 
     const currentTime = BigInt(
-      slotToUnixTime(context.lucid.config().network!, context.emulator.slot),
+      context.lucid.slotToUnixTime(context.lucid.currentSlot()),
     );
     const iUsdFeed: ParsedFeedPayload = {
       priceFeedId: 1,
@@ -499,7 +496,6 @@ describe('Pyth > Indigo', () => {
         [[robUtxo, payoutCollateralAmt]],
         'iUSD',
         adaAssetClass,
-        context.emulator.slot,
         toHex(message),
       ),
       context.lucid,

package/tests/pyth/pyth.test.ts

@@ -7,7 +7,6 @@ import {
   generateEmulatorAccount,
   Lucid,
   scriptHashToCredential,
-  slotToUnixTime,
   toHex,
   validatorToScriptHash,
 } from '@lucid-evolution/lucid';
@@ -140,7 +139,7 @@ describe('Pyth > Initialization', () => {
     );
 
     const currentTime = BigInt(
-      slotToUnixTime(context.lucid.config().network!, context.emulator.slot),
+      context.lucid.slotToUnixTime(context.lucid.currentSlot()),
     );
 
     // This is to test the transaction validity when using a timestamp different than the

package/tests/rob/actions.ts

@@ -12,7 +12,6 @@ export async function runRedeemRob(
   redemptionRobsData: [RobOutput, bigint][],
   iasset: string,
   collateralAsset: AssetClass,
-  currentSlot: number,
   pythMessage?: string,
 ): Promise<TxBuilder> {
   if (redemptionRobsData.length === 0) throw new Error('No ROBs to redeem');
@@ -51,7 +50,6 @@ export async function runRedeemRob(
     collateral.utxo,
     context.lucid,
     sysParams,
-    currentSlot,
     pythMessage,
     pythStateOutRef,
   );